Scripts/EasterKingdoms: moved scripts into their corresponding namespace

src/server/scripts/EasternKingdoms/AlteracValley/alterac_valley.cpp

@@ -18,6 +18,8 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
+namespace AlteracValley
+{
 enum Spells
 {
     SPELL_CHARGE                                  = 22911,
@@ -185,8 +187,10 @@ class npc_av_marshal_or_warmaster : public CreatureScript
             return new npc_av_marshal_or_warmasterAI(creature);
         }
 };
+}
 
 void AddSC_alterac_valley()
 {
+    using namespace AlteracValley;
     new npc_av_marshal_or_warmaster();
 }

src/server/scripts/EasternKingdoms/AlteracValley/boss_balinda.cpp

@@ -19,6 +19,8 @@
 #include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 
+namespace AlteracValley::Balinda
+{
 enum Spells
 {
     SPELL_ARCANE_EXPLOSION                  = 46608,
@@ -190,8 +192,10 @@ public:
         return new boss_balindaAI(creature);
     }
 };
+}
 
 void AddSC_boss_balinda()
 {
+    using namespace AlteracValley::Balinda;
     new boss_balinda;
 }

src/server/scripts/EasternKingdoms/AlteracValley/boss_drekthar.cpp

@@ -18,6 +18,8 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
+namespace AlteracValley::Drekthar
+{
 enum Spells
 {
     SPELL_WHIRLWIND                               = 15589,
@@ -143,8 +145,10 @@ public:
         return new boss_drektharAI(creature);
     }
 };
+}
 
 void AddSC_boss_drekthar()
 {
+    using namespace AlteracValley::Drekthar;
     new boss_drekthar;
 }

src/server/scripts/EasternKingdoms/AlteracValley/boss_galvangar.cpp

@@ -18,6 +18,8 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
+namespace AlteracValley::Galvangar
+{
 enum Spells
 {
     SPELL_CLEAVE                                  = 15284,
@@ -144,8 +146,10 @@ public:
         return new boss_galvangarAI(creature);
     }
 };
+}
 
 void AddSC_boss_galvangar()
 {
+    using namespace AlteracValley::Galvangar;
     new boss_galvangar;
 }

src/server/scripts/EasternKingdoms/AlteracValley/boss_vanndar.cpp

@@ -18,6 +18,8 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
+namespace AlteracValley::Vanndar
+{
 enum Yells
 {
     YELL_AGGRO                                    = 0,
@@ -121,8 +123,10 @@ public:
         return new boss_vanndarAI(creature);
     }
 };
+}
 
 void AddSC_boss_vanndar()
 {
+    using namespace AlteracValley::Vanndar;
     new boss_vanndar;
 }

src/server/scripts/EasternKingdoms/BaradinHold/baradin_hold.h

@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace BaradinHold
+{
 #define DataHeader "BH"
 #define BHScriptName "instance_baradin_hold"
 
@@ -63,5 +65,6 @@ inline AI* GetBaradinHoldAI(T* obj)
 }
 
 #define RegisterBaradinHoldCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetBaradinHoldAI)
+}
 
 #endif

src/server/scripts/EasternKingdoms/BaradinHold/boss_alizabal.cpp

@@ -25,6 +25,8 @@
 #include "SpellInfo.h"
 #include "SpellScript.h"
 
+namespace BaradinHold::Alizabal
+{
 enum Texts
 {
     // Alizabal
@@ -250,9 +252,12 @@ public:
         return true;
     }
 };
