Index: ps/trunk/source/graphics/tests/test_LOSTexture.h
===================================================================
--- ps/trunk/source/graphics/tests/test_LOSTexture.h
+++ ps/trunk/source/graphics/tests/test_LOSTexture.h
@@ -19,6 +19,7 @@
 
 #include "graphics/LOSTexture.h"
 #include "lib/timer.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "simulation2/Simulation2.h"
 #include "simulation2/helpers/Los.h"
 
Index: ps/trunk/source/gui/CGUI.cpp
===================================================================
--- ps/trunk/source/gui/CGUI.cpp
+++ ps/trunk/source/gui/CGUI.cpp
@@ -20,6 +20,7 @@
 #include "CGUI.h"
 
 #include "gui/IGUIScrollBar.h"
+#include "gui/ObjectBases/IGUIObject.h"
 #include "gui/ObjectTypes/CGUIDummyObject.h"
 #include "gui/ObjectTypes/CTooltip.h"
 #include "gui/Scripting/ScriptFunctions.h"
Index: ps/trunk/source/gui/CGUISetting.h
===================================================================
--- ps/trunk/source/gui/CGUISetting.h
+++ ps/trunk/source/gui/CGUISetting.h
@@ -18,10 +18,11 @@
 #ifndef INCLUDED_CGUISETTINGS
 #define INCLUDED_CGUISETTINGS
 
-#include "gui/ObjectBases/IGUIObject.h"
+#include "ps/CStr.h"
+#include "scriptinterface/ScriptForward.h"
+
 
 class IGUIObject;
-class ScriptRequest;
 
 /**
  * This setting interface allows GUI objects to call setting function functions without having to know the setting type.
Index: ps/trunk/source/gui/CGUISetting.cpp
===================================================================
--- ps/trunk/source/gui/CGUISetting.cpp
+++ ps/trunk/source/gui/CGUISetting.cpp
@@ -20,6 +20,7 @@
 #include "CGUISetting.h"
 
 #include "gui/CGUI.h"
+#include "gui/ObjectBases/IGUIObject.h"
 #include "ps/CLogger.h"
 #include "scriptinterface/ScriptInterface.h"
 
Index: ps/trunk/source/gui/ObjectBases/IGUIButtonBehavior.cpp
===================================================================
--- ps/trunk/source/gui/ObjectBases/IGUIButtonBehavior.cpp
+++ ps/trunk/source/gui/ObjectBases/IGUIButtonBehavior.cpp
@@ -20,6 +20,8 @@
 #include "IGUIButtonBehavior.h"
 
 #include "gui/CGUISprite.h"
+#include "gui/ObjectBases/IGUIObject.h"
+
 
 const CStr IGUIButtonBehavior::EventNamePress = "Press";
 const CStr IGUIButtonBehavior::EventNamePressRight = "PressRight";
Index: ps/trunk/source/gui/ObjectBases/IGUIObject.h
===================================================================
--- ps/trunk/source/gui/ObjectBases/IGUIObject.h
+++ ps/trunk/source/gui/ObjectBases/IGUIObject.h
@@ -30,6 +30,7 @@
 #include "gui/SettingTypes/CGUISize.h"
 #include "gui/SGUIMessage.h"
 #include "lib/input.h" // just for IN_PASS
+#include "ps/CStr.h"
 #include "ps/XML/Xeromyces.h"
 #include "scriptinterface/ScriptTypes.h"
 
@@ -37,6 +38,7 @@
 #include <vector>
 
 class CGUI;
+class CGUISize;
 class IGUIObject;
 class IGUIProxyObject;
 class IGUISetting;
Index: ps/trunk/source/gui/ObjectBases/IGUIObject.cpp
===================================================================
--- ps/trunk/source/gui/ObjectBases/IGUIObject.cpp
+++ ps/trunk/source/gui/ObjectBases/IGUIObject.cpp
@@ -21,6 +21,7 @@
 
 #include "gui/CGUI.h"
 #include "gui/CGUISetting.h"
+#include "gui/ObjectBases/IGUIObject.h"
 #include "gui/Scripting/JSInterface_GUIProxy.h"
 #include "js/Conversions.h"
 #include "ps/CLogger.h"
Index: ps/trunk/source/gui/SettingTypes/CGUIHotkey.h
===================================================================
--- ps/trunk/source/gui/SettingTypes/CGUIHotkey.h
+++ ps/trunk/source/gui/SettingTypes/CGUIHotkey.h
@@ -19,8 +19,12 @@
 #define INCLUDED_CGUIHOTKEY
 
 #include "gui/CGUISetting.h"
+#include "scriptinterface/ScriptForward.h"
 #include "ps/CStr.h"
 
+class IGUIObject;
+class ScriptRequest;
+
 /**
  * Manages a hotkey setting for a GUI object.
  */
Index: ps/trunk/source/gui/SettingTypes/CGUIHotkey.cpp
===================================================================
--- ps/trunk/source/gui/SettingTypes/CGUIHotkey.cpp
+++ ps/trunk/source/gui/SettingTypes/CGUIHotkey.cpp
@@ -19,6 +19,7 @@
 
 #include "CGUIHotkey.h"
 
