diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
index defb184a..ddf39bfe 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp
@@ -1,6 +1,8 @@
 #include <common/Util/Util.h>
 #include <common/Util/UtilMath.h>
 
+#include <common/Exd/ExdDataGenerated.h>
+
 #include "ActionCollision.h"
 #include "Actor/Actor.h"
 #include "Actor/Chara.h"
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h
index 13cddd44..b020db6c 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.h
+++ b/src/servers/sapphire_zone/Action/ActionCollision.h
@@ -2,9 +2,6 @@
 #define _ACTIONCOLLISION_H
 
 #include <common/Common.h>
-#include <common/Exd/ExdDataGenerated.h>
-
-#include "Actor/Chara.h"
 #include "Action.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommand.h b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
index 03c01a30..6c8bdd40 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommand.h
@@ -3,7 +3,6 @@
 
 #include <common/Common.h>
 
-#include "Actor/Player.h"
 #include "Forwards.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Math/CalcBattle.h b/src/servers/sapphire_zone/Math/CalcBattle.h
index 72a160c0..af4ee014 100644
--- a/src/servers/sapphire_zone/Math/CalcBattle.h
+++ b/src/servers/sapphire_zone/Math/CalcBattle.h
@@ -2,7 +2,7 @@
 #define _CALCBATTLE_H
 
 #include <common/Common.h>
-#include "Actor/Chara.h"
+#include "Forwards.h"
 
 using namespace Core::Entity;
 
diff --git a/src/servers/sapphire_zone/Math/CalcStats.h b/src/servers/sapphire_zone/Math/CalcStats.h
index 868d86f4..c1d5df63 100644
--- a/src/servers/sapphire_zone/Math/CalcStats.h
+++ b/src/servers/sapphire_zone/Math/CalcStats.h
@@ -2,7 +2,7 @@
 #define _CALCSTATS_H
 
 #include <common/Common.h>
-#include "Actor/Chara.h"
+#include "Forwards.h"
 
 using namespace Core::Entity;
 
diff --git a/src/servers/sapphire_zone/ServerZone.cpp b/src/servers/sapphire_zone/ServerZone.cpp
index f21c48d6..fe118a91 100644
--- a/src/servers/sapphire_zone/ServerZone.cpp
+++ b/src/servers/sapphire_zone/ServerZone.cpp
@@ -18,6 +18,8 @@
 #include <common/Database/DbWorkerPool.h>
 #include <common/Database/PreparedStatement.h>
 
+#include "Actor/Player.h"
+
 #include "Network/GameConnection.h"
 #include "Session.h"