diff --git a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h
index 7220109e..2ec9ab17 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h
+++ b/src/ObjLoading/Game/T6/BSP/Linker/BSPLinker.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../BSP.h"
 #include "Asset/IAssetCreator.h"
+#include "Game/T6/BSP/BSP.h"
 #include "SearchPath/ISearchPath.h"
 #include "Utils/MemoryManager.h"
 
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
index 23cf6ac2..8f03e0fd 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
+++ b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.cpp
@@ -1,6 +1,6 @@
 #include "ClipMapLinker.h"
 
-#include "../BSPUtil.h"
+#include "Game/T6/BSP/BSPUtil.h"
 
 using namespace T6;
 
@@ -499,7 +499,7 @@ namespace BSP
         }
         // the reinterpret_cast is used as triIndices is just a pointer to an array of indicies, and static_cast can't safely do the conversion
         clipMap->triCount = static_cast<int>(triIndexVec.size() / 3);
-        clipMap->triIndices = reinterpret_cast<uint16_t(*)[3]>(m_memory.Alloc<uint16_t>(triIndexVec.size()));
+        clipMap->triIndices = reinterpret_cast<uint16_t (*)[3]>(m_memory.Alloc<uint16_t>(triIndexVec.size()));
         memcpy(clipMap->triIndices, &triIndexVec[0], sizeof(uint16_t) * triIndexVec.size());
 
         // partitions are "containers" for vertices. BSP tree leafs contain a list of these partitions to determine the collision within a leaf.
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.h
index fd20d114..f4da0940 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.h
+++ b/src/ObjLoading/Game/T6/BSP/Linker/ClipMapLinker.h
@@ -1,8 +1,8 @@
 #pragma once
 
-#include "../BSP.h"
-#include "../BSPCalculation.h"
 #include "Asset/IAssetCreator.h"
+#include "Game/T6/BSP/BSP.h"
+#include "Game/T6/BSP/BSPCalculation.h"
 #include "SearchPath/ISearchPath.h"
 #include "Utils/MemoryManager.h"
 
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.h
index 06c7c6b0..23d26f2a 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.h
+++ b/src/ObjLoading/Game/T6/BSP/Linker/ComWorldLinker.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../BSP.h"
 #include "Asset/IAssetCreator.h"
+#include "Game/T6/BSP/BSP.h"
 #include "SearchPath/ISearchPath.h"
 #include "Utils/MemoryManager.h"
 
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GameWorldMpLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/GameWorldMpLinker.h
index ac426916..2dea6514 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/GameWorldMpLinker.h
+++ b/src/ObjLoading/Game/T6/BSP/Linker/GameWorldMpLinker.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../BSP.h"
 #include "Asset/IAssetCreator.h"
+#include "Game/T6/BSP/BSP.h"
 #include "SearchPath/ISearchPath.h"
 #include "Utils/MemoryManager.h"
 
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
index 5c5b8442..7a751af0 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
+++ b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.cpp
@@ -1,6 +1,6 @@
 #include "GfxWorldLinker.h"
 
-#include "../BSPUtil.h"
+#include "Game/T6/BSP/BSPUtil.h"
 #include "Utils/Alignment.h"
 #include "Utils/Pack.h"
 
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.h
index bea9f4ee..88eccaca 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.h
+++ b/src/ObjLoading/Game/T6/BSP/Linker/GfxWorldLinker.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../BSP.h"
 #include "Asset/IAssetCreator.h"
+#include "Game/T6/BSP/BSP.h"
 #include "SearchPath/ISearchPath.h"
 #include "Utils/MemoryManager.h"
 
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp
index 061484b0..176c006a 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp
+++ b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.cpp
@@ -1,6 +1,6 @@
 #include "MapEntsLinker.h"
 
-#include "../BSPUtil.h"
+#include "Game/T6/BSP/BSPUtil.h"
 
 #include <nlohmann/json.hpp>
 
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.h
index de3b5b8f..c9c4d01b 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.h
+++ b/src/ObjLoading/Game/T6/BSP/Linker/MapEntsLinker.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../BSP.h"
 #include "Asset/IAssetCreator.h"
+#include "Game/T6/BSP/BSP.h"
 #include "SearchPath/ISearchPath.h"
 #include "Utils/MemoryManager.h"
 
diff --git a/src/ObjLoading/Game/T6/BSP/Linker/SkinnedVertsLinker.h b/src/ObjLoading/Game/T6/BSP/Linker/SkinnedVertsLinker.h
index e7a09239..c3b0281f 100644
--- a/src/ObjLoading/Game/T6/BSP/Linker/SkinnedVertsLinker.h
+++ b/src/ObjLoading/Game/T6/BSP/Linker/SkinnedVertsLinker.h
@@ -1,7 +1,7 @@
 #pragma once
 
-#include "../BSP.h"
 #include "Asset/IAssetCreator.h"
+#include "Game/T6/BSP/BSP.h"
 #include "SearchPath/ISearchPath.h"
 #include "Utils/MemoryManager.h"