diff --git a/build/premake/premake.lua b/build/premake/premake.lua
index f6dcbc4281..613174007b 100755
--- a/build/premake/premake.lua
+++ b/build/premake/premake.lua
@@ -191,7 +191,7 @@ local function setup_static_lib_package (package_name, rel_source_dirs, extern_l
 		pch_dir = source_root.."pch/"..package_name.."/"
 		package.pchheader = "precompiled.h"
 		package.pchsource = "precompiled.cpp"
-		tinsert(package.files, pch_dir.."precompiled.cpp")
+		tinsert(package.files, { pch_dir.."precompiled.cpp", pch_dir.."precompiled.h" })
 
 	end
 	
@@ -433,6 +433,10 @@ local function setup_atlas_package(package_name, target_type, rel_source_dirs, r
 			package.pchsource = "stdafx.cpp"
 		end
 
+		if flags["depends"] then
+			listconcat(package.links, flags["depends"])
+		end
+
 	else -- Non-Windows, = Unix
 		-- TODO
 	end
diff --git a/source/graphics/GameView.cpp b/source/graphics/GameView.cpp
index a424565f47..d43bb48888 100644
--- a/source/graphics/GameView.cpp
+++ b/source/graphics/GameView.cpp
@@ -29,6 +29,8 @@
 #include "ps/Globals.h"
 #include "renderer/WaterManager.h"
 #include "renderer/SkyManager.h"
+#include "graphics/UnitManager.h"
+#include "graphics/Patch.h"
 
 #include "maths/Quaternion.h"
 #include "Unit.h"
diff --git a/source/graphics/MapReader.cpp b/source/graphics/MapReader.cpp
index 937d07d9a0..2918d63b01 100644
--- a/source/graphics/MapReader.cpp
+++ b/source/graphics/MapReader.cpp
@@ -6,12 +6,14 @@
 #include "Unit.h"
 #include "ps/Game.h"
 #include "ObjectManager.h"
+#include "simulation/Entity.h"
 #include "simulation/BaseEntity.h"
 #include "simulation/BaseEntityCollection.h"
 #include "simulation/EntityManager.h"
 #include "ps/CLogger.h"
 #include "maths/MathUtil.h"
 #include "Camera.h"
+#include "graphics/Patch.h"
 
 #include "Model.h"
 #include "Terrain.h"
diff --git a/source/graphics/MapWriter.cpp b/source/graphics/MapWriter.cpp
index 450f39ef9f..151eb2e01a 100644
--- a/source/graphics/MapWriter.cpp
+++ b/source/graphics/MapWriter.cpp
@@ -18,6 +18,8 @@
 #include "ps/Loader.h"
 #include "maths/MathUtil.h"
 #include "graphics/Camera.h"
+#include "ps/Player.h"
+#include "graphics/Patch.h"
 
 #include "ps/XML/XMLWriter.h"
 #include "simulation/Entity.h"
diff --git a/source/graphics/ParticleEngine.h b/source/graphics/ParticleEngine.h
index c0d7ea6c5b..e885c1f850 100644
--- a/source/graphics/ParticleEngine.h
+++ b/source/graphics/ParticleEngine.h
@@ -14,6 +14,7 @@
 #include "ParticleEmitter.h"
 #include "lib/res/graphics/tex.h"
 #include "lib/res/graphics/ogl_tex.h"
+#include "graphics/Texture.h"
 
 #include "ps/CLogger.h"
 #include "ps/Loader.h"
diff --git a/source/graphics/Patch.h b/source/graphics/Patch.h
index 7a73cf3ff1..0524c96c41 100644
--- a/source/graphics/Patch.h
+++ b/source/graphics/Patch.h
@@ -9,22 +9,16 @@
 #ifndef _PATCH_H
 #define _PATCH_H
 
+#include "MiniPatch.h"
+#include "RenderableObject.h"
+
+class CTerrain;
+
 ///////////////////////////////////////////////////////////////////////////////
 // Terrain Constants:
 //
 // PATCH_SIZE: number of tiles in each patch
 const int	PATCH_SIZE = 16;
-// CELL_SIZE: size of each tile in x and z
-const int	CELL_SIZE = 4;	
-// HEIGHT_SCALE: vertical scale of terrain - terrain has a coordinate range of 
-// 0 to 65536*HEIGHT_SCALE
-const float HEIGHT_SCALE = 0.35f/256.0f;
-
-
-#include "MiniPatch.h"
-#include "RenderableObject.h"
-
-class CTerrain;
 
 ///////////////////////////////////////////////////////////////////////////////
 // CPatch: a single terrain patch, PATCH_SIZE tiles square
diff --git a/source/graphics/Terrain.cpp b/source/graphics/Terrain.cpp
index 866fcf23f2..e24747b782 100644
--- a/source/graphics/Terrain.cpp
+++ b/source/graphics/Terrain.cpp
@@ -15,12 +15,13 @@
 #include "renderer/WaterManager.h"
 
 #include "simulation/EntityManager.h"
+#include "simulation/Entity.h"
 
 #include <string.h>
 #include "Terrain.h"
+#include "Patch.h"
 #include "maths/MathUtil.h"
 
-
 ///////////////////////////////////////////////////////////////////////////////
 // CTerrain constructor
 CTerrain::CTerrain() : m_Heightmap(0), m_Patches(0), m_MapSize(0), m_MapSizePatches(0)
@@ -74,6 +75,18 @@ bool CTerrain::Initialize(u32 size,const u16* data)
 	return true;
 }
 
+///////////////////////////////////////////////////////////////////////////////
+
+bool CTerrain::isOnMap(const CVector2D& v) const
+{
+	return isOnMap(v.x, v.y);
+}
+
+float CTerrain::getExactGroundLevel(const CVector2D& v) const
+{
+	return getExactGroundLevel(v.x, v.y);
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 // CalcPosition: calculate the world space position of the vertex at (i,j)
 void CTerrain::CalcPosition(i32 i, i32 j, CVector3D& pos) const
diff --git a/source/graphics/Terrain.h b/source/graphics/Terrain.h
index 6e1f72a31e..40575d5663 100644
--- a/source/graphics/Terrain.h
+++ b/source/graphics/Terrain.h
@@ -10,10 +10,22 @@
 #ifndef _TERRAIN_H
 #define _TERRAIN_H
 
-#include "Patch.h"
 #include "maths/Vector3D.h"
-#include "ps/Vector2D.h"
-#include "simulation/Entity.h"
+
+class CEntity;
+class CPatch;
+class CMiniPatch;
+class CVector2D;
+
+
+///////////////////////////////////////////////////////////////////////////////
+// Terrain Constants:
+//
+// CELL_SIZE: size of each tile in x and z
+const int	CELL_SIZE = 4;	
+// HEIGHT_SCALE: vertical scale of terrain - terrain has a coordinate range of 
+// 0 to 65536*HEIGHT_SCALE
+const float HEIGHT_SCALE = 0.35f/256.0f;
 
 ///////////////////////////////////////////////////////////////////////////////
 // CTerrain: main terrain class; contains the heightmap describing elevation
@@ -36,14 +48,16 @@ public:
 	// return number of patches along edge of the terrain
 	u32 GetPatchesPerSide() const { return m_MapSizePatches; }
 
-	inline bool isOnMap(float x, float z) const 
+	bool isOnMap(float x, float z) const
 	{
-		return ((x >= 0.0f) && (x < (float)((m_MapSize-1) * CELL_SIZE)) && (z >= 0.0f) && (z < (float)((m_MapSize-1) * CELL_SIZE)));
+		return ((x >= 0.0f) && (x < (float)((m_MapSize-1) * CELL_SIZE))
+		     && (z >= 0.0f) && (z < (float)((m_MapSize-1) * CELL_SIZE)));
 	}
-	inline bool isOnMap(const CVector2D& v) const { return isOnMap(v.x, v.y); }
+	bool isOnMap(const CVector2D& v) const;
+
 	float getVertexGroundLevel(int i, int j) const;
 	float getExactGroundLevel(float x, float z) const;
-	inline float getExactGroundLevel(const CVector2D& v) const { return getExactGroundLevel(v.x, v.y); }
+	float getExactGroundLevel(const CVector2D& v) const;
 
 	float getSlope(float x, float z) const ;
 	//Find the slope of in X and Z axes depending on the way the entity is facing
diff --git a/source/gui/MiniMap.cpp b/source/gui/MiniMap.cpp
index f0097d1b57..9f6c2a355a 100644
--- a/source/gui/MiniMap.cpp
+++ b/source/gui/MiniMap.cpp
@@ -1,26 +1,27 @@
 #include "precompiled.h"
 
-#include "gui/MiniMap.h"
-#include "ps/Game.h"
-
 #include <math.h>
-#include "lib/ogl.h"
-#include "renderer/Renderer.h"
+
+#include "graphics/GameView.h"
+#include "graphics/MiniPatch.h"
+#include "graphics/Model.h"
+#include "graphics/Terrain.h"
 #include "graphics/TextureEntry.h"
 #include "graphics/TextureManager.h"
 #include "graphics/Unit.h"
 #include "graphics/UnitManager.h"
-#include "simulation/Entity.h"
+#include "gui/MiniMap.h"
+#include "lib/ogl.h"
 #include "maths/Bound.h"
-#include "graphics/Model.h"
-#include "scripting/GameEvents.h"
-#include "graphics/Terrain.h"
-#include "ps/Profile.h"
-#include "simulation/LOSManager.h"
-#include "graphics/GameView.h"
-#include "renderer/WaterManager.h"
+#include "ps/Game.h"
 #include "ps/Interact.h"
 #include "ps/Network/NetMessage.h"
+#include "ps/Profile.h"
+#include "renderer/Renderer.h"
+#include "renderer/WaterManager.h"
+#include "scripting/GameEvents.h"
+#include "simulation/Entity.h"
+#include "simulation/LOSManager.h"
 
 
 bool g_TerrainModified = false;
diff --git a/source/pch/atlas/precompiled.h b/source/pch/atlas/precompiled.h
index fe88b36d8c..fa04605c7e 100644
--- a/source/pch/atlas/precompiled.h
+++ b/source/pch/atlas/precompiled.h
@@ -2,3 +2,4 @@
 
 // Atlas-specific PCH:
 
+#include "tools/atlas/GameInterface/Messages.h"
diff --git a/source/ps/CConsole.cpp b/source/ps/CConsole.cpp
index 19af3fe9ef..f01fbc8eb6 100644
--- a/source/ps/CConsole.cpp
+++ b/source/ps/CConsole.cpp
@@ -2,22 +2,21 @@
 #include <wctype.h>
 
 #include "CConsole.h"
-#include "CLogger.h"
 
-#include "Pyrogenesis.h"
+#include "lib/lib.h"
+#include "lib/ogl.h"
+#include "lib/res/file/vfs.h"
+#include "lib/res/graphics/unifont.h"
 #include "lib/sysdep/sysdep.h"
-#include "Hotkey.h"
-#include "scripting/ScriptingHost.h"
 #include "maths/MathUtil.h"
-
+#include "ps/CLogger.h"
+#include "ps/Globals.h"
+#include "ps/Hotkey.h"
+#include "ps/Interact.h"
 #include "ps/Network/Client.h"
 #include "ps/Network/Server.h"
-
-#include "lib/res/file/vfs.h"
-
-#include "Interact.h"
-#include "ps/Globals.h"
-
+#include "ps/Pyrogenesis.h"
+#include "scripting/ScriptingHost.h"
 
 CConsole* g_Console = 0;
 
diff --git a/source/ps/CConsole.h b/source/ps/CConsole.h
index 62474cc4af..73addfa43e 100644
--- a/source/ps/CConsole.h
+++ b/source/ps/CConsole.h
@@ -15,9 +15,6 @@
 #include <deque>
 #include <map>
 
-#include "lib/res/graphics/unifont.h"
-#include "lib/ogl.h"
-#include "lib/lib.h"
 #include "CStr.h"
 
 #include "lib/input.h"
diff --git a/source/ps/Game.cpp b/source/ps/Game.cpp
index 8b58e35361..0feefde38b 100644
--- a/source/ps/Game.cpp
+++ b/source/ps/Game.cpp
@@ -11,6 +11,7 @@
 #include "Loader.h"
 #include "CStr.h"
 #include "simulation/EntityManager.h"
+#include "simulation/Entity.h"
 #include "CConsole.h"
 
 #include "ps/World.h"
diff --git a/source/ps/GameSetup/GameSetup.cpp b/source/ps/GameSetup/GameSetup.cpp
index 5406945d43..e9e6ea07ba 100644
--- a/source/ps/GameSetup/GameSetup.cpp
+++ b/source/ps/GameSetup/GameSetup.cpp
@@ -788,6 +788,7 @@ void Shutdown()
 	delete &g_JSGameEvents;
 	
 	delete &g_FormationManager;
+	delete &g_BaseTechCollection;
 	delete &g_EntityFormationCollection;
 	delete &g_EntityTemplateCollection;
 	TIMER_END("shutdown game scripting stuff");
diff --git a/source/ps/Interact.cpp b/source/ps/Interact.cpp
index 9fe32b3d70..9709da4a13 100644
--- a/source/ps/Interact.cpp
+++ b/source/ps/Interact.cpp
@@ -1,29 +1,32 @@
 #include "precompiled.h"
 
-#include "Interact.h"
-#include "renderer/Renderer.h"
-#include "lib/input.h"
 #include "CConsole.h"
-#include "graphics/HFTracer.h"
+#include "Game.h"
 #include "Hotkey.h"
+#include "Interact.h"
+#include "graphics/GameView.h"
+#include "graphics/HFTracer.h"
+#include "graphics/Model.h"
+#include "graphics/Terrain.h"
+#include "graphics/Unit.h"
+#include "graphics/UnitManager.h"
 #include "gui/CGUI.h"
 #include "gui/MiniMap.h"
+#include "lib/input.h"
+#include "lib/res/graphics/unifont.h"
 #include "lib/timer.h"
-#include "Game.h"
-#include "simulation/Simulation.h"
+#include "maths/MathUtil.h"
 #include "ps/Globals.h"
-#include "ps/VFSUtil.h"
 #include "ps/Network/NetMessage.h"
-#include "simulation/BoundingObjects.h"
-#include "graphics/Unit.h"
-#include "graphics/Model.h"
+#include "ps/Player.h"
+#include "ps/VFSUtil.h"
+#include "renderer/Renderer.h"
+#include "scripting/GameEvents.h"
 #include "simulation/BaseEntityCollection.h"
+#include "simulation/BoundingObjects.h"
 #include "simulation/EntityFormation.h"
 #include "simulation/FormationManager.h"
-#include "scripting/GameEvents.h"
-#include "graphics/UnitManager.h"
-#include "maths/MathUtil.h"
-#include "graphics/GameView.h"
+#include "simulation/Simulation.h"
 
 #include "ps/CLogger.h"
 #define LOG_CATEGORY "world"
diff --git a/source/ps/Interact.h b/source/ps/Interact.h
index eae8570a57..b6b6f1617a 100644
--- a/source/ps/Interact.h
+++ b/source/ps/Interact.h
@@ -16,6 +16,7 @@
 #include "simulation/Scheduler.h"
 #include "graphics/Camera.h"
 #include "lib/input.h"
+#include "lib/res/handle.h"
 
 #define MAX_BOOKMARKS 10
 #define MAX_GROUPS    20
diff --git a/source/ps/World.cpp b/source/ps/World.cpp
index 7e2506551f..55f9132a4a 100644
--- a/source/ps/World.cpp
+++ b/source/ps/World.cpp
@@ -21,6 +21,7 @@
 #include "simulation/Projectile.h"
 #include "simulation/LOSManager.h"
 #include "graphics/GameView.h"
+#include "graphics/Terrain.h"
 
 #define LOG_CATEGORY "world"
 
@@ -31,7 +32,7 @@ CLightEnv g_LightEnv;
 
 CWorld::CWorld(CGame *pGame):
 	m_pGame(pGame),
-	m_Terrain(),
+	m_Terrain(new CTerrain()),
 	m_UnitManager(&g_UnitMan),
 	m_EntityManager(new CEntityManager()),
 	m_ProjectileManager(new CProjectileManager()),
@@ -54,7 +55,7 @@ void CWorld::Initialize(CGameAttributes *pAttribs)
 
 		try {
 			reader = new CMapReader;
-			reader->LoadMap(mapfilename, &m_Terrain, m_UnitManager, &g_LightEnv, m_pGame->GetView()->GetCamera());
+			reader->LoadMap(mapfilename, m_Terrain, m_UnitManager, &g_LightEnv, m_pGame->GetView()->GetCamera());
 				// fails immediately, or registers for delay loading
 		} catch (PSERROR_File&) {
 			delete reader;
@@ -73,6 +74,7 @@ void CWorld::RegisterInit(CGameAttributes *pAttribs)
 
 CWorld::~CWorld()
 {
+	delete m_Terrain;
 	delete m_EntityManager;
 	delete m_ProjectileManager;
 	delete m_LOSManager;
@@ -81,5 +83,5 @@ CWorld::~CWorld()
 
 void CWorld::RewriteMap()
 {
-	CMapWriter::RewriteAllMaps(&m_Terrain, m_UnitManager, &g_LightEnv, m_pGame->GetView()->GetCamera());
+	CMapWriter::RewriteAllMaps(m_Terrain, m_UnitManager, &g_LightEnv, m_pGame->GetView()->GetCamera());
 }
diff --git a/source/ps/World.h b/source/ps/World.h
index 100ec0a3b7..8077fe8d28 100644
--- a/source/ps/World.h
+++ b/source/ps/World.h
@@ -1,8 +1,6 @@
 #ifndef _ps_World_H
 #define _ps_World_H
 
-#include "graphics/Terrain.h"
-
 #include "ps/Errors.h"
 
 #ifndef ERROR_GROUP_GAME_DEFINED
@@ -18,12 +16,13 @@ class CUnitManager;
 class CEntityManager;
 class CProjectileManager;
 class CLOSManager;
+class CTerrain;
 
 class CWorld
 {
 	CGame *m_pGame;
 	
-	CTerrain m_Terrain;
+	CTerrain *m_Terrain;
 
 	CUnitManager *m_UnitManager;
 	CEntityManager *m_EntityManager;
@@ -44,7 +43,7 @@ public:
 	void RewriteMap();
 
 	inline CTerrain *GetTerrain()
-	{	return &m_Terrain; }
+	{	return m_Terrain; }
 	inline CUnitManager *GetUnitManager()
 	{	return m_UnitManager; }
 	inline CEntityManager *GetEntityManager()
diff --git a/source/renderer/PatchRData.cpp b/source/renderer/PatchRData.cpp
index ba8f116daf..d43a094032 100644
--- a/source/renderer/PatchRData.cpp
+++ b/source/renderer/PatchRData.cpp
@@ -13,7 +13,8 @@
 #include "ps/Profile.h"
 #include "maths/MathUtil.h"
 #include "simulation/LOSManager.h"
-
+#include "graphics/Patch.h"
+#include "graphics/Terrain.h"
 
 const int BlendOffsets[8][2] = {
 	{  0, -1 },
diff --git a/source/renderer/Renderer.h b/source/renderer/Renderer.h
index a87090b327..ae90d1e457 100644
--- a/source/renderer/Renderer.h
+++ b/source/renderer/Renderer.h
@@ -16,17 +16,13 @@
 #include <vector>
 #include "lib/ogl.h"
 #include "graphics/Camera.h"
-#include "graphics/Frustum.h"
-#include "graphics/Terrain.h"
 #include "ps/Singleton.h"
-#include "ps/Overlay.h"
 
 #include "scripting/ScriptableObject.h"
 
 #include "renderer/ModelRenderer.h"
 
 // necessary declarations
-class CCamera;
 class CPatch;
 class CSprite;
 class CParticleSys;
@@ -35,7 +31,6 @@ class CMaterial;
 class CModel;
 class CLightEnv;
 class CTexture;
-class CTerrain;
 
 class RenderPathVertexShader;
 class WaterManager;
diff --git a/source/scripting/JSConversions.cpp b/source/scripting/JSConversions.cpp
index 64b0384535..2b3e83d869 100644
--- a/source/scripting/JSConversions.cpp
+++ b/source/scripting/JSConversions.cpp
@@ -4,6 +4,7 @@
 #include "graphics/ObjectManager.h"
 #include "maths/scripting/JSInterface_Vector3D.h"
 #include "ps/Parser.h"
+#include "ps/Player.h"
 #include "simulation/BaseEntity.h"
 #include "lib/sysdep/sysdep.h"	// finite
 
diff --git a/source/simulation/AStarEngine.cpp b/source/simulation/AStarEngine.cpp
index 64368c7b02..c769b959c8 100644
--- a/source/simulation/AStarEngine.cpp
+++ b/source/simulation/AStarEngine.cpp
@@ -6,6 +6,8 @@
 #include "Collision.h"
 #include "ps/Game.h"
 #include "ps/World.h"
+#include "graphics/Patch.h"
+#include "graphics/Terrain.h"
 
 #include "ps/Profile.h"
 
diff --git a/source/simulation/BaseTech.cpp b/source/simulation/BaseTech.cpp
index a6a41b4739..2eecf896f2 100644
--- a/source/simulation/BaseTech.cpp
+++ b/source/simulation/BaseTech.cpp
@@ -8,6 +8,8 @@
 #include "ps/XML/Xeromyces.h"
 #include "ps/XML/XeroXMB.h"
 #include "BaseEntity.h"
+#include "Entity.h"
+#include "ps/Player.h"
 
 #define LOG_CATEGORY "Techs"
 
diff --git a/source/simulation/Entity.cpp b/source/simulation/Entity.cpp
index e4d8a82bca..f130544891 100644
--- a/source/simulation/Entity.cpp
+++ b/source/simulation/Entity.cpp
@@ -25,6 +25,7 @@
 #include "simulation/FormationManager.h"
 #include "BaseFormation.h"
 #include "graphics/GameView.h"
+#include "graphics/UnitManager.h"
 
 
 extern CConsole* g_Console;
diff --git a/source/simulation/Entity.h b/source/simulation/Entity.h
index 4e126c0f0a..52e88e46bd 100644
--- a/source/simulation/Entity.h
+++ b/source/simulation/Entity.h
@@ -28,23 +28,22 @@
 
 #include <deque>
 #include "scripting/ScriptableComplex.h"
-#include "ps/Player.h"
 #include "ps/Vector2D.h"
 #include "maths/Vector3D.h"
-#include "graphics/UnitManager.h"
 #include "EntityOrders.h"
 #include "EntityHandles.h"
 #include "EntityMessage.h"
 #include "EventHandlers.h"
 #include "ScriptObject.h"
-#include "graphics/ObjectEntry.h"
 #include "EntitySupport.h"
 
+class CAura;
 class CBaseEntity;
 class CBoundingObject;
-class CUnit;
-class CAura;
+class CPlayer;
 class CProductionQueue;
+class CSkeletonAnim;
+class CUnit;
 
 class CEntityFormation;
 
diff --git a/source/simulation/EntityHandles.cpp b/source/simulation/EntityHandles.cpp
index 9bc2702232..98c32c26d1 100644
--- a/source/simulation/EntityHandles.cpp
+++ b/source/simulation/EntityHandles.cpp
@@ -2,7 +2,9 @@
 
 #include "EntityHandles.h"
 #include "EntityManager.h"
+#include "Entity.h"
 #include "ps/CStr.h"
+#include "ps/Network/Serialization.h"
 
 CHandle::CHandle()
 {
diff --git a/source/simulation/EntityHandles.h b/source/simulation/EntityHandles.h
index 6c53cd9704..33b65946dc 100644
--- a/source/simulation/EntityHandles.h
+++ b/source/simulation/EntityHandles.h
@@ -21,7 +21,6 @@
 #define ENTITY_HANDLE_INCLUDED
 
 #include "lib/types.h"
-#include "ps/Network/Serialization.h"
 
 #define INVALID_HANDLE 65535
 // The maximum numerical value of an entity handle sent over the network
diff --git a/source/simulation/EntityManager.cpp b/source/simulation/EntityManager.cpp
index c5f7077a46..2b319458c6 100644
--- a/source/simulation/EntityManager.cpp
+++ b/source/simulation/EntityManager.cpp
@@ -8,6 +8,8 @@
 #include "graphics/Terrain.h"
 #include "ps/Game.h"
 #include "maths/MathUtil.h"
+#include "Entity.h"
+
 int SELECTION_CIRCLE_POINTS;
 int SELECTION_BOX_POINTS;
 int SELECTION_SMOOTHNESS_UNIFIED = 9;
diff --git a/source/simulation/EntityManager.h b/source/simulation/EntityManager.h
index a01715e1de..92f75bcb1c 100644
--- a/source/simulation/EntityManager.h
+++ b/source/simulation/EntityManager.h
@@ -19,12 +19,15 @@
 #define ENTITY_MANAGER_INCLUDED
 
 #include "ps/Singleton.h"
-#include "Entity.h"
 #include "EntityHandles.h"
 #include "EntityPredicate.h"
 #include "EntityMessage.h"
 #include "ps/Game.h"
 #include "ps/World.h"
+#include "ps/CStr.h"
+#include "maths/Vector3D.h"
+
+class CBaseEntity;
 
 #define MAX_HANDLES 4096
 
diff --git a/source/simulation/EntityOrders.h b/source/simulation/EntityOrders.h
index b63399e43f..a83c1952d1 100644
--- a/source/simulation/EntityOrders.h
+++ b/source/simulation/EntityOrders.h
@@ -38,7 +38,6 @@
 
 #include "EntityHandles.h"
 #include "ps/Vector2D.h"
-#include "scripting/DOMEvent.h"
 
 // An order data field, which could represent different things depending on the type of order.
 struct SOrderData
diff --git a/source/simulation/Projectile.cpp b/source/simulation/Projectile.cpp
index 07dd9e4096..8da1381c01 100644
--- a/source/simulation/Projectile.cpp
+++ b/source/simulation/Projectile.cpp
@@ -9,6 +9,8 @@
 #include "ps/Game.h"
 #include "Collision.h"
 #include "graphics/ObjectManager.h"
+#include "graphics/ObjectEntry.h"
+#include "graphics/Terrain.h"
 #include "ps/CLogger.h"
 
 const double GRAVITY = 0.00001;
diff --git a/source/simulation/Simulation.cpp b/source/simulation/Simulation.cpp
index dd674f9efa..30ebfbfc58 100644
--- a/source/simulation/Simulation.cpp
+++ b/source/simulation/Simulation.cpp
@@ -2,27 +2,29 @@
 
 #include <vector>
 
-#include "lib/timer.h"
-#include "ps/Profile.h"
-
-#include "Simulation.h"
-#include "TurnManager.h"
-#include "ps/Game.h"
+#include "EntityFormation.h"
 #include "EntityManager.h"
+#include "LOSManager.h"
 #include "Projectile.h"
 #include "Scheduler.h"
-#include "ps/Network/NetMessage.h"
-#include "ps/CLogger.h"
-#include "ps/CConsole.h"
-#include "graphics/Unit.h"
+#include "Simulation.h"
+#include "TurnManager.h"
 #include "graphics/Model.h"
-#include "LOSManager.h"
+#include "graphics/Terrain.h"
+#include "graphics/Unit.h"
+#include "graphics/UnitManager.h"
+#include "lib/timer.h"
+#include "ps/CConsole.h"
+#include "ps/CLogger.h"
+#include "ps/Game.h"
+#include "ps/GameAttributes.h"
 #include "ps/Loader.h"
 #include "ps/LoaderThunks.h"
-#include "ps/GameAttributes.h"
+#include "ps/Network/NetMessage.h"
+#include "ps/Profile.h"
 #include "renderer/Renderer.h"
 #include "renderer/WaterManager.h"
-#include "EntityFormation.h"
+#include "simulation/Entity.h"
 
 #include "gui/CGUI.h"
 
diff --git a/source/tools/atlas/GameInterface/Handlers/ElevationHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/ElevationHandlers.cpp
index cd2d493298..0c42b0d574 100644
--- a/source/tools/atlas/GameInterface/Handlers/ElevationHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/ElevationHandlers.cpp
@@ -9,6 +9,7 @@
 #include "ps/World.h"
 #include "maths/MathUtil.h"
 #include "simulation/EntityManager.h"
+#include "graphics/RenderableObject.h"
 
 #include "../Brushes.h"
 #include "../DeltaArray.h"
diff --git a/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
index e22c9f8fb5..2a9de45d18 100644
--- a/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/EnvironmentHandlers.cpp
@@ -4,10 +4,11 @@
 
 #include "../CommandProc.h"
 
+#include "graphics/LightEnv.h"
+#include "graphics/Terrain.h"
+#include "ps/World.h"
 #include "renderer/Renderer.h"
 #include "renderer/WaterManager.h"
-#include "ps/World.h"
-#include "graphics/LightEnv.h"
 
 namespace AtlasMessage {
 
diff --git a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
index 08c72d9865..80018515af 100644
--- a/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/GraphicsSetupHandlers.cpp
@@ -6,7 +6,8 @@
 
 #include "renderer/Renderer.h"
 #include "graphics/GameView.h"
-#include "gui/GUI.h"
+#include "gui/GUIbase.h"
+#include "gui/CGUI.h"
 #include "ps/CConsole.h"
 #include "ps/Game.h"
 #include "maths/MathUtil.h"
diff --git a/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
index fffc8b488c..8e571e4a4e 100644
--- a/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/MapHandlers.cpp
@@ -3,11 +3,12 @@
 #include "MessageHandler.h"
 #include "../GameLoop.h"
 
-#include "graphics/Patch.h"
-#include "graphics/TextureManager.h"
-#include "graphics/TextureEntry.h"
-#include "graphics/MapWriter.h"
 #include "graphics/GameView.h"
+#include "graphics/MapWriter.h"
+#include "graphics/Patch.h"
+#include "graphics/Terrain.h"
+#include "graphics/TextureEntry.h"
+#include "graphics/TextureManager.h"
 #include "ps/Game.h"
 #include "ps/GameAttributes.h"
 #include "ps/Loader.h"
diff --git a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
index dccff3806d..72e2bccc25 100644
--- a/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/ObjectHandlers.cpp
@@ -5,19 +5,21 @@
 #include "MessageHandler.h"
 #include "../CommandProc.h"
 
-#include "simulation/BaseEntityCollection.h"
-#include "simulation/EntityManager.h"
-#include "graphics/Unit.h"
-#include "graphics/UnitManager.h"
+#include "graphics/GameView.h"
 #include "graphics/Model.h"
 #include "graphics/ObjectManager.h"
-#include "maths/Matrix3D.h"
+#include "graphics/Terrain.h"
+#include "graphics/Unit.h"
+#include "graphics/UnitManager.h"
+#include "lib/ogl.h"
 #include "maths/MathUtil.h"
+#include "maths/Matrix3D.h"
 #include "ps/CLogger.h"
 #include "ps/Game.h"
 #include "ps/World.h"
-#include "graphics/GameView.h"
-#include "lib/ogl.h"
+#include "simulation/BaseEntityCollection.h"
+#include "simulation/Entity.h"
+#include "simulation/EntityManager.h"
 
 #define LOG_CATEGORY "editor"
 
diff --git a/source/tools/atlas/GameInterface/Handlers/TerrainHandlers.cpp b/source/tools/atlas/GameInterface/Handlers/TerrainHandlers.cpp
index c474720c47..8458c6a118 100644
--- a/source/tools/atlas/GameInterface/Handlers/TerrainHandlers.cpp
+++ b/source/tools/atlas/GameInterface/Handlers/TerrainHandlers.cpp
@@ -4,6 +4,7 @@
 
 #include "../CommandProc.h"
 
+#include "graphics/Patch.h"
 #include "graphics/TextureManager.h"
 #include "graphics/TextureEntry.h"
 #include "graphics/Terrain.h"