diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp
index 566eeda3ae..d4f123309d 100644
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@@ -57,6 +57,7 @@
 #include "simulation/Scheduler.h"
 #include "simulation/Projectile.h"
 
+#include "scripting/ScriptableComplex.inl"
 #include "scripting/ScriptingHost.h"
 #include "scripting/GameEvents.h"
 #include "scripting/ScriptableComplex.h"
diff --git a/source/scripting/ScriptableComplex.cpp b/source/scripting/ScriptableComplex.cpp
index 7d42038b31..a11071c225 100644
--- a/source/scripting/ScriptableComplex.cpp
+++ b/source/scripting/ScriptableComplex.cpp
@@ -1,5 +1,6 @@
 #include "precompiled.h"
 #include "ScriptableComplex.h"
+#include "ScriptableComplex.inl"
 
 #include "lib/allocators.h"
 
diff --git a/source/scripting/ScriptableComplex.h b/source/scripting/ScriptableComplex.h
index 9c02ff2be6..62468a09c3 100644
--- a/source/scripting/ScriptableComplex.h
+++ b/source/scripting/ScriptableComplex.h
@@ -273,9 +273,6 @@ extern void jscomplexproperty_suballoc_detach();
 extern void* jscomplexproperty_suballoc();
 extern void jscomplexproperty_suballoc_free(IJSComplexProperty* p);
 
-
-#include "ScriptableComplex.inl"
-
 #endif
 
 
diff --git a/source/simulation/Entity.cpp b/source/simulation/Entity.cpp
index 8cee5ec65e..808a288f81 100644
--- a/source/simulation/Entity.cpp
+++ b/source/simulation/Entity.cpp
@@ -29,6 +29,7 @@
 #include "graphics/GameView.h"
 #include "graphics/Sprite.h"
 #include "graphics/UnitManager.h"
+#include "scripting/ScriptableComplex.inl"
 
 extern CConsole* g_Console;
 extern int g_xres, g_yres;
diff --git a/source/simulation/EntityTemplate.cpp b/source/simulation/EntityTemplate.cpp
index f8afb483a5..c9aae3db84 100644
--- a/source/simulation/EntityTemplate.cpp
+++ b/source/simulation/EntityTemplate.cpp
@@ -5,7 +5,7 @@
 #include "graphics/ObjectManager.h"
 #include "ps/CStr.h"
 #include "ps/Player.h"
-
+#include "scripting/ScriptableComplex.inl"
 #include "ps/XML/Xeromyces.h"
 
 #include "ps/CLogger.h"
diff --git a/source/simulation/PathfindSparse.cpp b/source/simulation/PathfindSparse.cpp
index 389e52889b..3b7eadb6ad 100644
--- a/source/simulation/PathfindSparse.cpp
+++ b/source/simulation/PathfindSparse.cpp
@@ -4,6 +4,7 @@
 #include "graphics/Terrain.h"
 #include "ps/Game.h"
 #include "ps/World.h"
+#include "Entity.h"
 
 int SPF_RECURSION_DEPTH = 10;
 
diff --git a/source/simulation/Technology.cpp b/source/simulation/Technology.cpp
index 4a333750bb..46f72bb635 100644
--- a/source/simulation/Technology.cpp
+++ b/source/simulation/Technology.cpp
@@ -11,6 +11,7 @@
 #include "EntityTemplate.h"
 #include "EntityTemplateCollection.h"
 #include "ps/Player.h"
+#include "scripting/ScriptableComplex.inl"
 
 #define LOG_CATEGORY "Techs"