+}
 
 void AddSC_boss_alizabal()
 {
+    using namespace BaradinHold;
+    using namespace BaradinHold::Alizabal;
     RegisterBaradinHoldCreatureAI(boss_alizabal);
     RegisterSpellScript(spell_alizabal_seething_hate);
     new at_alizabal_intro();

src/server/scripts/EasternKingdoms/BaradinHold/boss_occuthar.cpp

@@ -25,6 +25,8 @@
 #include "TemporarySummon.h"
 #include "Vehicle.h"
 
+namespace BaradinHold::Occuthar
+{
 enum Spells
 {
     SPELL_SEARING_SHADOWS               = 96913,
@@ -374,9 +376,11 @@ class spell_occuthar_occuthars_destruction : public SpellScriptLoader
             return new spell_occuthar_occuthars_destruction_AuraScript();
         }
 };
+}
 
 void AddSC_boss_occuthar()
 {
+    using namespace BaradinHold::Occuthar;
     new boss_occuthar();
     new npc_eyestalk();
     new spell_occuthar_focused_fire();

src/server/scripts/EasternKingdoms/BaradinHold/boss_pit_lord_argaloth.cpp

@@ -26,6 +26,8 @@
 #include "SpellScript.h"
 #include "SpellAuraEffects.h"
 
+namespace BaradinHold::Argaloth
+{
 enum Texts
 {
     SAY_ANNOUNCE_FEL_FIRESTORM = 0
@@ -292,9 +294,12 @@ class spell_argaloth_fel_firestorm : public SpellScript
         OnObjectAreaTargetSelect.Register(&spell_argaloth_fel_firestorm::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENEMY);
     }
 };
+}
 
 void AddSC_boss_pit_lord_argaloth()
 {
+    using namespace BaradinHold;
+    using namespace BaradinHold::Argaloth;
     RegisterBaradinHoldCreatureAI(boss_pit_lord_argaloth);
     RegisterBaradinHoldCreatureAI(npc_argaloth_fel_flames);
     RegisterSpellAndAuraScriptPair(spell_argaloth_consuming_darkness, spell_argaloth_consuming_darkness_AuraScript);

src/server/scripts/EasternKingdoms/BaradinHold/instance_baradin_hold.cpp

@@ -23,6 +23,8 @@
 #include "InstanceScript.h"
 #include "Map.h"
 
+namespace BaradinHold
+{
 ObjectData const creatureData[] =
 {
     { BOSS_ARGALOTH,    DATA_ARGALOTH },
@@ -75,8 +77,10 @@ class instance_baradin_hold: public InstanceMapScript
             return new instance_baradin_hold_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_baradin_hold()
 {
+    using namespace BaradinHold;
     new instance_baradin_hold();
 }

src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.cpp

@@ -34,6 +34,8 @@
 
 #include <vector>
 
+namespace BastionOfTwilight
+{
 enum PhaseTwist
 {
     // Events
@@ -377,9 +379,11 @@ public:
 private:
     uint32 _dataType;
 };
+}
 
 void AddSC_bastion_of_twilight()
 {
+    using namespace BastionOfTwilight;
     RegisterBastionOfTwilightCreatureAI(npc_bot_invisible_stalker_phase_twist);
     RegisterBastionOfTwilightCreatureAI(npc_bot_chogall);
     RegisterBastionOfTwilightCreatureAI(npc_bot_evolved_drakonaar);

src/server/scripts/EasternKingdoms/BastionOfTwilight/bastion_of_twilight.h

@@ -18,11 +18,13 @@
 #ifndef DEF_BASTION_OF_TWILIGHT_H
 #define DEF_BASTION_OF_TWILIGHT_H
 
+#include "CreatureAIImpl.h"
+
+namespace BastionOfTwilight
+{
 #define DataHeader "BoT"
 #define BoTScriptName "instance_bastion_of_twilight"
 
-#include "CreatureAIImpl.h"
-
 uint32 const EncounterCountNormal = 4;
 uint32 const EncounterCountHeroic = 5;
 
@@ -219,5 +221,6 @@ AI* GetBastionOfTwilightAI(GameObject* go)
 {
     return GetInstanceAI<AI>(go, BoTScriptName);
 }
+}
 
 #endif

src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_ascendant_council.cpp

@@ -36,6 +36,8 @@
 #include "MotionMaster.h"
 #include "Map.h"
 
+namespace BastionOfTwilight::AscendantCouncil
+{
 enum Texts
 {
     // Ascendant Council
@@ -2571,9 +2573,12 @@ class spell_elementium_monstrosity_gravity_crush final : public SpellScript
         OnObjectAreaTargetSelect.Register(&spell_elementium_monstrosity_gravity_crush::FilterTargets, EFFECT_ALL, TARGET_UNIT_SRC_AREA_ENEMY);
     }
 };
+}
 
 void AddSC_boss_ascendant_council()
 {
+    using namespace BastionOfTwilight;
+    using namespace BastionOfTwilight::AscendantCouncil;
     RegisterBastionOfTwilightCreatureAI(boss_ascendant_council_controller);
     RegisterBastionOfTwilightCreatureAI(npc_feludius);
     RegisterBastionOfTwilightCreatureAI(npc_ignacious);

src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_chogall.cpp

@@ -34,6 +34,8 @@
 #include "Vehicle.h"
 #include "bastion_of_twilight.h"
 
+namespace BastionOfTwilight::Chogall
+{
 enum Texts
 {
     // Cho'Gall
@@ -1380,9 +1382,12 @@ class spell_chogall_debilitating_beam final : public AuraScript
         OnEffectPeriodic.Register(&spell_chogall_debilitating_beam::HandlePeriodic, EFFECT_0, SPELL_AURA_PERIODIC_DAMAGE);
     }
 };
+}
 
 void AddSC_boss_chogall()
 {
+    using namespace BastionOfTwilight;
+    using namespace BastionOfTwilight::Chogall;
     RegisterBastionOfTwilightCreatureAI(boss_chogall);
     RegisterBastionOfTwilightCreatureAI(npc_chogall_corrupting_adherent);
     RegisterBastionOfTwilightCreatureAI(npc_chogall_blood_of_the_old_god);

src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_halfus_wyrmbreaker.cpp

@@ -30,6 +30,8 @@
 #include "MotionMaster.h"
 #include "bastion_of_twilight.h"
 
+namespace BastionOfTwilight::HalfusWyrmbreaker
+{
 enum Spells
 {
     // Halfus Wyrmbreaker
@@ -689,9 +691,12 @@ class spell_halfus_dancing_flames final : public SpellScript
         OnObjectAreaTargetSelect.Register(&spell_halfus_dancing_flames::FilterTargets, EFFECT_0, TARGET_UNIT_SRC_AREA_ENTRY);
     }
 };
+}
 
 void AddSC_boss_halfus_wyrmbreaker()
 {
+    using namespace BastionOfTwilight;
+    using namespace BastionOfTwilight::HalfusWyrmbreaker;
     RegisterBastionOfTwilightCreatureAI(boss_halfus_wyrmbreaker);
     RegisterBastionOfTwilightCreatureAI(npc_halfus_proto_behemoth);
     RegisterBastionOfTwilightCreatureAI(npc_halfus_enslaved_dragon);

src/server/scripts/EasternKingdoms/BastionOfTwilight/boss_theralion_and_valiona.cpp

@@ -31,6 +31,8 @@
 #include "Map.h"
 #include "bastion_of_twilight.h"
 
+namespace BastionOfTwilight::TheralionAndValiona
+{
 enum Texts
 {
     // Theralion and Valiona
@@ -1601,9 +1603,12 @@ class spell_theralion_and_valiona_collapsing_twilight_portal final : public Aura
         AfterEffectApply.Register(&spell_theralion_and_valiona_collapsing_twilight_portal::Apply, EFFECT_1, SPELL_AURA_MOD_SCALE, AURA_EFFECT_HANDLE_REAL);
     }
 };
+}
 
 void AddSC_boss_theralion_and_valiona()
 {
+    using namespace BastionOfTwilight;
+    using namespace BastionOfTwilight::TheralionAndValiona;
     RegisterBastionOfTwilightCreatureAI(boss_theralion);
     RegisterBastionOfTwilightCreatureAI(boss_valiona);
     RegisterBastionOfTwilightCreatureAI(npc_theralion_and_valiona_unstable_twilight);

src/server/scripts/EasternKingdoms/BastionOfTwilight/instance_bastion_of_twilight.cpp

@@ -24,6 +24,8 @@
 #include "MotionMaster.h"
 #include "TemporarySummon.h"
 
+namespace BastionOfTwilight
+{
 ObjectData const creatureData[] =
 {
     { BOSS_HALFUS_WYRMBREAKER,          DATA_HALFUS_WYRMBREAKER             },
@@ -488,8 +490,10 @@ class instance_bastion_of_twilight final : public InstanceMapScript
             return new instance_bastion_of_twilight_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_bastion_of_twilight()
 {
+    using namespace BastionOfTwilight;
     new instance_bastion_of_twilight();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.cpp

@@ -29,6 +29,8 @@
 #include "TemporarySummon.h"
 #include "InstanceScript.h"
 
+namespace BlackrockCaverns
+{
 /*#####
 # npc_fire_cyclone
 #####*/
@@ -868,9 +870,11 @@ public:
 private:
     uint32 _questId = 0;
 };
+}
 
 void AddSC_blackrock_caverns()
 {
+    using namespace BlackrockCaverns;
     RegisterBlackrockCavernsCreatureAI(npc_fire_cyclone);
     RegisterBlackrockCavernsCreatureAI(npc_twilight_flame_caller);
     RegisterBlackrockCavernsCreatureAI(npc_twilight_torturer);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/blackrock_caverns.h

@@ -21,6 +21,8 @@
 #include "CreatureAIImpl.h"
 #include "Position.h"
 
+namespace BlackrockCaverns
+{
 #define BCScriptName "instance_blackrock_caverns"
 #define DataHeader "BRC"
 
@@ -109,5 +111,6 @@ inline AI* GetBlackrockCavernsAI(T* obj)
 }
 
 #define RegisterBlackrockCavernsCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetBlackrockCavernsAI)
+}
 
 #endif // BLACKROCKCAVERNS_H_

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_ascendant_lord_obsidius.cpp

@@ -26,6 +26,8 @@
 #include "SpellScript.h"
 #include "Position.h"
 
+namespace BlackrockCaverns::AscendantLordObsidius
+{
 enum Text
 {
     // Ascendant Lord Obsidius
@@ -348,9 +350,12 @@ class spell_obsidius_shadow_of_obsidius : public AuraScript
         OnEffectAbsorb.Register(&spell_obsidius_shadow_of_obsidius::Absorb, EFFECT_0);
     }
 };
+}
 
 void AddSC_boss_ascendant_lord_obsidius()
 {
+    using namespace BlackrockCaverns;
+    using namespace BlackrockCaverns::AscendantLordObsidius;
     RegisterBlackrockCavernsCreatureAI(boss_ascendant_lord_obsidius);
     RegisterSpellScript(spell_obsidius_twitchy);
     RegisterSpellScript(spell_obsidius_transformation);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_beauty.cpp

@@ -23,6 +23,8 @@
 #include "SpellScript.h"
 #include "ObjectAccessor.h"
 
+namespace BlackrockCaverns::Beauty
+{
 enum Sounds
 {
     // Beauty
@@ -248,9 +250,12 @@ class spell_beauty_magma_spit : public AuraScript
         AfterEffectRemove.Register(&spell_beauty_magma_spit::AfterRemove, EFFECT_1, SPELL_AURA_PERIODIC_DAMAGE, AURA_EFFECT_HANDLE_REAL);
     }
 };
+}
 
 void AddSC_boss_beauty()
 {
+    using namespace BlackrockCaverns;
+    using namespace BlackrockCaverns::Beauty;
     RegisterBlackrockCavernsCreatureAI(boss_beauty);
     RegisterBlackrockCavernsCreatureAI(npc_beauty_puppy);
     RegisterSpellScript(spell_beauty_magma_spit);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_corla_herald_of_twilight.cpp

@@ -26,6 +26,8 @@
 #include "InstanceScript.h"
 #include "ObjectAccessor.h"
 
+namespace BlackrockCaverns::CorlaHeraldOfTwilight
+{
 enum Texts
 {
     // Corla
@@ -535,10 +537,12 @@ class achievement_arrested_development : public AchievementCriteriaScript
             return false;
         }
 };
-
+}
 
 void AddSC_boss_corla()
 {
+    using namespace BlackrockCaverns;
+    using namespace BlackrockCaverns::CorlaHeraldOfTwilight;
     RegisterBlackrockCavernsCreatureAI(boss_corla_herald_of_twilight);
     RegisterBlackrockCavernsCreatureAI(npc_corla_twilight_zealot);
     RegisterSpellScript(spell_corla_nether_dragon_essence);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_karsh_steelbender.cpp

@@ -25,6 +25,8 @@
 #include "InstanceScript.h"
 #include "Map.h"
 
+namespace BlackrockCaverns::KarshSteelbender
+{
 enum Text
 {
     // Karsh Steelbender
@@ -318,9 +320,12 @@ class achievement_too_hot_to_handle : public AchievementCriteriaScript
             return false;
         }
 };
+}
 
 void AddSC_boss_karsh_steelbender()
 {
+    using namespace BlackrockCaverns;
+    using namespace BlackrockCaverns::KarshSteelbender;
     RegisterBlackrockCavernsCreatureAI(boss_karsh_steelbender);
     RegisterSpellScript(spell_karsh_quicksilver_armor);
     RegisterSpellAndAuraScriptPair(spell_karsh_superheated_quicksilver_armor, spell_karsh_superheated_quicksilver_armor_AuraScript);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/boss_romogg_bonecrusher.cpp

@@ -25,6 +25,8 @@
 #include "Map.h"
 #include "SpellInfo.h"
 
+namespace BlackrockCaverns::RomoggBonecrusher
+{
 enum Texts
 {
     SAY_AGGRO                   = 0,
@@ -324,9 +326,12 @@ class achievement_crushing_bones_and_cracking_skulls : public AchievementCriteri
             return false;
         }
 };
+}
 
 void AddSC_boss_romogg_bonecrusher()
 {
+    using namespace BlackrockCaverns;
+    using namespace BlackrockCaverns::RomoggBonecrusher;
     RegisterBlackrockCavernsCreatureAI(boss_romogg_bonecrusher);
     RegisterBlackrockCavernsCreatureAI(npc_romogg_chains_of_woe);
     RegisterSpellScript(spell_romogg_quake);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockCaverns/instance_blackrock_caverns.cpp

@@ -22,6 +22,8 @@
 #include "CreatureAI.h"
 #include "Map.h"
 
+namespace BlackrockCaverns
+{
 ObjectData const creatureData[] =
 {
     { BOSS_ROMOGG_BONECRUSHER,          DATA_ROMOGG_BONECRUSHER         },
@@ -141,8 +143,10 @@ class instance_blackrock_caverns : public InstanceMapScript
             return new instance_blackrock_caverns_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_blackrock_caverns()
 {
+    using namespace BlackrockCaverns;
     new instance_blackrock_caverns();
 }

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

@@ -28,6 +28,8 @@
 #include "TemporarySummon.h"
 #include "WorldSession.h"
 
+namespace BlackrockDepths
+{
 //go_shadowforge_brazier
 class go_shadowforge_brazier : public GameObjectScript
 {
@@ -634,9 +636,11 @@ class npc_rocknot : public CreatureScript
             return GetBlackrockDepthsAI<npc_rocknotAI>(creature);
         }
 };
+}
 
 void AddSC_blackrock_depths()
 {
+    using namespace BlackrockDepths;
     new go_shadowforge_brazier();
     new at_ring_of_law();
     new npc_grimstone();

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

@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace BlackrockDepths
+{
 #define BRDScriptName "instance_blackrock_depths"
 #define DataHeader "BRD"
 
@@ -71,5 +73,6 @@ inline AI* GetBlackrockDepthsAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, BRDScriptName);
 }
+}
 
 #endif

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_ambassador_flamelash.cpp

@@ -18,6 +18,8 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
+namespace BlackrockDepths::AmbassadorFlamelash
+{
 enum Spells
 {
     SPELL_FIREBLAST                                        = 15573
@@ -92,8 +94,11 @@ class boss_ambassador_flamelash : public CreatureScript
             return new boss_ambassador_flamelashAI(creature);
         }
 };
+}
 
 void AddSC_boss_ambassador_flamelash()
 {
+    using namespace BlackrockDepths;
+    using namespace BlackrockDepths::AmbassadorFlamelash;
     new boss_ambassador_flamelash();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_coren_direbrew.cpp

@@ -31,6 +31,8 @@
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 
+namespace BlackrockDepths::CorenDirebrew
+{
 enum DirebrewSays
 {
     SAY_INTRO                 = 0,
@@ -669,9 +671,12 @@ class spell_barreled_control_aura : public SpellScriptLoader
             return new spell_barreled_control_aura_AuraScript();
         }
 };
+}
 
 void AddSC_boss_coren_direbrew()
 {
+    using namespace BlackrockDepths;
+    using namespace BlackrockDepths::CorenDirebrew;
     new boss_coren_direbrew();
     new npc_coren_direbrew_sisters();
     new npc_direbrew_minion();

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_emperor_dagran_thaurissan.cpp

@@ -21,6 +21,8 @@
 #include "ObjectAccessor.h"
 #include "ScriptedCreature.h"
 
+namespace BlackrockDepths::EmperorDagranThaurissan
+{
 enum Yells
 {
     SAY_AGGRO                                              = 0,
@@ -123,8 +125,11 @@ class boss_emperor_dagran_thaurissan : public CreatureScript
             return GetBlackrockDepthsAI<boss_draganthaurissanAI>(creature);
         }
 };
+}
 
 void AddSC_boss_draganthaurissan()
 {
+    using namespace BlackrockDepths;
+    using namespace BlackrockDepths::EmperorDagranThaurissan;
     new boss_emperor_dagran_thaurissan();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_general_angerforge.cpp

@@ -18,6 +18,8 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
+namespace BlackrockDepths::GeneralAngerforge
+{
 enum Spells
 {
     SPELL_MIGHTYBLOW                                       = 14099,
@@ -133,8 +135,11 @@ class boss_general_angerforge : public CreatureScript
             return new boss_general_angerforgeAI(creature);
         }
 };
+}
 
 void AddSC_boss_general_angerforge()
 {
+    using namespace BlackrockDepths;
+    using namespace BlackrockDepths::GeneralAngerforge;
     new boss_general_angerforge();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_high_interrogator_gerstahn.cpp

@@ -18,6 +18,8 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
+namespace BlackrockDepths::HighInterrogatorGerstahn
+{
 enum Spells
 {
     SPELL_SHADOWWORDPAIN                                   = 10894,
@@ -102,8 +104,11 @@ class boss_high_interrogator_gerstahn : public CreatureScript
             return new boss_high_interrogator_gerstahnAI(creature);
         }
 };
+}
 
 void AddSC_boss_high_interrogator_gerstahn()
 {
+    using namespace BlackrockDepths;
+    using namespace BlackrockDepths::HighInterrogatorGerstahn;
     new boss_high_interrogator_gerstahn();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_magmus.cpp

@@ -20,6 +20,8 @@
 #include "InstanceScript.h"
 #include "ScriptedCreature.h"
 
+namespace BlackrockDepths::Magmus
+{
 enum Spells
 {
     SPELL_FIERYBURST        = 13900,
@@ -109,8 +111,11 @@ class boss_magmus : public CreatureScript
             return GetBlackrockDepthsAI<boss_magmusAI>(creature);
         }
 };
+}
 
 void AddSC_boss_magmus()
 {
+    using namespace BlackrockDepths;
+    using namespace BlackrockDepths::Magmus;
     new boss_magmus();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_moira_bronzebeard.cpp

@@ -18,6 +18,8 @@
 #include "ScriptMgr.h"
 #include "ScriptedCreature.h"
 
+namespace BlackrockDepths::MoiraBronzebeard
+{
 enum Spells
 {
     SPELL_HEAL                                             = 10917,
@@ -96,8 +98,11 @@ class boss_moira_bronzebeard : public CreatureScript
             return new boss_moira_bronzebeardAI(creature);
         }
 };
+}
 
 void AddSC_boss_moira_bronzebeard()
 {
+    using namespace BlackrockDepths;
+    using namespace BlackrockDepths::MoiraBronzebeard;
     new boss_moira_bronzebeard();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/boss_tomb_of_seven.cpp

@@ -22,6 +22,8 @@
 #include "ScriptedCreature.h"
 #include "ScriptedGossip.h"
 
+namespace BlackrockDepths::TombOfSeven
+{
 enum Spells
 {
     SPELL_SMELT_DARK_IRON       = 14891,
@@ -270,9 +272,12 @@ class boss_doomrel : public CreatureScript
             return GetBlackrockDepthsAI<boss_doomrelAI>(creature);
         }
 };
+}
 
 void AddSC_boss_tomb_of_seven()
 {
+    using namespace BlackrockDepths;
+    using namespace BlackrockDepths::TombOfSeven;
     new boss_gloomrel();
     new boss_doomrel();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockDepths/instance_blackrock_depths.cpp

@@ -25,6 +25,8 @@
 #include "Map.h"
 #include "MotionMaster.h"
 
+namespace BlackrockDepths
+{
 #define TIMER_TOMBOFTHESEVEN    15000
 #define MAX_ENCOUNTER           6
 
@@ -426,8 +428,10 @@ public:
         }
     };
 };
+}
 
 void AddSC_instance_blackrock_depths()
 {
+    using namespace BlackrockDepths;
     new instance_blackrock_depths();
 }

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

@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace BlackrockSpire
+{
 uint32 const EncounterCount         = 23;
 
 #define BRSScriptName "instance_blackrock_spire"
@@ -127,5 +129,6 @@ inline AI* GetBlackrockSpireAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, BRSScriptName);
 }
+}
 
 #endif

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_drakkisath.cpp

@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "blackrock_spire.h"
 
+namespace BlackrockSpire::Drakkisath
+{
 enum Spells
 {
     SPELL_FIRENOVA                  = 23462,
@@ -107,8 +109,11 @@ public:
         return new boss_drakkisathAI(creature);
     }
 };
+}
 
 void AddSC_boss_drakkisath()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::Drakkisath;
     new boss_drakkisath();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gizrul_the_slavener.cpp

