diff --git a/source/graphics/TextureConverter.h b/source/graphics/TextureConverter.h
index 04d1f98cf6..e6e1d44602 100644
--- a/source/graphics/TextureConverter.h
+++ b/source/graphics/TextureConverter.h
@@ -23,6 +23,7 @@
 #include "TextureManager.h"
 
 #include <condition_variable>
+#include <deque>
 #include <mutex>
 #include <thread>
 
diff --git a/source/gui/CGUI.h b/source/gui/CGUI.h
index 7a0bfd4bd7..e4b84a4bf3 100644
--- a/source/gui/CGUI.h
+++ b/source/gui/CGUI.h
@@ -34,6 +34,7 @@
 #include "scriptinterface/ScriptInterface.h"
 
 #include <map>
+#include <set>
 #include <unordered_set>
 #include <vector>
 
diff --git a/source/gui/CGUISetting.cpp b/source/gui/CGUISetting.cpp
index 2202a0e3ee..f6ced0f97c 100644
--- a/source/gui/CGUISetting.cpp
+++ b/source/gui/CGUISetting.cpp
@@ -20,6 +20,7 @@
 #include "CGUISetting.h"
 
 #include "gui/CGUI.h"
+#include "ps/CLogger.h"
 
 template<typename T>
 
diff --git a/source/gui/Scripting/GuiScriptConversions.cpp b/source/gui/Scripting/GuiScriptConversions.cpp
index 7cec0986c3..2859e3e788 100644
--- a/source/gui/Scripting/GuiScriptConversions.cpp
+++ b/source/gui/Scripting/GuiScriptConversions.cpp
@@ -25,6 +25,7 @@
 #include "lib/external_libraries/libsdl.h"
 #include "maths/Vector2D.h"
 #include "ps/Hotkey.h"
+#include "ps/CLogger.h"
 #include "scriptinterface/ScriptConversions.h"
 
 #include <string>
diff --git a/source/ps/Profiler2GPU.cpp b/source/ps/Profiler2GPU.cpp
index 1bcb5b2dbd..cccd4e0c83 100644
--- a/source/ps/Profiler2GPU.cpp
+++ b/source/ps/Profiler2GPU.cpp
@@ -29,6 +29,9 @@
 #include "ps/ConfigDB.h"
 #include "ps/Profiler2.h"
 
+#include <deque>
+#include <stack>
+
 #if !CONFIG2_GLES
 
 class CProfiler2GPU_base
diff --git a/source/ps/UserReport.cpp b/source/ps/UserReport.cpp
index c92c2e256a..44cf6617a3 100644
--- a/source/ps/UserReport.cpp
+++ b/source/ps/UserReport.cpp
@@ -32,6 +32,7 @@
 #include "ps/Pyrogenesis.h"
 
 #include <condition_variable>
+#include <deque>
 #include <fstream>
 #include <mutex>
 #include <string>
diff --git a/source/scriptinterface/ScriptConversions.cpp b/source/scriptinterface/ScriptConversions.cpp
index 569df4d298..26c4ce0073 100644
--- a/source/scriptinterface/ScriptConversions.cpp
+++ b/source/scriptinterface/ScriptConversions.cpp
@@ -22,6 +22,7 @@
 #include "graphics/Entity.h"
 #include "maths/Vector2D.h"
 #include "ps/utf16string.h"
+#include "ps/CLogger.h"
 #include "ps/CStr.h"
 
 #define FAIL(msg) STMT(LOGERROR(msg); return false)
diff --git a/source/scriptinterface/ScriptInterface.h b/source/scriptinterface/ScriptInterface.h
index 5b86ecd802..76761c235a 100644
--- a/source/scriptinterface/ScriptInterface.h
+++ b/source/scriptinterface/ScriptInterface.h
@@ -53,7 +53,6 @@ class ScriptInterface;
 struct ScriptInterface_impl;
 
 class ScriptContext;
-
 // Using a global object for the context is a workaround until Simulation, AI, etc,
 // use their own threads and also their own contexts.
 extern thread_local shared_ptr<ScriptContext> g_ScriptContext;
diff --git a/source/simulation2/components/ICmpSoundManager.h b/source/simulation2/components/ICmpSoundManager.h
index 44b0a842b9..ed16d80b97 100644
--- a/source/simulation2/components/ICmpSoundManager.h
+++ b/source/simulation2/components/ICmpSoundManager.h
@@ -20,7 +20,9 @@
 
 #include "simulation2/system/Interface.h"
 
+#include "lib/file/vfs/vfs_path.h"
 #include "maths/FixedVector3D.h"
+#include "simulation2/helpers/Player.h"
 
 /**
  * Interface to the engine's sound system.
diff --git a/source/simulation2/serialization/ISerializer.h b/source/simulation2/serialization/ISerializer.h
index 1ab19bceab..18f3c0122f 100644
--- a/source/simulation2/serialization/ISerializer.h
+++ b/source/simulation2/serialization/ISerializer.h
@@ -20,6 +20,7 @@
 
 #include "maths/Fixed.h"
 #include "ps/Errors.h"
+#include "scriptinterface/ScriptTypes.h"
 
 ERROR_GROUP(Serialize);
 ERROR_TYPE(Serialize, OutOfBounds);
diff --git a/source/simulation2/system/ParamNode.cpp b/source/simulation2/system/ParamNode.cpp
index 2e8f125887..ccc3025863 100644
--- a/source/simulation2/system/ParamNode.cpp
+++ b/source/simulation2/system/ParamNode.cpp
@@ -24,6 +24,7 @@
 #include "ps/CStr.h"
 #include "ps/Filesystem.h"
 #include "ps/XML/Xeromyces.h"
+#include "scriptinterface/ScriptInterface.h"
 
 #include <sstream>
 
diff --git a/source/test_setup.cpp b/source/test_setup.cpp
index be69bb1573..e7dd46353b 100644
--- a/source/test_setup.cpp
+++ b/source/test_setup.cpp
@@ -38,6 +38,7 @@
 #include "ps/Profiler2.h"
 #include "scriptinterface/ScriptEngine.h"
 #include "scriptinterface/ScriptContext.h"
+#include "scriptinterface/ScriptInterface.h"
 
 class LeakReporter : public CxxTest::GlobalFixture
 {