aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorKudlaty <none@none>2009-10-22 12:29:57 +0200
committerKudlaty <none@none>2009-10-22 12:29:57 +0200
commitacc00f0b012001cccf0b6e7d91a70d07fb207329 (patch)
treecee1b967cd543294410c459631a143feedd17eda /src
parent43e933ada292b9afc0d69184ac74f7705bb5ec16 (diff)
Remove def_ from headers filename. Part 2
--HG-- branch : trunk
Diffstat (limited to 'src')
-rw-r--r--src/bindings/scripts/CMakeLists.txt44
-rw-r--r--src/bindings/scripts/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.h (renamed from src/bindings/scripts/scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h)0
-rw-r--r--src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h (renamed from src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h)0
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp4
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h (renamed from src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/def_dark_portal.h)0
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h (renamed from src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h)0
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h (renamed from src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h)0
-rw-r--r--src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.h (renamed from src/bindings/scripts/scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h)0
-rw-r--r--src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp3
-rw-r--r--src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h (renamed from src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/def_ruins_of_ahnqiraj.h)0
-rw-r--r--src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h (renamed from src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h)0
-rw-r--r--src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp2
-rw-r--r--src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.h (renamed from src/bindings/scripts/scripts/kalimdor/wailing_caverns/def_wailing_caverns.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h (renamed from src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/def_sethekk_halls.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h (renamed from src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/def_shadow_labyrinth.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/black_temple.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/black_temple.h (renamed from src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h (renamed from src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/steam_vault.h (renamed from src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/def_steam_vault.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/gruuls_lair/gruuls_lair.h (renamed from src/bindings/scripts/scripts/outland/gruuls_lair/def_gruuls_lair.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h (renamed from src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/def_blood_furnace.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h (renamed from src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h (renamed from src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h (renamed from src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/def_shattered_halls.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.h (renamed from src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/def_arcatraz.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.h (renamed from src/bindings/scripts/scripts/outland/tempest_keep/the_eye/def_the_eye.h)0
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp2
-rw-r--r--src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/mechanar.h (renamed from src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/def_mechanar.h)0
119 files changed, 121 insertions, 118 deletions
diff --git a/src/bindings/scripts/CMakeLists.txt b/src/bindings/scripts/CMakeLists.txt
index e51c59402fb..29a9ac6e94f 100644
--- a/src/bindings/scripts/CMakeLists.txt
+++ b/src/bindings/scripts/CMakeLists.txt
@@ -206,15 +206,15 @@ SET(trinityscript_LIB_SRCS
scripts/examples/example_gossip_codebox.cpp
scripts/examples/example_misc.cpp
scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
- scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h
+ scripts/kalimdor/blackfathom_depths/blackfathom_deeps.h
scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
- scripts/kalimdor/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h
- scripts/kalimdor/caverns_of_time/dark_portal/def_dark_portal.h
+ scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
+ scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h
scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
@@ -225,7 +225,7 @@ SET(trinityscript_LIB_SRCS
scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
- scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h
+ scripts/kalimdor/caverns_of_time/hyjal/hyjal.h
scripts/kalimdor/caverns_of_time/hyjal/hyjal.cpp
scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
@@ -235,7 +235,7 @@ SET(trinityscript_LIB_SRCS
scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
- scripts/kalimdor/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
+ scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
scripts/kalimdor/maraudon/boss_celebras_the_cursed.cpp
@@ -245,7 +245,7 @@ SET(trinityscript_LIB_SRCS
scripts/kalimdor/onyxias_lair/boss_onyxia.cpp
scripts/kalimdor/razorfen_downs/boss_amnennar_the_coldbringer.cpp
scripts/kalimdor/razorfen_downs/razorfen_downs.cpp
- scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h
+ scripts/kalimdor/razorfen_kraul/razorfen_kraul.h
scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
@@ -254,7 +254,7 @@ SET(trinityscript_LIB_SRCS
scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
- scripts/kalimdor/ruins_of_ahnqiraj/def_ruins_of_ahnqiraj.h
+ scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
@@ -265,10 +265,10 @@ SET(trinityscript_LIB_SRCS
scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
scripts/kalimdor/temple_of_ahnqiraj/boss_viscidus.cpp
- scripts/kalimdor/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h
+ scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
scripts/kalimdor/temple_of_ahnqiraj/mob_anubisath_sentinel.cpp
- scripts/kalimdor/wailing_caverns/def_wailing_caverns.h
+ scripts/kalimdor/wailing_caverns/wailing_caverns.h
scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
scripts/kalimdor/zulfarrak/zulfarrak.cpp
@@ -426,13 +426,13 @@ SET(trinityscript_LIB_SRCS
scripts/outland/auchindoun/mana_tombs/boss_pandemonius.cpp
scripts/outland/auchindoun/sethekk_halls/boss_darkweaver_syth.cpp
scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
- scripts/outland/auchindoun/sethekk_halls/def_sethekk_halls.h
+ scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h
scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
- scripts/outland/auchindoun/shadow_labyrinth/def_shadow_labyrinth.h
+ scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
scripts/outland/black_temple/black_temple.cpp
scripts/outland/black_temple/boss_bloodboil.cpp
@@ -443,7 +443,7 @@ SET(trinityscript_LIB_SRCS
scripts/outland/black_temple/boss_supremus.cpp
scripts/outland/black_temple/boss_teron_gorefiend.cpp
scripts/outland/black_temple/boss_warlord_najentus.cpp
- scripts/outland/black_temple/def_black_temple.h
+ scripts/outland/black_temple/black_temple.h
scripts/outland/black_temple/illidari_council.cpp
scripts/outland/black_temple/instance_black_temple.cpp
scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
@@ -452,40 +452,40 @@ SET(trinityscript_LIB_SRCS
scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
- scripts/outland/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h
+ scripts/outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h
scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
- scripts/outland/coilfang_resevoir/steam_vault/def_steam_vault.h
+ scripts/outland/coilfang_resevoir/steam_vault/steam_vault.h
scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
scripts/outland/coilfang_resevoir/underbog/boss_hungarfen.cpp
scripts/outland/coilfang_resevoir/underbog/boss_the_black_stalker.cpp
scripts/outland/gruuls_lair/boss_gruul.cpp
scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
- scripts/outland/gruuls_lair/def_gruuls_lair.h
+ scripts/outland/gruuls_lair/gruuls_lair.h
scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
- scripts/outland/hellfire_citadel/blood_furnace/def_blood_furnace.h
+ scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h
scripts/outland/hellfire_citadel/hellfire_ramparts/boss_omor_the_unscarred.cpp
scripts/outland/hellfire_citadel/hellfire_ramparts/boss_watchkeeper_gargolmar.cpp
scripts/outland/hellfire_citadel/hellfire_ramparts/boss_vazruden_the_herald.cpp
- scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h
+ scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
- scripts/outland/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h
+ scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
- scripts/outland/hellfire_citadel/shattered_halls/def_shattered_halls.h
+ scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h
scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
scripts/outland/hellfire_citadel/shattered_halls/boss_warchief_kargath_bladefist.cpp
scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
- scripts/outland/tempest_keep/arcatraz/def_arcatraz.h
+ scripts/outland/tempest_keep/arcatraz/arcatraz.h
scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
scripts/outland/tempest_keep/botanica/boss_high_botanist_freywinn.cpp
scripts/outland/tempest_keep/botanica/boss_laj.cpp
@@ -494,14 +494,14 @@ SET(trinityscript_LIB_SRCS
scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
- scripts/outland/tempest_keep/the_eye/def_the_eye.h
+ scripts/outland/tempest_keep/the_eye/the_eye.h
scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
scripts/outland/tempest_keep/the_eye/the_eye.cpp
scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_gyrokill.cpp
scripts/outland/tempest_keep/the_mechanar/boss_gatewatcher_ironhand.cpp
scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
scripts/outland/tempest_keep/the_mechanar/boss_pathaleon_the_calculator.cpp
- scripts/outland/tempest_keep/the_mechanar/def_mechanar.h
+ scripts/outland/tempest_keep/the_mechanar/mechanar.h
scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
scripts/outland/blades_edge_mountains.cpp
scripts/outland/boss_doomlord_kazzak.cpp
diff --git a/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.h
index 097554708b7..097554708b7 100644
--- a/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/def_blackfathom_deeps.h
+++ b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/blackfathom_deeps.h
diff --git a/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
index 0845396ffa3..6d5149d3657 100644
--- a/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/blackfathom_depths/instance_blackfathom_deeps.cpp
@@ -22,7 +22,7 @@ SDCategory: Blackfathom Deeps
EndScriptData */
#include "precompiled.h"
-#include "def_blackfathom_deeps.h"
+#include "blackfathom_deeps.h"
#define MAX_ENCOUNTER 2
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
index 96a37c4ad79..a2fe66bb7ea 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_epoch.cpp
@@ -10,7 +10,7 @@ Script Data End */
update creature_template set scriptname = '' where entry = '';
*** SQL END ***/
#include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"
enum Spells
{
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
index f59d499f2ac..fef2d77d652 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_infinite.cpp
@@ -1,5 +1,5 @@
#include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"
enum Spells
{
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
index e01c4302743..e786cf84ced 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_mal_ganis.cpp
@@ -10,7 +10,7 @@ Script Data End */
update creature_template set scriptname = 'boss_mal_ganis' where entry = '';
*** SQL END ***/
#include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"
enum Spells
{
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
index 90902bf8c91..96ba265566c 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_meathook.cpp
@@ -10,7 +10,7 @@ Script Data End */
update creature_template set scriptname = 'boss_meathook' where entry = '';
*** SQL END ***/
#include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"
enum Spells
{
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
index e304d45d6d8..48edf6d08f1 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/boss_salramm.cpp
@@ -10,7 +10,7 @@ Script Data End */
update creature_template set scriptname = 'boss_salramm' where entry = '';
*** SQL END ***/
#include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"
enum Spells
{
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
index d5c2acae277..d5c2acae277 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/def_culling_of_stratholme.h
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/culling_of_stratholme.h
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
index 4750c17588d..5819a1afe8b 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/culling_of_stratholme/instance_culling_of_stratholme.cpp
@@ -1,6 +1,8 @@
#include "precompiled.h"
-#include "def_culling_of_stratholme.h"
+#include "culling_of_stratholme.h"
+
#define MAX_ENCOUNTER 5
+
/* Culling of Stratholme encounters:
0 - Meathook
1 - Salramm the Fleshcrafter
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
index ea3bdc45a6f..53316067148 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_aeonus.cpp
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, The Dark Portal
EndScriptData */
#include "precompiled.h"
-#include "def_dark_portal.h"
+#include "dark_portal.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
index eb0471fc278..05173387b64 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_chrono_lord_deja.cpp
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, The Dark Portal
EndScriptData */
#include "precompiled.h"
-#include "def_dark_portal.h"
+#include "dark_portal.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
index 5b09e4cb117..8035d13d023 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/boss_temporus.cpp
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, The Dark Portal
EndScriptData */
#include "precompiled.h"
-#include "def_dark_portal.h"
+#include "dark_portal.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
index afb2759a9f9..1bee3ffd8d0 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.cpp
@@ -28,7 +28,7 @@ npc_saat
EndContentData */
#include "precompiled.h"
-#include "def_dark_portal.h"
+#include "dark_portal.h"
#define SAY_ENTER -1269020 //where does this belong?
#define SAY_INTRO -1269021
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/def_dark_portal.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h
index 7bfd8c917d7..7bfd8c917d7 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/def_dark_portal.h
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/dark_portal.h
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
index ac4de810a14..7f06116efe4 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/dark_portal/instance_dark_portal.cpp
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, The Dark Portal
EndScriptData */
#include "precompiled.h"
-#include "def_dark_portal.h"
+#include "dark_portal.h"
#define MAX_ENCOUNTER 2
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
index b00e017e816..2126ae80efa 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_anetheron.cpp
@@ -1,6 +1,6 @@
#include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
#include "hyjal_trash.h"
#define SPELL_CARRION_SWARM 31306
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
index bcbacacbf90..ad781da0c9f 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_archimonde.cpp
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Mount Hyjal
EndScriptData */
#include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
#include "SpellAuras.h"
#include "hyjal_trash.h"
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
index a61d009284f..36c6c6c0b4b 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_azgalor.cpp
@@ -1,6 +1,6 @@
#include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
#include "hyjal_trash.h"
#define SPELL_RAIN_OF_FIRE 31340
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
index e1d65ff90a4..f56d4707d4c 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_kazrogal.cpp
@@ -1,6 +1,6 @@
#include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
#include "hyjal_trash.h"
#define SPELL_CLEAVE 31436
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
index da0d6c2dd5a..61df1738cf0 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/boss_rage_winterchill.cpp
@@ -1,6 +1,6 @@
#include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
#include "hyjal_trash.h"
#define SPELL_FROST_ARMOR 31256
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h
index bf2d6d99f90..bf2d6d99f90 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/def_hyjal.h
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal.h
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
index c646c47699c..b06334101ae 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjalAI.h
@@ -5,7 +5,7 @@
#ifndef SC_HYJALAI_H
#define SC_HYJALAI_H
-#include "def_hyjal.h"
+#include "hyjal.h"
#include "escort_ai.h"
// Trash Mobs summoned in waves
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
index 9fb4ba90b19..3fb245a46a7 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.cpp
@@ -1,6 +1,6 @@
#include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
#include "hyjal_trash.h"
#include "hyjalAI.h"
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
index d2272b72c16..e70ebf7dcd4 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/hyjal_trash.h
@@ -2,7 +2,7 @@
#ifndef SC_HYJAL_TRASH_AI_H
#define SC_HYJAL_TRASH_AI_H
-#include "def_hyjal.h"
+#include "hyjal.h"
#include "escort_ai.h"
#define MINRAIDDAMAGE 700000//minimal damage before trash can drop loot and reputation, resets if faction leader dies
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
index fc4c7485357..5e7ade4d19a 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/hyjal/instance_hyjal.cpp
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Mount Hyjal
EndScriptData */
#include "precompiled.h"
-#include "def_hyjal.h"
+#include "hyjal.h"
#include "hyjal_trash.h"
enum eEnums
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
index 6582e114049..f3dbe759646 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_captain_skarloc.cpp
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Old Hillsbrad Foothills
EndScriptData */
#include "precompiled.h"
-#include "def_old_hillsbrad.h"
+#include "old_hillsbrad.h"
#define SAY_ENTER -1560000
#define SAY_TAUNT1 -1560001
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
index d430cf92863..74f905d62db 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_epoch_hunter.cpp
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Old Hillsbrad Foothills
EndScriptData */
#include "precompiled.h"
-#include "def_old_hillsbrad.h"
+#include "old_hillsbrad.h"
#define SAY_ENTER1 -1560013
#define SAY_ENTER2 -1560014
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
index f396c556dae..8f3cd4420da 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/boss_leutenant_drake.cpp
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Old Hillsbrad Foothills
EndScriptData */
#include "precompiled.h"
-#include "def_old_hillsbrad.h"
+#include "old_hillsbrad.h"
#include "escort_ai.h"
/*######
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
index c8484765504..50b2be37648 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/instance_old_hillsbrad.cpp
@@ -22,7 +22,7 @@ SDCategory: Caverns of Time, Old Hillsbrad Foothills
EndScriptData */
#include "precompiled.h"
-#include "def_old_hillsbrad.h"
+#include "old_hillsbrad.h"
#define MAX_ENCOUNTER 6
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
index a3bfa20aee3..768694f5d2a 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.cpp
@@ -29,7 +29,7 @@ EndContentData */
#include "precompiled.h"
#include "escort_ai.h"
-#include "def_old_hillsbrad.h"
+#include "old_hillsbrad.h"
#define QUEST_ENTRY_HILLSBRAD 10282
#define QUEST_ENTRY_DIVERSION 10283
diff --git a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
index 3253a384217..3253a384217 100644
--- a/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/def_old_hillsbrad.h
+++ b/src/bindings/scripts/scripts/kalimdor/caverns_of_time/old_hillsbrad/old_hillsbrad.h
diff --git a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
index 4937e16d711..0764db846a0 100644
--- a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/instance_razorfen_kraul.cpp
@@ -22,7 +22,7 @@ SDCategory: Razorfen Kraul
EndScriptData */
#include "precompiled.h"
-#include "def_razorfen_kraul.h"
+#include "razorfen_kraul.h"
#define WARD_KEEPERS_NR 2
diff --git a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
index fec2cf711da..fb1df6612d0 100644
--- a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.cpp
@@ -27,7 +27,7 @@ EndContentData */
#include "precompiled.h"
#include "escort_ai.h"
-#include "def_razorfen_kraul.h"
+#include "razorfen_kraul.h"
#define SAY_READY -1047000
#define SAY_POINT -10470001
diff --git a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.h
index e2219986f63..e2219986f63 100644
--- a/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/def_razorfen_kraul.h
+++ b/src/bindings/scripts/scripts/kalimdor/razorfen_kraul/razorfen_kraul.h
diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
index 3b08d8b6eb1..cced5690faf 100644
--- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ayamiss.cpp
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"
/*
To do:
diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
index 40f23d66101..17bf770ce85 100644
--- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_buru.cpp
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"
enum Yells
{
diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
index 722f02ec7f3..b2e2998376a 100644
--- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_kurinnaxx.cpp
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"
enum Spells
{
diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
index b3cd4b934a6..e60b9ca3c58 100644
--- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_moam.cpp
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"
enum Emotes
{
diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
index 306913ed6bd..5aa63a04116 100644
--- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_ossirian.cpp
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"
enum Yells
{
diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
index 8568c43ce11..be80cb24ff9 100644
--- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/boss_rajaxx.cpp
@@ -22,7 +22,7 @@ SDCategory: Ruins of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"
enum Yells
{
diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
index 68ff1ff1ee2..ecd1d62d4de 100644
--- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/instance_ruins_of_ahnqiraj.cpp
@@ -22,7 +22,8 @@ SDCategory: Ruins of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_ruins_of_ahnqiraj.h"
+#include "ruins_of_ahnqiraj.h"
+
#define MAX_ENCOUNTER 6
/* Ruins of Ahn'Qiraj encounters:
diff --git a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/def_ruins_of_ahnqiraj.h b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
index c53a0c8050d..c53a0c8050d 100644
--- a/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/def_ruins_of_ahnqiraj.h
+++ b/src/bindings/scripts/scripts/kalimdor/ruins_of_ahnqiraj/ruins_of_ahnqiraj.h
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
index bd8888f4981..9fb0bdc00be 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_bug_trio.cpp
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"
#define SPELL_CLEAVE 26350
#define SPELL_TOXIC_VOLLEY 25812
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
index 5accf61a979..ed8c109e78e 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_cthun.cpp
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"
//Text emote
#define EMOTE_WEAKENED -1531011
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
index 13bf15fe66a..fa3b7f76d11 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_ouro.cpp
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"
#define SPELL_SWEEP 26103
#define SPELL_SANDBLAST 26102
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
index 1c988387993..6e06928ef5b 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_skeram.cpp
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"
#include "Group.h"
#define SAY_AGGRO1 -1531000
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
index b049fe25fa1..0e751a7e176 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/boss_twinemperors.cpp
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"
#include "WorldPacket.h"
#include "Item.h"
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
index 489a415cf81..e907e3f1a04 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/instance_temple_of_ahnqiraj.cpp
@@ -22,7 +22,7 @@ SDCategory: Temple of Ahn'Qiraj
EndScriptData */
#include "precompiled.h"
-#include "def_temple_of_ahnqiraj.h"
+#include "temple_of_ahnqiraj.h"
struct TRINITY_DLL_DECL instance_temple_of_ahnqiraj : public ScriptedInstance
{
diff --git a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
index 5d545ed7c74..5d545ed7c74 100644
--- a/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/def_temple_of_ahnqiraj.h
+++ b/src/bindings/scripts/scripts/kalimdor/temple_of_ahnqiraj/temple_of_ahnqiraj.h
diff --git a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
index 480272c6376..7e0c49428a7 100644
--- a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/instance_wailing_caverns.cpp
@@ -22,7 +22,7 @@ SDCategory: Wailing Caverns
EndScriptData */
#include "precompiled.h"
-#include "def_wailing_caverns.h"
+#include "wailing_caverns.h"
#define MAX_ENCOUNTER 9
diff --git a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
index 4985746d8fc..f6161ee65b6 100644
--- a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
+++ b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.cpp
@@ -26,7 +26,7 @@ EndContentData */
#include "precompiled.h"
#include "escort_ai.h"
-#include "def_wailing_caverns.h"
+#include "wailing_caverns.h"
/*######
## npc_disciple_of_naralex
diff --git a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/def_wailing_caverns.h b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.h
index f6c7bee8571..f6c7bee8571 100644
--- a/src/bindings/scripts/scripts/kalimdor/wailing_caverns/def_wailing_caverns.h
+++ b/src/bindings/scripts/scripts/kalimdor/wailing_caverns/wailing_caverns.h
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
index eafd0b2d0fd..972a8eda9a4 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/boss_tailonking_ikiss.cpp
@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Sethekk Halls
EndScriptData */
#include "precompiled.h"
-#include "def_sethekk_halls.h"
+#include "sethekk_halls.h"
#define SAY_INTRO -1556007
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
index 942325bd315..3d76122a9e0 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/instance_sethekk_halls.cpp
@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Sethekk Halls
EndScriptData */
#include "precompiled.h"
-#include "def_sethekk_halls.h"
+#include "sethekk_halls.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/def_sethekk_halls.h b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h
index 79a6cd4952d..79a6cd4952d 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/def_sethekk_halls.h
+++ b/src/bindings/scripts/scripts/outland/auchindoun/sethekk_halls/sethekk_halls.h
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
index aeb9f15b8ba..916755d13c3 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_ambassador_hellmaw.cpp
@@ -23,7 +23,7 @@ EndScriptData */
#include "precompiled.h"
#include "escort_ai.h"
-#include "def_shadow_labyrinth.h"
+#include "shadow_labyrinth.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
index 83d7586da1c..94af5f66508 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_blackheart_the_inciter.cpp
@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Shadow Labyrinth
EndScriptData */
#include "precompiled.h"
-#include "def_shadow_labyrinth.h"
+#include "shadow_labyrinth.h"
#define SPELL_INCITE_CHAOS 33676
#define SPELL_INCITE_CHAOS_B 33684 //debuff applied to each member of party
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
index 8508ad788bb..eac08d62c19 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_grandmaster_vorpil.cpp
@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Shadow Labyrinth
EndScriptData */
#include "precompiled.h"
-#include "def_shadow_labyrinth.h"
+#include "shadow_labyrinth.h"
#define SAY_INTRO -1555028
#define SAY_AGGRO1 -1555029
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
index ac1991d0be2..e6f7e0a0129 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/boss_murmur.cpp
@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Shadow Labyrinth
EndScriptData */
#include "precompiled.h"
-#include "def_shadow_labyrinth.h"
+#include "shadow_labyrinth.h"
#define EMOTE_SONIC_BOOM -1555036
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
index df4244991ee..94989655827 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
+++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/instance_shadow_labyrinth.cpp
@@ -22,7 +22,7 @@ SDCategory: Auchindoun, Shadow Labyrinth
EndScriptData */
#include "precompiled.h"
-#include "def_shadow_labyrinth.h"
+#include "shadow_labyrinth.h"
#define MAX_ENCOUNTER 5
diff --git a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/def_shadow_labyrinth.h b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
index a78955368bf..a78955368bf 100644
--- a/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/def_shadow_labyrinth.h
+++ b/src/bindings/scripts/scripts/outland/auchindoun/shadow_labyrinth/shadow_labyrinth.h
diff --git a/src/bindings/scripts/scripts/outland/black_temple/black_temple.cpp b/src/bindings/scripts/scripts/outland/black_temple/black_temple.cpp
index 270dafabe54..4d2bb41d5d5 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/black_temple.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/black_temple.cpp
@@ -26,7 +26,7 @@ npc_spirit_of_olum
EndContentData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
/*###
# npc_spirit_of_olum
diff --git a/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h b/src/bindings/scripts/scripts/outland/black_temple/black_temple.h
index b7432cd5b20..b7432cd5b20 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/def_black_temple.h
+++ b/src/bindings/scripts/scripts/outland/black_temple/black_temple.h
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
index 2aaf2cbf6ae..9e89c1601d6 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_bloodboil.cpp
@@ -22,7 +22,7 @@ SDCategory: Black Temple
EndScriptData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
//Speech'n'Sound
#define SAY_AGGRO -1564029
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp
index 65364d06bc3..e3d9f3db5ae 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_illidan.cpp
@@ -22,7 +22,7 @@ SDCategory: Black Temple
EndScriptData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
#define GETGO(obj, guid) GameObject* obj = pInstance->instance->GetGameObject(guid)
#define GETUNIT(unit, guid) Unit* unit = Unit::GetUnit(*m_creature, guid)
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp
index 37cb75ca380..decd79c17b4 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_mother_shahraz.cpp
@@ -22,7 +22,7 @@ SDCategory: Black Temple
EndScriptData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
//Speech'n'Sounds
#define SAY_TAUNT1 -1564018
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
index ef42da568a3..f8d64512640 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_reliquary_of_souls.cpp
@@ -22,7 +22,7 @@ SDCategory: Black Temple
EndScriptData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
#include "Spell.h"
//Sound'n'speech
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp
index 63e9c4f0b59..b7a2d7fec19 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_shade_of_akama.cpp
@@ -22,7 +22,7 @@ SDCategory: Black Temple
EndScriptData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
#define SAY_DEATH -1564013
#define SAY_LOW_HEALTH -1564014
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp
index a4e1b2d5428..9b652c20c33 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_supremus.cpp
@@ -22,7 +22,7 @@ SDCategory: Black Temple
EndScriptData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
#define EMOTE_NEW_TARGET -1564010
#define EMOTE_PUNCH_GROUND -1564011 //DoScriptText(EMOTE_PUNCH_GROUND, m_creature);
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp
index 968fc3d6b98..0dca28525f9 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_teron_gorefiend.cpp
@@ -22,7 +22,7 @@ SDCategory: Black Temple
EndScriptData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
//Speech'n'sound
#define SAY_INTRO -1564037
diff --git a/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp
index 1150b9e3ae5..0e58ba37d7c 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/boss_warlord_najentus.cpp
@@ -22,7 +22,7 @@ SDCategory: Black Temple
EndScriptData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp b/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp
index 7c32bb704dc..6ee2b314296 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/illidari_council.cpp
@@ -22,7 +22,7 @@ SDCategory: Black Temple
EndScriptData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
//Speech'n'Sounds
#define SAY_GATH_SLAY -1564085
diff --git a/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp b/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp
index 1d41f2c63f4..bee7d849885 100644
--- a/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp
+++ b/src/bindings/scripts/scripts/outland/black_temple/instance_black_temple.cpp
@@ -22,7 +22,7 @@ SDCategory: Black Temple
EndScriptData */
#include "precompiled.h"
-#include "def_black_temple.h"
+#include "black_temple.h"
#define MAX_ENCOUNTER 9
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
index 75f0c14d884..5321b1cb5d2 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_fathomlord_karathress.cpp
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
EndScriptData */
#include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"
#include "escort_ai.h"
#define SAY_AGGRO -1548021
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
index b7324a9850f..a9d4e857a7d 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_hydross_the_unstable.cpp
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
EndScriptData */
#include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"
#define SAY_AGGRO -1548000
#define SAY_SWITCH_TO_CLEAN -1548001
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
index bf85c02863d..a9ef31176fd 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lady_vashj.cpp
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
EndScriptData */
#include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"
#include "simple_ai.h"
#include "Spell.h"
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
index 7e5922235b1..d1d8e160e15 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_leotheras_the_blind.cpp
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
EndScriptData */
#include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"
// --- Spells used by Leotheras The Blind
#define SPELL_WHIRLWIND 37640
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
index 7aca819af4b..82de875628b 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_lurker_below.cpp
@@ -22,7 +22,7 @@ SDCategory: The Lurker Below
EndScriptData */
#include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"
#include "simple_ai.h"
#include "Spell.h"
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
index 506365c468e..73f8992fa7a 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/boss_morogrim_tidewalker.cpp
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
EndScriptData */
#include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"
#define SAY_AGGRO -1548030
#define SAY_SUMMON1 -1548031
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
index 4229c9a8a06..b83fafa9f1e 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/instance_serpent_shrine.cpp
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, Serpent Shrine Cavern
EndScriptData */
#include "precompiled.h"
-#include "def_serpent_shrine.h"
+#include "serpent_shrine.h"
#define MAX_ENCOUNTER 6
#define SPELL_SCALDINGWATER 37284
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h
index adfa39dc7e0..adfa39dc7e0 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/def_serpent_shrine.h
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/serpent_shrine/serpent_shrine.h
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
index fc23f175931..7df3157e555 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_hydromancer_thespia.cpp
@@ -27,7 +27,7 @@ mob_coilfang_waterelemental
EndContentData */
#include "precompiled.h"
-#include "def_steam_vault.h"
+#include "steam_vault.h"
#define SAY_SUMMON -1545000
#define SAY_AGGRO_1 -1545001
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
index d24279be1ec..8726d91d725 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_mekgineer_steamrigger.cpp
@@ -27,7 +27,7 @@ mob_steamrigger_mechanic
EndContentData */
#include "precompiled.h"
-#include "def_steam_vault.h"
+#include "steam_vault.h"
#define SAY_MECHANICS -1545007
#define SAY_AGGRO_1 -1545008
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
index f3a0be3bcfb..bf042c90c8d 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/boss_warlord_kalithresh.cpp
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, The Steamvault
EndScriptData */
#include "precompiled.h"
-#include "def_steam_vault.h"
+#include "steam_vault.h"
#define SAY_INTRO -1545016
#define SAY_REGEN -1545017
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
index e13aafce51d..ea7c42bd9aa 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/instance_steam_vault.cpp
@@ -22,7 +22,7 @@ SDCategory: Coilfang Resevoir, The Steamvault
EndScriptData */
#include "precompiled.h"
-#include "def_steam_vault.h"
+#include "steam_vault.h"
#define MAX_ENCOUNTER 4
diff --git a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/def_steam_vault.h b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/steam_vault.h
index 4b407ac4816..4b407ac4816 100644
--- a/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/def_steam_vault.h
+++ b/src/bindings/scripts/scripts/outland/coilfang_resevoir/steam_vault/steam_vault.h
diff --git a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp
index 97de7ab4149..12cd1a6e922 100644
--- a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp
+++ b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_gruul.cpp
@@ -22,7 +22,7 @@ SDCategory: Gruul's Lair
EndScriptData */
#include "precompiled.h"
-#include "def_gruuls_lair.h"
+#include "gruuls_lair.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
index 30a09538ab2..6c7b20a4a51 100644
--- a/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
+++ b/src/bindings/scripts/scripts/outland/gruuls_lair/boss_high_king_maulgar.cpp
@@ -22,7 +22,7 @@ SDCategory: Gruul's Lair
EndScriptData */
#include "precompiled.h"
-#include "def_gruuls_lair.h"
+#include "gruuls_lair.h"
#define SAY_AGGRO -1565000
#define SAY_ENRAGE -1565001
diff --git a/src/bindings/scripts/scripts/outland/gruuls_lair/def_gruuls_lair.h b/src/bindings/scripts/scripts/outland/gruuls_lair/gruuls_lair.h
index 7003dcb1e26..7003dcb1e26 100644
--- a/src/bindings/scripts/scripts/outland/gruuls_lair/def_gruuls_lair.h
+++ b/src/bindings/scripts/scripts/outland/gruuls_lair/gruuls_lair.h
diff --git a/src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp b/src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
index 8de6f2ed18a..80ae5bbe8ab 100644
--- a/src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
+++ b/src/bindings/scripts/scripts/outland/gruuls_lair/instance_gruuls_lair.cpp
@@ -22,7 +22,7 @@ SDCategory: Gruul's Lair
EndScriptData */
#include "precompiled.h"
-#include "def_gruuls_lair.h"
+#include "gruuls_lair.h"
#define MAX_ENCOUNTER 2
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/def_blood_furnace.h b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h
index b845c66823f..b845c66823f 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/def_blood_furnace.h
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/blood_furnace.h
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
index d359c9c25f7..1075b979e3a 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_broggok.cpp
@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Blood Furnace
EndScriptData */
#include "precompiled.h"
-#include "def_blood_furnace.h"
+#include "blood_furnace.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
index 236b35f0031..2ca3b67c727 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_kelidan_the_breaker.cpp
@@ -27,7 +27,7 @@ mob_shadowmoon_channeler
EndContentData */
#include "precompiled.h"
-#include "def_blood_furnace.h"
+#include "blood_furnace.h"
enum eKelidan
{
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
index 35fd93d0514..91f5873ed96 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/boss_the_maker.cpp
@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Blood Furnace
EndScriptData */
#include "precompiled.h"
-#include "def_blood_furnace.h"
+#include "blood_furnace.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
index 7473f84c5eb..4e66d15d304 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/blood_furnace/instance_blood_furnace.cpp
@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Blood Furnace
EndScriptData */
#include "precompiled.h"
-#include "def_blood_furnace.h"
+#include "blood_furnace.h"
#define ENTRY_SEWER1 181823
#define ENTRY_SEWER2 181766
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
index 3c453949baa..3c453949baa 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/def_hellfire_ramparts.h
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/hellfire_ramparts.h
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
index 5942f0142ef..0bd4b659c78 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/hellfire_ramparts/instance_hellfire_ramparts.cpp
@@ -22,7 +22,7 @@ SDCategory: Hellfire Ramparts
EndScriptData */
#include "precompiled.h"
-#include "def_hellfire_ramparts.h"
+#include "hellfire_ramparts.h"
struct TRINITY_DLL_DECL instance_ramparts : public ScriptedInstance
{
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
index c599f71f04f..4188750bcde 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/boss_magtheridon.cpp
@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Magtheridon's lair
EndScriptData */
#include "precompiled.h"
-#include "def_magtheridons_lair.h"
+#include "magtheridons_lair.h"
struct Yell
{
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
index e1778315376..49c379889d2 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/instance_magtheridons_lair.cpp
@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Magtheridon's lair
EndScriptData */
#include "precompiled.h"
-#include "def_magtheridons_lair.h"
+#include "magtheridons_lair.h"
#define SPELL_SOUL_TRANSFER 30531 // core bug, does not support target 7
#define SPELL_BLAZE_TARGET 30541 // core bug, does not support target 7
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
index c5469acaea0..c5469acaea0 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/def_magtheridons_lair.h
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/magtheridons_lair/magtheridons_lair.h
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
index 4ae379d988e..6880256a710 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_nethekurse.cpp
@@ -28,7 +28,7 @@ mob_lesser_shadow_fissure
EndContentData */
#include "precompiled.h"
-#include "def_shattered_halls.h"
+#include "shattered_halls.h"
struct Say
{
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
index 9a214be170a..2b0a55a651b 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/boss_warbringer_omrogg.cpp
@@ -27,7 +27,7 @@ boss_warbringer_omrogg
EndContentData */
#include "precompiled.h"
-#include "def_shattered_halls.h"
+#include "shattered_halls.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
index 864a49a84ba..740e5e8be0d 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/instance_shattered_halls.cpp
@@ -22,7 +22,7 @@ SDCategory: Hellfire Citadel, Shattered Halls
EndScriptData */
#include "precompiled.h"
-#include "def_shattered_halls.h"
+#include "shattered_halls.h"
#define MAX_ENCOUNTER 2
diff --git a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/def_shattered_halls.h b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h
index cbfa23ec4e0..cbfa23ec4e0 100644
--- a/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/def_shattered_halls.h
+++ b/src/bindings/scripts/scripts/outland/hellfire_citadel/shattered_halls/shattered_halls.h
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
index 6c5460e1d83..c4c4f7f89ae 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.cpp
@@ -28,7 +28,7 @@ mob_zerekethvoidzone
EndContentData */
#include "precompiled.h"
-#include "def_arcatraz.h"
+#include "arcatraz.h"
/*#####
# npc_millhouse_manastorm
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/def_arcatraz.h b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.h
index 3f8dee8bbd0..3f8dee8bbd0 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/def_arcatraz.h
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/arcatraz.h
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
index e5620e908c2..19451b5ab7c 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/boss_harbinger_skyriss.cpp
@@ -27,7 +27,7 @@ boss_harbinger_skyriss_illusion
EndContentData */
#include "precompiled.h"
-#include "def_arcatraz.h"
+#include "arcatraz.h"
#define SAY_INTRO -1552000
#define SAY_AGGRO -1552001
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
index c4eaece8d9f..fa8fcc89ed7 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/arcatraz/instance_arcatraz.cpp
@@ -22,7 +22,7 @@ SDCategory: Tempest Keep, The Arcatraz
EndScriptData */
#include "precompiled.h"
-#include "def_arcatraz.h"
+#include "arcatraz.h"
#define MAX_ENCOUNTER 9
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
index d62e5557e6e..3ea6fc8e596 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_alar.cpp
@@ -22,7 +22,7 @@ SDCategory: Tempest Keep, The Eye
EndScriptData */
#include "precompiled.h"
-#include "def_the_eye.h"
+#include "the_eye.h"
#define SPELL_FLAME_BUFFET 34121 // Flame Buffet - every 1,5 secs in phase 1 if there is no victim in melee range and after Dive Bomb in phase 2 with same conditions
#define SPELL_FLAME_QUILLS 34229 // Randomly after changing position in phase after watching tonns of movies, set probability 20%
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
index 2b0ed6aa225..8d61fb29f56 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_astromancer.cpp
@@ -22,7 +22,7 @@ SDCategory: Tempest Keep, The Eye
EndScriptData */
#include "precompiled.h"
-#include "def_the_eye.h"
+#include "the_eye.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
index ab6f38d846c..b0919f1e06b 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_kaelthas.cpp
@@ -22,7 +22,7 @@ SDCategory: Tempest Keep, The Eye
EndScriptData */
#include "precompiled.h"
-#include "def_the_eye.h"
+#include "the_eye.h"
#include "WorldPacket.h"
enum eEnums
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
index 5db46a68bb2..a1063356ed3 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/boss_void_reaver.cpp
@@ -22,7 +22,7 @@ SDCategory: Tempest Keep, The Eye
EndScriptData */
#include "precompiled.h"
-#include "def_the_eye.h"
+#include "the_eye.h"
enum eEnums
{
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
index 16ae07fe034..1a278851680 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/instance_the_eye.cpp
@@ -22,7 +22,7 @@ SDCategory: Tempest Keep, The Eye
EndScriptData */
#include "precompiled.h"
-#include "def_the_eye.h"
+#include "the_eye.h"
#define MAX_ENCOUNTER 5
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp
index a7e47718017..cfb96a3a4dc 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.cpp
@@ -26,7 +26,7 @@ mob_crystalcore_devastator
EndContentData */
#include "precompiled.h"
-#include "def_the_eye.h"
+#include "the_eye.h"
#define SPELL_COUNTERCHARGE 35035
#define SPELL_KNOCKAWAY 22893
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/def_the_eye.h b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.h
index d0d3ea09061..d0d3ea09061 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/def_the_eye.h
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_eye/the_eye.h
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
index aef118ff42f..f1122027490 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/boss_nethermancer_sepethrea.cpp
@@ -22,7 +22,7 @@ SDCategory: Tempest Keep, The Mechanar
EndScriptData */
#include "precompiled.h"
-#include "def_mechanar.h"
+#include "mechanar.h"
#define SAY_AGGRO -1554013
#define SAY_SUMMON -1554014
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
index 9a30eec6f71..9ff03182f31 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/instance_mechanar.cpp
@@ -22,7 +22,7 @@ SDCategory: Mechanar
EndScriptData */
#include "precompiled.h"
-#include "def_mechanar.h"
+#include "mechanar.h"
#define MAX_ENCOUNTER 1
diff --git a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/def_mechanar.h b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/mechanar.h
index d1b53eebf53..d1b53eebf53 100644
--- a/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/def_mechanar.h
+++ b/src/bindings/scripts/scripts/outland/tempest_keep/the_mechanar/mechanar.h