@@ -21,6 +21,8 @@
 #include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 
+namespace BlackrockSpire::GizrulTheSlavener
+{
 enum Spells
 {
     SPELL_FATAL_BITE                = 16495,
@@ -109,8 +111,11 @@ public:
         return GetBlackrockSpireAI<boss_gizrul_the_slavenerAI>(creature);
     }
 };
+}
 
 void AddSC_boss_gizrul_the_slavener()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::GizrulTheSlavener;
     new boss_gizrul_the_slavener();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_gyth.cpp

@@ -22,6 +22,8 @@
 #include "MotionMaster.h"
 #include "ScriptedCreature.h"
 
+namespace BlackrockSpire::Gyth
+{
 enum Spells
 {
     SPELL_REND_MOUNTS               = 16167, // Change model
@@ -182,8 +184,11 @@ public:
         return GetBlackrockSpireAI<boss_gythAI>(creature);
     }
 };
+}
 
 void AddSC_boss_gyth()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::Gyth;
     new boss_gyth();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_halycon.cpp

@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "blackrock_spire.h"
 
+namespace BlackrockSpire::Halycon
+{
 enum Spells
 {
     SPELL_REND                      = 13738,
@@ -115,8 +117,11 @@ public:
         return new boss_halyconAI(creature);
     }
 };
