Core/Misc: Reduce header dependencies - Step III

20 files changed, 26 insertions, 0 deletions

diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
index 1fe3ac60260..df180bf5568 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/instance_hyjal.cpp
@@ -28,6 +28,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "hyjal_trash.h"
 #include "Player.h"
+#include "WorldPacket.h"
+#include "Opcodes.h"
 
 enum Misc
 {
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
index 22ae808e348..365c5dd7300 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.cpp
@@ -22,6 +22,7 @@
 #include "ScriptedEscortAI.h"
 #include "PassiveAI.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 enum Says
 {
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
index 0ec7d1bdd25..0467109effc 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/instance_culling_of_stratholme.cpp
@@ -20,6 +20,8 @@
 #include "CreatureTextMgr.h"
 #include "culling_of_stratholme.h"
 #include "Player.h"
+#include "TemporarySummon.h"
+#include "SpellInfo.h"
 
 #define MAX_ENCOUNTER 5
 
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
index 8fa6c239858..8ca14d72b94 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/dark_portal.cpp
@@ -34,6 +34,7 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "dark_portal.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 #define SAY_ENTER               -1269020                    //where does this belong?
 #define SAY_INTRO               -1269021
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
index 879b0ed4aee..b7820bae920 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/DarkPortal/instance_dark_portal.cpp
@@ -27,6 +27,8 @@ EndScriptData */
 #include "InstanceScript.h"
 #include "dark_portal.h"
 #include "Player.h"
+#include "TemporarySummon.h"
+#include "SpellInfo.h"
 
 #define MAX_ENCOUNTER              2
 
diff --git a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
index 22ec68eba5e..adcec659fa3 100644
--- a/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
+++ b/src/server/scripts/Kalimdor/OnyxiasLair/instance_onyxias_lair.cpp
@@ -29,6 +29,7 @@ EndScriptData */
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "onyxias_lair.h"
+#include "TemporarySummon.h"
 
 class instance_onyxias_lair : public InstanceMapScript
 {
diff --git a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
index 3acf9bc7029..f7161638909 100644
--- a/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
+++ b/src/server/scripts/Kalimdor/RazorfenDowns/instance_razorfen_downs.cpp
@@ -19,6 +19,7 @@
 #include "InstanceScript.h"
 #include "razorfen_downs.h"
 #include "Player.h"
+#include "TemporarySummon.h"
 
 #define    MAX_ENCOUNTER  1
 
diff --git a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
index c43d46c4789..2bbdaa389ad 100644
--- a/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
+++ b/src/server/scripts/Kalimdor/RuinsOfAhnQiraj/boss_ossirian.cpp
@@ -19,6 +19,9 @@
 #include "ScriptedCreature.h"
 #include "ruins_of_ahnqiraj.h"
 #include "Player.h"
+#include "SpellInfo.h"
+#include "WorldPacket.h"
+#include "Opcodes.h"
 
 enum Texts
 {
diff --git a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
index 2706b638573..4cdddb2d9da 100644
--- a/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
+++ b/src/server/scripts/Kalimdor/ZulFarrak/instance_zulfarrak.cpp
@@ -19,6 +19,7 @@
 #include "InstanceScript.h"
 #include "zulfarrak.h"
 #include "Player.h"
+#include "TemporarySummon.h"
 
 #define NPC_GAHZRILLA 7273
 #define PATH_ADDS 81553
diff --git a/src/server/scripts/Kalimdor/azshara.cpp b/src/server/scripts/Kalimdor/azshara.cpp
index cf4bb38d559..c8eb5daef68 100644
--- a/src/server/scripts/Kalimdor/azshara.cpp
+++ b/src/server/scripts/Kalimdor/azshara.cpp
@@ -34,6 +34,8 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "Player.h"
+#include "SpellInfo.h"
+#include "WorldSession.h"
 
 /*######
 ## mobs_spitelashes
diff --git a/src/server/scripts/Kalimdor/darkshore.cpp b/src/server/scripts/Kalimdor/darkshore.cpp
index 4b8329cfaa6..5d10076c114 100644
--- a/src/server/scripts/Kalimdor/darkshore.cpp
+++ b/src/server/scripts/Kalimdor/darkshore.cpp
@@ -35,6 +35,7 @@ EndContentData */
 #include "ScriptedEscortAI.h"
 #include "ScriptedFollowerAI.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*####
 # npc_kerlonian
diff --git a/src/server/scripts/Kalimdor/desolace.cpp b/src/server/scripts/Kalimdor/desolace.cpp
index d34c72226b2..30a87ef0197 100644
--- a/src/server/scripts/Kalimdor/desolace.cpp
+++ b/src/server/scripts/Kalimdor/desolace.cpp
@@ -35,6 +35,7 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "ScriptedEscortAI.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 enum DyingKodo
 {
diff --git a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
index ef7a5a1d8f3..6ab9b653c5d 100644
--- a/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
+++ b/src/server/scripts/Kalimdor/dustwallow_marsh.cpp
@@ -37,6 +37,7 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "SpellScript.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 /*######
 ## mobs_risen_husk_spirit
diff --git a/src/server/scripts/Kalimdor/feralas.cpp b/src/server/scripts/Kalimdor/feralas.cpp
index db2a125bc71..df4345b3aae 100644
--- a/src/server/scripts/Kalimdor/feralas.cpp
+++ b/src/server/scripts/Kalimdor/feralas.cpp
@@ -29,6 +29,7 @@ EndScriptData */
 #include "ScriptedGossip.h"
 #include "SpellScript.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 /*######
 ## npc_gregan_brewspewer
diff --git a/src/server/scripts/Kalimdor/moonglade.cpp b/src/server/scripts/Kalimdor/moonglade.cpp
index 8a24828bcc3..6d93e074e79 100644
--- a/src/server/scripts/Kalimdor/moonglade.cpp
+++ b/src/server/scripts/Kalimdor/moonglade.cpp
@@ -36,6 +36,7 @@ EndContentData */
 #include "ScriptedEscortAI.h"
 #include "ScriptedGossip.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*######
 ## npc_bunthen_plainswind
diff --git a/src/server/scripts/Kalimdor/mulgore.cpp b/src/server/scripts/Kalimdor/mulgore.cpp
index 0aa1f55fa32..8ed26b8cf38 100644
--- a/src/server/scripts/Kalimdor/mulgore.cpp
+++ b/src/server/scripts/Kalimdor/mulgore.cpp
@@ -33,6 +33,7 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*######
 # npc_skorn_whitecloud
diff --git a/src/server/scripts/Kalimdor/tanaris.cpp b/src/server/scripts/Kalimdor/tanaris.cpp
index 8e6f8d57165..7341ccb1e2c 100644
--- a/src/server/scripts/Kalimdor/tanaris.cpp
+++ b/src/server/scripts/Kalimdor/tanaris.cpp
@@ -39,6 +39,7 @@ EndContentData */
 #include "ScriptedEscortAI.h"
 #include "ScriptedFollowerAI.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 /*######
 ## mob_aquementas
diff --git a/src/server/scripts/Kalimdor/the_barrens.cpp b/src/server/scripts/Kalimdor/the_barrens.cpp
index 228d1fc360a..8a24f696a23 100644
--- a/src/server/scripts/Kalimdor/the_barrens.cpp
+++ b/src/server/scripts/Kalimdor/the_barrens.cpp
@@ -37,6 +37,7 @@ EndContentData */
 #include "ScriptedGossip.h"
 #include "ScriptedEscortAI.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 /*######
 ## npc_beaten_corpse
diff --git a/src/server/scripts/Kalimdor/ungoro_crater.cpp b/src/server/scripts/Kalimdor/ungoro_crater.cpp
index 3da23bea489..e00ea566c8f 100644
--- a/src/server/scripts/Kalimdor/ungoro_crater.cpp
+++ b/src/server/scripts/Kalimdor/ungoro_crater.cpp
@@ -33,6 +33,7 @@ EndContentData */
 #include "ScriptedEscortAI.h"
 #include "ScriptedFollowerAI.h"
 #include "Player.h"
+#include "SpellInfo.h"
 
 enum AmeData
 {
diff --git a/src/server/scripts/Kalimdor/winterspring.cpp b/src/server/scripts/Kalimdor/winterspring.cpp
index 483ee472721..73b8bfe9af1 100644
--- a/src/server/scripts/Kalimdor/winterspring.cpp
+++ b/src/server/scripts/Kalimdor/winterspring.cpp
@@ -31,6 +31,7 @@ EndContentData */
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "Player.h"
+#include "WorldSession.h"
 
 /*######
 ## npc_rivern_frostwind