diff --git a/Editor/ProjectResourceFactoryBase.cpp b/Editor/ProjectResourceFactoryBase.cpp
index 7176a5eed..52a398036 100644
--- a/Editor/ProjectResourceFactoryBase.cpp
+++ b/Editor/ProjectResourceFactoryBase.cpp
@@ -1,6 +1,9 @@
-#include "ProjectResourceFactoryBase.hpp"
+#include "Editor/ProjectResourceFactoryBase.hpp"
+
 #include "Runtime/IObj.hpp"
 
+#include <logvisor/logvisor.hpp>
+
 #undef min
 #undef max
 
diff --git a/Editor/ProjectResourceFactoryMP1.cpp b/Editor/ProjectResourceFactoryMP1.cpp
index 1e056fbf2..9b9d0a90a 100644
--- a/Editor/ProjectResourceFactoryMP1.cpp
+++ b/Editor/ProjectResourceFactoryMP1.cpp
@@ -1,41 +1,42 @@
-#include "ProjectResourceFactoryMP1.hpp"
-#include "Runtime/IOStreams.hpp"
+#include "Editor/ProjectResourceFactoryMP1.hpp"
 
+#include "Runtime/CDependencyGroup.hpp"
 #include "Runtime/CGameHintInfo.hpp"
-#include "Runtime/Particle/CParticleDataFactory.hpp"
-#include "Runtime/Particle/CGenDescription.hpp"
-#include "Runtime/Particle/CElectricDescription.hpp"
-#include "Runtime/Particle/CSwooshDescription.hpp"
-#include "Runtime/Particle/CParticleElectricDataFactory.hpp"
-#include "Runtime/Particle/CParticleSwooshDataFactory.hpp"
-#include "Runtime/Particle/CWeaponDescription.hpp"
-#include "Runtime/Particle/CProjectileWeaponDataFactory.hpp"
-#include "Runtime/Particle/CDecalDataFactory.hpp"
+#include "Runtime/CSaveWorld.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Audio/CAudioGroupSet.hpp"
+#include "Runtime/Audio/CMidiManager.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/AutoMapper/CMapArea.hpp"
+#include "Runtime/AutoMapper/CMapUniverse.hpp"
+#include "Runtime/AutoMapper/CMapWorld.hpp"
+#include "Runtime/CScannableObjectInfo.hpp"
+#include "Runtime/Character/CAllFormatsAnimSource.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+#include "Runtime/Character/CAnimPOIData.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CSkinRules.hpp"
+#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
+#include "Runtime/Collision/CCollisionResponseData.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/GuiSys/CGuiFrame.hpp"
 #include "Runtime/GuiSys/CRasterFont.hpp"
 #include "Runtime/GuiSys/CStringTable.hpp"
-#include "Runtime/Graphics/CModel.hpp"
-#include "Runtime/Graphics/CTexture.hpp"
-#include "Runtime/Character/CCharLayoutInfo.hpp"
-#include "Runtime/Character/CSkinRules.hpp"
-#include "Runtime/Character/CAnimCharacterSet.hpp"
-#include "Runtime/Character/CAllFormatsAnimSource.hpp"
-#include "Runtime/Character/CAnimPOIData.hpp"
-#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
-#include "Runtime/Collision/CCollisionResponseData.hpp"
-#include "Runtime/CSaveWorld.hpp"
-#include "Runtime/AutoMapper/CMapWorld.hpp"
-#include "Runtime/AutoMapper/CMapArea.hpp"
-#include "Runtime/AutoMapper/CMapUniverse.hpp"
-#include "Runtime/CScannableObjectInfo.hpp"
+#include "Runtime/Particle/CDecalDataFactory.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CParticleDataFactory.hpp"
+#include "Runtime/Particle/CParticleElectricDataFactory.hpp"
+#include "Runtime/Particle/CParticleSwooshDataFactory.hpp"
+#include "Runtime/Particle/CProjectileWeaponDataFactory.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/Particle/CWeaponDescription.hpp"
 #include "Runtime/World/CPathFindArea.hpp"
-#include "Audio/CAudioGroupSet.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "Audio/CMidiManager.hpp"
-#include "Runtime/CDependencyGroup.hpp"
+
 #include "DataSpec/DNACommon/TXTR.hpp"