+}
 
 void AddSC_boss_halycon()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::Halycon;
     new boss_halycon();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_highlord_omokk.cpp

@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "blackrock_spire.h"
 
+namespace BlackrockSpire::HighlordOmokk
+{
 enum Spells
 {
     SPELL_FRENZY                    = 8269,
@@ -96,8 +98,11 @@ public:
     };
 
 };
+}
 
 void AddSC_boss_highlordomokk()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::HighlordOmokk;
     new boss_highlord_omokk();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_lord_valthalak.cpp

@@ -20,6 +20,8 @@
 #include "InstanceScript.h"
 #include "ScriptedCreature.h"
 
+namespace BlackrockSpire::LordValthalak
+{
 enum Spells
 {
     SPELL_FRENZY                    = 8269,
@@ -142,8 +144,11 @@ public:
         return GetBlackrockSpireAI<boss_lord_valthalakAI>(creature);
     }
 };
+}
 
 void AddSC_boss_lord_valthalak()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::LordValthalak;
     new boss_lord_valthalak();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_mother_smolderweb.cpp

@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "blackrock_spire.h"
 
+namespace BlackrockSpire::MotherSmolderweb
+{
 enum Spells
 {
     SPELL_CRYSTALIZE                = 16104,
@@ -101,8 +103,11 @@ public:
     };
 
 };
+}
 
 void AddSC_boss_mothersmolderweb()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::MotherSmolderweb;
     new boss_mother_smolderweb();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_overlord_wyrmthalak.cpp

@@ -20,6 +20,8 @@
 #include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 
+namespace BlackrockSpire::OverlordWyrmthalak
+{
 enum Spells
 {
     SPELL_BLASTWAVE                 = 11130,
@@ -140,8 +142,11 @@ public:
         return GetBlackrockSpireAI<boss_overlordwyrmthalakAI>(creature);
     }
 };
+}
 
 void AddSC_boss_overlordwyrmthalak()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::OverlordWyrmthalak;
     new boss_overlord_wyrmthalak();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_pyroguard_emberseer.cpp

@@ -27,6 +27,8 @@
 #include "Spell.h"
 #include "SpellInfo.h"
 
+namespace BlackrockSpire::PyroguardEmberseer
+{
 enum Text
 {
     EMOTE_ONE_STACK                 = 0,
@@ -444,9 +446,12 @@ public:
         return GetBlackrockSpireAI<npc_blackhand_incarceratorAI>(creature);
     }
 };
+}
 
 void AddSC_boss_pyroguard_emberseer()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::PyroguardEmberseer;
     new boss_pyroguard_emberseer();
     new npc_blackhand_incarcerator();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_quartermaster_zigris.cpp

@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "blackrock_spire.h"
 
+namespace BlackrockSpire::QuatermasterZigris
+{
 enum Spells
 {
     SPELL_SHOOT                     = 16496,
@@ -95,8 +97,11 @@ public:
         return new boss_quatermasterzigrisAI(creature);
     }
 };
+}
 
 void AddSC_boss_quatermasterzigris()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::QuatermasterZigris;
     new quartermaster_zigris();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_rend_blackhand.cpp

@@ -23,6 +23,8 @@
 #include "Player.h"
 #include "ScriptedCreature.h"
 
+namespace BlackrockSpire::RendBlackhand
+{
 enum Spells
 {
     SPELL_WHIRLWIND                 = 13736, // sniffed
@@ -457,8 +459,11 @@ public:
         return GetBlackrockSpireAI<boss_rend_blackhandAI>(creature);
     }
 };
+}
 
 void AddSC_boss_rend_blackhand()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::RendBlackhand;
     new boss_rend_blackhand();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_shadow_hunter_voshgajin.cpp

@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "blackrock_spire.h"
 
+namespace BlackrockSpire::ShadowHunterVoshgajin
+{
 enum Spells
 {
     SPELL_CURSEOFBLOOD              = 24673,
@@ -103,8 +105,11 @@ public:
     };
 
 };
+}
 
 void AddSC_boss_shadowvosh()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::ShadowHunterVoshgajin;
     new boss_shadow_hunter_voshgajin();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_the_beast.cpp

@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "blackrock_spire.h"
 
+namespace BlackrockSpire::TheBeast
+{
 enum Spells
 {
     SPELL_FLAMEBREAK                = 16785,
@@ -101,8 +103,11 @@ public:
         }
     };
 };
+}
 
 void AddSC_boss_thebeast()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::TheBeast;
     new boss_the_beast();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_urok_doomhowl.cpp

@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "blackrock_spire.h"
 
+namespace BlackrockSpire::UrokDoomhowl
+{
 enum Spells
 {
     SPELL_REND                      = 16509,
@@ -104,8 +106,11 @@ public:
         return new boss_urok_doomhowlAI(creature);
     }
 };
+}
 
 void AddSC_boss_urok_doomhowl()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::UrokDoomhowl;
     new boss_urok_doomhowl();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/boss_warmaster_voone.cpp

@@ -19,6 +19,8 @@
 #include "ScriptedCreature.h"
 #include "blackrock_spire.h"
 
+namespace BlackrockSpire::WarmasterVoone
+{
 enum Spells
 {
     SPELL_SNAPKICK                  = 15618,
@@ -121,8 +123,11 @@ public:
         return new boss_warmastervooneAI(creature);
     }
 };
