diff --git a/src/servers/sapphire_zone/Actor/Actor.h b/src/servers/sapphire_zone/Actor/Actor.h
index 54916754..5c8f7e45 100644
--- a/src/servers/sapphire_zone/Actor/Actor.h
+++ b/src/servers/sapphire_zone/Actor/Actor.h
@@ -39,6 +39,7 @@ namespace Entity {
          CardStand = 0x0E,
       };
 
+
    protected:
       /*! Position of the object */
       Common::FFXIVARR_POSITION3 m_pos;
diff --git a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
index 6e989623..72c31d5c 100644
--- a/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
+++ b/src/servers/sapphire_zone/DebugCommand/DebugCommandHandler.cpp
@@ -22,6 +22,7 @@
 #include "Script/NativeScriptManager.h"
 
 #include "Actor/Player.h"
+#include "Actor/EventObject.h"
 
 #include "Zone/Zone.h"
 #include "Zone/InstanceContent.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
index 9fa34628..11c2a21e 100644
--- a/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/GMCommandHandlers.cpp
@@ -4,6 +4,7 @@
 #include <common/Logging/Logger.h>
 #include <common/Network/PacketContainer.h>
 
+#include <unordered_map>
 #include <boost/format.hpp>
 
 #include "Network/GameConnection.h"
diff --git a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
index 50f38dd4..e2d7e31c 100644
--- a/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
+++ b/src/servers/sapphire_zone/Network/Handlers/PacketHandlers.cpp
@@ -7,6 +7,7 @@
 #include <common/Database/DatabaseDef.h>
 
 #include <boost/format.hpp>
+#include <unordered_map>
 
 #include "Network/GameConnection.h"
 
diff --git a/src/servers/sapphire_zone/Script/NativeScriptApi.h b/src/servers/sapphire_zone/Script/NativeScriptApi.h
index f65f93f4..43edd68e 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptApi.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptApi.h
@@ -4,11 +4,7 @@
 #include <string>
 #include <typeinfo>
 #include <typeindex>
-
-#include <Actor/Chara.h>
-#include <Actor/Player.h>
-#include <StatusEffect/StatusEffect.h>
-#include <Zone/InstanceContent.h>
+#include "Forwards.h"
 
 #ifdef _MSC_VER
 #define EXPORT __declspec( dllexport )
@@ -125,4 +121,4 @@ public:
    virtual void onEnterTerritory( Entity::Player& player, uint32_t eventId, uint16_t param1, uint16_t param2 ) { }
 };
 
-#endif
\ No newline at end of file
+#endif
diff --git a/src/servers/sapphire_zone/Script/NativeScriptManager.cpp b/src/servers/sapphire_zone/Script/NativeScriptManager.cpp
index 9b487c03..cd029f6c 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/NativeScriptManager.cpp
@@ -1,4 +1,7 @@
 #include "NativeScriptManager.h"
+#include <boost/filesystem.hpp>
+
+#include <common/Crypt/md5.h>
 
 namespace Core {
 namespace Scripting {
diff --git a/src/servers/sapphire_zone/Script/NativeScriptManager.h b/src/servers/sapphire_zone/Script/NativeScriptManager.h
index a793b68e..7398884d 100644
--- a/src/servers/sapphire_zone/Script/NativeScriptManager.h
+++ b/src/servers/sapphire_zone/Script/NativeScriptManager.h
@@ -7,9 +7,6 @@
 
 #include <boost/shared_ptr.hpp>
 #include <boost/make_shared.hpp>
-#include <boost/filesystem.hpp>
-
-#include <common/Crypt/md5.h>
 
 #include "ScriptLoader.h"
 
diff --git a/src/servers/sapphire_zone/Script/ScriptManager.cpp b/src/servers/sapphire_zone/Script/ScriptManager.cpp
index 1106535a..5ab27cc0 100644
--- a/src/servers/sapphire_zone/Script/ScriptManager.cpp
+++ b/src/servers/sapphire_zone/Script/ScriptManager.cpp
@@ -5,6 +5,7 @@
 #include "NativeScriptManager.h"
 
 #include "Zone/Zone.h"
+#include "Zone/InstanceContent.h"
 #include "Actor/Player.h"
 #include "ServerZone.h"
 #include "Event/EventHandler.h"
diff --git a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
index 0256b651..fcdca8ab 100644
--- a/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
+++ b/src/servers/sapphire_zone/Script/Scripts/instances/dungeons/Sastasha.cpp
@@ -1,5 +1,6 @@
 #include <ScriptObject.h>
 #include <Zone/InstanceContent.h>
+#include <Actor/EventObject.h>
 
 class Sastasha : public InstanceContentScript
 {
@@ -81,4 +82,4 @@ public:
 
    }
 
-};
\ No newline at end of file
+};
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.cpp b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
index 0c7f1d38..201ac523 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.cpp
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.cpp
@@ -10,6 +10,7 @@
 #include "Script/ScriptManager.h"
 
 #include "Actor/Player.h"
