diff --git a/servers/SCsub b/servers/SCsub
index a2ee659f35..1a547a1499 100644
--- a/servers/SCsub
+++ b/servers/SCsub
@@ -14,18 +14,11 @@ SConscript("display/SCsub")
 SConscript("movie_writer/SCsub")
 SConscript("rendering/SCsub")
 SConscript("text/SCsub")
-
-if not env["disable_navigation_2d"]:
-    SConscript("navigation_2d/SCsub")
-if not env["disable_physics_2d"]:
-    SConscript("physics_2d/SCsub")
-
-if not env["disable_navigation_3d"]:
-    SConscript("navigation_3d/SCsub")
-if not env["disable_physics_3d"]:
-    SConscript("physics_3d/SCsub")
-if not env["disable_xr"]:
-    SConscript("xr/SCsub")
+SConscript("navigation_2d/SCsub")
+SConscript("physics_2d/SCsub")
+SConscript("navigation_3d/SCsub")
+SConscript("physics_3d/SCsub")
+SConscript("xr/SCsub")
 
 lib = env.add_library("servers", env.servers_sources)
 
diff --git a/servers/navigation_2d/SCsub b/servers/navigation_2d/SCsub
index 98f918b245..6d356d2e0a 100644
--- a/servers/navigation_2d/SCsub
+++ b/servers/navigation_2d/SCsub
@@ -3,4 +3,5 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_navigation_2d"]:
+    env.add_source_files(env.servers_sources, "*.cpp")
diff --git a/servers/navigation_3d/SCsub b/servers/navigation_3d/SCsub
index 98f918b245..b972f58c5a 100644
--- a/servers/navigation_3d/SCsub
+++ b/servers/navigation_3d/SCsub
@@ -3,4 +3,8 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_navigation_3d"]:
+    env.add_source_files(env.servers_sources, "*.cpp")
+else:
+    if env.debug_features:
+        env.add_source_files(env.servers_sources, "navigation_server_3d.cpp")
diff --git a/servers/physics_2d/SCsub b/servers/physics_2d/SCsub
index 98f918b245..96d81ed148 100644
--- a/servers/physics_2d/SCsub
+++ b/servers/physics_2d/SCsub
@@ -3,4 +3,5 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_physics_2d"]:
+    env.add_source_files(env.servers_sources, "*.cpp")
diff --git a/servers/physics_3d/SCsub b/servers/physics_3d/SCsub
index 98f918b245..87926c3a3d 100644
--- a/servers/physics_3d/SCsub
+++ b/servers/physics_3d/SCsub
@@ -3,4 +3,5 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_physics_3d"]:
+    env.add_source_files(env.servers_sources, "*.cpp")
diff --git a/servers/xr/SCsub b/servers/xr/SCsub
index 98f918b245..4790e03e70 100644
--- a/servers/xr/SCsub
+++ b/servers/xr/SCsub
@@ -3,4 +3,5 @@ from misc.utility.scons_hints import *
 
 Import("env")
 
-env.add_source_files(env.servers_sources, "*.cpp")
+if not env["disable_xr"]:
+    env.add_source_files(env.servers_sources, "*.cpp")