+}
 
 void AddSC_boss_warmastervoone()
 {
+    using namespace BlackrockSpire;
+    using namespace BlackrockSpire::WarmasterVoone;
     new boss_warmaster_voone();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackrockSpire/instance_blackrock_spire.cpp

@@ -24,6 +24,8 @@
 #include "Player.h"
 #include "ScriptedCreature.h"
 
+namespace BlackrockSpire
+{
 //uint32 const DragonspireRunes[7] = { GO_HALL_RUNE_1, GO_HALL_RUNE_2, GO_HALL_RUNE_3, GO_HALL_RUNE_4, GO_HALL_RUNE_5, GO_HALL_RUNE_6, GO_HALL_RUNE_7 };
 
 uint32 const DragonspireMobs[3] = { NPC_BLACKHAND_DREADWEAVER, NPC_BLACKHAND_SUMMONER, NPC_BLACKHAND_VETERAN };
@@ -589,9 +591,11 @@ public:
         return false;
     }
 };
+}
 
 void AddSC_instance_blackrock_spire()
 {
+    using namespace BlackrockSpire;
     new instance_blackrock_spire();
     new at_dragonspire_hall();
     new at_blackrock_stadium();

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.cpp

@@ -31,6 +31,8 @@
 #include "InstanceScript.h"
 #include "blackwing_descent.h"
 
+namespace BlackwingDescent
+{
 enum LordVictorNefarius
 {
     // Spells
@@ -681,9 +683,11 @@ class at_bwd_intro: public OnlyOnceAreaTriggerScript
             return true;
         }
 };
+}
 
 void AddSC_blackwing_descent()
 {
+    using namespace BlackwingDescent;
     RegisterBlackwingDescentCreatureAI(npc_bwd_lord_victor_nefarius);
     RegisterBlackwingDescentCreatureAI(npc_bwd_drakonid_chainwielder);
     RegisterBlackwingDescentCreatureAI(npc_bwd_dwarven_spirit);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/blackwing_descent.h

@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace BlackwingDescent
+{
 #define DataHeader "BWD"
 #define BWDScriptName "instance_blackwing_descent"
 
@@ -231,5 +233,6 @@ inline AI* GetBlackwingDescentAI(T* obj)
 }
 
 #define RegisterBlackwingDescentCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetBlackwingDescentAI)
+}
 
 #endif

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_atramedes.cpp

@@ -32,6 +32,8 @@
 #include "TemporarySummon.h"
 #include "blackwing_descent.h"
 
+namespace BlackwingDescent::Atramedes
+{
 enum Spells
 {
     // Atramedes
@@ -1110,9 +1112,12 @@ class spell_atramedes_apply_vehicle_periodic : public AuraScript
         AfterEffectApply.Register(&spell_atramedes_apply_vehicle_periodic::AfterApply, EFFECT_0, SPELL_AURA_SET_VEHICLE_ID, AURA_EFFECT_HANDLE_REAL);
     }
 };