+#include "Actor/EventObject.h"
 
 #include "Network/PacketWrappers/ActorControlPacket142.h"
 #include "Network/PacketWrappers/ActorControlPacket143.h"
diff --git a/src/servers/sapphire_zone/Zone/InstanceContent.h b/src/servers/sapphire_zone/Zone/InstanceContent.h
index 328251c4..9dcb5974 100644
--- a/src/servers/sapphire_zone/Zone/InstanceContent.h
+++ b/src/servers/sapphire_zone/Zone/InstanceContent.h
@@ -4,11 +4,13 @@
 #include "Zone.h"
 #include "Event/Director.h"
 #include "Forwards.h"
-#include <common/Exd/ExdDataGenerated.h>
 
 namespace Core
 {
-
+   namespace Data
+   {
+      struct InstanceContent;
+   }
 class InstanceContent : public Event::Director, public Zone
 {
 public:
@@ -40,7 +42,7 @@ public:
 
    void setVar( uint8_t index, uint8_t value );
 
-   Core::Data::ExdDataGenerated::InstanceContentPtr getInstanceContentInfo() const;
+   boost::shared_ptr< Core::Data::InstanceContent > getInstanceContentInfo() const;
 
    uint32_t getInstanceContentId() const;
 
@@ -48,7 +50,7 @@ public:
 
 private:
    Event::DirectorPtr m_pDirector;
-   Core::Data::ExdDataGenerated::InstanceContentPtr m_instanceContentInfo;
+   boost::shared_ptr< Core::Data::InstanceContent > m_instanceContentInfo;
    uint32_t m_instanceContentId;
    InstanceContentState m_state;
 
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
index ed4c1513..85ac8aaa 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.cpp
@@ -4,6 +4,8 @@
 #include <common/Database/DatabaseDef.h>
 #include <common/Exd/ExdDataGenerated.h>
 
+#include <unordered_map>
+
 #include "Actor/Player.h"
 
 #include "Zone.h"
diff --git a/src/servers/sapphire_zone/Zone/TerritoryMgr.h b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
index 52561fa9..7ed16f85 100644
--- a/src/servers/sapphire_zone/Zone/TerritoryMgr.h
+++ b/src/servers/sapphire_zone/Zone/TerritoryMgr.h
@@ -1,9 +1,9 @@
 #ifndef SAPPHIRE_TERRITORYMGR_H
 #define SAPPHIRE_TERRITORYMGR_H
 
-#include <common/Exd/ExdDataGenerated.h>
 #include "Forwards.h"
 #include <set>
+#include <unordered_map>
 
 namespace Core
 {
diff --git a/src/servers/sapphire_zone/Zone/Zone.cpp b/src/servers/sapphire_zone/Zone/Zone.cpp
index 1545a098..1c56ad10 100644
--- a/src/servers/sapphire_zone/Zone/Zone.cpp
+++ b/src/servers/sapphire_zone/Zone/Zone.cpp
@@ -19,6 +19,7 @@
 #include "Session.h"
 #include "Actor/Chara.h"
 #include "Actor/Player.h"
+#include "Actor/EventObject.h"
 
 #include "Forwards.h"
 
diff --git a/src/servers/sapphire_zone/Zone/Zone.h b/src/servers/sapphire_zone/Zone/Zone.h
index 7b43c772..81170219 100644
--- a/src/servers/sapphire_zone/Zone/Zone.h
+++ b/src/servers/sapphire_zone/Zone/Zone.h
@@ -6,16 +6,16 @@
 
 #include "Cell.h"
 #include "CellHandler.h"
-#include "Actor/EventObject.h"
 
 #include "Forwards.h"
 
 #include <set>
+#include <map>
 #include <boost/enable_shared_from_this.hpp>
 
 #include <stdio.h>
 #include <string.h>
-#include <common/Exd/ExdDataGenerated.h>
+
 namespace Core {
 
 class Session;
@@ -23,6 +23,11 @@ class Session;
 class ZonePosition;
 
 using SessionSet = std::set< SessionPtr >;
+namespace Data
+{
+   struct InstanceContent;
+   struct TerritoryType;
+}
 
 class Zone : public CellHandler< Cell >, public boost::enable_shared_from_this< Zone >
 {