diff --git a/Runtime/CPlayMovieBase.hpp b/Runtime/CPlayMovieBase.hpp
index 996baa16e..068ef615a 100644
--- a/Runtime/CPlayMovieBase.hpp
+++ b/Runtime/CPlayMovieBase.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CIOWin.hpp"
-#include "Graphics/CMoviePlayer.hpp"
+#include "Runtime/CIOWin.hpp"
+#include "Runtime/Graphics/CMoviePlayer.hpp"
 
 namespace urde {
 
diff --git a/Runtime/CRandom16.hpp b/Runtime/CRandom16.hpp
index aa66b60fb..3d82cd886 100644
--- a/Runtime/CRandom16.hpp
+++ b/Runtime/CRandom16.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "GCNTypes.hpp"
+#include "Runtime/GCNTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/CRelayTracker.hpp b/Runtime/CRelayTracker.hpp
index c34015918..cd6509d93 100644
--- a/Runtime/CRelayTracker.hpp
+++ b/Runtime/CRelayTracker.hpp
@@ -1,12 +1,15 @@
 #pragma once
 
-#include "IOStreams.hpp"
-#include "World/ScriptObjectSupport.hpp"
-#include "RetroTypes.hpp"
+#include <vector>
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/ScriptObjectSupport.hpp"
 
 namespace urde {
-class CStateManager;
 class CSaveWorld;
+class CStateManager;
+
 #if 0
 struct CMailMessage
 {
diff --git a/Runtime/CResFactory.hpp b/Runtime/CResFactory.hpp
index 2326a7dd0..351e2f383 100644
--- a/Runtime/CResFactory.hpp
+++ b/Runtime/CResFactory.hpp
@@ -1,11 +1,15 @@
 #pragma once
 
+#include <list>
+#include <memory>
 #include <unordered_map>
-#include "IFactory.hpp"
-#include "CResLoader.hpp"
-#include "IVParamObj.hpp"
-#include "MP1/MP1OriginalIDs.hpp"
-#include "CToken.hpp"
+#include <vector>
+
+#include "Runtime/CResLoader.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/IFactory.hpp"
+#include "Runtime/IVParamObj.hpp"
+#include "Runtime/MP1/MP1OriginalIDs.hpp"
 
 namespace urde {
 class IDvdRequest;
diff --git a/Runtime/CResLoader.hpp b/Runtime/CResLoader.hpp
index 85837d8f4..e9edf7b32 100644
--- a/Runtime/CResLoader.hpp
+++ b/Runtime/CResLoader.hpp
@@ -1,14 +1,18 @@
 #pragma once
 
+#include <functional>
+#include <list>
 #include <memory>
 #include <string>
-#include "RetroTypes.hpp"
-#include "CPakFile.hpp"
-#include "IOStreams.hpp"
+#include <vector>
+
+#include "Runtime/CPakFile.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
-struct SObjectTag;
 class IDvdRequest;
+struct SObjectTag;
 
 class CResLoader {
   std::string m_loaderPath;
diff --git a/Runtime/CSaveWorld.hpp b/Runtime/CSaveWorld.hpp
index 030e84341..75403fd74 100644
--- a/Runtime/CSaveWorld.hpp
+++ b/Runtime/CSaveWorld.hpp
@@ -1,8 +1,11 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <vector>
+
 #include "DNACommon/SAVWCommon.hpp"
-#include "CFactoryMgr.hpp"
+
+#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/CScannableObjectInfo.hpp b/Runtime/CScannableObjectInfo.hpp
index 424720951..79096333e 100644
--- a/Runtime/CScannableObjectInfo.hpp
+++ b/Runtime/CScannableObjectInfo.hpp
@@ -1,9 +1,11 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "IFactory.hpp"
-#include "CToken.hpp"
-#include "zeus/CVector2i.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/IFactory.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+
+#include <zeus/CVector2i.hpp>
 
 namespace urde {
 class CScannableObjectInfo {
diff --git a/Runtime/CSimplePool.hpp b/Runtime/CSimplePool.hpp
index 5797c7a30..b237c1f87 100644
--- a/Runtime/CSimplePool.hpp
+++ b/Runtime/CSimplePool.hpp
@@ -1,13 +1,15 @@
 #pragma once
 
-#include "IObjectStore.hpp"
-#include "RetroTypes.hpp"
-#include "IVParamObj.hpp"
 #include <unordered_map>
+#include <vector>
+
+#include "Runtime/IObjectStore.hpp"
+#include "Runtime/IVParamObj.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
-class IFactory;
 class CObjectReference;
+class IFactory;
 
 class CSimplePool : public IObjectStore {
 protected:
diff --git a/Runtime/CStateManager.hpp b/Runtime/CStateManager.hpp
index 05b3cffb1..7788d4f59 100644
--- a/Runtime/CStateManager.hpp
+++ b/Runtime/CStateManager.hpp
@@ -1,49 +1,61 @@
 #pragma once
 
+#include <list>
+#include <map>
 #include <memory>
+#include <optional>
 #include <set>
-#include "CBasics.hpp"
-#include "World/ScriptObjectSupport.hpp"
-#include "GameObjectLists.hpp"
-#include "Camera/CCameraManager.hpp"
-#include "Camera/CCameraFilter.hpp"
-#include "CRandom16.hpp"
-#include "zeus/CAABox.hpp"
-#include "Weapon/CWeaponMgr.hpp"
-#include "World/CAi.hpp"
-#include "CToken.hpp"
-#include "World/ScriptLoader.hpp"
-#include "Input/CFinalInput.hpp"
-#include "CSortedLists.hpp"
-#include "World/CFluidPlaneManager.hpp"
-#include "World/CEnvFxManager.hpp"
-#include "World/CActorModelParticles.hpp"
-#include "Input/CRumbleManager.hpp"
-#include "Camera/CCameraShakeData.hpp"
-#include "Graphics/Shaders/CColoredQuadFilter.hpp"
+#include <string>
+#include <utility>
+#include <vector>
+
+#include "Runtime/CBasics.hpp"
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CSortedLists.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Camera/CCameraFilter.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+#include "Runtime/Camera/CCameraShakeData.hpp"
+#include "Runtime/GameObjectLists.hpp"
+#include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
+#include "Runtime/Input/CFinalInput.hpp"
+#include "Runtime/Input/CRumbleManager.hpp"
+#include "Runtime/Weapon/CWeaponMgr.hpp"
+#include "Runtime/World/CActorModelParticles.hpp"
+#include "Runtime/World/CAi.hpp"
+#include "Runtime/World/CEnvFxManager.hpp"
+#include "Runtime/World/CFluidPlaneManager.hpp"
+#include "Runtime/World/ScriptLoader.hpp"
+#include "Runtime/World/ScriptObjectSupport.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector2i.hpp>
 
 namespace urde {
-class CRelayTracker;
-class CMapWorldInfo;
-class CPlayerState;
-class CWorldTransManager;
-class CObjectList;
-class CSortedListManager;
-class CFluidPlaneManager;
-class CEnvFxManager;
-class CActorModelParticles;
-class CTeamAiTypes;
-class CRumbleManager;
 class CActor;
-class CLight;
+class CActorModelParticles;
 class CDamageInfo;
+class CEnvFxManager;
+class CFluidPlaneManager;
+class CLight;
+class CMapWorldInfo;
 class CMaterialFilter;
-struct CFinalInput;
+class CObjectList;
 class CPlayer;
-class CWorld;
-class CTexture;
-class CWorldLayerState;
+class CPlayerState;
 class CProjectedShadow;
+class CRelayTracker;
+class CRumbleManager;
+class CSortedListManager;
+class CTeamAiTypes;
+class CTexture;
+class CWorld;
+class CWorldLayerState;
+class CWorldTransManager;
+
+struct CFinalInput;
 
 namespace MP1 {
 class CMFGameLoader;
diff --git a/Runtime/CStaticInterference.hpp b/Runtime/CStaticInterference.hpp
index dce04963d..9e2718912 100644
--- a/Runtime/CStaticInterference.hpp
+++ b/Runtime/CStaticInterference.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <vector>
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/CStopwatch.hpp b/Runtime/CStopwatch.hpp
index 0341aaab0..8d1d5fa30 100644
--- a/Runtime/CStopwatch.hpp
+++ b/Runtime/CStopwatch.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
 #include <chrono>
+#include <fmt/format.h>
 
 namespace urde {
 class CStopwatch {
diff --git a/Runtime/CToken.hpp b/Runtime/CToken.hpp
index ac5921532..fc5ee6332 100644
--- a/Runtime/CToken.hpp
+++ b/Runtime/CToken.hpp
@@ -1,19 +1,21 @@
 #pragma once
 
 #include <memory>
-#include "IObj.hpp"
-#include "RetroTypes.hpp"
-#include "IVParamObj.hpp"
-#include "IObjectStore.hpp"
-#include "IFactory.hpp"
+
+#include "Runtime/IFactory.hpp"
+#include "Runtime/IObj.hpp"
+#include "Runtime/IObjectStore.hpp"
+#include "Runtime/IVParamObj.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class IObjectStore;
 
 /** Shared data-structure for CToken references, analogous to std::shared_ptr */
 class CObjectReference {
-  friend class CToken;
   friend class CSimplePool;
+  friend class CToken;
+
   u16 x0_refCount = 0;
   u16 x2_lockCount = 0;
   bool x3_loading = false; /* Rightmost bit of lockCount */
@@ -60,8 +62,9 @@ public:
  *  This class is analogous to std::shared_ptr and C++11 rvalues have been implemented accordingly
  *  (default/empty constructor, move constructor/assign) */
 class CToken {
-  friend class CSimplePool;
   friend class CModel;
+  friend class CSimplePool;
+
   CObjectReference* x0_objRef = nullptr;
   bool x4_lockHeld = false;
 
diff --git a/Runtime/Character/CCharacterFactory.hpp b/Runtime/Character/CCharacterFactory.hpp
index de2881aac..7222b1be0 100644
--- a/Runtime/Character/CCharacterFactory.hpp
+++ b/Runtime/Character/CCharacterFactory.hpp
@@ -1,22 +1,27 @@
 #pragma once
 
-#include "IFactory.hpp"
-#include "IObjFactory.hpp"
-#include "CToken.hpp"
-#include "CSimplePool.hpp"
-#include "CAnimationSet.hpp"
+#include <memory>
+#include <string_view>
+#include <utility>
+#include <vector>
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/IFactory.hpp"
+#include "Runtime/IObjFactory.hpp"
+#include "Runtime/Character/CAnimationSet.hpp"
 
 namespace urde {
-class CSimplePool;
-class CAnimCharacterSet;
-class CCharacterInfo;
-class CCharLayoutInfo;
 class CAdditiveAnimationInfo;
-class CTransitionDatabaseGame;
-class CAnimationManager;
-class CTransitionManager;
 class CAllFormatsAnimSource;
+class CAnimCharacterSet;
 class CAnimData;
+class CAnimationManager;
+class CCharLayoutInfo;
+class CCharacterInfo;
+class CSimplePool;
+class CTransitionDatabaseGame;
+class CTransitionManager;
 
 class CCharacterFactory : public IObjFactory {
 public:
diff --git a/Runtime/GameObjectLists.hpp b/Runtime/GameObjectLists.hpp
index 715b153b9..d4b6a8b0c 100644
--- a/Runtime/GameObjectLists.hpp
+++ b/Runtime/GameObjectLists.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CObjectList.hpp"
+#include "Runtime/CObjectList.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CRasterFont.hpp b/Runtime/GuiSys/CRasterFont.hpp
index 18b44530a..6d7c44b58 100644
--- a/Runtime/GuiSys/CRasterFont.hpp
+++ b/Runtime/GuiSys/CRasterFont.hpp
@@ -1,15 +1,21 @@
 #pragma once
 
-#include "IOStreams.hpp"
-#include "CToken.hpp"
-#include "zeus/CVector2i.hpp"
-#include "CGuiTextSupport.hpp"
-#include "Graphics/CTexture.hpp"
+#include <cstring>
+#include <memory>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/GuiSys/CGuiTextSupport.hpp"
+
+#include <zeus/CVector2i.hpp>
 
 namespace urde {
-class IObjectStore;
 class CDrawStringOptions;
 class CTextRenderBuffer;
+class IObjectStore;
 
 /* NOTE: Is this a good place for CGlyph and CKernPair? */
 class CGlyph {
diff --git a/Runtime/GuiSys/CSaveableState.hpp b/Runtime/GuiSys/CSaveableState.hpp
index c3fe13cb7..6be5b09e1 100644
--- a/Runtime/GuiSys/CSaveableState.hpp
+++ b/Runtime/GuiSys/CSaveableState.hpp
@@ -1,23 +1,27 @@
 #pragma once
 
-#include "CGuiTextSupport.hpp"
-#include "CDrawStringOptions.hpp"
-#include "CToken.hpp"
-#include "zeus/CColor.hpp"
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/GuiSys/CDrawStringOptions.hpp"
+#include "Runtime/GuiSys/CGuiTextSupport.hpp"
+
+#include <zeus/CColor.hpp>
 
 namespace urde {
 class CRasterFont;
 
 class CSaveableState {
-  friend class CTextExecuteBuffer;
   friend class CColorOverrideInstruction;
   friend class CFontInstruction;
+  friend class CGuiTextSupport;
   friend class CLineExtraSpaceInstruction;
-  friend class CTextInstruction;
   friend class CLineSpacingInstruction;
   friend class CRemoveColorOverrideInstruction;
+  friend class CTextExecuteBuffer;
+  friend class CTextInstruction;
   friend class CWordInstruction;
-  friend class CGuiTextSupport;
 
 protected:
   CDrawStringOptions x0_drawStrOpts;
diff --git a/Runtime/GuiSys/CScanDisplay.hpp b/Runtime/GuiSys/CScanDisplay.hpp
index 9afb852bf..52b9512f4 100644
--- a/Runtime/GuiSys/CScanDisplay.hpp
+++ b/Runtime/GuiSys/CScanDisplay.hpp
@@ -1,21 +1,26 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CVector2f.hpp"
-#include "zeus/CQuaternion.hpp"
-#include "CScannableObjectInfo.hpp"
-#include "Graphics/CTexture.hpp"
-#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
+#include <optional>
+#include <utility>
+
+#include "Runtime/CScannableObjectInfo.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CVector2f.hpp>
 
 namespace urde {
+class CAuiImagePane;
+class CGuiFrame;
+class CGuiModel;
 class CGuiTextPane;
 class CGuiWidget;
-class CGuiModel;
-struct CFinalInput;
-class CGuiFrame;
-class CAuiImagePane;
 class CStringTable;
+struct CFinalInput;
 
 class CScanDisplay {
   friend class CHudDecoInterfaceScan;
diff --git a/Runtime/GuiSys/CSplashScreen.hpp b/Runtime/GuiSys/CSplashScreen.hpp
index 88ba3b32e..db4fd2e86 100644
--- a/Runtime/GuiSys/CSplashScreen.hpp
+++ b/Runtime/GuiSys/CSplashScreen.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "CIOWin.hpp"
-#include "CToken.hpp"
-#include "Graphics/CTexture.hpp"
-#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
+#include "Runtime/CIOWin.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CStringTable.hpp b/Runtime/GuiSys/CStringTable.hpp
index b5ac329a3..0e8461e5e 100644
--- a/Runtime/GuiSys/CStringTable.hpp
+++ b/Runtime/GuiSys/CStringTable.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "IFactory.hpp"
+#include <memory>
+
+#include "Runtime/IFactory.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class CStringTable {
diff --git a/Runtime/GuiSys/CTargetingManager.hpp b/Runtime/GuiSys/CTargetingManager.hpp
index e688ccbc0..3f9a62ec0 100644
--- a/Runtime/GuiSys/CTargetingManager.hpp
+++ b/Runtime/GuiSys/CTargetingManager.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CCompoundTargetReticle.hpp"
-#include "COrbitPointMarker.hpp"
+#include "Runtime/GuiSys/CCompoundTargetReticle.hpp"
+#include "Runtime/GuiSys/COrbitPointMarker.hpp"
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/GuiSys/CTextExecuteBuffer.hpp b/Runtime/GuiSys/CTextExecuteBuffer.hpp
index daa884925..e84d1043d 100644
--- a/Runtime/GuiSys/CTextExecuteBuffer.hpp
+++ b/Runtime/GuiSys/CTextExecuteBuffer.hpp
@@ -1,15 +1,20 @@
 #pragma once
 
-#include "CSaveableState.hpp"
-#include "CGuiTextSupport.hpp"
 #include <list>
+#include <vector>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/GuiSys/CGuiTextSupport.hpp"
+#include "Runtime/GuiSys/CSaveableState.hpp"
+
+#include <zeus/CVector2i.hpp>
 
 namespace urde {
-class CInstruction;
-class CFontImageDef;
-class CTextRenderBuffer;
 class CBlockInstruction;
+class CFontImageDef;
+class CInstruction;
 class CLineInstruction;
+class CTextRenderBuffer;
 
 class CTextExecuteBuffer {
   friend class CGuiTextSupport;
diff --git a/Runtime/GuiSys/CTextParser.hpp b/Runtime/GuiSys/CTextParser.hpp
index dc72f69e1..6cf4370cc 100644
--- a/Runtime/GuiSys/CTextParser.hpp
+++ b/Runtime/GuiSys/CTextParser.hpp
@@ -1,10 +1,14 @@
 #pragma once
 
-#include "CGuiTextSupport.hpp"
+#include <utility>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/GuiSys/CGuiTextSupport.hpp"
 
 namespace urde {
-class CTextExecuteBuffer;
 class CFontImageDef;
+class CTextExecuteBuffer;
 
 class CTextParser {
   IObjectStore& x0_store;
diff --git a/Runtime/GuiSys/CTextRenderBuffer.hpp b/Runtime/GuiSys/CTextRenderBuffer.hpp
index bdea85d77..b3ad6806b 100644
--- a/Runtime/GuiSys/CTextRenderBuffer.hpp
+++ b/Runtime/GuiSys/CTextRenderBuffer.hpp
@@ -1,20 +1,28 @@
 #pragma once
 
-#include "zeus/CColor.hpp"
-#include "zeus/CVector2i.hpp"
-#include "zeus/CVector2f.hpp"
-#include "zeus/CMatrix4f.hpp"
-#include "CToken.hpp"
-#include "CFontImageDef.hpp"
-#include "RetroTypes.hpp"
-#include "CGuiWidget.hpp"
-#include "Graphics/Shaders/CTextSupportShader.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include <utility>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/Shaders/CTextSupportShader.hpp"
+#include "Runtime/GuiSys/CFontImageDef.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <hecl/UniformBufferPool.hpp>
+#include <hecl/VertexBufferPool.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector2i.hpp>
 
 namespace urde {
+class CGlyph;
 class CGraphicsPalette;
 class CRasterFont;
-class CGlyph;
 class CTextExecuteBuffer;
 
 using CTextColor = zeus::CColor;
diff --git a/Runtime/GuiSys/CWordBreakTables.cpp b/Runtime/GuiSys/CWordBreakTables.cpp
index 16435515b..d1e377f57 100644
--- a/Runtime/GuiSys/CWordBreakTables.cpp
+++ b/Runtime/GuiSys/CWordBreakTables.cpp
@@ -1,4 +1,9 @@
-#include "CWordBreakTables.hpp"
+#include "Runtime/GuiSys/CWordBreakTables.hpp"
+
+#include <iterator>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/rstl.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CWordBreakTables.hpp b/Runtime/GuiSys/CWordBreakTables.hpp
index 7c4e45f67..119b91cf7 100644
--- a/Runtime/GuiSys/CWordBreakTables.hpp
+++ b/Runtime/GuiSys/CWordBreakTables.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-
 namespace urde {
 
 class CWordBreakTables {
diff --git a/Runtime/IFactory.hpp b/Runtime/IFactory.hpp
index 8696420b8..d850a6962 100644
--- a/Runtime/IFactory.hpp
+++ b/Runtime/IFactory.hpp
@@ -1,17 +1,19 @@
 #pragma once
 
-#include <memory>
 #include <functional>
-#include "RetroTypes.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
-class CVParamTransfer;
-class IObj;
+class CFactoryMgr;
 class CObjectReference;
 class CResLoader;
-class CFactoryMgr;
 class CSimplePool;
+class CVParamTransfer;
 class IDvdRequest;
+class IObj;
 
 using CFactoryFnReturn = std::unique_ptr<IObj>;
 using FFactoryFunc = std::function<CFactoryFnReturn(const urde::SObjectTag& tag, urde::CInputStream& in,
diff --git a/Runtime/IMain.hpp b/Runtime/IMain.hpp
index c86a25592..b84364c51 100644
--- a/Runtime/IMain.hpp
+++ b/Runtime/IMain.hpp
@@ -1,13 +1,15 @@
 #pragma once
-#include "boo/boo.hpp"
-#include "boo/audiodev/IAudioVoiceEngine.hpp"
-#include "hecl/Runtime.hpp"
-#include "amuse/amuse.hpp"
-#include "RetroTypes.hpp"
+
+#include "Runtime/RetroTypes.hpp"
+
+#include <amuse/amuse.hpp>
+#include <boo/boo.hpp>
+#include <boo/audiodev/IAudioVoiceEngine.hpp>
+#include <hecl/Runtime.hpp>
 
 namespace hecl {
-class CVarManager;
 class Console;
+class CVarManager;
 } // namespace hecl
 
 namespace urde {
diff --git a/Runtime/IOStreams.hpp b/Runtime/IOStreams.hpp
index 1f2d7df3c..8837e61fe 100644
--- a/Runtime/IOStreams.hpp
+++ b/Runtime/IOStreams.hpp
@@ -1,10 +1,13 @@
 #pragma once
 
-#include "GCNTypes.hpp"
-#include "athena/IStreamReader.hpp"
-#include "athena/IStreamWriter.hpp"
-#include "athena/MemoryReader.hpp"
-#include "athena/MemoryWriter.hpp"
+#include <memory>
+
+#include "Runtime/GCNTypes.hpp"
+
+#include <athena/IStreamReader.hpp>
+#include <athena/IStreamWriter.hpp>
+#include <athena/MemoryReader.hpp>
+#include <athena/MemoryWriter.hpp>
 #ifdef URDE_ZIP_INPUT_STREAM
 #include <zlib.h>
 #endif
diff --git a/Runtime/IObj.hpp b/Runtime/IObj.hpp
index 74898b636..2c45ed233 100644
--- a/Runtime/IObj.hpp
+++ b/Runtime/IObj.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <memory>
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/IObjFactory.hpp b/Runtime/IObjFactory.hpp
index be272f1e9..c67f3a65b 100644
--- a/Runtime/IObjFactory.hpp
+++ b/Runtime/IObjFactory.hpp
@@ -1,8 +1,5 @@
 #pragma once
 
-#include <memory>
-#include "RetroTypes.hpp"
-
 namespace urde {
 
 class IObjFactory {
diff --git a/Runtime/IObjectStore.hpp b/Runtime/IObjectStore.hpp
index 2d57a98ed..db76a6893 100644
--- a/Runtime/IObjectStore.hpp
+++ b/Runtime/IObjectStore.hpp
@@ -3,10 +3,10 @@
 #include <string_view>
 
 namespace urde {
-struct SObjectTag;
+class CToken;
 class CVParamTransfer;
 class IFactory;
-class CToken;
+struct SObjectTag;
 
 class IObjectStore {
 public:
diff --git a/Runtime/IVParamObj.hpp b/Runtime/IVParamObj.hpp
index 424ec9a19..70e0e817f 100644
--- a/Runtime/IVParamObj.hpp
+++ b/Runtime/IVParamObj.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <memory>
-#include "IObj.hpp"
+#include "Runtime/IObj.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Input/CRumbleGenerator.hpp b/Runtime/Input/CRumbleGenerator.hpp
index bd857334e..d280e0d6c 100644
--- a/Runtime/Input/CRumbleGenerator.hpp
+++ b/Runtime/Input/CRumbleGenerator.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "CRumbleVoice.hpp"
-#include "CInputGenerator.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Input/CInputGenerator.hpp"
+#include "Runtime/Input/CRumbleVoice.hpp"
 
 namespace urde {
 class CRumbleGenerator {
diff --git a/Runtime/Input/CRumbleManager.hpp b/Runtime/Input/CRumbleManager.hpp
index b25e42caa..c820dacec 100644
--- a/Runtime/Input/CRumbleManager.hpp
+++ b/Runtime/Input/CRumbleManager.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "CRumbleGenerator.hpp"
-#include "zeus/CVector3f.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Input/CRumbleGenerator.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/Input/CRumbleVoice.hpp b/Runtime/Input/CRumbleVoice.hpp
index 8be238e63..719aab552 100644
--- a/Runtime/Input/CRumbleVoice.hpp
+++ b/Runtime/Input/CRumbleVoice.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
 
 namespace urde {
 enum class ERumbleFxId {
diff --git a/Runtime/Input/IController.hpp b/Runtime/Input/IController.hpp
index 9bba88e7d..efae5ecd0 100644
--- a/Runtime/Input/IController.hpp
+++ b/Runtime/Input/IController.hpp
@@ -1,7 +1,5 @@
 #pragma once
 
-#include "../RetroTypes.hpp"
-
 namespace urde {
 
 class IController {
diff --git a/Runtime/Particle/CProjectileWeaponDataFactory.hpp b/Runtime/Particle/CProjectileWeaponDataFactory.hpp
index 5299b717a..88d920209 100644
--- a/Runtime/Particle/CProjectileWeaponDataFactory.hpp
+++ b/Runtime/Particle/CProjectileWeaponDataFactory.hpp
@@ -1,10 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CFactoryMgr.hpp"
-#include "IObj.hpp"
-#include "CToken.hpp"
-#include "IOStreams.hpp"
+#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/IObj.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class CWeaponDescription;
diff --git a/Runtime/Particle/CRealElement.hpp b/Runtime/Particle/CRealElement.hpp
index dad6d1daf..da88cceb1 100644
--- a/Runtime/Particle/CRealElement.hpp
+++ b/Runtime/Particle/CRealElement.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
-#include "IElement.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Particle/IElement.hpp"
 
 /* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Real_Elements */
 
diff --git a/Runtime/Particle/CSpawnSystemKeyframeData.hpp b/Runtime/Particle/CSpawnSystemKeyframeData.hpp
index af6f7d22f..f30d580e7 100644
--- a/Runtime/Particle/CSpawnSystemKeyframeData.hpp
+++ b/Runtime/Particle/CSpawnSystemKeyframeData.hpp
@@ -1,7 +1,11 @@
 #pragma once
 
-#include "IOStreams.hpp"
-#include "CToken.hpp"
+#include <utility>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class CSimplePool;
diff --git a/Runtime/Particle/CSwooshDescription.hpp b/Runtime/Particle/CSwooshDescription.hpp
index 67dda3a90..084ac1971 100644
--- a/Runtime/Particle/CSwooshDescription.hpp
+++ b/Runtime/Particle/CSwooshDescription.hpp
@@ -1,12 +1,15 @@
 #pragma once
 
-#include "CParticleDataFactory.hpp"
-#include "CRealElement.hpp"
-#include "CIntElement.hpp"
-#include "CVectorElement.hpp"
-#include "CModVectorElement.hpp"
-#include "CColorElement.hpp"
-#include "CUVElement.hpp"
+#include <memory>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Particle/CColorElement.hpp"
+#include "Runtime/Particle/CIntElement.hpp"
+#include "Runtime/Particle/CModVectorElement.hpp"
+#include "Runtime/Particle/CParticleDataFactory.hpp"
+#include "Runtime/Particle/CRealElement.hpp"
+#include "Runtime/Particle/CUVElement.hpp"
+#include "Runtime/Particle/CVectorElement.hpp"
 
 namespace urde {
 class CSwooshDescription {
diff --git a/Runtime/Particle/CUVElement.hpp b/Runtime/Particle/CUVElement.hpp
index 0c8b052f4..b051bae21 100644
--- a/Runtime/Particle/CUVElement.hpp
+++ b/Runtime/Particle/CUVElement.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
-#include "IElement.hpp"
-#include "CToken.hpp"
-#include "Graphics/CTexture.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Particle/IElement.hpp"
 
 /* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#UV_Elements */
 
diff --git a/Runtime/Particle/CVectorElement.hpp b/Runtime/Particle/CVectorElement.hpp
index cda30aba4..0fae082df 100644
--- a/Runtime/Particle/CVectorElement.hpp
+++ b/Runtime/Particle/CVectorElement.hpp
@@ -1,6 +1,12 @@
 #pragma once
 
-#include "IElement.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Particle/IElement.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 /* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Vector_Elements */
 
diff --git a/Runtime/Particle/CWarp.hpp b/Runtime/Particle/CWarp.hpp
index 92614a7a0..cbb0d4a09 100644
--- a/Runtime/Particle/CWarp.hpp
+++ b/Runtime/Particle/CWarp.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "zeus/CColor.hpp"
-#include "zeus/CVector3f.hpp"
-#include "RetroTypes.hpp"
-#include "CParticleGen.hpp"
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Particle/CParticleGen.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Particle/CWeaponDescription.hpp b/Runtime/Particle/CWeaponDescription.hpp
index 9fb14e4a0..b6a1c2852 100644
--- a/Runtime/Particle/CWeaponDescription.hpp
+++ b/Runtime/Particle/CWeaponDescription.hpp
@@ -1,11 +1,14 @@
 #pragma once
 
-#include "CParticleDataFactory.hpp"
-#include "CRealElement.hpp"
-#include "CIntElement.hpp"
-#include "CVectorElement.hpp"
-#include "CModVectorElement.hpp"
-#include "CColorElement.hpp"
+#include <memory>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Particle/CColorElement.hpp"
+#include "Runtime/Particle/CIntElement.hpp"
+#include "Runtime/Particle/CModVectorElement.hpp"
+#include "Runtime/Particle/CParticleDataFactory.hpp"
+#include "Runtime/Particle/CRealElement.hpp"
+#include "Runtime/Particle/CVectorElement.hpp"
 
 namespace urde {
 class CCollisionResponseData;
diff --git a/Runtime/Particle/IElement.hpp b/Runtime/Particle/IElement.hpp
index 1fbb3d928..e7cecd29a 100644
--- a/Runtime/Particle/IElement.hpp
+++ b/Runtime/Particle/IElement.hpp
@@ -1,10 +1,12 @@
 #pragma once
 
 #include <memory>
-#include "GCNTypes.hpp"
-#include "zeus/CVector3f.hpp"
-#include "zeus/CColor.hpp"
-#include "IOStreams.hpp"
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/IOStreams.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CPhazonBeam.hpp b/Runtime/Weapon/CPhazonBeam.hpp
index d1867504b..8de5486ab 100644
--- a/Runtime/Weapon/CPhazonBeam.hpp
+++ b/Runtime/Weapon/CPhazonBeam.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "CGunWeapon.hpp"
-#include "Graphics/Shaders/CAABoxShader.hpp"
+#include <memory>
+
+#include "Runtime/Graphics/Shaders/CAABoxShader.hpp"
+#include "Runtime/Weapon/CGunWeapon.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CPlasmaBeam.hpp b/Runtime/Weapon/CPlasmaBeam.hpp
index be2594d80..2330515f5 100644
--- a/Runtime/Weapon/CPlasmaBeam.hpp
+++ b/Runtime/Weapon/CPlasmaBeam.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "CGunWeapon.hpp"
+#include <memory>
+#include "Runtime/Weapon/CGunWeapon.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CPlasmaProjectile.hpp b/Runtime/Weapon/CPlasmaProjectile.hpp
index 368daf534..b2e7e7d8d 100644
--- a/Runtime/Weapon/CPlasmaProjectile.hpp
+++ b/Runtime/Weapon/CPlasmaProjectile.hpp
@@ -1,9 +1,19 @@
 #pragma once
 
-#include "Weapon/CBeamProjectile.hpp"
-#include "Weapon/CBeamInfo.hpp"
-#include "World/CDamageInfo.hpp"
-#include "Graphics/Shaders/CColoredStripShader.hpp"
+#include <cstdint>
+#include <memory>
+#include <optional>
+#include <string_view>
+#include <vector>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Graphics/Shaders/CColoredStripShader.hpp"
+#include "Runtime/Weapon/CBeamInfo.hpp"
+#include "Runtime/Weapon/CBeamProjectile.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+
+#include <zeus/CColor.hpp>
 
 namespace urde {
 class CPlasmaProjectile : public CBeamProjectile {
diff --git a/Runtime/Weapon/CPlayerGun.hpp b/Runtime/Weapon/CPlayerGun.hpp
index 870cfadc4..9f8e8b181 100644
--- a/Runtime/Weapon/CPlayerGun.hpp
+++ b/Runtime/Weapon/CPlayerGun.hpp
@@ -1,26 +1,31 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "Character/CActorLights.hpp"
-#include "CFidget.hpp"
-#include "zeus/CTransform.hpp"
-#include "zeus/CAABox.hpp"
-#include "World/CPlayerCameraBob.hpp"
-#include "CGunMotion.hpp"
-#include "CGrappleArm.hpp"
-#include "CAuxWeapon.hpp"
-#include "CPowerBeam.hpp"
-#include "CIceBeam.hpp"
-#include "CWaveBeam.hpp"
-#include "CPlasmaBeam.hpp"
-#include "CPhazonBeam.hpp"
-#include "Particle/CElementGen.hpp"
-#include "Character/CModelData.hpp"
-#include "World/CWorldShadow.hpp"
-#include "World/ScriptObjectSupport.hpp"
-#include "Graphics/CRainSplashGenerator.hpp"
-#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
-#include "Graphics/Shaders/CAABoxShader.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CActorLights.hpp"
+#include "Runtime/Character/CModelData.hpp"
+#include "Runtime/Graphics/CRainSplashGenerator.hpp"
+#include "Runtime/Graphics/Shaders/CAABoxShader.hpp"
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Weapon/CAuxWeapon.hpp"
+#include "Runtime/Weapon/CFidget.hpp"
+#include "Runtime/Weapon/CGrappleArm.hpp"
+#include "Runtime/Weapon/CGunMotion.hpp"
+#include "Runtime/Weapon/CIceBeam.hpp"
+#include "Runtime/Weapon/CPhazonBeam.hpp"
+#include "Runtime/Weapon/CPlasmaBeam.hpp"
+#include "Runtime/Weapon/CPowerBeam.hpp"
+#include "Runtime/Weapon/CWaveBeam.hpp"
+#include "Runtime/World/CPlayerCameraBob.hpp"
+#include "Runtime/World/CWorldShadow.hpp"
+#include "Runtime/World/ScriptObjectSupport.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
 
 namespace urde {
 struct CFinalInput;
diff --git a/Runtime/Weapon/CPowerBeam.hpp b/Runtime/Weapon/CPowerBeam.hpp
index 9ca278cb9..b28c36485 100644
--- a/Runtime/Weapon/CPowerBeam.hpp
+++ b/Runtime/Weapon/CPowerBeam.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "CGunWeapon.hpp"
+#include <memory>
+#include "Runtime/Weapon/CGunWeapon.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CPowerBomb.hpp b/Runtime/Weapon/CPowerBomb.hpp
index 0f969d5a2..1b5a2ac5d 100644
--- a/Runtime/Weapon/CPowerBomb.hpp
+++ b/Runtime/Weapon/CPowerBomb.hpp
@@ -1,11 +1,17 @@
 #pragma once
 
-#include "CWeapon.hpp"
-#include "CToken.hpp"
+#include <memory>
+#include <optional>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Weapon/CWeapon.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
 
 namespace urde {
-
 class CElementGen;
+
 class CPowerBomb : public CWeapon {
   static const zeus::CColor kFadeColor;
   bool x158_24_canStartFilter : 1;
diff --git a/Runtime/Weapon/CProjectileInfo.hpp b/Runtime/Weapon/CProjectileInfo.hpp
index 6d33ea26e..6800fff3e 100644
--- a/Runtime/Weapon/CProjectileInfo.hpp
+++ b/Runtime/Weapon/CProjectileInfo.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
-#include "World/CDamageInfo.hpp"
-#include "Particle/CWeaponDescription.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Particle/CWeaponDescription.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CPlayer;
diff --git a/Runtime/Weapon/CProjectileWeapon.hpp b/Runtime/Weapon/CProjectileWeapon.hpp
index 6355496a4..b24b68433 100644
--- a/Runtime/Weapon/CProjectileWeapon.hpp
+++ b/Runtime/Weapon/CProjectileWeapon.hpp
@@ -1,20 +1,27 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CRandom16.hpp"
-#include "CToken.hpp"
-#include "zeus/CVector3f.hpp"
-#include "Particle/CElementGen.hpp"
-#include "Particle/CParticleSwoosh.hpp"
-#include "Particle/CGenDescription.hpp"
-#include "Particle/CSwooshDescription.hpp"
-#include "Particle/CWeaponDescription.hpp"
-#include "Collision/CCollisionResponseData.hpp"
+#include <memory>
+#include <optional>
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Collision/CCollisionResponseData.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CParticleSwoosh.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/Particle/CWeaponDescription.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CModel;
 class CDecalDescription;
 class CGenDescription;
+class CModel;
 
 class CProjectileWeapon {
   static u16 g_GlobalSeed;
diff --git a/Runtime/Weapon/CTargetableProjectile.hpp b/Runtime/Weapon/CTargetableProjectile.hpp
index 2b9a77aab..fd1b140bf 100644
--- a/Runtime/Weapon/CTargetableProjectile.hpp
+++ b/Runtime/Weapon/CTargetableProjectile.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CEnergyProjectile.hpp"
+#include <optional>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Weapon/CEnergyProjectile.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CWaveBeam.hpp b/Runtime/Weapon/CWaveBeam.hpp
index 83c3ac4ab..9dac530c1 100644
--- a/Runtime/Weapon/CWaveBeam.hpp
+++ b/Runtime/Weapon/CWaveBeam.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CGunWeapon.hpp"
+#include <memory>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Weapon/CGunWeapon.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CWaveBuster.hpp b/Runtime/Weapon/CWaveBuster.hpp
index 2c1e6afb9..c6701b1f5 100644
--- a/Runtime/Weapon/CWaveBuster.hpp
+++ b/Runtime/Weapon/CWaveBuster.hpp
@@ -1,6 +1,13 @@
 #pragma once
 
-#include "CGameProjectile.hpp"
+#include <memory>
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CWeapon.hpp b/Runtime/Weapon/CWeapon.hpp
index 901afa8ce..672ee2002 100644
--- a/Runtime/Weapon/CWeapon.hpp
+++ b/Runtime/Weapon/CWeapon.hpp
@@ -1,9 +1,12 @@
 #pragma once
 
-#include "World/CActor.hpp"
-#include "Weapon/WeaponCommon.hpp"
-#include "World/CDamageInfo.hpp"
-#include "Collision/CMaterialFilter.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Collision/CMaterialFilter.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+#include "Runtime/Weapon/WeaponCommon.hpp"
 
 namespace urde {
 class CWeapon : public CActor {
diff --git a/Runtime/Weapon/CWeaponMgr.hpp b/Runtime/Weapon/CWeaponMgr.hpp
index 1c596a785..41f564e88 100644
--- a/Runtime/Weapon/CWeaponMgr.hpp
+++ b/Runtime/Weapon/CWeaponMgr.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "WeaponCommon.hpp"
+#include <map>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Weapon/WeaponCommon.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CWeaponMode.hpp b/Runtime/Weapon/CWeaponMode.hpp
index cd6cf6513..15131e35d 100644
--- a/Runtime/Weapon/CWeaponMode.hpp
+++ b/Runtime/Weapon/CWeaponMode.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "WeaponCommon.hpp"
+#include "Runtime/Weapon/WeaponCommon.hpp"
 
 namespace urde {
 class CWeaponMode {
diff --git a/Runtime/Weapon/WeaponCommon.hpp b/Runtime/Weapon/WeaponCommon.hpp
index 12166c38e..599911708 100644
--- a/Runtime/Weapon/WeaponCommon.hpp
+++ b/Runtime/Weapon/WeaponCommon.hpp
@@ -1,16 +1,19 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp"
-#include "Audio/CSfxManager.hpp"
 #include <set>
-#include <Runtime/CPlayerState.hpp>
+#include <vector>
+
+#include "DataSpec/DNACommon/Tweaks/ITweakPlayerGun.hpp"
+
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
 
 namespace urde {
 class CAnimData;
-class CToken;
 class CPrimitive;
 class CStateManager;
+class CToken;
 
 enum class EWeaponType {
   None = -1,
diff --git a/Runtime/World/CPatternedInfo.hpp b/Runtime/World/CPatternedInfo.hpp
index e82f27c0a..ee29b63b2 100644
--- a/Runtime/World/CPatternedInfo.hpp
+++ b/Runtime/World/CPatternedInfo.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CDamageInfo.hpp"
-#include "CHealthInfo.hpp"
-#include "CDamageVulnerability.hpp"
-#include "CAnimationParameters.hpp"
-#include "zeus/CVector3f.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CAnimationParameters.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+#include "Runtime/World/CDamageVulnerability.hpp"
+#include "Runtime/World/CHealthInfo.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CPhysicsActor.hpp b/Runtime/World/CPhysicsActor.hpp
index 0184e2264..a4aa4b46f 100644
--- a/Runtime/World/CPhysicsActor.hpp
+++ b/Runtime/World/CPhysicsActor.hpp
@@ -1,7 +1,14 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "Collision/CCollidableAABox.hpp"
+#include <optional>
+
+#include "Runtime/Collision/CCollidableAABox.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CAxisAngle.hpp>
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CCollisionInfoList;
diff --git a/Runtime/World/CPlayerCameraBob.hpp b/Runtime/World/CPlayerCameraBob.hpp
index 65b814257..0ef07cde1 100644
--- a/Runtime/World/CPlayerCameraBob.hpp
+++ b/Runtime/World/CPlayerCameraBob.hpp
@@ -1,9 +1,12 @@
 #pragma once
 
 #include <cfloat>
-#include "RetroTypes.hpp"
-#include "zeus/CVector2f.hpp"
-#include "zeus/CTransform.hpp"
+
+#include "Runtime/RetroTypes.hpp"
+
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>
+#include <zeus/CTransform.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CPlayerEnergyDrain.hpp b/Runtime/World/CPlayerEnergyDrain.hpp
index 55fe5a562..8b4651786 100644
--- a/Runtime/World/CPlayerEnergyDrain.hpp
+++ b/Runtime/World/CPlayerEnergyDrain.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CEnergyDrainSource.hpp"
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CEnergyDrainSource.hpp"
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/World/CProjectedShadow.hpp b/Runtime/World/CProjectedShadow.hpp
index 2282ac8db..f80e130ba 100644
--- a/Runtime/World/CProjectedShadow.hpp
+++ b/Runtime/World/CProjectedShadow.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
-#include "Graphics/CTexture.hpp"
-#include "zeus/CTransform.hpp"
-#include "zeus/CAABox.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/World/CRepulsor.hpp b/Runtime/World/CRepulsor.hpp
index c1e48ba3b..58784a52b 100644
--- a/Runtime/World/CRepulsor.hpp
+++ b/Runtime/World/CRepulsor.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+#include "Runtime/World/CActor.hpp"
+
 namespace urde {
 class CRepulsor : public CActor {
   float xe8_affectRadius;
diff --git a/Runtime/World/CRipple.hpp b/Runtime/World/CRipple.hpp
index 70daf611c..86be8c647 100644
--- a/Runtime/World/CRipple.hpp
+++ b/Runtime/World/CRipple.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CRipple {
diff --git a/Runtime/World/CRippleManager.hpp b/Runtime/World/CRippleManager.hpp
index 9c970b03d..be1b2f2e2 100644
--- a/Runtime/World/CRippleManager.hpp
+++ b/Runtime/World/CRippleManager.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CRipple.hpp"
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CRipple.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScannableParameters.hpp b/Runtime/World/CScannableParameters.hpp
index e2fa4261d..93a6a4739 100644
--- a/Runtime/World/CScannableParameters.hpp
+++ b/Runtime/World/CScannableParameters.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptActor.hpp b/Runtime/World/CScriptActor.hpp
index 4136329c2..4e0854a1c 100644
--- a/Runtime/World/CScriptActor.hpp
+++ b/Runtime/World/CScriptActor.hpp
@@ -1,8 +1,9 @@
 #pragma once
 
-#include "CPhysicsActor.hpp"
-#include "CHealthInfo.hpp"
-#include "CDamageVulnerability.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CDamageVulnerability.hpp"
+#include "Runtime/World/CHealthInfo.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptActorKeyframe.hpp b/Runtime/World/CScriptActorKeyframe.hpp
index 62a3851c9..659ff4f36 100644
--- a/Runtime/World/CScriptActorKeyframe.hpp
+++ b/Runtime/World/CScriptActorKeyframe.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CEntity.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 class CScriptActorKeyframe : public CEntity {
diff --git a/Runtime/World/CScriptActorRotate.hpp b/Runtime/World/CScriptActorRotate.hpp
index 735982f54..8f1893679 100644
--- a/Runtime/World/CScriptActorRotate.hpp
+++ b/Runtime/World/CScriptActorRotate.hpp
@@ -1,7 +1,14 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "zeus/CTransform.hpp"
+#include <map>
+#include <string_view>
+#include <vector>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 struct SRiders;
diff --git a/Runtime/World/CScriptAiJumpPoint.hpp b/Runtime/World/CScriptAiJumpPoint.hpp
index a5dc82f64..31dfce661 100644
--- a/Runtime/World/CScriptAiJumpPoint.hpp
+++ b/Runtime/World/CScriptAiJumpPoint.hpp
@@ -1,6 +1,11 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CAABox.hpp>
 
 namespace urde {
 class CScriptAiJumpPoint : public CActor {
diff --git a/Runtime/World/CScriptAreaAttributes.hpp b/Runtime/World/CScriptAreaAttributes.hpp
index dde2eeab3..0b15bc880 100644
--- a/Runtime/World/CScriptAreaAttributes.hpp
+++ b/Runtime/World/CScriptAreaAttributes.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "CEnvFxManager.hpp"
+#include "Runtime/World/CEntity.hpp"
+#include "Runtime/World/CEnvFxManager.hpp"
 
 namespace urde {
 class CScriptAreaAttributes : public CEntity {
diff --git a/Runtime/World/CScriptBallTrigger.hpp b/Runtime/World/CScriptBallTrigger.hpp
index 8e9b41aa7..eccf60c91 100644
--- a/Runtime/World/CScriptBallTrigger.hpp
+++ b/Runtime/World/CScriptBallTrigger.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CScriptTrigger.hpp"
+#include <string_view>
+
+#include "Runtime/World/CScriptTrigger.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CScriptBallTrigger : public CScriptTrigger {
diff --git a/Runtime/World/CScriptBeam.hpp b/Runtime/World/CScriptBeam.hpp
index 87c450e66..202aab4df 100644
--- a/Runtime/World/CScriptBeam.hpp
+++ b/Runtime/World/CScriptBeam.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "Weapon/CBeamInfo.hpp"
-#include "CDamageInfo.hpp"
+#include <string_view>
+
+#include "Runtime/Weapon/CBeamInfo.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
 
 namespace urde {
 class CWeaponDescription;
diff --git a/Runtime/World/CScriptCameraBlurKeyframe.hpp b/Runtime/World/CScriptCameraBlurKeyframe.hpp
index 872ec3402..2916bd382 100644
--- a/Runtime/World/CScriptCameraBlurKeyframe.hpp
+++ b/Runtime/World/CScriptCameraBlurKeyframe.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "Camera/CCameraFilter.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Camera/CCameraFilter.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 class CScriptCameraBlurKeyframe : public CEntity {
diff --git a/Runtime/World/CScriptCameraFilterKeyframe.hpp b/Runtime/World/CScriptCameraFilterKeyframe.hpp
index 36d2d3677..96e050142 100644
--- a/Runtime/World/CScriptCameraFilterKeyframe.hpp
+++ b/Runtime/World/CScriptCameraFilterKeyframe.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "zeus/CColor.hpp"
-#include "Camera/CCameraFilter.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Camera/CCameraFilter.hpp"
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/CColor.hpp>
 
 namespace urde {
 class CScriptCameraFilterKeyframe : public CEntity {
diff --git a/Runtime/World/CScriptCameraHint.hpp b/Runtime/World/CScriptCameraHint.hpp
index 4a984a707..3826497da 100644
--- a/Runtime/World/CScriptCameraHint.hpp
+++ b/Runtime/World/CScriptCameraHint.hpp
@@ -1,7 +1,14 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "Camera/CBallCamera.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Camera/CBallCamera.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptCameraHintTrigger.hpp b/Runtime/World/CScriptCameraHintTrigger.hpp
index a02c5e44e..68497d278 100644
--- a/Runtime/World/CScriptCameraHintTrigger.hpp
+++ b/Runtime/World/CScriptCameraHintTrigger.hpp
@@ -1,7 +1,12 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "zeus/COBBox.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/COBBox.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CScriptCameraHintTrigger : public CActor {
diff --git a/Runtime/World/CScriptCameraPitchVolume.hpp b/Runtime/World/CScriptCameraPitchVolume.hpp
index e4ce1d688..2b84d2816 100644
--- a/Runtime/World/CScriptCameraPitchVolume.hpp
+++ b/Runtime/World/CScriptCameraPitchVolume.hpp
@@ -1,8 +1,13 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "zeus/CRelAngle.hpp"
-#include "zeus/COBBox.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/COBBox.hpp>
+#include <zeus/CRelAngle.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CScriptCameraPitchVolume : public CActor {
diff --git a/Runtime/World/CScriptCameraShaker.hpp b/Runtime/World/CScriptCameraShaker.hpp
index 4f5fd3ec0..0c6404201 100644
--- a/Runtime/World/CScriptCameraShaker.hpp
+++ b/Runtime/World/CScriptCameraShaker.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "Camera/CCameraShakeData.hpp"
+#include <string_view>
+
+#include "Runtime/Camera/CCameraShakeData.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptCameraWaypoint.hpp b/Runtime/World/CScriptCameraWaypoint.hpp
index ffd3f3f32..26f8d9c51 100644
--- a/Runtime/World/CScriptCameraWaypoint.hpp
+++ b/Runtime/World/CScriptCameraWaypoint.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptColorModulate.hpp b/Runtime/World/CScriptColorModulate.hpp
index a9778e761..bd60316f9 100644
--- a/Runtime/World/CScriptColorModulate.hpp
+++ b/Runtime/World/CScriptColorModulate.hpp
@@ -1,10 +1,15 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "zeus/CColor.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/CColor.hpp>
 
 namespace urde {
 struct CModelFlags;
+
 class CScriptColorModulate : public CEntity {
 public:
   enum class EBlendMode {
diff --git a/Runtime/World/CScriptControllerAction.hpp b/Runtime/World/CScriptControllerAction.hpp
index 8d1a61694..a18dd5838 100644
--- a/Runtime/World/CScriptControllerAction.hpp
+++ b/Runtime/World/CScriptControllerAction.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "Input/ControlMapper.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Input/ControlMapper.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptCounter.hpp b/Runtime/World/CScriptCounter.hpp
index a42819967..95ddd2e5d 100644
--- a/Runtime/World/CScriptCounter.hpp
+++ b/Runtime/World/CScriptCounter.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CEntity.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptCoverPoint.hpp b/Runtime/World/CScriptCoverPoint.hpp
index 15d7e92bd..c644d3832 100644
--- a/Runtime/World/CScriptCoverPoint.hpp
+++ b/Runtime/World/CScriptCoverPoint.hpp
@@ -1,6 +1,12 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <optional>
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CAABox.hpp>
 
 namespace urde {
 class CScriptCoverPoint : public CActor {
diff --git a/Runtime/World/CScriptDamageableTrigger.hpp b/Runtime/World/CScriptDamageableTrigger.hpp
index 3604a9f25..2f7bead29 100644
--- a/Runtime/World/CScriptDamageableTrigger.hpp
+++ b/Runtime/World/CScriptDamageableTrigger.hpp
@@ -1,12 +1,21 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "CFluidPlaneDoor.hpp"
-#include "CHealthInfo.hpp"
-#include "CDamageVulnerability.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CDamageVulnerability.hpp"
+#include "Runtime/World/CFluidPlaneDoor.hpp"
+#include "Runtime/World/CHealthInfo.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CFrustum.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CVisorParameters;
+
 class CScriptDamageableTrigger : public CActor {
 public:
   enum class ECanOrbit {
diff --git a/Runtime/World/CScriptDebris.hpp b/Runtime/World/CScriptDebris.hpp
index 4c2ee77b2..8121c352d 100644
--- a/Runtime/World/CScriptDebris.hpp
+++ b/Runtime/World/CScriptDebris.hpp
@@ -1,6 +1,13 @@
 #pragma once
 
-#include "CPhysicsActor.hpp"
+#include <memory>
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CElementGen;
diff --git a/Runtime/World/CScriptDebugCameraWaypoint.hpp b/Runtime/World/CScriptDebugCameraWaypoint.hpp
index cba74817b..75e9242d6 100644
--- a/Runtime/World/CScriptDebugCameraWaypoint.hpp
+++ b/Runtime/World/CScriptDebugCameraWaypoint.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptDistanceFog.hpp b/Runtime/World/CScriptDistanceFog.hpp
index be9350bf5..0a58dc5c0 100644
--- a/Runtime/World/CScriptDistanceFog.hpp
+++ b/Runtime/World/CScriptDistanceFog.hpp
@@ -1,7 +1,12 @@
 #pragma once
 
-#include "Graphics/CGraphics.hpp"
-#include "CEntity.hpp"
+#include <string_view>
+
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CVector2f.hpp>
 
 namespace urde {
 class CScriptDistanceFog : public CEntity {
diff --git a/Runtime/World/CScriptDock.hpp b/Runtime/World/CScriptDock.hpp
index ab9475d9f..1e0634f0d 100644
--- a/Runtime/World/CScriptDock.hpp
+++ b/Runtime/World/CScriptDock.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CPhysicsActor.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptDockAreaChange.hpp b/Runtime/World/CScriptDockAreaChange.hpp
index 8898cab5e..0e6c07610 100644
--- a/Runtime/World/CScriptDockAreaChange.hpp
+++ b/Runtime/World/CScriptDockAreaChange.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CEntity.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 class CScriptDockAreaChange : public CEntity {
diff --git a/Runtime/World/CScriptDoor.hpp b/Runtime/World/CScriptDoor.hpp
index 12551c41c..e87f15267 100644
--- a/Runtime/World/CScriptDoor.hpp
+++ b/Runtime/World/CScriptDoor.hpp
@@ -1,6 +1,11 @@
 #pragma once
 
-#include "CPhysicsActor.hpp"
+#include <string_view>
+
+#include "Runtime/World/CPhysicsActor.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptEMPulse.hpp b/Runtime/World/CScriptEMPulse.hpp
index 29081d045..6f8e4d5be 100644
--- a/Runtime/World/CScriptEMPulse.hpp
+++ b/Runtime/World/CScriptEMPulse.hpp
@@ -1,11 +1,12 @@
-#ifndef __URDE_CSCRIPTEMPULSE_HPP__
-#define __URDE_CSCRIPTEMPULSE_HPP__
+#pragma once
 
-#include "CActor.hpp"
+#include <memory>
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
-class CGenDescription;
 class CElementGen;
+class CGenDescription;
+
 class CScriptEMPulse : public CActor {
   float xe8_duration;
   float xec_finalRadius;
@@ -32,4 +33,3 @@ public:
   void Touch(CActor&, CStateManager&) override;
 };
 } // namespace urde
-#endif // __URDE_CSCRIPTEMPULSE_HPP__
\ No newline at end of file
diff --git a/Runtime/World/CScriptEffect.hpp b/Runtime/World/CScriptEffect.hpp
index b8dca4a0c..c01f617cb 100644
--- a/Runtime/World/CScriptEffect.hpp
+++ b/Runtime/World/CScriptEffect.hpp
@@ -1,10 +1,15 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <memory>
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 class CElementGen;
 class CParticleElectric;
+
 class CScriptEffect : public CActor {
   static u32 g_NumParticlesUpdating;
   static u32 g_NumParticlesRendered;
diff --git a/Runtime/World/CScriptGenerator.hpp b/Runtime/World/CScriptGenerator.hpp
index 5ec814a65..3b98b7101 100644
--- a/Runtime/World/CScriptGenerator.hpp
+++ b/Runtime/World/CScriptGenerator.hpp
@@ -1,7 +1,11 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "zeus/CVector3f.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptGrapplePoint.hpp b/Runtime/World/CScriptGrapplePoint.hpp
index bab2f6281..13a616670 100644
--- a/Runtime/World/CScriptGrapplePoint.hpp
+++ b/Runtime/World/CScriptGrapplePoint.hpp
@@ -1,7 +1,11 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "CGrappleParameters.hpp"
+#include <string_view>
+
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CGrappleParameters.hpp"
+
+#include <zeus/CAABox.hpp>
 
 namespace urde {
 class CScriptGrapplePoint : public CActor {
diff --git a/Runtime/World/CScriptHUDMemo.hpp b/Runtime/World/CScriptHUDMemo.hpp
index 18b3836c7..78a96f55e 100644
--- a/Runtime/World/CScriptHUDMemo.hpp
+++ b/Runtime/World/CScriptHUDMemo.hpp
@@ -1,10 +1,15 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "CHUDMemoParms.hpp"
-#include "CToken.hpp"
+#include <optional>
+#include <string_view>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/World/CEntity.hpp"
+#include "Runtime/World/CHUDMemoParms.hpp"
+
 namespace urde {
 class CStringTable;
+
 class CScriptHUDMemo : public CEntity {
 public:
   enum class EDisplayType {
diff --git a/Runtime/World/CScriptMazeNode.hpp b/Runtime/World/CScriptMazeNode.hpp
index 79cadf353..f9e147d5a 100644
--- a/Runtime/World/CScriptMazeNode.hpp
+++ b/Runtime/World/CScriptMazeNode.hpp
@@ -1,6 +1,11 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CScriptMazeNode : public CActor {
diff --git a/Runtime/World/CScriptMemoryRelay.hpp b/Runtime/World/CScriptMemoryRelay.hpp
index 6ad43ce4e..594b6da71 100644
--- a/Runtime/World/CScriptMemoryRelay.hpp
+++ b/Runtime/World/CScriptMemoryRelay.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CEntity.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 class CScriptMemoryRelay : public CEntity {
diff --git a/Runtime/World/CScriptMidi.hpp b/Runtime/World/CScriptMidi.hpp
index 2e3192ef3..296d0682f 100644
--- a/Runtime/World/CScriptMidi.hpp
+++ b/Runtime/World/CScriptMidi.hpp
@@ -1,8 +1,11 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "CToken.hpp"
-#include "Audio/CMidiManager.hpp"
+#include <string_view>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Audio/CMidiManager.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptPickup.hpp b/Runtime/World/CScriptPickup.hpp
index c619ff0e2..234d9fde2 100644
--- a/Runtime/World/CScriptPickup.hpp
+++ b/Runtime/World/CScriptPickup.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "CPhysicsActor.hpp"
-#include "CPlayerState.hpp"
+#include <string_view>
+
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
 
 namespace urde {
 class CScriptPickup : public CPhysicsActor {
diff --git a/Runtime/World/CScriptPickupGenerator.hpp b/Runtime/World/CScriptPickupGenerator.hpp
index dffb67818..b05e23a3b 100644
--- a/Runtime/World/CScriptPickupGenerator.hpp
+++ b/Runtime/World/CScriptPickupGenerator.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "zeus/CVector3f.hpp"
+#include <string_view>
+
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CScriptPickupGenerator : public CEntity {
diff --git a/Runtime/World/CScriptPlatform.hpp b/Runtime/World/CScriptPlatform.hpp
index 47364348b..d2dcdcfa8 100644
--- a/Runtime/World/CScriptPlatform.hpp
+++ b/Runtime/World/CScriptPlatform.hpp
@@ -1,10 +1,20 @@
 #pragma once
 
-#include "CPhysicsActor.hpp"
+#include <memory>
 #include <optional>
-#include "CToken.hpp"
-#include "CHealthInfo.hpp"
-#include "CDamageVulnerability.hpp"
+#include <string_view>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/World/CDamageVulnerability.hpp"
+#include "Runtime/World/CHealthInfo.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CCollidableOBBTreeGroup;
diff --git a/Runtime/World/CScriptPlayerActor.hpp b/Runtime/World/CScriptPlayerActor.hpp
index dd1e25090..bbd4d910f 100644
--- a/Runtime/World/CScriptPlayerActor.hpp
+++ b/Runtime/World/CScriptPlayerActor.hpp
@@ -1,7 +1,11 @@
 #pragma once
 
-#include "CScriptActor.hpp"
-#include "CPlayerState.hpp"
+#include <memory>
+#include <string_view>
+
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CScriptActor.hpp"
 
 namespace urde {
 class CScriptPlayerActor : public CScriptActor {
diff --git a/Runtime/World/CScriptPlayerHint.hpp b/Runtime/World/CScriptPlayerHint.hpp
index 0ed5114b5..878148aad 100644
--- a/Runtime/World/CScriptPlayerHint.hpp
+++ b/Runtime/World/CScriptPlayerHint.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptPlayerStateChange.hpp b/Runtime/World/CScriptPlayerStateChange.hpp
index 024bf283f..d8f297460 100644
--- a/Runtime/World/CScriptPlayerStateChange.hpp
+++ b/Runtime/World/CScriptPlayerStateChange.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "World/CEntity.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 class CScriptPlayerStateChange : public CEntity {
diff --git a/Runtime/World/CScriptPointOfInterest.hpp b/Runtime/World/CScriptPointOfInterest.hpp
index bd0a25e31..89ee604e8 100644
--- a/Runtime/World/CScriptPointOfInterest.hpp
+++ b/Runtime/World/CScriptPointOfInterest.hpp
@@ -1,9 +1,11 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 class CScannableParameters;
+
 class CScriptPointOfInterest : public CActor {
 private:
   float xe8_pointSize;
diff --git a/Runtime/World/CScriptRandomRelay.hpp b/Runtime/World/CScriptRandomRelay.hpp
index 33490677b..6a4f9c8c8 100644
--- a/Runtime/World/CScriptRandomRelay.hpp
+++ b/Runtime/World/CScriptRandomRelay.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CEntity.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 class CScriptRandomRelay : public CEntity {
diff --git a/Runtime/World/CScriptRelay.hpp b/Runtime/World/CScriptRelay.hpp
index a2c12ce9a..c280acf1f 100644
--- a/Runtime/World/CScriptRelay.hpp
+++ b/Runtime/World/CScriptRelay.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CEntity.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 class CScriptRelay : public CEntity {
diff --git a/Runtime/World/CScriptRipple.hpp b/Runtime/World/CScriptRipple.hpp
index 3f9decfa9..8f9090acf 100644
--- a/Runtime/World/CScriptRipple.hpp
+++ b/Runtime/World/CScriptRipple.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "zeus/CVector3f.hpp"
+#include <string_view>
+
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CScriptRipple : public CEntity {
diff --git a/Runtime/World/CScriptRoomAcoustics.hpp b/Runtime/World/CScriptRoomAcoustics.hpp
index 371dfa6f4..ca1e0e4b9 100644
--- a/Runtime/World/CScriptRoomAcoustics.hpp
+++ b/Runtime/World/CScriptRoomAcoustics.hpp
@@ -1,9 +1,13 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "amuse/EffectChorus.hpp"
-#include "amuse/EffectDelay.hpp"
-#include "amuse/EffectReverb.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
+
+#include <amuse/EffectChorus.hpp>
+#include <amuse/EffectDelay.hpp>
+#include <amuse/EffectReverb.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptShadowProjector.hpp b/Runtime/World/CScriptShadowProjector.hpp
index 7a61f831d..188369b7e 100644
--- a/Runtime/World/CScriptShadowProjector.hpp
+++ b/Runtime/World/CScriptShadowProjector.hpp
@@ -1,9 +1,16 @@
 #pragma once
 
-#include "World/CActor.hpp"
+#include <memory>
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CProjectedShadow;
+
 class CScriptShadowProjector : public CActor {
   float xe8_scale;
   zeus::CVector3f xec_offset;
diff --git a/Runtime/World/CScriptSound.hpp b/Runtime/World/CScriptSound.hpp
index 8fa637fab..030a3c1d4 100644
--- a/Runtime/World/CScriptSound.hpp
+++ b/Runtime/World/CScriptSound.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptSpawnPoint.hpp b/Runtime/World/CScriptSpawnPoint.hpp
index 5ea69e072..ab867ec6c 100644
--- a/Runtime/World/CScriptSpawnPoint.hpp
+++ b/Runtime/World/CScriptSpawnPoint.hpp
@@ -1,8 +1,13 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "zeus/CTransform.hpp"
-#include "CPlayerState.hpp"
+#include <string_view>
+
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/CTransform.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptSpecialFunction.hpp b/Runtime/World/CScriptSpecialFunction.hpp
index 0db12c6d7..6fcc2f161 100644
--- a/Runtime/World/CScriptSpecialFunction.hpp
+++ b/Runtime/World/CScriptSpecialFunction.hpp
@@ -1,9 +1,16 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "CDamageInfo.hpp"
-#include "zeus/CTransform.hpp"
-#include "zeus/CColor.hpp"
+#include <optional>
+#include <string>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CScriptSpecialFunction : public CActor {
diff --git a/Runtime/World/CScriptSpiderBallAttractionSurface.hpp b/Runtime/World/CScriptSpiderBallAttractionSurface.hpp
index d5889db01..90d31503e 100644
--- a/Runtime/World/CScriptSpiderBallAttractionSurface.hpp
+++ b/Runtime/World/CScriptSpiderBallAttractionSurface.hpp
@@ -1,6 +1,11 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptSpiderBallWaypoint.hpp b/Runtime/World/CScriptSpiderBallWaypoint.hpp
index c43409e2f..7fb1e7ba2 100644
--- a/Runtime/World/CScriptSpiderBallWaypoint.hpp
+++ b/Runtime/World/CScriptSpiderBallWaypoint.hpp
@@ -1,6 +1,12 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <optional>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CAABox.hpp>
 
 namespace urde {
 class CScriptSpiderBallWaypoint : public CActor {
diff --git a/Runtime/World/CScriptSpindleCamera.hpp b/Runtime/World/CScriptSpindleCamera.hpp
index 577a6eee1..8a494b7a0 100644
--- a/Runtime/World/CScriptSpindleCamera.hpp
+++ b/Runtime/World/CScriptSpindleCamera.hpp
@@ -1,6 +1,12 @@
 #pragma once
 
-#include "Camera/CGameCamera.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptSteam.hpp b/Runtime/World/CScriptSteam.hpp
index b93ef11f7..40d83e0a7 100644
--- a/Runtime/World/CScriptSteam.hpp
+++ b/Runtime/World/CScriptSteam.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CScriptTrigger.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CScriptTrigger.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptStreamedMusic.hpp b/Runtime/World/CScriptStreamedMusic.hpp
index fa0408243..e307ddc8d 100644
--- a/Runtime/World/CScriptStreamedMusic.hpp
+++ b/Runtime/World/CScriptStreamedMusic.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
-#include "CEntity.hpp"
+#include <string>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
+class CStateManager;
 
 class CScriptStreamedMusic : public CEntity {
   std::string x34_fileName;
diff --git a/Runtime/World/CScriptSwitch.hpp b/Runtime/World/CScriptSwitch.hpp
index 20c2ea32a..920374725 100644
--- a/Runtime/World/CScriptSwitch.hpp
+++ b/Runtime/World/CScriptSwitch.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "CEntity.hpp"
+#include <string_view>
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 class CScriptSwitch : public CEntity {
diff --git a/Runtime/World/CScriptTargetingPoint.hpp b/Runtime/World/CScriptTargetingPoint.hpp
index 2c8b27ecd..92b61fe12 100644
--- a/Runtime/World/CScriptTargetingPoint.hpp
+++ b/Runtime/World/CScriptTargetingPoint.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "World/CActor.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 class CScriptTargetingPoint : public CActor {
diff --git a/Runtime/World/CScriptTimer.hpp b/Runtime/World/CScriptTimer.hpp
index a9f3cba04..c73f7ea96 100644
--- a/Runtime/World/CScriptTimer.hpp
+++ b/Runtime/World/CScriptTimer.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "CEntity.hpp"
+#include <string_view>
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptTrigger.hpp b/Runtime/World/CScriptTrigger.hpp
index 1167c2086..3fe57b9ac 100644
--- a/Runtime/World/CScriptTrigger.hpp
+++ b/Runtime/World/CScriptTrigger.hpp
@@ -1,7 +1,13 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "CDamageInfo.hpp"
+#include <list>
+#include <string_view>
+
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptVisorFlare.hpp b/Runtime/World/CScriptVisorFlare.hpp
index ba8e55541..718ccb7d4 100644
--- a/Runtime/World/CScriptVisorFlare.hpp
+++ b/Runtime/World/CScriptVisorFlare.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "CVisorFlare.hpp"
+#include <string_view>
+
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CVisorFlare.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptVisorGoo.hpp b/Runtime/World/CScriptVisorGoo.hpp
index 0ecbaab0a..df683ca51 100644
--- a/Runtime/World/CScriptVisorGoo.hpp
+++ b/Runtime/World/CScriptVisorGoo.hpp
@@ -1,6 +1,11 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CColor.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptWater.hpp b/Runtime/World/CScriptWater.hpp
index 09d453bf5..938c2be12 100644
--- a/Runtime/World/CScriptWater.hpp
+++ b/Runtime/World/CScriptWater.hpp
@@ -1,7 +1,19 @@
 #pragma once
 
-#include "CScriptTrigger.hpp"
-#include "CFluidPlaneCPU.hpp"
+#include <list>
+#include <memory>
+#include <optional>
+#include <utility>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/World/CFluidPlaneCPU.hpp"
+#include "Runtime/World/CScriptTrigger.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CFrustum.hpp>
+#include <zeus/CVector3f.hpp>
+
 namespace urde {
 
 class CDamageInfo;
diff --git a/Runtime/World/CScriptWaypoint.hpp b/Runtime/World/CScriptWaypoint.hpp
index d9906c9e6..101fb526e 100644
--- a/Runtime/World/CScriptWaypoint.hpp
+++ b/Runtime/World/CScriptWaypoint.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CScriptWorldTeleporter.hpp b/Runtime/World/CScriptWorldTeleporter.hpp
index c3fd5fa10..f76a21763 100644
--- a/Runtime/World/CScriptWorldTeleporter.hpp
+++ b/Runtime/World/CScriptWorldTeleporter.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "CAnimationParameters.hpp"
-#include "zeus/CVector3f.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CAnimationParameters.hpp"
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CSnakeWeedSwarm.hpp b/Runtime/World/CSnakeWeedSwarm.hpp
index 3a39d9566..10d6b5b16 100644
--- a/Runtime/World/CSnakeWeedSwarm.hpp
+++ b/Runtime/World/CSnakeWeedSwarm.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include "World/CActor.hpp"
-#include "Collision/CCollisionSurface.hpp"
+#include "Runtime/Collision/CCollisionSurface.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 class CAnimationParameters;
+
 class CSnakeWeedSwarm : public CActor {
 public:
   CSnakeWeedSwarm(TUniqueId, bool, std::string_view, const CEntityInfo&, const zeus::CVector3f&, const zeus::CVector3f&,
diff --git a/Runtime/World/CStateMachine.hpp b/Runtime/World/CStateMachine.hpp
index 18c81ccf5..51470b73b 100644
--- a/Runtime/World/CStateMachine.hpp
+++ b/Runtime/World/CStateMachine.hpp
@@ -1,14 +1,18 @@
 #pragma once
 
-#include "CAiFuncMap.hpp"
-#include "IObj.hpp"
-#include "CToken.hpp"
-#include "IOStreams.hpp"
-#include "IObjFactory.hpp"
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/IObj.hpp"
+#include "Runtime/IObjFactory.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/World/CAiFuncMap.hpp"
 
 namespace urde {
 class CAiState;
 class CStateManager;
+
 class CAiTrigger {
   CAiTriggerFunc x0_func;
   float xc_arg = 0.f;
diff --git a/Runtime/World/CTeamAiMgr.hpp b/Runtime/World/CTeamAiMgr.hpp
index 712e10996..79e6aa5e7 100644
--- a/Runtime/World/CTeamAiMgr.hpp
+++ b/Runtime/World/CTeamAiMgr.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "zeus/CVector3f.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/World/CVisorFlare.hpp b/Runtime/World/CVisorFlare.hpp
index 2af7bd481..0f2fecc67 100644
--- a/Runtime/World/CVisorFlare.hpp
+++ b/Runtime/World/CVisorFlare.hpp
@@ -1,13 +1,17 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CToken.hpp"
-#include "zeus/CColor.hpp"
+#include <optional>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <zeus/CColor.hpp>
 
 namespace urde {
-class CTexture;
 class CActor;
 class CStateManager;
+class CTexture;
 
 class CVisorFlare {
 public:
diff --git a/Runtime/World/CVisorParameters.hpp b/Runtime/World/CVisorParameters.hpp
index 95b4576fc..6cc09d1a4 100644
--- a/Runtime/World/CVisorParameters.hpp
+++ b/Runtime/World/CVisorParameters.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/GCNTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CWallCrawlerSwarm.hpp b/Runtime/World/CWallCrawlerSwarm.hpp
index 8c7689deb..f88871b9c 100644
--- a/Runtime/World/CWallCrawlerSwarm.hpp
+++ b/Runtime/World/CWallCrawlerSwarm.hpp
@@ -1,10 +1,21 @@
 #pragma once
 
-#include "World/CActor.hpp"
-#include "Collision/CCollisionSurface.hpp"
-#include "World/CDamageInfo.hpp"
-#include "World/CDamageVulnerability.hpp"
-#include "Particle/CElementGen.hpp"
+#include <memory>
+#include <string_view>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Collision/CCollisionSurface.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+#include "Runtime/World/CDamageVulnerability.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CAreaCollisionCache;
diff --git a/Runtime/World/CWallWalker.hpp b/Runtime/World/CWallWalker.hpp
index 7ee081c41..ab51512d6 100644
--- a/Runtime/World/CWallWalker.hpp
+++ b/Runtime/World/CWallWalker.hpp
@@ -1,8 +1,13 @@
 #pragma once
 
-#include "CPatterned.hpp"
-#include "Collision/CCollisionSurface.hpp"
-#include "Collision/CCollidableSphere.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Collision/CCollidableSphere.hpp"
+#include "Runtime/Collision/CCollisionSurface.hpp"
+#include "Runtime/World/CPatterned.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CWallWalker : public CPatterned {
diff --git a/Runtime/World/CWorld.hpp b/Runtime/World/CWorld.hpp
index 12d7200ec..dbe99f741 100644
--- a/Runtime/World/CWorld.hpp
+++ b/Runtime/World/CWorld.hpp
@@ -1,19 +1,24 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "ScriptObjectSupport.hpp"
-#include "CGameArea.hpp"
-#include "Graphics/CModel.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "AutoMapper/CMapWorld.hpp"
-#include "CEnvFxManager.hpp"
+#include <memory>
+#include <string>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/AutoMapper/CMapWorld.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/World/CEnvFxManager.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/ScriptObjectSupport.hpp"
 
 namespace urde {
+class CAudioGroupSet;
 class CGameArea;
-class IObjectStore;
 class CResFactory;
 class IGameArea;
-class CAudioGroupSet;
+class IObjectStore;
 
 class IWorld {
 public:
diff --git a/Runtime/World/CWorldLight.hpp b/Runtime/World/CWorldLight.hpp
index 6e68075bb..eccf6ffab 100644
--- a/Runtime/World/CWorldLight.hpp
+++ b/Runtime/World/CWorldLight.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "Graphics/CLight.hpp"
+#include "Runtime/Graphics/CLight.hpp"
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CWorldLight {
diff --git a/Runtime/World/CWorldShadow.hpp b/Runtime/World/CWorldShadow.hpp
index b80c8e5ea..993f5389b 100644
--- a/Runtime/World/CWorldShadow.hpp
+++ b/Runtime/World/CWorldShadow.hpp
@@ -1,8 +1,11 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CAABox.hpp"
-#include "Graphics/Shaders/CWorldShadowShader.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/Shaders/CWorldShadowShader.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 #define CWORLDSHADOW_FEEDBACK 0
 
diff --git a/Runtime/World/CWorldTransManager.hpp b/Runtime/World/CWorldTransManager.hpp
index 38e16740c..418452add 100644
--- a/Runtime/World/CWorldTransManager.hpp
+++ b/Runtime/World/CWorldTransManager.hpp
@@ -1,14 +1,21 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CRandom16.hpp"
-#include "Character/CModelData.hpp"
-#include "GuiSys/CGuiTextSupport.hpp"
-#include "Graphics/CLight.hpp"
-#include "Graphics/Shaders/CColoredQuadFilter.hpp"
-#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
-#include "Graphics/Shaders/CCameraBlurFilter.hpp"
-#include "Audio/CSfxManager.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/Character/CModelData.hpp"
+#include "Runtime/Graphics/CLight.hpp"
+#include "Runtime/Graphics/Shaders/CCameraBlurFilter.hpp"
+#include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
+#include "Runtime/GuiSys/CGuiTextSupport.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CSimplePool;
diff --git a/Runtime/World/IGameArea.hpp b/Runtime/World/IGameArea.hpp
index a0addc90d..8d9256e03 100644
--- a/Runtime/World/IGameArea.hpp
+++ b/Runtime/World/IGameArea.hpp
@@ -1,7 +1,14 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CTransform.hpp"
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CEntity;
diff --git a/Runtime/World/ScriptLoader.hpp b/Runtime/World/ScriptLoader.hpp
index 095ccabd4..e0a84d55e 100644
--- a/Runtime/World/ScriptLoader.hpp
+++ b/Runtime/World/ScriptLoader.hpp
@@ -1,20 +1,22 @@
 #pragma once
 
-#include "IOStreams.hpp"
-#include "zeus/CTransform.hpp"
+#include "Runtime/IOStreams.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CStateManager;
-class CEntityInfo;
-class CEntity;
-class CGrappleParameters;
 class CActorParameters;
-class CVisorParameters;
-class CScannableParameters;
-class CLightParameters;
 class CAnimationParameters;
-class CFluidUVMotion;
 class CCameraShakeData;
+class CEntity;
+class CEntityInfo;
+class CFluidUVMotion;
+class CGrappleParameters;
+class CLightParameters;
+class CScannableParameters;
+class CStateManager;
+class CVisorParameters;
 
 typedef CEntity* (*FScriptLoader)(CStateManager& mgr, CInputStream& in, int propCount, const CEntityInfo& info);