+}
 
 void AddSC_boss_atramedes()
 {
+    using namespace BlackwingDescent;
+    using namespace BlackwingDescent::Atramedes;
     RegisterBlackwingDescentCreatureAI(boss_atramedes);
     RegisterBlackwingDescentCreatureAI(npc_atramedes_ancient_dwarven_shield);
     RegisterBlackwingDescentCreatureAI(npc_atramedes_lord_victor_nefarius);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_chimaeron.cpp

@@ -28,6 +28,8 @@
 #include "Map.h"
 #include "blackwing_descent.h"
 
+namespace BlackwingDescent::Chimaeron
+{
 enum Spells
 {
     // Chimaeron
@@ -681,9 +683,12 @@ class spell_chimaeron_shadow_whip : public SpellScript
         OnEffectHitTarget.Register(&spell_chimaeron_shadow_whip::HandleDummyEffect, EFFECT_0, SPELL_EFFECT_DUMMY);
     }
 };
+}
 
 void AddSC_boss_chimaeron()
 {
+    using namespace BlackwingDescent;
+    using namespace BlackwingDescent::Chimaeron;
     RegisterBlackwingDescentCreatureAI(boss_chimaeron);
     RegisterBlackwingDescentCreatureAI(npc_chimaeron_finkle_einhorn);
     RegisterBlackwingDescentCreatureAI(npc_chimaeron_bile_o_tron);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_magmaw.cpp

@@ -29,6 +29,8 @@
 #include "Map.h"
 #include "blackwing_descent.h"
 
+namespace BlackwingDescent::Magmaw
+{
 enum Spells
 {
     // Magmaw
@@ -1260,10 +1262,12 @@ class spell_magmaw_captured : public AuraScript
         OnEffectPeriodic.Register(&spell_magmaw_captured::HandleTick, EFFECT_0, SPELL_AURA_PERIODIC_DUMMY);
     }
 };
-
+}
 
 void AddSC_boss_magmaw()
 {
+    using namespace BlackwingDescent;
+    using namespace BlackwingDescent::Magmaw;
     RegisterBlackwingDescentCreatureAI(boss_magmaw);
     RegisterBlackwingDescentCreatureAI(npc_magmaw_nefarian);
     RegisterBlackwingDescentCreatureAI(npc_magmaw_lava_parasite);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_maloriak.cpp

@@ -31,6 +31,8 @@
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 
+namespace BlackwingDescent::Maloriak
+{
 enum Spells
 {
     // Maloriak
@@ -1264,9 +1266,12 @@ class spell_maloriak_master_adventurer_award : public AuraScript
         AfterEffectRemove.Register(&spell_maloriak_master_adventurer_award::HandleRemove, EFFECT_0, SPELL_AURA_DUMMY, AURA_EFFECT_HANDLE_REAL);
     }
 };
+}
 
 void AddSC_boss_maloriak()
 {
+    using namespace BlackwingDescent;
+    using namespace BlackwingDescent::Maloriak;
     RegisterBlackwingDescentCreatureAI(boss_maloriak);
     RegisterBlackwingDescentCreatureAI(npc_maloriak_flash_freeze);
     RegisterBlackwingDescentCreatureAI(npc_maloriak_experiment);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_nefarians_end.cpp

@@ -37,6 +37,8 @@
 #include "ObjectAccessor.h"
 #include "blackwing_descent.h"
 
+namespace BlackwingDescent::NefariansEnd
+{
 enum Spells
 {
     // Nefarian
@@ -2064,9 +2066,12 @@ struct go_nefarians_end_orb_of_culmination : public GameObjectAI
 private:
     InstanceScript* _instance;
 };
+}
 
 void AddSC_boss_nefarians_end()
 {
+    using namespace BlackwingDescent;
+    using namespace BlackwingDescent::NefariansEnd;
     RegisterBlackwingDescentCreatureAI(boss_nefarians_end);
     RegisterBlackwingDescentCreatureAI(npc_nefarians_end_onyxia);
     RegisterBlackwingDescentCreatureAI(npc_nefarians_end_lord_victor_nefarius);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/boss_omnotron_defense_system.cpp

@@ -30,6 +30,8 @@
 #include "TemporarySummon.h"
 #include "blackwing_descent.h"
 
+namespace BlackwingDescent::OmnotronDefenseSystem
+{
 enum Spells
 {
     // Omnotron
@@ -1557,9 +1559,12 @@ class spell_omnotron_flamethrower : public SpellScript
         OnObjectAreaTargetSelect.Register(&spell_omnotron_flamethrower::FilterTargets, EFFECT_0, TARGET_UNIT_CONE_CASTER_TO_DEST_ENEMY);
     }
 };
+}
 
 void AddSC_boss_omnotron_defense_system()
 {
+    using namespace BlackwingDescent;
+    using namespace BlackwingDescent::OmnotronDefenseSystem;
     RegisterBlackwingDescentCreatureAI(boss_omnotron_defense_system);
     RegisterBlackwingDescentCreatureAI(npc_omnotron_electron);
     RegisterBlackwingDescentCreatureAI(npc_omnotron_magmatron);

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingDescent/instance_blackwing_descent.cpp

@@ -26,6 +26,8 @@
 #include "TemporarySummon.h"
 #include "blackwing_descent.h"
 
+namespace BlackwingDescent
+{
 ObjectData const creatureData[] =
 {
     { BOSS_MAGMAW,                              DATA_MAGMAW                             },
@@ -534,8 +536,10 @@ class instance_blackwing_descent : public InstanceMapScript
             return new instance_blackwing_descent_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_blackwing_descent()
 {
+    using namespace BlackwingDescent;
     new instance_blackwing_descent();
 }

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

@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace BlackwingLair
+{
 uint32 const EncounterCount     = 8;
 
 #define BRLScriptName "instance_blackwing_lair"
@@ -87,5 +89,6 @@ inline AI* GetBlackwingLairAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, BRLScriptName);
 }
+}
 
 #endif

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_broodlord_lashlayer.cpp

@@ -19,6 +19,8 @@
 #include "blackwing_lair.h"
 #include "ScriptedCreature.h"
 
+namespace BlackwingLair::BroodlordLashlayer
+{
 enum Say
 {
     SAY_AGGRO               = 0,
@@ -112,8 +114,11 @@ public:
         return GetBlackwingLairAI<boss_broodlordAI>(creature);
     }
 };
+}
 
 void AddSC_boss_broodlord()
 {
+    using namespace BlackwingLair;
+    using namespace BlackwingLair::BroodlordLashlayer;
     new boss_broodlord();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_chromaggus.cpp

@@ -21,6 +21,8 @@
 #include "Player.h"
 #include "ScriptedCreature.h"
 
+namespace BlackwingLair::Chromaggus
+{
 enum Emotes
 {
     EMOTE_FRENZY                                           = 0,
@@ -293,8 +295,11 @@ public:
         return GetBlackwingLairAI<boss_chromaggusAI>(creature);
     }
 };
+}
 
 void AddSC_boss_chromaggus()
 {
+    using namespace BlackwingLair;
+    using namespace BlackwingLair::Chromaggus;
     new boss_chromaggus();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_ebonroc.cpp

@@ -19,6 +19,8 @@
 #include "blackwing_lair.h"
 #include "ScriptedCreature.h"
 
+namespace BlackwingLair::Ebonroc
+{
 enum Spells
 {
     SPELL_SHADOWFLAME           = 22539,
@@ -92,8 +94,11 @@ public:
         return GetBlackwingLairAI<boss_ebonrocAI>(creature);
     }
 };
+}
 
 void AddSC_boss_ebonroc()
 {
+    using namespace BlackwingLair;
+    using namespace BlackwingLair::Ebonroc;
     new boss_ebonroc();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_firemaw.cpp

@@ -19,6 +19,8 @@
 #include "blackwing_lair.h"
 #include "ScriptedCreature.h"
 
+namespace BlackwingLair::Firemaw
+{
 enum Spells
 {
     SPELL_SHADOWFLAME       = 22539,
@@ -94,8 +96,11 @@ public:
         return GetBlackwingLairAI<boss_firemawAI>(creature);
     }
 };
+}
 
 void AddSC_boss_firemaw()
 {
+    using namespace BlackwingLair;
+    using namespace BlackwingLair::Firemaw;
     new boss_firemaw();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_flamegor.cpp

@@ -19,6 +19,8 @@
 #include "blackwing_lair.h"
 #include "ScriptedCreature.h"
 
+namespace BlackwingLair::Flamegor
+{
 enum Emotes
 {
     EMOTE_FRENZY            = 0,
@@ -100,8 +102,11 @@ public:
         return GetBlackwingLairAI<boss_flamegorAI>(creature);
     }
 };
+}
 
 void AddSC_boss_flamegor()
 {
+    using namespace BlackwingLair;
+    using namespace BlackwingLair::Flamegor;
     new boss_flamegor();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_nefarian.cpp

@@ -25,6 +25,8 @@
 #include "ScriptedGossip.h"
 #include "TemporarySummon.h"
 
+namespace BlackwingLair::Nefarian
+{
 enum Events
 {
     // Victor Nefarius
@@ -600,9 +602,12 @@ public:
         return GetBlackwingLairAI<boss_nefarianAI>(creature);
     }
 };
+}
 
 void AddSC_boss_nefarian()
 {
+    using namespace BlackwingLair;
+    using namespace BlackwingLair::Nefarian;
     new boss_victor_nefarius();
     new boss_nefarian();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_razorgore.cpp

@@ -24,6 +24,8 @@
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 
+namespace BlackwingLair::Razorgore
+{
 enum Say
 {
     SAY_EGGS_BROKEN1        = 0,
@@ -225,9 +227,12 @@ class spell_egg_event : public SpellScriptLoader
             return new spell_egg_eventSpellScript();
         }
 };
+}
 
 void AddSC_boss_razorgore()
 {
+    using namespace BlackwingLair;
+    using namespace BlackwingLair::Razorgore;
     new boss_razorgore();
     new go_orb_of_domination();
     new spell_egg_event();

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/boss_vaelastrasz.cpp

@@ -24,6 +24,8 @@
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
+namespace BlackwingLair::Vaelastrasz
+{
 enum Says
 {
    SAY_LINE1                         = 0,
@@ -271,9 +273,12 @@ public:
         return new spell_vael_burning_adrenaline_AuraScript();
     }
 };
+}
 
 void AddSC_boss_vaelastrasz()
 {
+    using namespace BlackwingLair;
+    using namespace BlackwingLair::Vaelastrasz;
     new boss_vaelastrasz();
     new spell_vael_burning_adrenaline();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/BlackwingLair/instance_blackwing_lair.cpp

@@ -25,6 +25,8 @@
 #include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 
+namespace BlackwingLair
+{
 DoorData const doorData[] =
 {
     { GO_PORTCULLIS,             DATA_RAZORGORE_THE_UNTAMED,  DOOR_TYPE_PASSAGE },
@@ -282,8 +284,10 @@ public:
         return new instance_blackwing_lair_InstanceMapScript(map);
     }
 };
+}
 
 void AddSC_instance_blackwing_lair()
 {
+    using namespace BlackwingLair;
     new instance_blackwing_lair();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_baron_geddon.cpp

@@ -29,6 +29,8 @@ EndScriptData */
 #include "SpellAuraEffects.h"
 #include "SpellScript.h"
 
+namespace MoltenCore::BaronGeddon
+{
 enum Emotes
 {
     EMOTE_SERVICE       = 0
@@ -149,9 +151,12 @@ class spell_baron_geddon_inferno : public SpellScriptLoader
             return new spell_baron_geddon_inferno_AuraScript();
         }
 };
+}
 
 void AddSC_boss_baron_geddon()
 {
+    using namespace MoltenCore;
+    using namespace MoltenCore::BaronGeddon;
     new boss_baron_geddon();
     new spell_baron_geddon_inferno();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_garr.cpp

@@ -27,6 +27,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "molten_core.h"
 
+namespace MoltenCore::Garr
+{
 enum Spells
 {
     // Garr
@@ -162,9 +164,12 @@ class npc_firesworn : public CreatureScript
             return new npc_fireswornAI(creature);
         }
 };
+}
 
 void AddSC_boss_garr()
 {
+    using namespace MoltenCore;
+    using namespace MoltenCore::Garr;
     new boss_garr();
     new npc_firesworn();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_gehennas.cpp

@@ -27,6 +27,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "molten_core.h"
 
+namespace MoltenCore::Gehenannas
+{
 enum Spells
 {
     SPELL_GEHENNAS_CURSE    = 19716,
@@ -105,8 +107,11 @@ class boss_gehennas : public CreatureScript
             return new boss_gehennasAI(creature);
         }
 };
+}
 
 void AddSC_boss_gehennas()
 {
+    using namespace MoltenCore;
+    using namespace MoltenCore::Gehenannas;
     new boss_gehennas();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_golemagg.cpp

@@ -29,6 +29,8 @@ EndScriptData */
 #include "ObjectMgr.h"
 #include "ScriptedCreature.h"
 
+namespace MoltenCore::Golemagg
+{
 enum Texts
 {
     EMOTE_LOWHP             = 0,
@@ -190,9 +192,12 @@ class npc_core_rager : public CreatureScript
             return GetMoltenCoreAI<npc_core_ragerAI>(creature);
         }
 };
+}
 
 void AddSC_boss_golemagg()
 {
+    using namespace MoltenCore;
+    using namespace MoltenCore::Golemagg;
     new boss_golemagg();
     new npc_core_rager();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_lucifron.cpp

@@ -27,6 +27,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "molten_core.h"
 
+namespace MoltenCore::Lucifron
+{
 enum Spells
 {
     SPELL_IMPENDING_DOOM    = 19702,
@@ -103,8 +105,11 @@ class boss_lucifron : public CreatureScript
             return new boss_lucifronAI(creature);
         }
 };
+}
 
 void AddSC_boss_lucifron()
 {
+    using namespace MoltenCore;
+    using namespace MoltenCore::Lucifron;
     new boss_lucifron();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_magmadar.cpp

@@ -27,6 +27,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "molten_core.h"
 
+namespace MoltenCore::Magmadar
+{
 enum Texts
 {
     EMOTE_FRENZY        = 0
@@ -117,8 +119,11 @@ class boss_magmadar : public CreatureScript
             return new boss_magmadarAI(creature);
         }
 };
+}
 
 void AddSC_boss_magmadar()
 {
+    using namespace MoltenCore;
+    using namespace MoltenCore::Magmadar;
     new boss_magmadar();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_majordomo_executus.cpp

@@ -32,6 +32,8 @@ EndScriptData */
 #include "ScriptedGossip.h"
 #include "MotionMaster.h"
 
+namespace MoltenCore::MajordomoExecutus
+{
 enum Texts
 {
     SAY_AGGRO           = 0,
@@ -257,8 +259,11 @@ class boss_majordomo : public CreatureScript
             return GetMoltenCoreAI<boss_majordomoAI>(creature);
         }
 };
+}
 
 void AddSC_boss_majordomo()
 {
+    using namespace MoltenCore;
+    using namespace MoltenCore::MajordomoExecutus;
     new boss_majordomo();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_ragnaros.cpp

@@ -29,6 +29,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "TemporarySummon.h"
 
+namespace MoltenCore::Ragnaros
+{
 enum Texts
 {
     SAY_SUMMON_MAJ              = 0,
@@ -350,9 +352,12 @@ class npc_son_of_flame : public CreatureScript
             return GetMoltenCoreAI<npc_son_of_flameAI>(creature);
         }
 };
+}
 
 void AddSC_boss_ragnaros()
 {
+    using namespace MoltenCore;
+    using namespace MoltenCore::Ragnaros;
     new boss_ragnaros();
     new npc_son_of_flame();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_shazzrah.cpp

@@ -20,6 +20,8 @@
 #include "ScriptedCreature.h"
 #include "SpellScript.h"
 
+namespace MoltenCore::Shazzrah
+{
 enum Spells
 {
     SPELL_ARCANE_EXPLOSION      = 19712,
@@ -164,9 +166,12 @@ class spell_shazzrah_gate_dummy : public SpellScriptLoader
             return new spell_shazzrah_gate_dummy_SpellScript();
         }
 };
+}
 
 void AddSC_boss_shazzrah()
 {
+    using namespace MoltenCore;
+    using namespace MoltenCore::Shazzrah;
     new boss_shazzrah();
     new spell_shazzrah_gate_dummy();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/boss_sulfuron_harbinger.cpp

@@ -27,6 +27,8 @@ EndScriptData */
 #include "ScriptedCreature.h"
 #include "molten_core.h"
 
+namespace MoltenCore::SulfuronHarbinger
+{
 enum Spells
 {
     // Sulfuron Harbringer
@@ -213,9 +215,12 @@ class npc_flamewaker_priest : public CreatureScript
             return new npc_flamewaker_priestAI(creature);
         }
 };
+}
 
 void AddSC_boss_sulfuron()
 {
+    using namespace MoltenCore;
+    using namespace MoltenCore::SulfuronHarbinger;
     new boss_sulfuron();
     new npc_flamewaker_priest();
 }

src/server/scripts/EasternKingdoms/BlackrockMountain/MoltenCore/instance_molten_core.cpp

@@ -24,6 +24,8 @@
 #include "molten_core.h"
 #include "TemporarySummon.h"
 
+namespace MoltenCore
+{
 Position const MajodoSummonPos   = { 737.850f, -1145.35f, -120.288f, 4.71368f };
 Position const RagnarosTelePos   = { 829.159f, -815.773f, -228.972f, 5.30500f };
 Position const RagnarosSummonPos = { 838.510f, -829.840f, -232.000f, 2.00000f };
@@ -169,8 +171,10 @@ class instance_molten_core : public InstanceMapScript
             return new instance_molten_core_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_molten_core()
 {
+    using namespace MoltenCore;
     new instance_molten_core();
 }

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

@@ -22,6 +22,8 @@
 
 struct Position;
 
+namespace MoltenCore
+{
 #define MCScriptName "instance_molten_core"
 #define DataHeader "MC"
 
@@ -80,5 +82,6 @@ inline AI* GetMoltenCoreAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, MCScriptName);
 }
+}
 
 #endif

