Mass refactoring part 2/2: fixing include paths and project files

2025-12-20 10:25:40 +00:00 · 2015-12-14 19:07:22 -07:00
parent 8805baaee1
commit 824d23efc1
207 changed files with 662 additions and 1035 deletions
--- a/src/Core/Resource/CAnimSet.cpp
+++ b/src/Core/Resource/CAnimSet.cpp
@@ -1,5 +1,4 @@
 #include "CAnimSet.h"
-#include <Core/CResCache.h>

 CAnimSet::CAnimSet() : CResource()
 {
--- a/src/Core/Resource/CAnimSet.h
+++ b/src/Core/Resource/CAnimSet.h
@@ -1,11 +1,12 @@
 #ifndef CANIMSET_H
 #define CANIMSET_H

-#include <Common/types.h>
-#include <Core/TResPtr.h>
-#include <vector>
-#include "model/CModel.h"
+#include "TResPtr.h"
 #include "CResource.h"
+#include "Core/Resource/Model/CModel.h"
+#include <Common/types.h>
+
+#include <vector>

 // will expand later! this is where animation support will come in
 class CAnimSet : public CResource
--- a/src/Core/Resource/CAnimationParameters.cpp
+++ b/src/Core/Resource/CAnimationParameters.cpp
@@ -1,7 +1,7 @@
 #include "CAnimationParameters.h"
 #include "CAnimSet.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
+#include "CResCache.h"
+#include "Core/Log.h"
 #include <iostream>

 CAnimationParameters::CAnimationParameters()
--- a/src/Core/Resource/CAnimationParameters.h
+++ b/src/Core/Resource/CAnimationParameters.h
@@ -2,9 +2,9 @@
 #define CANIMATIONPARAMETERS_H

 #include "CResource.h"
-#include "model/CModel.h"
-#include <Core/TResPtr.h>
+#include "TResPtr.h"
 #include "EFormatVersion.h"
+#include "Core/Resource/Model/CModel.h"

 class CAnimationParameters
 {
--- a/src/Core/Resource/CCollisionMesh.cpp
+++ b/src/Core/Resource/CCollisionMesh.cpp
@@ -1,5 +1,5 @@
 #include "CCollisionMesh.h"
-#include <Core/CRenderer.h>
+#include "Core/Render/CRenderer.h"

 CCollisionMesh::CCollisionMesh()
 {
--- a/src/Core/Resource/CCollisionMesh.h
+++ b/src/Core/Resource/CCollisionMesh.h
@@ -1,10 +1,10 @@
 #ifndef CCOLLISIONMESH_H
 #define CCOLLISIONMESH_H

-#include <Common/CAABox.h>
-#include <OpenGL/CVertexBuffer.h>
-#include <OpenGL/CIndexBuffer.h>
 #include "CResource.h"
+#include "Core/OpenGL/CVertexBuffer.h"
+#include "Core/OpenGL/CIndexBuffer.h"
+#include <Common/Math/CAABox.h>

 class CCollisionMesh
 {
--- a/src/Core/Resource/CCollisionMeshGroup.h
+++ b/src/Core/Resource/CCollisionMeshGroup.h
@@ -3,7 +3,7 @@

 #include "CResource.h"
 #include "CCollisionMesh.h"
-#include <Core/TResPtr.h>
+#include "TResPtr.h"
 #include <vector>

 class CCollisionMeshGroup : public CResource
--- a/src/Core/Resource/CFont.cpp
+++ b/src/Core/Resource/CFont.cpp
@@ -1,7 +1,7 @@
 #include "CFont.h"
-#include <Core/CDrawUtil.h>
-#include <Core/CRenderer.h>
-#include <Core/CResCache.h>
+#include "CResCache.h"
+#include "Core/Render/CDrawUtil.h"
+#include "Core/Render/CRenderer.h"
 #include <Common/AnimUtil.h>

 CDynamicVertexBuffer CFont::smGlyphVertices;
--- a/src/Core/Resource/CFont.h
+++ b/src/Core/Resource/CFont.h
@@ -3,11 +3,11 @@

 #include "CResource.h"
 #include "CTexture.h"
-#include "model/CVertex.h"
+#include "TResPtr.h"
+#include "Core/Resource/Model/CVertex.h"
+#include "Core/OpenGL/CDynamicVertexBuffer.h"
+#include "Core/OpenGL/CIndexBuffer.h"
 #include <Common/types.h>
-#include <Core/TResPtr.h>
-#include <OpenGL/CDynamicVertexBuffer.h>
-#include <OpenGL/CIndexBuffer.h>

 #include <string>
 #include <unordered_map>
--- a/src/Core/Resource/CGameArea.cpp
+++ b/src/Core/Resource/CGameArea.cpp
@@ -1,6 +1,6 @@
 #include "CGameArea.h"
-#include "script/CScriptLayer.h"
-#include <Core/CRenderer.h>
+#include "Core/Resource/Script/CScriptLayer.h"
+#include "Core/Render/CRenderer.h"

 CGameArea::CGameArea() : CResource()
 {
--- a/src/Core/Resource/CGameArea.h
+++ b/src/Core/Resource/CGameArea.h
@@ -1,14 +1,15 @@
 #ifndef CGAMEAREA_H
 #define CGAMEAREA_H

+#include "CResource.h"
 #include "CCollisionMeshGroup.h"
 #include "CLight.h"
 #include "CMaterialSet.h"
-#include "model/CModel.h"
-#include "model/CStaticModel.h"
-#include "CResource.h"
+#include "Core/Resource/Model/CModel.h"
+#include "Core/Resource/Model/CStaticModel.h"
 #include <Common/types.h>
-#include <Common/CTransform4f.h>
+#include <Common/Math/CTransform4f.h>
+
 #include <unordered_map>

 class CScriptLayer;
--- a/src/Core/Resource/CLight.cpp
+++ b/src/Core/Resource/CLight.cpp
@@ -1,7 +1,7 @@
 #include "CLight.h"
+#include "Core/Render/CGraphics.h"
 #include <cmath>
 #include <float.h>
-#include <Core/CGraphics.h>

 #define CLIGHT_NO_RADIUS 0x40
 #define CLIGHT_NO_INTENSITY 0x80
--- a/src/Core/Resource/CLight.h
+++ b/src/Core/Resource/CLight.h
@@ -3,8 +3,7 @@

 #include <FileIO/CInputStream.h>
 #include <Common/CColor.h>
-#include <Common/CVector3f.h>
-#include <GL/glew.h>
+#include <Common/Math/CVector3f.h>

 /* CLight is currently heavily based on the lights system from Metroid Prime,
 * including code reverse engineered from the game's executable. Not yet sure
--- a/src/Core/Resource/CMaterial.cpp
+++ b/src/Core/Resource/CMaterial.cpp
@@ -1,13 +1,13 @@
 #include "CMaterial.h"
+#include "CResCache.h"
+#include "Core/Render/CDrawUtil.h"
+#include "Core/Render/CRenderer.h"
+#include "Core/OpenGL/GLCommon.h"
+#include "Core/OpenGL/CShaderGenerator.h"
 #include <Common/CHashFNV1A.h>
-#include <Core/CDrawUtil.h>
-#include <Core/CRenderer.h>
-#include <Core/CResCache.h>
-#include <OpenGL/GLCommon.h>
-#include <OpenGL/CShaderGenerator.h>

 #include <iostream>
-#include <gl/glew.h>
+#include <GL/glew.h>

 u64 CMaterial::sCurrentMaterial = 0;
 CColor CMaterial::sCurrentTint = CColor::skWhite;
--- a/src/Core/Resource/CMaterial.h
+++ b/src/Core/Resource/CMaterial.h
@@ -4,15 +4,15 @@
 #include "CMaterialPass.h"
 #include "CTexture.h"
 #include "EFormatVersion.h"
-#include "model/EVertexDescription.h"
+#include "TResPtr.h"
+#include "Core/Resource/Model/EVertexDescription.h"
+#include "Core/Render/ERenderOptions.h"
+#include "Core/OpenGL/CShader.h"
+
 #include <Common/CColor.h>
 #include <Common/EnumUtil.h>
 #include <Common/types.h>
-#include <Core/TResPtr.h>
-#include <Core/ERenderOptions.h>
 #include <FileIO/CInputStream.h>
-#include <OpenGL/CShader.h>
-#include <Resource/CTexture.h>

 class CMaterialSet;

--- a/src/Core/Resource/CMaterialPass.cpp
+++ b/src/Core/Resource/CMaterialPass.cpp
@@ -1,7 +1,7 @@
 #include "CMaterialPass.h"
 #include "CMaterial.h"
+#include "Core/Render/CGraphics.h"
 #include <Common/AnimUtil.h>
-#include <Core/CGraphics.h>

 CMaterialPass::CMaterialPass(CMaterial *pParent)
 {
--- a/src/Core/Resource/CMaterialPass.h
+++ b/src/Core/Resource/CMaterialPass.h
@@ -1,12 +1,12 @@
 #ifndef CMATERIALPASS_H
 #define CMATERIALPASS_H

+#include "TResPtr.h"
+#include "CTexture.h"
+#include "ETevEnums.h"
+#include "Core/Render/ERenderOptions.h"
 #include <Common/CFourCC.h>
 #include <Common/CHashFNV1A.h>
-#include <Core/TResPtr.h>
-#include <Core/ERenderOptions.h>
-#include <Resource/CTexture.h>
-#include "ETevEnums.h"

 class CMaterial;

--- a/src/Core/Resource/CMaterialSet.cpp
+++ b/src/Core/Resource/CMaterialSet.cpp
@@ -1,5 +1,5 @@
 #include "CMaterialSet.h"
-#include <Core/CResCache.h>
+#include "CResCache.h"
 #include <iostream>

 CMaterialSet::CMaterialSet()
--- a/src/Core/Resource/CMaterialSet.h
+++ b/src/Core/Resource/CMaterialSet.h
@@ -1,10 +1,10 @@
 #ifndef CMATERIALSET_H
 #define CMATERIALSET_H

-#include <FileIO/CInputStream.h>
-#include <Resource/CTexture.h>
-#include <Resource/CMaterial.h>
+#include "CMaterial.h"
+#include "CTexture.h"
 #include "EFormatVersion.h"
+#include <FileIO/CInputStream.h>

 class CMaterialSet
 {
--- a/src/Core/Resource/CPakFile.cpp
+++ b/src/Core/Resource/CPakFile.cpp
@@ -2,6 +2,7 @@
 #include <Common/types.h>
 #include <FileIO/CMemoryInStream.h>
 #include <FileIO/FileIO.h>
+
 #include <zlib.h>
 #include <lzo/lzo1x.h>
 #include <iostream>
--- a/src/Core/Resource/CPakFile.h
+++ b/src/Core/Resource/CPakFile.h
@@ -1,10 +1,10 @@
 #ifndef CPAKFILE_H
 #define CPAKFILE_H

-#include <Common/types.h>
-#include <FileIO/CFileInStream.h>
 #include "SNamedResource.h"
 #include "SResInfo.h"
+#include <Common/types.h>
+#include <FileIO/CFileInStream.h>
 #include <vector>

 class CPakFile
--- a/src/Core/Resource/CResCache.cpp
+++ b/src/Core/Resource/CResCache.cpp
@@ -1,20 +1,18 @@
 #include "CResCache.h"
-#include "Log.h"
+#include "Core/Resource/Factory/CAreaLoader.h"
+#include "Core/Resource/Factory/CAnimSetLoader.h"
+#include "Core/Resource/Factory/CCollisionLoader.h"
+#include "Core/Resource/Factory/CFontLoader.h"
+#include "Core/Resource/Factory/CModelLoader.h"
+#include "Core/Resource/Factory/CScanLoader.h"
+#include "Core/Resource/Factory/CStringLoader.h"
+#include "Core/Resource/Factory/CTextureDecoder.h"
+#include "Core/Resource/Factory/CWorldLoader.h"
+#include "Core/Log.h"
+
 #include <Common/TString.h>
 #include <FileIO/FileIO.h>
 #include <iostream>
-#include <string>
-
-// Loaders
-#include <Resource/factory/CAreaLoader.h>
-#include <Resource/factory/CAnimSetLoader.h>
-#include <Resource/factory/CCollisionLoader.h>
-#include <Resource/factory/CFontLoader.h>
-#include <Resource/factory/CModelLoader.h>
-#include <Resource/factory/CScanLoader.h>
-#include <Resource/factory/CStringLoader.h>
-#include <Resource/factory/CTextureDecoder.h>
-#include <Resource/factory/CWorldLoader.h>

 CResCache::CResCache()
 {
--- a/src/Core/Resource/CResCache.h
+++ b/src/Core/Resource/CResCache.h
@@ -1,10 +1,10 @@
 #ifndef CRESCACHE_H
 #define CRESCACHE_H

+#include "CPakFile.h"
+#include "CResource.h"
 #include <Common/types.h>
 #include <Common/TString.h>
-#include <Resource/CPakFile.h>
-#include <Resource/CResource.h>
 #include <unordered_map>

 struct SResSource
--- a/src/Core/Resource/CResource.cpp
+++ b/src/Core/Resource/CResource.cpp
@@ -1,5 +1,5 @@
 #include "CResource.h"
-#include <Core/CResCache.h>
+#include "CResCache.h"
 #include <iostream>

 CResource::CResource()
--- a/src/Core/Resource/CScan.h
+++ b/src/Core/Resource/CScan.h
@@ -4,7 +4,7 @@
 #include "CResource.h"
 #include "CStringTable.h"
 #include "EFormatVersion.h"
-#include <Core/TResPtr.h>
+#include "TResPtr.h"

 class CScan : public CResource
 {
--- a/src/Core/Resource/CStringTable.h
+++ b/src/Core/Resource/CStringTable.h
@@ -2,10 +2,10 @@
 #define CSTRINGTABLE_H

 #include "CResource.h"
-#include <Common/types.h>
 #include <Common/CFourCC.h>
+#include <Common/TString.h>
+#include <Common/types.h>
 #include <vector>
-#include <string>

 class CStringTable : public CResource
 {
--- a/src/Core/Resource/CTexture.h
+++ b/src/Core/Resource/CTexture.h
@@ -1,12 +1,13 @@
 #ifndef CTEXTURE_H
 #define CTEXTURE_H

-#include <Common/types.h>
-#include <Common/CVector2f.h>
-#include <FileIO/FileIO.h>
-#include <gl/glew.h>
 #include "CResource.h"
 #include "ETexelFormat.h"
+#include <Common/types.h>
+#include <Common/Math/CVector2f.h>
+#include <FileIO/FileIO.h>
+
+#include <GL/glew.h>

 class CTexture : public CResource
 {
--- a/src/Core/Resource/CWorld.cpp
+++ b/src/Core/Resource/CWorld.cpp
@@ -1,6 +1,6 @@
 #include "CWorld.h"
-#include "script/CScriptLayer.h"
-#include <Core/CResCache.h>
+#include "CResCache.h"
+#include "Core/Resource/Script/CScriptLayer.h"

 CWorld::CWorld() : CResource()
 {
--- a/src/Core/Resource/CWorld.h
+++ b/src/Core/Resource/CWorld.h
@@ -5,8 +5,8 @@
 #include "CGameArea.h"
 #include "CStringTable.h"
 #include "SDependency.h"
-#include "model/CModel.h"
-#include <Common/CTransform4f.h>
+#include "Core/Resource/Model/CModel.h"
+#include <Common/Math/CTransform4f.h>

 class CWorld : public CResource
 {
--- a/src/Core/Resource/Cooker/CMaterialCooker.cpp
+++ b/src/Core/Resource/Cooker/CMaterialCooker.cpp
@@ -1,5 +1,4 @@
 #include "CMaterialCooker.h"
-
 #include <algorithm>

 CMaterialCooker::CMaterialCooker()
--- a/src/Core/Resource/Cooker/CMaterialCooker.h
+++ b/src/Core/Resource/Cooker/CMaterialCooker.h
@@ -1,9 +1,9 @@
 #ifndef CMATERIALCOOKER_H
 #define CMATERIALCOOKER_H

-#include "../CMaterial.h"
-#include "../CMaterialSet.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/CMaterial.h"
+#include "Core/Resource/CMaterialSet.h"
+#include "Core/Resource/EFormatVersion.h"

 class CMaterialCooker
 {
--- a/src/Core/Resource/Cooker/CModelCooker.h
+++ b/src/Core/Resource/Cooker/CModelCooker.h
@@ -1,8 +1,8 @@
 #ifndef CMODELCOOKER_H
 #define CMODELCOOKER_H

-#include "../model/CModel.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/Model/CModel.h"
+#include "Core/Resource/EFormatVersion.h"
 #include <FileIO/FileIO.h>

 class CModelCooker
--- a/src/Core/Resource/Cooker/CSectionMgrOut.h
+++ b/src/Core/Resource/Cooker/CSectionMgrOut.h
@@ -1,8 +1,8 @@
 #ifndef CBLOCKMGROUT_H
 #define CBLOCKMGROUT_H

-#include <FileIO/COutputStream.h>
 #include <Common/types.h>
+#include <FileIO/COutputStream.h>
 #include <vector>

 // Small class to manage file sections for CMDL/MREA output
--- a/src/Core/Resource/Cooker/CTemplateWriter.cpp
+++ b/src/Core/Resource/Cooker/CTemplateWriter.cpp
@@ -1,7 +1,8 @@
 #include "CTemplateWriter.h"
-#include "../cooker/CWorldCooker.h"
-#include <tinyxml2.h>
+#include "CWorldCooker.h"
+
 #include <boost/filesystem.hpp>
+#include <tinyxml2.h>

 using namespace tinyxml2;

--- a/src/Core/Resource/Cooker/CTemplateWriter.h
+++ b/src/Core/Resource/Cooker/CTemplateWriter.h
@@ -1,8 +1,9 @@
 #ifndef CTEMPLATEWRITER_H
 #define CTEMPLATEWRITER_H

-#include "../script/CMasterTemplate.h"
-#include "../script/CScriptTemplate.h"
+#include "Core/Resource/Script/CMasterTemplate.h"
+#include "Core/Resource/Script/CScriptTemplate.h"
+#include <tinyxml2.h>

 class CTemplateWriter
 {
--- a/src/Core/Resource/Cooker/CTextureEncoder.h
+++ b/src/Core/Resource/Cooker/CTextureEncoder.h
@@ -1,8 +1,8 @@
 #ifndef CTEXTUREENCODER_H
 #define CTEXTUREENCODER_H

-#include "../CTexture.h"
-#include <Core/TResPtr.h>
+#include "Core/Resource/CTexture.h"
+#include "Core/Resource/TResPtr.h"

 // Class contains basic functionality right now - only supports directly converting DXT1 to CMPR
 // More advanced functions (including actual encoding!) coming later
--- a/src/Core/Resource/Cooker/CWorldCooker.h
+++ b/src/Core/Resource/Cooker/CWorldCooker.h
@@ -1,8 +1,8 @@
 #ifndef CWORLDCOOKER_H
 #define CWORLDCOOKER_H

+#include "Core/Resource/EFormatVersion.h"
 #include <Common/types.h>
-#include "../EFormatVersion.h"

 class CWorldCooker
 {
--- a/src/Core/Resource/Factory/CAnimSetLoader.cpp
+++ b/src/Core/Resource/Factory/CAnimSetLoader.cpp
@@ -1,6 +1,6 @@
 #include "CAnimSetLoader.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
+#include "Core/Resource/CResCache.h"
+#include "Core/Log.h"

 CAnimSetLoader::CAnimSetLoader()
 {
--- a/src/Core/Resource/Factory/CAnimSetLoader.h
+++ b/src/Core/Resource/Factory/CAnimSetLoader.h
@@ -1,9 +1,9 @@
 #ifndef CCHARACTERLOADER_H
 #define CCHARACTERLOADER_H

-#include "../CAnimSet.h"
-#include "../EFormatVersion.h"
-#include <Core/CResCache.h>
+#include "Core/Resource/CAnimSet.h"
+#include "Core/Resource/EFormatVersion.h"
+#include "Core/Resource/CResCache.h"

 class CAnimSetLoader
 {
--- a/src/Core/Resource/Factory/CAreaLoader.cpp
+++ b/src/Core/Resource/Factory/CAreaLoader.cpp
@@ -3,10 +3,12 @@
 #include "CModelLoader.h"
 #include "CMaterialLoader.h"
 #include "CScriptLoader.h"
+#include "Core/Log.h"
+
 #include <Common/CFourCC.h>
 #include <Common/CompressionUtil.h>
+
 #include <iostream>
-#include <Core/Log.h>

 CAreaLoader::CAreaLoader()
 {
--- a/src/Core/Resource/Factory/CAreaLoader.h
+++ b/src/Core/Resource/Factory/CAreaLoader.h
@@ -1,12 +1,13 @@
 #ifndef CAREALOADER_H
 #define CAREALOADER_H

-#include <FileIO/FileIO.h>
-#include "../CGameArea.h"
-#include "../EFormatVersion.h"
 #include "CBlockMgrIn.h"
-#include <Core/CResCache.h>
-#include <Resource/script/SConnection.h>
+#include "Core/Resource/Script/SConnection.h"
+#include "Core/Resource/CGameArea.h"
+#include "Core/Resource/EFormatVersion.h"
+#include "Core/Resource/CResCache.h"
+
+#include <FileIO/FileIO.h>

 class CAreaLoader
 {
--- a/src/Core/Resource/Factory/CCollisionLoader.cpp
+++ b/src/Core/Resource/Factory/CCollisionLoader.cpp
@@ -1,5 +1,5 @@
 #include "CCollisionLoader.h"
-#include <Core/Log.h>
+#include "Core/Log.h"
 #include <iostream>

 CCollisionLoader::CCollisionLoader()
--- a/src/Core/Resource/Factory/CCollisionLoader.h
+++ b/src/Core/Resource/Factory/CCollisionLoader.h
@@ -1,9 +1,9 @@
 #ifndef CCOLLISIONLOADER_H
 #define CCOLLISIONLOADER_H

-#include "../CCollisionMesh.h"
-#include "../CCollisionMeshGroup.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/CCollisionMesh.h"
+#include "Core/Resource/CCollisionMeshGroup.h"
+#include "Core/Resource/EFormatVersion.h"

 class CCollisionLoader
 {
--- a/src/Core/Resource/Factory/CFontLoader.cpp
+++ b/src/Core/Resource/Factory/CFontLoader.cpp
@@ -1,5 +1,5 @@
 #include "CFontLoader.h"
-#include <Core/Log.h>
+#include "Core/Log.h"
 #include <iostream>

 CFontLoader::CFontLoader()
--- a/src/Core/Resource/Factory/CFontLoader.h
+++ b/src/Core/Resource/Factory/CFontLoader.h
@@ -1,9 +1,9 @@
 #ifndef CFONTLOADER_H
 #define CFONTLOADER_H

-#include "../CFont.h"
-#include "../EFormatVersion.h"
-#include <Core/CResCache.h>
+#include "Core/Resource/CFont.h"
+#include "Core/Resource/EFormatVersion.h"
+#include "Core/Resource/CResCache.h"

 class CFontLoader
 {
--- a/src/Core/Resource/Factory/CMaterialLoader.cpp
+++ b/src/Core/Resource/Factory/CMaterialLoader.cpp
@@ -1,7 +1,7 @@
 #include "CMaterialLoader.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
-#include <OpenGL/GLCommon.h>
+#include "Core/Resource/CResCache.h"
+#include "Core/OpenGL/GLCommon.h"
+#include "Core/Log.h"
 #include <iostream>
 #include <iomanip>

--- a/src/Core/Resource/Factory/CMaterialLoader.h
+++ b/src/Core/Resource/Factory/CMaterialLoader.h
@@ -1,9 +1,9 @@
 #ifndef CMATERIALLOADER_H
 #define CMATERIALLOADER_H

-#include "../CMaterialSet.h"
-#include "../EFormatVersion.h"
-#include <Core/CResCache.h>
+#include "Core/Resource/CMaterialSet.h"
+#include "Core/Resource/EFormatVersion.h"
+#include "Core/Resource/CResCache.h"

 #include <FileIO/FileIO.h>
 #include <assimp/scene.h>
--- a/src/Core/Resource/Factory/CModelLoader.cpp
+++ b/src/Core/Resource/Factory/CModelLoader.cpp
@@ -1,6 +1,6 @@
 #include "CModelLoader.h"
 #include "CMaterialLoader.h"
-#include <Core/Log.h>
+#include "Core/Log.h"

 CModelLoader::CModelLoader()
 {
--- a/src/Core/Resource/Factory/CModelLoader.h
+++ b/src/Core/Resource/Factory/CModelLoader.h
@@ -1,13 +1,14 @@
 #ifndef CMODELLOADER_H
 #define CMODELLOADER_H

-#include "../model/CBasicModel.h"
-#include "../model/CModel.h"
-#include "../EFormatVersion.h"
 #include "CBlockMgrIn.h"
-#include <FileIO/FileIO.h>
-#include <Core/CResCache.h>
+#include "Core/Resource/Model/CBasicModel.h"
+#include "Core/Resource/Model/CModel.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Resource/EFormatVersion.h"
 #include <Common/EnumUtil.h>
+
+#include <FileIO/FileIO.h>
 #include <assimp/scene.h>

 class CModelLoader
--- a/src/Core/Resource/Factory/CScanLoader.cpp
+++ b/src/Core/Resource/Factory/CScanLoader.cpp
@@ -1,6 +1,6 @@
 #include "CScanLoader.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
+#include "Core/Resource/CResCache.h"
+#include "Core/Log.h"

 CScanLoader::CScanLoader()
 {
--- a/src/Core/Resource/Factory/CScanLoader.h
+++ b/src/Core/Resource/Factory/CScanLoader.h
@@ -1,8 +1,8 @@
 #ifndef CSCANLOADER_H
 #define CSCANLOADER_H

-#include "../CScan.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/CScan.h"
+#include "Core/Resource/EFormatVersion.h"

 class CScanLoader
 {
--- a/src/Core/Resource/Factory/CScriptLoader.cpp
+++ b/src/Core/Resource/Factory/CScriptLoader.cpp
@@ -1,7 +1,7 @@
 #include "CScriptLoader.h"
-#include "../script/CMasterTemplate.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
+#include "Core/Resource/Script/CMasterTemplate.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Log.h"
 #include <iostream>
 #include <sstream>

--- a/src/Core/Resource/Factory/CScriptLoader.h
+++ b/src/Core/Resource/Factory/CScriptLoader.h
@@ -1,11 +1,11 @@
 #ifndef CSCRIPTLOADER_H
 #define CSCRIPTLOADER_H

-#include "../script/CScriptObject.h"
-#include "../script/CScriptLayer.h"
-#include "../script/CMasterTemplate.h"
-#include "../CGameArea.h"
-#include <Core/CResCache.h>
+#include "Core/Resource/Script/CScriptObject.h"
+#include "Core/Resource/Script/CScriptLayer.h"
+#include "Core/Resource/Script/CMasterTemplate.h"
+#include "Core/Resource/CGameArea.h"
+#include "Core/Resource/CResCache.h"

 class CScriptLoader
 {
--- a/src/Core/Resource/Factory/CStringLoader.cpp
+++ b/src/Core/Resource/Factory/CStringLoader.cpp
@@ -1,5 +1,5 @@
 #include "CStringLoader.h"
-#include <Core/Log.h>
+#include "Core/Log.h"

 CStringLoader::CStringLoader()
 {
--- a/src/Core/Resource/Factory/CStringLoader.h
+++ b/src/Core/Resource/Factory/CStringLoader.h
@@ -1,10 +1,10 @@
 #ifndef CSTRINGLOADER_H
 #define CSTRINGLOADER_H

-#include "../CStringTable.h"
-#include "../EFormatVersion.h"
-#include <Core/CResCache.h>
-#include <Core/TResPtr.h>
+#include "Core/Resource/CStringTable.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Resource/EFormatVersion.h"
+#include "Core/Resource/TResPtr.h"

 class CStringLoader
 {
--- a/src/Core/Resource/Factory/CTemplateLoader.cpp
+++ b/src/Core/Resource/Factory/CTemplateLoader.cpp
@@ -1,6 +1,6 @@
 #include "CTemplateLoader.h"
 #include "CWorldLoader.h"
-#include <Core/Log.h>
+#include "Core/Log.h"

 void CTemplateLoader::LoadBitFlags(tinyxml2::XMLElement *pElem, CBitfieldTemplate *pTemp, const TString& templateName)
 {
--- a/src/Core/Resource/Factory/CTemplateLoader.h
+++ b/src/Core/Resource/Factory/CTemplateLoader.h
@@ -1,8 +1,8 @@
 #ifndef CTEMPLATELOADER_H
 #define CTEMPLATELOADER_H

-#include "../script/CMasterTemplate.h"
-#include "../script/CScriptTemplate.h"
+#include "Core/Resource/Script/CMasterTemplate.h"
+#include "Core/Resource/Script/CScriptTemplate.h"
 #include <tinyxml2.h>

 class CTemplateLoader
--- a/src/Core/Resource/Factory/CTextureDecoder.cpp
+++ b/src/Core/Resource/Factory/CTextureDecoder.cpp
@@ -1,6 +1,6 @@
-#include <Common/CColor.h>
-#include <Core/Log.h>
 #include "CTextureDecoder.h"
+#include "Core/Log.h"
+#include <Common/CColor.h>

 // A cleanup is warranted at some point. Trying to support both partial + full decode ended up really messy.

--- a/src/Core/Resource/Factory/CTextureDecoder.h
+++ b/src/Core/Resource/Factory/CTextureDecoder.h
@@ -1,11 +1,12 @@
 #ifndef CTEXTUREDECODER_H
 #define CTEXTUREDECODER_H

-#include <FileIO/FileIO.h>
+#include "Core/Resource/CTexture.h"
+#include "Core/Resource/ETexelFormat.h"
 #include <Common/CColor.h>
 #include <Common/types.h>
-#include "../CTexture.h"
-#include "../ETexelFormat.h"
+
+#include <FileIO/FileIO.h>

 class CTextureDecoder
 {
--- a/src/Core/Resource/Factory/CWorldLoader.cpp
+++ b/src/Core/Resource/Factory/CWorldLoader.cpp
@@ -1,6 +1,6 @@
 #include "CWorldLoader.h"
-#include <Core/CResCache.h>
-#include <Core/Log.h>
+#include "Core/Resource/CResCache.h"
+#include "Core/Log.h"
 #include <iostream>

 CWorldLoader::CWorldLoader()
--- a/src/Core/Resource/Factory/CWorldLoader.h
+++ b/src/Core/Resource/Factory/CWorldLoader.h
@@ -1,10 +1,11 @@
 #ifndef CWORLDLOADER_H
 #define CWORLDLOADER_H

-#include "../CWorld.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/CWorld.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Resource/EFormatVersion.h"
+
 #include <FileIO/FileIO.h>
-#include <Core/CResCache.h>

 class CWorldLoader
 {
--- a/src/Core/Resource/Model/CBasicModel.h
+++ b/src/Core/Resource/Model/CBasicModel.h
@@ -1,10 +1,10 @@
 #ifndef CBASICMODEL_H
 #define CBASICMODEL_H

-#include "../CResource.h"
 #include "SSurface.h"
-#include <Common/CAABox.h>
-#include <OpenGL/CVertexBuffer.h>
+#include "Core/Resource/CResource.h"
+#include "Core/OpenGL/CVertexBuffer.h"
+#include <Common/Math/CAABox.h>

 class CBasicModel : public CResource
 {
--- a/src/Core/Resource/Model/CModel.cpp
+++ b/src/Core/Resource/Model/CModel.cpp
@@ -1,7 +1,7 @@
 #include "CModel.h"
-#include <Core/CDrawUtil.h>
-#include <Core/CRenderer.h>
-#include <OpenGL/GLCommon.h>
+#include "Core/Render/CDrawUtil.h"
+#include "Core/Render/CRenderer.h"
+#include "Core/OpenGL/GLCommon.h"

 CModel::CModel() : CBasicModel()
 {
--- a/src/Core/Resource/Model/CModel.h
+++ b/src/Core/Resource/Model/CModel.h
@@ -3,11 +3,10 @@

 #include "CBasicModel.h"
 #include "SSurface.h"
-#include "../CMaterialSet.h"
-
-#include <Core/ERenderOptions.h>
-#include <OpenGL/CIndexBuffer.h>
-#include <OpenGL/GLCommon.h>
+#include "Core/Resource/CMaterialSet.h"
+#include "Core/OpenGL/CIndexBuffer.h"
+#include "Core/OpenGL/GLCommon.h"
+#include "Core/Render/ERenderOptions.h"

 class CModel : public CBasicModel
 {
--- a/src/Core/Resource/Model/CStaticModel.cpp
+++ b/src/Core/Resource/Model/CStaticModel.cpp
@@ -1,7 +1,7 @@
 #include "CStaticModel.h"
-#include <Core/CDrawUtil.h>
-#include <Core/CRenderer.h>
-#include <OpenGL/GLCommon.h>
+#include "Core/Render/CDrawUtil.h"
+#include "Core/Render/CRenderer.h"
+#include "Core/OpenGL/GLCommon.h"

 CStaticModel::CStaticModel() : CBasicModel()
 {
--- a/src/Core/Resource/Model/CStaticModel.h
+++ b/src/Core/Resource/Model/CStaticModel.h
@@ -2,13 +2,12 @@
 #define CSTATICMODEL_H

 #include "CBasicModel.h"
-#include <Core/ERenderOptions.h>
-#include <OpenGL/CIndexBuffer.h>
-
-// A CStaticModel is meant for meshes that don't move. It's built specifically with terrain in mind.
-// It only links to one material, and what it does best is combining submeshes from different models
-// into shared VBOs and IBOs. This allows for a significantly reduced number of draw calls.
+#include "Core/Render/ERenderOptions.h"
+#include "Core/OpenGL/CIndexBuffer.h"

+/* A CStaticModel is meant for meshes that don't move. It's built specifically with terrain in mind.
+ * It only links to one material, and what it does best is combining submeshes from different models
+ * into shared VBOs and IBOs. This allows for a significantly reduced number of draw calls. */
 class CStaticModel : public CBasicModel
 {
    CMaterial *mpMaterial;
--- a/src/Core/Resource/Model/CVertex.h
+++ b/src/Core/Resource/Model/CVertex.h
@@ -1,8 +1,8 @@
 #ifndef CVERTEX_H
 #define CVERTEX_H

-#include <Common/CVector2f.h>
-#include <Common/CVector3f.h>
+#include <Common/Math/CVector2f.h>
+#include <Common/Math/CVector3f.h>
 #include <Common/CColor.h>

 class CVertex
--- a/src/Core/Resource/Model/SSurface.cpp
+++ b/src/Core/Resource/Model/SSurface.cpp
@@ -1,7 +1,7 @@
 #include "SSurface.h"
-#include <Common/CRayCollisionTester.h>
-#include <Common/Math.h>
-#include <Core/CDrawUtil.h>
+#include "Core/Render/CDrawUtil.h"
+#include "Core/CRayCollisionTester.h"
+#include <Common/Math/Math.h>

 std::pair<bool,float> SSurface::IntersectsRay(const CRay& Ray, bool allowBackfaces, float LineThreshold)
 {
--- a/src/Core/Resource/Model/SSurface.h
+++ b/src/Core/Resource/Model/SSurface.h
@@ -1,15 +1,15 @@
 #ifndef SSURFACE_H
 #define SSURFACE_H

-#include "../CMaterialSet.h"
 #include "CVertex.h"
+#include "Core/Resource/CMaterialSet.h"
+#include "Core/OpenGL/GLCommon.h"
+#include "Core/SRayIntersection.h"
 #include <Common/types.h>
-#include <Common/CAABox.h>
-#include <Common/CRay.h>
-#include <Common/CTransform4f.h>
-#include <Common/CVector3f.h>
-#include <Common/SRayIntersection.h>
-#include <OpenGL/GLCommon.h>
+#include <Common/Math/CAABox.h>
+#include <Common/Math/CRay.h>
+#include <Common/Math/CTransform4f.h>
+#include <Common/Math/CVector3f.h>
 #include <vector>

 struct SSurface
--- a/src/Core/Resource/Script/CMasterTemplate.cpp
+++ b/src/Core/Resource/Script/CMasterTemplate.cpp
@@ -1,6 +1,6 @@
 #include "CMasterTemplate.h"
-#include "../factory/CWorldLoader.h"
-#include <Core/Log.h>
+#include "Core/Resource/Factory/CWorldLoader.h"
+#include "Core/Log.h"

 CMasterTemplate::CMasterTemplate()
 {
--- a/src/Core/Resource/Script/CMasterTemplate.h
+++ b/src/Core/Resource/Script/CMasterTemplate.h
@@ -2,10 +2,9 @@
 #define CMASTERTEMPLATE_H

 #include "CScriptTemplate.h"
-#include "../EFormatVersion.h"
+#include "Core/Resource/EFormatVersion.h"
 #include <Common/types.h>
 #include <map>
-#include <tinyxml2.h>

 class CMasterTemplate
 {
--- a/src/Core/Resource/Script/CProperty.h
+++ b/src/Core/Resource/Script/CProperty.h
@@ -1,19 +1,17 @@
 #ifndef CPROPERTY
 #define CPROPERTY

-/*
- * This header file declares some classes used to track script object properties
+/* This header file declares some classes used to track script object properties
 * CPropertyBase, __CProperty (and typedefs), CPropertyStruct
- * It's a bit hard to read, should be reorganized at some point
- */
-#include "../CResource.h"
-#include "../CAnimationParameters.h"
+ * It's a bit hard to read, should be reorganized at some point */
 #include "CPropertyTemplate.h"
 #include "EPropertyType.h"
+#include "Core/Resource/CResource.h"
+#include "Core/Resource/TResPtr.h"
+#include "Core/Resource/CAnimationParameters.h"
+#include <Common/Math/CVector3f.h>
 #include <Common/CColor.h>
-#include <Common/CVector3f.h>
 #include <Common/TString.h>
-#include <Core/TResPtr.h>
 #include <list>

 class CScriptTemplate;
--- a/src/Core/Resource/Script/CScriptObject.cpp
+++ b/src/Core/Resource/Script/CScriptObject.cpp
@@ -1,6 +1,6 @@
 #include "CScriptObject.h"
-#include "../CAnimSet.h"
 #include "CMasterTemplate.h"
+#include "Core/Resource/CAnimSet.h"

 CScriptObject::CScriptObject(CGameArea *pArea, CScriptLayer *pLayer, CScriptTemplate *pTemplate)
 {
--- a/src/Core/Resource/Script/CScriptObject.h
+++ b/src/Core/Resource/Script/CScriptObject.h
@@ -5,9 +5,9 @@
 #include "CProperty.h"
 #include "CPropertyTemplate.h"
 #include "CScriptTemplate.h"
-#include "../model/CModel.h"
-#include "../CCollisionMeshGroup.h"
-#include "../CGameArea.h"
+#include "Core/Resource/Model/CModel.h"
+#include "Core/Resource/CCollisionMeshGroup.h"
+#include "Core/Resource/CGameArea.h"

 class CScriptLayer;

--- a/src/Core/Resource/Script/CScriptTemplate.cpp
+++ b/src/Core/Resource/Script/CScriptTemplate.cpp
@@ -1,11 +1,12 @@
 #include "CScriptTemplate.h"
 #include "CScriptObject.h"
 #include "CMasterTemplate.h"
+#include "Core/Resource/CResCache.h"
+#include "Core/Resource/CAnimSet.h"
+#include "Core/Log.h"
+
 #include <iostream>
 #include <string>
-#include <Core/Log.h>
-#include <Core/CResCache.h>
-#include <Resource/CAnimSet.h>

 CScriptTemplate::CScriptTemplate(CMasterTemplate *pMaster)
 {
--- a/src/Core/Resource/Script/CScriptTemplate.h
+++ b/src/Core/Resource/Script/CScriptTemplate.h
@@ -5,13 +5,12 @@
 #include "CProperty.h"
 #include "EPropertyType.h"
 #include "EVolumeShape.h"
+#include "Core/Resource/Model/CModel.h"
+#include "Core/Resource/CCollisionMeshGroup.h"
 #include <Common/CFourCC.h>
 #include <Common/types.h>
 #include <list>
 #include <vector>
-#include <tinyxml2.h>
-#include <Resource/model/CModel.h>
-#include <Resource/CCollisionMeshGroup.h>

 class CMasterTemplate;
 class CScriptObject;
--- a/src/Core/Resource/TResPtr.h
+++ b/src/Core/Resource/TResPtr.h
@@ -1,7 +1,7 @@
 #ifndef TRESPTR_H
 #define TRESPTR_H

-#include <Resource/CResource.h>
+#include "CResource.h"

 template <typename ResType>
 class TResPtr