diff --git a/SDK/include/NDK/Components.hpp b/SDK/include/NDK/Components.hpp
index a6d41e543..46392ab7c 100644
--- a/SDK/include/NDK/Components.hpp
+++ b/SDK/include/NDK/Components.hpp
@@ -5,13 +5,16 @@
 #ifndef NDK_COMPONENTS_GLOBAL_HPP
 #define NDK_COMPONENTS_GLOBAL_HPP
 
-#include <NDK/Components/CameraComponent.hpp>
 #include <NDK/Components/CollisionComponent.hpp>
-#include <NDK/Components/GraphicsComponent.hpp>
-#include <NDK/Components/LightComponent.hpp>
-#include <NDK/Components/ListenerComponent.hpp>
 #include <NDK/Components/NodeComponent.hpp>
 #include <NDK/Components/PhysicsComponent.hpp>
 #include <NDK/Components/VelocityComponent.hpp>
 
+#ifndef NDK_SERVER
+#include <NDK/Components/CameraComponent.hpp>
+#include <NDK/Components/GraphicsComponent.hpp>
+#include <NDK/Components/LightComponent.hpp>
+#include <NDK/Components/ListenerComponent.hpp>
+#endif
+
 #endif // NDK_COMPONENTS_GLOBAL_HPP
diff --git a/SDK/include/NDK/Systems.hpp b/SDK/include/NDK/Systems.hpp
index d9bd12c75..193438b5e 100644
--- a/SDK/include/NDK/Systems.hpp
+++ b/SDK/include/NDK/Systems.hpp
@@ -5,9 +5,12 @@
 #ifndef NDK_SYSTEMS_GLOBAL_HPP
 #define NDK_SYSTEMS_GLOBAL_HPP
 
-#include <NDK/Systems/ListenerSystem.hpp>
 #include <NDK/Systems/PhysicsSystem.hpp>
-#include <NDK/Systems/RenderSystem.hpp>
 #include <NDK/Systems/VelocitySystem.hpp>
 
+#ifndef NDK_SERVER
+#include <NDK/Systems/ListenerSystem.hpp>
+#include <NDK/Systems/RenderSystem.hpp>
+#endif
+
 #endif // NDK_SYSTEMS_GLOBAL_HPP