diff --git a/Runtime/World/CMorphBall.cpp b/Runtime/World/CMorphBall.cpp
index 1c2b6eff6..0d0fe5387 100644
--- a/Runtime/World/CMorphBall.cpp
+++ b/Runtime/World/CMorphBall.cpp
@@ -1,20 +1,21 @@
-#include "GameGlobalObjects.hpp"
-#include "CDependencyGroup.hpp"
-#include "CMorphBall.hpp"
-#include "CPlayer.hpp"
-#include "CSimplePool.hpp"
-#include "CGameLight.hpp"
-#include "World/CWorld.hpp"
-#include "World/CScriptAreaAttributes.hpp"
-#include "TCastTo.hpp"
-#include "Camera/CGameCamera.hpp"
-#include "Collision/CGameCollision.hpp"
-#include "CScriptSpiderBallAttractionSurface.hpp"
-#include "CScriptSpiderBallWaypoint.hpp"
-#include "CScriptWater.hpp"
-#include "Graphics/CSkinnedModel.hpp"
-#include "MP1/World/CMetroidBeta.hpp"
-#include "Input/ControlMapper.hpp"
+#include "Runtime/World/CMorphBall.hpp"
+
+#include "Runtime/CDependencyGroup.hpp"
+#include "Runtime/CSimplePool.hpp"
+#include "Runtime/TCastTo.hpp"
+#include "Runtime/Camera/CGameCamera.hpp"
+#include "Runtime/Collision/CGameCollision.hpp"
+#include "Runtime/GameGlobalObjects.hpp"
+#include "Runtime/Graphics/CSkinnedModel.hpp"
+#include "Runtime/Input/ControlMapper.hpp"
+#include "Runtime/MP1/World/CMetroidBeta.hpp"
+#include "Runtime/World/CGameLight.hpp"
+#include "Runtime/World/CPlayer.hpp"
+#include "Runtime/World/CScriptAreaAttributes.hpp"
+#include "Runtime/World/CScriptSpiderBallAttractionSurface.hpp"
+#include "Runtime/World/CScriptSpiderBallWaypoint.hpp"
+#include "Runtime/World/CScriptWater.hpp"
+#include "Runtime/World/CWorld.hpp"
 
 namespace urde {
 
diff --git a/Runtime/World/CMorphBall.hpp b/Runtime/World/CMorphBall.hpp
index b3d7d77f6..8e8136f48 100644
--- a/Runtime/World/CMorphBall.hpp
+++ b/Runtime/World/CMorphBall.hpp
@@ -1,26 +1,29 @@
 #pragma once
 
-#include "World/CActor.hpp"
-#include "World/ScriptObjectSupport.hpp"
-#include "zeus/CVector3f.hpp"
-#include "Collision/CCollidableSphere.hpp"
-#include "RetroTypes.hpp"
-#include "Character/CAnimCharacterSet.hpp"
-#include "Particle/CParticleSwoosh.hpp"
-#include "Particle/CElementGen.hpp"
-#include "CWorldShadow.hpp"
-#include "Graphics/CRainSplashGenerator.hpp"
-#include "CMorphBallShadow.hpp"
-#include "Collision/CCollisionInfoList.hpp"
+#include "Runtime/RetroTypes.hpp"
+#include "Runtime/Collision/CCollidableSphere.hpp"
+#include "Runtime/Collision/CCollisionInfoList.hpp"
+#include "Runtime/Graphics/CRainSplashGenerator.hpp"
+#include "Runtime/Particle/CElementGen.hpp"
+#include "Runtime/Particle/CParticleSwoosh.hpp"
+#include "Runtime/World/CActor.hpp"
+#include "Runtime/World/CMorphBallShadow.hpp"
+#include "Runtime/World/CWorldShadow.hpp"
+#include "Runtime/World/ScriptObjectSupport.hpp"
+
+#include <zeus/CTransform.hpp>
+#include <zeus/CVector2f.hpp>
+#include <zeus/CVector3f.hpp>
 
 namespace urde {
 class CActorLights;
-class CPlayer;
 class CDamageInfo;
-struct CFinalInput;
+class CPlayer;
 class CScriptWater;
 class CStateManager;
 
+struct CFinalInput;
+
 class CMorphBall {
 public:
   enum class EBallBoostState { BoostAvailable, BoostDisabled };