diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
index c81ceb36..90a18e43 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp
@@ -9,7 +9,6 @@
 #include "Actor/Player.h"
 
 #include <cmath>
-#include <boost/make_shared.hpp>
 
 using namespace Core::Entity;
 using namespace Core::Common;
diff --git a/src/servers/sapphire_zone/Action/ActionCollision.h b/src/servers/sapphire_zone/Action/ActionCollision.h
index 7b845b51..89a3a99c 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.h
+++ b/src/servers/sapphire_zone/Action/ActionCollision.h
@@ -2,14 +2,14 @@
 #define _ACTIONCOLLISION_H
 
 #include <Common.h>
-#include "Action.h"
-
+#include "Forwards.h"
 
 namespace Core {
 namespace Data
 {
    struct Action;
 }
+
 namespace Entity {
 
    enum class TargetFilter
diff --git a/src/servers/sapphire_zone/Action/ActionMount.h b/src/servers/sapphire_zone/Action/ActionMount.h
index 3450a2b2..23533c90 100644
--- a/src/servers/sapphire_zone/Action/ActionMount.h
+++ b/src/servers/sapphire_zone/Action/ActionMount.h
@@ -1,7 +1,7 @@
 #ifndef _ACTIONMOUNT_H_
 #define _ACTIONMOUNT_H_
 
-#include "../Forwards.h"
+#include "Forwards.h"
 #include "Action.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Action/ActionTeleport.h b/src/servers/sapphire_zone/Action/ActionTeleport.h
index fab98d06..4c42fc65 100644
--- a/src/servers/sapphire_zone/Action/ActionTeleport.h
+++ b/src/servers/sapphire_zone/Action/ActionTeleport.h
@@ -1,7 +1,7 @@
 #ifndef _ACTIONTELEPORT_H_
 #define _ACTIONTELEPORT_H_
 
-#include "../Forwards.h"
+#include "Forwards.h"
 #include "Action.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Action/EventAction.cpp b/src/servers/sapphire_zone/Action/EventAction.cpp
index e0578dce..a21400f0 100644
--- a/src/servers/sapphire_zone/Action/EventAction.cpp
+++ b/src/servers/sapphire_zone/Action/EventAction.cpp
@@ -6,7 +6,6 @@
 #include "Network/PacketWrappers/ActorControlPacket143.h"
 
 #include "Actor/Player.h"
-#include "Event/EventHandler.h"
 
 #include "EventAction.h"
 #include "Framework.h"
diff --git a/src/servers/sapphire_zone/Action/EventAction.h b/src/servers/sapphire_zone/Action/EventAction.h
index 642513a2..346f0256 100644
--- a/src/servers/sapphire_zone/Action/EventAction.h
+++ b/src/servers/sapphire_zone/Action/EventAction.h
@@ -3,7 +3,7 @@
 
 #include <Common.h>
 
-#include "../Forwards.h"
+#include "Forwards.h"
 #include "Action.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Action/EventItemAction.h b/src/servers/sapphire_zone/Action/EventItemAction.h
index 6c69e1aa..69832263 100644
--- a/src/servers/sapphire_zone/Action/EventItemAction.h
+++ b/src/servers/sapphire_zone/Action/EventItemAction.h
@@ -1,7 +1,7 @@
 #ifndef _EVENTITEMACTION_H_
 #define _EVENTITEMACTION_H_
 
-#include "../Forwards.h"
+#include "Forwards.h"
 #include "Action.h"
 
 namespace Core {
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 0de580e6..dcbb812f 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -1,11 +1,10 @@
 #include "Actor.h"
 
 #include <Network/PacketContainer.h>
-#include <Network/GamePacket.h>
+
 #include <Util/Util.h>
 #include <Util/UtilMath.h>
 
-#include "Forwards.h"
 #include "Action/Action.h"
 #include "Action/ActionCollision.h"
 
@@ -19,8 +18,6 @@
 
 #include "ServerZone.h"
 #include "Session.h"
-#include "Zone/Zone.h"
-
 
 #include "Zone/TerritoryMgr.h"
 
@@ -28,11 +25,6 @@
 
 #include "Math/CalcBattle.h"
 
-#include "ServerZone.h"
-#include "Session.h"
-#include "Actor.h"
-#include "Player.h"
-
 #include "Framework.h"
 
 extern Core::Framework g_fw;
diff --git a/src/servers/sapphire_zone/Actor/Chara.cpp b/src/servers/sapphire_zone/Actor/Chara.cpp
index d905c341..841e75fa 100644
--- a/src/servers/sapphire_zone/Actor/Chara.cpp
+++ b/src/servers/sapphire_zone/Actor/Chara.cpp
@@ -2,7 +2,6 @@
 #include <Util/UtilMath.h>
 #include <Network/PacketContainer.h>
 #include <Exd/ExdDataGenerated.h>
-#include <Network/GamePacket.h>
 
 #include "Forwards.h"
 #include "Action/Action.h"
diff --git a/src/servers/sapphire_zone/Actor/EventObject.cpp b/src/servers/sapphire_zone/Actor/EventObject.cpp
index 64e59688..eac02744 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.cpp
+++ b/src/servers/sapphire_zone/Actor/EventObject.cpp
@@ -6,7 +6,6 @@
 #include <Logging/Logger.h>
 #include <Network/GamePacket.h>
 #include <Network/GamePacketNew.h>
-#include <Network/CommonNetwork.h>
 #include <Network/PacketDef/Zone/ServerZoneDef.h>
 #include <Network/PacketContainer.h>
 #include <Util/UtilMath.h>
diff --git a/src/servers/sapphire_zone/Actor/EventObject.h b/src/servers/sapphire_zone/Actor/EventObject.h
index 363d5077..937ac0f3 100644
--- a/src/servers/sapphire_zone/Actor/EventObject.h
+++ b/src/servers/sapphire_zone/Actor/EventObject.h
@@ -10,10 +10,11 @@ namespace Entity
    class EventObject : public Actor
    {
    public:
-      EventObject( uint32_t actorId, uint32_t objectId, uint32_t gimmickId, uint8_t initialState, Common::FFXIVARR_POSITION3 pos,
-                   float rotation, const std::string& givenName = "none" );
+      EventObject( uint32_t actorId, uint32_t objectId, uint32_t gimmickId, uint8_t initialState,
+                   Common::FFXIVARR_POSITION3 pos, float rotation, const std::string& givenName = "none" );
 
-      using OnTalkEventHandler = std::function< void( Entity::Player&, Entity::EventObjectPtr, InstanceContentPtr, uint64_t ) >;
+      using OnTalkEventHandler = std::function< void( Entity::Player&, Entity::EventObjectPtr,
+                                                      InstanceContentPtr, uint64_t ) >;
 
       uint32_t getGimmickId() const;
       void setGimmickId( uint32_t gimmickId );
diff --git a/src/servers/sapphire_zone/Actor/Player.cpp b/src/servers/sapphire_zone/Actor/Player.cpp
index 9aed1649..dbc28283 100644
--- a/src/servers/sapphire_zone/Actor/Player.cpp
+++ b/src/servers/sapphire_zone/Actor/Player.cpp
@@ -30,11 +30,6 @@
 
 #include "Script/ScriptMgr.h"
 
-#include "Inventory/Item.h"
-#include "Inventory/Inventory.h"
-
-#include "Event/EventHandler.h"
-
 #include "Action/Action.h"
 #include "Action/ActionTeleport.h"
 #include "Action/EventAction.h"
diff --git a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
index 80e3dbda..ec05b996 100644
--- a/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerEvent.cpp
@@ -16,12 +16,7 @@
 #include "Action/EventAction.h"
 #include "Action/EventItemAction.h"
 
-#include "Event/EventHandler.h"
-
 #include "Zone/Zone.h"
-
-#include "Player.h"
-#include "Forwards.h"
 #include "ServerZone.h"
 #include "Framework.h"
 
diff --git a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
index ebd89a1e..952d0bf8 100644
--- a/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerQuest.cpp
@@ -8,8 +8,6 @@
 #include "Network/PacketWrappers/QuestMessagePacket.h"
 
 #include "Session.h"
-#include "Inventory/Inventory.h"
-#include "Player.h"
 #include "Framework.h"
 
 extern Core::Framework g_fw;
diff --git a/src/servers/sapphire_zone/Actor/PlayerSql.cpp b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
index 2cb73926..7ced3f9a 100644
--- a/src/servers/sapphire_zone/Actor/PlayerSql.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerSql.cpp
@@ -1,6 +1,4 @@
 #include <set>
-#include <stdio.h>
-#include <time.h>
 
 #include <Common.h>
 #include <Network/GamePacket.h>
@@ -19,11 +17,7 @@
 #include "Zone/TerritoryMgr.h"
 #include "Zone/Zone.h"
 
-#include "Inventory/Inventory.h"
-
-#include "Player.h"
 #include "ServerZone.h"
-#include "Forwards.h"
 #include "Framework.h"
 
 extern Core::Framework g_fw;
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 71d8d8fe..10a83b85 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -6,7 +6,6 @@
 #include <Common.h>
 #include <Version.h>
 #include <Network/GamePacketNew.h>
-#include <Network/CommonNetwork.h>
 #include <Util/UtilMath.h>
 #include <Network/PacketContainer.h>
 #include <Logging/Logger.h>
@@ -25,7 +24,6 @@
 #include "Script/ScriptMgr.h"
 #include "Script/NativeScriptMgr.h"
 
-#include "Actor/Player.h"
 #include "Actor/EventObject.h"
 
 #include "Zone/Zone.h"
@@ -34,7 +32,6 @@
 
 #include "ServerZone.h"
 
-#include "StatusEffect/StatusEffect.h"
 #include "Session.h"
 #include "Framework.h"
 
diff --git a/src/servers/sapphire_zone/Event/EventHandler.h b/src/servers/sapphire_zone/Event/EventHandler.h
index acdaf592..87a29c8d 100644
--- a/src/servers/sapphire_zone/Event/EventHandler.h
+++ b/src/servers/sapphire_zone/Event/EventHandler.h
@@ -1,7 +1,7 @@
 #ifndef _EVENT_H
 #define _EVENT_H
 
-#include "../Forwards.h"
+#include "Forwards.h"
 
 namespace Core {
    namespace Event {
diff --git a/src/servers/sapphire_zone/Event/EventHelper.cpp b/src/servers/sapphire_zone/Event/EventHelper.cpp
index 4a389965..1b4c34b6 100644
--- a/src/servers/sapphire_zone/Event/EventHelper.cpp
+++ b/src/servers/sapphire_zone/Event/EventHelper.cpp
@@ -1,10 +1,12 @@
 #include <Common.h>
 #include <Exd/ExdDataGenerated.h>
+#include <boost/range/algorithm/remove_if.hpp>
+#include <boost/algorithm/string/classification.hpp>
+
 #include "Framework.h"
 #include "EventHelper.h"
 #include "EventHandler.h"
-#include <boost/range/algorithm/remove_if.hpp>
-#include <boost/algorithm/string/classification.hpp>
+
 
 extern Core::Framework g_fw;
 
diff --git a/src/servers/sapphire_zone/Inventory/Inventory.h b/src/servers/sapphire_zone/Inventory/Inventory.h
index dacfa514..997e840c 100644
--- a/src/servers/sapphire_zone/Inventory/Inventory.h
+++ b/src/servers/sapphire_zone/Inventory/Inventory.h
@@ -2,7 +2,7 @@
 #define INVENTORY_H_
 #include <map>
 #include <Common.h>
-#include "../Forwards.h"
+#include "Forwards.h"
 
 namespace Core
 {
diff --git a/src/servers/sapphire_zone/Inventory/ItemContainer.h b/src/servers/sapphire_zone/Inventory/ItemContainer.h
index 1d7147d5..223dd7ae 100644
--- a/src/servers/sapphire_zone/Inventory/ItemContainer.h
+++ b/src/servers/sapphire_zone/Inventory/ItemContainer.h
@@ -5,7 +5,7 @@
 
 #include <Common.h>
 
-#include "../Forwards.h"
+#include "Forwards.h"
 
 namespace Core
 {
diff --git a/src/servers/sapphire_zone/Network/GameConnection.cpp b/src/servers/sapphire_zone/Network/GameConnection.cpp
index a106481f..e885a994 100644
--- a/src/servers/sapphire_zone/Network/GameConnection.cpp
+++ b/src/servers/sapphire_zone/Network/GameConnection.cpp
@@ -8,6 +8,7 @@
 #include <Network/Acceptor.h>
 #include <Network/PacketContainer.h>
 #include <Network/GamePacketParser.h>
+#include <Network/GamePacket.h>
 
 #include "Zone/Zone.h"
 
@@ -15,8 +16,6 @@
 
 #include "DebugCommand/DebugCommandHandler.h"
 
-#include "Actor/Player.h"
-
 #include "GameConnection.h"
 #include "ServerZone.h"
 #include "Session.h"
diff --git a/src/servers/sapphire_zone/Network/GameConnection.h b/src/servers/sapphire_zone/Network/GameConnection.h
index ec14ec94..07e17bc3 100644
--- a/src/servers/sapphire_zone/Network/GameConnection.h
+++ b/src/servers/sapphire_zone/Network/GameConnection.h
@@ -4,7 +4,7 @@
 #include <Network/Connection.h>
 
 #include <Network/CommonNetwork.h>
-#include <Network/GamePacket.h>
+//#include <Network/GamePacket.h>
 #include <Util/LockedQueue.h>
 
 #include "Forwards.h"
@@ -13,7 +13,9 @@
 
 namespace Core {
 namespace Network {
-
+namespace Packets {
+   class GamePacket;
+}
 enum ConnectionType : uint8_t
 {
    Zone = 1,
diff --git a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
index 6c37a645..50c81fb0 100644
--- a/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/ActionHandler.cpp
@@ -25,10 +25,6 @@
 
 #include "DebugCommand/DebugCommandHandler.h"
 
-#include "Actor/Player.h"
-
-#include "Inventory/Inventory.h"
-
 #include "Event/EventHelper.h"
 
 #include "Action/Action.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
index 5e0b1bdf..683a966f 100644
--- a/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/CFHandlers.cpp
@@ -15,9 +15,6 @@
 #include "Network/PacketWrappers/ActorControlPacket144.h"
 #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
-#include "Actor/Player.h"
-
-#include "Forwards.h"
 #include "Framework.h"
 #include "Session.h"
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
index f8a4763c..1e6913bb 100644
--- a/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/EventHandlers.cpp
@@ -19,14 +19,12 @@
 
 #include "Script/ScriptMgr.h"
 
-#include "Actor/Player.h"
-
 #include "Event/EventHelper.h"
 
 #include "Zone/InstanceContent.h"
 
 #include "Session.h"
-#include "Forwards.h"
+
 #include "Framework.h"
 
 extern Core::Framework g_fw;
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 110a1107..35808521 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -15,7 +15,6 @@
 #include "Zone/TerritoryMgr.h"
 #include "Zone/Zone.h"
 #include "Zone/InstanceContent.h"
-#include "Zone/ZonePosition.h"
 
 #include "Network/PacketWrappers/InitUIPacket.h"
 #include "Network/PacketWrappers/PingPacket.h"
@@ -29,15 +28,7 @@
 #include "Network/PacketWrappers/EventFinishPacket.h"
 #include "Network/PacketWrappers/PlayerStateFlagsPacket.h"
 
-#include "DebugCommand/DebugCommandHandler.h"
-
-#include "Event/EventHelper.h"
-
-#include "Action/Action.h"
-#include "Action/ActionTeleport.h"
-
 #include "ServerZone.h"
-#include "Forwards.h"
 #include "Framework.h"
 
 extern Core::Framework g_fw;
diff --git a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
index 00b57c72..63c09215 100644
--- a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
@@ -17,11 +17,10 @@
 
 #include "DebugCommand/DebugCommandHandler.h"
 #include "Actor/Player.h"
-#include "Inventory/Inventory.h"
 
 #include "Session.h"
 #include "ServerZone.h"
-#include "Forwards.h"
+
 #include "Framework.h"
 
 extern Core::Framework g_fw;
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 1e23fd3a..49efc3de 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -7,10 +7,7 @@
 #include <Network/PacketContainer.h>
 #include <Network/PacketDef/Chat/ServerChatDef.h>
 #include <Database/DatabaseDef.h>
-#include <Database/DbWorkerPool.h>
-#include <Database/CharaDbConnection.h>
 
-#include <boost/format.hpp>
 #include <unordered_map>
 #include "Network/GameConnection.h"
 
@@ -32,10 +29,6 @@
 
 #include "DebugCommand/DebugCommandHandler.h"
 
-#include "Actor/Player.h"
-
-#include "Inventory/Inventory.h"
-
 #include "Event/EventHelper.h"
 
 #include "Action/Action.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
index f3ed84d3..aa068d79 100644
--- a/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/SkillHandler.cpp
@@ -18,8 +18,6 @@
 
 #include "DebugCommand/DebugCommandHandler.h"
 
-#include "Actor/Player.h"
-
 #include "Action/Action.h"
 #include "Action/ActionCast.h"
 #include "Action/ActionMount.h"
@@ -27,7 +25,6 @@
 #include "Script/ScriptMgr.h"
 
 #include "Session.h"
-#include "Forwards.h"
 #include "Framework.h"
 
 extern Core::Framework g_fw;