General: Normalize RuntimeCommon include paths

Performs the same normalizing done to the RuntimeCommonB target, now all
of the runtime headers have normalized include paths.

Editor/ProjectResourceFactoryBase.hpp

@@ -1,15 +1,20 @@
 #pragma once
 
-#include "hecl/ClientProcess.hpp"
+#include <list>
-#include "hecl/Database.hpp"
+#include <memory>
-#include "Runtime/IFactory.hpp"
+#include <mutex>
+#include <optional>
+#include <thread>
+#include <unordered_map>
+
+#include "DataSpec/SpecBase.hpp"
+
 #include "Runtime/CFactoryMgr.hpp"
 #include "Runtime/CResFactory.hpp"
-#include "DataSpec/SpecBase.hpp"
+#include "Runtime/IFactory.hpp"
-#include <optional>
 
-#include <thread>
+#include <hecl/ClientProcess.hpp>
-#include <mutex>
+#include <hecl/Database.hpp>
 
 namespace urde {
 

Editor/ProjectResourceFactoryMP1.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "ProjectResourceFactoryBase.hpp"
+#include "Editor/ProjectResourceFactoryBase.hpp"
-#include "CToken.hpp"
+#include "Runtime/CToken.hpp"
 
 namespace urde {
 class MP1OriginalIDs;

Runtime/Audio/CAudioGroupSet.hpp

@@ -1,11 +1,15 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <memory>
-#include "CFactoryMgr.hpp"
+#include <string>
-#include "IObj.hpp"
+
-#include "CToken.hpp"
+#include "Runtime/CFactoryMgr.hpp"
-#include "IOStreams.hpp"
+#include "Runtime/CToken.hpp"
-#include "amuse/AudioGroupData.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/IObj.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <amuse/AudioGroupData.hpp>
 
 namespace urde {
 

Runtime/Audio/CAudioSys.hpp

@@ -1,15 +1,16 @@
 #pragma once
 
-#include "../GCNTypes.hpp"
+#include "Runtime/CToken.hpp"
-#include "zeus/CVector3f.hpp"
+#include "Runtime/GCNTypes.hpp"
-#include "amuse/amuse.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "boo/audiodev/IAudioVoiceEngine.hpp"
+
-#include "RetroTypes.hpp"
+#include <amuse/amuse.hpp>
-#include "CToken.hpp"
+#include <boo/audiodev/IAudioVoiceEngine.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CSimplePool;
 class CAudioGroupSet;
+class CSimplePool;
 
 CFactoryFnReturn FAudioTranslationTableFactory(const SObjectTag& tag, CInputStream& in, const CVParamTransfer& vparms,
                                                CObjectReference* selfRef);

Runtime/Audio/CMidiManager.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
-#include "CSfxManager.hpp"
+#include <memory>
+
+#include "Runtime/Audio/CSfxManager.hpp"
 
 namespace urde {
 

Runtime/Audio/CSfxManager.hpp

@@ -1,10 +1,14 @@
 #pragma once
 
+#include <memory>
+#include <unordered_set>
 #include <vector>
-#include "../RetroTypes.hpp"
+
-#include "zeus/CVector3f.hpp"
-#include "CAudioSys.hpp"
 #include "DNAMP1/SFX/SFX.h"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Audio/CAudioSys.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

Runtime/Audio/CStaticAudioPlayer.hpp

@@ -1,10 +1,17 @@
 #pragma once
 
-#include "CAudioSys.hpp"
+#include <cstring>
-#include "RetroTypes.hpp"
+#include <memory>
+#include <optional>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Audio/CAudioSys.hpp"
+
 #include "g721.h"
-#include "boo/audiodev/IAudioVoice.hpp"
+
-#include "boo/audiodev/IAudioVoiceEngine.hpp"
+#include <boo/audiodev/IAudioVoice.hpp>
+#include <boo/audiodev/IAudioVoiceEngine.hpp>
 
 namespace urde {
 class IDvdRequest;

Runtime/Audio/CStreamAudioManager.hpp

@@ -1,6 +1,8 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <string_view>
+
+#include "Runtime/GCNTypes.hpp"
 
 namespace urde {
 

Runtime/AutoMapper/CAutoMapper.hpp

@@ -1,18 +1,28 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <list>
-#include "CInGameTweakManagerBase.hpp"
+#include <memory>
-#include "zeus/CQuaternion.hpp"
+#include <optional>
-#include "zeus/CTransform.hpp"
+#include <vector>
-#include "zeus/CVector3f.hpp"
+
-#include "MP1/CInGameGuiManager.hpp"
+#include "Runtime/CInGameTweakManagerBase.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/MP1/CInGameGuiManager.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector2i.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-struct CFinalInput;
+class CMapUniverse;
-class IWorld;
 class CMapWorldInfo;
 class CStateManager;
-class CMapUniverse;
+class IWorld;
+
+struct CFinalInput;
 
 class CAutoMapper {
 public:

Runtime/AutoMapper/CMapArea.hpp

@@ -1,13 +1,18 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <memory>
-#include "CResFactory.hpp"
+#include <vector>
-#include "zeus/CAABox.hpp"
+
-#include "zeus/CVector3f.hpp"
+#include "Runtime/CResFactory.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "Graphics/CLineRenderer.hpp"
+#include "Runtime/AutoMapper/CMappableObject.hpp"
-#include "Graphics/Shaders/CMapSurfaceShader.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
-#include "CMappableObject.hpp"
+#include "Runtime/Graphics/Shaders/CMapSurfaceShader.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class IWorld;

Runtime/AutoMapper/CMapUniverse.hpp

@@ -1,12 +1,16 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <string>
-#include "zeus/CVector3f.hpp"
+#include <vector>
-#include "zeus/CColor.hpp"
+
-#include "zeus/CTransform.hpp"
+#include "Runtime/CToken.hpp"
-#include "IFactory.hpp"
+#include "Runtime/IFactory.hpp"
-#include "CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "CMapArea.hpp"
+#include "Runtime/AutoMapper/CMapArea.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CStateManager;

Runtime/AutoMapper/CMapWorld.hpp

@@ -1,16 +1,21 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <vector>
-#include "CToken.hpp"
+
-#include "zeus/CColor.hpp"
+#include "Runtime/CToken.hpp"
-#include "zeus/CVector3f.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "zeus/CTransform.hpp"
+#include "Runtime/rstl.hpp"
-#include "CMapArea.hpp"
+#include "Runtime/AutoMapper/CMapArea.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class IWorld;
 class CMapWorldInfo;
 class CStateManager;
+class IWorld;
+
 class CMapWorld {
 public:
   /* skDrawProfileItemNames; */

Runtime/AutoMapper/CMapWorldInfo.hpp

@@ -1,6 +1,9 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <map>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 class CSaveWorld;

Runtime/AutoMapper/CMappableObject.hpp

@@ -1,16 +1,20 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <optional>
-#include "zeus/CAABox.hpp"
+#include <utility>
-#include "zeus/CTransform.hpp"
+
-#include "GameGlobalObjects.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
-#include "Graphics/Shaders/CMapSurfaceShader.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
-#include "Graphics/CLineRenderer.hpp"
+#include "Runtime/Graphics/Shaders/CMapSurfaceShader.hpp"
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
 
 namespace urde {
-class CStateManager;
 class CMapWorldInfo;
+class CStateManager;
 
 class CMappableObject {
   static boo::ObjToken<boo::IGraphicsBufferS> g_doorVbo;

Runtime/Camera/CBallCamera.hpp

@@ -1,7 +1,15 @@
 #pragma once
 
-#include "CGameCamera.hpp"
+#include <cmath>
-#include "CCameraSpline.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/Camera/CCameraSpline.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CPlayer;

Runtime/Camera/CCameraFilter.hpp

@@ -1,10 +1,14 @@
 #pragma once
 
-#include "zeus/CColor.hpp"
+#include <memory>
-#include "RetroTypes.hpp"
+#include <optional>
-#include "CToken.hpp"
+
-#include "Graphics/Shaders/CCameraBlurFilter.hpp"
+#include "Runtime/CToken.hpp"
-#include "Graphics/Shaders/CXRayBlurFilter.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/Shaders/CCameraBlurFilter.hpp"
+#include "Runtime/Graphics/Shaders/CXRayBlurFilter.hpp"
+
+#include <zeus/CColor.hpp>
 
 namespace urde {
 class CTexture;

Runtime/Camera/CCameraManager.hpp

@@ -1,20 +1,26 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <list>
-#include "zeus/CVector3f.hpp"
+#include <vector>
-#include "World/CGameArea.hpp"
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/World/CGameArea.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CFirstPersonCamera;
 class CBallCamera;
-class CStateManager;
-class CGameCamera;
 class CCameraShakeData;
-class CScriptWater;
-class CInterpolationCamera;
-struct CFinalInput;
-class CScriptCameraHint;
 class CCinematicCamera;
+class CFirstPersonCamera;
+class CGameCamera;
+class CInterpolationCamera;
+class CScriptCameraHint;
+class CScriptWater;
+class CStateManager;
+
+struct CFinalInput;
 
 class CCameraManager {
   static float sAspect;

Runtime/Camera/CCameraShakeData.hpp

@@ -1,7 +1,8 @@
 #pragma once
 
-#include "zeus/CVector3f.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "RetroTypes.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CRandom16;

Runtime/Camera/CCinematicCamera.hpp

@@ -1,6 +1,13 @@
 #pragma once
 
-#include "CGameCamera.hpp"
+#include <string_view>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

Runtime/Camera/CFirstPersonCamera.hpp

@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CGameCamera.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

Runtime/Camera/CGameCamera.hpp

@@ -1,14 +1,17 @@
 #pragma once
 
-#include "World/CActor.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "zeus/CTransform.hpp"
+#include "Runtime/World/CActor.hpp"
+
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CTransform.hpp>
 
 namespace urde {
 struct CFinalInput;
 
 class CGameCamera : public CActor {
-  friend class CStateManager;
   friend class CCameraManager;
+  friend class CStateManager;
 
 protected:
   TUniqueId xe8_watchedObject;

Runtime/Camera/CInterpolationCamera.hpp

@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CGameCamera.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

Runtime/Camera/CPathCamera.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CGameCamera.hpp"
+#include "Runtime/Camera/CCameraSpline.hpp"
-#include "CCameraSpline.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
 
 namespace urde {
 

Runtime/Character/CActorLights.hpp

@@ -1,15 +1,18 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <vector>
-#include "zeus/CVector3f.hpp"
+
-#include "zeus/CColor.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "zeus/CAABox.hpp"
+#include "Runtime/Graphics/CLight.hpp"
-#include "Graphics/CLight.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CBooModel;
-class CStateManager;
 class CGameArea;
+class CStateManager;
 
 class CActorLights {
   static s32 sFrameSchedulerCount;

Runtime/Character/CAdditiveAnimPlayback.hpp

@@ -1,12 +1,13 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <memory>
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
-class CAnimTreeNode;
 class CAdditiveAnimationInfo;
-class CSegIdList;
+class CAnimTreeNode;
 class CCharLayoutInfo;
+class CSegIdList;
 class CSegStatementSet;
 
 class CAdditiveAnimationInfo {

Runtime/Character/CAdditiveBodyState.hpp

@@ -1,13 +1,14 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "CharacterCommon.hpp"
+#include "Runtime/Character/CBodyStateCmdMgr.hpp"
-#include "CBodyStateCmdMgr.hpp"
+#include "Runtime/Character/CharacterCommon.hpp"
 
 namespace urde {
+class CActor;
 class CBodyController;
 class CStateManager;
-class CActor;
+
 class CAdditiveBodyState {
 public:
   virtual ~CAdditiveBodyState() = default;

Runtime/Character/CAllFormatsAnimSource.hpp

@@ -1,14 +1,18 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <algorithm>
-#include "zeus/CVector3f.hpp"
+#include <memory>
-#include "CAnimSource.hpp"
+
-#include "CFBStreamedCompression.hpp"
+#include "Runtime/CFactoryMgr.hpp"
-#include "CFactoryMgr.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CAnimSource.hpp"
+#include "Runtime/Character/CFBStreamedCompression.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class IObjectStore;
 class IAnimReader;
+class IObjectStore;
 
 enum class EAnimFormat { Uncompressed, Unknown, BitstreamCompressed, BitstreamCompressed24 };
 

Runtime/Character/CAnimCharacterSet.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "CFactoryMgr.hpp"
+#include "Runtime/CFactoryMgr.hpp"
-#include "CCharacterSet.hpp"
+#include "Runtime/Character/CAnimationSet.hpp"
-#include "CAnimationSet.hpp"
+#include "Runtime/Character/CCharacterSet.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimData.hpp

@@ -1,16 +1,24 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <memory>
-#include "CToken.hpp"
-#include "CCharacterInfo.hpp"
-#include "CParticleDatabase.hpp"
-#include "CPoseAsTransforms.hpp"
-#include "CHierarchyPoseBuilder.hpp"
-#include "CAdditiveAnimPlayback.hpp"
-#include "CCharLayoutInfo.hpp"
-#include "CAnimPlaybackParms.hpp"
-#include "IAnimReader.hpp"
 #include <set>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CAdditiveAnimPlayback.hpp"
+#include "Runtime/Character/CAnimPlaybackParms.hpp"
+#include "Runtime/Character/CCharLayoutInfo.hpp"
+#include "Runtime/Character/CCharacterInfo.hpp"
+#include "Runtime/Character/CHierarchyPoseBuilder.hpp"
+#include "Runtime/Character/CParticleDatabase.hpp"
+#include "Runtime/Character/CPoseAsTransforms.hpp"
+#include "Runtime/Character/IAnimReader.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CVector3f.hpp>
 
 enum class EUserEventType {
   Projectile = 0,
@@ -51,30 +59,31 @@ enum class EUserEventType {
 };
 
 namespace urde {
-class CCharLayoutInfo;
+class CAnimTreeNode;
-class CSkinnedModel;
-class CMorphableSkinnedModel;
-struct CAnimSysContext;
 class CAnimationManager;
-class CTransitionManager;
+class CBoolPOINode;
+class CCharAnimTime;
+class CCharLayoutInfo;
 class CCharacterFactory;
-class IMetaAnim;
+class CInt32POINode;
-struct CModelFlags;
+class CModel;
-class CVertexMorphEffect;
+class CMorphableSkinnedModel;
+class CParticlePOINode;
 class CPrimitive;
 class CRandom16;
-class CStateManager;
-class CCharAnimTime;
-class CModel;
-class CSkinRules;
-class CAnimTreeNode;
 class CSegIdList;
 class CSegStatementSet;
-class CBoolPOINode;
+class CSkinRules;
-class CInt32POINode;
+class CSkinnedModel;
-class CParticlePOINode;
 class CSoundPOINode;
+class CStateManager;
+class CTransitionManager;
+class CVertexMorphEffect;
 class IAnimReader;
+class IMetaAnim;
+
+struct CAnimSysContext;
+struct CModelFlags;
 struct SAdvancementDeltas;
 struct SAdvancementResults;
 

Runtime/Character/CAnimPOIData.hpp

@@ -1,10 +1,13 @@
 #pragma once
 
-#include "CFactoryMgr.hpp"
+#include <vector>
-#include "CBoolPOINode.hpp"
+
-#include "CInt32POINode.hpp"
+#include "Runtime/CFactoryMgr.hpp"
-#include "CParticlePOINode.hpp"
+#include "Runtime/GCNTypes.hpp"
-#include "CSoundPOINode.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimPerSegmentData.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "zeus/CQuaternion.hpp"
+#include <zeus/CQuaternion.hpp>
-#include "zeus/CVector3f.hpp"
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

Runtime/Character/CAnimPlaybackParms.hpp

@@ -1,7 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "zeus/CQuaternion.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CAnimPlaybackParms {

Runtime/Character/CAnimSource.hpp

@@ -1,22 +1,26 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <memory>
-#include "CCharAnimTime.hpp"
+#include <vector>
-#include "zeus/CQuaternion.hpp"
+
-#include "zeus/CVector3f.hpp"
+#include "Runtime/CToken.hpp"
-#include "CSegId.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "CToken.hpp"
+#include "Runtime/Character/CCharAnimTime.hpp"
+#include "Runtime/Character/CSegId.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class IObjectStore;
-class CSegIdList;
-class CSegStatementSet;
-class CSegId;
 class CAnimPOIData;
 class CBoolPOINode;
 class CInt32POINode;
 class CParticlePOINode;
+class CSegId;
+class CSegIdList;
+class CSegStatementSet;
 class CSoundPOINode;
+class IObjectStore;
 
 class RotationAndOffsetStorage {
   friend class CAnimSource;

Runtime/Character/CAnimSourceReader.hpp

@@ -1,10 +1,15 @@
 #pragma once
 
-#include "IAnimReader.hpp"
+#include <memory>
-#include "CToken.hpp"
-#include "CAnimSource.hpp"
-#include "CParticleData.hpp"
 #include <set>
+#include <utility>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Character/CAnimSource.hpp"
+#include "Runtime/Character/CParticleData.hpp"
+#include "Runtime/Character/IAnimReader.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimSysContext.hpp

@@ -1,11 +1,14 @@
 #pragma once
 
-#include "CToken.hpp"
+#include <memory>
-#include "CRandom16.hpp"
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/GCNTypes.hpp"
 
 namespace urde {
-class CTransitionDatabaseGame;
 class CSimplePool;
+class CTransitionDatabaseGame;
 
 struct CAnimSysContext {
   TToken<CTransitionDatabaseGame> x0_transDB;

Runtime/Character/CAnimTreeAnimReaderContainer.hpp

@@ -1,6 +1,12 @@
 #pragma once
 
-#include "CAnimTreeNode.hpp"
+#include <memory>
+#include <string_view>
+#include <utility>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeBlend.hpp

@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CAnimTreeTweenBase.hpp"
+#include <memory>
+#include <string>
+
+#include "Runtime/Character/CAnimTreeTweenBase.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeDoubleChild.hpp

@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CAnimTreeNode.hpp"
+#include <memory>
+#include <string_view>
+
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeLoopIn.hpp

@@ -1,8 +1,12 @@
 #pragma once
 
-#include "CAnimTreeSingleChild.hpp"
+#include <memory>
-#include "CAnimSysContext.hpp"
+#include <string>
-#include "CSequenceHelper.hpp"
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CAnimTreeSingleChild.hpp"
+#include "Runtime/Character/CSequenceHelper.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeNode.hpp

@@ -1,6 +1,11 @@
 #pragma once
 
-#include "IAnimReader.hpp"
+#include <memory>
+#include <string>
+#include <utility>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Character/IAnimReader.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeSequence.hpp

@@ -1,8 +1,12 @@
 #pragma once
 
-#include "CAnimTreeSingleChild.hpp"
+#include <memory>
-#include "CAnimSysContext.hpp"
+#include <vector>
-#include "CSequenceHelper.hpp"
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Character/CAnimSysContext.hpp"
+#include "Runtime/Character/CAnimTreeSingleChild.hpp"
+#include "Runtime/Character/CSequenceHelper.hpp"
 
 namespace urde {
 class IMetaAnim;

Runtime/Character/CAnimTreeSingleChild.hpp

@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CAnimTreeNode.hpp"
+#include <memory>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeTimeScale.hpp

@@ -1,7 +1,12 @@
 #pragma once
 
-#include "CAnimTreeSingleChild.hpp"
+#include <memory>
-#include "CTimeScaleFunctions.hpp"
+#include <string>
+#include <vector>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Character/CAnimTreeSingleChild.hpp"
+#include "Runtime/Character/CTimeScaleFunctions.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeTransition.hpp

@@ -1,7 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <memory>
-#include "CAnimTreeTweenBase.hpp"
+#include <string_view>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CAnimTreeTweenBase.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimTreeTweenBase.hpp

@@ -1,6 +1,10 @@
 #pragma once
 
-#include "CAnimTreeDoubleChild.hpp"
+#include <memory>
+#include <utility>
+
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CAnimTreeDoubleChild.hpp"
 
 namespace urde {
 

Runtime/Character/CAnimation.hpp

@@ -1,7 +1,10 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <memory>
-#include "CMetaAnimFactory.hpp"
+#include <string>
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/CMetaAnimFactory.hpp"
 
 namespace urde {
 class IMetaAnim;

Runtime/Character/CAnimationDatabase.hpp

@@ -1,13 +1,14 @@
 #pragma once
 
-#include "../RetroTypes.hpp"
-#include <vector>
 #include <set>
-#include <string>
+#include <string_view>
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
-class IMetaAnim;
 class CPrimitive;
+class IMetaAnim;
 
 class CAnimationDatabase {
 public:

Runtime/Character/CAnimationDatabaseGame.hpp

@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CAnimationDatabase.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/Character/CAnimationDatabase.hpp"
 
 namespace urde {
 class CAnimation;

Runtime/Character/CAnimationManager.hpp

@@ -1,16 +1,19 @@
 #pragma once
 
-#include "CToken.hpp"
+#include <memory>
-#include "CAnimSysContext.hpp"
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Character/CAnimSysContext.hpp"
 
 namespace urde {
-class CAnimationDatabaseGame;
-class CTransitionDatabaseGame;
-class CSimplePool;
 class CAnimTreeNode;
-struct CMetaAnimTreeBuildOrders;
+class CAnimationDatabaseGame;
+class CSimplePool;
+class CTransitionDatabaseGame;
 class IMetaAnim;
 
+struct CMetaAnimTreeBuildOrders;
+
 class CAnimationManager {
   TToken<CAnimationDatabaseGame> x0_animDB;
   CAnimSysContext x8_sysCtx;

Runtime/Character/CAnimationSet.hpp

@@ -1,10 +1,15 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <memory>
-#include "CAnimation.hpp"
+#include <utility>
-#include "CTransition.hpp"
+#include <vector>
-#include "CHalfTransition.hpp"
+
-#include "CAdditiveAnimPlayback.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CAdditiveAnimPlayback.hpp"
+#include "Runtime/Character/CAnimation.hpp"
+#include "Runtime/Character/CHalfTransition.hpp"
+#include "Runtime/Character/CTransition.hpp"
 
 namespace urde {
 

Runtime/Character/CAssetFactory.hpp

@@ -1,9 +1,12 @@
 #pragma once
 
-#include "IFactory.hpp"
+#include <functional>
-#include "IObj.hpp"
+#include <memory>
-#include "CToken.hpp"
+
-#include "CSimplePool.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/IFactory.hpp"
+#include "Runtime/IObj.hpp"
 
 namespace urde {
 class CCharacterFactory;

Runtime/Character/CBodyController.hpp

@@ -1,20 +1,22 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "zeus/CQuaternion.hpp"
+#include "Runtime/Character/CBodyStateCmdMgr.hpp"
-#include "CharacterCommon.hpp"
+#include "Runtime/Character/CBodyStateInfo.hpp"
-#include "CBodyStateCmdMgr.hpp"
+#include "Runtime/Character/CharacterCommon.hpp"
-#include "CBodyStateInfo.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-
 class CActor;
 class CAnimPlaybackParms;
-struct CFinalInput;
 class CPASAnimParmData;
+class CPASDatabase;
 class CRandom16;
 class CStateManager;
-class CPASDatabase;
+
+struct CFinalInput;
 
 class CBodyController {
   CActor& x0_actor;

Runtime/Character/CBodyState.hpp

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "CharacterCommon.hpp"
+#include "Runtime/Character/CBodyStateCmdMgr.hpp"
-#include "CBodyStateCmdMgr.hpp"
+#include "Runtime/Character/CharacterCommon.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CBodyController;

Runtime/Character/CBodyStateCmdMgr.hpp

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "CharacterCommon.hpp"
+#include "Runtime/rstl.hpp"
-#include "zeus/CVector3f.hpp"
+#include "Runtime/Character/CharacterCommon.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

Runtime/Character/CBodyStateInfo.hpp

@@ -1,9 +1,14 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <map>
-#include "CharacterCommon.hpp"
+#include <memory>
-#include "CBodyState.hpp"
+#include <utility>
-#include "CAdditiveBodyState.hpp"
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CAdditiveBodyState.hpp"
+#include "Runtime/Character/CBodyState.hpp"
+#include "Runtime/Character/CharacterCommon.hpp"
 
 namespace urde {
 class CActor;

Runtime/Character/CBoneTracking.hpp

@@ -1,11 +1,14 @@
 #pragma once
 
-#include "Character/CSegId.hpp"
+#include <optional>
+#include <string_view>
 
-#include "zeus/CTransform.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "zeus/CQuaternion.hpp"
+#include "Runtime/Character/CSegId.hpp"
-#include "zeus/CVector3f.hpp"
+
-#include "RetroTypes.hpp"
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CAnimData;

Runtime/Character/CBoolPOINode.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "CPOINode.hpp"
+#include "Runtime/Character/CPOINode.hpp"
 
 namespace urde {
 class IAnimSourceInfo;

Runtime/Character/CCharAnimTime.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include "Runtime/IOStreams.hpp"
 
 #undef min
 #undef max

Runtime/Character/CCharLayoutInfo.hpp

@@ -1,10 +1,17 @@
 #pragma once
 
-#include "CFactoryMgr.hpp"
+#include <map>
-#include "IOStreams.hpp"
+#include <memory>
-#include "CSegIdList.hpp"
+#include <string>
-#include "CSegId.hpp"
+#include <vector>
-#include "TSegIdMap.hpp"
+
+#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/CSegId.hpp"
+#include "Runtime/Character/CSegIdList.hpp"
+#include "Runtime/Character/TSegIdMap.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

Runtime/Character/CCharacterInfo.hpp

@@ -1,9 +1,15 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <string>
-#include "CPASDatabase.hpp"
+#include <utility>
-#include "zeus/CAABox.hpp"
+#include <vector>
-#include "CEffectComponent.hpp"
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CEffectComponent.hpp"
+#include "Runtime/Character/CPASDatabase.hpp"
+
+#include <zeus/CAABox.hpp>
 
 namespace urde {
 

Runtime/Character/CCharacterSet.hpp

@@ -1,7 +1,10 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <map>
-#include "CCharacterInfo.hpp"
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Character/CCharacterInfo.hpp"
 
 namespace urde {
 

Runtime/Character/CEffectComponent.hpp

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <string>
-#include "RetroTypes.hpp"
+
-#include "CParticleData.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CParticleData.hpp"
 
 namespace urde {
 

Runtime/Character/CFBStreamedAnimReader.hpp

@@ -1,7 +1,10 @@
 #pragma once
 
-#include "CAnimSourceReader.hpp"
+#include <memory>
-#include "CFBStreamedCompression.hpp"
+#include <vector>
+
+#include "Runtime/Character/CAnimSourceReader.hpp"
+#include "Runtime/Character/CFBStreamedCompression.hpp"
 
 namespace urde {
 class CBitLevelLoader;

Runtime/Character/CFBStreamedCompression.hpp

@@ -1,9 +1,13 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <memory>
-#include "CToken.hpp"
+#include <vector>
-#include "CAnimPOIData.hpp"
+
-#include "zeus/CVector3f.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CAnimPOIData.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class IObjectStore;

Runtime/Character/CGroundMovement.hpp

@@ -1,14 +1,19 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <optional>
-#include "Collision/CCollisionInfo.hpp"
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Collision/CCollisionInfo.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
+class CAreaCollisionCache;
+class CCollisionInfoList;
+class CMaterialFilter;
 class CPhysicsActor;
 class CStateManager;
-class CAreaCollisionCache;
-class CMaterialFilter;
-class CCollisionInfoList;
 
 class CGroundMovement {
 public:

Runtime/Character/CHalfTransition.hpp

@@ -1,7 +1,10 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <memory>
-#include "IMetaTrans.hpp"
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/IMetaTrans.hpp"
 
 namespace urde {
 

Runtime/Character/CHierarchyPoseBuilder.hpp

@@ -1,13 +1,15 @@
 #pragma once
 
-#include "CSegId.hpp"
+#include "Runtime/Character/CLayoutDescription.hpp"
-#include "TSegIdMap.hpp"
+#include "Runtime/Character/CSegId.hpp"
-#include "zeus/CQuaternion.hpp"
+#include "Runtime/Character/TSegIdMap.hpp"
-#include "CLayoutDescription.hpp"
+
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CLayoutDescription;
 class CCharLayoutInfo;
+class CLayoutDescription;
 class CPoseAsTransforms;
 
 class CHierarchyPoseBuilder {

Runtime/Character/CIkChain.hpp

@@ -1,10 +1,11 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "zeus/CTransform.hpp"
+#include "Runtime/Character/CSegId.hpp"
-#include "zeus/CVector3f.hpp"
+
-#include "zeus/CQuaternion.hpp"
+#include <zeus/CQuaternion.hpp>
-#include "Character/CSegId.hpp"
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CAnimData;

Runtime/Character/CInt32POINode.hpp

@@ -1,6 +1,9 @@
 #pragma once
 
-#include "CPOINode.hpp"
+#include <string>
+
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/Character/CPOINode.hpp"
 
 namespace urde {
 class IAnimSourceInfo;

Runtime/Character/CLayoutDescription.hpp

@@ -1,8 +1,10 @@
 #pragma once
 
 #include <optional>
-#include "CToken.hpp"
+
-#include "zeus/CVector3f.hpp"
+#include "Runtime/CToken.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CCharLayoutInfo;

Runtime/Character/CMetaAnimBlend.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
-#include "IMetaAnim.hpp"
+#include <memory>
-#include "IOStreams.hpp"
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaAnimFactory.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <memory>
-#include "IMetaAnim.hpp"
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaAnimPhaseBlend.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
-#include "IMetaAnim.hpp"
+#include <memory>
-#include "IOStreams.hpp"
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaAnimPlay.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "IMetaAnim.hpp"
+#include "Runtime/IOStreams.hpp"
-#include "CPrimitive.hpp"
+#include "Runtime/Character/CPrimitive.hpp"
-#include "IOStreams.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaAnimRandom.hpp

@@ -1,7 +1,11 @@
 #pragma once
 
-#include "IMetaAnim.hpp"
+#include <memory>
-#include "IOStreams.hpp"
+#include <utility>
+#include <vector>
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaAnimSequence.hpp

@@ -1,7 +1,10 @@
 #pragma once
 
-#include "IMetaAnim.hpp"
+#include <memory>
-#include "IOStreams.hpp"
+#include <vector>
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaTransFactory.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <memory>
-#include "IMetaTrans.hpp"
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/IMetaTrans.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaTransMetaAnim.hpp

@@ -1,8 +1,10 @@
 #pragma once
 
-#include "IMetaTrans.hpp"
+#include <memory>
-#include "IMetaAnim.hpp"
+
-#include "IOStreams.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/IMetaAnim.hpp"
+#include "Runtime/Character/IMetaTrans.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaTransPhaseTrans.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "IMetaTrans.hpp"
+#include "Runtime/IOStreams.hpp"
-#include "IOStreams.hpp"
+#include "Runtime/Character/CCharAnimTime.hpp"
-#include "CCharAnimTime.hpp"
+#include "Runtime/Character/IMetaTrans.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaTransSnap.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "IMetaTrans.hpp"
+#include "Runtime/IOStreams.hpp"
-#include "IOStreams.hpp"
+#include "Runtime/Character/IMetaTrans.hpp"
 
 namespace urde {
 

Runtime/Character/CMetaTransTrans.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "IMetaTrans.hpp"
+#include "Runtime/IOStreams.hpp"
-#include "IOStreams.hpp"
+#include "Runtime/Character/CCharAnimTime.hpp"
-#include "CCharAnimTime.hpp"
+#include "Runtime/Character/IMetaTrans.hpp"
 
 namespace urde {
 

Runtime/Character/CModelData.hpp

@@ -1,22 +1,25 @@
 #pragma once
 
-#include "zeus/CVector3f.hpp"
+#include <memory>
-#include "zeus/CAABox.hpp"
+
-#include "zeus/CColor.hpp"
+#include "Runtime/CToken.hpp"
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "CToken.hpp"
+#include "Runtime/Character/CAnimData.hpp"
-#include "CAnimData.hpp"
+#include "Runtime/Graphics/CModel.hpp"
-#include "Graphics/CModel.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CCharAnimTime;
-class CStateManager;
 class CActorLights;
-struct CModelFlags;
-class CRandom16;
 class CAnimData;
+class CCharAnimTime;
 class CModel;
+class CRandom16;
 class CSkinnedModel;
+class CStateManager;
+struct CModelFlags;
 struct SAdvancementDeltas;
 
 class CStaticRes {

Runtime/Character/CPASAnimInfo.hpp

@@ -1,8 +1,8 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include "Runtime/IOStreams.hpp"
-#include "rstl.hpp"
+#include "Runtime/rstl.hpp"
-#include "CPASAnimParm.hpp"
+#include "Runtime/Character/CPASAnimParm.hpp"
 
 namespace urde {
 

Runtime/Character/CPASAnimParm.hpp

@@ -1,6 +1,6 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 

Runtime/Character/CPASAnimParmData.hpp

@@ -1,6 +1,8 @@
 #pragma once
-#include "RetroTypes.hpp"
+
-#include "CPASAnimParm.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Character/CPASAnimParm.hpp"
 
 namespace urde {
 class CPASAnimParmData {

Runtime/Character/CPASAnimState.hpp

@@ -1,8 +1,11 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <utility>
-#include "CPASParmInfo.hpp"
+#include <vector>
-#include "CPASAnimInfo.hpp"
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/CPASAnimInfo.hpp"
+#include "Runtime/Character/CPASParmInfo.hpp"
 
 namespace urde {
 class CRandom16;

Runtime/Character/CPASDatabase.hpp

@@ -1,7 +1,11 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <algorithm>
-#include "CPASAnimState.hpp"
+#include <utility>
+#include <vector>
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/CPASAnimState.hpp"
 
 namespace urde {
 

Runtime/Character/CPASParmInfo.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include "Runtime/IOStreams.hpp"
-#include "CPASAnimParm.hpp"
+#include "Runtime/Character/CPASAnimParm.hpp"
 
 namespace urde {
 

Runtime/Character/CPOINode.hpp

@@ -1,7 +1,10 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <string>
-#include "CCharAnimTime.hpp"
+#include <vector>
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/CCharAnimTime.hpp"
 
 namespace urde {
 class IAnimSourceInfo;

Runtime/Character/CParticleData.hpp

@@ -1,8 +1,11 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <string>
-#include "RetroTypes.hpp"
+
-#include "zeus/CVector3f.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

Runtime/Character/CParticleDatabase.hpp

@@ -1,17 +1,22 @@
 #pragma once
 
-#include "CCharacterInfo.hpp"
-#include "CParticleGenInfo.hpp"
-#include "zeus/CFrustum.hpp"
-#include "CToken.hpp"
-#include "Particle/CGenDescription.hpp"
-#include "Particle/CSwooshDescription.hpp"
-#include "Particle/CElectricDescription.hpp"
 #include <map>
+#include <memory>
+#include <string>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Character/CCharacterInfo.hpp"
+#include "Runtime/Character/CParticleGenInfo.hpp"
+#include "Runtime/Particle/CGenDescription.hpp"
+#include "Runtime/Particle/CSwooshDescription.hpp"
+#include "Runtime/Particle/CElectricDescription.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CFrustum.hpp>
 
 namespace urde {
-class CPoseAsTransforms;
 class CCharLayoutInfo;
+class CPoseAsTransforms;
 
 class CParticleDatabase {
   std::map<CAssetId, std::shared_ptr<TLockedToken<CGenDescription>>> x0_particleDescs;

Runtime/Character/CParticleGenInfo.hpp

@@ -1,14 +1,18 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <memory>
-#include "CParticleData.hpp"
+
-#include "zeus/CVector3f.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "zeus/CAABox.hpp"
+#include "Runtime/Character/CParticleData.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-struct SObjectTag;
 class CParticleGen;
 class CStateManager;
+struct SObjectTag;
 
 enum class EParticleGenType { Normal, Auxiliary };
 

Runtime/Character/CParticlePOINode.hpp

@@ -1,7 +1,7 @@
 #pragma once
 
-#include "CPOINode.hpp"
+#include "Runtime/Character/CParticleData.hpp"
-#include "CParticleData.hpp"
+#include "Runtime/Character/CPOINode.hpp"
 
 namespace urde {
 class IAnimSourceInfo;

Runtime/Character/CPoseAsTransforms.hpp

@@ -1,8 +1,14 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include <memory>
-#include "CSegId.hpp"
+#include <utility>
-#include "zeus/CTransform.hpp"
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Character/CSegId.hpp"
+
+#include <zeus/CMatrix3f.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CCharLayoutInfo;

Runtime/Character/CPrimitive.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <string>
-#include "RetroTypes.hpp"
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
 
 namespace urde {
 

Runtime/Character/CRagDoll.hpp

@@ -1,13 +1,17 @@
 #pragma once
-#include "RetroTypes.hpp"
+
-#include "zeus/CVector3f.hpp"
+#include <vector>
-#include "zeus/CQuaternion.hpp"
+
-#include "zeus/CAABox.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "CSegId.hpp"
+#include "Runtime/Character/CSegId.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CQuaternion.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
-class CHierarchyPoseBuilder;
 class CCharLayoutInfo;
+class CHierarchyPoseBuilder;
 class CModelData;
 class CStateManager;
 

Runtime/Character/CSegId.hpp

@@ -1,8 +1,9 @@
 #pragma once
 
-#include "RetroTypes.hpp"
+#include "Runtime/IOStreams.hpp"
-#include "IOStreams.hpp"
+#include "Runtime/RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
+
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 

Runtime/Character/CSegIdList.hpp

@@ -1,7 +1,9 @@
 #pragma once
 
-#include "IOStreams.hpp"
+#include <vector>
-#include "CSegId.hpp"
+
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Character/CSegId.hpp"
 
 namespace urde {
 

Runtime/Character/CSegStatementSet.hpp

@@ -1,11 +1,11 @@
 #pragma once
 
-#include "CAnimPerSegmentData.hpp"
+#include "Runtime/Character/CAnimPerSegmentData.hpp"
-#include "CSegId.hpp"
+#include "Runtime/Character/CSegId.hpp"
 
 namespace urde {
-class CSegIdList;
 class CCharLayoutInfo;
+class CSegIdList;
 
 class CSegStatementSet {
 public:

Runtime/Character/CSequenceHelper.hpp

@@ -1,15 +1,18 @@
 #pragma once
 
-#include "CAnimTreeNode.hpp"
+#include <memory>
-#include "CBoolPOINode.hpp"
+#include <vector>
-#include "CInt32POINode.hpp"
+
-#include "CParticlePOINode.hpp"
+#include "Runtime/Character/CAnimSysContext.hpp"
-#include "CSoundPOINode.hpp"
+#include "Runtime/Character/CAnimTreeNode.hpp"
-#include "CAnimSysContext.hpp"
+#include "Runtime/Character/CBoolPOINode.hpp"
+#include "Runtime/Character/CInt32POINode.hpp"
+#include "Runtime/Character/CParticlePOINode.hpp"
+#include "Runtime/Character/CSoundPOINode.hpp"
 
 namespace urde {
-class IMetaAnim;
 class CTransitionDatabaseGame;
+class IMetaAnim;
 
 class CSequenceFundamentals {
   CSteadyStateAnimInfo x0_ssInfo;