-#include "CSimplePool.hpp"
-#include "GameGlobalObjects.hpp"
 
 namespace DataSpec {
 extern hecl::Database::DataSpecEntry SpecEntMP1;
diff --git a/Runtime/Audio/CAudioGroupSet.cpp b/Runtime/Audio/CAudioGroupSet.cpp
index f6d6a7756..64910da34 100644
--- a/Runtime/Audio/CAudioGroupSet.cpp
+++ b/Runtime/Audio/CAudioGroupSet.cpp
@@ -1,4 +1,4 @@
-#include "CAudioGroupSet.hpp"
+#include "Runtime/Audio/CAudioGroupSet.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Audio/CAudioSys.cpp b/Runtime/Audio/CAudioSys.cpp
index 5cf9a2574..ec1f82722 100644
--- a/Runtime/Audio/CAudioSys.cpp
+++ b/Runtime/Audio/CAudioSys.cpp
@@ -1,6 +1,10 @@
-#include "CAudioSys.hpp"
-#include "CSimplePool.hpp"
-#include "CAudioGroupSet.hpp"
+#include "Runtime/Audio/CAudioSys.hpp"
+
+#include <string>
+#include <unordered_map>
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Audio/CAudioGroupSet.hpp"
 
 namespace urde {
 namespace {
diff --git a/Runtime/Audio/CMidiManager.cpp b/Runtime/Audio/CMidiManager.cpp
index 9962bce0d..efaecf6e0 100644
--- a/Runtime/Audio/CMidiManager.cpp
+++ b/Runtime/Audio/CMidiManager.cpp
@@ -1,4 +1,4 @@
-#include "CMidiManager.hpp"
+#include "Runtime/Audio/CMidiManager.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Audio/CStaticAudioPlayer.cpp b/Runtime/Audio/CStaticAudioPlayer.cpp
index fbd5ac486..67434226d 100644
--- a/Runtime/Audio/CStaticAudioPlayer.cpp
+++ b/Runtime/Audio/CStaticAudioPlayer.cpp
@@ -1,6 +1,7 @@
-#include "CStaticAudioPlayer.hpp"
-#include "CDvdFile.hpp"
-#include "CDvdRequest.hpp"
+#include "Runtime/Audio/CStaticAudioPlayer.hpp"
+
+#include "Runtime/CDvdFile.hpp"
+#include "Runtime/CDvdRequest.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Audio/CStreamAudioManager.cpp b/Runtime/Audio/CStreamAudioManager.cpp
index dce6a7e4a..93208bc89 100644
--- a/Runtime/Audio/CStreamAudioManager.cpp
+++ b/Runtime/Audio/CStreamAudioManager.cpp
@@ -1,11 +1,17 @@
-#include "CStreamAudioManager.hpp"
-#include "CStringExtras.hpp"
-#include "CDvdFile.hpp"
-#include "CDvdRequest.hpp"
-#include "Audio/CAudioSys.hpp"
-#include "amuse/DSPCodec.hpp"
+#include "Runtime/Audio/CStreamAudioManager.hpp"
+
+#include "Runtime/Audio/CAudioSys.hpp"
+#include "Runtime/CDvdFile.hpp"
+#include "Runtime/CDvdRequest.hpp"
+#include "Runtime/CStringExtras.hpp"
+
+#include <algorithm>
+#include <cstdlib>
+#include <cstring>
 #include <memory>
 
+#include <amuse/DSPCodec.hpp>
+
 namespace urde {
 class CDSPStreamManager;
 
diff --git a/Runtime/AutoMapper/CMapArea.cpp b/Runtime/AutoMapper/CMapArea.cpp
index 3ff3dd3cd..35ef15402 100644
--- a/Runtime/AutoMapper/CMapArea.cpp
+++ b/Runtime/AutoMapper/CMapArea.cpp
@@ -1,10 +1,11 @@
-#include "CMapArea.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CMappableObject.hpp"
-#include "CToken.hpp"
-#include "World/CWorld.hpp"
-#include "World/CGameArea.hpp"
-#include "CResFactory.hpp"
+#include "Runtime/AutoMapper/CMapArea.hpp"
+
+#include "Runtime/CResFactory.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/AutoMapper/CMappableObject.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/CWorld.hpp"
 
 namespace urde {
 CMapArea::CMapArea(CInputStream& in, u32 size)
diff --git a/Runtime/AutoMapper/CMapUniverse.cpp b/Runtime/AutoMapper/CMapUniverse.cpp
index 6df0c6cab..fa1ecfac2 100644
--- a/Runtime/AutoMapper/CMapUniverse.cpp
+++ b/Runtime/AutoMapper/CMapUniverse.cpp
@@ -1,7 +1,8 @@
-#include "CMapUniverse.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CGameState.hpp"
+#include "Runtime/AutoMapper/CMapUniverse.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CGameState.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
 
 namespace urde {
 
diff --git a/Runtime/AutoMapper/CMapWorld.cpp b/Runtime/AutoMapper/CMapWorld.cpp
index fbe172343..9eb8a190d 100644
--- a/Runtime/AutoMapper/CMapWorld.cpp
+++ b/Runtime/AutoMapper/CMapWorld.cpp
@@ -1,9 +1,10 @@
-#include "CMapWorld.hpp"
-#include "CMapWorldInfo.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "World/CWorld.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/AutoMapper/CMapWorld.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/AutoMapper/CMapWorldInfo.hpp"
+#include "Runtime/World/CWorld.hpp"
 
 namespace urde {
 
diff --git a/Runtime/AutoMapper/CMapWorldInfo.cpp b/Runtime/AutoMapper/CMapWorldInfo.cpp
index 822a8798a..be80faa51 100644
--- a/Runtime/AutoMapper/CMapWorldInfo.cpp
+++ b/Runtime/AutoMapper/CMapWorldInfo.cpp
@@ -1,6 +1,7 @@
-#include "CMapWorldInfo.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CMemoryCardSys.hpp"
+#include "Runtime/AutoMapper/CMapWorldInfo.hpp"
+
+#include "Runtime/CMemoryCardSys.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Camera/CBallCamera.cpp b/Runtime/Camera/CBallCamera.cpp
index cc1b428c5..ac4fff054 100644
--- a/Runtime/Camera/CBallCamera.cpp
+++ b/Runtime/Camera/CBallCamera.cpp
@@ -1,18 +1,24 @@
-#include "GameGlobalObjects.hpp"
-#include "CBallCamera.hpp"
+#include "Runtime/Camera/CBallCamera.hpp"
+
+#include <algorithm>
+#include <cmath>
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/Camera/CPathCamera.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Input/ControlMapper.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptCameraHint.hpp"
+#include "Runtime/World/CScriptDock.hpp"
+#include "Runtime/World/CScriptDoor.hpp"
+#include "Runtime/World/CScriptSpindleCamera.hpp"
+#include "Runtime/World/CScriptWater.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CStateManager.hpp"
-#include "Collision/CCollisionActor.hpp"
-#include "World/CPlayer.hpp"
-#include "Input/ControlMapper.hpp"
-#include "Camera/CFirstPersonCamera.hpp"
-#include "Camera/CPathCamera.hpp"
-#include "World/CScriptSpindleCamera.hpp"
-#include "World/CScriptCameraHint.hpp"
-#include "World/CScriptDoor.hpp"
-#include "World/CScriptWater.hpp"
-#include "World/CScriptDock.hpp"
-#include "Collision/CGameCollision.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Camera/CCameraFilter.cpp b/Runtime/Camera/CCameraFilter.cpp
index 5f13b16f8..53ff45c88 100644
--- a/Runtime/Camera/CCameraFilter.cpp
+++ b/Runtime/Camera/CCameraFilter.cpp
@@ -1,12 +1,16 @@
-#include "Graphics/CGraphics.hpp"
-#include "CCameraFilter.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "CSimplePool.hpp"
-#include "Graphics/Shaders/CColoredQuadFilter.hpp"
-#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
-#include "Graphics/Shaders/CScanLinesFilter.hpp"
-#include "Graphics/Shaders/CRandomStaticFilter.hpp"
+#include "Runtime/Camera/CCameraFilter.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
+#include "Runtime/Graphics/Shaders/CRandomStaticFilter.hpp"
+#include "Runtime/Graphics/Shaders/CScanLinesFilter.hpp"
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
+
+#include <algorithm>
+#include <zeus/CColor.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Camera/CCameraManager.cpp b/Runtime/Camera/CCameraManager.cpp
index 67309e6d7..6dc75e1b4 100644
--- a/Runtime/Camera/CCameraManager.cpp
+++ b/Runtime/Camera/CCameraManager.cpp
@@ -1,18 +1,20 @@
-#include "CCameraManager.hpp"
-#include "CCameraShakeData.hpp"
-#include "CFirstPersonCamera.hpp"
-#include "CStateManager.hpp"
-#include "World/CScriptWater.hpp"
-#include "World/CPlayer.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CBallCamera.hpp"
+#include "Runtime/Camera/CCameraShakeData.hpp"
+#include "Runtime/Camera/CCinematicCamera.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/Camera/CInterpolationCamera.hpp"
+#include "Runtime/Camera/CPathCamera.hpp"
+#include "Runtime/World/CExplosion.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptCameraHint.hpp"
+#include "Runtime/World/CScriptSpindleCamera.hpp"
+#include "Runtime/World/CScriptWater.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CCinematicCamera.hpp"
-#include "CBallCamera.hpp"
-#include "CInterpolationCamera.hpp"
-#include "World/CScriptCameraHint.hpp"
-#include "CPathCamera.hpp"
-#include "World/CScriptSpindleCamera.hpp"
-#include "World/CExplosion.hpp"
 
 namespace urde {
 float CCameraManager::sFirstPersonFOV = 55.f;
diff --git a/Runtime/Camera/CCameraShakeData.cpp b/Runtime/Camera/CCameraShakeData.cpp
index 375db909c..9e2ded6f0 100644
--- a/Runtime/Camera/CCameraShakeData.cpp
+++ b/Runtime/Camera/CCameraShakeData.cpp
@@ -1,7 +1,13 @@
-#include "CCameraShakeData.hpp"
-#include "World/ScriptLoader.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
+#include "Runtime/Camera/CCameraShakeData.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/ScriptLoader.hpp"
+
+#include <algorithm>
+#include <cmath>
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Camera/CCameraSpline.cpp b/Runtime/Camera/CCameraSpline.cpp
index 0723cd348..310056762 100644
--- a/Runtime/Camera/CCameraSpline.cpp
+++ b/Runtime/Camera/CCameraSpline.cpp
@@ -1,6 +1,8 @@
-#include "Camera/CCameraSpline.hpp"
-#include "CStateManager.hpp"
-#include "World/CScriptCameraWaypoint.hpp"
+#include "Runtime/Camera/CCameraSpline.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/World/CScriptCameraWaypoint.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {
diff --git a/Runtime/Camera/CCinematicCamera.cpp b/Runtime/Camera/CCinematicCamera.cpp
index de126b43b..505f2218e 100644
--- a/Runtime/Camera/CCinematicCamera.cpp
+++ b/Runtime/Camera/CCinematicCamera.cpp
@@ -1,11 +1,13 @@
-#include "CCinematicCamera.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptActor.hpp"
+#include "Runtime/Camera/CCinematicCamera.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptActor.hpp"
+#include "Runtime/World/CScriptCameraWaypoint.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CScriptCameraWaypoint.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Character/CAnimTreeNode.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Camera/CFirstPersonCamera.cpp b/Runtime/Camera/CFirstPersonCamera.cpp
index f958a4340..267df6d0e 100644
--- a/Runtime/Camera/CFirstPersonCamera.cpp
+++ b/Runtime/Camera/CFirstPersonCamera.cpp
@@ -1,9 +1,11 @@
-#include "CFirstPersonCamera.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptGrapplePoint.hpp"
-#include "World/CScriptCameraPitchVolume.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptCameraPitchVolume.hpp"
+#include "Runtime/World/CScriptGrapplePoint.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace DataSpec::DNAMP1 {
diff --git a/Runtime/Camera/CGameCamera.cpp b/Runtime/Camera/CGameCamera.cpp
index 35db4f56c..772eef002 100644
--- a/Runtime/Camera/CGameCamera.cpp
+++ b/Runtime/Camera/CGameCamera.cpp
@@ -1,7 +1,8 @@
-#include "CGameCamera.hpp"
-#include "CStateManager.hpp"
-#include "Camera/CCameraManager.hpp"
-#include "World/CActorParameters.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+#include "Runtime/World/CActorParameters.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Camera/CInterpolationCamera.cpp b/Runtime/Camera/CInterpolationCamera.cpp
index 2e7bd6c5e..09d6eaedd 100644
--- a/Runtime/Camera/CInterpolationCamera.cpp
+++ b/Runtime/Camera/CInterpolationCamera.cpp
@@ -1,9 +1,11 @@
-#include "CInterpolationCamera.hpp"
-#include "CCameraManager.hpp"
-#include "CStateManager.hpp"
-#include "Camera/CBallCamera.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptSpindleCamera.hpp"
+#include "Runtime/Camera/CInterpolationCamera.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Camera/CBallCamera.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptSpindleCamera.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {
diff --git a/Runtime/Camera/CPathCamera.cpp b/Runtime/Camera/CPathCamera.cpp
index fb1c764d5..8d882e969 100644
--- a/Runtime/Camera/CPathCamera.cpp
+++ b/Runtime/Camera/CPathCamera.cpp
@@ -1,11 +1,13 @@
-#include "CPathCamera.hpp"
-#include "CCameraManager.hpp"
-#include "CStateManager.hpp"
-#include "CBallCamera.hpp"
-#include "World/CScriptCameraHint.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptDoor.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/Camera/CPathCamera.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CBallCamera.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptCameraHint.hpp"
+#include "Runtime/World/CScriptDoor.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {
diff --git a/Runtime/Character/CActorLights.cpp b/Runtime/Character/CActorLights.cpp
index 02688dd6c..97057aaf9 100644
--- a/Runtime/Character/CActorLights.cpp
+++ b/Runtime/Character/CActorLights.cpp
@@ -1,14 +1,16 @@
-#include "CActorLights.hpp"
-#include "Graphics/CModel.hpp"
-#include "World/CGameArea.hpp"
-#include "CStateManager.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Camera/CFirstPersonCamera.hpp"
-#include "World/CGameLight.hpp"
+#include "Runtime/Character/CActorLights.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/World/CExplosion.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/CGameLight.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "GameGlobalObjects.hpp"
-#include "World/CExplosion.hpp"
-#include "Graphics/CBooRenderer.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAdditiveAnimPlayback.cpp b/Runtime/Character/CAdditiveAnimPlayback.cpp
index f1e9d57ac..28406e01a 100644
--- a/Runtime/Character/CAdditiveAnimPlayback.cpp
+++ b/Runtime/Character/CAdditiveAnimPlayback.cpp
@@ -1,7 +1,8 @@
-#include "CAdditiveAnimPlayback.hpp"
-#include "CSegStatementSet.hpp"
-#include "CCharLayoutInfo.hpp"
-#include "CAnimTreeNode.hpp"
+#include "Runtime/Character/CAdditiveAnimPlayback.hpp"
+
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAdditiveBodyState.cpp b/Runtime/Character/CAdditiveBodyState.cpp
index e504f4f86..ff5a449f4 100644
--- a/Runtime/Character/CAdditiveBodyState.cpp
+++ b/Runtime/Character/CAdditiveBodyState.cpp
@@ -1,9 +1,10 @@
-#include "CAdditiveBodyState.hpp"
-#include "CBodyController.hpp"
-#include "Character/CPASDatabase.hpp"
-#include "CStateManager.hpp"
-#include "CAnimTreeNode.hpp"
-#include "CPASAnimParmData.hpp"
+#include "Runtime/Character/CAdditiveBodyState.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CBodyController.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/Character/CPASDatabase.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAllFormatsAnimSource.cpp b/Runtime/Character/CAllFormatsAnimSource.cpp
index 7c1a6127e..b36b72b7f 100644
--- a/Runtime/Character/CAllFormatsAnimSource.cpp
+++ b/Runtime/Character/CAllFormatsAnimSource.cpp
@@ -1,8 +1,10 @@
-#include "CAllFormatsAnimSource.hpp"
-#include "logvisor/logvisor.hpp"
-#include "CSimplePool.hpp"
-#include "CAnimSourceReader.hpp"
-#include "CFBStreamedAnimReader.hpp"
+#include "Runtime/Character/CAllFormatsAnimSource.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Character/CAnimSourceReader.hpp"
+#include "Runtime/Character/CFBStreamedAnimReader.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 static logvisor::Module Log("urde::CAllFormatsAnimSource");
diff --git a/Runtime/Character/CAnimCharacterSet.cpp b/Runtime/Character/CAnimCharacterSet.cpp
index 5a817cc23..15a7a7943 100644
--- a/Runtime/Character/CAnimCharacterSet.cpp
+++ b/Runtime/Character/CAnimCharacterSet.cpp
@@ -1,5 +1,6 @@
-#include "CAnimCharacterSet.hpp"
-#include "CToken.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimData.cpp b/Runtime/Character/CAnimData.cpp
index 3dddc53db..09adede33 100644
--- a/Runtime/Character/CAnimData.cpp
+++ b/Runtime/Character/CAnimData.cpp
@@ -1,26 +1,30 @@
-#include "CAnimData.hpp"
-#include "CCharacterInfo.hpp"
-#include "CCharLayoutInfo.hpp"
-#include "Graphics/CSkinnedModel.hpp"
-#include "CCharacterFactory.hpp"
-#include "CAnimationManager.hpp"
-#include "CTransitionManager.hpp"
-#include "CAdditiveAnimPlayback.hpp"
-#include "CBoolPOINode.hpp"
-#include "CInt32POINode.hpp"
-#include "CParticlePOINode.hpp"
-#include "CSoundPOINode.hpp"
-#include "CParticleGenInfo.hpp"
-#include "IAnimReader.hpp"
-#include "CAnimTreeNode.hpp"
-#include "CAnimPerSegmentData.hpp"
-#include "CSegStatementSet.hpp"
-#include "CStateManager.hpp"
-#include "CAnimPlaybackParms.hpp"
-#include "CAnimTreeBlend.hpp"
-#include "CPrimitive.hpp"
-#include "CAllFormatsAnimSource.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/Character/CAnimData.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CAdditiveAnimPlayback.hpp"
+#include "Runtime/Character/CAllFormatsAnimSource.hpp"
+#include "Runtime/Character/CAnimPerSegmentData.hpp"
+#include "Runtime/Character/CAnimPlaybackParms.hpp"
+#include "Runtime/Character/CAnimTreeBlend.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/Character/CAnimationManager.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CCharacterFactory.hpp"
+#include "Runtime/Character/CCharacterInfo.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Character/CParticleGenInfo.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+#include "Runtime/Character/CPrimitive.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
+#include "Runtime/Character/CTransitionManager.hpp"
+#include "Runtime/Character/IAnimReader.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 static logvisor::Module Log("CAnimData");
diff --git a/Runtime/Character/CAnimPOIData.cpp b/Runtime/Character/CAnimPOIData.cpp
index 5d93e0c5c..54014bf3e 100644
--- a/Runtime/Character/CAnimPOIData.cpp
+++ b/Runtime/Character/CAnimPOIData.cpp
@@ -1,5 +1,6 @@
-#include "CAnimPOIData.hpp"
-#include "CToken.hpp"
+#include "Runtime/Character/CAnimPOIData.hpp"
+
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimSource.cpp b/Runtime/Character/CAnimSource.cpp
index 5c98916c4..a826eeb86 100644
--- a/Runtime/Character/CAnimSource.cpp
+++ b/Runtime/Character/CAnimSource.cpp
@@ -1,8 +1,11 @@
-#include "CAnimSource.hpp"
-#include "CAnimPOIData.hpp"
-#include "CSegId.hpp"
-#include "CSegIdList.hpp"
-#include "CSegStatementSet.hpp"
+#include "Runtime/Character/CAnimSource.hpp"
+
+#include <algorithm>
+
+#include "Runtime/Character/CAnimPOIData.hpp"
+#include "Runtime/Character/CSegId.hpp"
+#include "Runtime/Character/CSegIdList.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimSourceReader.cpp b/Runtime/Character/CAnimSourceReader.cpp
index 9d84351b7..2ce914a5e 100644
--- a/Runtime/Character/CAnimSourceReader.cpp
+++ b/Runtime/Character/CAnimSourceReader.cpp
@@ -1,9 +1,10 @@
-#include "CAnimSourceReader.hpp"
-#include "CBoolPOINode.hpp"
-#include "CInt32POINode.hpp"
-#include "CParticlePOINode.hpp"
-#include "CSoundPOINode.hpp"
-#include "CFBStreamedAnimReader.hpp"
+#include "Runtime/Character/CAnimSourceReader.hpp"
+
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CFBStreamedAnimReader.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimTreeAnimReaderContainer.cpp b/Runtime/Character/CAnimTreeAnimReaderContainer.cpp
index 9681903c9..16661690b 100644
--- a/Runtime/Character/CAnimTreeAnimReaderContainer.cpp
+++ b/Runtime/Character/CAnimTreeAnimReaderContainer.cpp
@@ -1,5 +1,6 @@
-#include "CAnimTreeAnimReaderContainer.hpp"
-#include "CFBStreamedAnimReader.hpp"
+#include "Runtime/Character/CAnimTreeAnimReaderContainer.hpp"
+
+#include "Runtime/Character/CFBStreamedAnimReader.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimTreeBlend.cpp b/Runtime/Character/CAnimTreeBlend.cpp
index 620476b67..8dbabbd8d 100644
--- a/Runtime/Character/CAnimTreeBlend.cpp
+++ b/Runtime/Character/CAnimTreeBlend.cpp
@@ -1,4 +1,4 @@
-#include "CAnimTreeBlend.hpp"
+#include "Runtime/Character/CAnimTreeBlend.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimTreeDoubleChild.cpp b/Runtime/Character/CAnimTreeDoubleChild.cpp
index 77c9fd84e..5c3b1e69f 100644
--- a/Runtime/Character/CAnimTreeDoubleChild.cpp
+++ b/Runtime/Character/CAnimTreeDoubleChild.cpp
@@ -1,4 +1,4 @@
-#include "CAnimTreeDoubleChild.hpp"
+#include "Runtime/Character/CAnimTreeDoubleChild.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimTreeLoopIn.cpp b/Runtime/Character/CAnimTreeLoopIn.cpp
index 7707ca1ac..985bc6121 100644
--- a/Runtime/Character/CAnimTreeLoopIn.cpp
+++ b/Runtime/Character/CAnimTreeLoopIn.cpp
@@ -1,5 +1,6 @@
-#include "CAnimTreeLoopIn.hpp"
-#include "CTreeUtils.hpp"
+#include "Runtime/Character/CAnimTreeLoopIn.hpp"
+
+#include "Runtime/Character/CTreeUtils.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimTreeNode.cpp b/Runtime/Character/CAnimTreeNode.cpp
index 3b28b26fa..efbad4e5d 100644
--- a/Runtime/Character/CAnimTreeNode.cpp
+++ b/Runtime/Character/CAnimTreeNode.cpp
@@ -1,4 +1,4 @@
-#include "CAnimTreeNode.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimTreeSequence.cpp b/Runtime/Character/CAnimTreeSequence.cpp
index a7b020705..628840687 100644
--- a/Runtime/Character/CAnimTreeSequence.cpp
+++ b/Runtime/Character/CAnimTreeSequence.cpp
@@ -1,7 +1,8 @@
-#include "CAnimTreeSequence.hpp"
-#include "IMetaAnim.hpp"
-#include "CAnimSysContext.hpp"
-#include "CTreeUtils.hpp"
+#include "Runtime/Character/CAnimTreeSequence.hpp"
+
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CTreeUtils.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimTreeSingleChild.cpp b/Runtime/Character/CAnimTreeSingleChild.cpp
index f13d3f896..a7c9bf851 100644
--- a/Runtime/Character/CAnimTreeSingleChild.cpp
+++ b/Runtime/Character/CAnimTreeSingleChild.cpp
@@ -1,4 +1,4 @@
-#include "CAnimTreeSingleChild.hpp"
+#include "Runtime/Character/CAnimTreeSingleChild.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimTreeTimeScale.cpp b/Runtime/Character/CAnimTreeTimeScale.cpp
index 61ce63532..dbf5a754f 100644
--- a/Runtime/Character/CAnimTreeTimeScale.cpp
+++ b/Runtime/Character/CAnimTreeTimeScale.cpp
@@ -1,4 +1,4 @@
-#include "CAnimTreeTimeScale.hpp"
+#include "Runtime/Character/CAnimTreeTimeScale.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimTreeTransition.cpp b/Runtime/Character/CAnimTreeTransition.cpp
index f1b5b1596..8e2c8dd17 100644
--- a/Runtime/Character/CAnimTreeTransition.cpp
+++ b/Runtime/Character/CAnimTreeTransition.cpp
@@ -1,4 +1,4 @@
-#include "CAnimTreeTransition.hpp"
+#include "Runtime/Character/CAnimTreeTransition.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimTreeTweenBase.cpp b/Runtime/Character/CAnimTreeTweenBase.cpp
index a0811eb4c..70a02fc16 100644
--- a/Runtime/Character/CAnimTreeTweenBase.cpp
+++ b/Runtime/Character/CAnimTreeTweenBase.cpp
@@ -1,6 +1,7 @@
-#include "CAnimTreeTweenBase.hpp"
-#include "CSegStatementSet.hpp"
-#include "CSegIdList.hpp"
+#include "Runtime/Character/CAnimTreeTweenBase.hpp"
+
+#include "Runtime/Character/CSegIdList.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimation.cpp b/Runtime/Character/CAnimation.cpp
index ebdf8b2c4..cbb27be3d 100644
--- a/Runtime/Character/CAnimation.cpp
+++ b/Runtime/Character/CAnimation.cpp
@@ -1,5 +1,6 @@
-#include "CAnimation.hpp"
-#include "CMetaAnimFactory.hpp"
+#include "Runtime/Character/CAnimation.hpp"
+
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimationDatabaseGame.cpp b/Runtime/Character/CAnimationDatabaseGame.cpp
index ed8914413..764fee1b4 100644
--- a/Runtime/Character/CAnimationDatabaseGame.cpp
+++ b/Runtime/Character/CAnimationDatabaseGame.cpp
@@ -1,7 +1,8 @@
-#include "CAnimationDatabaseGame.hpp"
-#include "IMetaAnim.hpp"
-#include "CPrimitive.hpp"
-#include "CAnimation.hpp"
+#include "Runtime/Character/CAnimationDatabaseGame.hpp"
+
+#include "Runtime/Character/CAnimation.hpp"
+#include "Runtime/Character/CPrimitive.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimationManager.cpp b/Runtime/Character/CAnimationManager.cpp
index 4f5c1ed3b..d7c69634b 100644
--- a/Runtime/Character/CAnimationManager.cpp
+++ b/Runtime/Character/CAnimationManager.cpp
@@ -1,7 +1,7 @@
-#include "CAnimationManager.hpp"
-#include "CAnimationDatabaseGame.hpp"
-#include "CTransitionDatabaseGame.hpp"
-#include "IMetaAnim.hpp"
+#include "Runtime/Character/CAnimationManager.hpp"
+
+#include "Runtime/Character/CAnimationDatabaseGame.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAnimationSet.cpp b/Runtime/Character/CAnimationSet.cpp
index bf8a83c38..a3ae93fe8 100644
--- a/Runtime/Character/CAnimationSet.cpp
+++ b/Runtime/Character/CAnimationSet.cpp
@@ -1,5 +1,6 @@
-#include "CAnimationSet.hpp"
-#include "CMetaTransFactory.hpp"
+#include "Runtime/Character/CAnimationSet.hpp"
+
+#include "Runtime/Character/CMetaTransFactory.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CAssetFactory.cpp b/Runtime/Character/CAssetFactory.cpp
index 69d92d79a..cf95602c8 100644
--- a/Runtime/Character/CAssetFactory.cpp
+++ b/Runtime/Character/CAssetFactory.cpp
@@ -1,9 +1,10 @@
-#include "CAssetFactory.hpp"
-#include "CAnimCharacterSet.hpp"
-#include "CCharacterFactory.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CModelData.hpp"
-#include "Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CAssetFactory.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+#include "Runtime/Character/CCharacterFactory.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CModelData.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CBodyController.cpp b/Runtime/Character/CBodyController.cpp
index a188d3244..a13feb6cd 100644
--- a/Runtime/Character/CBodyController.cpp
+++ b/Runtime/Character/CBodyController.cpp
@@ -1,11 +1,13 @@
-#include "CBodyController.hpp"
-#include "World/CActor.hpp"
+#include "Runtime/Character/CBodyController.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CPASAnimParm.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CActorModelParticles.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CPhysicsActor.hpp"
-#include "World/CActorModelParticles.hpp"
-#include "Character/CPASAnimParm.hpp"
-#include "Character/CPASAnimParmData.hpp"
-#include "CStateManager.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CBodyState.cpp b/Runtime/Character/CBodyState.cpp
index 5e2285d86..9b903a031 100644
--- a/Runtime/Character/CBodyState.cpp
+++ b/Runtime/Character/CBodyState.cpp
@@ -1,10 +1,12 @@
-#include "CBodyState.hpp"
-#include "CBodyController.hpp"
-#include "World/CActor.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Character/CBodyState.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CBodyController.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CPatterned.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CPASAnimParmData.hpp"
-#include "World/CPatterned.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CBodyStateCmdMgr.cpp b/Runtime/Character/CBodyStateCmdMgr.cpp
index 318834549..139a8bc3b 100644
--- a/Runtime/Character/CBodyStateCmdMgr.cpp
+++ b/Runtime/Character/CBodyStateCmdMgr.cpp
@@ -1,4 +1,5 @@
-#include "CBodyStateCmdMgr.hpp"
+#include "Runtime/Character/CBodyStateCmdMgr.hpp"
+
 #include <cfloat>
 
 namespace urde {
diff --git a/Runtime/Character/CBodyStateInfo.cpp b/Runtime/Character/CBodyStateInfo.cpp
index a71e46753..027a5891b 100644
--- a/Runtime/Character/CBodyStateInfo.cpp
+++ b/Runtime/Character/CBodyStateInfo.cpp
@@ -1,6 +1,7 @@
-#include "CBodyStateInfo.hpp"
-#include "World/CActor.hpp"
-#include "CBodyController.hpp"
+#include "Runtime/Character/CBodyStateInfo.hpp"
+
+#include "Runtime/Character/CBodyController.hpp"
+#include "Runtime/World/CActor.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CBoneTracking.cpp b/Runtime/Character/CBoneTracking.cpp
index 4b57545dc..eab8f1cb5 100644
--- a/Runtime/Character/CBoneTracking.cpp
+++ b/Runtime/Character/CBoneTracking.cpp
@@ -1,9 +1,10 @@
-#include "Character/CBoneTracking.hpp"
-#include "Character/CBodyController.hpp"
-#include "Character/CAnimData.hpp"
-#include "Character/CHierarchyPoseBuilder.hpp"
-#include "World/CPatterned.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Character/CBoneTracking.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CAnimData.hpp"
+#include "Runtime/Character/CBodyController.hpp"
+#include "Runtime/Character/CHierarchyPoseBuilder.hpp"
+#include "Runtime/World/CPatterned.hpp"
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
diff --git a/Runtime/Character/CBoolPOINode.cpp b/Runtime/Character/CBoolPOINode.cpp
index 29caa8a58..c4d2624f7 100644
--- a/Runtime/Character/CBoolPOINode.cpp
+++ b/Runtime/Character/CBoolPOINode.cpp
@@ -1,5 +1,6 @@
-#include "CBoolPOINode.hpp"
-#include "CAnimSourceReader.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CCharAnimTime.cpp b/Runtime/Character/CCharAnimTime.cpp
index a89f2b988..3cffef350 100644
--- a/Runtime/Character/CCharAnimTime.cpp
+++ b/Runtime/Character/CCharAnimTime.cpp
@@ -1,4 +1,5 @@
-#include "CCharAnimTime.hpp"
+#include "Runtime/Character/CCharAnimTime.hpp"
+
 #include <algorithm>
 #include <cmath>
 #include <cfloat>
diff --git a/Runtime/Character/CCharLayoutInfo.cpp b/Runtime/Character/CCharLayoutInfo.cpp
index 5bf284922..74921214b 100644
--- a/Runtime/Character/CCharLayoutInfo.cpp
+++ b/Runtime/Character/CCharLayoutInfo.cpp
@@ -1,5 +1,6 @@
-#include "CCharLayoutInfo.hpp"
-#include "CToken.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CCharacterFactory.cpp b/Runtime/Character/CCharacterFactory.cpp
index c9c28e96d..d22efeae5 100644
--- a/Runtime/Character/CCharacterFactory.cpp
+++ b/Runtime/Character/CCharacterFactory.cpp
@@ -1,18 +1,19 @@
-#include "CCharacterFactory.hpp"
-#include "CAnimCharacterSet.hpp"
-#include "CSimplePool.hpp"
-#include "CTransitionDatabaseGame.hpp"
-#include "CAnimationDatabaseGame.hpp"
-#include "CAnimationManager.hpp"
-#include "CTransitionManager.hpp"
-#include "CRandom16.hpp"
-#include "CPrimitive.hpp"
-#include "CAnimData.hpp"
-#include "CAdditiveAnimPlayback.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CParticleGenInfo.hpp"
-#include "Graphics/CSkinnedModel.hpp"
-#include "Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CCharacterFactory.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CAdditiveAnimPlayback.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+#include "Runtime/Character/CAnimData.hpp"
+#include "Runtime/Character/CAnimationDatabaseGame.hpp"
+#include "Runtime/Character/CAnimationManager.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CParticleGenInfo.hpp"
+#include "Runtime/Character/CPrimitive.hpp"
+#include "Runtime/Character/CTransitionDatabaseGame.hpp"
+#include "Runtime/Character/CTransitionManager.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CCharacterInfo.cpp b/Runtime/Character/CCharacterInfo.cpp
index 12a1f6c93..87b5c14aa 100644
--- a/Runtime/Character/CCharacterInfo.cpp
+++ b/Runtime/Character/CCharacterInfo.cpp
@@ -1,4 +1,4 @@
-#include "CCharacterInfo.hpp"
+#include "Runtime/Character/CCharacterInfo.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CCharacterSet.cpp b/Runtime/Character/CCharacterSet.cpp
index 1ae8be46f..df95c94ca 100644
--- a/Runtime/Character/CCharacterSet.cpp
+++ b/Runtime/Character/CCharacterSet.cpp
@@ -1,4 +1,4 @@
-#include "CCharacterSet.hpp"
+#include "Runtime/Character/CCharacterSet.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CEffectComponent.cpp b/Runtime/Character/CEffectComponent.cpp
index c96795e30..8839ff438 100644
--- a/Runtime/Character/CEffectComponent.cpp
+++ b/Runtime/Character/CEffectComponent.cpp
@@ -1,4 +1,4 @@
-#include "CEffectComponent.hpp"
+#include "Runtime/Character/CEffectComponent.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CFBStreamedAnimReader.cpp b/Runtime/Character/CFBStreamedAnimReader.cpp
index 490e210e3..c9dbc7125 100644
--- a/Runtime/Character/CFBStreamedAnimReader.cpp
+++ b/Runtime/Character/CFBStreamedAnimReader.cpp
@@ -1,6 +1,12 @@
-#include "CFBStreamedAnimReader.hpp"
-#include "CSegIdList.hpp"
-#include "CSegStatementSet.hpp"
+#include "Runtime/Character/CFBStreamedAnimReader.hpp"
+
+#include <algorithm>
+#include <cmath>
+#include <cstring>
+#include <memory>
+
+#include "Runtime/Character/CSegIdList.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CFBStreamedCompression.cpp b/Runtime/Character/CFBStreamedCompression.cpp
index f87bf18b8..a1990dd50 100644
--- a/Runtime/Character/CFBStreamedCompression.cpp
+++ b/Runtime/Character/CFBStreamedCompression.cpp
@@ -1,5 +1,6 @@
-#include "CFBStreamedCompression.hpp"
-#include "CFBStreamedAnimReader.hpp"
+#include "Runtime/Character/CFBStreamedCompression.hpp"
+
+#include "Runtime/Character/CFBStreamedAnimReader.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CGroundMovement.cpp b/Runtime/Character/CGroundMovement.cpp
index bfd32e980..a7b54eeb2 100644
--- a/Runtime/Character/CGroundMovement.cpp
+++ b/Runtime/Character/CGroundMovement.cpp
@@ -1,14 +1,16 @@
-#include "CGroundMovement.hpp"
-#include "World/CPhysicsActor.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Collision/CCollisionInfoList.hpp"
-#include "Collision/CollisionUtil.hpp"
-#include "Collision/CAABoxFilter.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Character/CGroundMovement.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Collision/CAABoxFilter.hpp"
+#include "Runtime/Collision/CCollisionInfoList.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptPlatform.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CScriptPlatform.hpp"
-#include "World/CWorld.hpp"
-#include "World/CPlayer.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CHalfTransition.cpp b/Runtime/Character/CHalfTransition.cpp
index 5b5a1f241..3c240eb5f 100644
--- a/Runtime/Character/CHalfTransition.cpp
+++ b/Runtime/Character/CHalfTransition.cpp
@@ -1,5 +1,6 @@
-#include "CHalfTransition.hpp"
-#include "CMetaTransFactory.hpp"
+#include "Runtime/Character/CHalfTransition.hpp"
+
+#include "Runtime/Character/CMetaTransFactory.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CHierarchyPoseBuilder.cpp b/Runtime/Character/CHierarchyPoseBuilder.cpp
index 438c3d9cc..d4c843d32 100644
--- a/Runtime/Character/CHierarchyPoseBuilder.cpp
+++ b/Runtime/Character/CHierarchyPoseBuilder.cpp
@@ -1,7 +1,9 @@
-#include "CHierarchyPoseBuilder.hpp"
-#include "CAnimData.hpp"
-#include "CCharLayoutInfo.hpp"
-#include "zeus/CEulerAngles.hpp"
+#include "Runtime/Character/CHierarchyPoseBuilder.hpp"
+
+#include "Runtime/Character/CAnimData.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+
+#include <zeus/CEulerAngles.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Character/CIkChain.cpp b/Runtime/Character/CIkChain.cpp
index 07ff900a1..e5905ad62 100644
--- a/Runtime/Character/CIkChain.cpp
+++ b/Runtime/Character/CIkChain.cpp
@@ -1,5 +1,6 @@
-#include "Character/CIkChain.hpp"
-#include "Character/CAnimData.hpp"
+#include "Runtime/Character/CIkChain.hpp"
+
+#include "Runtime/Character/CAnimData.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CInt32POINode.cpp b/Runtime/Character/CInt32POINode.cpp
index 037a33407..a314a9df0 100644
--- a/Runtime/Character/CInt32POINode.cpp
+++ b/Runtime/Character/CInt32POINode.cpp
@@ -1,5 +1,6 @@
-#include "CInt32POINode.hpp"
-#include "CAnimSourceReader.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
 
 namespace urde {
 CInt32POINode::CInt32POINode()
diff --git a/Runtime/Character/CMetaAnimBlend.cpp b/Runtime/Character/CMetaAnimBlend.cpp
index 3577089a2..521f43a45 100644
--- a/Runtime/Character/CMetaAnimBlend.cpp
+++ b/Runtime/Character/CMetaAnimBlend.cpp
@@ -1,6 +1,7 @@
-#include "CMetaAnimBlend.hpp"
-#include "CMetaAnimFactory.hpp"
-#include "CAnimTreeBlend.hpp"
+#include "Runtime/Character/CMetaAnimBlend.hpp"
+
+#include "Runtime/Character/CAnimTreeBlend.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CMetaAnimFactory.cpp b/Runtime/Character/CMetaAnimFactory.cpp
index 56eddc9d0..0efc33c20 100644
--- a/Runtime/Character/CMetaAnimFactory.cpp
+++ b/Runtime/Character/CMetaAnimFactory.cpp
@@ -1,9 +1,10 @@
-#include "CMetaAnimFactory.hpp"
-#include "CMetaAnimPlay.hpp"
-#include "CMetaAnimBlend.hpp"
-#include "CMetaAnimPhaseBlend.hpp"
-#include "CMetaAnimRandom.hpp"
-#include "CMetaAnimSequence.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
+
+#include "Runtime/Character/CMetaAnimBlend.hpp"
+#include "Runtime/Character/CMetaAnimPhaseBlend.hpp"
+#include "Runtime/Character/CMetaAnimPlay.hpp"
+#include "Runtime/Character/CMetaAnimRandom.hpp"
+#include "Runtime/Character/CMetaAnimSequence.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CMetaAnimPhaseBlend.cpp b/Runtime/Character/CMetaAnimPhaseBlend.cpp
index d98942d45..bbec54c51 100644
--- a/Runtime/Character/CMetaAnimPhaseBlend.cpp
+++ b/Runtime/Character/CMetaAnimPhaseBlend.cpp
@@ -1,7 +1,8 @@
-#include "CMetaAnimPhaseBlend.hpp"
-#include "CMetaAnimFactory.hpp"
-#include "CAnimTreeTimeScale.hpp"
-#include "CAnimTreeBlend.hpp"
+#include "Runtime/Character/CMetaAnimPhaseBlend.hpp"
+
+#include "Runtime/Character/CAnimTreeBlend.hpp"
+#include "Runtime/Character/CAnimTreeTimeScale.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CMetaAnimPlay.cpp b/Runtime/Character/CMetaAnimPlay.cpp
index 06125eb70..148464cdb 100644
--- a/Runtime/Character/CMetaAnimPlay.cpp
+++ b/Runtime/Character/CMetaAnimPlay.cpp
@@ -1,8 +1,9 @@
-#include "CMetaAnimPlay.hpp"
-#include "CAnimSysContext.hpp"
-#include "CSimplePool.hpp"
-#include "CAllFormatsAnimSource.hpp"
-#include "CAnimTreeAnimReaderContainer.hpp"
+#include "Runtime/Character/CMetaAnimPlay.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/Character/CAllFormatsAnimSource.hpp"
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CAnimTreeAnimReaderContainer.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CMetaAnimRandom.cpp b/Runtime/Character/CMetaAnimRandom.cpp
index fd7a58a2a..8c88127e5 100644
--- a/Runtime/Character/CMetaAnimRandom.cpp
+++ b/Runtime/Character/CMetaAnimRandom.cpp
@@ -1,6 +1,7 @@
-#include "CMetaAnimRandom.hpp"
-#include "CMetaAnimFactory.hpp"
-#include "CAnimSysContext.hpp"
+#include "Runtime/Character/CMetaAnimRandom.hpp"
+
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CMetaAnimSequence.cpp b/Runtime/Character/CMetaAnimSequence.cpp
index 270a4baee..a781ddba5 100644
--- a/Runtime/Character/CMetaAnimSequence.cpp
+++ b/Runtime/Character/CMetaAnimSequence.cpp
@@ -1,6 +1,7 @@
-#include "CMetaAnimSequence.hpp"
-#include "CMetaAnimFactory.hpp"
-#include "CAnimTreeSequence.hpp"
+#include "Runtime/Character/CMetaAnimSequence.hpp"
+
+#include "Runtime/Character/CAnimTreeSequence.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CMetaTransFactory.cpp b/Runtime/Character/CMetaTransFactory.cpp
index 74905ad48..146645f65 100644
--- a/Runtime/Character/CMetaTransFactory.cpp
+++ b/Runtime/Character/CMetaTransFactory.cpp
@@ -1,8 +1,9 @@
-#include "CMetaTransFactory.hpp"
-#include "CMetaTransMetaAnim.hpp"
-#include "CMetaTransTrans.hpp"
-#include "CMetaTransPhaseTrans.hpp"
-#include "CMetaTransSnap.hpp"
+#include "Runtime/Character/CMetaTransFactory.hpp"
+
+#include "Runtime/Character/CMetaTransMetaAnim.hpp"
+#include "Runtime/Character/CMetaTransPhaseTrans.hpp"
+#include "Runtime/Character/CMetaTransSnap.hpp"
+#include "Runtime/Character/CMetaTransTrans.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CMetaTransMetaAnim.cpp b/Runtime/Character/CMetaTransMetaAnim.cpp
index b5309c5c1..ce7365a71 100644
--- a/Runtime/Character/CMetaTransMetaAnim.cpp
+++ b/Runtime/Character/CMetaTransMetaAnim.cpp
@@ -1,6 +1,7 @@
-#include "CMetaTransMetaAnim.hpp"
-#include "CMetaAnimFactory.hpp"
-#include "CAnimTreeLoopIn.hpp"
+#include "Runtime/Character/CMetaTransMetaAnim.hpp"
+
+#include "Runtime/Character/CAnimTreeLoopIn.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CMetaTransPhaseTrans.cpp b/Runtime/Character/CMetaTransPhaseTrans.cpp
index bc4b9ad9c..6b1804993 100644
--- a/Runtime/Character/CMetaTransPhaseTrans.cpp
+++ b/Runtime/Character/CMetaTransPhaseTrans.cpp
@@ -1,8 +1,9 @@
-#include "CMetaTransPhaseTrans.hpp"
-#include "CAnimTreeNode.hpp"
-#include "CTimeScaleFunctions.hpp"
-#include "CAnimTreeTransition.hpp"
-#include "CAnimTreeTimeScale.hpp"
+#include "Runtime/Character/CMetaTransPhaseTrans.hpp"
+
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/Character/CAnimTreeTimeScale.hpp"
+#include "Runtime/Character/CAnimTreeTransition.hpp"
+#include "Runtime/Character/CTimeScaleFunctions.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CMetaTransSnap.cpp b/Runtime/Character/CMetaTransSnap.cpp
index e28512ed1..92d1711ca 100644
--- a/Runtime/Character/CMetaTransSnap.cpp
+++ b/Runtime/Character/CMetaTransSnap.cpp
@@ -1,4 +1,4 @@
-#include "CMetaTransSnap.hpp"
+#include "Runtime/Character/CMetaTransSnap.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CMetaTransTrans.cpp b/Runtime/Character/CMetaTransTrans.cpp
index f356ccd20..102d28310 100644
--- a/Runtime/Character/CMetaTransTrans.cpp
+++ b/Runtime/Character/CMetaTransTrans.cpp
@@ -1,5 +1,6 @@
-#include "CMetaTransTrans.hpp"
-#include "CAnimTreeTransition.hpp"
+#include "Runtime/Character/CMetaTransTrans.hpp"
+
+#include "Runtime/Character/CAnimTreeTransition.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CModelData.cpp b/Runtime/Character/CModelData.cpp
index ca393103c..1ac59a504 100644
--- a/Runtime/Character/CModelData.cpp
+++ b/Runtime/Character/CModelData.cpp
@@ -1,17 +1,21 @@
-#include "CModelData.hpp"
-#include "CAnimData.hpp"
-#include "IAnimReader.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "Graphics/CSkinnedModel.hpp"
-#include "Graphics/CVertexMorphEffect.hpp"
+#include "Runtime/Character/CModelData.hpp"
+
 #include "Editor/ProjectManager.hpp"
-#include "CActorLights.hpp"
-#include "CStateManager.hpp"
-#include "CPlayerState.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CAssetFactory.hpp"
-#include "CCharacterFactory.hpp"
-#include "CAdditiveAnimPlayback.hpp"
+
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CActorLights.hpp"
+#include "Runtime/Character/CAdditiveAnimPlayback.hpp"
+#include "Runtime/Character/CAnimData.hpp"
+#include "Runtime/Character/CAssetFactory.hpp"
+#include "Runtime/Character/CCharacterFactory.hpp"
+#include "Runtime/Character/IAnimReader.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
+#include "Runtime/Graphics/CVertexMorphEffect.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 static logvisor::Module Log("urde::CModelData");
diff --git a/Runtime/Character/CPASAnimInfo.cpp b/Runtime/Character/CPASAnimInfo.cpp
index c5c09b273..222094958 100644
--- a/Runtime/Character/CPASAnimInfo.cpp
+++ b/Runtime/Character/CPASAnimInfo.cpp
@@ -1,4 +1,4 @@
-#include "CPASAnimInfo.hpp"
+#include "Runtime/Character/CPASAnimInfo.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CPASAnimParmData.cpp b/Runtime/Character/CPASAnimParmData.cpp
index bba370a05..0b0ade4ef 100644
--- a/Runtime/Character/CPASAnimParmData.cpp
+++ b/Runtime/Character/CPASAnimParmData.cpp
@@ -1,4 +1,4 @@
-#include "CPASAnimParmData.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CPASAnimState.cpp b/Runtime/Character/CPASAnimState.cpp
index 0c2ac04c1..ca7f6e517 100644
--- a/Runtime/Character/CPASAnimState.cpp
+++ b/Runtime/Character/CPASAnimState.cpp
@@ -1,9 +1,14 @@
-#include "CPASAnimState.hpp"
-#include "CPASAnimParmData.hpp"
-#include "CRandom16.hpp"
-#include "zeus/Math.hpp"
-#include <cmath>
+#include "Runtime/Character/CPASAnimState.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+
+#include <algorithm>
 #include <cfloat>
+#include <cmath>
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Character/CPASDatabase.cpp b/Runtime/Character/CPASDatabase.cpp
index a46806a13..b15f70952 100644
--- a/Runtime/Character/CPASDatabase.cpp
+++ b/Runtime/Character/CPASDatabase.cpp
@@ -1,6 +1,10 @@
-#include "CPASDatabase.hpp"
-#include "CPASAnimParmData.hpp"
-#include "CRandom16.hpp"
+#include "Runtime/Character/CPASDatabase.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+
+#include <algorithm>
 
 namespace urde {
 
diff --git a/Runtime/Character/CPASParmInfo.cpp b/Runtime/Character/CPASParmInfo.cpp
index 505617a79..942bb0fe4 100644
--- a/Runtime/Character/CPASParmInfo.cpp
+++ b/Runtime/Character/CPASParmInfo.cpp
@@ -1,4 +1,4 @@
-#include "CPASParmInfo.hpp"
+#include "Runtime/Character/CPASParmInfo.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CPOINode.cpp b/Runtime/Character/CPOINode.cpp
index 428c8539f..cd631ad4e 100644
--- a/Runtime/Character/CPOINode.cpp
+++ b/Runtime/Character/CPOINode.cpp
@@ -1,9 +1,10 @@
-#include "CPOINode.hpp"
-#include "CBoolPOINode.hpp"
-#include "CInt32POINode.hpp"
-#include "CParticlePOINode.hpp"
-#include "CSoundPOINode.hpp"
-#include "CAnimSourceReader.hpp"
+#include "Runtime/Character/CPOINode.hpp"
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CParticleData.cpp b/Runtime/Character/CParticleData.cpp
index 3340b3b1a..48c0c60cd 100644
--- a/Runtime/Character/CParticleData.cpp
+++ b/Runtime/Character/CParticleData.cpp
@@ -1,4 +1,4 @@
-#include "CParticleData.hpp"
+#include "Runtime/Character/CParticleData.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CParticleDatabase.cpp b/Runtime/Character/CParticleDatabase.cpp
index 2c4b30e51..e0d0ceb2d 100644
--- a/Runtime/Character/CParticleDatabase.cpp
+++ b/Runtime/Character/CParticleDatabase.cpp
@@ -1,11 +1,12 @@
-#include "CParticleDatabase.hpp"
-#include "CSimplePool.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Character/CCharLayoutInfo.hpp"
-#include "Character/CPoseAsTransforms.hpp"
-#include "Particle/CElementGen.hpp"
-#include "Particle/CParticleSwoosh.hpp"
-#include "Particle/CParticleElectric.hpp"
+#include "Runtime/Character/CParticleDatabase.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CPoseAsTransforms.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CParticleElectric.hpp"
+#include "Runtime/Particle/CParticleSwoosh.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CParticleGenInfo.cpp b/Runtime/Character/CParticleGenInfo.cpp
index 0f8972215..fd67f09fb 100644
--- a/Runtime/Character/CParticleGenInfo.cpp
+++ b/Runtime/Character/CParticleGenInfo.cpp
@@ -1,10 +1,12 @@
-#include "CParticleGenInfo.hpp"
-#include "Graphics/IRenderer.hpp"
-#include "Particle/CParticleGen.hpp"
-#include "GameGlobalObjects.hpp"
-#include "World/CGameLight.hpp"
-#include "CStateManager.hpp"
-#include "Graphics/CBooRenderer.hpp"
+#include "Runtime/Character/CParticleGenInfo.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/IRenderer.hpp"
+#include "Runtime/Particle/CParticleGen.hpp"
+#include "Runtime/World/CGameLight.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {
diff --git a/Runtime/Character/CParticlePOINode.cpp b/Runtime/Character/CParticlePOINode.cpp
index 62e3f136b..514b57700 100644
--- a/Runtime/Character/CParticlePOINode.cpp
+++ b/Runtime/Character/CParticlePOINode.cpp
@@ -1,5 +1,6 @@
-#include "CParticlePOINode.hpp"
-#include "CAnimSourceReader.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CPoseAsTransforms.cpp b/Runtime/Character/CPoseAsTransforms.cpp
index c72e1617c..8b617a250 100644
--- a/Runtime/Character/CPoseAsTransforms.cpp
+++ b/Runtime/Character/CPoseAsTransforms.cpp
@@ -1,5 +1,6 @@
-#include "CPoseAsTransforms.hpp"
-#include "CCharLayoutInfo.hpp"
+#include "Runtime/Character/CPoseAsTransforms.hpp"
+
+#include "Runtime/Character/CCharLayoutInfo.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CPrimitive.cpp b/Runtime/Character/CPrimitive.cpp
index 5e1ebe91e..af081a2b9 100644
--- a/Runtime/Character/CPrimitive.cpp
+++ b/Runtime/Character/CPrimitive.cpp
@@ -1,4 +1,4 @@
-#include "CPrimitive.hpp"
+#include "Runtime/Character/CPrimitive.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CRagDoll.cpp b/Runtime/Character/CRagDoll.cpp
index f0be7fd36..77f6a7f43 100644
--- a/Runtime/Character/CRagDoll.cpp
+++ b/Runtime/Character/CRagDoll.cpp
@@ -1,10 +1,11 @@
-#include "CRagDoll.hpp"
-#include "Collision/CMetroidAreaCollider.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Collision/CMaterialFilter.hpp"
-#include "Collision/CCollidableSphere.hpp"
-#include "Collision/CCollisionInfo.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Character/CRagDoll.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Collision/CCollidableSphere.hpp"
+#include "Runtime/Collision/CCollisionInfo.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Collision/CMaterialFilter.hpp"
+#include "Runtime/Collision/CMetroidAreaCollider.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CSegIdList.cpp b/Runtime/Character/CSegIdList.cpp
index ba04cf338..b5f0a5d8b 100644
--- a/Runtime/Character/CSegIdList.cpp
+++ b/Runtime/Character/CSegIdList.cpp
@@ -1,4 +1,4 @@
-#include "CSegIdList.hpp"
+#include "Runtime/Character/CSegIdList.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CSegStatementSet.cpp b/Runtime/Character/CSegStatementSet.cpp
index f3128dd96..a0bd0ca6f 100644
--- a/Runtime/Character/CSegStatementSet.cpp
+++ b/Runtime/Character/CSegStatementSet.cpp
@@ -1,6 +1,7 @@
-#include "CSegStatementSet.hpp"
-#include "CSegIdList.hpp"
-#include "CCharLayoutInfo.hpp"
+#include "Runtime/Character/CSegStatementSet.hpp"
+
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CSegIdList.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CSequenceHelper.cpp b/Runtime/Character/CSequenceHelper.cpp
index f93cdb0c0..aff24ab97 100644
--- a/Runtime/Character/CSequenceHelper.cpp
+++ b/Runtime/Character/CSequenceHelper.cpp
@@ -1,11 +1,12 @@
-#include "CSequenceHelper.hpp"
-#include "CAnimSysContext.hpp"
-#include "CBoolPOINode.hpp"
-#include "CInt32POINode.hpp"
-#include "CParticlePOINode.hpp"
-#include "CSoundPOINode.hpp"
-#include "IMetaAnim.hpp"
-#include "CTreeUtils.hpp"
+#include "Runtime/Character/CSequenceHelper.hpp"
+
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
+#include "Runtime/Character/CTreeUtils.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CSkinBank.cpp b/Runtime/Character/CSkinBank.cpp
index 85a3142c3..517679b67 100644
--- a/Runtime/Character/CSkinBank.cpp
+++ b/Runtime/Character/CSkinBank.cpp
@@ -1,5 +1,6 @@
-#include "CSkinBank.hpp"
-#include "CPoseAsTransforms.hpp"
+#include "Runtime/Character/CSkinBank.hpp"
+
+#include "Runtime/Character/CPoseAsTransforms.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CSkinRules.cpp b/Runtime/Character/CSkinRules.cpp
index 332e4b5b0..0aac67bdc 100644
--- a/Runtime/Character/CSkinRules.cpp
+++ b/Runtime/Character/CSkinRules.cpp
@@ -1,7 +1,8 @@
-#include "CSkinRules.hpp"
-#include "CToken.hpp"
-#include "Graphics/CModel.hpp"
-#include "CPoseAsTransforms.hpp"
+#include "Runtime/Character/CSkinRules.hpp"
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Character/CPoseAsTransforms.hpp"
+#include "Runtime/Graphics/CModel.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CSoundPOINode.cpp b/Runtime/Character/CSoundPOINode.cpp
index 1d73602b5..c7ac311cf 100644
--- a/Runtime/Character/CSoundPOINode.cpp
+++ b/Runtime/Character/CSoundPOINode.cpp
@@ -1,5 +1,6 @@
-#include "CSoundPOINode.hpp"
-#include "CAnimSourceReader.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CSteeringBehaviors.cpp b/Runtime/Character/CSteeringBehaviors.cpp
index 782cc7c2d..b7dbcff48 100644
--- a/Runtime/Character/CSteeringBehaviors.cpp
+++ b/Runtime/Character/CSteeringBehaviors.cpp
@@ -1,6 +1,7 @@
-#include "CSteeringBehaviors.hpp"
-#include "World/CPhysicsActor.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Character/CSteeringBehaviors.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/World/CPhysicsActor.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CTimeScaleFunctions.cpp b/Runtime/Character/CTimeScaleFunctions.cpp
index 401a5b9c4..18817fea7 100644
--- a/Runtime/Character/CTimeScaleFunctions.cpp
+++ b/Runtime/Character/CTimeScaleFunctions.cpp
@@ -1,5 +1,6 @@
-#include "CTimeScaleFunctions.hpp"
-#include "zeus/Math.hpp"
+#include "Runtime/Character/CTimeScaleFunctions.hpp"
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Character/CTransition.cpp b/Runtime/Character/CTransition.cpp
index 5382ee148..4df34a5aa 100644
--- a/Runtime/Character/CTransition.cpp
+++ b/Runtime/Character/CTransition.cpp
@@ -1,4 +1,4 @@
-#include "CTransition.hpp"
+#include "Runtime/Character/CTransition.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CTransitionDatabaseGame.cpp b/Runtime/Character/CTransitionDatabaseGame.cpp
index edc46e665..4f7f9b0e7 100644
--- a/Runtime/Character/CTransitionDatabaseGame.cpp
+++ b/Runtime/Character/CTransitionDatabaseGame.cpp
@@ -1,6 +1,11 @@
-#include "CTransitionDatabaseGame.hpp"
-#include "CTransition.hpp"
-#include "CHalfTransition.hpp"
+#include "Runtime/Character/CTransitionDatabaseGame.hpp"
+
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CHalfTransition.hpp"
+#include "Runtime/Character/CTransition.hpp"
+
+#include <algorithm>
+#include <utility>
 
 namespace urde {
 
diff --git a/Runtime/Character/CTransitionManager.cpp b/Runtime/Character/CTransitionManager.cpp
index 62c8ba4db..94a867e8a 100644
--- a/Runtime/Character/CTransitionManager.cpp
+++ b/Runtime/Character/CTransitionManager.cpp
@@ -1,5 +1,6 @@
-#include "CTransitionManager.hpp"
-#include "CTreeUtils.hpp"
+#include "Runtime/Character/CTransitionManager.hpp"
+
+#include "Runtime/Character/CTreeUtils.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/CTreeUtils.cpp b/Runtime/Character/CTreeUtils.cpp
index 1624b6811..8c64f0d4d 100644
--- a/Runtime/Character/CTreeUtils.cpp
+++ b/Runtime/Character/CTreeUtils.cpp
@@ -1,8 +1,9 @@
-#include "CTreeUtils.hpp"
-#include "CAnimTreeNode.hpp"
-#include "CAnimSysContext.hpp"
-#include "CTransitionDatabaseGame.hpp"
-#include "IMetaTrans.hpp"
+#include "Runtime/Character/CTreeUtils.hpp"
+
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/Character/CTransitionDatabaseGame.hpp"
+#include "Runtime/Character/IMetaTrans.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/IAnimReader.cpp b/Runtime/Character/IAnimReader.cpp
index 0f41455e9..4a4264343 100644
--- a/Runtime/Character/IAnimReader.cpp
+++ b/Runtime/Character/IAnimReader.cpp
@@ -1,5 +1,6 @@
-#include "IAnimReader.hpp"
-#include "CCharAnimTime.hpp"
+#include "Runtime/Character/IAnimReader.hpp"
+
+#include "Runtime/Character/CCharAnimTime.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Character/IMetaAnim.cpp b/Runtime/Character/IMetaAnim.cpp
index 77ce616ce..22c3715a1 100644
--- a/Runtime/Character/IMetaAnim.cpp
+++ b/Runtime/Character/IMetaAnim.cpp
@@ -1,8 +1,9 @@
-#include "IMetaAnim.hpp"
-#include "CCharAnimTime.hpp"
-#include "IAnimReader.hpp"
-#include "CBoolPOINode.hpp"
-#include "CAnimTreeNode.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
+
+#include "Runtime/Character/CAnimTreeNode.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CCharAnimTime.hpp"
+#include "Runtime/Character/IAnimReader.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Collision/CAreaOctTree.cpp b/Runtime/Collision/CAreaOctTree.cpp
index da90ed3c3..0b40613aa 100644
--- a/Runtime/Collision/CAreaOctTree.cpp
+++ b/Runtime/Collision/CAreaOctTree.cpp
@@ -1,7 +1,14 @@
-#include "CAreaOctTree.hpp"
-#include "CMaterialFilter.hpp"
-#include "zeus/CVector2i.hpp"
+#include "Runtime/Collision/CAreaOctTree.hpp"
+
+#include "Runtime/Collision/CMaterialFilter.hpp"
+
 #include <array>
+#include <cfloat>
+#include <cmath>
+#include <utility>
+
+#include <hecl/hecl.hpp>
+#include <zeus/CVector2i.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Collision/CCollidableAABox.cpp b/Runtime/Collision/CCollidableAABox.cpp
index 947553730..8d8ac3221 100644
--- a/Runtime/Collision/CCollidableAABox.cpp
+++ b/Runtime/Collision/CCollidableAABox.cpp
@@ -1,8 +1,9 @@
-#include "CCollidableAABox.hpp"
-#include "CollisionUtil.hpp"
-#include "CCollidableSphere.hpp"
-#include "CCollisionInfo.hpp"
-#include "CInternalRayCastStructure.hpp"
+#include "Runtime/Collision/CCollidableAABox.hpp"
+
+#include "Runtime/Collision/CCollidableSphere.hpp"
+#include "Runtime/Collision/CCollisionInfo.hpp"
+#include "Runtime/Collision/CInternalRayCastStructure.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
 
 namespace urde {
 constexpr CCollisionPrimitive::Type sType(CCollidableAABox::SetStaticTableIndex, "CCollidableAABox");
diff --git a/Runtime/Collision/CCollidableCollisionSurface.cpp b/Runtime/Collision/CCollidableCollisionSurface.cpp
index 3b41ef6bb..e409eca6b 100644
--- a/Runtime/Collision/CCollidableCollisionSurface.cpp
+++ b/Runtime/Collision/CCollidableCollisionSurface.cpp
@@ -1,4 +1,4 @@
-#include "CCollidableCollisionSurface.hpp"
+#include "Runtime/Collision/CCollidableCollisionSurface.hpp"
 
 namespace urde {
 constexpr CCollisionPrimitive::Type sType(CCollidableCollisionSurface::SetStaticTableIndex,
diff --git a/Runtime/Collision/CCollidableOBBTree.cpp b/Runtime/Collision/CCollidableOBBTree.cpp
index 83b8aaf19..0e7000f64 100644
--- a/Runtime/Collision/CCollidableOBBTree.cpp
+++ b/Runtime/Collision/CCollidableOBBTree.cpp
@@ -1,8 +1,9 @@
-#include "CCollidableOBBTree.hpp"
-#include "CMaterialFilter.hpp"
-#include "CollisionUtil.hpp"
-#include "CInternalRayCastStructure.hpp"
-#include "CCollisionInfoList.hpp"
+#include "Runtime/Collision/CCollidableOBBTree.hpp"
+
+#include "Runtime/Collision/CCollisionInfoList.hpp"
+#include "Runtime/Collision/CInternalRayCastStructure.hpp"
+#include "Runtime/Collision/CMaterialFilter.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Collision/CCollidableOBBTreeGroup.cpp b/Runtime/Collision/CCollidableOBBTreeGroup.cpp
index d5a187bd9..b0f5c69c2 100644
--- a/Runtime/Collision/CCollidableOBBTreeGroup.cpp
+++ b/Runtime/Collision/CCollidableOBBTreeGroup.cpp
@@ -1,10 +1,11 @@
-#include "CCollidableOBBTreeGroup.hpp"
-#include "CCollidableOBBTree.hpp"
-#include "CCollidableAABox.hpp"
-#include "CCollidableSphere.hpp"
-#include "CInternalRayCastStructure.hpp"
-#include "CollisionUtil.hpp"
-#include "CToken.hpp"
+#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Collision/CCollidableAABox.hpp"
+#include "Runtime/Collision/CCollidableOBBTree.hpp"
+#include "Runtime/Collision/CCollidableSphere.hpp"
+#include "Runtime/Collision/CInternalRayCastStructure.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
 
 namespace urde {
 constexpr CCollisionPrimitive::Type sType(CCollidableOBBTreeGroup::SetStaticTableIndex, "CCollidableOBBTreeGroup");
diff --git a/Runtime/Collision/CCollidableSphere.cpp b/Runtime/Collision/CCollidableSphere.cpp
index d027defdd..931dc0202 100644
--- a/Runtime/Collision/CCollidableSphere.cpp
+++ b/Runtime/Collision/CCollidableSphere.cpp
@@ -1,8 +1,9 @@
-#include "CCollidableSphere.hpp"
-#include "CCollisionInfoList.hpp"
-#include "CCollidableAABox.hpp"
-#include "CollisionUtil.hpp"
-#include "CInternalRayCastStructure.hpp"
+#include "Runtime/Collision/CCollidableSphere.hpp"
+
+#include "Runtime/Collision/CCollidableAABox.hpp"
+#include "Runtime/Collision/CCollisionInfoList.hpp"
+#include "Runtime/Collision/CInternalRayCastStructure.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
 
 namespace urde {
 constexpr CCollisionPrimitive::Type sType(CCollidableSphere::SetStaticTableIndex, "CCollidableSphere");
diff --git a/Runtime/Collision/CCollisionActor.cpp b/Runtime/Collision/CCollisionActor.cpp
index f0559c7f4..1c3c4875a 100644
--- a/Runtime/Collision/CCollisionActor.cpp
+++ b/Runtime/Collision/CCollisionActor.cpp
@@ -1,9 +1,11 @@
-#include "CCollisionActor.hpp"
-#include "Camera/CGameCamera.hpp"
-#include "CStateManager.hpp"
-#include "World/CActorParameters.hpp"
-#include "Collision/CCollidableOBBTreeGroup.hpp"
-#include "Collision/CCollidableSphere.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
+#include "Runtime/Collision/CCollidableSphere.hpp"
+#include "Runtime/World/CActorParameters.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {
diff --git a/Runtime/Collision/CCollisionActorManager.cpp b/Runtime/Collision/CCollisionActorManager.cpp
index e9e3baacf..a94b4f346 100644
--- a/Runtime/Collision/CCollisionActorManager.cpp
+++ b/Runtime/Collision/CCollisionActorManager.cpp
@@ -1,9 +1,11 @@
-#include "CCollisionActorManager.hpp"
+#include "Runtime/Collision/CCollisionActorManager.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/Collision/CMaterialList.hpp"
+#include "Runtime/World/CActor.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CActor.hpp"
-#include "CStateManager.hpp"
-#include "CMaterialList.hpp"
-#include "Collision/CCollisionActor.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Collision/CCollisionEdge.cpp b/Runtime/Collision/CCollisionEdge.cpp
index 4a2db3fdd..4ec1b6932 100644
--- a/Runtime/Collision/CCollisionEdge.cpp
+++ b/Runtime/Collision/CCollisionEdge.cpp
@@ -1,4 +1,4 @@
-#include "CCollisionEdge.hpp"
+#include "Runtime/Collision/CCollisionEdge.hpp"
 
 namespace urde {
 CCollisionEdge::CCollisionEdge(CInputStream& in) {
diff --git a/Runtime/Collision/CCollisionInfo.cpp b/Runtime/Collision/CCollisionInfo.cpp
index 62f9e227e..20ab3b27e 100644
--- a/Runtime/Collision/CCollisionInfo.cpp
+++ b/Runtime/Collision/CCollisionInfo.cpp
@@ -1,4 +1,6 @@
-#include "CCollisionInfo.hpp"
+#include "Runtime/Collision/CCollisionInfo.hpp"
+
+#include <utility>
 
 namespace urde {
 
diff --git a/Runtime/Collision/CJointCollisionDescription.cpp b/Runtime/Collision/CJointCollisionDescription.cpp
index 31f38a85e..cbba49cc2 100644
--- a/Runtime/Collision/CJointCollisionDescription.cpp
+++ b/Runtime/Collision/CJointCollisionDescription.cpp
@@ -1,4 +1,4 @@
-#include "Collision/CJointCollisionDescription.hpp"
+#include "Runtime/Collision/CJointCollisionDescription.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Collision/CMetroidAreaCollider.cpp b/Runtime/Collision/CMetroidAreaCollider.cpp
index c29be10e9..5e5ffed0b 100644
--- a/Runtime/Collision/CMetroidAreaCollider.cpp
+++ b/Runtime/Collision/CMetroidAreaCollider.cpp
@@ -1,7 +1,8 @@
-#include "CMetroidAreaCollider.hpp"
-#include "CMaterialFilter.hpp"
-#include "CollisionUtil.hpp"
-#include "CCollisionInfoList.hpp"
+#include "Runtime/Collision/CMetroidAreaCollider.hpp"
+
+#include "Runtime/Collision/CCollisionInfoList.hpp"
+#include "Runtime/Collision/CMaterialFilter.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Collision/COBBTree.cpp b/Runtime/Collision/COBBTree.cpp
index eb4fd6c74..d543e8300 100644
--- a/Runtime/Collision/COBBTree.cpp
+++ b/Runtime/Collision/COBBTree.cpp
@@ -1,5 +1,6 @@
-#include "COBBTree.hpp"
-#include "CCollidableOBBTreeGroup.hpp"
+#include "Runtime/Collision/COBBTree.hpp"
+
+#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
 
 namespace urde {
 /* This is exactly what retro did >.< */
diff --git a/Runtime/Collision/CRayCastResult.cpp b/Runtime/Collision/CRayCastResult.cpp
index bdfe815e6..cad892038 100644
--- a/Runtime/Collision/CRayCastResult.cpp
+++ b/Runtime/Collision/CRayCastResult.cpp
@@ -1,4 +1,4 @@
-#include "CRayCastResult.hpp"
+#include "Runtime/Collision/CRayCastResult.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Collision/InternalColliders.cpp b/Runtime/Collision/InternalColliders.cpp
index 064ab2568..f1abdeb6b 100644
--- a/Runtime/Collision/InternalColliders.cpp
+++ b/Runtime/Collision/InternalColliders.cpp
@@ -1,7 +1,8 @@
-#include "InternalColliders.hpp"
-#include "CCollidableAABox.hpp"
-#include "CCollidableCollisionSurface.hpp"
-#include "CCollidableSphere.hpp"
+#include "Runtime/Collision/InternalColliders.hpp"
+
+#include "Runtime/Collision/CCollidableAABox.hpp"
+#include "Runtime/Collision/CCollidableCollisionSurface.hpp"
+#include "Runtime/Collision/CCollidableSphere.hpp"
 
 namespace urde::InternalColliders {
 void AddTypes() {
diff --git a/Runtime/Graphics/CBooRenderer.cpp b/Runtime/Graphics/CBooRenderer.cpp
index 503373451..18b476213 100644
--- a/Runtime/Graphics/CBooRenderer.cpp
+++ b/Runtime/Graphics/CBooRenderer.cpp
@@ -1,17 +1,25 @@
-#include "boo/System.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CBooRenderer.hpp"
-#include "CModel.hpp"
-#include "Particle/CParticleGen.hpp"
-#include "Particle/CGenDescription.hpp"
-#include "Particle/CDecal.hpp"
-#include "Particle/CElementGen.hpp"
-#include "CMetroidModelInstance.hpp"
-#include "Collision/CAreaOctTree.hpp"
-#include "zeus/CUnitVector.hpp"
-#include "Graphics/CSkinnedModel.hpp"
-#include "zeus/CVector3d.hpp"
-#include "World/CActor.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Collision/CAreaOctTree.hpp"
+#include "Runtime/Graphics/CMetroidModelInstance.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
+#include "Runtime/Particle/CDecal.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CParticleGen.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <algorithm>
+
+#include <boo/System.hpp>
+#include <logvisor/logvisor.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CUnitVector.hpp>
+#include <zeus/CVector3d.hpp>
+#include <zeus/CVector4f.hpp>
 
 #define FOGVOL_RAMP_RES 256
 #define FOGVOL_FAR 750.0
diff --git a/Runtime/Graphics/CGraphics.cpp b/Runtime/Graphics/CGraphics.cpp
index 776247293..cbe08c43c 100644
--- a/Runtime/Graphics/CGraphics.cpp
+++ b/Runtime/Graphics/CGraphics.cpp
@@ -1,10 +1,12 @@
-#include "Graphics/CGraphics.hpp"
-#include "Graphics/CLight.hpp"
-#include "zeus/Math.hpp"
-#include "CTimeProvider.hpp"
-#include "Shaders/CTextSupportShader.hpp"
-#include "GuiSys/CGuiSys.hpp"
-#include "CLineRenderer.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include "Runtime/CTimeProvider.hpp"
+#include "Runtime/Graphics/CLight.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
+#include "Runtime/Graphics/Shaders/CTextSupportShader.hpp"
+#include "Runtime/GuiSys/CGuiSys.hpp"
+
+#include <zeus/Math.hpp>
 
 namespace urde {
 
diff --git a/Runtime/Graphics/CLight.cpp b/Runtime/Graphics/CLight.cpp
index b7908150e..bea0df8b9 100644
--- a/Runtime/Graphics/CLight.cpp
+++ b/Runtime/Graphics/CLight.cpp
@@ -1,4 +1,5 @@
-#include "CLight.hpp"
+#include "Runtime/Graphics/CLight.hpp"
+
 #include <cfloat>
 
 namespace urde {
diff --git a/Runtime/Graphics/CLineRenderer.cpp b/Runtime/Graphics/CLineRenderer.cpp
index 3cb4b9356..367b6badf 100644
--- a/Runtime/Graphics/CLineRenderer.cpp
+++ b/Runtime/Graphics/CLineRenderer.cpp
@@ -1,5 +1,8 @@
-#include "CLineRenderer.hpp"
-#include "Shaders/CLineRendererShaders.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
+
+#include "Runtime/Graphics/Shaders/CLineRendererShaders.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 logvisor::Module LineRendererLog("urde::CLineRenderer");
diff --git a/Runtime/Graphics/CModelBoo.cpp b/Runtime/Graphics/CModelBoo.cpp
index e157ee43c..e2992e644 100644
--- a/Runtime/Graphics/CModelBoo.cpp
+++ b/Runtime/Graphics/CModelBoo.cpp
@@ -1,18 +1,22 @@
-#include "Graphics/CModel.hpp"
-#include "Graphics/CTexture.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "Graphics/CLight.hpp"
-#include "hecl/HMDLMeta.hpp"
-#include "hecl/Runtime.hpp"
-#include "hecl/CVarManager.hpp"
-#include "boo/graphicsdev/Metal.hpp"
-#include "Shaders/CModelShaders.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "Character/CSkinRules.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CSkinRules.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CLight.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/Shaders/CModelShaders.hpp"
+
 #include <array>
 
+#include <boo/graphicsdev/Metal.hpp>
+#include <hecl/CVarManager.hpp>
+#include <hecl/HMDLMeta.hpp>
+#include <hecl/Runtime.hpp>
+#include <logvisor/logvisor.hpp>
+
 namespace urde {
 static logvisor::Module Log("urde::CBooModel");
 bool CBooModel::g_DrawingOccluders = false;
diff --git a/Runtime/Graphics/CMoviePlayer.cpp b/Runtime/Graphics/CMoviePlayer.cpp
index d2634daa2..ca90937f8 100644
--- a/Runtime/Graphics/CMoviePlayer.cpp
+++ b/Runtime/Graphics/CMoviePlayer.cpp
@@ -1,11 +1,13 @@
-#include "CMoviePlayer.hpp"
-#include "boo/graphicsdev/GLSLMacros.hpp"
-#include "specter/View.hpp"
-#include "CGraphics.hpp"
-#include "Audio/g721.h"
-#include "amuse/DSPCodec.hpp"
-#include "CDvdRequest.hpp"
-#include "hecl/Pipeline.hpp"
+#include "Runtime/Graphics/CMoviePlayer.hpp"
+
+#include "Runtime/CDvdRequest.hpp"
+#include "Runtime/Audio/g721.h"
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include <amuse/DSPCodec.hpp>
+#include <boo/graphicsdev/GLSLMacros.hpp>
+#include <hecl/Pipeline.hpp>
+#include <specter/View.hpp>
 #include <turbojpeg.h>
 
 namespace urde {
diff --git a/Runtime/Graphics/CPVSAreaSet.cpp b/Runtime/Graphics/CPVSAreaSet.cpp
index e03745377..1caa15add 100644
--- a/Runtime/Graphics/CPVSAreaSet.cpp
+++ b/Runtime/Graphics/CPVSAreaSet.cpp
@@ -1,4 +1,4 @@
-#include "CPVSAreaSet.hpp"
+#include "Runtime/Graphics/CPVSAreaSet.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Graphics/CPVSVisOctree.cpp b/Runtime/Graphics/CPVSVisOctree.cpp
index 0dcea0217..d1767ebc6 100644
--- a/Runtime/Graphics/CPVSVisOctree.cpp
+++ b/Runtime/Graphics/CPVSVisOctree.cpp
@@ -1,4 +1,4 @@
-#include "CPVSVisOctree.hpp"
+#include "Runtime/Graphics/CPVSVisOctree.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Graphics/CPVSVisSet.cpp b/Runtime/Graphics/CPVSVisSet.cpp
index 0f80f7f41..7ed070c17 100644
--- a/Runtime/Graphics/CPVSVisSet.cpp
+++ b/Runtime/Graphics/CPVSVisSet.cpp
@@ -1,5 +1,6 @@
-#include "CPVSVisSet.hpp"
-#include "CPVSVisOctree.hpp"
+#include "Runtime/Graphics/CPVSVisSet.hpp"
+
+#include "Runtime/Graphics/CPVSVisOctree.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Graphics/CRainSplashGenerator.cpp b/Runtime/Graphics/CRainSplashGenerator.cpp
index 6d7af1a3a..5937788a5 100644
--- a/Runtime/Graphics/CRainSplashGenerator.cpp
+++ b/Runtime/Graphics/CRainSplashGenerator.cpp
@@ -1,8 +1,9 @@
-#include "CRainSplashGenerator.hpp"
-#include "CStateManager.hpp"
-#include "World/CWorld.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/CRainSplashGenerator.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/World/CWorld.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Graphics/CSimpleShadow.cpp b/Runtime/Graphics/CSimpleShadow.cpp
index 3c6a65542..7beb2d5b9 100644
--- a/Runtime/Graphics/CSimpleShadow.cpp
+++ b/Runtime/Graphics/CSimpleShadow.cpp
@@ -1,6 +1,7 @@
-#include "CSimpleShadow.hpp"
-#include "CStateManager.hpp"
-#include "Collision/CGameCollision.hpp"
+#include "Runtime/Graphics/CSimpleShadow.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Graphics/CSkinnedModel.cpp b/Runtime/Graphics/CSkinnedModel.cpp
index 57f701354..11ced1a9a 100644
--- a/Runtime/Graphics/CSkinnedModel.cpp
+++ b/Runtime/Graphics/CSkinnedModel.cpp
@@ -1,6 +1,9 @@
-#include "CSkinnedModel.hpp"
-#include "Character/CSkinRules.hpp"
-#include "CVertexMorphEffect.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
+
+#include "Runtime/Character/CSkinRules.hpp"
+#include "Runtime/Graphics/CVertexMorphEffect.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 static logvisor::Module Log("urde::CSkinnedModel");
diff --git a/Runtime/Graphics/CVertexMorphEffect.cpp b/Runtime/Graphics/CVertexMorphEffect.cpp
index d0b6f8d0d..3a3d0ed81 100644
--- a/Runtime/Graphics/CVertexMorphEffect.cpp
+++ b/Runtime/Graphics/CVertexMorphEffect.cpp
@@ -1,5 +1,6 @@
-#include "CVertexMorphEffect.hpp"
-#include "Character/CSkinRules.hpp"
+#include "Runtime/Graphics/CVertexMorphEffect.hpp"
+
+#include "Runtime/Character/CSkinRules.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Graphics/IWeaponRenderer.cpp b/Runtime/Graphics/IWeaponRenderer.cpp
index 0a1e5c525..cfbbc3657 100644
--- a/Runtime/Graphics/IWeaponRenderer.cpp
+++ b/Runtime/Graphics/IWeaponRenderer.cpp
@@ -1,5 +1,6 @@
-#include "IWeaponRenderer.hpp"
-#include "Particle/CParticleGen.hpp"
+#include "Runtime/Graphics/IWeaponRenderer.hpp"
+
+#include "Runtime/Particle/CParticleGen.hpp"
 
 namespace urde {
 
diff --git a/Runtime/MP1/CAudioStateWin.cpp b/Runtime/MP1/CAudioStateWin.cpp
index 9c98b8613..89ca24fb1 100644
--- a/Runtime/MP1/CAudioStateWin.cpp
+++ b/Runtime/MP1/CAudioStateWin.cpp
@@ -1,10 +1,11 @@
 #include "CAudioStateWin.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "CArchitectureMessage.hpp"
-#include "CArchitectureQueue.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CGameState.hpp"
-#include "MP1.hpp"
+
+#include "Runtime/CArchitectureMessage.hpp"
+#include "Runtime/CArchitectureQueue.hpp"
+#include "Runtime/CGameState.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/MP1/MP1.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CCredits.cpp b/Runtime/MP1/CCredits.cpp
index 2de9198bf..72e4e73fa 100644
--- a/Runtime/MP1/CCredits.cpp
+++ b/Runtime/MP1/CCredits.cpp
@@ -1,5 +1,6 @@
-#include "CCredits.hpp"
-#include "Graphics/CGraphics.hpp"
+#include "Runtime/MP1/CCredits.hpp"
+
+#include "Runtime/Graphics/CGraphics.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CFaceplateDecoration.cpp b/Runtime/MP1/CFaceplateDecoration.cpp
index 9f7f58a9e..2c45c778a 100644
--- a/Runtime/MP1/CFaceplateDecoration.cpp
+++ b/Runtime/MP1/CFaceplateDecoration.cpp
@@ -1,9 +1,10 @@
-#include "CFaceplateDecoration.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "Particle/CGenDescription.hpp"
+#include "Runtime/MP1/CFaceplateDecoration.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/World/CPlayer.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CFrontEndUITouchBar.cpp b/Runtime/MP1/CFrontEndUITouchBar.cpp
index bbdf82b0b..ccc5ccf2f 100644
--- a/Runtime/MP1/CFrontEndUITouchBar.cpp
+++ b/Runtime/MP1/CFrontEndUITouchBar.cpp
@@ -1,4 +1,4 @@
-#include "CFrontEndUITouchBar.hpp"
+#include "Runtime/MP1/CFrontEndUITouchBar.hpp"
 
 namespace urde {
 
diff --git a/Runtime/MP1/CGBASupport.cpp b/Runtime/MP1/CGBASupport.cpp
index 113241436..1806edc56 100644
--- a/Runtime/MP1/CGBASupport.cpp
+++ b/Runtime/MP1/CGBASupport.cpp
@@ -1,9 +1,9 @@
-#include "CGBASupport.hpp"
+#include "Runtime/MP1/CGBASupport.hpp"
 
 #include <cstring>
 
-#include "CBasics.hpp"
-#include "CDvdRequest.hpp"
+#include "Runtime/CBasics.hpp"
+#include "Runtime/CDvdRequest.hpp"
 
 #include <jbus/Endpoint.hpp>
 #include <jbus/Listener.hpp>
diff --git a/Runtime/MP1/CGameCubeDoll.cpp b/Runtime/MP1/CGameCubeDoll.cpp
index 4f78b2c43..86e643bb6 100644
--- a/Runtime/MP1/CGameCubeDoll.cpp
+++ b/Runtime/MP1/CGameCubeDoll.cpp
@@ -1,7 +1,8 @@
-#include "CGameCubeDoll.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "Graphics/CBooRenderer.hpp"
+#include "Runtime/MP1/CGameCubeDoll.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CInGameGuiManager.cpp b/Runtime/MP1/CInGameGuiManager.cpp
index 064f305ec..561c98e72 100644
--- a/Runtime/MP1/CInGameGuiManager.cpp
+++ b/Runtime/MP1/CInGameGuiManager.cpp
@@ -1,21 +1,22 @@
-#include "CInGameGuiManager.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "World/CPlayer.hpp"
-#include "CDependencyGroup.hpp"
-#include "CSimplePool.hpp"
-#include "GuiSys/CGuiFrame.hpp"
-#include "GuiSys/CGuiCamera.hpp"
-#include "GuiSys/CGuiModel.hpp"
-#include "AutoMapper/CAutoMapper.hpp"
-#include "Particle/CGenDescription.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "CSamusHud.hpp"
-#include "Input/CInputGenerator.hpp"
+#include "Runtime/MP1/CInGameGuiManager.hpp"
+
+#include "Runtime/CDependencyGroup.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/AutoMapper/CAutoMapper.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/GuiSys/CGuiCamera.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/Input/CInputGenerator.hpp"
+#include "Runtime/MP1/CSamusHud.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "Camera/CFirstPersonCamera.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "GuiSys/CGuiWidgetDrawParms.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CInventoryScreen.cpp b/Runtime/MP1/CInventoryScreen.cpp
index 2a415dd53..d6a82c63e 100644
--- a/Runtime/MP1/CInventoryScreen.cpp
+++ b/Runtime/MP1/CInventoryScreen.cpp
@@ -1,9 +1,10 @@
-#include "CInventoryScreen.hpp"
-#include "GuiSys/CGuiTableGroup.hpp"
-#include "GuiSys/CGuiTextPane.hpp"
-#include "GuiSys/CGuiModel.hpp"
-#include "Input/ControlMapper.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/MP1/CInventoryScreen.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiTableGroup.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/Input/ControlMapper.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CMFGame.cpp b/Runtime/MP1/CMFGame.cpp
index 885cd0802..5bfa54a36 100644
--- a/Runtime/MP1/CMFGame.cpp
+++ b/Runtime/MP1/CMFGame.cpp
@@ -1,12 +1,14 @@
-#include "CMFGame.hpp"
-#include "CArchitectureQueue.hpp"
-#include "World/CPlayer.hpp"
-#include "MP1.hpp"
-#include "AutoMapper/CAutoMapper.hpp"
-#include "CSamusHud.hpp"
+#include "Runtime/MP1/CMFGame.hpp"
+
+#include "Runtime/CArchitectureQueue.hpp"
+#include "Runtime/MP1/CSamusHud.hpp"
+#include "Runtime/MP1/MP1.hpp"
+#include "Runtime/Audio/CMidiManager.hpp"
+#include "Runtime/AutoMapper/CAutoMapper.hpp"
+#include "Runtime/Camera/CCinematicCamera.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "Audio/CMidiManager.hpp"
-#include "Camera/CCinematicCamera.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CMainFlow.cpp b/Runtime/MP1/CMainFlow.cpp
index d833f8b43..8822d8c9c 100644
--- a/Runtime/MP1/CMainFlow.cpp
+++ b/Runtime/MP1/CMainFlow.cpp
@@ -1,18 +1,20 @@
-#include "CMainFlow.hpp"
-#include "MP1.hpp"
-#include "CArchitectureQueue.hpp"
-#include "CMFGame.hpp"
-#include "CPlayMovie.hpp"
-#include "CResFactory.hpp"
-#include "CFrontEndUI.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Character/CCharLayoutInfo.hpp"
-#include "CSaveGameScreen.hpp"
-#include "CCredits.hpp"
-#include "CPreFrontEnd.hpp"
-#include "CStateSetterFlow.hpp"
-#include "CNESEmulator.hpp"
-#include "CQuitGameScreen.hpp"
+#include "Runtime/MP1/CMainFlow.hpp"
+
+#include "NESEmulator/CNESEmulator.hpp"
+
+#include "Runtime/CArchitectureQueue.hpp"
+#include "Runtime/CResFactory.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/MP1/CCredits.hpp"
+#include "Runtime/MP1/CFrontEndUI.hpp"
+#include "Runtime/MP1/CMFGame.hpp"
+#include "Runtime/MP1/CPlayMovie.hpp"
+#include "Runtime/MP1/CPreFrontEnd.hpp"
+#include "Runtime/MP1/CQuitGameScreen.hpp"
+#include "Runtime/MP1/CSaveGameScreen.hpp"
+#include "Runtime/MP1/CStateSetterFlow.hpp"
+#include "Runtime/MP1/MP1.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CMemoryCardDriver.cpp b/Runtime/MP1/CMemoryCardDriver.cpp
index eb19c9d91..8f916ed80 100644
--- a/Runtime/MP1/CMemoryCardDriver.cpp
+++ b/Runtime/MP1/CMemoryCardDriver.cpp
@@ -1,6 +1,7 @@
-#include "CMemoryCardDriver.hpp"
-#include "MP1.hpp"
-#include "CCRC32.hpp"
+#include "Runtime/MP1/CMemoryCardDriver.hpp"
+
+#include "Runtime/CCRC32.hpp"
+#include "Runtime/MP1/MP1.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CMessageScreen.cpp b/Runtime/MP1/CMessageScreen.cpp
index 1cb72590b..ea2b28c7c 100644
--- a/Runtime/MP1/CMessageScreen.cpp
+++ b/Runtime/MP1/CMessageScreen.cpp
@@ -1,12 +1,13 @@
-#include "CMessageScreen.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "GuiSys/CGuiModel.hpp"
-#include "GuiSys/CGuiTextPane.hpp"
-#include "CGameState.hpp"
-#include "Input/CFinalInput.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/MP1/CMessageScreen.hpp"
+
+#include "Runtime/CGameState.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/Input/CFinalInput.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/COptionsScreen.cpp b/Runtime/MP1/COptionsScreen.cpp
index 8d2419cf1..0bb91fe3f 100644
--- a/Runtime/MP1/COptionsScreen.cpp
+++ b/Runtime/MP1/COptionsScreen.cpp
@@ -1,9 +1,10 @@
-#include "COptionsScreen.hpp"
-#include "GuiSys/CGuiTableGroup.hpp"
-#include "GuiSys/CGuiTextPane.hpp"
-#include "GuiSys/CGuiSliderGroup.hpp"
-#include "Input/RumbleFxTable.hpp"
-#include "CArchitectureQueue.hpp"
+#include "Runtime/MP1/COptionsScreen.hpp"
+
+#include "Runtime/CArchitectureQueue.hpp"
+#include "Runtime/GuiSys/CGuiSliderGroup.hpp"
+#include "Runtime/GuiSys/CGuiTableGroup.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/Input/RumbleFxTable.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CPauseScreen.cpp b/Runtime/MP1/CPauseScreen.cpp
index de84e6504..706156aa2 100644
--- a/Runtime/MP1/CPauseScreen.cpp
+++ b/Runtime/MP1/CPauseScreen.cpp
@@ -1,13 +1,14 @@
-#include "CPauseScreen.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "CLogBookScreen.hpp"
-#include "COptionsScreen.hpp"
-#include "GuiSys/CGuiSys.hpp"
-#include "GuiSys/CGuiTextPane.hpp"
-#include "GuiSys/CGuiWidgetDrawParms.hpp"
-#include "Input/ControlMapper.hpp"
+#include "Runtime/MP1/CPauseScreen.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/GuiSys/CGuiSys.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/Input/ControlMapper.hpp"
+#include "Runtime/MP1/CLogBookScreen.hpp"
+#include "Runtime/MP1/COptionsScreen.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CPauseScreenBase.cpp b/Runtime/MP1/CPauseScreenBase.cpp
index 577af0910..eb1b06278 100644
--- a/Runtime/MP1/CPauseScreenBase.cpp
+++ b/Runtime/MP1/CPauseScreenBase.cpp
@@ -1,15 +1,16 @@
-#include "CPauseScreenBase.hpp"
-#include "GuiSys/CGuiFrame.hpp"
-#include "GuiSys/CGuiTableGroup.hpp"
-#include "GuiSys/CGuiSliderGroup.hpp"
-#include "GuiSys/CGuiModel.hpp"
-#include "GuiSys/CGuiTextPane.hpp"
-#include "GuiSys/CAuiImagePane.hpp"
-#include "GuiSys/CGuiWidgetDrawParms.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "CGameState.hpp"
-#include "GuiSys/CStringTable.hpp"
+#include "Runtime/MP1/CPauseScreenBase.hpp"
+
+#include "Runtime/CGameState.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/GuiSys/CAuiImagePane.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiSliderGroup.hpp"
+#include "Runtime/GuiSys/CGuiTableGroup.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/GuiSys/CStringTable.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CPauseScreenBlur.cpp b/Runtime/MP1/CPauseScreenBlur.cpp
index bdb8396cb..c668f0db6 100644
--- a/Runtime/MP1/CPauseScreenBlur.cpp
+++ b/Runtime/MP1/CPauseScreenBlur.cpp
@@ -1,7 +1,8 @@
-#include "CPauseScreenBlur.hpp"
-#include "CSimplePool.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Audio/CSfxManager.hpp"
+#include "Runtime/MP1/CPauseScreenBlur.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CPlayMovie.cpp b/Runtime/MP1/CPlayMovie.cpp
index 0b8c8dd77..fcffdaf28 100644
--- a/Runtime/MP1/CPlayMovie.cpp
+++ b/Runtime/MP1/CPlayMovie.cpp
@@ -1,4 +1,4 @@
-#include "CPlayMovie.hpp"
+#include "Runtime/MP1/CPlayMovie.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CPlayerVisor.cpp b/Runtime/MP1/CPlayerVisor.cpp
index 35b19f11d..ffd84babb 100644
--- a/Runtime/MP1/CPlayerVisor.cpp
+++ b/Runtime/MP1/CPlayerVisor.cpp
@@ -1,14 +1,16 @@
-#include "CPlayerVisor.hpp"
-#include "CSimplePool.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/CModel.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
+#include "Runtime/MP1/CPlayerVisor.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/GuiSys/CCompoundTargetReticle.hpp"
+#include "Runtime/GuiSys/CTargetingManager.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "Camera/CGameCamera.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "GuiSys/CCompoundTargetReticle.hpp"
-#include "GuiSys/CTargetingManager.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CPreFrontEnd.cpp b/Runtime/MP1/CPreFrontEnd.cpp
index f7f51b516..b9f7d5ee7 100644
--- a/Runtime/MP1/CPreFrontEnd.cpp
+++ b/Runtime/MP1/CPreFrontEnd.cpp
@@ -1,7 +1,8 @@
-#include "CPreFrontEnd.hpp"
-#include "CResLoader.hpp"
-#include "GameGlobalObjects.hpp"
-#include "MP1.hpp"
+#include "Runtime/MP1/CPreFrontEnd.hpp"
+
+#include "Runtime/CResLoader.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/MP1/MP1.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CSamusDoll.cpp b/Runtime/MP1/CSamusDoll.cpp
index e84fdd867..c5f715b43 100644
--- a/Runtime/MP1/CSamusDoll.cpp
+++ b/Runtime/MP1/CSamusDoll.cpp
@@ -1,11 +1,19 @@
-#include "CSamusDoll.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CDependencyGroup.hpp"
-#include "zeus/CEulerAngles.hpp"
-#include "Collision/CollisionUtil.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "World/CMorphBall.hpp"
+#include "Runtime/MP1/CSamusDoll.hpp"
+
+#include "Runtime/CDependencyGroup.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/World/CMorphBall.hpp"
+
+#include <algorithm>
+#include <cfloat>
+#include <cmath>
+#include <memory>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CEulerAngles.hpp>
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CSamusFaceReflection.cpp b/Runtime/MP1/CSamusFaceReflection.cpp
index 50693d287..84ca37816 100644
--- a/Runtime/MP1/CSamusFaceReflection.cpp
+++ b/Runtime/MP1/CSamusFaceReflection.cpp
@@ -1,10 +1,12 @@
-#include "CSamusFaceReflection.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/MP1/CSamusFaceReflection.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "Camera/CFirstPersonCamera.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CWorld.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CSamusHud.cpp b/Runtime/MP1/CSamusHud.cpp
index 470fe4154..0bc2a4279 100644
--- a/Runtime/MP1/CSamusHud.cpp
+++ b/Runtime/MP1/CSamusHud.cpp
@@ -1,17 +1,19 @@
-#include "CSamusHud.hpp"
-#include "CSimplePool.hpp"
-#include "GameGlobalObjects.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptTrigger.hpp"
-#include "GuiSys/CGuiFrame.hpp"
-#include "GuiSys/CGuiTextPane.hpp"
-#include "GuiSys/CGuiLight.hpp"
-#include "GuiSys/CGuiModel.hpp"
-#include "GuiSys/CGuiCamera.hpp"
-#include "GuiSys/CGuiWidgetDrawParms.hpp"
-#include "Camera/CFirstPersonCamera.hpp"
+#include "Runtime/MP1/CSamusHud.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/GuiSys/CGuiCamera.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiLight.hpp"
+#include "Runtime/GuiSys/CGuiModel.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/World/CGameLight.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptTrigger.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CGameLight.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CSaveGameScreen.cpp b/Runtime/MP1/CSaveGameScreen.cpp
index d8fbcf4a6..95fe4acda 100644
--- a/Runtime/MP1/CSaveGameScreen.cpp
+++ b/Runtime/MP1/CSaveGameScreen.cpp
@@ -1,13 +1,14 @@
-#include "CSaveGameScreen.hpp"
-#include "CSimplePool.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CMemoryCardSys.hpp"
-#include "GuiSys/CGuiFrame.hpp"
-#include "GuiSys/CGuiTableGroup.hpp"
-#include "GuiSys/CGuiTextPane.hpp"
-#include "GuiSys/CGuiWidgetDrawParms.hpp"
-#include "Audio/CSfxManager.hpp"
-#include "MP1/MP1.hpp"
+#include "Runtime/MP1/CSaveGameScreen.hpp"
+
+#include "Runtime/CMemoryCardSys.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/GuiSys/CGuiFrame.hpp"
+#include "Runtime/GuiSys/CGuiTableGroup.hpp"
+#include "Runtime/GuiSys/CGuiTextPane.hpp"
+#include "Runtime/GuiSys/CGuiWidgetDrawParms.hpp"
+#include "Runtime/MP1/MP1.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CSaveGameScreenTouchBar.cpp b/Runtime/MP1/CSaveGameScreenTouchBar.cpp
index 0e79b6c4c..281a5d968 100644
--- a/Runtime/MP1/CSaveGameScreenTouchBar.cpp
+++ b/Runtime/MP1/CSaveGameScreenTouchBar.cpp
@@ -1,4 +1,4 @@
-#include "CSaveGameScreenTouchBar.hpp"
+#include "Runtime/MP1/CSaveGameScreenTouchBar.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/CSlideShow.cpp b/Runtime/MP1/CSlideShow.cpp
index 8d26b22db..60a3c6e6d 100644
--- a/Runtime/MP1/CSlideShow.cpp
+++ b/Runtime/MP1/CSlideShow.cpp
@@ -1,7 +1,9 @@
-#include "CSlideShow.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/MP1/CSlideShow.hpp"
+
 #include "Editor/ProjectManager.hpp"
 
+#include "Runtime/GameGlobalObjects.hpp"
+
 namespace urde {
 
 CSlideShow::CSlideShow() : CIOWin("SlideShow"), x5c_slideA(*this), x90_slideB(*this) {
diff --git a/Runtime/MP1/CStateSetterFlow.cpp b/Runtime/MP1/CStateSetterFlow.cpp
index d4a896630..3ebcedb74 100644
--- a/Runtime/MP1/CStateSetterFlow.cpp
+++ b/Runtime/MP1/CStateSetterFlow.cpp
@@ -1,7 +1,9 @@
-#include "CStateSetterFlow.hpp"
-#include "CArchitectureMessage.hpp"
-#include "GameGlobalObjects.hpp"
-#include "MP1.hpp"
+#include "Runtime/MP1/CStateSetterFlow.hpp"
+
+#include "Runtime/CArchitectureMessage.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/MP1/MP1.hpp"
+
 namespace urde::MP1 {
 
 CStateSetterFlow::CStateSetterFlow() : CIOWin("") {}
diff --git a/Runtime/MP1/CTweaks.cpp b/Runtime/MP1/CTweaks.cpp
index 52e7a2919..431ab3dfc 100644
--- a/Runtime/MP1/CTweaks.cpp
+++ b/Runtime/MP1/CTweaks.cpp
@@ -1,10 +1,5 @@
-#include "logvisor/logvisor.hpp"
-#include "CTweaks.hpp"
-#include "CResFactory.hpp"
-#include "CResLoader.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Editor/ProjectManager.hpp"
-#include "Editor/ProjectResourceFactoryMP1.hpp"
+#include "Runtime/MP1/CTweaks.hpp"
+
 #include "DataSpec/DNAMP1/Tweaks/CTweakGame.hpp"
 #include "DataSpec/DNAMP1/Tweaks/CTweakPlayer.hpp"
 #include "DataSpec/DNAMP1/Tweaks/CTweakPlayerControl.hpp"
@@ -18,7 +13,13 @@
 #include "DataSpec/DNAMP1/Tweaks/CTweakBall.hpp"
 #include "DataSpec/DNAMP1/Tweaks/CTweakGuiColors.hpp"
 #include "DataSpec/DNAMP1/Tweaks/CTweakPlayerGun.hpp"
-#include "World/CPlayerCameraBob.hpp"
+
+#include "Editor/ProjectManager.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/World/CPlayerCameraBob.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 
diff --git a/Runtime/MP1/MP1.cpp b/Runtime/MP1/MP1.cpp
index 3491e9d00..fbb94dc62 100644
--- a/Runtime/MP1/MP1.cpp
+++ b/Runtime/MP1/MP1.cpp
@@ -1,69 +1,71 @@
 #include "Runtime/MP1/MP1.hpp"
 
-#include "Runtime/Graphics/Shaders/CModelShaders.hpp"
-#include "Runtime/Graphics/Shaders/CThermalColdFilter.hpp"
-#include "Runtime/Graphics/Shaders/CThermalHotFilter.hpp"
-#include "Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp"
+#include "NESEmulator/CNESShader.hpp"
+
+#include "Runtime/Graphics/Shaders/CAABoxShader.hpp"
+#include "Runtime/Graphics/Shaders/CCameraBlurFilter.hpp"
 #include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
 #include "Runtime/Graphics/Shaders/CColoredStripShader.hpp"
-#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
-#include "Runtime/Graphics/Shaders/CCameraBlurFilter.hpp"
-#include "Runtime/Graphics/Shaders/CXRayBlurFilter.hpp"
-#include "Runtime/Graphics/Shaders/CTextSupportShader.hpp"
 #include "Runtime/Graphics/Shaders/CEnergyBarShader.hpp"
-#include "Runtime/Graphics/Shaders/CRadarPaintShader.hpp"
-#include "Runtime/Graphics/Shaders/CMapSurfaceShader.hpp"
-#include "Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp"
-#include "Runtime/Graphics/Shaders/CScanLinesFilter.hpp"
-#include "Runtime/Graphics/Shaders/CRandomStaticFilter.hpp"
-#include "Runtime/Graphics/Shaders/CFluidPlaneShader.hpp"
-#include "Runtime/Graphics/Shaders/CAABoxShader.hpp"
-#include "Runtime/Graphics/Shaders/CWorldShadowShader.hpp"
-#include "Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp"
 #include "Runtime/Graphics/Shaders/CEnvFxShaders.hpp"
-#include "NESEmulator/CNESShader.hpp"
-#include "Runtime/Audio/CStreamAudioManager.hpp"
-#include "Runtime/MP1/CGBASupport.hpp"
+#include "Runtime/Graphics/Shaders/CFluidPlaneShader.hpp"
+#include "Runtime/Graphics/Shaders/CMapSurfaceShader.hpp"
+#include "Runtime/Graphics/Shaders/CModelShaders.hpp"
+#include "Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp"
+#include "Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp"
+#include "Runtime/Graphics/Shaders/CRadarPaintShader.hpp"
+#include "Runtime/Graphics/Shaders/CRandomStaticFilter.hpp"
+#include "Runtime/Graphics/Shaders/CScanLinesFilter.hpp"
+#include "Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp"
+#include "Runtime/Graphics/Shaders/CTextSupportShader.hpp"
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
+#include "Runtime/Graphics/Shaders/CThermalColdFilter.hpp"
+#include "Runtime/Graphics/Shaders/CThermalHotFilter.hpp"
+#include "Runtime/Graphics/Shaders/CWorldShadowShader.hpp"
+#include "Runtime/Graphics/Shaders/CXRayBlurFilter.hpp"
 
+#include "Runtime/CDependencyGroup.hpp"
 #include "Runtime/CGameHintInfo.hpp"
-#include "Runtime/Particle/CParticleDataFactory.hpp"
-#include "Runtime/Particle/CParticleElectricDataFactory.hpp"
-#include "Runtime/Particle/CParticleSwooshDataFactory.hpp"
-#include "Runtime/Particle/CWeaponDescription.hpp"
-#include "Runtime/Particle/CProjectileWeaponDataFactory.hpp"
-#include "Runtime/Particle/CDecalDataFactory.hpp"
+#include "Runtime/CSaveWorld.hpp"
+#include "Runtime/CScannableObjectInfo.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/CStopwatch.hpp"
+#include "Runtime/CTextureCache.hpp"
+#include "Runtime/Audio/CAudioGroupSet.hpp"
+#include "Runtime/Audio/CMidiManager.hpp"
+#include "Runtime/Audio/CSfxManager.hpp"
+#include "Runtime/Audio/CStreamAudioManager.hpp"
+#include "Runtime/AutoMapper/CMapArea.hpp"
+#include "Runtime/AutoMapper/CMapUniverse.hpp"
+#include "Runtime/AutoMapper/CMapWorld.hpp"
+#include "Runtime/Character/CAllFormatsAnimSource.hpp"
+#include "Runtime/Character/CAnimCharacterSet.hpp"
+#include "Runtime/Character/CAnimPOIData.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CSkinRules.hpp"
+#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
+#include "Runtime/Collision/CCollisionResponseData.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
 #include "Runtime/GuiSys/CGuiFrame.hpp"
 #include "Runtime/GuiSys/CRasterFont.hpp"
 #include "Runtime/GuiSys/CStringTable.hpp"
-#include "Runtime/Graphics/CModel.hpp"
-#include "Runtime/Graphics/CTexture.hpp"
-#include "Runtime/Character/CCharLayoutInfo.hpp"
-#include "Runtime/Character/CSkinRules.hpp"
-#include "Runtime/Character/CAnimCharacterSet.hpp"
-#include "Runtime/Character/CAllFormatsAnimSource.hpp"
-#include "Runtime/Character/CAnimPOIData.hpp"
-#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
-#include "Runtime/Collision/CCollisionResponseData.hpp"
-#include "Runtime/CTextureCache.hpp"
-#include "Runtime/CSaveWorld.hpp"
-#include "Runtime/AutoMapper/CMapWorld.hpp"
-#include "Runtime/AutoMapper/CMapArea.hpp"
-#include "Runtime/AutoMapper/CMapUniverse.hpp"
-#include "Runtime/World/CStateMachine.hpp"
-#include "Runtime/CScannableObjectInfo.hpp"
-#include "Runtime/Audio/CAudioGroupSet.hpp"
-#include "Runtime/Audio/CSfxManager.hpp"
-#include "Runtime/Audio/CMidiManager.hpp"
-#include "Runtime/CDependencyGroup.hpp"
-#include "Runtime/CStateManager.hpp"
+#include "Runtime/MP1/CGBASupport.hpp"
+#include "Runtime/Particle/CDecalDataFactory.hpp"
+#include "Runtime/Particle/CParticleDataFactory.hpp"
+#include "Runtime/Particle/CParticleElectricDataFactory.hpp"
+#include "Runtime/Particle/CParticleSwooshDataFactory.hpp"
+#include "Runtime/Particle/CProjectileWeaponDataFactory.hpp"
+#include "Runtime/Particle/CWeaponDescription.hpp"
 #include "Runtime/World/CPlayer.hpp"
-#include "Runtime/CStopwatch.hpp"
+#include "Runtime/World/CStateMachine.hpp"
 
 #include <DataSpec/DNAMP1/SFX/Misc.h>
 #include <DataSpec/DNAMP1/SFX/MiscSamus.h>
 #include <DataSpec/DNAMP1/SFX/UI.h>
 #include <DataSpec/DNAMP1/SFX/Weapons.h>
 #include <DataSpec/DNAMP1/SFX/ZZZ.h>
+
 #include <discord_rpc.h>
 
 namespace hecl {
diff --git a/Runtime/MP1/World/CActorContraption.cpp b/Runtime/MP1/World/CActorContraption.cpp
index eb432525c..374d824e3 100644
--- a/Runtime/MP1/World/CActorContraption.cpp
+++ b/Runtime/MP1/World/CActorContraption.cpp
@@ -1,10 +1,12 @@
-#include "MP1/World/CActorContraption.hpp"
-#include "Weapon/CFlameThrower.hpp"
-#include "Weapon/CFlameInfo.hpp"
-#include "Character/CInt32POINode.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/MP1/World/CActorContraption.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Weapon/CFlameInfo.hpp"
+#include "Runtime/Weapon/CFlameThrower.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde {
diff --git a/Runtime/MP1/World/CBabygoth.cpp b/Runtime/MP1/World/CBabygoth.cpp
index 1435f6e45..2dd760946 100644
--- a/Runtime/MP1/World/CBabygoth.cpp
+++ b/Runtime/MP1/World/CBabygoth.cpp
@@ -1,21 +1,23 @@
-#include "CBabygoth.hpp"
-#include "Character/CPASAnimParmData.hpp"
-#include "Collision/CCollisionActorManager.hpp"
-#include "Collision/CCollisionActor.hpp"
-#include "World/CWorld.hpp"
-#include "World/CGameArea.hpp"
-#include "World/CPatternedInfo.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CTeamAiMgr.hpp"
-#include "Weapon/CWeapon.hpp"
-#include "Weapon/CFlameThrower.hpp"
-#include "Weapon/CFlameInfo.hpp"
-#include "World/CExplosion.hpp"
-#include "Particle/CWeaponDescription.hpp"
-#include "CStateManager.hpp"
-#include "CSimplePool.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/CSkinnedModel.hpp"
+#include "Runtime/MP1/World/CBabygoth.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/Collision/CCollisionActorManager.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
+#include "Runtime/Particle/CWeaponDescription.hpp"
+#include "Runtime/Weapon/CFlameInfo.hpp"
+#include "Runtime/Weapon/CFlameThrower.hpp"
+#include "Runtime/Weapon/CWeapon.hpp"
+#include "Runtime/World/CExplosion.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CTeamAiMgr.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CBeetle.cpp b/Runtime/MP1/World/CBeetle.cpp
index 0819d41f3..94a31f8c6 100644
--- a/Runtime/MP1/World/CBeetle.cpp
+++ b/Runtime/MP1/World/CBeetle.cpp
@@ -1,14 +1,16 @@
-#include "CBeetle.hpp"
-#include "CStateManager.hpp"
-#include "World/CDamageInfo.hpp"
-#include "Character/CCharLayoutInfo.hpp"
+#include "Runtime/MP1/World/CBeetle.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+#include "Runtime/World/CDamageInfo.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptWaypoint.hpp"
+#include "Runtime/World/CTeamAiMgr.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CPatternedInfo.hpp"
-#include "Character/CPASAnimParmData.hpp"
-#include "World/CTeamAiMgr.hpp"
-#include "World/CWorld.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptWaypoint.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/World/CBloodFlower.cpp b/Runtime/MP1/World/CBloodFlower.cpp
index 3cf68d2b0..fe2d867ac 100644
--- a/Runtime/MP1/World/CBloodFlower.cpp
+++ b/Runtime/MP1/World/CBloodFlower.cpp
@@ -1,13 +1,14 @@
-#include "CBloodFlower.hpp"
-#include "Particle/CGenDescription.hpp"
-#include "Particle/CElementGen.hpp"
-#include "Weapon/CProjectileWeapon.hpp"
-#include "Weapon/CTargetableProjectile.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptTrigger.hpp"
-#include "CSimplePool.hpp"
-#include "CStateManager.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/MP1/World/CBloodFlower.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Weapon/CProjectileWeapon.hpp"
+#include "Runtime/Weapon/CTargetableProjectile.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptTrigger.hpp"
 
 namespace urde::MP1 {
 CBloodFlower::CBloodFlower(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
diff --git a/Runtime/MP1/World/CBurrower.cpp b/Runtime/MP1/World/CBurrower.cpp
index 2ae618835..abca8d1b7 100644
--- a/Runtime/MP1/World/CBurrower.cpp
+++ b/Runtime/MP1/World/CBurrower.cpp
@@ -1,5 +1,6 @@
-#include "CBurrower.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/MP1/World/CBurrower.hpp"
+
+#include "Runtime/CStateManager.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/World/CChozoGhost.cpp b/Runtime/MP1/World/CChozoGhost.cpp
index d3c53aff9..f68501497 100644
--- a/Runtime/MP1/World/CChozoGhost.cpp
+++ b/Runtime/MP1/World/CChozoGhost.cpp
@@ -1,4 +1,4 @@
-#include "CChozoGhost.hpp"
+#include "Runtime/MP1/World/CChozoGhost.hpp"
 
 namespace urde::MP1 {
 CChozoGhost::CBehaveChance::CBehaveChance(CInputStream& in)
diff --git a/Runtime/MP1/World/CElitePirate.cpp b/Runtime/MP1/World/CElitePirate.cpp
index 76e96f051..d0316d5e5 100644
--- a/Runtime/MP1/World/CElitePirate.cpp
+++ b/Runtime/MP1/World/CElitePirate.cpp
@@ -1,5 +1,6 @@
-#include "CElitePirate.hpp"
-#include "World/ScriptLoader.hpp"
+#include "Runtime/MP1/World/CElitePirate.hpp"
+
+#include "Runtime/World/ScriptLoader.hpp"
 
 namespace urde::MP1 {
 CElitePirateData::CElitePirateData(CInputStream& in, u32 propCount)
diff --git a/Runtime/MP1/World/CEnergyBall.cpp b/Runtime/MP1/World/CEnergyBall.cpp
index 2aeafedfb..dc0e1377e 100644
--- a/Runtime/MP1/World/CEnergyBall.cpp
+++ b/Runtime/MP1/World/CEnergyBall.cpp
@@ -1,9 +1,10 @@
-#include "CSimplePool.hpp"
-#include "CStateManager.hpp"
-#include "GameGlobalObjects.hpp"
-#include "MP1/World/CEnergyBall.hpp"
-#include "World/CPatternedInfo.hpp"
-#include "World/CPlayer.hpp"
+#include "Runtime/MP1/World/CEnergyBall.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CPlayer.hpp"
 
 namespace urde::MP1 {
 CEnergyBall::CEnergyBall(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
diff --git a/Runtime/MP1/World/CEyeball.cpp b/Runtime/MP1/World/CEyeball.cpp
index 761385803..8b7e3aecc 100644
--- a/Runtime/MP1/World/CEyeball.cpp
+++ b/Runtime/MP1/World/CEyeball.cpp
@@ -1,12 +1,15 @@
-#include "CEyeball.hpp"
-#include "Weapon/CBeamInfo.hpp"
-#include "Weapon/CGameProjectile.hpp"
-#include "Weapon/CPlasmaProjectile.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CWorld.hpp"
-#include "World/CGameArea.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/MP1/World/CEyeball.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Weapon/CBeamInfo.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
+#include "Runtime/Weapon/CPlasmaProjectile.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
+
 namespace urde::MP1 {
 CEyeball::CEyeball(TUniqueId uid, std::string_view name, CPatterned::EFlavorType flavor, const CEntityInfo& info,
                    const zeus::CTransform& xf, CModelData&& mData, const CPatternedInfo& pInfo, float attackDelay,
diff --git a/Runtime/MP1/World/CFireFlea.cpp b/Runtime/MP1/World/CFireFlea.cpp
index e67c5f2f1..7b27dd088 100644
--- a/Runtime/MP1/World/CFireFlea.cpp
+++ b/Runtime/MP1/World/CFireFlea.cpp
@@ -1,8 +1,10 @@
-#include <Runtime/World/CPatternedInfo.hpp>
-#include "CFireFlea.hpp"
-#include "CStateManager.hpp"
-#include "CPlayerState.hpp"
-#include "World/CWorld.hpp"
+#include "Runtime/MP1/World/CFireFlea.hpp"
+
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CFlaahgra.cpp b/Runtime/MP1/World/CFlaahgra.cpp
index cd1bb864d..8eba180e9 100644
--- a/Runtime/MP1/World/CFlaahgra.cpp
+++ b/Runtime/MP1/World/CFlaahgra.cpp
@@ -1,22 +1,24 @@
-#include "CFlaahgra.hpp"
-#include "Camera/CCameraManager.hpp"
-#include "Camera/CFirstPersonCamera.hpp"
-#include "CDependencyGroup.hpp"
-#include "Character/CBoneTracking.hpp"
-#include "Collision/CCollisionActor.hpp"
-#include "Collision/CCollisionActorManager.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "MP1/World/CFlaahgraProjectile.hpp"
-#include "Particle/CElementGen.hpp"
-#include "World/CActorParameters.hpp"
-#include "World/CGameArea.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptWaypoint.hpp"
-#include "World/CWorld.hpp"
-#include "World/ScriptLoader.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/MP1/World/CFlaahgra.hpp"
+
+#include "Runtime/CDependencyGroup.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+#include "Runtime/Camera/CFirstPersonCamera.hpp"
+#include "Runtime/Character/CBoneTracking.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/Collision/CCollisionActorManager.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/MP1/World/CFlaahgraProjectile.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/World/CActorParameters.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptWaypoint.hpp"
+#include "Runtime/World/CWorld.hpp"
+#include "Runtime/World/ScriptLoader.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CFlaahgraProjectile.cpp b/Runtime/MP1/World/CFlaahgraProjectile.cpp
index d5e1c7d43..c2573680d 100644
--- a/Runtime/MP1/World/CFlaahgraProjectile.cpp
+++ b/Runtime/MP1/World/CFlaahgraProjectile.cpp
@@ -1,4 +1,4 @@
-#include "CFlaahgraProjectile.hpp"
+#include "Runtime/MP1/World/CFlaahgraProjectile.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/World/CFlaahgraTentacle.cpp b/Runtime/MP1/World/CFlaahgraTentacle.cpp
index b0361ff0b..65b9ce849 100644
--- a/Runtime/MP1/World/CFlaahgraTentacle.cpp
+++ b/Runtime/MP1/World/CFlaahgraTentacle.cpp
@@ -1,8 +1,10 @@
-#include "CFlaahgraTentacle.hpp"
-#include "Collision/CCollisionActor.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptTrigger.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/MP1/World/CFlaahgraTentacle.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptTrigger.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CFlickerBat.cpp b/Runtime/MP1/World/CFlickerBat.cpp
index b0b66c10f..18f288c01 100644
--- a/Runtime/MP1/World/CFlickerBat.cpp
+++ b/Runtime/MP1/World/CFlickerBat.cpp
@@ -1,9 +1,11 @@
-#include "CFlickerBat.hpp"
-#include "CStateManager.hpp"
-#include "Camera/CCameraManager.hpp"
-#include "Camera/CGameCamera.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "World/CPlayer.hpp"
+#include "Runtime/MP1/World/CFlickerBat.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Camera/CCameraManager.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CFlyingPirate.cpp b/Runtime/MP1/World/CFlyingPirate.cpp
index 5a5139be6..815a59883 100644
--- a/Runtime/MP1/World/CFlyingPirate.cpp
+++ b/Runtime/MP1/World/CFlyingPirate.cpp
@@ -1,4 +1,4 @@
-#include "CFlyingPirate.hpp"
+#include "Runtime/MP1/World/CFlyingPirate.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/World/CJellyZap.cpp b/Runtime/MP1/World/CJellyZap.cpp
index 449a23556..d1c07d951 100644
--- a/Runtime/MP1/World/CJellyZap.cpp
+++ b/Runtime/MP1/World/CJellyZap.cpp
@@ -1,6 +1,8 @@
-#include "CJellyZap.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
+#include "Runtime/MP1/World/CJellyZap.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CMagdolite.cpp b/Runtime/MP1/World/CMagdolite.cpp
index e451cdf21..400e3dba4 100644
--- a/Runtime/MP1/World/CMagdolite.cpp
+++ b/Runtime/MP1/World/CMagdolite.cpp
@@ -1,4 +1,4 @@
-#include "CMagdolite.hpp"
+#include "Runtime/MP1/World/CMagdolite.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/World/CMetaree.cpp b/Runtime/MP1/World/CMetaree.cpp
index 9680b3831..97b6f8a65 100644
--- a/Runtime/MP1/World/CMetaree.cpp
+++ b/Runtime/MP1/World/CMetaree.cpp
@@ -1,8 +1,9 @@
-#include "MP1/World/CMetaree.hpp"
-#include "Weapon/CGameProjectile.hpp"
-#include "World/CPlayer.hpp"
-#include "CStateManager.hpp"
-#include "CPlayerState.hpp"
+#include "Runtime/MP1/World/CMetaree.hpp"
+
+#include "Runtime/CPlayerState.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
+#include "Runtime/World/CPlayer.hpp"
 
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
diff --git a/Runtime/MP1/World/CMetroid.cpp b/Runtime/MP1/World/CMetroid.cpp
index 1ba32e10d..8adbdbff1 100644
--- a/Runtime/MP1/World/CMetroid.cpp
+++ b/Runtime/MP1/World/CMetroid.cpp
@@ -1,5 +1,5 @@
-#include "CMetroid.hpp"
-#include "World/ScriptLoader.hpp"
+#include "Runtime/MP1/World/CMetroid.hpp"
+#include "Runtime/World/ScriptLoader.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/World/CMetroidBeta.cpp b/Runtime/MP1/World/CMetroidBeta.cpp
index db1acae89..5405520de 100644
--- a/Runtime/MP1/World/CMetroidBeta.cpp
+++ b/Runtime/MP1/World/CMetroidBeta.cpp
@@ -1,18 +1,19 @@
-#include "CMetroidBeta.hpp"
-#include "CSimplePool.hpp"
-#include "Collision/CCollisionActorManager.hpp"
-#include "Collision/CCollisionActor.hpp"
-#include "Particle/CElementGen.hpp"
-#include "Particle/CParticleSwoosh.hpp"
-#include "Weapon/CGameProjectile.hpp"
-#include "World/CGameArea.hpp"
-#include "World/CPatternedInfo.hpp"
-#include "World/CPlayer.hpp"
-#include "World/ScriptLoader.hpp"
-#include "World/CTeamAiMgr.hpp"
-#include "World/CWorld.hpp"
-#include "CStateManager.hpp"
-#include "GameGlobalObjects.hpp"
+#include "Runtime/MP1/World/CMetroidBeta.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/Collision/CCollisionActorManager.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CParticleSwoosh.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CTeamAiMgr.hpp"
+#include "Runtime/World/CWorld.hpp"
+#include "Runtime/World/ScriptLoader.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/World/CMetroidPrimeExo.cpp b/Runtime/MP1/World/CMetroidPrimeExo.cpp
index 6485c8e31..260ac4a6f 100644
--- a/Runtime/MP1/World/CMetroidPrimeExo.cpp
+++ b/Runtime/MP1/World/CMetroidPrimeExo.cpp
@@ -1,9 +1,11 @@
-#include "CMetroidPrimeExo.hpp"
-#include "World/ScriptLoader.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/MP1/World/CMetroidPrimeExo.hpp"
+
 #include "DataSpec/DNAMP1/ScriptObjects/MetroidPrimeStage1.hpp"
 
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/World/ScriptLoader.hpp"
+
 namespace urde::MP1 {
 
 SPrimeStruct2B::SPrimeStruct2B(CInputStream& in)
diff --git a/Runtime/MP1/World/CMetroidPrimeProjectile.cpp b/Runtime/MP1/World/CMetroidPrimeProjectile.cpp
index 3b6fc25e4..0075db6fe 100644
--- a/Runtime/MP1/World/CMetroidPrimeProjectile.cpp
+++ b/Runtime/MP1/World/CMetroidPrimeProjectile.cpp
@@ -1,6 +1,7 @@
-#include "CMetroidPrimeProjectile.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/MP1/World/CMetroidPrimeProjectile.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/World/CMetroidPrimeRelay.cpp b/Runtime/MP1/World/CMetroidPrimeRelay.cpp
index e55253425..56868e6fc 100644
--- a/Runtime/MP1/World/CMetroidPrimeRelay.cpp
+++ b/Runtime/MP1/World/CMetroidPrimeRelay.cpp
@@ -1,4 +1,5 @@
-#include "CMetroidPrimeRelay.hpp"
+#include "Runtime/MP1/World/CMetroidPrimeRelay.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CNewIntroBoss.cpp b/Runtime/MP1/World/CNewIntroBoss.cpp
index 78bc60734..76f15a196 100644
--- a/Runtime/MP1/World/CNewIntroBoss.cpp
+++ b/Runtime/MP1/World/CNewIntroBoss.cpp
@@ -1,14 +1,15 @@
-#include "MP1/World/CNewIntroBoss.hpp"
-#include "Character/CCharLayoutInfo.hpp"
-#include "Collision/CCollisionActor.hpp"
-#include "Collision/CCollisionActorManager.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Collision/CJointCollisionDescription.hpp"
-#include "Weapon/CPlasmaProjectile.hpp"
-#include "World/CPlayer.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/MP1/World/CNewIntroBoss.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/Collision/CCollisionActorManager.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Collision/CJointCollisionDescription.hpp"
+#include "Runtime/Weapon/CPlasmaProjectile.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "CNewIntroBoss.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/World/CParasite.cpp b/Runtime/MP1/World/CParasite.cpp
index 682857d10..8646c99d0 100644
--- a/Runtime/MP1/World/CParasite.cpp
+++ b/Runtime/MP1/World/CParasite.cpp
@@ -1,19 +1,21 @@
-#include "CParasite.hpp"
-#include "Character/CModelData.hpp"
-#include "World/CActorParameters.hpp"
-#include "World/CPatternedInfo.hpp"
-#include "World/CWorld.hpp"
-#include "World/CGameArea.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptWaypoint.hpp"
-#include "World/CScriptDoor.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/MP1/World/CParasite.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CModelData.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
+#include "Runtime/World/CActorParameters.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptDoor.hpp"
+#include "Runtime/World/CScriptWaypoint.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "Graphics/CSkinnedModel.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Collision/CCollisionActor.hpp"
 
 namespace urde::MP1 {
 
diff --git a/Runtime/MP1/World/CPuddleSpore.cpp b/Runtime/MP1/World/CPuddleSpore.cpp
index 6e4f8920a..3e1b9ac94 100644
--- a/Runtime/MP1/World/CPuddleSpore.cpp
+++ b/Runtime/MP1/World/CPuddleSpore.cpp
@@ -1,13 +1,15 @@
-#include "CPuddleSpore.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Weapon/CEnergyProjectile.hpp"
-#include "Weapon/CGameProjectile.hpp"
-#include "World/CPatternedInfo.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptWater.hpp"
-#include "CStateManager.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
+#include "Runtime/MP1/World/CPuddleSpore.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Weapon/CEnergyProjectile.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptWater.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CPuddleToadGamma.cpp b/Runtime/MP1/World/CPuddleToadGamma.cpp
index 409661454..2ee5e068c 100644
--- a/Runtime/MP1/World/CPuddleToadGamma.cpp
+++ b/Runtime/MP1/World/CPuddleToadGamma.cpp
@@ -1,10 +1,12 @@
-#include "CPuddleToadGamma.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "CStateManager.hpp"
-#include "World/CPlayer.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "Weapon/CBomb.hpp"
+#include "Runtime/MP1/World/CPuddleToadGamma.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/Weapon/CBomb.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CPuffer.cpp b/Runtime/MP1/World/CPuffer.cpp
index 9e3bf11dd..e45164bff 100644
--- a/Runtime/MP1/World/CPuffer.cpp
+++ b/Runtime/MP1/World/CPuffer.cpp
@@ -1,10 +1,12 @@
-#include "CPuffer.hpp"
-#include "CStateManager.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "World/CKnockBackController.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CFire.hpp"
+#include "Runtime/MP1/World/CPuffer.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/World/CFire.hpp"
+#include "Runtime/World/CKnockBackController.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CRipper.cpp b/Runtime/MP1/World/CRipper.cpp
index 61cf93e52..bf9e8ee8d 100644
--- a/Runtime/MP1/World/CRipper.cpp
+++ b/Runtime/MP1/World/CRipper.cpp
@@ -1,10 +1,12 @@
-#include "MP1/World/CRipper.hpp"
-#include "Collision/CCollidableOBBTreeGroup.hpp"
-#include "Weapon/CPlayerGun.hpp"
-#include "World/CActorParameters.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CScriptGrapplePoint.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/MP1/World/CRipper.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
+#include "Runtime/Weapon/CPlayerGun.hpp"
+#include "Runtime/World/CActorParameters.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptGrapplePoint.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CSpacePirate.cpp b/Runtime/MP1/World/CSpacePirate.cpp
index be2c301f2..6087de7c3 100644
--- a/Runtime/MP1/World/CSpacePirate.cpp
+++ b/Runtime/MP1/World/CSpacePirate.cpp
@@ -1,20 +1,22 @@
-#include "CSpacePirate.hpp"
-#include "Character/CCharLayoutInfo.hpp"
-#include "Character/CPASAnimParmData.hpp"
-#include "World/CScriptWaypoint.hpp"
-#include "World/CPatternedInfo.hpp"
-#include "World/CScriptWater.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CTeamAiMgr.hpp"
-#include "Weapon/CGameProjectile.hpp"
-#include "CTimeProvider.hpp"
-#include "GameGlobalObjects.hpp"
-#include "Graphics/CBooRenderer.hpp"
-#include "World/CScriptCoverPoint.hpp"
-#include "World/CScriptTargetingPoint.hpp"
-#include "World/CScriptAiJumpPoint.hpp"
-#include "World/CWorld.hpp"
-#include "CMetroid.hpp"
+#include "Runtime/MP1/World/CSpacePirate.hpp"
+
+#include "Runtime/CTimeProvider.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CPASAnimParmData.hpp"
+#include "Runtime/Graphics/CBooRenderer.hpp"
+#include "Runtime/MP1/World/CMetroid.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptAiJumpPoint.hpp"
+#include "Runtime/World/CScriptCoverPoint.hpp"
+#include "Runtime/World/CScriptTargetingPoint.hpp"
+#include "Runtime/World/CScriptWater.hpp"
+#include "Runtime/World/CScriptWaypoint.hpp"
+#include "Runtime/World/CTeamAiMgr.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CSpankWeed.cpp b/Runtime/MP1/World/CSpankWeed.cpp
index ac00306f1..f361be72c 100644
--- a/Runtime/MP1/World/CSpankWeed.cpp
+++ b/Runtime/MP1/World/CSpankWeed.cpp
@@ -1,8 +1,10 @@
-#include "CSpankWeed.hpp"
-#include "World/CPatternedInfo.hpp"
-#include "World/CPlayer.hpp"
-#include "Collision/CCollisionActor.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/MP1/World/CSpankWeed.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Collision/CCollisionActor.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CPlayer.hpp"
+
 #include <logvisor/logvisor.hpp>
 
 namespace urde::MP1 {
diff --git a/Runtime/MP1/World/CThardusRockProjectile.cpp b/Runtime/MP1/World/CThardusRockProjectile.cpp
index 6f971be40..dd79183be 100644
--- a/Runtime/MP1/World/CThardusRockProjectile.cpp
+++ b/Runtime/MP1/World/CThardusRockProjectile.cpp
@@ -1,4 +1,4 @@
-#include "CThardusRockProjectile.hpp"
+#include "Runtime/MP1/World/CThardusRockProjectile.hpp"
 
 namespace urde {
 
diff --git a/Runtime/MP1/World/CTryclops.cpp b/Runtime/MP1/World/CTryclops.cpp
index bd0bfbb80..16c32f7f1 100644
--- a/Runtime/MP1/World/CTryclops.cpp
+++ b/Runtime/MP1/World/CTryclops.cpp
@@ -1,12 +1,16 @@
-#include "CTryclops.hpp"
-#include "CStateManager.hpp"
-#include "World/CWorld.hpp"
-#include "World/CGameArea.hpp"
-#include "World/CPatternedInfo.hpp"
-#include "World/CPlayer.hpp"
-#include "Weapon/CBomb.hpp"
+#include "Runtime/MP1/World/CTryclops.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Weapon/CBomb.hpp"
+#include "Runtime/World/CGameArea.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
 
+#include <cmath>
+
 namespace urde::MP1 {
 const CDamageVulnerability CTryclops::skVulnerabilities = CDamageVulnerability(
     EVulnerability::Deflect, EVulnerability::Deflect, EVulnerability::Deflect, EVulnerability::Deflect,
diff --git a/Runtime/MP1/World/CWarWasp.cpp b/Runtime/MP1/World/CWarWasp.cpp
index ffeaba2cf..4aaaa3aa8 100644
--- a/Runtime/MP1/World/CWarWasp.cpp
+++ b/Runtime/MP1/World/CWarWasp.cpp
@@ -1,14 +1,16 @@
-#include "CWarWasp.hpp"
-#include "Character/CCharLayoutInfo.hpp"
+#include "Runtime/MP1/World/CWarWasp.hpp"
+
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Weapon/CGameProjectile.hpp"
+#include "Runtime/World/CPatternedInfo.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptWaypoint.hpp"
+#include "Runtime/World/CTeamAiMgr.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CPatternedInfo.hpp"
-#include "GameGlobalObjects.hpp"
-#include "CSimplePool.hpp"
-#include "World/CPlayer.hpp"
-#include "World/CTeamAiMgr.hpp"
-#include "World/CWorld.hpp"
-#include "World/CScriptWaypoint.hpp"
-#include "Weapon/CGameProjectile.hpp"
 
 namespace urde::MP1 {
 CWarWasp::CWarWasp(TUniqueId uid, std::string_view name, const CEntityInfo& info, const zeus::CTransform& xf,
diff --git a/Runtime/RetroTypes.cpp b/Runtime/RetroTypes.cpp
index c1412bccd..d9fc73d5d 100644
--- a/Runtime/RetroTypes.cpp
+++ b/Runtime/RetroTypes.cpp
@@ -1,6 +1,9 @@
-#include "RetroTypes.hpp"
-#include "GameGlobalObjects.hpp"
-#include "IMain.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/IMain.hpp"
+
+#include <logvisor/logvisor.hpp>
 
 namespace urde {
 logvisor::Module Log("urde::RetroTypes::CAssetId");