From 393d9a598781ecb567ca6b315fcba976cd7ff696 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Francesco=20Borz=C3=AC?= <borzifrancesco@gmail.com>
Date: Mon, 22 Jul 2024 00:15:20 +0200
Subject: [PATCH] refactor(Scripts/Outland): remove unused imports (#19461)

---
 .../Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp      | 1 +
 .../ShadowLabyrinth/instance_shadow_labyrinth.cpp           | 1 +
 .../Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h   | 2 --
 src/server/scripts/Outland/BlackTemple/black_temple.h       | 6 ------
 src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp   | 1 +
 src/server/scripts/Outland/BlackTemple/boss_illidan.cpp     | 4 ++++
 .../scripts/Outland/BlackTemple/boss_mother_shahraz.cpp     | 3 +++
 .../scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp | 3 +++
 .../scripts/Outland/BlackTemple/boss_shade_of_akama.cpp     | 5 +++++
 .../scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp    | 5 +++++
 .../scripts/Outland/BlackTemple/boss_warlord_najentus.cpp   | 1 +
 src/server/scripts/Outland/BlackTemple/illidari_council.cpp | 3 +++
 .../scripts/Outland/BlackTemple/instance_black_temple.cpp   | 3 +++
 .../SerpentShrine/boss_fathomlord_karathress.cpp            | 2 ++
 .../SerpentShrine/boss_hydross_the_unstable.cpp             | 1 +
 .../CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp     | 1 +
 .../SerpentShrine/boss_leotheras_the_blind.cpp              | 3 +++
 .../CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp   | 3 +++
 .../SerpentShrine/boss_morogrim_tidewalker.cpp              | 1 +
 .../SerpentShrine/instance_serpent_shrine.cpp               | 2 ++
 .../CoilfangReservoir/SerpentShrine/serpent_shrine.h        | 5 -----
 .../Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp      | 1 -
 .../Outland/CoilfangReservoir/SteamVault/steam_vault.h      | 1 -
 src/server/scripts/Outland/GruulsLair/boss_gruul.cpp        | 1 +
 src/server/scripts/Outland/GruulsLair/gruuls_lair.h         | 2 --
 .../HellfireRamparts/boss_vazruden_the_herald.cpp           | 1 +
 .../HellfireRamparts/boss_watchkeeper_gargolmar.cpp         | 1 +
 .../HellfireCitadel/HellfireRamparts/hellfire_ramparts.h    | 1 -
 .../HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp   | 1 +
 .../HellfireCitadel/MagtheridonsLair/magtheridons_lair.h    | 2 --
 .../HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp      | 1 +
 .../HellfireCitadel/ShatteredHalls/shattered_halls.h        | 2 --
 src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp    | 3 +++
 .../scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp    | 2 ++
 .../scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp       | 3 ++-
 .../scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp    | 1 +
 src/server/scripts/Outland/TempestKeep/Eye/the_eye.h        | 4 ----
 .../TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp    | 2 ++
 src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h  | 4 ----
 .../scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp       | 2 ++
 src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h  | 3 ---
 .../Outland/TempestKeep/botanica/instance_the_botanica.cpp  | 1 +
 .../scripts/Outland/TempestKeep/botanica/the_botanica.h     | 1 -
 src/server/scripts/Outland/zone_blades_edge_mountains.cpp   | 1 -
 src/server/scripts/Outland/zone_nagrand.cpp                 | 1 -
 45 files changed, 61 insertions(+), 37 deletions(-)

diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
index 54888d53e53bb6..91efd32be2ff81 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/boss_murmur.cpp
@@ -20,6 +20,7 @@
 #include "SpellInfo.h"
 #include "SpellScriptLoader.h"
 #include "shadow_labyrinth.h"
+#include "SpellScript.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
index 93c2be52134043..1f1a99d59b2278 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/instance_shadow_labyrinth.cpp
@@ -19,6 +19,7 @@
 #include "InstanceScript.h"
 #include "SpellScriptLoader.h"
 #include "shadow_labyrinth.h"
+#include "SpellScript.h"
 
 DoorData const doorData[] =
 {
diff --git a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
index e6e77bdd860a69..4a6d94af5a096b 100644
--- a/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
+++ b/src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h
@@ -18,10 +18,8 @@
 #ifndef DEF_SHADOW_LABYRINTH_H
 #define DEF_SHADOW_LABYRINTH_H
 
-#include "CreatureAI.h"
 #include "CreatureAIImpl.h"
 #include "GridNotifiers.h"
-#include "SpellScript.h"
 
 #define ShadowLabyrinthScriptName "instance_shadow_labyrinth"
 
diff --git a/src/server/scripts/Outland/BlackTemple/black_temple.h b/src/server/scripts/Outland/BlackTemple/black_temple.h
index e4febfe055d2f6..4b88eff2798bec 100644
--- a/src/server/scripts/Outland/BlackTemple/black_temple.h
+++ b/src/server/scripts/Outland/BlackTemple/black_temple.h
@@ -19,12 +19,6 @@
 #define BLACK_TEMPLE_H_
 
 #include "CreatureAIImpl.h"
-#include "GridNotifiers.h"
-#include "PassiveAI.h"
-#include "Player.h"
-#include "ScriptedGossip.h"
-#include "SpellAuraEffects.h"
-#include "SpellScript.h"
 
 #define DataHeader "BT"
 
diff --git a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
index e5fecceb40e755..4fb630a651ea9d 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_bloodboil.cpp
@@ -19,6 +19,7 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "black_temple.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
index 9d930d21a26294..4c26f09ab65f1a 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_illidan.cpp
@@ -20,6 +20,10 @@
 #include "ScriptedEscortAI.h"
 #include "SpellScriptLoader.h"
 #include "black_temple.h"
+#include "Player.h"
+#include "ScriptedGossip.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
index c0e99e6ad08ee7..3706fd21174289 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_mother_shahraz.cpp
@@ -19,6 +19,9 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "black_temple.h"
+#include "GridNotifiers.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
index 8054df37c3e10f..741082b65a4582 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_reliquary_of_souls.cpp
@@ -20,6 +20,9 @@
 #include "Spell.h"
 #include "SpellScriptLoader.h"
 #include "black_temple.h"
+#include "Player.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
index d33abd52adb657..da4f9f9f0ed10c 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_shade_of_akama.cpp
@@ -19,6 +19,11 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "black_temple.h"
+#include "PassiveAI.h"
+#include "ScriptedGossip.h"
+#include "SpellAuras.h"
+#include "SpellInfo.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
index 7a0f4a48f6e9d8..dca4b7e26e7700 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_teron_gorefiend.cpp
@@ -19,6 +19,11 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "black_temple.h"
+#include "PassiveAI.h"
+#include "Player.h"
+#include "SpellAuraEffects.h"
+#include "SpellAuras.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
index 101122b560717a..90c2538f563fa7 100644
--- a/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
+++ b/src/server/scripts/Outland/BlackTemple/boss_warlord_najentus.cpp
@@ -19,6 +19,7 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "black_temple.h"
+#include "SpellScript.h"
 
 enum Yells
 {
diff --git a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
index c7be8416db1bbd..93e559147c37bc 100644
--- a/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
+++ b/src/server/scripts/Outland/BlackTemple/illidari_council.cpp
@@ -19,6 +19,9 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "black_temple.h"
+#include "Player.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index c6c519d9410b9b..2e0f7db8919269 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -20,6 +20,9 @@
 #include "InstanceScript.h"
 #include "SpellScriptLoader.h"
 #include "black_temple.h"
+#include "SpellAuraEffects.h"
+#include "SpellAuras.h"
+#include "SpellScript.h"
 
 DoorData const doorData[] =
 {
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
index 667b83773bed61..f3c966b330cb3a 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_fathomlord_karathress.cpp
@@ -20,6 +20,8 @@
 #include "SpellScriptLoader.h"
 #include "TaskScheduler.h"
 #include "serpent_shrine.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 
 enum Talk
 {
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
index 1423cc94917722..ca70ae838972b7 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_hydross_the_unstable.cpp
@@ -19,6 +19,7 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "serpent_shrine.h"
+#include "SpellScript.h"
 
 enum Talk
 {
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
index 2f48c13380dd87..9cc9fadaf8fdf0 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lady_vashj.cpp
@@ -22,6 +22,7 @@
 #include "SpellScriptLoader.h"
 #include "WorldSession.h"
 #include "serpent_shrine.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
index 92c75da7f97363..c632d961c6e1fa 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_leotheras_the_blind.cpp
@@ -17,11 +17,14 @@
 
 #include "CreatureGroups.h"
 #include "CreatureScript.h"
+#include "GridNotifiers.h"
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "TaskScheduler.h"
 #include "serpent_shrine.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 
 enum Talk
 {
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
index ea7d032e4fea27..08bdae70afd4f9 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_lurker_below.cpp
@@ -17,9 +17,12 @@
 
 #include "CreatureScript.h"
 #include "GameObjectScript.h"
+#include "Player.h"
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "serpent_shrine.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 
 enum Spells
 {
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
index 54b5d154a58e21..2494acf59d4589 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/boss_morogrim_tidewalker.cpp
@@ -19,6 +19,7 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "serpent_shrine.h"
+#include "SpellScript.h"
 
 enum Yells
 {
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
index 54ee662b55c8a5..59ca24665d28ce 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/instance_serpent_shrine.cpp
@@ -23,6 +23,8 @@
 #include "SpellScriptLoader.h"
 #include "TemporarySummon.h"
 #include "serpent_shrine.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 
 DoorData const doorData[] =
 {
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
index 8453d8e3707a2a..4a1d5e27654d6c 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h
@@ -18,12 +18,7 @@
 #ifndef DEF_SERPENT_SHRINE_H
 #define DEF_SERPENT_SHRINE_H
 
-#include "CreatureAI.h"
 #include "CreatureAIImpl.h"
-#include "GridNotifiers.h"
-#include "Player.h"
-#include "SpellAuraEffects.h"
-#include "SpellScript.h"
 
 #define DataHeader "SS"
 
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
index 940f369553d909..265c3fef9bc15b 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
+++ b/src/server/scripts/Outland/CoilfangReservoir/SlavePens/boss_ahune.cpp
@@ -27,7 +27,6 @@
 #include "Map.h"
 #include "MotionMaster.h"
 #include "ObjectAccessor.h"
-#include "PassiveAI.h"
 #include "Player.h"
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
diff --git a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
index af2e2c4270d8f7..3eeaf32668ec4b 100644
--- a/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
+++ b/src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h
@@ -19,7 +19,6 @@
 #define DEF_STEAM_VAULT_H
 
 #include "CreatureAIImpl.h"
-#include "PassiveAI.h"
 
 #define DataHeaders "SV"
 
diff --git a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
index 773ec71d3832c2..8a0357ab07aeb6 100644
--- a/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
+++ b/src/server/scripts/Outland/GruulsLair/boss_gruul.cpp
@@ -21,6 +21,7 @@
 #include "SpellScript.h"
 #include "SpellScriptLoader.h"
 #include "gruuls_lair.h"
+#include "SpellAuraEffects.h"
 
 enum Yells
 {
diff --git a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
index 91244e4af727a7..5aacb769f1c400 100644
--- a/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
+++ b/src/server/scripts/Outland/GruulsLair/gruuls_lair.h
@@ -18,9 +18,7 @@
 #ifndef GRUULS_LAIR_H_
 #define GRUULS_LAIR_H_
 
-#include "CreatureAI.h"
 #include "CreatureAIImpl.h"
-#include "SpellAuraEffects.h"
 
 #define DataHeader "GL"
 
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
index e47c1165787835..ec612ddfd3e63d 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_vazruden_the_herald.cpp
@@ -20,6 +20,7 @@
 #include "SpellScriptLoader.h"
 #include "TaskScheduler.h"
 #include "hellfire_ramparts.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
index ea4a66c1e9bb7e..26728de3596be0 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/boss_watchkeeper_gargolmar.cpp
@@ -19,6 +19,7 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "hellfire_ramparts.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
index 0f610988075e05..95a8512c3a0e3a 100644
--- a/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
+++ b/src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h
@@ -19,7 +19,6 @@
 #define DEF_RAMPARTS_H
 
 #include "CreatureAIImpl.h"
-#include "SpellScript.h"
 
 #define DataHeader "HR"
 #define HellfireRampartsScriptName "instance_hellfire_ramparts"
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
index 09183cc5d9eb15..37b3a95b159e9e 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/boss_magtheridon.cpp
@@ -23,6 +23,7 @@
 #include "SpellScriptLoader.h"
 #include "TaskScheduler.h"
 #include "magtheridons_lair.h"
+#include "SpellScript.h"
 
 enum Yells
 {
diff --git a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
index 4e28280165f672..b9a6341d7610d6 100644
--- a/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
+++ b/src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h
@@ -19,8 +19,6 @@
 #define DEF_MAGTHERIDONS_LAIR_H
 
 #include "CreatureAIImpl.h"
-#include "SpellScript.h"
-
 #define DataHeader "ML"
 
 #define MagtheridonsLairScriptName "instance_magtheridons_lair"
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
index bcdc684436a2d7..e5723aee5a68ac 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/boss_nethekurse.cpp
@@ -21,6 +21,7 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "shattered_halls.h"
+#include "SpellScript.h"
 
 enum Texts
 {
diff --git a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
index 07c31a3ba2a583..9001522a8f9167 100644
--- a/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
+++ b/src/server/scripts/Outland/HellfireCitadel/ShatteredHalls/shattered_halls.h
@@ -19,8 +19,6 @@
 #define DEF_SHATTERED_H
 
 #include "CreatureAIImpl.h"
-#include "PassiveAI.h"
-#include "SpellScript.h"
 
 #define ShatteredHallsLairScriptName "instance_shattered_halls"
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
index 7e17bbf6677334..f028ac61fcdb54 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_alar.cpp
@@ -23,6 +23,9 @@
 #include "the_eye.h"
 #include <cmath>
 
+#include "Player.h"
+#include "SpellScript.h"
+
 enum Spells
 {
     SPELL_BERSERK                   = 45078,
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
index 3ca2ffeb852b58..dc1b9a02cc81de 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_astromancer.cpp
@@ -17,6 +17,8 @@
 
 #include "CreatureScript.h"
 #include "ScriptedCreature.h"
+#include "SpellAuras.h"
+#include "SpellScript.h"
 #include "SpellScriptLoader.h"
 #include "the_eye.h"
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
index 0de1b41ea7c424..303e091afd14c4 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/boss_kaelthas.cpp
@@ -16,8 +16,9 @@
  */
 
 #include "CreatureScript.h"
-#include "Opcodes.h"
+#include "GridNotifiers.h"
 #include "ScriptedCreature.h"
+#include "SpellScript.h"
 #include "SpellScriptLoader.h"
 #include "WorldPacket.h"
 #include "the_eye.h"
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
index 4da9dbc14c1244..354e45c41481a4 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Eye/instance_the_eye.cpp
@@ -17,6 +17,7 @@
 
 #include "InstanceMapScript.h"
 #include "InstanceScript.h"
+#include "SpellScript.h"
 #include "SpellScriptLoader.h"
 #include "the_eye.h"
 
diff --git a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
index ad911b563189d1..d480f7f8431d62 100644
--- a/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
+++ b/src/server/scripts/Outland/TempestKeep/Eye/the_eye.h
@@ -19,10 +19,6 @@
 #define DEF_THE_EYE_H
 
 #include "CreatureAIImpl.h"
-#include "GridNotifiers.h"
-#include "Player.h"
-#include "SpellAuraEffects.h"
-#include "SpellScript.h"
 
 #define DataHeader "TE"
 
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
index c4adf42158f9a0..99a367c1cb6566 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/boss_nethermancer_sepethrea.cpp
@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "SpellScriptLoader.h"
 #include "mechanar.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
index 4f3f8567b9bc06..9d3e3074a78f83 100644
--- a/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
+++ b/src/server/scripts/Outland/TempestKeep/Mechanar/mechanar.h
@@ -18,11 +18,7 @@
 #ifndef DEF_MECHANAR_H
 #define DEF_MECHANAR_H
 
-#include "CreatureAI.h"
 #include "CreatureAIImpl.h"
-#include "Player.h"
-#include "SpellAuraEffects.h"
-#include "SpellScript.h"
 
 #define DataHeader "MR"
 
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
index 1fabae4404d84b..f9f5dad491dfae 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.cpp
@@ -17,7 +17,9 @@
 
 #include "arcatraz.h"
 #include "CreatureScript.h"
+#include "Player.h"
 #include "ScriptedCreature.h"
+#include "SpellScript.h"
 #include "SpellScriptLoader.h"
 
 enum MillhouseSays
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
index a95acaf31c28ce..9c0cb31eed2c6c 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/arcatraz.h
@@ -18,10 +18,7 @@
 #ifndef ARCATRAZ_H
 #define ARCATRAZ_H
 
-#include "CreatureAI.h"
 #include "CreatureAIImpl.h"
-#include "Player.h"
-#include "SpellScript.h"
 
 #define DataHeader "AZ"
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
index 02c20d600798dd..082a918e9674fd 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
+++ b/src/server/scripts/Outland/TempestKeep/botanica/instance_the_botanica.cpp
@@ -19,6 +19,7 @@
 #include "GameTime.h"
 #include "InstanceMapScript.h"
 #include "InstanceScript.h"
+#include "SpellScript.h"
 #include "SpellScriptLoader.h"
 #include "the_botanica.h"
 
diff --git a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
index 44d4e44a820a03..af44f970de0999 100644
--- a/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
+++ b/src/server/scripts/Outland/TempestKeep/botanica/the_botanica.h
@@ -19,7 +19,6 @@
 #define DEF_THE_BOTANICA_H
 
 #include "CreatureAIImpl.h"
-#include "SpellScript.h"
 
 #define TheBotanicaScriptName "instance_the_botanica"
 
diff --git a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
index e3fa09e7ed47ad..9f549e2b72a3da 100644
--- a/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
+++ b/src/server/scripts/Outland/zone_blades_edge_mountains.cpp
@@ -23,7 +23,6 @@
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SpellAuraEffects.h"
-#include "SpellAuras.h"
 #include "SpellInfo.h"
 #include "SpellScript.h"
 #include "SpellScriptLoader.h"
diff --git a/src/server/scripts/Outland/zone_nagrand.cpp b/src/server/scripts/Outland/zone_nagrand.cpp
index 1439b72f877be4..c7d83bc7aadede 100644
--- a/src/server/scripts/Outland/zone_nagrand.cpp
+++ b/src/server/scripts/Outland/zone_nagrand.cpp
@@ -20,7 +20,6 @@
 #include "Player.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
-#include "ScriptedGossip.h"
 #include "SpellInfo.h"
 /* ScriptData
 SDName: Nagrand