+#include "gui/CGUI.h"
 #include "gui/ObjectBases/IGUIObject.h"
 #include "scriptinterface/ScriptInterface.h"
 
Index: ps/trunk/source/gui/SettingTypes/MouseEventMask.h
===================================================================
--- ps/trunk/source/gui/SettingTypes/MouseEventMask.h
+++ ps/trunk/source/gui/SettingTypes/MouseEventMask.h
@@ -18,12 +18,16 @@
 #ifndef INCLUDED_GUI_MOUSE_EVENT_MASK
 #define INCLUDED_GUI_MOUSE_EVENT_MASK
 
+#include "gui/CGUISetting.h"
+#include "ps/CStr.h"
+
 #include <string>
 #include <memory>
 
 class CRect;
 class CVector2D;
 class IGUIObject;
+class ScriptRequest;
 
 /**
  * A custom shape that changes the object's "over-ability", and thus where one can click on it.
Index: ps/trunk/source/gui/SettingTypes/MouseEventMask.cpp
===================================================================
--- ps/trunk/source/gui/SettingTypes/MouseEventMask.cpp
+++ ps/trunk/source/gui/SettingTypes/MouseEventMask.cpp
@@ -21,11 +21,16 @@
 
 #include "gui/CGUISetting.h"
 #include "lib/tex/tex.h"
+#include "maths/Rect.h"
+#include "maths/Vector2D.h"
 #include "ps/Filesystem.h"
 #include "ps/CLogger.h"
 #include "ps/CStr.h"
 #include "scriptinterface/ScriptInterface.h"
 
+class IGUIObject;
+class IGUISetting;
+
 namespace
 {
 	const std::string MOUSE_EVENT_MASK = "mouse_event_mask";
Index: ps/trunk/source/gui/tests/test_GuiManager.h
===================================================================
--- ps/trunk/source/gui/tests/test_GuiManager.h
+++ ps/trunk/source/gui/tests/test_GuiManager.h
@@ -25,6 +25,8 @@
 #include "ps/GameSetup/GameSetup.h"
 #include "ps/Hotkey.h"
 #include "ps/XML/Xeromyces.h"
+#include "scriptinterface/ScriptRequest.h"
+#include "scriptinterface/ScriptInterface.h"
 #include "scriptinterface/StructuredClone.h"
 
 #include <memory>
Index: ps/trunk/source/network/StunClient.cpp
===================================================================
--- ps/trunk/source/network/StunClient.cpp
+++ ps/trunk/source/network/StunClient.cpp
@@ -20,6 +20,8 @@
 
 #include "StunClient.h"
 
+#include "lib/sysdep/os.h"
+
 #include <chrono>
 #include <cstdio>
 
@@ -27,7 +29,7 @@
 #include <string.h>
 
 #include <sys/types.h>
-#ifdef WIN32
+#if OS_WIN
 #  include <winsock2.h>
 #  include <ws2tcpip.h>
 #else
Index: ps/trunk/source/ps/SavedGame.h
===================================================================
--- ps/trunk/source/ps/SavedGame.h
+++ ps/trunk/source/ps/SavedGame.h
@@ -18,6 +18,7 @@
 #ifndef INCLUDED_SAVEDGAME
 #define INCLUDED_SAVEDGAME
 
+#include "ps/CStr.h"
 #include "scriptinterface/StructuredClone.h"
 
 class CSimulation2;
Index: ps/trunk/source/ps/XMB/XMBStorage.cpp
===================================================================
--- ps/trunk/source/ps/XMB/XMBStorage.cpp
+++ ps/trunk/source/ps/XMB/XMBStorage.cpp
@@ -20,6 +20,8 @@
 #include "XMBStorage.h"
 
 #include "lib/file/io/write_buffer.h"
+#include "lib/file/vfs/vfs.h"
+#include "ps/CLogger.h"
 #include "scriptinterface/ScriptExtraHeaders.h"
 #include "scriptinterface/ScriptInterface.h"
 
Index: ps/trunk/source/scriptinterface/StructuredClone.cpp
===================================================================
--- ps/trunk/source/scriptinterface/StructuredClone.cpp
+++ ps/trunk/source/scriptinterface/StructuredClone.cpp
@@ -17,6 +17,7 @@
 
 #include "precompiled.h"
 
+#include "ps/Profile.h"
 #include "ScriptExceptions.h"
 #include "ScriptInterface.h"
 #include "ScriptRequest.h"
Index: ps/trunk/source/simulation2/components/ICmpRangeManager.h
===================================================================
--- ps/trunk/source/simulation2/components/ICmpRangeManager.h
+++ ps/trunk/source/simulation2/components/ICmpRangeManager.h
@@ -25,6 +25,8 @@
 #include "simulation2/helpers/Position.h"
 #include "simulation2/helpers/Player.h"
 
+#include <vector>
+
 class FastSpatialSubdivision;
 
 /**