src/server/scripts/EasternKingdoms/Deadmines/boss_admiral_ripsnarl.cpp

@@ -27,6 +27,8 @@
 #include "ObjectAccessor.h"
 #include "MotionMaster.h"
 
+namespace Deadmines::AdmiralRipsnarl
+{
 enum Texts
 {
     // Admiral Ripsnarl
@@ -454,9 +456,12 @@ class spell_ripsnarl_summon_vapor_targeting : public SpellScriptLoader
             return new spell_ripsnarl_summon_vapor_targeting_SpellScript();
         }
 };
+}
 
 void AddSC_boss_admiral_ripsnarl()
 {
+    using namespace Deadmines;
+    using namespace Deadmines::AdmiralRipsnarl;
     new boss_admiral_ripsnarl();
     new npc_ripsnarl_vapor();
     new spell_ripsnarl_go_for_the_throat_targeting();

src/server/scripts/EasternKingdoms/Deadmines/boss_captain_cookie.cpp

@@ -26,6 +26,8 @@
 #include "MotionMaster.h"
 #include "deadmines.h"
 
+namespace Deadmines::CaptainCookie
+{
 enum Spells
 {
     // "Captain" Cookie
@@ -345,9 +347,12 @@ class spell_cookie_satiated : public SpellScriptLoader
             return new spell_cookie_satiated_SpellScript();
         }
 };
+}
 
 void AddSC_boss_captain_cookie()
 {
+    using namespace Deadmines;
+    using namespace Deadmines::CaptainCookie;
     new boss_captain_cookie();
     new spell_cookie_throw_food_targeting();
     new spell_cookie_satiated();

src/server/scripts/EasternKingdoms/Deadmines/boss_foe_reaper_5000.cpp

@@ -27,6 +27,8 @@
 #include "Map.h"
 #include "deadmines.h"
 
+namespace Deadmines::ForeReaper5000
+{
 enum Texts
 {
     // Foe Reaper 5000
@@ -571,9 +573,12 @@ class spell_foe_reaper_5000_fixate : public SpellScriptLoader
             return new spell_foe_reaper_5000_fixate_SpellScript();
         }
 };
+}
 
 void AddSC_boss_foe_reaper_5000()
 {
+    using namespace Deadmines;
+    using namespace Deadmines::ForeReaper5000;
     new boss_foe_reaper_5000();
     new npc_foe_reaper_5000_molten_slag();
     new spell_foe_reaper_5000_acquire_target();

src/server/scripts/EasternKingdoms/Deadmines/boss_glubtok.cpp

@@ -28,6 +28,8 @@
 #include "MotionMaster.h"
 #include "deadmines.h"
 
+namespace Deadmines::Glubtok
+{
 enum Spells
 {
     // Glubtok
@@ -387,9 +389,12 @@ class spell_glubtok_blossom_targeting : public SpellScript
         OnEffectHitTarget.Register(&spell_glubtok_blossom_targeting::HandleBlossomEffect, EFFECT_0, SPELL_EFFECT_APPLY_AURA);
     }
 };
+}
 
 void AddSC_boss_glubtok()
 {
+    using namespace Deadmines;
+    using namespace Deadmines::Glubtok;
     RegisterDeadminesCreatureAI(boss_glubtok);
     RegisterSpellScript(spell_glubtok_blossom_targeting);
 }

