chore(PCH): remove "ScriptPCH.h" from cpp scripts (#1423)

remove "ScriptPCH.h" from cpp scripts as it is intended to be used as precompiled header for the build process only

src/server/scripts/Commands/cs_spy.cpp

@@ -1,4 +1,6 @@
-#include "ScriptPCH.h"
+#include "Player.h"
+#include "ScriptMgr.h"
+#include "Chat.h"
 #include "Channel.h"
 #include "Language.h"
 #include "Group.h"

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/blackrock_depths.h

@@ -7,8 +7,6 @@
 #ifndef DEF_BRD_H
 #define DEF_BRD_H
 
-#include "ScriptPCH.h"
-
 enum FactionIds
 {
     FACTION_NEUTRAL            = 734,

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/blackrock_spire.h

@@ -7,8 +7,6 @@
 #ifndef DEF_BLACKROCK_SPIRE_H
 #define DEF_BLACKROCK_SPIRE_H
 
-#include "ScriptPCH.h"
-
 uint32 const EncounterCount         = 23;
 
 #define BRSScriptName "instance_blackrock_spire"

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/blackwing_lair.h

@@ -7,8 +7,6 @@
 #ifndef DEF_BLACKWING_LAIR_H
 #define DEF_BLACKWING_LAIR_H
 
-#include "ScriptPCH.h"
-
 uint32 const EncounterCount     = 8;
 
 #define BRLScriptName "instance_blackwing_lair"

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/molten_core.h

@@ -7,8 +7,6 @@
 #ifndef DEF_MOLTEN_CORE_H
 #define DEF_MOLTEN_CORE_H
 
-#include "ScriptPCH.h"
-
 enum Encounters
 {
     BOSS_LUCIFRON                   = 0,

src/server/scripts/EasternKingdoms/Deadmines/deadmines.h

@@ -5,8 +5,6 @@
 #ifndef DEF_DEADMINES_H
 #define DEF_DEADMINES_H
 
-#include "ScriptPCH.h"
-
 enum DataTypes
 {
     TYPE_RHAHK_ZOR              = 0,

src/server/scripts/EasternKingdoms/Gnomeregan/instance_gnomeregan.cpp

@@ -2,8 +2,9 @@
  * Originally written by Xinef - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 */
 
+#include "Player.h"
+#include "SpellScript.h"
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "InstanceScript.h"
 #include "PassiveAI.h"
 

src/server/scripts/EasternKingdoms/Karazhan/boss_nightbane.cpp

@@ -11,8 +11,8 @@ SDComment: SDComment: Timers may incorrect
 SDCategory: Karazhan
 EndScriptData */
 
+#include "Player.h"
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "karazhan.h"
 

src/server/scripts/EasternKingdoms/MagistersTerrace/boss_felblood_kaelthas.cpp

@@ -3,7 +3,6 @@
 */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "magisters_terrace.h"
 #include "WorldPacket.h"

src/server/scripts/EasternKingdoms/MagistersTerrace/instance_magisters_terrace.cpp

@@ -3,7 +3,6 @@
 */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "InstanceScript.h"
 #include "magisters_terrace.h"
 

src/server/scripts/EasternKingdoms/MagistersTerrace/magisters_terrace.h

@@ -5,7 +5,9 @@
 #ifndef DEF_MAGISTERS_TERRACE_H
 #define DEF_MAGISTERS_TERRACE_H
 
-#include "ScriptPCH.h"
+#include "Player.h"
+#include "CreatureAI.h"
+#include "SpellScript.h"
 
 enum MTData
 {

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter1.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "Vehicle.h"
@@ -17,6 +16,7 @@
 #include "SpellInfo.h"
 #include "CreatureTextMgr.h"
 #include "PetAI.h"
+#include "SpellScript.h"
 
 // Ours
 enum eyeOfAcherus

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter2.cpp

@@ -5,12 +5,13 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "Player.h"
 #include "SpellInfo.h"
 #include "CreatureTextMgr.h"
+#include "CombatAI.h"
+#include "SpellScript.h"
 
 //How to win friends and influence enemies
 // texts signed for creature 28939 but used for 28939, 28940, 28610

src/server/scripts/EasternKingdoms/ScarletEnclave/chapter5.cpp

@@ -5,11 +5,11 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "ScriptedEscortAI.h"
 #include "Player.h"
+#include "SpellScript.h"
 
 enum LightOfDawnSays
 {

src/server/scripts/EasternKingdoms/Scholomance/scholomance.h

@@ -5,8 +5,6 @@
 #ifndef DEF_SCHOLOMANCE_H
 #define DEF_SCHOLOMANCE_H
 
-#include "ScriptPCH.h"
-
 enum DataTypes
 {
     DATA_KIRTONOS_THE_HERALD            = 0,

src/server/scripts/EasternKingdoms/ShadowfangKeep/instance_shadowfang_keep.cpp

@@ -3,7 +3,6 @@
 */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "InstanceScript.h"
 #include "shadowfang_keep.h"
 #include "TemporarySummon.h"

src/server/scripts/EasternKingdoms/ShadowfangKeep/shadowfang_keep.h

@@ -5,7 +5,8 @@
 #ifndef DEF_SHADOWFANG_H
 #define DEF_SHADOWFANG_H
 
-#include "ScriptPCH.h"
+#include "SpellAuraEffects.h"
+#include "SpellScript.h"
 
 enum DataTypes
 {

src/server/scripts/EasternKingdoms/Stratholme/stratholme.h

@@ -5,7 +5,7 @@
 #ifndef DEF_STRATHOLME_H
 #define DEF_STRATHOLME_H
 
-#include "ScriptPCH.h"
+#include "SpellAuras.h"
 
 enum DataTypes
 {

src/server/scripts/EasternKingdoms/SunkenTemple/instance_sunken_temple.cpp

@@ -3,11 +3,11 @@
 */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "InstanceScript.h"
 #include "sunken_temple.h"
 #include "Player.h"
 #include "CreatureAI.h"
+#include "SpellScript.h"
 
 class instance_sunken_temple : public InstanceMapScript
 {

src/server/scripts/EasternKingdoms/SunkenTemple/sunken_temple.h

@@ -5,8 +5,6 @@
 #ifndef DEF_SUNKEN_TEMPLE_H
 #define DEF_SUNKEN_TEMPLE_H
 
-#include "ScriptPCH.h"
-
 enum DataTypes
 {
     DATA_STATUES                = 10,

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_brutallus.cpp

@@ -3,7 +3,6 @@
 */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "sunwell_plateau.h"
 

src/server/scripts/EasternKingdoms/SunwellPlateau/boss_eredar_twins.cpp

@@ -3,7 +3,6 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "sunwell_plateau.h"
 #include "SpellInfo.h"

src/server/scripts/EasternKingdoms/SunwellPlateau/sunwell_plateau.h

@@ -5,7 +5,11 @@
 #ifndef SUNWELL_PLATEAU_H
 #define SUNWELL_PLATEAU_H
 
-#include "ScriptPCH.h"
+#include "Player.h"
+#include "SpellScript.h"
+#include "PassiveAI.h"
+#include "SpellAuraEffects.h"
+#include "CreatureAIImpl.h"
 
 enum DataTypes
 {

src/server/scripts/EasternKingdoms/Uldaman/instance_uldaman.cpp

@@ -3,8 +3,9 @@
 */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "InstanceScript.h"
+#include "SpellScript.h"
+#include "CreatureAI.h"
 #include "uldaman.h"
 
 enum Spells

src/server/scripts/EasternKingdoms/Uldaman/uldaman.h

@@ -5,8 +5,6 @@
 #ifndef DEF_ULDAMAN_H
 #define DEF_ULDAMAN_H
 
-#include "ScriptPCH.h"
-
 enum DataTypes
 {
     DATA_IRONAYA_DOORS                  = 0,

src/server/scripts/EasternKingdoms/ZulAman/zulaman.h

@@ -7,8 +7,6 @@
 #ifndef DEF_ZULAMAN_H
 #define DEF_ZULAMAN_H
 
-#include "ScriptPCH.h"
-
 enum DataTypes
 {
     DATA_GONGEVENT                      = 0,

src/server/scripts/EasternKingdoms/ZulGurub/zulgurub.h

@@ -7,8 +7,6 @@
 #ifndef DEF_ZULGURUB_H
 #define DEF_ZULGURUB_H
 
-#include "ScriptPCH.h"
-
 uint32 const EncounterCount = 13;
 
 #define ZGScriptName "instance_zulgurub"

src/server/scripts/EasternKingdoms/zone_eastern_plaguelands.cpp

@@ -19,11 +19,12 @@ npc_tirion_fordring
 EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "Player.h"
 #include "WorldSession.h"
+#include "PassiveAI.h"
+#include "SpellInfo.h"
 
 // Ours
 

src/server/scripts/EasternKingdoms/zone_isle_of_queldanas.cpp

@@ -17,12 +17,12 @@ npc_greengill_slave
 EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "Player.h"
 #include "Pet.h"
 #include "SpellInfo.h"
 #include "PassiveAI.h"
+#include "SpellScript.h"
 
 /*###### OUR: ######*/
 

src/server/scripts/Events/brewfest.cpp

@@ -1,7 +1,6 @@
 // Scripted by Xinef
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SpellAuras.h"
@@ -11,6 +10,8 @@
 #include "GameEventMgr.h"
 #include "Group.h"
 #include "LFGMgr.h"
+#include "PassiveAI.h"
+#include "CellImpl.h"
 
 ///////////////////////////////////////
 ////// GOS

src/server/scripts/Events/love_in_air.cpp

@@ -1,7 +1,6 @@
 // Scripted by Xinef
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
@@ -10,6 +9,7 @@
 #include "SpellScript.h"
 #include "LFGMgr.h"
 #include "Group.h"
+#include "PassiveAI.h"
 
 ///////////////////////////////////////
 ////// GOS

src/server/scripts/Events/pilgrims_bounty.cpp

@@ -1,13 +1,13 @@
 // Scripted by Xinef
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "SpellAuraEffects.h"
 #include "CombatAI.h"
 #include "SpellScript.h"
 #include "Player.h"
 #include "Vehicle.h"
+#include "PassiveAI.h"
 
 ///////////////////////////////////////
 ////// TABLE EVENT

src/server/scripts/Kalimdor/BlackfathomDeeps/blackfathom_deeps.h

@@ -5,8 +5,6 @@
 #ifndef BFD_H_
 #define BFD_H_
 
-#include "ScriptPCH.h"
-
 enum Data
 {
     TYPE_GELIHAST               = 0,

src/server/scripts/Kalimdor/CavernsOfTime/BattleForMountHyjal/hyjal.h

@@ -7,7 +7,7 @@
 #ifndef DEF_HYJAL_H
 #define DEF_HYJAL_H
 
-#include "ScriptPCH.h"
+#include "GridNotifiers.h"
 
 #define ERROR_INST_DATA     "TSCR: Instance data not set properly for Mount Hyjal. Encounters will be buggy."
 

src/server/scripts/Kalimdor/CavernsOfTime/CullingOfStratholme/culling_of_stratholme.h

@@ -5,8 +5,6 @@
 #ifndef DEF_CULLING_OF_STRATHOLME_H
 #define DEF_CULLING_OF_STRATHOLME_H
 
-#include "ScriptPCH.h"
-
 enum Data
 {
     DATA_ARTHAS_EVENT,

src/server/scripts/Kalimdor/CavernsOfTime/EscapeFromDurnholdeKeep/old_hillsbrad.h

@@ -5,8 +5,6 @@
 #ifndef DEF_OLD_HILLSBRAD_H
 #define DEF_OLD_HILLSBRAD_H
 
-#include "ScriptPCH.h"
-
 enum DataIds
 {
     DATA_ESCORT_PROGRESS    = 0,

src/server/scripts/Kalimdor/CavernsOfTime/TheBlackMorass/the_black_morass.h

@@ -5,7 +5,8 @@
 #ifndef DEF_THEBLACKMORASS_H
 #define DEF_THEBLACKMORASS_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
+#include "PassiveAI.h"
 
 enum DataTypes
 {

src/server/scripts/Kalimdor/DireMaul/dire_maul.h

@@ -5,7 +5,7 @@
 #ifndef DEF_DIRE_MAUL_H
 #define DEF_DIRE_MAUL_H
 
-#include "ScriptPCH.h"
+#include "UnitAI.h"
 
 enum DataTypes
 {

src/server/scripts/Kalimdor/Maraudon/maraudon.h

@@ -5,8 +5,6 @@
 #ifndef DEF_MARAUDON_H
 #define DEF_MARAUDON_H
 
-#include "ScriptPCH.h"
-
 enum DataTypes
 {
     TYPE_NOXXION                = 0,

src/server/scripts/Kalimdor/OnyxiasLair/onyxias_lair.h

@@ -5,8 +5,6 @@
 #ifndef DEF_ONYXIAS_LAIR_H
 #define DEF_ONYXIAS_LAIR_H
 
-#include "ScriptPCH.h"
-
 enum eInstanceData
 {
     DATA_ONYXIA                 = 0,

src/server/scripts/Kalimdor/RazorfenDowns/razorfen_downs.h

@@ -5,7 +5,7 @@
 #ifndef DEF_RAZORFEN_DOWNS_H
 #define DEF_RAZORFEN_DOWNS_H
 
-#include "ScriptPCH.h"
+#include "PassiveAI.h"
 
 enum CreatureIds
 {

src/server/scripts/Kalimdor/RuinsOfAhnQiraj/ruins_of_ahnqiraj.h

@@ -7,8 +7,6 @@
 #ifndef DEF_RUINS_OF_AHNQIRAJ_H
 #define DEF_RUINS_OF_AHNQIRAJ_H
 
-#include "ScriptPCH.h"
-
 enum DataTypes
 {
     DATA_KURINNAXX          = 0,

src/server/scripts/Kalimdor/TempleOfAhnQiraj/temple_of_ahnqiraj.h

@@ -7,8 +7,6 @@
 #ifndef DEF_TEMPLE_OF_AHNQIRAJ_H
 #define DEF_TEMPLE_OF_AHNQIRAJ_H
 
-#include "ScriptPCH.h"
-
 enum DataTypes
 {
     DATA_SKERAM             = 1,

src/server/scripts/Kalimdor/WailingCaverns/wailing_caverns.h

@@ -5,7 +5,7 @@
 #ifndef DEF_WAILING_CAVERNS_H
 #define DEF_WAILING_CAVERNS_H
 
-#include "ScriptPCH.h"
+#include "CreatureAI.h"
 
 enum DataTypes
 {

src/server/scripts/Kalimdor/ZulFarrak/zulfarrak.h

@@ -5,7 +5,9 @@
 #ifndef DEF_ZULFARRACK_H
 #define DEF_ZULFARRACK_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
+#include "GridNotifiers.h"
+#include "CellImpl.h"
 
 enum ZulFarrakData
 {

src/server/scripts/Kalimdor/zone_silithus.cpp

@@ -17,12 +17,13 @@ quest_a_pawn_on_the_eternal_pawn
 EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "Group.h"
 #include "Player.h"
 #include "AccountMgr.h"
+#include "SpellInfo.h"
+#include "Spell.h"
 
 /*###
 ## npcs_rutgar_and_frankal

src/server/scripts/Northrend/AzjolNerub/AzjolNerub/azjol_nerub.h

@@ -5,7 +5,9 @@
 #ifndef DEF_AZJOL_NERUB_H
 #define DEF_AZJOL_NERUB_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
+#include "SpellAuras.h"
+#include "SpellAuraEffects.h"
 
 enum ANData
 {

src/server/scripts/Northrend/AzjolNerub/ahnkahet/ahnkahet.h

@@ -2,8 +2,6 @@
 #ifndef DEF_AHNKAHET_H
 #define DEF_AHNKAHET_H
 
-#include "ScriptPCH.h"
-
 #define MAX_ENCOUNTER           5
 enum Data64
 {

src/server/scripts/Northrend/ChamberOfAspects/ObsidianSanctum/obsidian_sanctum.h

@@ -5,8 +5,6 @@
 #ifndef DEF_OBSIDIAN_SANCTUM_H
 #define DEF_OBSIDIAN_SANCTUM_H
 
-#include "ScriptPCH.h"
-
 enum Data
 {
     // Encounter

src/server/scripts/Northrend/ChamberOfAspects/RubySanctum/ruby_sanctum.h

@@ -5,13 +5,13 @@
 #ifndef RUBY_SANCTUM_H_
 #define RUBY_SANCTUM_H_
 
-#include "ScriptPCH.h"
-
+#include "Player.h"
 #include "SpellScript.h"
 #include "Map.h"
 #include "Creature.h"
 #include "GameObjectAI.h"
-
+#include "PassiveAI.h"
+#include "Opcodes.h"
 
 enum DataTypes
 {

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheChampion/trial_of_the_champion.h

@@ -5,7 +5,7 @@
 #ifndef DEF_TOC_H
 #define DEF_TOC_H
 
-#include "ScriptPCH.h"
+#include "CombatAI.h"
 
 enum eData
 {

src/server/scripts/Northrend/CrusadersColiseum/TrialOfTheCrusader/trial_of_the_crusader.h

@@ -5,7 +5,8 @@
 #ifndef DEF_CRUSADER_H
 #define DEF_CRUSADER_H
 
-#include "ScriptPCH.h"
+#include "GridNotifiers.h"
+#include "SpellAuraEffects.h"
 
 enum DataTypes
 {

src/server/scripts/Northrend/DraktharonKeep/drak_tharon_keep.h

@@ -5,7 +5,8 @@
 #ifndef DEF_DRAK_THARON_H
 #define DEF_DRAK_THARON_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
+#include "SpellAuraEffects.h"
 
 enum Data
 {

src/server/scripts/Northrend/FrozenHalls/ForgeOfSouls/forge_of_souls.h

@@ -5,7 +5,7 @@
 #ifndef DEF_FORGE_OF_SOULS_H
 #define DEF_FORGE_OF_SOULS_H
 
-#include "ScriptPCH.h"
+#include "GridNotifiers.h"
 
 enum Data
 {

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_falric.cpp

@@ -2,7 +2,6 @@
  * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 */
 
-#include "ScriptPCH.h"
 #include "halls_of_reflection.h"
 
 enum Yells

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/boss_marwyn.cpp

@@ -2,7 +2,6 @@
  * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 */
 
-#include "ScriptPCH.h"
 #include "halls_of_reflection.h"
 
 enum Yells

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.cpp

@@ -2,7 +2,6 @@
  * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 */
 
-#include "ScriptPCH.h"
 #include "halls_of_reflection.h"
 #include "MotionMaster.h"
 

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/halls_of_reflection.h

@@ -5,7 +5,14 @@
 #ifndef DEF_HALLS_OF_REFLECTION_H
 #define DEF_HALLS_OF_REFLECTION_H
 
-#include "ScriptPCH.h"
+#include "Player.h"
+#include "SpellAuras.h"
+#include "SpellAuraEffects.h"
+#include "ScriptedCreature.h"
+#include "PassiveAI.h"
+#include "ScriptedGossip.h"
+#include "SpellScript.h"
+#include "ScriptMgr.h"
 
 enum Data
 {

src/server/scripts/Northrend/FrozenHalls/HallsOfReflection/instance_halls_of_reflection.cpp

@@ -2,7 +2,6 @@
  * Originally written by Pussywizard - Copyright (C) 2016+ AzerothCore <www.azerothcore.org>, released under GNU AGPL v3 license: https://github.com/azerothcore/azerothcore-wotlk/blob/master/LICENSE-AGPL3
 */
 
-#include "ScriptPCH.h"
 #include "halls_of_reflection.h"
 #include "Transport.h"
 #include "MapManager.h"

src/server/scripts/Northrend/FrozenHalls/PitOfSaron/pit_of_saron.h

@@ -5,7 +5,7 @@
 #ifndef DEF_PIT_OF_SARON_H
 #define DEF_PIT_OF_SARON_H
 
-#include "ScriptPCH.h"
+#include "Chat.h"
 
 enum DataTypes
 {

src/server/scripts/Northrend/Gundrak/gundrak.h

@@ -5,7 +5,7 @@
 #ifndef DEF_GUNDRAK_H
 #define DEF_GUNDRAK_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
 
 enum Data
 {

src/server/scripts/Northrend/IcecrownCitadel/icecrown_citadel.h

@@ -5,11 +5,18 @@
 #ifndef ICECROWN_CITADEL_H_
 #define ICECROWN_CITADEL_H_
 
-#include "ScriptPCH.h"
+#include "Player.h"
+#include "Chat.h"
+#include "SpellAuras.h"
 #include "SpellScript.h"
 #include "Map.h"
 #include "Creature.h"
 #include "SpellMgr.h"
+#include "PassiveAI.h"
+#include "SpellAuraEffects.h"
+#include "InstanceScript.h"
+#include "ScriptedGossip.h"
+#include "ScriptedCreature.h"
 
 #define ICCScriptName "instance_icecrown_citadel"
 

src/server/scripts/Northrend/Naxxramas/naxxramas.h

@@ -5,7 +5,7 @@
 #ifndef DEF_NAXXRAMAS_H
 #define DEF_NAXXRAMAS_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
 
 enum Encouters
 {

src/server/scripts/Northrend/Nexus/EyeOfEternity/eye_of_eternity.h

@@ -5,7 +5,7 @@
 #ifndef DEF_EYE_OF_ETERNITY_H
 #define DEF_EYE_OF_ETERNITY_H
 
-#include "ScriptPCH.h"
+#include "Chat.h"
 
 enum Objects
 {

src/server/scripts/Northrend/Nexus/Nexus/nexus.h

@@ -5,7 +5,12 @@
 #ifndef DEF_NEXUS_H
 #define DEF_NEXUS_H
 
-#include "ScriptPCH.h"
+#include "Player.h"
+#include "SpellScript.h"
+#include "PassiveAI.h"
+#include "SpellAuras.h"
+#include "GridNotifiers.h"
+#include "GameEventMgr.h"
 
 enum eTypes
 {

src/server/scripts/Northrend/Nexus/Oculus/oculus.h

@@ -5,7 +5,9 @@
 #ifndef DEF_OCULUS_H
 #define DEF_OCULUS_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
+#include "SpellAuras.h"
+#include "SpellAuraEffects.h"
 
 enum Data
 {

src/server/scripts/Northrend/Ulduar/HallsOfLightning/halls_of_lightning.h

@@ -5,8 +5,6 @@
 #ifndef DEF_HALLS_OF_LIGHTNING_H
 #define DEF_HALLS_OF_LIGHTNING_H
 
-#include "ScriptPCH.h"
-
 enum HoLEvents
 {
     TYPE_BJARNGRIM          = 0,

src/server/scripts/Northrend/Ulduar/HallsOfStone/halls_of_stone.h

@@ -5,8 +5,6 @@
 #ifndef DEF_HALLS_OF_STONE_H
 #define DEF_HALLS_OF_STONE_H
 
-#include "ScriptPCH.h"
-
 enum Encounter
 {
     BOSS_KRYSTALLUS             = 0,

src/server/scripts/Northrend/Ulduar/Ulduar/ulduar.h

@@ -5,7 +5,10 @@
 #ifndef DEF_ULDUAR_H
 #define DEF_ULDUAR_H
 
-#include "ScriptPCH.h"
+#include "Chat.h"
+#include "GridNotifiers.h"
+#include "GridNotifiersImpl.h"
+#include "CellImpl.h"
 
 enum UlduarEncounters
 {

src/server/scripts/Northrend/UtgardeKeep/UtgardeKeep/utgarde_keep.h

@@ -5,7 +5,7 @@
 #ifndef DEF_UTGARDE_KEEP_H
 #define DEF_UTGARDE_KEEP_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
 
 enum eData
 {

src/server/scripts/Northrend/UtgardeKeep/UtgardePinnacle/utgarde_pinnacle.h

@@ -1,7 +1,7 @@
 #ifndef DEF_PINNACLE_H
 #define DEF_PINNACLE_H
 
-#include "ScriptPCH.h"
+#include "Opcodes.h"
 
 enum Data
 {

src/server/scripts/Northrend/VaultOfArchavon/vault_of_archavon.h

@@ -7,8 +7,6 @@
 #ifndef DEF_ARCHAVON_H
 #define DEF_ARCHAVON_H
 
-#include "ScriptPCH.h"
-
 enum Creatures
 {
     CREATURE_ARCHAVON                           = 31125,

src/server/scripts/Northrend/VioletHold/violet_hold.h

@@ -5,8 +5,6 @@
 #ifndef DEF_VIOLET_HOLD_H
 #define DEF_VIOLET_HOLD_H
 
-#include "ScriptPCH.h"
-
 #define MAX_ENCOUNTER 3
 
 enum Creatures

src/server/scripts/Northrend/zone_borean_tundra.cpp

@@ -23,7 +23,6 @@ npc_nexus_drake_hatchling
 EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "ScriptedEscortAI.h"
@@ -31,6 +30,9 @@ EndContentData */
 #include "Player.h"
 #include "SpellInfo.h"
 #include "WorldSession.h"
+#include "SpellScript.h"
+#include "PassiveAI.h"
+#include "SpellAuras.h"
 
 // Ours
 enum eDrakeHunt

src/server/scripts/Northrend/zone_crystalsong_forest.cpp

@@ -13,12 +13,12 @@ SDCategory: CrystalsongForest
 Script Data End */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "Player.h"
 #include "SmartScriptMgr.h"
 #include "Transport.h"
 #include "Vehicle.h"
+#include "PassiveAI.h"
 
 enum ePreparationsForWar
 {

src/server/scripts/Northrend/zone_dragonblight.cpp

@@ -15,7 +15,6 @@ EndScriptData */
 EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "ScriptedEscortAI.h"
@@ -23,6 +22,11 @@ EndContentData */
 #include "Player.h"
 #include "Vehicle.h"
 #include "CreatureTextMgr.h"
+#include "PassiveAI.h"
+#include "CombatAI.h"
+#include "SpellAuras.h"
+#include "Chat.h"
+#include "CellImpl.h"
 
 // Ours
 /********

src/server/scripts/Northrend/zone_grizzly_hills.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedEscortAI.h"
 #include "Vehicle.h"
@@ -14,6 +13,7 @@
 #include "Pet.h"
 #include "SpellInfo.h"
 #include "CreatureTextMgr.h"
+#include "SpellScript.h"
 
 // Ours
 enum qRedRocket

src/server/scripts/Northrend/zone_icecrown.cpp

@@ -16,7 +16,6 @@ npc_arete
 EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "SpellAuras.h"
@@ -26,6 +25,8 @@ EndContentData */
 #include "ScriptedEscortAI.h"
 #include "Vehicle.h"
 #include "SmartScriptMgr.h"
+#include "SpellScript.h"
+#include "PassiveAI.h"
 
 // Ours
 enum eBKG

src/server/scripts/Northrend/zone_sholazar_basin.cpp

@@ -18,7 +18,6 @@ avatar_of_freya
 EndContentData */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "ScriptedEscortAI.h"
@@ -27,6 +26,8 @@ EndContentData */
 #include "Player.h"
 #include "Vehicle.h"
 #include "WaypointManager.h"
+#include "PassiveAI.h"
+#include "CombatAI.h"
 
 // Ours
 enum songOfWindandWater

src/server/scripts/Northrend/zone_zuldrak.cpp

@@ -5,7 +5,6 @@
  */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 #include "ScriptedEscortAI.h"
@@ -14,6 +13,7 @@
 #include "PassiveAI.h"
 #include "SpellInfo.h"
 #include "Vehicle.h"
+#include "SpellAuras.h"
 
 // Ours
 enum AlchemistItemRequirements

src/server/scripts/OutdoorPvP/OutdoorPvPEP.h

@@ -7,7 +7,6 @@
 #ifndef OUTDOOR_PVP_EP_
 #define OUTDOOR_PVP_EP_
 
-#include "ScriptPCH.h"
 #include "DBCStructure.h"
 #include "OutdoorPvP.h"
 

src/server/scripts/OutdoorPvP/OutdoorPvPGH.h

@@ -7,7 +7,6 @@
 #ifndef OUTDOOR_PVP_GH_
 #define OUTDOOR_PVP_GH_
 
-#include "ScriptPCH.h"
 #include "OutdoorPvP.h"
 
 enum OutdoorPvPGHenum

src/server/scripts/OutdoorPvP/OutdoorPvPHP.h

@@ -7,7 +7,6 @@
 #ifndef OUTDOOR_PVP_HP_
 #define OUTDOOR_PVP_HP_
 
-#include "ScriptPCH.h"
 #include "OutdoorPvP.h"
 
 #define OutdoorPvPHPBuffZonesNum 6

src/server/scripts/OutdoorPvP/OutdoorPvPNA.h

@@ -7,7 +7,6 @@
 #ifndef OUTDOOR_PVP_NA_
 #define OUTDOOR_PVP_NA_
 
-#include "ScriptPCH.h"
 #include "OutdoorPvP.h"
 
 // TODO: "sometimes" set to neutral

src/server/scripts/OutdoorPvP/OutdoorPvPSI.h

@@ -7,7 +7,6 @@
 #ifndef OUTDOOR_PVP_SI_
 #define OUTDOOR_PVP_SI_
 
-#include "ScriptPCH.h"
 #include "OutdoorPvP.h"
 
 enum OutdoorPvPSISpells

src/server/scripts/OutdoorPvP/OutdoorPvPTF.h

@@ -7,7 +7,6 @@
 #ifndef OUTDOOR_PVP_TF_
 #define OUTDOOR_PVP_TF_
 
-#include "ScriptPCH.h"
 #include "OutdoorPvP.h"
 
 const uint8 OutdoorPvPTFBuffZonesNum = 5;

src/server/scripts/OutdoorPvP/OutdoorPvPZM.h

@@ -7,7 +7,6 @@
 #ifndef OUTDOOR_PVP_ZM_
 #define OUTDOOR_PVP_ZM_
 
-#include "ScriptPCH.h"
 #include "Language.h"
 #include "OutdoorPvP.h"
 

src/server/scripts/Outland/Auchindoun/AuchenaiCrypts/boss_shirrak_the_dead_watcher.cpp

@@ -3,9 +3,10 @@
 */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
 #include "Player.h"
+#include "SpellScript.h"
+#include "SpellAuras.h"
 
 enum eShirrak
 {

src/server/scripts/Outland/Auchindoun/ManaTombs/boss_nexusprince_shaffar.cpp

@@ -4,8 +4,8 @@
 
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
+#include "Player.h"
 
 enum ePrince
 {

src/server/scripts/Outland/Auchindoun/SethekkHalls/sethekk_halls.h

@@ -5,8 +5,6 @@
 #ifndef DEF_SETHEKK_HALLS_H
 #define DEF_SETHEKK_HALLS_H
 
-#include "ScriptPCH.h"
-
 enum eTypes
 {
     DATA_IKISSDOOREVENT = 1,

src/server/scripts/Outland/Auchindoun/ShadowLabyrinth/shadow_labyrinth.h

@@ -5,7 +5,9 @@
 #ifndef DEF_SHADOW_LABYRINTH_H
 #define DEF_SHADOW_LABYRINTH_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
+#include "CreatureAI.h"
+#include "GridNotifiers.h"
 
 enum slData
 {

src/server/scripts/Outland/BlackTemple/black_temple.h

@@ -5,7 +5,12 @@
 #ifndef BLACK_TEMPLE_H_
 #define BLACK_TEMPLE_H_
 
-#include "ScriptPCH.h"
+#include "Player.h"
+#include "ScriptedGossip.h"
+#include "SpellScript.h"
+#include "SpellAuraEffects.h"
+#include "PassiveAI.h"
+#include "GridNotifiers.h"
 
 enum DataTypes
 {

src/server/scripts/Outland/CoilfangReservoir/SerpentShrine/serpent_shrine.h

@@ -5,7 +5,11 @@
 #ifndef DEF_SERPENT_SHRINE_H
 #define DEF_SERPENT_SHRINE_H
 
-#include "ScriptPCH.h"
+#include "Player.h"
+#include "SpellScript.h"
+#include "CreatureAI.h"
+#include "SpellAuraEffects.h"
+#include "GridNotifiers.h"
 
 enum DataTypes
 {

src/server/scripts/Outland/CoilfangReservoir/SteamVault/steam_vault.h

@@ -5,7 +5,7 @@
 #ifndef DEF_STEAM_VAULT_H
 #define DEF_STEAM_VAULT_H
 
-#include "ScriptPCH.h"
+#include "PassiveAI.h"
 
 enum steamVault
 {

src/server/scripts/Outland/CoilfangReservoir/underbog/boss_the_black_stalker.cpp

@@ -12,8 +12,8 @@ SDCategory: Coilfang Resevoir, Underbog
 EndScriptData */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
+#include "SpellScript.h"
 
 enum eBlackStalker
 {

src/server/scripts/Outland/GruulsLair/gruuls_lair.h

@@ -5,7 +5,8 @@
 #ifndef GRUULS_LAIR_H_
 #define GRUULS_LAIR_H_
 
-#include "ScriptPCH.h"
+#include "SpellAuraEffects.h"
+#include "CreatureAI.h"
 
 enum DataTypes
 {

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/blood_furnace.h

@@ -5,7 +5,7 @@
 #ifndef DEF_BLOOD_FURNACE_H
 #define DEF_BLOOD_FURNACE_H
 
-#include "ScriptPCH.h"
+#include "Player.h"
 
 enum bloodFurnace
 {

src/server/scripts/Outland/HellfireCitadel/BloodFurnace/boss_broggok.cpp

@@ -3,8 +3,9 @@
 */
 
 #include "ScriptMgr.h"
-#include "ScriptPCH.h"
 #include "ScriptedCreature.h"
+#include "SpellScript.h"
+#include "SpellAuraEffects.h"
 #include "blood_furnace.h"
 
 enum eEnums

src/server/scripts/Outland/HellfireCitadel/HellfireRamparts/hellfire_ramparts.h

@@ -5,7 +5,7 @@
 #ifndef DEF_RAMPARTS_H
 #define DEF_RAMPARTS_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
 
 enum DataTypes
 {

src/server/scripts/Outland/HellfireCitadel/MagtheridonsLair/magtheridons_lair.h

@@ -5,7 +5,7 @@
 #ifndef DEF_MAGTHERIDONS_LAIR_H
 #define DEF_MAGTHERIDONS_LAIR_H
 
-#include "ScriptPCH.h"
+#include "SpellScript.h"
 
 enum DataTypes
 {