diff --git a/source/graphics/HFTracer.h b/source/graphics/HFTracer.h
index de3d3169a2..7bbb1b6fbd 100755
--- a/source/graphics/HFTracer.h
+++ b/source/graphics/HFTracer.h
@@ -12,6 +12,8 @@
 class CVector3D;
 class CTerrain;
 
+#include "lib/types.h"
+
 ///////////////////////////////////////////////////////////////////////////////
 // CHFTracer: a class for determining ray intersections with a heightfield
 class CHFTracer
diff --git a/source/gui/CGUI.h b/source/gui/CGUI.h
index afc2ff5627..8154d5da11 100755
--- a/source/gui/CGUI.h
+++ b/source/gui/CGUI.h
@@ -17,6 +17,7 @@ gee@pyro.nu
 #ifndef CGUI_H
 #define CGUI_H
 
+#include "ps/errors.h"
 ERROR_GROUP(GUI);
 ERROR_TYPE(GUI, JSOpenFailed);
 
diff --git a/source/i18n/Common.h b/source/i18n/Common.h
index 796f58924b..c0c2f33d55 100755
--- a/source/i18n/Common.h
+++ b/source/i18n/Common.h
@@ -5,7 +5,7 @@
 
 #include <string>
 
-#include "Errors.h"
+#include "ps/Errors.h"
 
 namespace I18n
 {
diff --git a/source/ps/CVFSFile.h b/source/ps/CVFSFile.h
index 6b019dbaae..af81ae260f 100755
--- a/source/ps/CVFSFile.h
+++ b/source/ps/CVFSFile.h
@@ -3,6 +3,8 @@
 #include "lib/res/handle.h"
 #include "ps/CStr.h"
 
+#include "ps/errors.h"
+
 ERROR_GROUP(CVFSFile);
 ERROR_TYPE(CVFSFile, LoadFailed);
 ERROR_TYPE(CVFSFile, AlreadyLoaded);
diff --git a/source/ps/Errors.cpp b/source/ps/Errors.cpp
index 19ca57a3b2..18b2a0585b 100755
--- a/source/ps/Errors.cpp
+++ b/source/ps/Errors.cpp
@@ -2,7 +2,7 @@
 
 #include "precompiled.h"
 
-#include "Errors.h"
+#include "ps/Errors.h"
 
 class PSERROR_CVFSFile : public PSERROR {};
 class PSERROR_Error : public PSERROR {};
diff --git a/source/ps/Game.h b/source/ps/Game.h
index 5539ef8887..7b795dfcf7 100755
--- a/source/ps/Game.h
+++ b/source/ps/Game.h
@@ -3,7 +3,7 @@
 
 // Kludge: Our included headers might want to subgroup the Game group, so do it
 // here, before including the other guys
-#include "Errors.h"
+#include "ps/Errors.h"
 ERROR_GROUP(Game);
 
 #include "World.h"
diff --git a/source/ps/StringConvert.cpp b/source/ps/StringConvert.cpp
index dfb94aa70e..4908731c64 100755
--- a/source/ps/StringConvert.cpp
+++ b/source/ps/StringConvert.cpp
@@ -1,6 +1,7 @@
 #include "precompiled.h"
 
 #include "StringConvert.h"
+#include "lib/types.h"
 
 #include <assert.h>
 
diff --git a/source/ps/World.cpp b/source/ps/World.cpp
index f8881b1845..a77627be42 100755
--- a/source/ps/World.cpp
+++ b/source/ps/World.cpp
@@ -2,7 +2,7 @@
 
 #include "CStr.h"
 #include "CLogger.h"
-#include "Errors.h"
+#include "ps/Errors.h"
 
 #include "World.h"
 #include "MapReader.h"
diff --git a/source/ps/Xeromyces.h b/source/ps/Xeromyces.h
index f813373287..2016126ed2 100755
--- a/source/ps/Xeromyces.h
+++ b/source/ps/Xeromyces.h
@@ -11,6 +11,7 @@
 #ifndef _XEROMYCES_H_
 #define _XEROMYCES_H_
 
+#include "ps/errors.h"
 ERROR_GROUP(Xeromyces);
 ERROR_TYPE(Xeromyces, XMLOpenFailed);
 ERROR_TYPE(Xeromyces, XMLParseError);
diff --git a/source/renderer/VertexBuffer.cpp b/source/renderer/VertexBuffer.cpp
index 8f23b36208..9088cc4017 100755
--- a/source/renderer/VertexBuffer.cpp
+++ b/source/renderer/VertexBuffer.cpp
@@ -7,6 +7,7 @@
 ///////////////////////////////////////////////////////////////////////////////
 
 #include "precompiled.h"
+#include "ps/errors.h"
 #include "ogl.h"
 #include "Renderer.h"
 #include "VertexBuffer.h"
diff --git a/source/scripting/ScriptingHost.h b/source/scripting/ScriptingHost.h
index 70c94f3961..883ba3767d 100755
--- a/source/scripting/ScriptingHost.h
+++ b/source/scripting/ScriptingHost.h
@@ -2,7 +2,7 @@
 #ifndef _SCRIPTINGHOST_H_
 #define _SCRIPTINGHOST_H_
 
-#include "Errors.h"
+#include "ps/Errors.h"
 
 ERROR_GROUP(Scripting);
 ERROR_TYPE(Scripting, RuntimeCreationFailed);
diff --git a/source/simulation/Simulation.h b/source/simulation/Simulation.h
index 2878c3043e..7502af8404 100755
--- a/source/simulation/Simulation.h
+++ b/source/simulation/Simulation.h
@@ -1,6 +1,8 @@
 #ifndef _Simulation_H
 #define _Simulation_H
 
+#include "lib/types.h"
+
 class CGame;
 class CGameAttributes;
 class CWorld;
diff --git a/source/simulation/TurnManager.h b/source/simulation/TurnManager.h
index 3b1481d564..182acc9364 100755
--- a/source/simulation/TurnManager.h
+++ b/source/simulation/TurnManager.h
@@ -5,6 +5,8 @@
 //#include "Network/Network.h"
 #include <vector>
 
+#include "lib/types.h"
+
 class CGameRecord;
 class CNetMessage;
 class IMessagePipeEnd;