diff --git a/Runtime/CArchitectureMessage.hpp b/Runtime/CArchitectureMessage.hpp
index 54d62c51c..1a7926879 100644
--- a/Runtime/CArchitectureMessage.hpp
+++ b/Runtime/CArchitectureMessage.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
-#include "GCNTypes.hpp"
-#include "Input/CFinalInput.hpp"
-#include "rstl.hpp"
+#include <memory>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Input/CFinalInput.hpp"
 
 namespace urde {
 class CIOWin;
diff --git a/Runtime/CArchitectureQueue.hpp b/Runtime/CArchitectureQueue.hpp
index ee2010b6f..8aae965a0 100644
--- a/Runtime/CArchitectureQueue.hpp
+++ b/Runtime/CArchitectureQueue.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <list>
-#include "CArchitectureMessage.hpp"
+#include "Runtime/CArchitectureMessage.hpp"
 
 namespace urde {
 
diff --git a/Runtime/CBasics.hpp b/Runtime/CBasics.hpp
index c80118b05..431a2143c 100644
--- a/Runtime/CBasics.hpp
+++ b/Runtime/CBasics.hpp
@@ -4,7 +4,7 @@
 #include <cstdlib>
 #include <chrono>
 
-#include "RetroTypes.hpp"
+#include "Runtime/GCNTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/CDependencyGroup.hpp b/Runtime/CDependencyGroup.hpp
index 08e63d2b7..603fb2471 100644
--- a/Runtime/CDependencyGroup.hpp
+++ b/Runtime/CDependencyGroup.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "CFactoryMgr.hpp"
+#include <vector>
+#include "Runtime/CFactoryMgr.hpp"
 
 namespace urde {
 class CDependencyGroup {
diff --git a/Runtime/CDvdFile.hpp b/Runtime/CDvdFile.hpp
index 668239c82..5cb6007f6 100644
--- a/Runtime/CDvdFile.hpp
+++ b/Runtime/CDvdFile.hpp
@@ -1,13 +1,18 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "athena/FileReader.hpp"
-
-#include <thread>
-#include <mutex>
+#include <atomic>
 #include <condition_variable>
+#include <memory>
+#include <mutex>
+#include <string>
+#include <thread>
 #include <unordered_map>
 
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <athena/FileReader.hpp>
+
 namespace urde {
 
 enum class ESeekOrigin { Begin = 0, Cur = 1, End = 2 };
diff --git a/Runtime/CFactoryMgr.hpp b/Runtime/CFactoryMgr.hpp
index ec29fd9b2..722f30634 100644
--- a/Runtime/CFactoryMgr.hpp
+++ b/Runtime/CFactoryMgr.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
 #include <unordered_map>
-#include "RetroTypes.hpp"
-#include "IOStreams.hpp"
-#include "IFactory.hpp"
+
+#include "Runtime/IFactory.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 struct SObjectTag;
diff --git a/Runtime/CGameAllocator.hpp b/Runtime/CGameAllocator.hpp
index 46bcfaabf..a80500ca9 100644
--- a/Runtime/CGameAllocator.hpp
+++ b/Runtime/CGameAllocator.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <cstddef>
+#include <memory>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class CGameAllocator {
diff --git a/Runtime/CGameHintInfo.hpp b/Runtime/CGameHintInfo.hpp
index 9cfca51a7..7b0e75ee3 100644
--- a/Runtime/CGameHintInfo.hpp
+++ b/Runtime/CGameHintInfo.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "IFactory.hpp"
+#include <string_view>
+#include <vector>
+
+#include "Runtime/IFactory.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class CGameHintInfo {
diff --git a/Runtime/CGameOptions.hpp b/Runtime/CGameOptions.hpp
index 6e2ebff13..cc290db78 100644
--- a/Runtime/CGameOptions.hpp
+++ b/Runtime/CGameOptions.hpp
@@ -1,9 +1,11 @@
 #pragma once
 
 #include <array>
-#include "RetroTypes.hpp"
-#include "Audio/CAudioSys.hpp"
-#include "CSaveWorld.hpp"
+#include <vector>
+
+#include "Runtime/CSaveWorld.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Audio/CAudioSys.hpp"
 
 namespace urde {
 struct CFinalInput;
diff --git a/Runtime/CGameOptionsTouchBar.hpp b/Runtime/CGameOptionsTouchBar.hpp
index 361c4ea7f..302aef98a 100644
--- a/Runtime/CGameOptionsTouchBar.hpp
+++ b/Runtime/CGameOptionsTouchBar.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include <utility>
 #include <memory>
+#include <utility>
 
 namespace urde {
 
diff --git a/Runtime/CGameState.hpp b/Runtime/CGameState.hpp
index 2d573b706..0c422a7c6 100644
--- a/Runtime/CGameState.hpp
+++ b/Runtime/CGameState.hpp
@@ -1,15 +1,18 @@
 #pragma once
 
 #include <memory>
-#include "CBasics.hpp"
-#include "CPlayerState.hpp"
-#include "CGameOptions.hpp"
-#include "CRelayTracker.hpp"
-#include "World/CWorldTransManager.hpp"
-#include "AutoMapper/CMapWorldInfo.hpp"
-#include "World/CWorld.hpp"
+#include <vector>
+
 #include "DataSpec/DNACommon/DNACommon.hpp"
 
+#include "Runtime/CBasics.hpp"
+#include "Runtime/CGameOptions.hpp"
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/CRelayTracker.hpp"
+#include "Runtime/AutoMapper/CMapWorldInfo.hpp"
+#include "Runtime/World/CWorld.hpp"
+#include "Runtime/World/CWorldTransManager.hpp"
+
 namespace urde {
 class CSaveWorldMemory;
 
diff --git a/Runtime/CIOWin.hpp b/Runtime/CIOWin.hpp
index 14b69b75e..4852e719e 100644
--- a/Runtime/CIOWin.hpp
+++ b/Runtime/CIOWin.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
-#include <string>
+#include <functional>
 #include <memory>
+#include <string>
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class CArchitectureMessage;
diff --git a/Runtime/CIOWinManager.hpp b/Runtime/CIOWinManager.hpp
index b2b645995..9aadc67b8 100644
--- a/Runtime/CIOWinManager.hpp
+++ b/Runtime/CIOWinManager.hpp
@@ -1,10 +1,11 @@
 #pragma once
 
-#include <memory>
 #include <list>
-#include "CIOWin.hpp"
-#include "rstl.hpp"
-#include "CArchitectureQueue.hpp"
+#include <memory>
+
+#include "Runtime/CArchitectureQueue.hpp"
+#include "Runtime/CIOWin.hpp"
+#include "Runtime/rstl.hpp"
 
 namespace urde {
 
diff --git a/Runtime/CInGameTweakManagerBase.hpp b/Runtime/CInGameTweakManagerBase.hpp
index 88d69fe58..126098f00 100644
--- a/Runtime/CInGameTweakManagerBase.hpp
+++ b/Runtime/CInGameTweakManagerBase.hpp
@@ -3,7 +3,7 @@
 #include <string>
 #include <vector>
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/CMFGameBase.hpp b/Runtime/CMFGameBase.hpp
index 9599e0f31..c99416549 100644
--- a/Runtime/CMFGameBase.hpp
+++ b/Runtime/CMFGameBase.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CIOWin.hpp"
+#include "Runtime/CIOWin.hpp"
 
 namespace urde {
 
diff --git a/Runtime/CMainFlowBase.hpp b/Runtime/CMainFlowBase.hpp
index 44a9835f8..22a17f39f 100644
--- a/Runtime/CMainFlowBase.hpp
+++ b/Runtime/CMainFlowBase.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CIOWin.hpp"
+#include "Runtime/CIOWin.hpp"
 
 namespace urde {
 
diff --git a/Runtime/CMemoryCardSys.hpp b/Runtime/CMemoryCardSys.hpp
index 64c25c9a2..82b71a236 100644
--- a/Runtime/CMemoryCardSys.hpp
+++ b/Runtime/CMemoryCardSys.hpp
@@ -1,17 +1,23 @@
 #pragma once
 
-#include "CToken.hpp"
-#include "World/CWorld.hpp"
-#include "CGameHintInfo.hpp"
-#include "CSaveWorld.hpp"
-#include "GuiSys/CStringTable.hpp"
-#include "kabufuda/Card.hpp"
+#include <memory>
+#include <optional>
+#include <string>
 #include <vector>
 
+#include "Runtime/CGameHintInfo.hpp"
+#include "Runtime/CSaveWorld.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/GuiSys/CStringTable.hpp"
+#include "Runtime/World/CWorld.hpp"
+
+#include <kabufuda/Card.hpp>
+
 namespace urde {
 class CDummyWorld;
-class CStringTable;
 class CSimplePool;
+class CStringTable;
 
 class CSaveWorldMemory {
   friend class CMemoryCardSys;
diff --git a/Runtime/CObjectList.hpp b/Runtime/CObjectList.hpp
index aa92513bb..15222dae8 100644
--- a/Runtime/CObjectList.hpp
+++ b/Runtime/CObjectList.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "World/CEntity.hpp"
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CEntity.hpp"
 
 namespace urde {
 
diff --git a/Runtime/CPakFile.hpp b/Runtime/CPakFile.hpp
index 0f6b7c084..0ed918f83 100644
--- a/Runtime/CPakFile.hpp
+++ b/Runtime/CPakFile.hpp
@@ -1,11 +1,14 @@
 #pragma once
 
+#include <memory>
+#include <string>
 #include <vector>
-#include "RetroTypes.hpp"
-#include "CStringExtras.hpp"
-#include "CDvdFile.hpp"
-#include "CDvdRequest.hpp"
-#include "CFactoryMgr.hpp"
+
+#include "Runtime/CDvdFile.hpp"
+#include "Runtime/CDvdRequest.hpp"
+#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/CStringExtras.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CAuiEnergyBarT01.hpp b/Runtime/GuiSys/CAuiEnergyBarT01.hpp
index 5144637fd..3c46af65e 100644
--- a/Runtime/GuiSys/CAuiEnergyBarT01.hpp
+++ b/Runtime/GuiSys/CAuiEnergyBarT01.hpp
@@ -1,9 +1,15 @@
 #pragma once
 
-#include "CGuiWidget.hpp"
-#include "CToken.hpp"
-#include "Graphics/CTexture.hpp"
-#include "Graphics/Shaders/CEnergyBarShader.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/Shaders/CEnergyBarShader.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CSimplePool;
diff --git a/Runtime/GuiSys/CAuiImagePane.hpp b/Runtime/GuiSys/CAuiImagePane.hpp
index 3c574f214..528a83417 100644
--- a/Runtime/GuiSys/CAuiImagePane.hpp
+++ b/Runtime/GuiSys/CAuiImagePane.hpp
@@ -1,8 +1,16 @@
 #pragma once
 
-#include "CGuiWidget.hpp"
-#include "CToken.hpp"
-#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>
+
+namespace zeus {
+class CColor;
+}
 
 namespace urde {
 class CSimplePool;
diff --git a/Runtime/GuiSys/CAuiMeter.hpp b/Runtime/GuiSys/CAuiMeter.hpp
index 6934cfb4d..be0b83eae 100644
--- a/Runtime/GuiSys/CAuiMeter.hpp
+++ b/Runtime/GuiSys/CAuiMeter.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CGuiGroup.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/GuiSys/CGuiGroup.hpp"
 
 namespace urde {
 class CSimplePool;
diff --git a/Runtime/GuiSys/CCompoundTargetReticle.hpp b/Runtime/GuiSys/CCompoundTargetReticle.hpp
index 9a2c6b65b..06a6987a5 100644
--- a/Runtime/GuiSys/CCompoundTargetReticle.hpp
+++ b/Runtime/GuiSys/CCompoundTargetReticle.hpp
@@ -1,16 +1,20 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CQuaternion.hpp"
-#include "CToken.hpp"
-#include "Graphics/CLineRenderer.hpp"
-#include "CPlayerState.hpp"
+#include <vector>
+
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CActor;
 class CModel;
-class CStateManager;
 class CScriptGrapplePoint;
+class CStateManager;
 
 class CTargetReticleRenderState {
   TUniqueId x0_target;
diff --git a/Runtime/GuiSys/CConsoleOutputWindow.hpp b/Runtime/GuiSys/CConsoleOutputWindow.hpp
index 3220d798c..65fc0f862 100644
--- a/Runtime/GuiSys/CConsoleOutputWindow.hpp
+++ b/Runtime/GuiSys/CConsoleOutputWindow.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CIOWin.hpp"
+#include "Runtime/CIOWin.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CDrawStringOptions.hpp b/Runtime/GuiSys/CDrawStringOptions.hpp
index 50aa975a6..43523df2f 100644
--- a/Runtime/GuiSys/CDrawStringOptions.hpp
+++ b/Runtime/GuiSys/CDrawStringOptions.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
 #include <vector>
-#include "RetroTypes.hpp"
-#include "CGuiTextSupport.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/GuiSys/CGuiTextSupport.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CErrorOutputWindow.hpp b/Runtime/GuiSys/CErrorOutputWindow.hpp
index 99dad5dc8..2189d77d2 100644
--- a/Runtime/GuiSys/CErrorOutputWindow.hpp
+++ b/Runtime/GuiSys/CErrorOutputWindow.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CIOWin.hpp"
-#include "RetroTypes.hpp"
+#include "Runtime/CIOWin.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CFontImageDef.hpp b/Runtime/GuiSys/CFontImageDef.hpp
index 53d1c6228..80355cd4f 100644
--- a/Runtime/GuiSys/CFontImageDef.hpp
+++ b/Runtime/GuiSys/CFontImageDef.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
 #include <vector>
-#include "CToken.hpp"
-#include "zeus/CVector2f.hpp"
+
+#include "Runtime/CToken.hpp"
+
+#include <zeus/CVector2f.hpp>
 
 namespace urde {
 class CTexture;
diff --git a/Runtime/GuiSys/CFontRenderState.hpp b/Runtime/GuiSys/CFontRenderState.hpp
index 14c30df26..ec42f469f 100644
--- a/Runtime/GuiSys/CFontRenderState.hpp
+++ b/Runtime/GuiSys/CFontRenderState.hpp
@@ -1,18 +1,21 @@
 #pragma once
 
-#include "CGuiTextSupport.hpp"
-#include "CSaveableState.hpp"
-#include "CDrawStringOptions.hpp"
+#include <list>
+#include <vector>
+
+#include "Runtime/GuiSys/CDrawStringOptions.hpp"
+#include "Runtime/GuiSys/CGuiTextSupport.hpp"
+#include "Runtime/GuiSys/CSaveableState.hpp"
 
 namespace urde {
-class CLineInstruction;
 class CBlockInstruction;
+class CLineInstruction;
 
 class CFontRenderState : public CSaveableState {
-  friend class CLineInstruction;
   friend class CBlockInstruction;
-  friend class CTextInstruction;
   friend class CImageInstruction;
+  friend class CLineInstruction;
+  friend class CTextInstruction;
   friend class CWordInstruction;
 
   CBlockInstruction* x88_curBlock = nullptr;
diff --git a/Runtime/GuiSys/CGuiCamera.cpp b/Runtime/GuiSys/CGuiCamera.cpp
index 09e210528..99354dce7 100644
--- a/Runtime/GuiSys/CGuiCamera.cpp
+++ b/Runtime/GuiSys/CGuiCamera.cpp
@@ -1,7 +1,8 @@
-#include "CGuiCamera.hpp"
-#include "CGuiFrame.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "CGuiWidgetDrawParms.hpp"
+#include "Runtime/GuiSys/CGuiCamera.hpp"
+
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiCamera.hpp b/Runtime/GuiSys/CGuiCamera.hpp
index 5b56cdd88..053041699 100644
--- a/Runtime/GuiSys/CGuiCamera.hpp
+++ b/Runtime/GuiSys/CGuiCamera.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "CGuiWidget.hpp"
+#include <memory>
+#include "Runtime/GuiSys/CGuiWidget.hpp"
 
 namespace urde {
 class CSimplePool;
diff --git a/Runtime/GuiSys/CGuiCompoundWidget.cpp b/Runtime/GuiSys/CGuiCompoundWidget.cpp
index a70370850..27aefb6a6 100644
--- a/Runtime/GuiSys/CGuiCompoundWidget.cpp
+++ b/Runtime/GuiSys/CGuiCompoundWidget.cpp
@@ -1,4 +1,4 @@
-#include "CGuiCompoundWidget.hpp"
+#include "Runtime/GuiSys/CGuiCompoundWidget.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiCompoundWidget.hpp b/Runtime/GuiSys/CGuiCompoundWidget.hpp
index 82bd0f1c5..9eaac99c4 100644
--- a/Runtime/GuiSys/CGuiCompoundWidget.hpp
+++ b/Runtime/GuiSys/CGuiCompoundWidget.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CGuiWidget.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiFrame.cpp b/Runtime/GuiSys/CGuiFrame.cpp
index 653b2fcaf..6ab96bc90 100644
--- a/Runtime/GuiSys/CGuiFrame.cpp
+++ b/Runtime/GuiSys/CGuiFrame.cpp
@@ -1,16 +1,18 @@
-#include "CGuiFrame.hpp"
-#include "CGuiWidget.hpp"
-#include "CGuiSys.hpp"
-#include "CGuiHeadWidget.hpp"
-#include "CGuiLight.hpp"
-#include "CGuiCamera.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "Input/CFinalInput.hpp"
-#include "zeus/CColor.hpp"
-#include "CSimplePool.hpp"
-#include "Graphics/CModel.hpp"
-#include "CGuiWidgetDrawParms.hpp"
-#include "CGuiTableGroup.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/GuiSys/CGuiCamera.hpp"
+#include "Runtime/GuiSys/CGuiHeadWidget.hpp"
+#include "Runtime/GuiSys/CGuiLight.hpp"
+#include "Runtime/GuiSys/CGuiSys.hpp"
+#include "Runtime/GuiSys/CGuiTableGroup.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/Input/CFinalInput.hpp"
+
+#include <zeus/CColor.hpp>
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiFrame.hpp b/Runtime/GuiSys/CGuiFrame.hpp
index 091081aca..bae374734 100644
--- a/Runtime/GuiSys/CGuiFrame.hpp
+++ b/Runtime/GuiSys/CGuiFrame.hpp
@@ -1,22 +1,27 @@
 #pragma once
 
-#include "CGuiWidget.hpp"
-#include "CGuiHeadWidget.hpp"
-#include "CGuiWidgetIdDB.hpp"
-#include "IObj.hpp"
-#include "boo/IWindow.hpp"
 #include <array>
+#include <functional>
+#include <memory>
+#include <vector>
+
+#include "Runtime/IObj.hpp"
+#include "Runtime/GuiSys/CGuiHeadWidget.hpp"
+#include "Runtime/GuiSys/CGuiWidgetIdDB.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+
+#include <boo/IWindow.hpp>
 
 namespace urde {
+class CBooModel;
+class CGuiCamera;
+class CGuiLight;
 class CGuiSys;
 class CLight;
-class CGuiCamera;
-struct CFinalInput;
-class CGuiLight;
-class CVParamTransfer;
 class CObjectReference;
 class CSimplePool;
-class CBooModel;
+class CVParamTransfer;
+struct CFinalInput;
 
 class CGuiFrame {
   friend class CGuiSys;
diff --git a/Runtime/GuiSys/CGuiGroup.cpp b/Runtime/GuiSys/CGuiGroup.cpp
index 60c44af16..9a6bda8fc 100644
--- a/Runtime/GuiSys/CGuiGroup.cpp
+++ b/Runtime/GuiSys/CGuiGroup.cpp
@@ -1,4 +1,4 @@
-#include "CGuiGroup.hpp"
+#include "Runtime/GuiSys/CGuiGroup.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiGroup.hpp b/Runtime/GuiSys/CGuiGroup.hpp
index aec2ed07e..9a1bc4f43 100644
--- a/Runtime/GuiSys/CGuiGroup.hpp
+++ b/Runtime/GuiSys/CGuiGroup.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "CGuiCompoundWidget.hpp"
+#include <memory>
+#include "Runtime/GuiSys/CGuiCompoundWidget.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiHeadWidget.cpp b/Runtime/GuiSys/CGuiHeadWidget.cpp
index 5fe50df86..42edb8be9 100644
--- a/Runtime/GuiSys/CGuiHeadWidget.cpp
+++ b/Runtime/GuiSys/CGuiHeadWidget.cpp
@@ -1,5 +1,5 @@
-#include "CGuiHeadWidget.hpp"
-#include "CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiHeadWidget.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiHeadWidget.hpp b/Runtime/GuiSys/CGuiHeadWidget.hpp
index d53064e66..46abbac73 100644
--- a/Runtime/GuiSys/CGuiHeadWidget.hpp
+++ b/Runtime/GuiSys/CGuiHeadWidget.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CGuiWidget.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiLight.cpp b/Runtime/GuiSys/CGuiLight.cpp
index ea58bd75d..c1299931b 100644
--- a/Runtime/GuiSys/CGuiLight.cpp
+++ b/Runtime/GuiSys/CGuiLight.cpp
@@ -1,5 +1,5 @@
-#include "CGuiLight.hpp"
-#include "CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiLight.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiLight.hpp b/Runtime/GuiSys/CGuiLight.hpp
index 3d86bd1cd..2a077df11 100644
--- a/Runtime/GuiSys/CGuiLight.hpp
+++ b/Runtime/GuiSys/CGuiLight.hpp
@@ -1,7 +1,11 @@
 #pragma once
 
-#include "CGuiWidget.hpp"
-#include "Graphics/CLight.hpp"
+#include <memory>
+
+#include "Runtime/Graphics/CLight.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+
+#include <zeus/CColor.hpp>
 
 namespace urde {
 class CSimplePool;
diff --git a/Runtime/GuiSys/CGuiModel.cpp b/Runtime/GuiSys/CGuiModel.cpp
index ab353c1eb..07a0f992a 100644
--- a/Runtime/GuiSys/CGuiModel.cpp
+++ b/Runtime/GuiSys/CGuiModel.cpp
@@ -1,9 +1,10 @@
-#include "CGuiModel.hpp"
-#include "CGuiFrame.hpp"
-#include "CGuiSys.hpp"
-#include "CSimplePool.hpp"
-#include "CGuiWidgetDrawParms.hpp"
-#include "Graphics/CGraphics.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiSys.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiModel.hpp b/Runtime/GuiSys/CGuiModel.hpp
index 9b40c52fd..0174ffd9c 100644
--- a/Runtime/GuiSys/CGuiModel.hpp
+++ b/Runtime/GuiSys/CGuiModel.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
-#include "CGuiWidget.hpp"
-#include "CToken.hpp"
-#include "Graphics/CModel.hpp"
+#include <memory>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
 
 namespace urde {
 class CSimplePool;
diff --git a/Runtime/GuiSys/CGuiObject.cpp b/Runtime/GuiSys/CGuiObject.cpp
index c421e67fc..a0f27fb11 100644
--- a/Runtime/GuiSys/CGuiObject.cpp
+++ b/Runtime/GuiSys/CGuiObject.cpp
@@ -1,8 +1,9 @@
-#include "CGuiObject.hpp"
-#include "CGuiWidgetDrawParms.hpp"
-#include "Graphics/CTexture.hpp"
-#include "CGuiWidget.hpp"
-#include "CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiObject.hpp"
+
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiObject.hpp b/Runtime/GuiSys/CGuiObject.hpp
index 03d0d1f42..06d7b2d11 100644
--- a/Runtime/GuiSys/CGuiObject.hpp
+++ b/Runtime/GuiSys/CGuiObject.hpp
@@ -1,9 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
-#include "zeus/CQuaternion.hpp"
-#include "zeus/CTransform.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 struct CGuiWidgetDrawParms;
diff --git a/Runtime/GuiSys/CGuiPane.cpp b/Runtime/GuiSys/CGuiPane.cpp
index 719d98f6f..5cd7658a5 100644
--- a/Runtime/GuiSys/CGuiPane.cpp
+++ b/Runtime/GuiSys/CGuiPane.cpp
@@ -1,4 +1,4 @@
-#include "CGuiPane.hpp"
+#include "Runtime/GuiSys/CGuiPane.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiPane.hpp b/Runtime/GuiSys/CGuiPane.hpp
index ffcdb390c..90bdb4729 100644
--- a/Runtime/GuiSys/CGuiPane.hpp
+++ b/Runtime/GuiSys/CGuiPane.hpp
@@ -1,7 +1,14 @@
 #pragma once
 
-#include "CGuiWidget.hpp"
-#include "specter/View.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+
+#include <specter/View.hpp>
+
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiSliderGroup.cpp b/Runtime/GuiSys/CGuiSliderGroup.cpp
index 1f63d8e0d..bdb3e49d7 100644
--- a/Runtime/GuiSys/CGuiSliderGroup.cpp
+++ b/Runtime/GuiSys/CGuiSliderGroup.cpp
@@ -1,6 +1,7 @@
-#include "CGuiSliderGroup.hpp"
-#include "Input/CFinalInput.hpp"
-#include "CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiSliderGroup.hpp"
+
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/Input/CFinalInput.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiSliderGroup.hpp b/Runtime/GuiSys/CGuiSliderGroup.hpp
index 4831bd752..f8a20235a 100644
--- a/Runtime/GuiSys/CGuiSliderGroup.hpp
+++ b/Runtime/GuiSys/CGuiSliderGroup.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "CGuiCompoundWidget.hpp"
 #include <functional>
+#include <memory>
+
+#include "Runtime/GuiSys/CGuiCompoundWidget.hpp"
 
 namespace urde {
 class CSimplePool;
diff --git a/Runtime/GuiSys/CGuiSys.cpp b/Runtime/GuiSys/CGuiSys.cpp
index fee97a960..1888da21b 100644
--- a/Runtime/GuiSys/CGuiSys.cpp
+++ b/Runtime/GuiSys/CGuiSys.cpp
@@ -1,21 +1,22 @@
-#include "CGuiSys.hpp"
-#include "CGuiWidget.hpp"
-#include "CGuiHeadWidget.hpp"
-#include "CGuiLight.hpp"
-#include "CGuiCamera.hpp"
-#include "CGuiGroup.hpp"
-#include "CGuiPane.hpp"
-#include "CAuiImagePane.hpp"
-#include "CAuiMeter.hpp"
-#include "CGuiModel.hpp"
-#include "CGuiTableGroup.hpp"
-#include "CGuiSliderGroup.hpp"
-#include "CGuiTextPane.hpp"
-#include "CAuiEnergyBarT01.hpp"
-#include "CTextParser.hpp"
-#include "CSimplePool.hpp"
-#include "CTextExecuteBuffer.hpp"
-#include "CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiSys.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GuiSys/CAuiEnergyBarT01.hpp"
+#include "Runtime/GuiSys/CAuiImagePane.hpp"
+#include "Runtime/GuiSys/CAuiMeter.hpp"
+#include "Runtime/GuiSys/CGuiCamera.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiGroup.hpp"
+#include "Runtime/GuiSys/CGuiHeadWidget.hpp"
+#include "Runtime/GuiSys/CGuiLight.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiPane.hpp"
+#include "Runtime/GuiSys/CGuiSliderGroup.hpp"
+#include "Runtime/GuiSys/CGuiTableGroup.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+#include "Runtime/GuiSys/CTextExecuteBuffer.hpp"
+#include "Runtime/GuiSys/CTextParser.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiSys.hpp b/Runtime/GuiSys/CGuiSys.hpp
index d64a84921..d82cc5aa8 100644
--- a/Runtime/GuiSys/CGuiSys.hpp
+++ b/Runtime/GuiSys/CGuiSys.hpp
@@ -1,22 +1,25 @@
 #pragma once
 
-#include "hecl/hecl.hpp"
-#include <unordered_map>
-#include <vector>
+#include <memory>
 #include <stack>
-#include "CSaveableState.hpp"
-#include "IOStreams.hpp"
+#include <unordered_set>
+#include <vector>
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/GuiSys/CSaveableState.hpp"
+
+#include <hecl/hecl.hpp>
 
 namespace urde {
-class CGuiObject;
-class CVParamTransfer;
-struct SObjectTag;
-class IFactory;
-class CSimplePool;
-class CGuiWidget;
 class CGuiFrame;
-class CTextParser;
+class CGuiObject;
+class CGuiWidget;
+class CSimplePool;
 class CTextExecuteBuffer;
+class CTextParser;
+class CVParamTransfer;
+class IFactory;
+struct SObjectTag;
 
 class CGuiSys {
   friend class CGuiFrame;
diff --git a/Runtime/GuiSys/CGuiTableGroup.cpp b/Runtime/GuiSys/CGuiTableGroup.cpp
index 1889003f4..83a7848c7 100644
--- a/Runtime/GuiSys/CGuiTableGroup.cpp
+++ b/Runtime/GuiSys/CGuiTableGroup.cpp
@@ -1,5 +1,5 @@
-#include "CGuiTableGroup.hpp"
-#include "Input/CFinalInput.hpp"
+#include "Runtime/GuiSys/CGuiTableGroup.hpp"
+#include "Runtime/Input/CFinalInput.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiTableGroup.hpp b/Runtime/GuiSys/CGuiTableGroup.hpp
index 6affde0f9..4f4b3d0f3 100644
--- a/Runtime/GuiSys/CGuiTableGroup.hpp
+++ b/Runtime/GuiSys/CGuiTableGroup.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CGuiCompoundWidget.hpp"
+#include <functional>
+#include <memory>
+
+#include "Runtime/GuiSys/CGuiCompoundWidget.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiTextPane.cpp b/Runtime/GuiSys/CGuiTextPane.cpp
index e39fdd1f4..3a54fad6d 100644
--- a/Runtime/GuiSys/CGuiTextPane.cpp
+++ b/Runtime/GuiSys/CGuiTextPane.cpp
@@ -1,10 +1,11 @@
-#include "CGuiTextPane.hpp"
-#include "CFontImageDef.hpp"
-#include "CGuiFrame.hpp"
-#include "CGuiSys.hpp"
-#include "CGuiWidgetDrawParms.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "Graphics/CGraphicsPalette.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CGraphicsPalette.hpp"
+#include "Runtime/GuiSys/CFontImageDef.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiSys.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiTextPane.hpp b/Runtime/GuiSys/CGuiTextPane.hpp
index bcc67e431..532d585f3 100644
--- a/Runtime/GuiSys/CGuiTextPane.hpp
+++ b/Runtime/GuiSys/CGuiTextPane.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "CGuiPane.hpp"
-#include "CGuiTextSupport.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/GuiSys/CGuiPane.hpp"
+#include "Runtime/GuiSys/CGuiTextSupport.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiTextSupport.cpp b/Runtime/GuiSys/CGuiTextSupport.cpp
index 5eb283589..f42ecd082 100644
--- a/Runtime/GuiSys/CGuiTextSupport.cpp
+++ b/Runtime/GuiSys/CGuiTextSupport.cpp
@@ -1,12 +1,13 @@
-#include "CGuiTextSupport.hpp"
-#include "CSimplePool.hpp"
-#include "CFontImageDef.hpp"
-#include "CGuiSys.hpp"
-#include "CTextExecuteBuffer.hpp"
-#include "CTextParser.hpp"
-#include "Graphics/CGraphicsPalette.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "GuiSys/CRasterFont.hpp"
+#include "Runtime/GuiSys/CGuiTextSupport.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CGraphicsPalette.hpp"
+#include "Runtime/GuiSys/CFontImageDef.hpp"
+#include "Runtime/GuiSys/CGuiSys.hpp"
+#include "Runtime/GuiSys/CRasterFont.hpp"
+#include "Runtime/GuiSys/CTextExecuteBuffer.hpp"
+#include "Runtime/GuiSys/CTextParser.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiTextSupport.hpp b/Runtime/GuiSys/CGuiTextSupport.hpp
index 307de1878..fa7ecd1b6 100644
--- a/Runtime/GuiSys/CGuiTextSupport.hpp
+++ b/Runtime/GuiSys/CGuiTextSupport.hpp
@@ -1,19 +1,23 @@
 #pragma once
 
-#include "zeus/CColor.hpp"
-#include "RetroTypes.hpp"
-#include "CToken.hpp"
-#include "CTextRenderBuffer.hpp"
-#include "CGuiWidget.hpp"
-#include "CSaveWorld.hpp"
+#include <list>
 #include <optional>
 #include <string>
+#include <vector>
+
+#include "Runtime/CSaveWorld.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+#include "Runtime/GuiSys/CTextRenderBuffer.hpp"
+
+#include <zeus/CColor.hpp>
 
 namespace urde {
-class CSimplePool;
 class CRasterFont;
-class CTextRenderBuffer;
+class CSimplePool;
 class CTextExecuteBuffer;
+class CTextRenderBuffer;
 
 enum class EJustification { Left = 0, Center, Right, Full, NLeft, NCenter, NRight, LeftMono, CenterMono, RightMono };
 
diff --git a/Runtime/GuiSys/CGuiWidget.cpp b/Runtime/GuiSys/CGuiWidget.cpp
index 36d03e821..e68fe0ce9 100644
--- a/Runtime/GuiSys/CGuiWidget.cpp
+++ b/Runtime/GuiSys/CGuiWidget.cpp
@@ -1,5 +1,7 @@
-#include "CGuiWidget.hpp"
-#include "CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 static logvisor::Module Log("urde::CGuiWidget");
diff --git a/Runtime/GuiSys/CGuiWidget.hpp b/Runtime/GuiSys/CGuiWidget.hpp
index 7f083ac24..a59585fa9 100644
--- a/Runtime/GuiSys/CGuiWidget.hpp
+++ b/Runtime/GuiSys/CGuiWidget.hpp
@@ -1,9 +1,18 @@
 #pragma once
 
-#include "IOStreams.hpp"
-#include "CGuiObject.hpp"
-#include "zeus/CColor.hpp"
-#include "boo/IWindow.hpp"
+#include <memory>
+#include <optional>
+#include <string>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/GuiSys/CGuiObject.hpp"
+
+#include <boo/IWindow.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CGuiFrame;
diff --git a/Runtime/GuiSys/CGuiWidgetDrawParms.cpp b/Runtime/GuiSys/CGuiWidgetDrawParms.cpp
index be3bc6e81..7c8af0db6 100644
--- a/Runtime/GuiSys/CGuiWidgetDrawParms.cpp
+++ b/Runtime/GuiSys/CGuiWidgetDrawParms.cpp
@@ -1,4 +1,4 @@
-#include "CGuiWidgetDrawParms.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
 
 namespace urde {
 const CGuiWidgetDrawParms CGuiWidgetDrawParms::Default = {};
diff --git a/Runtime/GuiSys/CGuiWidgetDrawParms.hpp b/Runtime/GuiSys/CGuiWidgetDrawParms.hpp
index ebf3b184d..a5938c83c 100644
--- a/Runtime/GuiSys/CGuiWidgetDrawParms.hpp
+++ b/Runtime/GuiSys/CGuiWidgetDrawParms.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "zeus/CVector3f.hpp"
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiWidgetIdDB.cpp b/Runtime/GuiSys/CGuiWidgetIdDB.cpp
index c2dad7e80..162ee1351 100644
--- a/Runtime/GuiSys/CGuiWidgetIdDB.cpp
+++ b/Runtime/GuiSys/CGuiWidgetIdDB.cpp
@@ -1,4 +1,4 @@
-#include "CGuiWidgetIdDB.hpp"
+#include "Runtime/GuiSys/CGuiWidgetIdDB.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CGuiWidgetIdDB.hpp b/Runtime/GuiSys/CGuiWidgetIdDB.hpp
index f95052e8b..799f6efe1 100644
--- a/Runtime/GuiSys/CGuiWidgetIdDB.hpp
+++ b/Runtime/GuiSys/CGuiWidgetIdDB.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <unordered_map>
-#include "RetroTypes.hpp"
+#include "Runtime/GCNTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/GuiSys/CHudBallInterface.hpp b/Runtime/GuiSys/CHudBallInterface.hpp
index 99cd17fc4..818154df4 100644
--- a/Runtime/GuiSys/CHudBallInterface.hpp
+++ b/Runtime/GuiSys/CHudBallInterface.hpp
@@ -1,14 +1,14 @@
 #pragma once
 
-#include "rstl.hpp"
-#include "zeus/CVector3f.hpp"
+#include "Runtime/rstl.hpp"
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CGuiFrame;
-class CGuiWidget;
 class CGuiCamera;
+class CGuiFrame;
 class CGuiModel;
 class CGuiTextPane;
+class CGuiWidget;
 
 class CHudBallInterface {
   CGuiCamera* x0_camera;
diff --git a/Runtime/GuiSys/CHudBossEnergyInterface.hpp b/Runtime/GuiSys/CHudBossEnergyInterface.hpp
index 589926398..1736f2935 100644
--- a/Runtime/GuiSys/CHudBossEnergyInterface.hpp
+++ b/Runtime/GuiSys/CHudBossEnergyInterface.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CGuiFrame;
-class CGuiWidget;
 class CAuiEnergyBarT01;
+class CGuiFrame;
 class CGuiTextPane;
+class CGuiWidget;
 
 class CHudBossEnergyInterface {
   float x0_alpha;
diff --git a/Runtime/GuiSys/CHudDecoInterface.hpp b/Runtime/GuiSys/CHudDecoInterface.hpp
index c91673416..ab4ab5c83 100644
--- a/Runtime/GuiSys/CHudDecoInterface.hpp
+++ b/Runtime/GuiSys/CHudDecoInterface.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "zeus/CMatrix3f.hpp"
-#include "zeus/CQuaternion.hpp"
-#include "zeus/CVector3f.hpp"
-#include "CToken.hpp"
-#include "CScanDisplay.hpp"
-#include "World/CPlayer.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/GuiSys/CScanDisplay.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
+#include <zeus/CMatrix3f.hpp>
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CGuiFrame;
diff --git a/Runtime/GuiSys/CHudEnergyInterface.hpp b/Runtime/GuiSys/CHudEnergyInterface.hpp
index bca5d08f3..2c2fda089 100644
--- a/Runtime/GuiSys/CHudEnergyInterface.hpp
+++ b/Runtime/GuiSys/CHudEnergyInterface.hpp
@@ -1,15 +1,15 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CHudInterface.hpp"
-#include "zeus/CVector3f.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/GuiSys/CHudInterface.hpp"
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CGuiFrame;
-class CGuiWidget;
-class CGuiTextPane;
-class CAuiMeter;
 class CAuiEnergyBarT01;
+class CAuiMeter;
+class CGuiFrame;
+class CGuiTextPane;
+class CGuiWidget;
 
 class CHudEnergyInterface {
   EHudType x0_hudType;
diff --git a/Runtime/GuiSys/CHudFreeLookInterface.hpp b/Runtime/GuiSys/CHudFreeLookInterface.hpp
index a0564777f..fedc6931b 100644
--- a/Runtime/GuiSys/CHudFreeLookInterface.hpp
+++ b/Runtime/GuiSys/CHudFreeLookInterface.hpp
@@ -1,13 +1,13 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CHudInterface.hpp"
-#include "zeus/CTransform.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/GuiSys/CHudInterface.hpp"
+#include <zeus/CTransform.hpp>
 
 namespace urde {
 class CGuiFrame;
-class CGuiWidget;
 class CGuiModel;
+class CGuiWidget;
 
 class IFreeLookInterface {
 public:
diff --git a/Runtime/GuiSys/CHudHelmetInterface.hpp b/Runtime/GuiSys/CHudHelmetInterface.hpp
index a5892d2ea..fc987a420 100644
--- a/Runtime/GuiSys/CHudHelmetInterface.hpp
+++ b/Runtime/GuiSys/CHudHelmetInterface.hpp
@@ -1,12 +1,12 @@
 #pragma once
 
-#include "zeus/CMatrix3f.hpp"
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include <zeus/CMatrix3f.hpp>
 
 namespace urde {
+class CGuiCamera;
 class CGuiFrame;
 class CGuiWidget;
-class CGuiCamera;
 
 class CHudHelmetInterface {
   zeus::CMatrix3f x0_hudLagRotation;
diff --git a/Runtime/GuiSys/CHudMissileInterface.hpp b/Runtime/GuiSys/CHudMissileInterface.hpp
index 7f270eddc..df21193ec 100644
--- a/Runtime/GuiSys/CHudMissileInterface.hpp
+++ b/Runtime/GuiSys/CHudMissileInterface.hpp
@@ -1,16 +1,16 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CHudInterface.hpp"
-#include "zeus/CTransform.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/GuiSys/CHudInterface.hpp"
+#include <zeus/CTransform.hpp>
 
 namespace urde {
-class CStateManager;
-class CGuiFrame;
-class CGuiWidget;
-class CGuiTextPane;
 class CAuiEnergyBarT01;
+class CGuiFrame;
 class CGuiModel;
+class CGuiTextPane;
+class CGuiWidget;
+class CStateManager;
 
 class CHudMissileInterface {
   enum class EInventoryStatus { Normal, Warning, Depleted };
diff --git a/Runtime/GuiSys/CHudRadarInterface.hpp b/Runtime/GuiSys/CHudRadarInterface.hpp
index 5c4800fc8..8a601701b 100644
--- a/Runtime/GuiSys/CHudRadarInterface.hpp
+++ b/Runtime/GuiSys/CHudRadarInterface.hpp
@@ -1,13 +1,18 @@
 #pragma once
 
-#include "CToken.hpp"
-#include "Graphics/CTexture.hpp"
-#include "Graphics/Shaders/CRadarPaintShader.hpp"
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/Shaders/CRadarPaintShader.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
+class CGuiCamera;
 class CGuiFrame;
 class CGuiWidget;
-class CGuiCamera;
 class CStateManager;
 
 class CHudRadarInterface {
diff --git a/Runtime/GuiSys/CHudThreatInterface.hpp b/Runtime/GuiSys/CHudThreatInterface.hpp
index 098e88bc4..2a50de9fa 100644
--- a/Runtime/GuiSys/CHudThreatInterface.hpp
+++ b/Runtime/GuiSys/CHudThreatInterface.hpp
@@ -1,15 +1,15 @@
 #pragma once
 
-#include "CHudInterface.hpp"
-#include "RetroTypes.hpp"
-#include "zeus/CTransform.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/GuiSys/CHudInterface.hpp"
+#include <zeus/CTransform.hpp>
 
 namespace urde {
+class CAuiEnergyBarT01;
 class CGuiFrame;
-class CGuiWidget;
 class CGuiModel;
 class CGuiTextPane;
-class CAuiEnergyBarT01;
+class CGuiWidget;
 
 class CHudThreatInterface {
   enum class EThreatStatus { Normal, Warning, Damage };
diff --git a/Runtime/GuiSys/CHudVisorBeamMenu.hpp b/Runtime/GuiSys/CHudVisorBeamMenu.hpp
index 37e043130..3cf9b45a9 100644
--- a/Runtime/GuiSys/CHudVisorBeamMenu.hpp
+++ b/Runtime/GuiSys/CHudVisorBeamMenu.hpp
@@ -1,13 +1,15 @@
 #pragma once
 
-#include "RetroTypes.hpp"
 #include <cfloat>
 
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+
 namespace urde {
 class CGuiFrame;
-class CGuiWidget;
-class CGuiTextPane;
 class CGuiModel;
+class CGuiTextPane;
+class CGuiWidget;
 
 class CHudVisorBeamMenu {
 public:
diff --git a/Runtime/GuiSys/CInstruction.hpp b/Runtime/GuiSys/CInstruction.hpp
index fe2caef0e..9f8ecb589 100644
--- a/Runtime/GuiSys/CInstruction.hpp
+++ b/Runtime/GuiSys/CInstruction.hpp
@@ -1,14 +1,15 @@
 #pragma once
 
-#include "CToken.hpp"
-#include "CGuiTextSupport.hpp"
-#include "CFontImageDef.hpp"
 #include <vector>
 
+#include "Runtime/CToken.hpp"
+#include "Runtime/GuiSys/CFontImageDef.hpp"
+#include "Runtime/GuiSys/CGuiTextSupport.hpp"
+
 namespace urde {
+class CFontImageDef;
 class CFontRenderState;
 class CTextRenderBuffer;
-class CFontImageDef;
 
 class CInstruction {
 public:
diff --git a/Runtime/GuiSys/COrbitPointMarker.hpp b/Runtime/GuiSys/COrbitPointMarker.hpp
index 2764ea817..b910babfe 100644
--- a/Runtime/GuiSys/COrbitPointMarker.hpp
+++ b/Runtime/GuiSys/COrbitPointMarker.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CToken.hpp"
-#include "Graphics/CModel.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/Input/CFinalInput.hpp b/Runtime/Input/CFinalInput.hpp
index b4f6a3645..7f64a8e02 100644
--- a/Runtime/Input/CFinalInput.hpp
+++ b/Runtime/Input/CFinalInput.hpp
@@ -1,7 +1,8 @@
 #pragma once
 
-#include "../RetroTypes.hpp"
-#include "CKeyboardMouseController.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Input/CKeyboardMouseController.hpp"
+
 #include <boo/inputdev/DolphinSmashAdapter.hpp>
 
 namespace urde {
diff --git a/Runtime/Input/CInputGenerator.hpp b/Runtime/Input/CInputGenerator.hpp
index bca3fde7c..d2dd73e88 100644
--- a/Runtime/Input/CInputGenerator.hpp
+++ b/Runtime/Input/CInputGenerator.hpp
@@ -1,9 +1,12 @@
 #pragma once
 
 #include <atomic>
+#include <mutex>
+
+#include "Runtime/Input/CFinalInput.hpp"
+#include "Runtime/Input/CKeyboardMouseController.hpp"
+
 #include <boo/boo.hpp>
-#include "CFinalInput.hpp"
-#include "CKeyboardMouseController.hpp"
 
 namespace urde {
 class CArchitectureQueue;
diff --git a/Runtime/Input/ControlMapper.hpp b/Runtime/Input/ControlMapper.hpp
index 6015113ff..81a139bd8 100644
--- a/Runtime/Input/ControlMapper.hpp
+++ b/Runtime/Input/ControlMapper.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
-#include "boo/IWindow.hpp"
+#include <type_traits>
+
+#include <boo/IWindow.hpp>
 
 namespace urde {
 struct CFinalInput;
diff --git a/Runtime/Particle/CColorElement.hpp b/Runtime/Particle/CColorElement.hpp
index 22b82a7ff..ddd0fcc02 100644
--- a/Runtime/Particle/CColorElement.hpp
+++ b/Runtime/Particle/CColorElement.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#Color_Elements */
 
diff --git a/Runtime/Particle/CDecal.hpp b/Runtime/Particle/CDecal.hpp
index d51462c56..ee571a535 100644
--- a/Runtime/Particle/CDecal.hpp
+++ b/Runtime/Particle/CDecal.hpp
@@ -1,10 +1,12 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CToken.hpp"
-#include "zeus/CTransform.hpp"
-#include "CDecalDescription.hpp"
-#include "CRandom16.hpp"
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Particle/CDecalDescription.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 struct SQuadDescr;
diff --git a/Runtime/Particle/CDecalDataFactory.hpp b/Runtime/Particle/CDecalDataFactory.hpp
index 0e27f8c9f..c16547dab 100644
--- a/Runtime/Particle/CDecalDataFactory.hpp
+++ b/Runtime/Particle/CDecalDataFactory.hpp
@@ -1,11 +1,11 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CFactoryMgr.hpp"
-#include "IObj.hpp"
-#include "CToken.hpp"
-#include "IOStreams.hpp"
-#include "CDecalDescription.hpp"
+#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/IObj.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Particle/CDecalDescription.hpp"
 
 namespace urde {
 class CSimplePool;
diff --git a/Runtime/Particle/CDecalDescription.hpp b/Runtime/Particle/CDecalDescription.hpp
index 105b70409..ff1d74afa 100644
--- a/Runtime/Particle/CDecalDescription.hpp
+++ b/Runtime/Particle/CDecalDescription.hpp
@@ -1,11 +1,13 @@
 #pragma once
 
-#include "CRealElement.hpp"
-#include "CIntElement.hpp"
-#include "CVectorElement.hpp"
-#include "CColorElement.hpp"
-#include "CUVElement.hpp"
-#include "CParticleDataFactory.hpp"
+#include <memory>
+
+#include "Runtime/Particle/CColorElement.hpp"
+#include "Runtime/Particle/CIntElement.hpp"
+#include "Runtime/Particle/CParticleDataFactory.hpp"
+#include "Runtime/Particle/CRealElement.hpp"
+#include "Runtime/Particle/CUVElement.hpp"
+#include "Runtime/Particle/CVectorElement.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Particle/CDecalManager.hpp b/Runtime/Particle/CDecalManager.hpp
index caad41743..1af0430c1 100644
--- a/Runtime/Particle/CDecalManager.hpp
+++ b/Runtime/Particle/CDecalManager.hpp
@@ -1,11 +1,12 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "rstl.hpp"
 #include <optional>
-#include "CToken.hpp"
-#include "CDecal.hpp"
-#include "zeus/CFrustum.hpp"
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Particle/CDecal.hpp"
+#include <zeus/CFrustum.hpp>
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/Particle/CElectricDescription.hpp b/Runtime/Particle/CElectricDescription.hpp
index f8318f582..54580af28 100644
--- a/Runtime/Particle/CElectricDescription.hpp
+++ b/Runtime/Particle/CElectricDescription.hpp
@@ -1,12 +1,14 @@
 #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/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 CElectricDescription {
diff --git a/Runtime/Particle/CElementGen.hpp b/Runtime/Particle/CElementGen.hpp
index 1c64ce375..f88609c12 100644
--- a/Runtime/Particle/CElementGen.hpp
+++ b/Runtime/Particle/CElementGen.hpp
@@ -1,18 +1,22 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CTransform.hpp"
-#include "zeus/CVector3f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CAABox.hpp"
-#include "CToken.hpp"
-#include "Graphics/CLight.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "CRandom16.hpp"
-#include "CParticleGen.hpp"
-#include "Graphics/Shaders/CElementGenShaders.hpp"
-#include "Graphics/CLineRenderer.hpp"
-#include "Particle/CGenDescription.hpp"
+#include <array>
+#include <vector>
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CLight.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
+#include "Runtime/Graphics/Shaders/CElementGenShaders.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CParticleGen.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CWarp;
diff --git a/Runtime/Particle/CEmitterElement.hpp b/Runtime/Particle/CEmitterElement.hpp
index 93f1e3cfa..454be10d4 100644
--- a/Runtime/Particle/CEmitterElement.hpp
+++ b/Runtime/Particle/CEmitterElement.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "IElement.hpp"
+#include <memory>
+#include "Runtime/Particle/IElement.hpp"
 
 /* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Emitter_Elements */
 
diff --git a/Runtime/Particle/CFlameWarp.hpp b/Runtime/Particle/CFlameWarp.hpp
index a3e2d364a..48faca6fb 100644
--- a/Runtime/Particle/CFlameWarp.hpp
+++ b/Runtime/Particle/CFlameWarp.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CWarp.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Particle/CWarp.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/Particle/CGenDescription.hpp b/Runtime/Particle/CGenDescription.hpp
index 8fe04e09d..f2eef1c3e 100644
--- a/Runtime/Particle/CGenDescription.hpp
+++ b/Runtime/Particle/CGenDescription.hpp
@@ -1,15 +1,16 @@
 #pragma once
 
 #include <memory>
-#include "CRealElement.hpp"
-#include "CIntElement.hpp"
-#include "CVectorElement.hpp"
-#include "CModVectorElement.hpp"
-#include "CColorElement.hpp"
-#include "CUVElement.hpp"
-#include "CEmitterElement.hpp"
-#include "CSpawnSystemKeyframeData.hpp"
-#include "CParticleDataFactory.hpp"
+
+#include "Runtime/Particle/CColorElement.hpp"
+#include "Runtime/Particle/CEmitterElement.hpp"
+#include "Runtime/Particle/CIntElement.hpp"
+#include "Runtime/Particle/CModVectorElement.hpp"
+#include "Runtime/Particle/CParticleDataFactory.hpp"
+#include "Runtime/Particle/CRealElement.hpp"
+#include "Runtime/Particle/CSpawnSystemKeyframeData.hpp"
+#include "Runtime/Particle/CUVElement.hpp"
+#include "Runtime/Particle/CVectorElement.hpp"
 
 /* Documentation at: http://www.metroid2002.com/retromodding/wiki/PART_(File_Format) */
 
diff --git a/Runtime/Particle/CIntElement.hpp b/Runtime/Particle/CIntElement.hpp
index a58460f9a..51bf481c1 100644
--- a/Runtime/Particle/CIntElement.hpp
+++ b/Runtime/Particle/CIntElement.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "IElement.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/Particle/IElement.hpp"
 
 /* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Int_Elements */
 
diff --git a/Runtime/Particle/CModVectorElement.hpp b/Runtime/Particle/CModVectorElement.hpp
index 6e01908f4..18a661540 100644
--- a/Runtime/Particle/CModVectorElement.hpp
+++ b/Runtime/Particle/CModVectorElement.hpp
@@ -1,6 +1,7 @@
 #pragma once
 
-#include "IElement.hpp"
+#include <memory>
+#include "Runtime/Particle/IElement.hpp"
 
 /* Documentation at: http://www.metroid2002.com/retromodding/wiki/Particle_Script#Mod_Vector_Elements */
 
diff --git a/Runtime/Particle/CParticleDataFactory.hpp b/Runtime/Particle/CParticleDataFactory.hpp
index 857194be0..281e6ff19 100644
--- a/Runtime/Particle/CParticleDataFactory.hpp
+++ b/Runtime/Particle/CParticleDataFactory.hpp
@@ -1,25 +1,28 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CFactoryMgr.hpp"
-#include "IObj.hpp"
-#include "CToken.hpp"
-#include "IOStreams.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/IObj.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
-class CGenDescription;
-class CSwooshDescription;
-class CElectricDescription;
-class CSimplePool;
-class CVParamTransfer;
-class CModel;
-class CUVElement;
 class CColorElement;
-class CModVectorElement;
+class CElectricDescription;
 class CEmitterElement;
-class CVectorElement;
-class CRealElement;
+class CGenDescription;
 class CIntElement;
+class CModVectorElement;
+class CModel;
+class CRealElement;
+class CSimplePool;
+class CSwooshDescription;
+class CUVElement;
+class CVParamTransfer;
+class CVectorElement;
 
 struct SParticleModel {
   TLockedToken<CModel> m_token;
diff --git a/Runtime/Particle/CParticleElectric.hpp b/Runtime/Particle/CParticleElectric.hpp
index 22e8cb04e..9cc421928 100644
--- a/Runtime/Particle/CParticleElectric.hpp
+++ b/Runtime/Particle/CParticleElectric.hpp
@@ -1,14 +1,25 @@
 #pragma once
 
-#include "CParticleGen.hpp"
-#include "CToken.hpp"
-#include "CRandom16.hpp"
-#include "Graphics/CLineRenderer.hpp"
+#include <list>
+#include <memory>
+#include <optional>
+#include <vector>
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
+#include "Runtime/Particle/CParticleGen.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CElectricDescription;
-class CParticleSwoosh;
 class CElementGen;
+class CParticleSwoosh;
 
 class CParticleElectric : public CParticleGen {
   static u16 g_GlobalSeed;
diff --git a/Runtime/Particle/CParticleElectricDataFactory.hpp b/Runtime/Particle/CParticleElectricDataFactory.hpp
index 96f53a40e..e71fc4609 100644
--- a/Runtime/Particle/CParticleElectricDataFactory.hpp
+++ b/Runtime/Particle/CParticleElectricDataFactory.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 CElectricDescription;
diff --git a/Runtime/Particle/CParticleGen.hpp b/Runtime/Particle/CParticleGen.hpp
index fee3a6ff2..925f1e80c 100644
--- a/Runtime/Particle/CParticleGen.hpp
+++ b/Runtime/Particle/CParticleGen.hpp
@@ -1,12 +1,15 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "Graphics/CLight.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CVector3f.hpp"
-#include "zeus/CTransform.hpp"
-#include "zeus/CAABox.hpp"
 #include <list>
+#include <optional>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CLight.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CWarp;
diff --git a/Runtime/Particle/CParticleGlobals.hpp b/Runtime/Particle/CParticleGlobals.hpp
index 281877cdd..83233dd05 100644
--- a/Runtime/Particle/CParticleGlobals.hpp
+++ b/Runtime/Particle/CParticleGlobals.hpp
@@ -1,11 +1,14 @@
 #pragma once
 
-#include "zeus/CVector3f.hpp"
-#include "zeus/CVector4f.hpp"
-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "RetroTypes.hpp"
 #include <array>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CVector3f.hpp>
+#include <zeus/CVector4f.hpp>
 
 namespace urde {
 class CElementGen;
diff --git a/Runtime/Particle/CParticleSwoosh.hpp b/Runtime/Particle/CParticleSwoosh.hpp
index 46c85b7c1..a2680198a 100644
--- a/Runtime/Particle/CParticleSwoosh.hpp
+++ b/Runtime/Particle/CParticleSwoosh.hpp
@@ -1,13 +1,21 @@
 #pragma once
 
-#include "CParticleGen.hpp"
-#include "CToken.hpp"
-#include "CRandom16.hpp"
-#include "Graphics/CTexture.hpp"
-#include "Graphics/CLineRenderer.hpp"
-#include "CUVElement.hpp"
+#include <memory>
+#include <vector>
+
 #include "DataSpec/DNACommon/GX.hpp"
-#include "Graphics/Shaders/CParticleSwooshShaders.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp"
+#include "Runtime/Particle/CParticleGen.hpp"
+#include "Runtime/Particle/CUVElement.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CSwooshDescription;
diff --git a/Runtime/Particle/CParticleSwooshDataFactory.hpp b/Runtime/Particle/CParticleSwooshDataFactory.hpp
index c23432f6c..d55d5ab05 100644
--- a/Runtime/Particle/CParticleSwooshDataFactory.hpp
+++ b/Runtime/Particle/CParticleSwooshDataFactory.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 CSwooshDescription;
diff --git a/Runtime/Weapon/CAuxWeapon.hpp b/Runtime/Weapon/CAuxWeapon.hpp
index 165a0cfbc..05bb59a23 100644
--- a/Runtime/Weapon/CAuxWeapon.hpp
+++ b/Runtime/Weapon/CAuxWeapon.hpp
@@ -1,10 +1,13 @@
 #pragma once
 
-#include "CPlayerState.hpp"
-#include "RetroTypes.hpp"
-#include "CStateManager.hpp"
-#include "CGunWeapon.hpp"
-#include "CWeapon.hpp"
+#include <memory>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Weapon/CGunWeapon.hpp"
+#include "Runtime/Weapon/CWeapon.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CBeamInfo.hpp b/Runtime/Weapon/CBeamInfo.hpp
index f374aefef..d87971799 100644
--- a/Runtime/Weapon/CBeamInfo.hpp
+++ b/Runtime/Weapon/CBeamInfo.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "IOStreams.hpp"
-#include "zeus/CColor.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include <zeus/CColor.hpp>
 
 namespace urde {
 class CBeamInfo {
diff --git a/Runtime/Weapon/CBeamProjectile.hpp b/Runtime/Weapon/CBeamProjectile.hpp
index a9fcf573c..775cb2a4a 100644
--- a/Runtime/Weapon/CBeamProjectile.hpp
+++ b/Runtime/Weapon/CBeamProjectile.hpp
@@ -1,6 +1,12 @@
 #pragma once
 
-#include "Weapon/CGameProjectile.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
+
 namespace urde {
 class CBeamProjectile : public CGameProjectile {
 public:
diff --git a/Runtime/Weapon/CBomb.hpp b/Runtime/Weapon/CBomb.hpp
index c3c6f2aea..bde620c07 100644
--- a/Runtime/Weapon/CBomb.hpp
+++ b/Runtime/Weapon/CBomb.hpp
@@ -1,7 +1,13 @@
 #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/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CElectricBeamProjectile.hpp b/Runtime/Weapon/CElectricBeamProjectile.hpp
index e89dc18d1..ce6c506e1 100644
--- a/Runtime/Weapon/CElectricBeamProjectile.hpp
+++ b/Runtime/Weapon/CElectricBeamProjectile.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
-#include "CBeamProjectile.hpp"
+#include <memory>
+
+#include "Runtime/Weapon/CBeamProjectile.hpp"
 
 namespace urde {
 struct SElectricBeamInfo {
diff --git a/Runtime/Weapon/CFidget.hpp b/Runtime/Weapon/CFidget.hpp
index 13792cdea..5158221b4 100644
--- a/Runtime/Weapon/CFidget.hpp
+++ b/Runtime/Weapon/CFidget.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CGunMotion.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Weapon/CGunMotion.hpp"
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/Weapon/CFlameInfo.hpp b/Runtime/Weapon/CFlameInfo.hpp
index 4c5cf7f51..03f754264 100644
--- a/Runtime/Weapon/CFlameInfo.hpp
+++ b/Runtime/Weapon/CFlameInfo.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "Weapon/CGameProjectile.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
 
 namespace urde {
 class CFlameInfo {
diff --git a/Runtime/Weapon/CFlameThrower.hpp b/Runtime/Weapon/CFlameThrower.hpp
index 9d7a6462e..10e846e2f 100644
--- a/Runtime/Weapon/CFlameThrower.hpp
+++ b/Runtime/Weapon/CFlameThrower.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "Weapon/CGameProjectile.hpp"
-#include "Particle/CFlameWarp.hpp"
+#include <memory>
+
+#include "Runtime/Particle/CFlameWarp.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
 
 namespace urde {
 class CFlameInfo;
diff --git a/Runtime/Weapon/CGSComboFire.hpp b/Runtime/Weapon/CGSComboFire.hpp
index 5dbb1f390..bdac15732 100644
--- a/Runtime/Weapon/CGSComboFire.hpp
+++ b/Runtime/Weapon/CGSComboFire.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CGSFidget.hpp b/Runtime/Weapon/CGSFidget.hpp
index f034dcc2a..1317089be 100644
--- a/Runtime/Weapon/CGSFidget.hpp
+++ b/Runtime/Weapon/CGSFidget.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CToken.hpp"
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class CAnimData;
diff --git a/Runtime/Weapon/CGSFreeLook.hpp b/Runtime/Weapon/CGSFreeLook.hpp
index 55e2daca3..b7e53d8ef 100644
--- a/Runtime/Weapon/CGSFreeLook.hpp
+++ b/Runtime/Weapon/CGSFreeLook.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CGameProjectile.hpp b/Runtime/Weapon/CGameProjectile.hpp
index c62d2b3df..31f482089 100644
--- a/Runtime/Weapon/CGameProjectile.hpp
+++ b/Runtime/Weapon/CGameProjectile.hpp
@@ -1,13 +1,19 @@
 #pragma once
 
-#include "Collision/CMaterialList.hpp"
-#include "Weapon/CWeaponMode.hpp"
-#include "Weapon/CWeapon.hpp"
-#include "World/CDamageInfo.hpp"
-#include "RetroTypes.hpp"
-#include "CToken.hpp"
-#include "Weapon/CProjectileWeapon.hpp"
-#include "Collision/CRayCastResult.hpp"
+#include <optional>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Collision/CMaterialList.hpp"
+#include "Runtime/Collision/CRayCastResult.hpp"
+#include "Runtime/Weapon/CProjectileWeapon.hpp"
+#include "Runtime/Weapon/CWeapon.hpp"
+#include "Runtime/Weapon/CWeaponMode.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CGenDescription;
diff --git a/Runtime/Weapon/CGrappleArm.hpp b/Runtime/Weapon/CGrappleArm.hpp
index 4b7378ffe..0c19da3d5 100644
--- a/Runtime/Weapon/CGrappleArm.hpp
+++ b/Runtime/Weapon/CGrappleArm.hpp
@@ -1,17 +1,23 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
-#include "Character/CModelData.hpp"
-#include "Character/CAnimCharacterSet.hpp"
-#include "CStateManager.hpp"
-#include "CGunController.hpp"
-#include "CGunMotion.hpp"
+#include <memory>
+#include <optional>
+#include <vector>
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CModelData.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+#include "Runtime/Weapon/CGunController.hpp"
+#include "Runtime/Weapon/CGunMotion.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
+class CActorLights;
 class CStateManager;
 struct CModelFlags;
-class CActorLights;
 
 class CGrappleArm {
 public:
diff --git a/Runtime/Weapon/CGunController.hpp b/Runtime/Weapon/CGunController.hpp
index e21a137e8..35f23dcec 100644
--- a/Runtime/Weapon/CGunController.hpp
+++ b/Runtime/Weapon/CGunController.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
-#include "Character/CModelData.hpp"
-#include "CGSFreeLook.hpp"
-#include "CGSComboFire.hpp"
-#include "CGSFidget.hpp"
+#include "Runtime/Character/CModelData.hpp"
+#include "Runtime/Weapon/CGSComboFire.hpp"
+#include "Runtime/Weapon/CGSFidget.hpp"
+#include "Runtime/Weapon/CGSFreeLook.hpp"
 
 namespace urde {
 enum class EGunState { Inactive, Default, FreeLook, ComboFire, Idle, Fidget, Strike, BigStrike };
diff --git a/Runtime/Weapon/CGunMotion.hpp b/Runtime/Weapon/CGunMotion.hpp
index 10be7eed2..3079140f4 100644
--- a/Runtime/Weapon/CGunMotion.hpp
+++ b/Runtime/Weapon/CGunMotion.hpp
@@ -1,9 +1,12 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
-#include "Character/CModelData.hpp"
-#include "CGunController.hpp"
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CModelData.hpp"
+#include "Runtime/Weapon/CGunController.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CGunWeapon.hpp b/Runtime/Weapon/CGunWeapon.hpp
index 8b2f3ce7d..1813b8d59 100644
--- a/Runtime/Weapon/CGunWeapon.hpp
+++ b/Runtime/Weapon/CGunWeapon.hpp
@@ -1,18 +1,24 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CWeaponMgr.hpp"
-#include "Collision/CMaterialList.hpp"
-#include "zeus/CVector3f.hpp"
-#include "CPlayerState.hpp"
-#include "Character/CAnimCharacterSet.hpp"
-#include "Particle/CElementGen.hpp"
-#include "CToken.hpp"
-#include "CStateManager.hpp"
-#include "CGunController.hpp"
-#include "WeaponCommon.hpp"
-#include "CGunMotion.hpp"
-#include "World/CDamageInfo.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+#include "Runtime/Collision/CMaterialList.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Weapon/CGunController.hpp"
+#include "Runtime/Weapon/CGunMotion.hpp"
+#include "Runtime/Weapon/CWeaponMgr.hpp"
+#include "Runtime/Weapon/WeaponCommon.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CIceBeam.hpp b/Runtime/Weapon/CIceBeam.hpp
index 66cd20c81..7442aba39 100644
--- a/Runtime/Weapon/CIceBeam.hpp
+++ b/Runtime/Weapon/CIceBeam.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
-#include "CGunWeapon.hpp"
+#include <memory>
+
+#include "Runtime/Weapon/CGunWeapon.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Weapon/CNewFlameThrower.hpp b/Runtime/Weapon/CNewFlameThrower.hpp
index f4c8e8fbb..29f8af7a9 100644
--- a/Runtime/Weapon/CNewFlameThrower.hpp
+++ b/Runtime/Weapon/CNewFlameThrower.hpp
@@ -1,6 +1,11 @@
 #pragma once
 
-#include "CGameProjectile.hpp"
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "Runtime/rstl.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CActor.hpp b/Runtime/World/CActor.hpp
index 9e6a5c42b..6419d2fdf 100644
--- a/Runtime/World/CActor.hpp
+++ b/Runtime/World/CActor.hpp
@@ -1,16 +1,17 @@
 #pragma once
 
-#include "CEntity.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "Graphics/CSimpleShadow.hpp"
-#include "zeus/zeus.hpp"
-#include "Collision/CMaterialFilter.hpp"
-#include "Character/CModelData.hpp"
-#include "Character/CActorLights.hpp"
-#include "Collision/CCollisionResponseData.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "CScannableObjectInfo.hpp"
-#include "Weapon/WeaponCommon.hpp"
+#include "Runtime/CScannableObjectInfo.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/Collision/CCollisionResponseData.hpp"
+#include "Runtime/Collision/CMaterialFilter.hpp"
+#include "Runtime/Character/CActorLights.hpp"
+#include "Runtime/Character/CModelData.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CSimpleShadow.hpp"
+#include "Runtime/Weapon/WeaponCommon.hpp"
+#include "Runtime/World/CEntity.hpp"
+
+#include <zeus/zeus.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CActorModelParticles.hpp b/Runtime/World/CActorModelParticles.hpp
index c58f8a34d..67ab400db 100644
--- a/Runtime/World/CActorModelParticles.hpp
+++ b/Runtime/World/CActorModelParticles.hpp
@@ -1,12 +1,20 @@
 #pragma once
 
 #include <list>
-#include "Audio/CSfxManager.hpp"
-#include "CToken.hpp"
-#include "zeus/CTransform.hpp"
-#include "Particle/CParticleElectric.hpp"
-#include "Particle/CParticleSwoosh.hpp"
-#include "Graphics/CRainSplashGenerator.hpp"
+#include <memory>
+#include <utility>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/Graphics/CRainSplashGenerator.hpp"
+#include "Runtime/Particle/CParticleElectric.hpp"
+#include "Runtime/Particle/CParticleSwoosh.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/World/CActorParameters.hpp b/Runtime/World/CActorParameters.hpp
index 30942901d..b7b395b43 100644
--- a/Runtime/World/CActorParameters.hpp
+++ b/Runtime/World/CActorParameters.hpp
@@ -1,8 +1,11 @@
 #pragma once
 
-#include "CLightParameters.hpp"
-#include "CScannableParameters.hpp"
-#include "CVisorParameters.hpp"
+#include <utility>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CLightParameters.hpp"
+#include "Runtime/World/CScannableParameters.hpp"
+#include "Runtime/World/CVisorParameters.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CAi.hpp b/Runtime/World/CAi.hpp
index 9f8780a10..0f739769c 100644
--- a/Runtime/World/CAi.hpp
+++ b/Runtime/World/CAi.hpp
@@ -1,16 +1,18 @@
 #pragma once
 
-#include "GCNTypes.hpp"
-#include "ScriptObjectSupport.hpp"
-#include "RetroTypes.hpp"
-#include "CEntity.hpp"
-#include "CPhysicsActor.hpp"
-#include "CDamageVulnerability.hpp"
-#include "CHealthInfo.hpp"
-#include "CStateMachine.hpp"
-#include "CKnockBackController.hpp"
+#include <string_view>
 
-#include "zeus/zeus.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CDamageVulnerability.hpp"
+#include "Runtime/World/CEntity.hpp"
+#include "Runtime/World/CHealthInfo.hpp"
+#include "Runtime/World/CKnockBackController.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
+#include "Runtime/World/CStateMachine.hpp"
+#include "Runtime/World/ScriptObjectSupport.hpp"
+
+#include <zeus/zeus.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CAmbientAI.hpp b/Runtime/World/CAmbientAI.hpp
index 1d05d9506..8ba3dbb03 100644
--- a/Runtime/World/CAmbientAI.hpp
+++ b/Runtime/World/CAmbientAI.hpp
@@ -1,6 +1,17 @@
 #pragma once
-#include "CPhysicsActor.hpp"
-#include "CDamageVulnerability.hpp"
+
+#include <optional>
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CDamageVulnerability.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
+
+#include <zeus/CAABox.hpp>
+
+namespace zeus {
+class CTransform;
+}
 
 namespace urde {
 class CAmbientAI : public CPhysicsActor {
diff --git a/Runtime/World/CAnimationParameters.hpp b/Runtime/World/CAnimationParameters.hpp
index a87138d9f..bb66c7247 100644
--- a/Runtime/World/CAnimationParameters.hpp
+++ b/Runtime/World/CAnimationParameters.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CDamageInfo.hpp b/Runtime/World/CDamageInfo.hpp
index 6487d6a70..e1db1eab4 100644
--- a/Runtime/World/CDamageInfo.hpp
+++ b/Runtime/World/CDamageInfo.hpp
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "Weapon/CWeaponMgr.hpp"
-#include "Weapon/CWeaponMode.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Weapon/CWeaponMgr.hpp"
+#include "Runtime/Weapon/CWeaponMode.hpp"
 
 namespace DataSpec {
 struct SShotParam;
diff --git a/Runtime/World/CDamageVulnerability.hpp b/Runtime/World/CDamageVulnerability.hpp
index 32b929039..daca17b55 100644
--- a/Runtime/World/CDamageVulnerability.hpp
+++ b/Runtime/World/CDamageVulnerability.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "Weapon/CWeaponMode.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Weapon/CWeaponMode.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CDestroyableRock.hpp b/Runtime/World/CDestroyableRock.hpp
index df5269be5..07bc26f25 100644
--- a/Runtime/World/CDestroyableRock.hpp
+++ b/Runtime/World/CDestroyableRock.hpp
@@ -1,6 +1,8 @@
 #pragma once
 
-#include "CAi.hpp"
+#include <string_view>
+
+#include "Runtime/World/CAi.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CEffect.hpp b/Runtime/World/CEffect.hpp
index 04d3d297a..ef3b7fea2 100644
--- a/Runtime/World/CEffect.hpp
+++ b/Runtime/World/CEffect.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CActor.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 
@@ -8,8 +8,8 @@ class CEffect : public CActor {
 public:
   CEffect(TUniqueId uid, const CEntityInfo& info, bool active, std::string_view name, const zeus::CTransform& xf);
 
-  void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const override{}
-  void Render(const CStateManager&) const override{}
+  void AddToRenderer(const zeus::CFrustum&, const CStateManager&) const override {}
+  void Render(const CStateManager&) const override {}
 };
 
 } // namespace urde
diff --git a/Runtime/World/CEnergyDrainSource.hpp b/Runtime/World/CEnergyDrainSource.hpp
index 4d2cdfe35..c71e4713d 100644
--- a/Runtime/World/CEnergyDrainSource.hpp
+++ b/Runtime/World/CEnergyDrainSource.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class CEnergyDrainSource {
diff --git a/Runtime/World/CEntity.hpp b/Runtime/World/CEntity.hpp
index ad1f9aa21..912126227 100644
--- a/Runtime/World/CEntity.hpp
+++ b/Runtime/World/CEntity.hpp
@@ -1,8 +1,11 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "ScriptObjectSupport.hpp"
-#include "CEntityInfo.hpp"
+#include <string>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/CEntityInfo.hpp"
+#include "Runtime/World/ScriptObjectSupport.hpp"
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/World/CEntityInfo.hpp b/Runtime/World/CEntityInfo.hpp
index 11916f8bf..abbfc09af 100644
--- a/Runtime/World/CEntityInfo.hpp
+++ b/Runtime/World/CEntityInfo.hpp
@@ -1,9 +1,9 @@
 #pragma once
 
 #include <vector>
-#include <string>
-#include "RetroTypes.hpp"
-#include "World/ScriptObjectSupport.hpp"
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/World/ScriptObjectSupport.hpp"
 
 namespace urde {
 struct SConnection {
diff --git a/Runtime/World/CEnvFxManager.hpp b/Runtime/World/CEnvFxManager.hpp
index ffec46764..8fe12fc1d 100644
--- a/Runtime/World/CEnvFxManager.hpp
+++ b/Runtime/World/CEnvFxManager.hpp
@@ -1,19 +1,26 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CToken.hpp"
-#include "zeus/CAABox.hpp"
-#include "Particle/CGenDescription.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "Graphics/Shaders/CEnvFxShaders.hpp"
-#include "Graphics/CLineRenderer.hpp"
-#include "hecl/VertexBufferPool.hpp"
-#include "hecl/UniformBufferPool.hpp"
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
+#include "Runtime/Graphics/Shaders/CEnvFxShaders.hpp"
+
+#include <hecl/UniformBufferPool.hpp>
+#include <hecl/VertexBufferPool.hpp>
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector2i.hpp>
 
 namespace urde {
+class CActor;
 class CStateManager;
 class CTexture;
-class CActor;
 
 enum class EEnvFxType { None, Snow, Rain, UnderwaterFlake };
 
diff --git a/Runtime/World/CExplosion.hpp b/Runtime/World/CExplosion.hpp
index 5971b0d39..8dd858bd4 100644
--- a/Runtime/World/CExplosion.hpp
+++ b/Runtime/World/CExplosion.hpp
@@ -1,8 +1,11 @@
 #pragma once
 
-#include "CEffect.hpp"
-#include "Particle/CElementGen.hpp"
-#include "Particle/CGenDescription.hpp"
+#include <memory>
+#include <string_view>
+
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/World/CEffect.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CFire.hpp b/Runtime/World/CFire.hpp
index 401a56f68..6988fda22 100644
--- a/Runtime/World/CFire.hpp
+++ b/Runtime/World/CFire.hpp
@@ -1,7 +1,10 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "CDamageInfo.hpp"
+#include <optional>
+#include <memory>
+
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
 
 namespace urde {
 class CElementGen;
diff --git a/Runtime/World/CFishCloud.hpp b/Runtime/World/CFishCloud.hpp
index 10e571141..036606ef0 100644
--- a/Runtime/World/CFishCloud.hpp
+++ b/Runtime/World/CFishCloud.hpp
@@ -1,7 +1,13 @@
 #pragma once
 
-#include "CActor.hpp"
-#include "Particle/CElementGen.hpp"
+#include <optional>
+#include <vector>
+
+#include "Runtime/rstl.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CFishCloudModifier.hpp b/Runtime/World/CFishCloudModifier.hpp
index d2da1dac2..0d5efde12 100644
--- a/Runtime/World/CFishCloudModifier.hpp
+++ b/Runtime/World/CFishCloudModifier.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CActor.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 class CFishCloudModifier : public CActor {
diff --git a/Runtime/World/CFluidPlane.hpp b/Runtime/World/CFluidPlane.hpp
index f7d47e9a8..a4d848125 100644
--- a/Runtime/World/CFluidPlane.hpp
+++ b/Runtime/World/CFluidPlane.hpp
@@ -1,19 +1,27 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CToken.hpp"
-#include "Graphics/CTexture.hpp"
-#include "CFluidUVMotion.hpp"
-#include "zeus/CAABox.hpp"
-#include "zeus/CFrustum.hpp"
-#include "Graphics/Shaders/CFluidPlaneShader.hpp"
+#include <algorithm>
+#include <cmath>
+#include <optional>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/Shaders/CFluidPlaneShader.hpp"
+#include "Runtime/World/CFluidUVMotion.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CFrustum.hpp>
+#include <zeus/CVector2f.hpp>
 
 namespace urde {
 class CFluidUVMotion;
+class CRipple;
 class CRippleManager;
 class CScriptWater;
 class CStateManager;
-class CRipple;
 
 class CFluidPlaneRender {
 public:
diff --git a/Runtime/World/CFluidPlaneCPU.hpp b/Runtime/World/CFluidPlaneCPU.hpp
index a68094b3e..35ef93eca 100644
--- a/Runtime/World/CFluidPlaneCPU.hpp
+++ b/Runtime/World/CFluidPlaneCPU.hpp
@@ -1,7 +1,12 @@
 #pragma once
 
-#include "CFluidPlane.hpp"
-#include "CRipple.hpp"
+#include <memory>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CFluidPlane.hpp"
+#include "Runtime/World/CRipple.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CFluidUVMotion;
diff --git a/Runtime/World/CFluidPlaneDoor.hpp b/Runtime/World/CFluidPlaneDoor.hpp
index ac705a946..f3885b59d 100644
--- a/Runtime/World/CFluidPlaneDoor.hpp
+++ b/Runtime/World/CFluidPlaneDoor.hpp
@@ -1,7 +1,9 @@
 #pragma once
 
-#include "CFluidPlane.hpp"
-#include "Graphics/Shaders/CFluidPlaneShader.hpp"
+#include <optional>
+
+#include "Runtime/Graphics/Shaders/CFluidPlaneShader.hpp"
+#include "Runtime/World/CFluidPlane.hpp"
 
 namespace urde {
 class CFluidPlaneDoor final : public CFluidPlane {
diff --git a/Runtime/World/CFluidPlaneGPU.hpp b/Runtime/World/CFluidPlaneGPU.hpp
index 723a07353..958c97d38 100644
--- a/Runtime/World/CFluidPlaneGPU.hpp
+++ b/Runtime/World/CFluidPlaneGPU.hpp
@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CFluidPlaneCPU.hpp"
+#include <vector>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CFluidPlaneCPU.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CFluidPlaneManager.hpp b/Runtime/World/CFluidPlaneManager.hpp
index 39603029f..62bb95d9c 100644
--- a/Runtime/World/CFluidPlaneManager.hpp
+++ b/Runtime/World/CFluidPlaneManager.hpp
@@ -1,8 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CRippleManager.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/World/CRippleManager.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CFluidUVMotion.hpp b/Runtime/World/CFluidUVMotion.hpp
index a3b9664f6..fd506bcfc 100644
--- a/Runtime/World/CFluidUVMotion.hpp
+++ b/Runtime/World/CFluidUVMotion.hpp
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "rstl.hpp"
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
 
 namespace urde {
 class CFluidUVMotion {
diff --git a/Runtime/World/CGameArea.hpp b/Runtime/World/CGameArea.hpp
index 35dfb8534..ff653bb89 100644
--- a/Runtime/World/CGameArea.hpp
+++ b/Runtime/World/CGameArea.hpp
@@ -1,22 +1,25 @@
 #pragma once
 
-#include "zeus/CVector2f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CAABox.hpp"
-#include "CToken.hpp"
-#include "RetroTypes.hpp"
-#include "IGameArea.hpp"
-#include "Collision/CAreaOctTree.hpp"
-#include "hecl/ClientProcess.hpp"
-#include "Graphics/CMetroidModelInstance.hpp"
-#include "CObjectList.hpp"
-#include "CWorldLight.hpp"
-#include "Graphics/CPVSAreaSet.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "Graphics/CModel.hpp"
-#include "CPathFindArea.hpp"
 #include "Editor/ProjectResourceFactoryBase.hpp"
-#include "World/CEnvFxManager.hpp"
+#include "Runtime/CObjectList.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Collision/CAreaOctTree.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CMetroidModelInstance.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Graphics/CPVSAreaSet.hpp"
+#include "Runtime/World/CEnvFxManager.hpp"
+#include "Runtime/World/CPathFindArea.hpp"
+#include "Runtime/World/CWorldLight.hpp"
+#include "Runtime/World/IGameArea.hpp"
+
+#include <hecl/ClientProcess.hpp>
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector2f.hpp>
 
 namespace urde {
 class CStateManager;
diff --git a/Runtime/World/CGameLight.hpp b/Runtime/World/CGameLight.hpp
index a5f7f3ebd..f64c850a0 100644
--- a/Runtime/World/CGameLight.hpp
+++ b/Runtime/World/CGameLight.hpp
@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CActor.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/Graphics/CLight.hpp"
 
 namespace urde {
 class CGameLight : public CActor {
diff --git a/Runtime/World/CHUDBillboardEffect.hpp b/Runtime/World/CHUDBillboardEffect.hpp
index 0afd69daf..cba72ef0d 100644
--- a/Runtime/World/CHUDBillboardEffect.hpp
+++ b/Runtime/World/CHUDBillboardEffect.hpp
@@ -1,11 +1,16 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "World/CEffect.hpp"
-#include "CToken.hpp"
-#include "Particle/CElementGen.hpp"
-#include "Particle/CParticleElectric.hpp"
-#include "Particle/CParticleSwoosh.hpp"
+#include <memory>
+#include <optional>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CParticleElectric.hpp"
+#include "Runtime/Particle/CParticleSwoosh.hpp"
+#include "Runtime/World/CEffect.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CGenDescription;
diff --git a/Runtime/World/CHUDMemoParms.hpp b/Runtime/World/CHUDMemoParms.hpp
index fc54b8b3f..61e3b678a 100644
--- a/Runtime/World/CHUDMemoParms.hpp
+++ b/Runtime/World/CHUDMemoParms.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include "Runtime/IOStreams.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CIceImpact.hpp b/Runtime/World/CIceImpact.hpp
index ab7be8ff5..a746ad7f3 100644
--- a/Runtime/World/CIceImpact.hpp
+++ b/Runtime/World/CIceImpact.hpp
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CEffect.hpp"
+#include "Runtime/World/CEffect.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CKnockBackController.hpp b/Runtime/World/CKnockBackController.hpp
index 0c552952c..3c3180832 100644
--- a/Runtime/World/CKnockBackController.hpp
+++ b/Runtime/World/CKnockBackController.hpp
@@ -1,12 +1,17 @@
 #pragma once
-#include "RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
-#include "Character/CharacterCommon.hpp"
-#include "Weapon/WeaponCommon.hpp"
+
+#include <bitset>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CharacterCommon.hpp"
+#include "Runtime/Weapon/WeaponCommon.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CPatterned;
 class CDamageInfo;
+class CPatterned;
 
 enum class EKnockBackType { Direct, Radius };
 
diff --git a/Runtime/World/CLightParameters.hpp b/Runtime/World/CLightParameters.hpp
index 5f9c13134..327c2cb60 100644
--- a/Runtime/World/CLightParameters.hpp
+++ b/Runtime/World/CLightParameters.hpp
@@ -1,8 +1,12 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CColor.hpp"
-#include "Character/CActorLights.hpp"
+#include <memory>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CActorLights.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 
diff --git a/Runtime/World/CMorphBallShadow.hpp b/Runtime/World/CMorphBallShadow.hpp
index 405873def..e1c281c40 100644
--- a/Runtime/World/CMorphBallShadow.hpp
+++ b/Runtime/World/CMorphBallShadow.hpp
@@ -1,14 +1,18 @@
 #pragma once
 
-#include "CToken.hpp"
-#include "Graphics/CTexture.hpp"
-#include "zeus/CAABox.hpp"
+#include <list>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+
+#include <zeus/CAABox.hpp>
 
 namespace urde {
-class CStateManager;
-class CPlayer;
-class CGameArea;
 class CActor;
+class CGameArea;
+class CPlayer;
+class CStateManager;
 
 class CMorphBallShadow {
   std::list<const CActor*> x0_actors;
diff --git a/Runtime/World/CPathFindArea.hpp b/Runtime/World/CPathFindArea.hpp
index 7b3b1dfe3..427f6cb5f 100644
--- a/Runtime/World/CPathFindArea.hpp
+++ b/Runtime/World/CPathFindArea.hpp
@@ -1,10 +1,16 @@
 #pragma once
 
-#include "IObj.hpp"
-#include "zeus/CTransform.hpp"
-#include "zeus/CAABox.hpp"
-#include "IFactory.hpp"
-#include "CPathFindRegion.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/IFactory.hpp"
+#include "Runtime/IObj.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/World/CPathFindRegion.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CVParamTransfer;
diff --git a/Runtime/World/CPathFindRegion.hpp b/Runtime/World/CPathFindRegion.hpp
index ef669cd2d..b126f230e 100644
--- a/Runtime/World/CPathFindRegion.hpp
+++ b/Runtime/World/CPathFindRegion.hpp
@@ -1,7 +1,11 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "zeus/CAABox.hpp"
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CPFArea;
diff --git a/Runtime/World/CPathFindSearch.hpp b/Runtime/World/CPathFindSearch.hpp
index 1c8cffd23..2248dc122 100644
--- a/Runtime/World/CPathFindSearch.hpp
+++ b/Runtime/World/CPathFindSearch.hpp
@@ -1,8 +1,13 @@
 #pragma once
 
-#include "RetroTypes.hpp"
-#include "CPathFindArea.hpp"
-#include "Graphics/CLineRenderer.hpp"
+#include <optional>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
+#include "Runtime/World/CPathFindArea.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CPathFindSearch;
diff --git a/Runtime/World/CPatterned.hpp b/Runtime/World/CPatterned.hpp
index ded53ae09..fe8842fed 100644
--- a/Runtime/World/CPatterned.hpp
+++ b/Runtime/World/CPatterned.hpp
@@ -1,14 +1,22 @@
 #pragma once
 
-#include "CAi.hpp"
-#include "Character/CBodyController.hpp"
-#include "Character/CSteeringBehaviors.hpp"
-#include "Graphics/CVertexMorphEffect.hpp"
-#include "Particle/CGenDescription.hpp"
-#include "Particle/CElectricDescription.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/Character/CBodyController.hpp"
+#include "Runtime/Character/CSteeringBehaviors.hpp"
+#include "Runtime/Graphics/CVertexMorphEffect.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/World/CAi.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+#include "Runtime/World/CKnockBackController.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CDamageInfo.hpp"
-#include "CKnockBackController.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 #ifndef DEFINE_PATTERNED
 #define DEFINE_PATTERNED(type) static constexpr ECharacter CharacterType = ECharacter::type;