diff --git a/src/servers/Scripts/action/ActionSprint3.cpp b/src/servers/Scripts/action/ActionSprint3.cpp
index 3d5da658..b630cd8b 100644
--- a/src/servers/Scripts/action/ActionSprint3.cpp
+++ b/src/servers/Scripts/action/ActionSprint3.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 class ActionSprint3 : public ActionScript
diff --git a/src/servers/Scripts/common/Aethernet.cpp b/src/servers/Scripts/common/Aethernet.cpp
index 78e22b8b..b925564e 100644
--- a/src/servers/Scripts/common/Aethernet.cpp
+++ b/src/servers/Scripts/common/Aethernet.cpp
@@ -1,5 +1,4 @@
-#include "Script/NativeScriptApi.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 #define ACTION_ATTUNE 0x13
diff --git a/src/servers/Scripts/common/Aetheryte.cpp b/src/servers/Scripts/common/Aetheryte.cpp
index 800d5c8f..d883bd3c 100644
--- a/src/servers/Scripts/common/Aetheryte.cpp
+++ b/src/servers/Scripts/common/Aetheryte.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 
diff --git a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
index d3730d60..fdd742e1 100644
--- a/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
+++ b/src/servers/Scripts/common/CmnDefCutSceneReplay.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 class CmnDefCutSceneReplay : public EventScript
diff --git a/src/servers/Scripts/common/CmnDefInnBed.cpp b/src/servers/Scripts/common/CmnDefInnBed.cpp
index b97f129b..2b524502 100644
--- a/src/servers/Scripts/common/CmnDefInnBed.cpp
+++ b/src/servers/Scripts/common/CmnDefInnBed.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 class CmnDefInnBed : public EventScript
diff --git a/src/servers/Scripts/common/CmnDefLinkShell.cpp b/src/servers/Scripts/common/CmnDefLinkShell.cpp
index c5758211..81d174b8 100644
--- a/src/servers/Scripts/common/CmnDefLinkShell.cpp
+++ b/src/servers/Scripts/common/CmnDefLinkShell.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 #define ACTION_CREATE 2
diff --git a/src/servers/Scripts/common/HouFurOrchestrion.cpp b/src/servers/Scripts/common/HouFurOrchestrion.cpp
index 2269789e..7ceeea71 100644
--- a/src/servers/Scripts/common/HouFurOrchestrion.cpp
+++ b/src/servers/Scripts/common/HouFurOrchestrion.cpp
@@ -1,5 +1,4 @@
-#include <Script/NativeScriptApi.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 
 class HouFurOrchestrion : public EventScript
diff --git a/src/servers/Scripts/opening/OpeningGridania.cpp b/src/servers/Scripts/opening/OpeningGridania.cpp
index 71dc22b9..453aa7fd 100644
--- a/src/servers/Scripts/opening/OpeningGridania.cpp
+++ b/src/servers/Scripts/opening/OpeningGridania.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include <ScriptObject.h>
 
diff --git a/src/servers/Scripts/opening/OpeningLimsa.cpp b/src/servers/Scripts/opening/OpeningLimsa.cpp
index 9613149e..088b9ba3 100644
--- a/src/servers/Scripts/opening/OpeningLimsa.cpp
+++ b/src/servers/Scripts/opening/OpeningLimsa.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include <ScriptObject.h>
 
diff --git a/src/servers/Scripts/opening/OpeningUldah.cpp b/src/servers/Scripts/opening/OpeningUldah.cpp
index dfc0bd62..7ef8d392 100644
--- a/src/servers/Scripts/opening/OpeningUldah.cpp
+++ b/src/servers/Scripts/opening/OpeningUldah.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include <ScriptObject.h>
 
