diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
index 530efedace..12bf89ffcf 100644
--- a/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp
@@ -18,6 +18,7 @@
#include "ScriptMgr.h"
#include "baradin_hold.h"
#include "InstanceScript.h"
+#include "ObjectAccessor.h"
#include "Map.h"
#include "MotionMaster.h"
#include "ScriptedCreature.h"
diff --git a/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp b/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
index 6df7808e49..022ff08ce0 100644
--- a/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
+++ b/src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp
@@ -15,6 +15,7 @@
* with this program. If not, see .
*/
+#include "CreatureAI.h"
#include "ScriptMgr.h"
#include "baradin_hold.h"
#include "Creature.h"
diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.cpp
index 68cedb1f30..d31705817b 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.cpp
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.cpp
@@ -1,4 +1,4 @@
-/*
+/*
* This file is part of the TrinityCore Project. See AUTHORS file for Copyright information
*
* This program is free software; you can redistribute it and/or modify it
@@ -15,6 +15,7 @@
* with this program. If not, see .
*/
+#include "InstanceScript.h"
#include "ObjectMgr.h"
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h b/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h
index d9f543316e..8ebff90e11 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h
@@ -21,6 +21,8 @@
#define DataHeader "BoT"
#define BoTScriptName "instance_bastion_of_twilight"
+#include "CreatureAIImpl.h"
+
uint32 const EncounterCountNormal = 4;
uint32 const EncounterCountHeroic = 5;
diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp
index e5965839e3..79741221d5 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp
@@ -16,7 +16,10 @@
*/
#include "CommonPredicates.h"
+#include "Creature.h"
+#include "InstanceScript.h"
#include "GridNotifiers.h"
+#include "ObjectAccessor.h"
#include "ObjectMgr.h"
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
@@ -25,8 +28,12 @@
#include "SpellMgr.h"
#include "SpellHistory.h"
#include "Player.h"
+#include "TemporarySummon.h"
+#include "Unit.h"
#include "DBCStores.h"
#include "bastion_of_twilight.h"
+#include "MotionMaster.h"
+#include "Map.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp
index 32c403cbda..e6f255b359 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp
@@ -15,7 +15,12 @@
* with this program. If not, see .
*/
+#include "Creature.h"
+#include "CreatureAIImpl.h"
+#include "InstanceScript.h"
#include "GridNotifiers.h"
+#include "MotionMaster.h"
+#include "Map.h"
#include "ObjectMgr.h"
#include "PassiveAI.h"
#include "ScriptMgr.h"
@@ -24,6 +29,8 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
+#include "TemporarySummon.h"
+#include "Unit.h"
#include "Vehicle.h"
#include "bastion_of_twilight.h"
diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp
index cc28250ef6..2a0d33814d 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp
@@ -24,6 +24,10 @@
#include "GameObject.h"
#include "GameObjectAI.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "Map.h"
+#include "ObjectAccessor.h"
+#include "MotionMaster.h"
#include "bastion_of_twilight.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp
index 617da48305..4123307c20 100644
--- a/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp
+++ b/src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp
@@ -24,6 +24,11 @@
#include "Player.h"
#include "PhasingHandler.h"
#include "PassiveAI.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
+#include "TemporarySummon.h"
+#include "Map.h"
#include "bastion_of_twilight.h"
enum Texts
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
index bb0be9f571..2ed7281c2a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp
@@ -24,6 +24,7 @@
#include "SpellAuras.h"
#include "SpellScript.h"
#include "TemporarySummon.h"
+#include "InstanceScript.h"
/*#####
# npc_fire_cyclone
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
index 52901b2734..ae62288c54 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h
@@ -19,6 +19,7 @@
#define BLACKROCKCAVERNS_H_
#include "CreatureAIImpl.h"
+#include "Position.h"
#define BCScriptName "instance_blackrock_caverns"
#define DataHeader "BRC"
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
index c418b134dc..a7fa49e942 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp
@@ -15,11 +15,15 @@
* with this program. If not, see .
*/
+#include "InstanceScript.h"
#include "ScriptMgr.h"
#include "blackrock_caverns.h"
+#include "ObjectAccessor.h"
#include "ScriptedCreature.h"
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
+#include "SpellScript.h"
+#include "Position.h"
enum Text
{
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
index 5523a02e98..458e7e4d61 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp
@@ -18,6 +18,10 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "blackrock_caverns.h"
+#include "MotionMaster.h"
+#include "InstanceScript.h"
+#include "SpellScript.h"
+#include "ObjectAccessor.h"
enum Sounds
{
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp
index 1624f66b87..ef104d2e16 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp
@@ -22,6 +22,8 @@
#include "SpellScript.h"
#include "Spell.h"
#include "SpellAuraEffects.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
index 431440c1f3..c7bccb577a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp
@@ -22,6 +22,8 @@
#include "SpellMgr.h"
#include "SpellAuras.h"
#include "SpellAuraEffects.h"
+#include "InstanceScript.h"
+#include "Map.h"
enum Text
{
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
index aec78835e8..6548ac4635 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp
@@ -22,6 +22,8 @@
#include "ScriptedCreature.h"
#include "Spell.h"
#include "SpellScript.h"
+#include "Map.h"
+#include "SpellInfo.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
index a68380af6f..fa51a0b47e 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp
@@ -18,6 +18,10 @@
#include "ScriptMgr.h"
#include "blackrock_caverns.h"
#include "InstanceScript.h"
+#include "Creature.h"
+#include "InstanceScript.h"
+#include "CreatureAI.h"
+#include "Map.h"
ObjectData const creatureData[] =
{
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp
index 9345189c81..f07e1fccb7 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp
@@ -24,6 +24,7 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "Player.h"
+#include "InstanceScript.h"
#include "blackwing_descent.h"
struct go_bwd_ancient_bell : public GameObjectAI
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp
index 39bcdbec7a..43b57463f5 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp
@@ -25,6 +25,10 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
+#include "TemporarySummon.h"
#include "blackwing_descent.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp
index 77d34422ab..ca41cf22b9 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp
@@ -25,6 +25,9 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "Map.h"
#include "blackwing_descent.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp
index 93b1762d3f..3a948f953a 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp
@@ -23,6 +23,10 @@
#include "SpellAuraEffects.h"
#include "Player.h"
#include "Vehicle.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "MotionMaster.h"
+#include "Map.h"
#include "blackwing_descent.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp
index 8ce2b6c950..78a4d06dd0 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp
@@ -25,6 +25,10 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "TemporarySummon.h"
+#include "MapInstanced.h"
#include "blackwing_descent.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp
index 58ea16a807..3926b0b723 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp
@@ -30,6 +30,11 @@
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
#include "Transport.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "TemporarySummon.h"
+#include "Map.h"
+#include "ObjectAccessor.h"
#include "blackwing_descent.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp
index cc9f1c6881..733f2f4dce 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp
@@ -23,6 +23,10 @@
#include "PassiveAI.h"
#include "Player.h"
#include "SpellMgr.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "MotionMaster.h"
+#include "TemporarySummon.h"
#include "blackwing_descent.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp
index 8c199cafbe..917c93fcaf 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp
@@ -21,6 +21,9 @@
#include "InstanceScript.h"
#include "MapManager.h"
#include "Transport.h"
+#include "EventMap.h"
+#include "CreatureAI.h"
+#include "TemporarySummon.h"
#include "blackwing_descent.h"
ObjectData const creatureData[] =
diff --git a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
index 29064e09cf..d127b33188 100644
--- a/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
+++ b/src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp
@@ -30,6 +30,7 @@ EndScriptData */
#include "Player.h"
#include "ScriptedCreature.h"
#include "ScriptedGossip.h"
+#include "MotionMaster.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp
index 277290f1b4..f1f31573a2 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp
@@ -23,6 +23,9 @@
#include "SpellAuraEffects.h"
#include "Player.h"
#include "deadmines.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "MotionMaster.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp
index 46f70b4a94..0005ec0c9e 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp
@@ -21,6 +21,9 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "Player.h"
+#include "CreatureAIImpl.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
#include "deadmines.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp
index 40376aa689..b375ff4425 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp
@@ -21,6 +21,10 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "CreatureAIImpl.h"
+#include "Map.h"
#include "deadmines.h"
enum Texts
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp
index e23fdcca01..acafe8defd 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp
@@ -23,6 +23,9 @@
#include "MoveSplineInit.h"
#include "Player.h"
#include "Vehicle.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "MotionMaster.h"
#include "deadmines.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
index c233736ef5..4e6e6a6ae4 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp
@@ -29,6 +29,7 @@
#include "SpellMgr.h"
#include "VehicleDefines.h"
#include "GridNotifiers.h"
+#include "Map.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
index 3e74ad3c65..2587ef5bd5 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp
@@ -27,6 +27,8 @@
#include "Player.h"
#include "ScriptedCreature.h"
#include "SpellAuraEffects.h"
+#include "ObjectAccessor.h"
+#include "MotionMaster.h"
#include "SpellScript.h"
enum Texts
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
index d06c9cc901..6f8bf743ab 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.cpp
@@ -24,6 +24,11 @@
#include "GameObjectAI.h"
#include "GameObject.h"
#include "Vehicle.h"
+#include "MotionMaster.h"
+#include "InstanceScript.h"
+#include "TemporarySummon.h"
+#include "SpellScript.h"
+#include "SpellInfo.h"
enum DefiasWatcher
{
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
index 2f27ca6f57..a183b8c40d 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
+++ b/src/server/scripts/EasternKingdoms/Deadmines/deadmines.h
@@ -18,6 +18,9 @@
#ifndef DEF_DEADMINES_H
#define DEF_DEADMINES_H
+#include "CreatureAIImpl.h"
+#include "Position.h"
+
#define DataHeader "DM"
#define DMScriptName "instance_deadmines"
diff --git a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
index 235384ef9b..4d54de642f 100644
--- a/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
+++ b/src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp
@@ -25,6 +25,8 @@
#include "TemporarySummon.h"
#include "VehicleDefines.h"
#include "WorldPacket.h"
+#include "Player.h"
+#include "CreatureAIImpl.h"
enum EventIds
{
diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp
index 6936043c0f..34d29bac84 100644
--- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp
+++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp
@@ -23,6 +23,9 @@
#include "SpellAuraEffects.h"
#include "MoveSplineInit.h"
#include "Player.h"
+#include "MotionMaster.h"
+#include "InstanceScript.h"
+#include "TemporarySummon.h"
#include "grim_batol.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp
index 1e24b8bf1c..9dca358c4a 100644
--- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp
+++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_erudax.cpp
@@ -23,6 +23,10 @@
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "MotionMaster.h"
+#include "Map.h"
enum Spells
{
diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp
index facb6a6b4d..af4a2dd79a 100644
--- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp
+++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_forgemaster_throngus.cpp
@@ -22,6 +22,8 @@
#include "SpellAuraEffects.h"
#include "PassiveAI.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "Map.h"
#include "grim_batol.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp
index 3221332fa3..bca95ef524 100644
--- a/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp
+++ b/src/server/scripts/EasternKingdoms/GrimBatol/boss_general_umbriss.cpp
@@ -21,6 +21,8 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
#include "grim_batol.h"
enum Spells
diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp
index 09db3d5321..4f0c42942a 100644
--- a/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp
+++ b/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.cpp
@@ -21,6 +21,10 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "CombatAI.h"
+#include "MotionMaster.h"
+#include "InstanceScript.h"
+#include "Player.h"
+#include "ObjectAccessor.h"
#include "grim_batol.h"
enum TwilightBeguiler
diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.h b/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.h
index 1013a5cd05..dee1d7bc61 100644
--- a/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.h
+++ b/src/server/scripts/EasternKingdoms/GrimBatol/grim_batol.h
@@ -18,6 +18,8 @@
#ifndef GRIM_BATOL_H_
#define GRIM_BATOL_H_
+#include "CreatureAIImpl.h"
+
#define GBScriptName "instance_grim_batol"
#define DataHeader "GB"
diff --git a/src/server/scripts/EasternKingdoms/GrimBatol/instance_grim_batol.cpp b/src/server/scripts/EasternKingdoms/GrimBatol/instance_grim_batol.cpp
index da7d5c96ca..64fab570f3 100644
--- a/src/server/scripts/EasternKingdoms/GrimBatol/instance_grim_batol.cpp
+++ b/src/server/scripts/EasternKingdoms/GrimBatol/instance_grim_batol.cpp
@@ -18,6 +18,12 @@
#include "ScriptMgr.h"
#include "InstanceScript.h"
#include "grim_batol.h"
+#include "Creature.h"
+#include "EventMap.h"
+#include "Map.h"
+#include "ScriptMgr.h"
+#include "MotionMaster.h"
+#include "CreatureAI.h"
ObjectData const creatureData[] =
{
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
index bc93340219..f24e027e3c 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_apothecary_hummel.cpp
@@ -28,6 +28,7 @@
#include "shadowfang_keep.h"
#include "SpellAuraEffects.h"
#include "SpellScript.h"
+#include "CreatureAIImpl.h"
enum ApothecarySpells
{
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp
index f02c680197..1ca178af0d 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_ashbury.cpp
@@ -23,6 +23,8 @@
#include "SpellAuras.h"
#include "SpellAuraEffects.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "Map.h"
enum Spells
{
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
index 69cf5b0fea..f41d4a8d21 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_baron_silverlaine.cpp
@@ -23,6 +23,9 @@
#include "SpellAuras.h"
#include "SpellAuraEffects.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "CreatureAIImpl.h"
+#include "ObjectAccessor.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
index 9dd1001cb9..d9373a10e1 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_commander_springvale.cpp
@@ -23,6 +23,10 @@
#include "SpellAuras.h"
#include "SpellAuraEffects.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "CreatureAIImpl.h"
+#include "Map.h"
enum Spells
{
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp
index a12cc31c62..6e06a026c0 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_godfrey.cpp
@@ -24,6 +24,8 @@
#include "SpellAuras.h"
#include "SpellAuraEffects.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp
index 5de2c1fa7b..d196c0c388 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/boss_lord_walden.cpp
@@ -23,6 +23,8 @@
#include "SpellAuras.h"
#include "SpellAuraEffects.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
index 68f5350c2b..935801c1a0 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp
@@ -22,6 +22,10 @@
#include "Player.h"
#include "InstanceScript.h"
#include "shadowfang_keep.h"
+#include "Map.h"
+#include "Creature.h"
+#include "EventMap.h"
+#include "CreatureAI.h"
ObjectData const creatureData[] =
{
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
index 9fa7a56a03..966c3dfc4f 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.cpp
@@ -25,6 +25,7 @@
#include "SpellAuraEffects.h"
#include "ScriptedEscortAI.h"
#include "Player.h"
+#include "InstanceScript.h"
enum Events
{
diff --git a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
index 2f7f86ef9b..e4a1838a41 100644
--- a/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
+++ b/src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h
@@ -18,6 +18,7 @@
#ifndef DEF_SHADOWFANG_H
#define DEF_SHADOWFANG_H
+#include "CreatureAIImpl.h"
#include "SpellScript.h"
#define DataHeader "SK"
diff --git a/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h b/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h
index ead9875524..534771dae6 100644
--- a/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h
+++ b/src/server/scripts/EasternKingdoms/TheStockade/the_stockade.h
@@ -19,6 +19,7 @@
#define THE_STOCKADE_H
#include "CreatureAIImpl.h"
+#include "MotionMaster.h"
#define StormwindStockadeScriptName "instance_the_stockade"
#define DataHeader "SS"
diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp
index fe6e1c6fea..49dd8b35e6 100644
--- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp
+++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_commander_ulthok.cpp
@@ -23,6 +23,7 @@
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
#include "Player.h"
+#include "InstanceScript.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp
index ac39098f86..f822a9c970 100644
--- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp
+++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_lady_nazjar.cpp
@@ -25,6 +25,8 @@
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_ozumat.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_ozumat.cpp
index 676561eee1..e5aeb22692 100644
--- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_ozumat.cpp
+++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/boss_ozumat.cpp
@@ -27,6 +27,11 @@
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
#include "Vehicle.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "Player.h"
+#include "ObjectAccessor.h"
+#include "Map.h"
enum Texts
{
diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/instance_throne_of_the_tides.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/instance_throne_of_the_tides.cpp
index 788d6bd795..21eed57807 100644
--- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/instance_throne_of_the_tides.cpp
+++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/instance_throne_of_the_tides.cpp
@@ -17,11 +17,16 @@
#include "ScriptMgr.h"
#include "throne_of_the_tides.h"
+#include "Creature.h"
#include "CreatureAI.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Vehicle.h"
#include "MoveSpline.h"
+#include "MotionMaster.h"
+#include "Map.h"
+#include "Player.h"
+#include "TemporarySummon.h"
ObjectData const creatureData[] =
{
diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp
index c916f7b858..866a9e60b0 100644
--- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp
+++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.cpp
@@ -19,8 +19,12 @@
#include "AreaBoundary.h"
#include "GameObjectAI.h"
#include "GridNotifiers.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
#include "MoveSplineInit.h"
+#include "ObjectAccessor.h"
#include "ScriptedCreature.h"
+#include "ScriptMgr.h"
#include "SpellScript.h"
#include "Transport.h"
#include "Vehicle.h"
diff --git a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.h b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.h
index df3e2b074d..d7381bf820 100644
--- a/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.h
+++ b/src/server/scripts/EasternKingdoms/ThroneOfTheTides/throne_of_the_tides.h
@@ -19,6 +19,7 @@
#define THRONEOFTHETIDES_H_
#include "CreatureAIImpl.h"
+#include "Position.h"
#define TotTScriptName "instance_throne_of_the_tides"
#define DataHeader "TOTT"
diff --git a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
index bb591954ee..61a9977829 100644
--- a/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulAman/instance_zulaman.cpp
@@ -20,6 +20,7 @@
#include "InstanceScript.h"
#include "Map.h"
#include "ScriptedCreature.h"
+#include "MotionMaster.h"
#include "zulaman.h"
ObjectData const creatureData[] =
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp
index 844d836e6d..f8de77cdc5 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priest_venoxis.cpp
@@ -23,6 +23,11 @@
#include "Spell.h"
#include "SpellAuraEffects.h"
#include "SpellScript.h"
+#include "TemporarySummon.h"
+#include "MotionMaster.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "Map.h"
enum Yells
{
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp
index 406a7a0dd1..28d36e79c2 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_high_priestess_kilnara.cpp
@@ -20,6 +20,9 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "Spell.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "SpellScript.h"
#include "zulgurub.h"
enum Yells
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
index e8e2bc8670..34c3a9ffec 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_jindo_the_godbreaker.cpp
@@ -19,6 +19,14 @@
#include "PhasingHandler.h"
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "Map.h"
+#include "ObjectAccessor.h"
+#include "SpellScript.h"
+#include "TemporarySummon.h"
+#include "Unit.h"
+#include "SpellInfo.h"
#include "zulgurub.h"
enum Yells
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp
index ca1fc8eafc..3119786c99 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/boss_zanzil.cpp
@@ -19,6 +19,11 @@
#include "ScriptedCreature.h"
#include "Spell.h"
#include "DynamicObject.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "SpellInfo.h"
+#include "MotionMaster.h"
+#include "SpellScript.h"
#include "zulgurub.h"
enum Yells
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
index 2f1efbcb5e..baad8be83f 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/instance_zulgurub.cpp
@@ -20,6 +20,8 @@
#include "Creature.h"
#include "GameObject.h"
#include "InstanceScript.h"
+#include "CreatureAI.h"
+#include "Map.h"
#include "zulgurub.h"
ObjectData const creatureData[] =
diff --git a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp
index 7f7ab7293b..e98119fc55 100644
--- a/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp
+++ b/src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.cpp
@@ -19,6 +19,7 @@
#include "ScriptedCreature.h"
#include "zulgurub.h"
#include "GridNotifiers.h"
+#include "MotionMaster.h"
#include "MoveSplineInit.h"
#include "Spell.h"
#include "SpellAuraEffects.h"
diff --git a/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp b/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp
index fbf734080d..d5696745d8 100644
--- a/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp
+++ b/src/server/scripts/EasternKingdoms/zone_hillsbrad_foothills.cpp
@@ -21,6 +21,7 @@
#include "CombatAI.h"
#include "GridNotifiersImpl.h"
#include "MotionMaster.h"
+#include "ObjectAccessor.h"
#include "Player.h"
#include "PassiveAI.h"
#include "PhasingHandler.h"
@@ -28,6 +29,7 @@
#include "SpellScript.h"
#include "SpellMgr.h"
#include "SpellHistory.h"
+#include "TemporarySummon.h"
#include "Vehicle.h"
enum PlansVsZombies
diff --git a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
index 5c7c9e4868..a20811fff1 100644
--- a/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
+++ b/src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/npc_arthas.cpp
@@ -30,6 +30,7 @@
#include "ScriptedGossip.h"
#include "ScriptMgr.h"
#include "ScriptSystem.h"
+#include "SpellInfo.h"
#include "SpellScript.h"
#include "SplineChainMovementGenerator.h"
#include "TemporarySummon.h"
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp
index 6e1b2624c3..a8616bdc0f 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_ammunae.cpp
@@ -20,6 +20,7 @@
#include "SpellMgr.h"
#include "ScriptedCreature.h"
#include "SpellScript.h"
+#include "InstanceScript.h"
enum Spells
{
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
index e47f2ce07e..891ece86f0 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_earthrager_ptah.cpp
@@ -30,6 +30,8 @@
#include "MoveSplineInit.h"
#include "MoveSpline.h"
#include "Weather.h"
+#include "ObjectAccessor.h"
+#include "MotionMaster.h"
enum Texts
{
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp
index 38905e2340..052a2d8276 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_isiset.cpp
@@ -21,6 +21,7 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "halls_of_origination.h"
+#include "InstanceScript.h"
#include "TemporarySummon.h"
enum Spells
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp
index 9640937f87..45dcd134f5 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_rajh.cpp
@@ -21,6 +21,10 @@
#include "InstanceScript.h"
#include "Spell.h"
#include "SpellScript.h"
+#include "SpellInfo.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
+#include "Map.h"
enum Spells
{
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp
index b7f323a5b3..5bc8a1bb70 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/boss_setesh.cpp
@@ -20,6 +20,9 @@
#include "ScriptMgr.h"
#include "ScriptedCreature.h"
#include "SpellScript.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "SpellInfo.h"
enum Spells
{
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp
index 04bdd9972a..8fb418844b 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.cpp
@@ -17,11 +17,15 @@
#include "ScriptMgr.h"
#include "CreatureGroups.h"
+#include "CreatureAI.h"
#include "GameObject.h"
#include "GameObjectAI.h"
#include "GridNotifiers.h"
#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
#include "PassiveAI.h"
+#include "ScriptedCreature.h"
#include "ScriptedGossip.h"
#include "SpellAuraEffects.h"
#include "SpellScript.h"
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
index 7f35826008..2ba49c9139 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/halls_of_origination.h
@@ -19,6 +19,8 @@
#define HALLS_OF_ORIGINATION_H
#include "CreatureAIImpl.h"
+#include "Position.h"
+#include "Creature.h"
#define DataHeader "HOO"
#define HoOScriptName "instance_halls_of_origination"
diff --git a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
index 14d8b36b28..595105a1c3 100644
--- a/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
+++ b/src/server/scripts/Kalimdor/HallsOfOrigination/instance_halls_of_origination.cpp
@@ -25,6 +25,7 @@
#include "InstanceScript.h"
#include "Map.h"
#include "World.h"
+#include "TemporarySummon.h"
DoorData const doorData[] =
{
diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
index de0c25c21b..71b319180f 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/boss_siamat.cpp
@@ -21,6 +21,8 @@
#include "SpellScript.h"
#include "SpellAuraEffects.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
#include "lost_city_of_the_tolvir.h"
enum Texts
diff --git a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.cpp b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.cpp
index d30f62efd5..c11178b169 100644
--- a/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.cpp
+++ b/src/server/scripts/Kalimdor/LostCityOfTheTolvir/lost_city_of_the_tolvir.cpp
@@ -18,6 +18,8 @@
#include "lost_city_of_the_tolvir.h"
#include "ScriptedCreature.h"
#include "SpellAuraEffects.h"
+#include "ScriptMgr.h"
+#include "ObjectAccessor.h"
enum Texts
{
diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp
index 64cf668f88..77a4612cfc 100644
--- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp
+++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_alakir.cpp
@@ -26,6 +26,11 @@
#include "SpellMgr.h"
#include "Spell.h"
#include "Vehicle.h"
+#include "InstanceScript.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
+#include "TemporarySummon.h"
+#include "Map.h"
enum Spells
{
diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp
index 0a2d5f89d3..a0ea3b449e 100644
--- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp
+++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/boss_conclave_of_wind.cpp
@@ -26,6 +26,9 @@
#include "SpellMgr.h"
#include "Spell.h"
#include "Player.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "MotionMaster.h"
enum Spells
{
diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp
index df03415ef1..953ab24453 100644
--- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp
+++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/instance_throne_of_the_four_winds.cpp
@@ -27,6 +27,9 @@
#include "TemporarySummon.h"
#include "Vehicle.h"
#include "Weather.h"
+#include "Player.h"
+#include "Creature.h"
+#include "Map.h"
ObjectData const creatureData[] =
{
diff --git a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp
index 70254f7e5e..b2f9756ec3 100644
--- a/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp
+++ b/src/server/scripts/Kalimdor/ThroneOfTheFourWinds/throne_of_the_four_winds.cpp
@@ -25,6 +25,9 @@
#include "MoveSplineInit.h"
#include "Player.h"
#include "Vehicle.h"
+#include "InstanceScript.h"
+#include "ObjectAccessor.h"
+#include "MotionMaster.h"
#include "throne_of_the_four_winds.h"
enum Spells
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp
index a5d3785aa1..b5aeec951c 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_altairus.cpp
@@ -25,6 +25,7 @@
#include "SpellInfo.h"
#include "SpellScript.h"
#include "TemporarySummon.h"
+#include "ObjectAccessor.h"
#include "vortex_pinnacle.h"
enum Spells
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
index fd1d12b3b9..be4c859f30 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_asaad.cpp
@@ -18,6 +18,7 @@
#include "ScriptMgr.h"
#include "AreaBoundary.h"
#include "InstanceScript.h"
+#include "Map.h"
#include "MotionMaster.h"
#include "ObjectAccessor.h"
#include "ScriptedCreature.h"
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
index 830a62ecf2..4cbd4f99e8 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/boss_grand_vizier_ertan.cpp
@@ -21,6 +21,10 @@
#include "ScriptedCreature.h"
#include "SpellScript.h"
#include "TemporarySummon.h"
+#include "InstanceScript.h"
+#include "SpellScript.h"
+#include "Unit.h"
+#include "SpellInfo.h"
#include "vortex_pinnacle.h"
enum Spells
diff --git a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
index d9a9bb6202..02af7e203c 100644
--- a/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
+++ b/src/server/scripts/Kalimdor/VortexPinnacle/vortex_pinnacle.cpp
@@ -21,6 +21,7 @@
#include "MotionMaster.h"
#include "MoveSplineInit.h"
#include "PassiveAI.h"
+#include "Player.h"
#include "ScriptedCreature.h"
#include "Spell.h"
#include "SpellAuras.h"
diff --git a/src/server/scripts/Kalimdor/zone_durotar.cpp b/src/server/scripts/Kalimdor/zone_durotar.cpp
index 868eacd367..6715039f70 100644
--- a/src/server/scripts/Kalimdor/zone_durotar.cpp
+++ b/src/server/scripts/Kalimdor/zone_durotar.cpp
@@ -19,6 +19,7 @@
#include "CreatureAIImpl.h"
#include "Player.h"
#include "ScriptedCreature.h"
+#include "SpellInfo.h"
#include "SpellScript.h"
enum VoodooSpells
diff --git a/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp b/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp
index 576f649812..586fc6901a 100644
--- a/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp
+++ b/src/server/scripts/Kalimdor/zone_mount_hyjal.cpp
@@ -25,6 +25,12 @@
#include "PassiveAI.h"
#include "Spell.h"
#include "Vehicle.h"
+#include "Map.h"
+#include "MotionMaster.h"
+#include "ObjectAccessor.h"
+#include "TemporarySummon.h"
+#include "Player.h"
+#include "SpellScript.h"
enum CommonDefines
{
diff --git a/src/server/scripts/Kalimdor/zone_uldum.cpp b/src/server/scripts/Kalimdor/zone_uldum.cpp
index e6df74153c..fcea7fa484 100644
--- a/src/server/scripts/Kalimdor/zone_uldum.cpp
+++ b/src/server/scripts/Kalimdor/zone_uldum.cpp
@@ -20,11 +20,19 @@
#include "SpellAuraEffects.h"
#include "GameObjectData.h"
#include "GameObject.h"
+#include "Map.h"
+#include "MotionMaster.h"
#include "MoveSpline.h"
#include "MoveSplineInit.h"
+#include "ObjectAccessor.h"
#include "PassiveAI.h"
#include "PhasingHandler.h"
+#include "Player.h"
#include "Spell.h"
+#include "SpellInfo.h"
+#include "SpellScript.h"
+#include "TemporarySummon.h"
+#include "Unit.h"
#include "Vehicle.h"
enum UldumIntro
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
index 2bc1bb9f1d..998a32c0a5 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_corborus.cpp
@@ -16,10 +16,14 @@
*/
#include "ScriptMgr.h"
+#include "Player.h"
#include "CreatureGroups.h"
#include "InstanceScript.h"
#include "ScriptedCreature.h"
#include "SpellAuraEffects.h"
+#include "MotionMaster.h"
+#include "SpellScript.h"
+#include "Map.h"
#include "stonecore.h"
enum Spells
diff --git a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
index 0d0e9e8fea..5aa7035144 100644
--- a/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/boss_ozruk.cpp
@@ -23,6 +23,9 @@
#include "SpellScript.h"
#include "TemporarySummon.h"
#include "Vehicle.h"
+#include "InstanceScript.h"
+#include "Map.h"
+#include "ScriptedCreature.h"
enum Spells
{
diff --git a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
index 76f78bc28b..8ddb1ee3d6 100644
--- a/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
+++ b/src/server/scripts/Maelstrom/Stonecore/instance_stonecore.cpp
@@ -17,10 +17,12 @@
#include "ScriptMgr.h"
#include "Creature.h"
+#include "CreatureAI.h"
#include "CreatureGroups.h"
#include "GameObject.h"
#include "InstanceScript.h"
#include "Map.h"
+#include "EventMap.h"
#include "stonecore.h"
#define MAX_ENCOUNTER 4
diff --git a/src/server/scripts/Maelstrom/Stonecore/stonecore.h b/src/server/scripts/Maelstrom/Stonecore/stonecore.h
index bf3a21837f..075cc604e4 100644
--- a/src/server/scripts/Maelstrom/Stonecore/stonecore.h
+++ b/src/server/scripts/Maelstrom/Stonecore/stonecore.h
@@ -19,6 +19,7 @@
#define DEF_STONECORE_H
#include "CreatureAIImpl.h"
+#include "Position.h"
#define SCScriptName "instance_stonecore"
#define DataHeader "SC"
diff --git a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
index 6fa701fdd4..241e8ba362 100644
--- a/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
+++ b/src/server/scripts/Outland/BlackTemple/instance_black_temple.cpp
@@ -22,6 +22,7 @@
#include "CreatureAI.h"
#include "GameObject.h"
#include "InstanceScript.h"
+#include "Map.h"
DoorData const doorData[] =
{
diff --git a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
index fb8323e769..5f1321fb76 100644
--- a/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
+++ b/src/server/scripts/Outland/TempestKeep/arcatraz/instance_arcatraz.cpp
@@ -20,6 +20,7 @@
#include "Creature.h"
#include "GameObject.h"
#include "InstanceScript.h"
+#include "Map.h"
DoorData const doorData[] =
{
diff --git a/src/server/scripts/Pet/pet_dk.cpp b/src/server/scripts/Pet/pet_dk.cpp
index 1761d42346..f9734d9cbb 100644
--- a/src/server/scripts/Pet/pet_dk.cpp
+++ b/src/server/scripts/Pet/pet_dk.cpp
@@ -26,6 +26,7 @@
#include "GridNotifiersImpl.h"
#include "MotionMaster.h"
#include "ScriptedCreature.h"
+#include "SpellScript.h"
enum DeathKnightSpells
{
diff --git a/src/server/scripts/Pet/pet_mage.cpp b/src/server/scripts/Pet/pet_mage.cpp
index ad554c7f4f..04050776ee 100644
--- a/src/server/scripts/Pet/pet_mage.cpp
+++ b/src/server/scripts/Pet/pet_mage.cpp
@@ -27,6 +27,7 @@
#include "MotionMaster.h"
#include "PetAI.h"
#include "ScriptedCreature.h"
+#include "TemporarySummon.h"
enum Spells
{
diff --git a/src/server/scripts/Spells/spell_druid.cpp b/src/server/scripts/Spells/spell_druid.cpp
index 2fab32e6cf..a95cb5e647 100644
--- a/src/server/scripts/Spells/spell_druid.cpp
+++ b/src/server/scripts/Spells/spell_druid.cpp
@@ -30,6 +30,8 @@
#include "SpellMgr.h"
#include "SpellScript.h"
#include "DynamicObject.h"
+#include "Creature.h"
+#include "TemporarySummon.h"
enum DruidSpells
{
diff --git a/src/server/scripts/Spells/spell_generic.cpp b/src/server/scripts/Spells/spell_generic.cpp
index 57d3502679..994db554b2 100644
--- a/src/server/scripts/Spells/spell_generic.cpp
+++ b/src/server/scripts/Spells/spell_generic.cpp
@@ -41,6 +41,7 @@
#include "SpellMgr.h"
#include "SpellScript.h"
#include "Vehicle.h"
+#include "CreatureAIImpl.h"
class spell_gen_absorb0_hitlimit1 : public SpellScriptLoader
{
diff --git a/src/server/scripts/Spells/spell_holiday.cpp b/src/server/scripts/Spells/spell_holiday.cpp
index 4ab3d40150..b33fa7ec21 100644
--- a/src/server/scripts/Spells/spell_holiday.cpp
+++ b/src/server/scripts/Spells/spell_holiday.cpp
@@ -29,6 +29,7 @@
#include "ScriptedCreature.h"
#include "SpellAuraEffects.h"
#include "SpellScript.h"
+#include "TemporarySummon.h"
#include "Vehicle.h"
#include "World.h"
diff --git a/src/server/scripts/Spells/spell_mage.cpp b/src/server/scripts/Spells/spell_mage.cpp
index 53d64437b4..e47e86b58b 100644
--- a/src/server/scripts/Spells/spell_mage.cpp
+++ b/src/server/scripts/Spells/spell_mage.cpp
@@ -23,6 +23,7 @@
#include "ScriptMgr.h"
#include "GridNotifiers.h"
+#include "ObjectAccessor.h"
#include "Pet.h"
#include "Player.h"
#include "SpellAuraEffects.h"
diff --git a/src/server/scripts/Spells/spell_paladin.cpp b/src/server/scripts/Spells/spell_paladin.cpp
index 1071cd1efc..e96c010534 100644
--- a/src/server/scripts/Spells/spell_paladin.cpp
+++ b/src/server/scripts/Spells/spell_paladin.cpp
@@ -29,6 +29,7 @@
#include "SpellHistory.h"
#include "SpellMgr.h"
#include "Spell.h"
+#include "TemporarySummon.h"
enum PaladinSpells
{
diff --git a/src/server/scripts/Spells/spell_priest.cpp b/src/server/scripts/Spells/spell_priest.cpp
index 56ea2fd3f7..5dfe916b17 100644
--- a/src/server/scripts/Spells/spell_priest.cpp
+++ b/src/server/scripts/Spells/spell_priest.cpp
@@ -27,6 +27,7 @@
#include "SpellAuraEffects.h"
#include "SpellMgr.h"
#include "SpellScript.h"
+#include "TemporarySummon.h"
enum PriestSpells
{
diff --git a/src/server/scripts/World/world_map_scripts.cpp b/src/server/scripts/World/world_map_scripts.cpp
index fcaa4b6afe..3c172fafe5 100644
--- a/src/server/scripts/World/world_map_scripts.cpp
+++ b/src/server/scripts/World/world_map_scripts.cpp
@@ -24,6 +24,7 @@
#include "Unit.h"
#include "Weather.h"
#include "ObjectMgr.h"
+#include "SpellInfo.h"
enum DeeprunTram
{