diff --git a/src/servers/sapphire_zone/Action/ActionCollision.cpp b/src/servers/sapphire_zone/Action/ActionCollision.cpp
index 3ec83c9a..322e0da2 100644
--- a/src/servers/sapphire_zone/Action/ActionCollision.cpp
+++ b/src/servers/sapphire_zone/Action/ActionCollision.cpp
@@ -1,5 +1,4 @@
 #include <common/Util/Util.h>
-#include <common/Exd/ExdData.h>
 #include <common/Util/UtilMath.h>
 
 #include "ActionCollision.h"
diff --git a/src/servers/sapphire_zone/Action/ActionMount.cpp b/src/servers/sapphire_zone/Action/ActionMount.cpp
index 5e5a4846..13dcc05d 100644
--- a/src/servers/sapphire_zone/Action/ActionMount.cpp
+++ b/src/servers/sapphire_zone/Action/ActionMount.cpp
@@ -3,7 +3,6 @@
 #include <common/Common.h>
 #include <common/Util/Util.h>
 #include <common/Util/UtilMath.h>
-#include <common/Exd/ExdData.h>
 #include <common/Logging/Logger.h>
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
@@ -17,7 +16,6 @@ using namespace Core::Network;
 using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
-extern Core::Data::ExdData g_exdData;
 extern Core::Logger g_log;
 extern Core::Scripting::ScriptManager g_scriptMgr;
 
diff --git a/src/servers/sapphire_zone/Actor/Actor.cpp b/src/servers/sapphire_zone/Actor/Actor.cpp
index 9e981dac..657f7947 100644
--- a/src/servers/sapphire_zone/Actor/Actor.cpp
+++ b/src/servers/sapphire_zone/Actor/Actor.cpp
@@ -1,7 +1,6 @@
 #include <common/Util/Util.h>
 #include <common/Util/UtilMath.h>
 #include <common/Network/PacketContainer.h>
-#include <common/Exd/ExdData.h>
 #include <common/Exd/ExdDataGenerated.h>
 #include <common/Network/GamePacket.h>
 
diff --git a/src/servers/sapphire_zone/Actor/EventNpc.cpp b/src/servers/sapphire_zone/Actor/EventNpc.cpp
index 5b1e4bc4..bb01d069 100644
--- a/src/servers/sapphire_zone/Actor/EventNpc.cpp
+++ b/src/servers/sapphire_zone/Actor/EventNpc.cpp
@@ -5,7 +5,6 @@
 #include <cmath>
 
 #include <common/Logging/Logger.h>
-#include <common/Exd/ExdData.h>
 #include <common/Util/Util.h>
 #include <common/Util/UtilMath.h>
 
@@ -21,7 +20,6 @@ using namespace Core::Network::Packets;
 using namespace Core::Network::Packets::Server;
 
 extern Core::Logger g_log;
-extern Core::Data::ExdData g_exdData;
 
 uint32_t Core::Entity::EventNpc::m_nextID = 1249241694;
 
diff --git a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp
index e20dfa88..2f18f857 100644
--- a/src/servers/sapphire_zone/Actor/PlayerInventory.cpp
+++ b/src/servers/sapphire_zone/Actor/PlayerInventory.cpp
@@ -1,5 +1,4 @@
 #include <common/Common.h>
-#include <common/Exd/ExdData.h>
 #include <common/Network/GamePacket.h>
 #include <common/Logging/Logger.h>
 
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index d3226c3a..9ba5c2b9 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -2,7 +2,6 @@
 #include <common/Network/CommonNetwork.h>
 #include <common/Network/GamePacketNew.h>
 #include <common/Logging/Logger.h>
-#include <common/Exd/ExdData.h>
 #include <common/Network/PacketContainer.h>
 
 #include <boost/format.hpp>
@@ -38,7 +37,6 @@
 extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
 extern Core::TerritoryMgr g_territoryMgr;
-extern Core::Data::ExdData g_exdData;
 extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
diff --git a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
index 752ca776..9a44832f 100644
--- a/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/InventoryHandler.cpp
@@ -2,7 +2,6 @@
 #include <common/Network/CommonNetwork.h>
 #include <common/Network/GamePacketNew.h>
 #include <common/Logging/Logger.h>
-#include <common/Exd/ExdData.h>
 #include <common/Network/PacketContainer.h>
 
 #include <boost/format.hpp>
@@ -26,7 +25,6 @@
 
 extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
-extern Core::Data::ExdData g_exdData;
 extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index b2425d69..7cd1de23 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -2,7 +2,6 @@
 #include <common/Network/CommonNetwork.h>
 #include <common/Network/GamePacketNew.h>
 #include <common/Logging/Logger.h>
-#include <common/Exd/ExdData.h>
 #include <common/Network/PacketContainer.h>
 #include <common/Network/PacketDef/Chat/ServerChatDef.h>
 #include <common/Database/DatabaseDef.h>
@@ -41,7 +40,6 @@
 extern Core::Logger g_log;
 extern Core::ServerZone g_serverZone;
 extern Core::TerritoryMgr g_territoryMgr;
-extern Core::Data::ExdData g_exdData;
 extern Core::DebugCommandHandler g_gameCommandMgr;
 
 using namespace Core::Common;
diff --git a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
index 7d986249..e4ae715a 100644
--- a/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
+++ b/src/servers/sapphire_zone/StatusEffect/StatusEffect.cpp
@@ -2,7 +2,6 @@
 #include <common/Util/Util.h>
 #include <common/Network/PacketDef/Zone/ServerZoneDef.h>
 #include <common/Logging/Logger.h>
-#include <common/Exd/ExdData.h>
 
 #include <boost/algorithm/string.hpp>
 #include <algorithm>
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index 2f7bbd81..5c27c224 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -11,7 +11,6 @@
 #include "InstanceContent.h"
 
 extern Core::Logger g_log;
-extern Core::Data::ExdData g_exdData;
 extern Core::Data::ExdDataGenerated g_exdDataGen;
 
 Core::TerritoryMgr::TerritoryMgr() :
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
index b7cdcf3c..52561fa9 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
@@ -1,7 +1,7 @@
 #ifndef SAPPHIRE_TERRITORYMGR_H
 #define SAPPHIRE_TERRITORYMGR_H
 
-#include <common/Exd/ExdData.h>
+#include <common/Exd/ExdDataGenerated.h>
 #include "Forwards.h"
 #include <set>