diff --git a/src/servers/Scripts/quest/ManFst001.cpp b/src/servers/Scripts/quest/ManFst001.cpp
index a351e61c..ba606e80 100644
--- a/src/servers/Scripts/quest/ManFst001.cpp
+++ b/src/servers/Scripts/quest/ManFst001.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include <sapphire_zone/Event/EventHandler.h>
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 #include "Event/EventHelper.h"
 
 // Quest Script: ManFst001_00039
diff --git a/src/servers/Scripts/quest/ManFst002.cpp b/src/servers/Scripts/quest/ManFst002.cpp
index 153fb9a0..b9c8e38d 100644
--- a/src/servers/Scripts/quest/ManFst002.cpp
+++ b/src/servers/Scripts/quest/ManFst002.cpp
@@ -1,8 +1,7 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include <sapphire_zone/Event/EventHandler.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManFst002_00124
 // Quest Name: Close to Home
diff --git a/src/servers/Scripts/quest/ManFst003.cpp b/src/servers/Scripts/quest/ManFst003.cpp
index 25344bf2..77134ab7 100644
--- a/src/servers/Scripts/quest/ManFst003.cpp
+++ b/src/servers/Scripts/quest/ManFst003.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManFst003_00123
 // Quest Name: Close to Home
diff --git a/src/servers/Scripts/quest/ManFst004.cpp b/src/servers/Scripts/quest/ManFst004.cpp
index da1fb49b..72617bb4 100644
--- a/src/servers/Scripts/quest/ManFst004.cpp
+++ b/src/servers/Scripts/quest/ManFst004.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
 #include <ScriptObject.h>
diff --git a/src/servers/Scripts/quest/ManSea001.cpp b/src/servers/Scripts/quest/ManSea001.cpp
index 7f0a8840..ddea858e 100644
--- a/src/servers/Scripts/quest/ManSea001.cpp
+++ b/src/servers/Scripts/quest/ManSea001.cpp
@@ -1,4 +1,3 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
 #include <ScriptObject.h>
diff --git a/src/servers/Scripts/quest/ManSea002.cpp b/src/servers/Scripts/quest/ManSea002.cpp
index 9817969a..aeb2f96d 100644
--- a/src/servers/Scripts/quest/ManSea002.cpp
+++ b/src/servers/Scripts/quest/ManSea002.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManSea002_00108
 // Quest Name: Close to Home
diff --git a/src/servers/Scripts/quest/ManWil001.cpp b/src/servers/Scripts/quest/ManWil001.cpp
index 8a3f0dfd..7bcf68a7 100644
--- a/src/servers/Scripts/quest/ManWil001.cpp
+++ b/src/servers/Scripts/quest/ManWil001.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManWil001_00594
 // Quest Name: Coming to Ul'dah
diff --git a/src/servers/Scripts/quest/ManWil002.cpp b/src/servers/Scripts/quest/ManWil002.cpp
index 55530020..f0956f0b 100644
--- a/src/servers/Scripts/quest/ManWil002.cpp
+++ b/src/servers/Scripts/quest/ManWil002.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: ManWil002_00568
 // Quest Name: Close to Home
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
index 4c22f807..261233d9 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst001.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../../../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: SubFst001_00024
 // Quest Name: Coarse Correspondence
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
index 505a601c..124cc4ad 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst002.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../../../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: SubFst002_00025
 // Quest Name: Quarrels with Squirrels
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
index a7053079..104c8d2c 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst010.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../../../ScriptObject.h"
+#include <ScriptObject.h>
 
 // Quest Script: SubFst010_00001
 // Quest Name: A Good Adventurer Is Hard to Find
diff --git a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
index 6c5e2b99..c6f36790 100644
--- a/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
+++ b/src/servers/Scripts/quest/subquest/gridania/SubFst013.cpp
@@ -1,7 +1,6 @@
-#include <Script/NativeScriptApi.h>
+#include <ScriptObject.h>
 #include <Actor/Player.h>
 #include "Event/EventHelper.h"
-#include "../../../ScriptObject.h"
 
 // Quest Script: SubFst013_00040
 // Quest Name: For Friendship