diff --git a/source/graphics/UnitManager.h b/source/graphics/UnitManager.h
index 4a66c1cf98..235a517af9 100644
--- a/source/graphics/UnitManager.h
+++ b/source/graphics/UnitManager.h
@@ -29,6 +29,7 @@ class CUnit;
 class CVector3D;
 class CEntity;
 class CObjectManager;
+class CStr8;
 
 ///////////////////////////////////////////////////////////////////////////////
 // CUnitManager: simple container class holding all units within the world
@@ -49,7 +50,7 @@ public:
 	void DeleteAll();
 
 	// creates a new unit and adds it to the world
-	CUnit* CreateUnit(const CStr& actorName, CEntity* entity, const std::set<CStr>& selections);
+	CUnit* CreateUnit(const CStr8& actorName, CEntity* entity, const std::set<CStr8>& selections);
 
 	// return the units
 	const std::vector<CUnit*>& GetUnits() const { return m_Units; }
diff --git a/source/main.cpp b/source/main.cpp
index d9c9ac1e5f..6c0402ff40 100644
--- a/source/main.cpp
+++ b/source/main.cpp
@@ -28,8 +28,12 @@ that of Atlas depending on commandline parameters.
 
 // not for any PCH effort, but instead for the (common) definitions
 // included there.
+#define MINIMAL_PCH 2
 #include "lib/precompiled.h"
 
+#include "lib/debug.h"
+#include "lib/lib_errors.h"
+#include "lib/secure_crt.h"
 #include "lib/frequency_filter.h"
 #include "lib/input.h"
 #include "lib/ogl.h"
diff --git a/source/ps/KeyName.h b/source/ps/KeyName.h
index 64364a9ac0..a503b18670 100644
--- a/source/ps/KeyName.h
+++ b/source/ps/KeyName.h
@@ -21,9 +21,11 @@
 // Need SDLK_* enum values.
 #include "lib/external_libraries/sdl.h"
 
+class CStr8;
+
 extern void InitKeyNameMap();
-extern CStr FindKeyName( int keycode );
-extern int FindKeyCode( const CStr& keyname );
+extern CStr8 FindKeyName( int keycode );
+extern int FindKeyCode( const CStr8& keyname );
 
 enum {
 	// 'Keycodes' for the mouse buttons
diff --git a/source/simulation2/components/ICmpPathfinder.h b/source/simulation2/components/ICmpPathfinder.h
index e0e0d14aaf..7a54ad5d73 100644
--- a/source/simulation2/components/ICmpPathfinder.h
+++ b/source/simulation2/components/ICmpPathfinder.h
@@ -22,6 +22,8 @@
 
 #include "simulation2/helpers/Position.h"
 
+#include <vector>
+
 /**
  * Pathfinder algorithm.
  *