src/server/scripts/EasternKingdoms/Deadmines/boss_helix_gearbreaker.cpp

@@ -29,6 +29,8 @@
 #include "GridNotifiers.h"
 #include "Map.h"
 
+namespace Deadmines::HelixGearbreaker
+{
 enum Texts
 {
     // Helix Gearbreaker
@@ -851,10 +853,12 @@ class spell_helix_ride_vehicle : public AuraScript
         AfterEffectRemove.Register(&spell_helix_ride_vehicle::AfterRemove, EFFECT_0, SPELL_AURA_CONTROL_VEHICLE, AURA_EFFECT_HANDLE_REAL);
     }
 };
-
+}
 
 void AddSC_boss_helix_gearbreaker()
 {
+    using namespace Deadmines;
+    using namespace Deadmines::HelixGearbreaker;
     RegisterDeadminesCreatureAI(boss_helix_gearbreaker);
     RegisterDeadminesCreatureAI(npc_helix_lumbering_oaf);
     RegisterDeadminesCreatureAI(npc_helix_sticky_bomb);

src/server/scripts/EasternKingdoms/Deadmines/boss_vanessa_van_cleef.cpp

@@ -27,6 +27,8 @@
 #include "ObjectAccessor.h"
 #include "SpellScript.h"
 
+namespace Deadmines::VanessaVanCleef
+{
 enum Texts
 {
     // Vanessa VanCleef
@@ -731,9 +733,12 @@ class spell_vanessa_backslash_targeting : public SpellScriptLoader
             return new spell_vanessa_backslash_targeting_SpellScript();
         }
 };
+}
 
 void AddSC_boss_vanessa_van_cleef()
 {
+    using namespace Deadmines;
+    using namespace Deadmines::VanessaVanCleef;
     new boss_vanessa_van_cleef();
     new npc_vanessa_vanessa_van_cleef();
     new npc_vanessa_note_from_vanessa();

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

@@ -30,6 +30,8 @@
 #include "SpellScript.h"
 #include "SpellInfo.h"
 
+namespace Deadmines
+{
 enum DefiasWatcher
 {
     SPELL_ON_FIRE           = 91737,
@@ -655,9 +657,11 @@ class spell_deadmines_bloodbath : public SpellScriptLoader
             return new spell_deadmines_bloodbath_AuraScript();
         }
 };
+}
 
 void AddSC_deadmines()
 {
+    using namespace Deadmines;
     RegisterDeadminesCreatureAI(npc_deadmines_defias_watcher);
     new npc_deadmines_vanessas_trap_bunny();
     new npc_deadmines_steam_valve();

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

@@ -21,6 +21,8 @@
 #include "CreatureAIImpl.h"
 #include "Position.h"
 
+namespace Deadmines
+{
 #define DataHeader "DM"
 #define DMScriptName "instance_deadmines"
 
@@ -551,6 +553,7 @@ AI* GetDeadminesAI(GameObject* go)
 }
 
 #define RegisterDeadminesCreatureAI(ai_name) RegisterCreatureAIWithFactory(ai_name, GetDeadminesAI)
+}
 
 // DEADMINES_H_
 #endif

src/server/scripts/EasternKingdoms/Deadmines/instance_deadmines.cpp

@@ -27,6 +27,8 @@
 #include "Player.h"
 #include "CreatureAIImpl.h"
 
+namespace Deadmines
+{
 enum EventIds
 {
     EVENT_SPAWN_GOBLIN_EVENT = 1,
@@ -928,8 +930,10 @@ class instance_deadmines : public InstanceMapScript
             return new instance_deadmines_InstanceMapScript(map);
         }
 };
+}
 
 void AddSC_instance_deadmines()
 {
+    using namespace Deadmines;
     new instance_deadmines();
 }

src/server/scripts/EasternKingdoms/Gilneas/gilneas.h

@@ -20,6 +20,8 @@
 
 #include "Position.h"
 
+namespace Gilneas
+{
 /*######
 ## Quest 14154 - By the Skin of his Teeth
 ######*/
@@ -304,5 +306,6 @@ Position const greymanesHorsePath2[] =
     { -1771.557f, 1423.011f, 19.98499f },
     { -1770.955f, 1430.332f, 19.83506f }
 };
+}
 
 #endif // GILNEAS_M_

src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_1.cpp

@@ -29,6 +29,9 @@
 #include "TemporarySummon.h"
 #include "Vehicle.h"
 
+namespace Gilneas::Chapter1
+{
+
 /*######
 ## Quest 14098 - Evacuate the Merchant Square
 ######*/
@@ -665,9 +668,11 @@ struct npc_gilnean_crow : public PassiveAI
 private:
     EventMap _events;
 };
+}
 
 void AddSC_gilneas_chapter_1()
 {
+    using namespace Gilneas::Chapter1;
     RegisterCreatureAI(npc_frightened_citizen);
     RegisterCreatureAI(npc_worgen_runt);
     RegisterCreatureAI(npc_josiah_avery);

src/server/scripts/EasternKingdoms/Gilneas/gilneas_chapter_2.cpp

@@ -32,6 +32,8 @@
 #include "GameObjectAI.h"
 #include "GameObject.h"
 
+namespace Gilneas::Chapter2
+{
 enum GilneasInvasionCamera
 {
     CINEMATIC_FORSAKEN_INVASION = 168
@@ -695,9 +697,11 @@ public:
         return true;
     }
 };
+}
 
 void AddSC_gilneas_chapter_2()
 {
+    using namespace Gilneas::Chapter2;
     RegisterGameObjectAI(go_gilneas_invasion_camera);
     RegisterCreatureAI(npc_gilneas_horrid_abomination);
     RegisterCreatureAI(npc_gilneas_save_the_children);

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

@@ -34,6 +34,8 @@ Script Data End */
 #include "SpellScript.h"
 #include "TemporarySummon.h"
 
+namespace Gnomeregan
+{
 enum BlastmasterEmi
 {
     SAY_BLASTMASTER_0   = 0,
@@ -579,9 +581,11 @@ class spell_collecting_fallout : public SpellScriptLoader
             return new spell_collecting_fallout_SpellScript();
         }
 };
+}
 
 void AddSC_gnomeregan()
 {
+    using namespace Gnomeregan;
     new npc_blastmaster_emi_shortfuse();
     new boss_grubbis();
 

src/server/scripts/EasternKingdoms/Gnomeregan/gnomeregan.h

@@ -20,6 +20,8 @@
 
 #include "CreatureAIImpl.h"
 
+namespace Gnomeregan
+{
 #define GNOScriptName "instance_gnomeregan"
 #define DataHeader "GNO"
 
@@ -55,5 +57,6 @@ inline AI* GetGnomereganAI(T* obj)
 {
     return GetInstanceAI<AI>(obj, GNOScriptName);
 }
+}
 
 #endif

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

@@ -24,6 +24,8 @@
 #include "Map.h"
 #include "Player.h"
 
+namespace Gnomeregan
+{
 #define    MAX_ENCOUNTER  1
 
 class instance_gnomeregan : public InstanceMapScript
@@ -132,8 +134,10 @@ public:
         return new instance_gnomeregan_InstanceMapScript(map);
     }
 };
+}
 
 void AddSC_instance_gnomeregan()
 {
+    using namespace Gnomeregan;
     new instance_gnomeregan();
 }

src/server/scripts/EasternKingdoms/GrimBatol/boss_drahga_shadowburner.cpp

@@ -27,6 +27,8 @@
 #include "TemporarySummon.h"
 #include "grim_batol.h"
 
+namespace GrimBatol::DrahgaShadowburner
+{
 enum Spells
 {
     // Drahga
@@ -539,9 +541,12 @@ class spell_drahga_devouring_flames : public SpellScript
         OnHit.Register(&spell_drahga_devouring_flames::ChangeDamage);
     }
 };
+}
 
 void AddSC_boss_drahga_shadowburner()
 {
+    using namespace GrimBatol;
+    using namespace GrimBatol::DrahgaShadowburner;
     RegisterGrimBatolCreatureAI(boss_drahga_shadowburner);
     RegisterGrimBatolCreatureAI(npc_drahga_valiona);
     RegisterGrimBatolCreatureAI(npc_drahga_invoked_flaming_spirit);