General: Normalize RuntimeCommon include paths

Performs the same normalizing done to the RuntimeCommonB target, now all of the runtime headers have normalized include paths.
2025-12-08 14:24:56 +00:00 · 2019-09-27 22:53:03 -04:00
parent 8591787409
commit a633b8e8fd
258 changed files with 1744 additions and 951 deletions
--- a/Runtime/Graphics/CBooRenderer.hpp
+++ b/Runtime/Graphics/CBooRenderer.hpp
@@ -1,29 +1,42 @@
 #pragma once

 #include <functional>
-#include "IRenderer.hpp"
-#include "CDrawable.hpp"
-#include "CDrawablePlaneObject.hpp"
-#include "Shaders/CThermalColdFilter.hpp"
-#include "Shaders/CThermalHotFilter.hpp"
-#include "Shaders/CSpaceWarpFilter.hpp"
-#include "Shaders/CFogVolumePlaneShader.hpp"
-#include "Shaders/CFogVolumeFilter.hpp"
-#include "Shaders/CPhazonSuitFilter.hpp"
-#include "CTexture.hpp"
-#include "CRandom16.hpp"
-#include "CPVSVisSet.hpp"
-#include "zeus/CRectangle.hpp"
-#include "World/CGameArea.hpp"
-#include "zeus/CPlane.hpp"
+#include <list>
+#include <optional>
+#include <unordered_map>
+#include <utility>
+#include <vector>
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Graphics/CDrawable.hpp"
+#include "Runtime/Graphics/CDrawablePlaneObject.hpp"
+#include "Runtime/Graphics/CPVSVisSet.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/IRenderer.hpp"
+#include "Runtime/Graphics/Shaders/CFogVolumeFilter.hpp"
+#include "Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp"
+#include "Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp"
+#include "Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp"
+#include "Runtime/Graphics/Shaders/CThermalColdFilter.hpp"
+#include "Runtime/Graphics/Shaders/CThermalHotFilter.hpp"
+#include "Runtime/World/CGameArea.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CFrustum.hpp>
+#include <zeus/CPlane.hpp>
+#include <zeus/CRectangle.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector3f.hpp>

 namespace urde {
-class IObjectStore;
-class CMemorySys;
-class IFactory;
-class CTexture;
-class CParticleGen;
 class CBooModel;
+class CMemorySys;
+class CParticleGen;
+class CTexture;
+class IFactory;
+class IObjectStore;

 class Buckets {
  friend class CBooRenderer;
@@ -57,10 +70,10 @@ enum class EWorldShadowMode {

 class CBooRenderer final : public IRenderer {
  friend class CBooModel;
-  friend class CModel;
  friend class CGameArea;
-  friend class CWorldTransManager;
+  friend class CModel;
  friend class CMorphBallShadow;
+  friend class CWorldTransManager;

  struct CAreaListItem {
    const std::vector<CMetroidModelInstance>* x0_geometry;
--- a/Runtime/Graphics/CDrawable.hpp
+++ b/Runtime/Graphics/CDrawable.hpp
@@ -1,7 +1,7 @@
 #pragma once

-#include "GCNTypes.hpp"
-#include "zeus/CAABox.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include <zeus/CAABox.hpp>

 namespace urde {
 enum class EDrawableType : u16 { WorldSurface, Particle, Actor, SimpleShadow, Decal };
--- a/Runtime/Graphics/CDrawablePlaneObject.hpp
+++ b/Runtime/Graphics/CDrawablePlaneObject.hpp
@@ -1,7 +1,7 @@
 #pragma once

-#include "CDrawable.hpp"
-#include "zeus/CPlane.hpp"
+#include "Runtime/Graphics/CDrawable.hpp"
+#include <zeus/CPlane.hpp>

 namespace urde {
 class CDrawablePlaneObject : public CDrawable {
--- a/Runtime/Graphics/CGraphics.hpp
+++ b/Runtime/Graphics/CGraphics.hpp
@@ -1,15 +1,19 @@
 #pragma once

-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "boo/graphicsdev/IGraphicsCommandQueue.hpp"
+#include <vector>

-#include "RetroTypes.hpp"
-#include "zeus/CTransform.hpp"
-#include "zeus/CVector2i.hpp"
-#include "zeus/CColor.hpp"
+#include "Runtime/RetroTypes.hpp"

-#include "hecl/Runtime.hpp"
-#include "hecl/CVar.hpp"
+#include <boo/graphicsdev/IGraphicsCommandQueue.hpp>
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <hecl/CVar.hpp>
+#include <hecl/Runtime.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector2i.hpp>
+#include <zeus/CVector2f.hpp>

 namespace urde {
 extern hecl::CVar* g_disableLighting;
--- a/Runtime/Graphics/CGraphicsPalette.hpp
+++ b/Runtime/Graphics/CGraphicsPalette.hpp
@@ -1,7 +1,7 @@
 #pragma once

 #include <memory>
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"

 namespace urde {

--- a/Runtime/Graphics/CLight.hpp
+++ b/Runtime/Graphics/CLight.hpp
@@ -1,8 +1,9 @@
 #pragma once

-#include "zeus/CVector3f.hpp"
-#include "zeus/CColor.hpp"
-#include "RetroTypes.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CVector3f.hpp>

 namespace urde {

--- a/Runtime/Graphics/CLineRenderer.hpp
+++ b/Runtime/Graphics/CLineRenderer.hpp
@@ -1,13 +1,18 @@
 #pragma once

-#include "RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
-#include "zeus/CVector4f.hpp"
-#include "zeus/CColor.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "hecl/VertexBufferPool.hpp"
-#include "hecl/UniformBufferPool.hpp"
-#include "Graphics/CGraphics.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <hecl/UniformBufferPool.hpp>
+#include <hecl/VertexBufferPool.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>
+#include <zeus/CVector4f.hpp>

 namespace urde {

--- a/Runtime/Graphics/CMetroidModelInstance.hpp
+++ b/Runtime/Graphics/CMetroidModelInstance.hpp
@@ -1,12 +1,18 @@
 #pragma once

+#include <memory>
+#include <unordered_map>
 #include <vector>
-#include "RetroTypes.hpp"
-#include "zeus/CTransform.hpp"
-#include "zeus/CAABox.hpp"
-#include "hecl/HMDLMeta.hpp"
+
+#include "Runtime/RetroTypes.hpp"
+
 #include "Shaders/CModelShaders.hpp"

+#include <hecl/HMDLMeta.hpp>
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>
+
 namespace urde {
 class CBooModel;
 struct CBooSurface;
--- a/Runtime/Graphics/CModel.hpp
+++ b/Runtime/Graphics/CModel.hpp
@@ -1,23 +1,29 @@
 #pragma once

-#include "RetroTypes.hpp"
-#include "zeus/CColor.hpp"
-#include "CFactoryMgr.hpp"
-#include "CToken.hpp"
-#include "zeus/CAABox.hpp"
+#include <memory>
+#include <optional>
+#include <unordered_map>
+#include <vector>
+
 #include "DNACommon/CMDL.hpp"
 #include "DNAMP1/CMDLMaterials.hpp"
+#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
 #include "Shaders/CModelShaders.hpp"
-#include "hecl/HMDLMeta.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+#include <hecl/HMDLMeta.hpp>
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>

 namespace urde {
-class IObjectStore;
-class CTexture;
 class CLight;
-class CSkinRules;
-class CPoseAsTransforms;
 class CModel;
+class CPoseAsTransforms;
+class CSkinRules;
+class CTexture;
+class IObjectStore;

 struct CModelFlags {
  u8 x0_blendMode = 0; /* 2: add color, >6: additive, >4: blend, else opaque */
@@ -115,10 +121,10 @@ struct SShader {
 };

 class CBooModel {
-  friend class CModel;
-  friend class CGameArea;
  friend class CBooRenderer;
+  friend class CGameArea;
  friend class CMetroidModelInstance;
+  friend class CModel;
  friend class CSkinnedModel;
  friend struct GeometryUniformLayout;

--- a/Runtime/Graphics/CMoviePlayer.hpp
+++ b/Runtime/Graphics/CMoviePlayer.hpp
@@ -1,10 +1,14 @@
 #pragma once

-#include "RetroTypes.hpp"
-#include "CDvdFile.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "specter/View.hpp"
-#include "zeus/CVector3f.hpp"
+#include <memory>
+#include <vector>
+
+#include "Runtime/CDvdFile.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+#include <specter/View.hpp>
+#include <zeus/CVector3f.hpp>

 namespace urde {

--- a/Runtime/Graphics/CPVSAreaSet.hpp
+++ b/Runtime/Graphics/CPVSAreaSet.hpp
@@ -1,7 +1,9 @@
 #pragma once

-#include "RetroTypes.hpp"
-#include "CPVSVisOctree.hpp"
+#include <vector>
+
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CPVSVisOctree.hpp"

 namespace urde {

--- a/Runtime/Graphics/CPVSVisOctree.hpp
+++ b/Runtime/Graphics/CPVSVisOctree.hpp
@@ -1,8 +1,10 @@
 #pragma once

-#include "RetroTypes.hpp"
-#include "zeus/CVector3f.hpp"
-#include "CPVSVisSet.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CPVSVisSet.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CVector3f.hpp>

 namespace urde {

--- a/Runtime/Graphics/CPVSVisSet.hpp
+++ b/Runtime/Graphics/CPVSVisSet.hpp
@@ -1,8 +1,7 @@
 #pragma once

-#include "RetroTypes.hpp"
-#include "zeus/CAABox.hpp"
-#include <memory>
+#include "Runtime/RetroTypes.hpp"
+#include <zeus/CVector3f.hpp>

 namespace urde {
 class CPVSVisOctree;
--- a/Runtime/Graphics/CRainSplashGenerator.hpp
+++ b/Runtime/Graphics/CRainSplashGenerator.hpp
@@ -1,9 +1,14 @@
 #pragma once

-#include "RetroTypes.hpp"
-#include "CRandom16.hpp"
-#include "zeus/CVector3f.hpp"
-#include "Graphics/CLineRenderer.hpp"
+#include <utility>
+#include <vector>
+
+#include "Runtime/CRandom16.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/rstl.hpp"
+#include "Runtime/Graphics/CLineRenderer.hpp"
+
+#include <zeus/CVector3f.hpp>

 namespace urde {
 class CStateManager;
--- a/Runtime/Graphics/CSimpleShadow.hpp
+++ b/Runtime/Graphics/CSimpleShadow.hpp
@@ -1,7 +1,11 @@
 #pragma once

-#include "zeus/CAABox.hpp"
-#include "Graphics/Shaders/CTexturedQuadFilter.hpp"
+#include <optional>
+
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CTransform.hpp>

 namespace urde {
 class CTexture;
--- a/Runtime/Graphics/CSkinnedModel.hpp
+++ b/Runtime/Graphics/CSkinnedModel.hpp
@@ -1,14 +1,20 @@
 #pragma once

-#include "CToken.hpp"
-#include "CModel.hpp"
+#include <memory>
 #include <optional>
+#include <utility>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Graphics/CModel.hpp"
+
+#include <zeus/CVector3f.hpp>

 namespace urde {
-class CModel;
-class CSkinRules;
 class CCharLayoutInfo;
+class CModel;
 class CPoseAsTransforms;
+class CSkinRules;
 class CVertexMorphEffect;
 class IObjectStore;

--- a/Runtime/Graphics/CTexture.hpp
+++ b/Runtime/Graphics/CTexture.hpp
@@ -1,11 +1,15 @@
 #pragma once

-#include "GCNTypes.hpp"
-#include "CFactoryMgr.hpp"
-#include "IObj.hpp"
-#include "IOStreams.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include <memory>
+#include <string>
+
+#include "Runtime/CFactoryMgr.hpp"
+#include "Runtime/GCNTypes.hpp"
+#include "Runtime/IObj.hpp"
+#include "Runtime/IOStreams.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>

 namespace urde {
 class CVParamTransfer;
--- a/Runtime/Graphics/CVertexMorphEffect.hpp
+++ b/Runtime/Graphics/CVertexMorphEffect.hpp
@@ -1,11 +1,17 @@
 #pragma once

-#include "CToken.hpp"
-#include "Character/CPoseAsTransforms.hpp"
+#include <utility>
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/Character/CPoseAsTransforms.hpp"
+
+#include <zeus/CUnitVector.hpp>
+#include <zeus/CVector3f.hpp>

 namespace urde {
-class CSkinRules;
 class CRandom16;
+class CSkinRules;

 class CVertexMorphEffect {
  zeus::CUnitVector3f x0_;
--- a/Runtime/Graphics/IRenderer.hpp
+++ b/Runtime/Graphics/IRenderer.hpp
@@ -1,26 +1,29 @@
 #pragma once

+#include <functional>
 #include <vector>
-#include "../RetroTypes.hpp"
-#include "../CToken.hpp"
-#include "zeus/CAABox.hpp"
-#include "zeus/CPlane.hpp"
-#include "zeus/CFrustum.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CRectangle.hpp"
-#include "CGraphics.hpp"
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CFrustum.hpp>
+#include <zeus/CPlane.hpp>
+#include <zeus/CRectangle.hpp>

 namespace urde {
-class CMetroidModelInstance;
-class CLight;
 class CAreaOctTree;
-class CParticleGen;
+class CLight;
+class CMetroidModelInstance;
 class CModel;
-struct SShader;
-class CSkinnedModel;
 class CPVSVisSet;
+class CParticleGen;
+class CSkinnedModel;
 struct CAreaRenderOctTree;
 struct CModelFlags;
+struct SShader;

 class IRenderer {
 public:
--- a/Runtime/Graphics/Shaders/CAABoxShader.hpp
+++ b/Runtime/Graphics/Shaders/CAABoxShader.hpp
@@ -1,9 +1,10 @@
 #pragma once

-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CAABox.hpp"
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp
+++ b/Runtime/Graphics/Shaders/CCameraBlurFilter.hpp
@@ -1,8 +1,11 @@
 #pragma once

-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CVector3f.hpp>
+#include <zeus/CVector4f.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp
+++ b/Runtime/Graphics/Shaders/CColoredQuadFilter.hpp
@@ -1,9 +1,11 @@
 #pragma once

-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CRectangle.hpp"
-#include "Camera/CCameraFilter.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/Camera/CCameraFilter.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CRectangle.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CColoredStripShader.hpp
+++ b/Runtime/Graphics/Shaders/CColoredStripShader.hpp
@@ -1,8 +1,9 @@
 #pragma once

-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>

 namespace urde
 {
--- a/Runtime/Graphics/Shaders/CDecalShaders.hpp
+++ b/Runtime/Graphics/Shaders/CDecalShaders.hpp
@@ -1,6 +1,6 @@
 #pragma once

-#include "Graphics/CGraphics.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"

 namespace urde {
 struct CQuadDecal;
--- a/Runtime/Graphics/Shaders/CElementGenShaders.hpp
+++ b/Runtime/Graphics/Shaders/CElementGenShaders.hpp
@@ -1,7 +1,10 @@
 #pragma once

-#include "Graphics/CGraphics.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include <array>
+
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>

 namespace urde {
 class CElementGen;
--- a/Runtime/Graphics/Shaders/CEnergyBarShader.hpp
+++ b/Runtime/Graphics/Shaders/CEnergyBarShader.hpp
@@ -1,9 +1,14 @@
 #pragma once

-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CRectangle.hpp"
-#include "Camera/CCameraFilter.hpp"
+#include <vector>
+
+#include "Runtime/Camera/CCameraFilter.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CRectangle.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CEnvFxShaders.hpp
+++ b/Runtime/Graphics/Shaders/CEnvFxShaders.hpp
@@ -1,7 +1,12 @@
 #pragma once

-#include "Graphics/CGraphics.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>

 namespace urde {
 class CEnvFxManager;
--- a/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp
+++ b/Runtime/Graphics/Shaders/CFluidPlaneShader.hpp
@@ -1,14 +1,23 @@
 #pragma once

-#include "RetroTypes.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "CModelShaders.hpp"
-#include "World/CFluidPlaneManager.hpp"
-#include "Graphics/CTexture.hpp"
-#include "CToken.hpp"
-#include "zeus/CAABox.hpp"
+#include <vector>
+
+#include "Runtime/CToken.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Graphics/CTexture.hpp"
+#include "Runtime/Graphics/Shaders/CModelShaders.hpp"
+#include "Runtime/World/CFluidPlaneManager.hpp"
+
 #include "Shaders/shader_CFluidPlaneShader.hpp"

+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CAABox.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CVector3f.hpp>
+#include <zeus/CVector4f.hpp>
+
 namespace urde {

 class CFluidPlaneShader {
--- a/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp
+++ b/Runtime/Graphics/Shaders/CFogVolumeFilter.hpp
@@ -1,9 +1,10 @@
 #pragma once

-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CRectangle.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CRectangle.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp
+++ b/Runtime/Graphics/Shaders/CFogVolumePlaneShader.hpp
@@ -1,10 +1,14 @@
 #pragma once

-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CRectangle.hpp"
-#include "zeus/CVector4f.hpp"
+#include <cstddef>
+#include <vector>
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CRectangle.hpp>
+#include <zeus/CVector4f.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CLineRendererShaders.hpp
+++ b/Runtime/Graphics/Shaders/CLineRendererShaders.hpp
@@ -1,7 +1,10 @@
 #pragma once

-#include "Graphics/CGraphics.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include <array>
+
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>

 namespace urde {
 class CLineRenderer;
--- a/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp
+++ b/Runtime/Graphics/Shaders/CMapSurfaceShader.hpp
@@ -1,9 +1,11 @@
 #pragma once

-#include "RetroTypes.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CModelShaders.hpp
+++ b/Runtime/Graphics/Shaders/CModelShaders.hpp
@@ -1,13 +1,18 @@
 #pragma once

-#include "hecl/Runtime.hpp"
-#include "hecl/Backend.hpp"
-#include <optional>
-#include "zeus/CVector3f.hpp"
-#include "zeus/CColor.hpp"
-#include "Graphics/CGraphics.hpp"
-#include "DataSpec/DNAMP1/CMDLMaterials.hpp"
 #include <array>
+#include <optional>
+
+#include "DataSpec/DNAMP1/CMDLMaterials.hpp"
+
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include <hecl/Backend.hpp>
+#include <hecl/Runtime.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CVector3f.hpp>
+#include <zeus/CVector4f.hpp>

 #define URDE_MAX_LIGHTS 8

--- a/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp
+++ b/Runtime/Graphics/Shaders/CParticleSwooshShaders.hpp
@@ -1,7 +1,14 @@
 #pragma once

-#include "Graphics/CGraphics.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include <array>
+
+#include "Runtime/Graphics/CGraphics.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>

 namespace urde {
 class CParticleSwoosh;
--- a/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp
+++ b/Runtime/Graphics/Shaders/CPhazonSuitFilter.hpp
@@ -1,7 +1,7 @@
 #pragma once

-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "zeus/CColor.hpp"
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+#include <zeus/CColor.hpp>

 namespace urde {
 class CTexture;
--- a/Runtime/Graphics/Shaders/CRadarPaintShader.hpp
+++ b/Runtime/Graphics/Shaders/CRadarPaintShader.hpp
@@ -1,9 +1,12 @@
 #pragma once

-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CRectangle.hpp"
-#include "Camera/CCameraFilter.hpp"
+#include <vector>
+
+#include "Runtime/Camera/CCameraFilter.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CRectangle.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp
+++ b/Runtime/Graphics/Shaders/CRandomStaticFilter.hpp
@@ -1,9 +1,10 @@
 #pragma once

-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CRectangle.hpp"
-#include "Camera/CCameraFilter.hpp"
+#include "Runtime/Camera/CCameraFilter.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CRectangle.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CScanLinesFilter.hpp
+++ b/Runtime/Graphics/Shaders/CScanLinesFilter.hpp
@@ -1,9 +1,10 @@
 #pragma once

-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CRectangle.hpp"
-#include "Camera/CCameraFilter.hpp"
+#include "Runtime/Camera/CCameraFilter.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CRectangle.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp
+++ b/Runtime/Graphics/Shaders/CSpaceWarpFilter.hpp
@@ -1,9 +1,10 @@
 #pragma once

-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "RetroTypes.hpp"
-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CTextSupportShader.hpp
+++ b/Runtime/Graphics/Shaders/CTextSupportShader.hpp
@@ -1,9 +1,15 @@
 #pragma once

-#include "GuiSys/CGuiWidget.hpp"
-#include "hecl/VertexBufferPool.hpp"
-#include "hecl/UniformBufferPool.hpp"
-#include "zeus/CVector2i.hpp"
+#include "Runtime/GuiSys/CGuiWidget.hpp"
+
+#include <hecl/UniformBufferPool.hpp>
+#include <hecl/VertexBufferPool.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector2i.hpp>
+#include <zeus/CVector3f.hpp>

 namespace urde {
 class CGlyph;
--- a/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp
+++ b/Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp
@@ -1,10 +1,13 @@
 #pragma once

-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "zeus/CRectangle.hpp"
-#include "Camera/CCameraFilter.hpp"
-#include "CToken.hpp"
+#include "Runtime/CToken.hpp"
+#include "Runtime/Camera/CCameraFilter.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>
+#include <zeus/CRectangle.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CThermalColdFilter.hpp
+++ b/Runtime/Graphics/Shaders/CThermalColdFilter.hpp
@@ -1,9 +1,11 @@
 #pragma once

-#include "RetroTypes.hpp"
-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include "Runtime/RetroTypes.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CThermalHotFilter.hpp
+++ b/Runtime/Graphics/Shaders/CThermalHotFilter.hpp
@@ -1,8 +1,9 @@
 #pragma once

-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CWorldShadowShader.hpp
+++ b/Runtime/Graphics/Shaders/CWorldShadowShader.hpp
@@ -1,7 +1,12 @@
 #pragma once

-#include "CColoredQuadFilter.hpp"
-#include "CTexturedQuadFilter.hpp"
+#include <optional>
+
+#include "Runtime/Graphics/Shaders/CColoredQuadFilter.hpp"
+#include "Runtime/Graphics/Shaders/CTexturedQuadFilter.hpp"
+
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>

 namespace urde {

--- a/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp
+++ b/Runtime/Graphics/Shaders/CXRayBlurFilter.hpp
@@ -1,9 +1,10 @@
 #pragma once

-#include "boo/graphicsdev/IGraphicsDataFactory.hpp"
-#include "zeus/CMatrix4f.hpp"
-#include "zeus/CColor.hpp"
-#include "CToken.hpp"
+#include "Runtime/CToken.hpp"
+
+#include <boo/graphicsdev/IGraphicsDataFactory.hpp>
+#include <zeus/CColor.hpp>
+#include <zeus/CMatrix4f.hpp>

 namespace urde {
 class CTexture;