diff --git a/Runtime/Collision/CAABoxFilter.cpp b/Runtime/Collision/CAABoxFilter.cpp
index a0e48f59e..77583c3b1 100644
--- a/Runtime/Collision/CAABoxFilter.cpp
+++ b/Runtime/Collision/CAABoxFilter.cpp
@@ -1,5 +1,7 @@
-#include "CAABoxFilter.hpp"
-#include "CollisionUtil.hpp"
+#include "Runtime/Collision/CAABoxFilter.hpp"
+
+#include "Runtime/Collision/CCollisionInfoList.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Collision/CAABoxFilter.hpp b/Runtime/Collision/CAABoxFilter.hpp
index 4c4553169..de28e207a 100644
--- a/Runtime/Collision/CAABoxFilter.hpp
+++ b/Runtime/Collision/CAABoxFilter.hpp
@@ -3,6 +3,7 @@
 #include "Runtime/Collision/ICollisionFilter.hpp"
 
 namespace urde {
+class CCollisionInfoList;
 
 class CAABoxFilter : public ICollisionFilter {
 public:
diff --git a/Runtime/Collision/CBallFilter.cpp b/Runtime/Collision/CBallFilter.cpp
index ee0b5a104..6067547cf 100644
--- a/Runtime/Collision/CBallFilter.cpp
+++ b/Runtime/Collision/CBallFilter.cpp
@@ -1,5 +1,6 @@
-#include "CBallFilter.hpp"
-#include "CollisionUtil.hpp"
+#include "Runtime/Collision/CBallFilter.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
+
 namespace urde {
 
 void CBallFilter::Filter(const CCollisionInfoList& in, CCollisionInfoList& out) const {
diff --git a/Runtime/Collision/CBallFilter.hpp b/Runtime/Collision/CBallFilter.hpp
index eb050215c..803a72337 100644
--- a/Runtime/Collision/CBallFilter.hpp
+++ b/Runtime/Collision/CBallFilter.hpp
@@ -3,6 +3,7 @@
 #include "Runtime/Collision/ICollisionFilter.hpp"
 
 namespace urde {
+class CCollisionInfoList;
 class CPhysicsActor;
 
 class CBallFilter : public ICollisionFilter {
diff --git a/Runtime/Collision/CGameCollision.cpp b/Runtime/Collision/CGameCollision.cpp
index 9f447892a..f510460fc 100644
--- a/Runtime/Collision/CGameCollision.cpp
+++ b/Runtime/Collision/CGameCollision.cpp
@@ -1,18 +1,21 @@
-#include "CGameCollision.hpp"
-#include "CCollidableOBBTreeGroup.hpp"
-#include "CMaterialFilter.hpp"
-#include "CMaterialList.hpp"
-#include "World/CActor.hpp"
-#include "CStateManager.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+
+#include "Runtime/CStateManager.hpp"
+#include "Runtime/Character/CGroundMovement.hpp"
+#include "Runtime/Collision/CAABoxFilter.hpp"
+#include "Runtime/Collision/CBallFilter.hpp"
+#include "Runtime/Collision/CCollidableOBBTreeGroup.hpp"
+#include "Runtime/Collision/CCollidableSphere.hpp"
+#include "Runtime/Collision/CCollisionInfoList.hpp"
+#include "Runtime/Collision/CMaterialFilter.hpp"
+#include "Runtime/Collision/CMaterialList.hpp"
+#include "Runtime/Collision/CMetroidAreaCollider.hpp"
+#include "Runtime/Collision/CollisionUtil.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CScriptPlatform.hpp"
+#include "Runtime/World/CWorld.hpp"
+
 #include "TCastTo.hpp" // Generated file, do not modify include path
-#include "World/CWorld.hpp"
-#include "CAABoxFilter.hpp"
-#include "CBallFilter.hpp"
-#include "CMetroidAreaCollider.hpp"
-#include "CollisionUtil.hpp"
-#include "World/CScriptPlatform.hpp"
-#include "CCollidableSphere.hpp"
-#include "Character/CGroundMovement.hpp"
 
 namespace urde {
 
diff --git a/Runtime/Collision/CGameCollision.hpp b/Runtime/Collision/CGameCollision.hpp
index fa4659de3..eb346c3e2 100644
--- a/Runtime/Collision/CGameCollision.hpp
+++ b/Runtime/Collision/CGameCollision.hpp
@@ -16,11 +16,11 @@ namespace urde {
 class CActor;
 class CCollisionInfo;
 class CCollisionInfoList;
-class CMaterialList;
-class CStateManager;
-class CPhysicsActor;
-class CMaterialFilter;
 class CGameArea;
+class CMaterialFilter;
+class CMaterialList;
+class CPhysicsActor;
+class CStateManager;
 class ICollisionFilter;
 
 class CGameCollision {
diff --git a/Runtime/Collision/ICollisionFilter.hpp b/Runtime/Collision/ICollisionFilter.hpp
index c860603d0..3c09e7fa3 100644
--- a/Runtime/Collision/ICollisionFilter.hpp
+++ b/Runtime/Collision/ICollisionFilter.hpp
@@ -1,9 +1,8 @@
 #pragma once
 
-#include "Runtime/Collision/CCollisionInfoList.hpp"
-
 namespace urde {
 class CActor;
+class CCollisionInfoList;
 
 class ICollisionFilter {
   CActor& x4_actor;