A great purge of obsolete macros.

--HG-- branch : trunk
author: Xanadu <none@none> 2010-02-05 00:31:28 +0100
committer: Xanadu <none@none> 2010-02-05 00:31:28 +0100
commit: a5d1bc77abc275402240bec1380fa87f04461ba8 (patch)
tree: f33b3e3f10a4f0723d85b5bec4764f4518501c06 /src/scripts/eastern_kingdoms
parent: b0b261585f4c410736548cd536642cb104cb7023 (diff)
164 files changed, 301 insertions, 301 deletions
diff --git a/src/scripts/eastern_kingdoms/arathi_highlands.cpp b/src/scripts/eastern_kingdoms/arathi_highlands.cpp
index f48326d22c6..d316bf67df9 100644
--- a/src/scripts/eastern_kingdoms/arathi_highlands.cpp
+++ b/src/scripts/eastern_kingdoms/arathi_highlands.cpp
@@ -49,7 +49,7 @@ enum eEnums
     MOB_VENGEFUL_SURGE      = 2776
 };
 
-struct TRINITY_DLL_DECL npc_professor_phizzlethorpeAI : public npc_escortAI
+struct npc_professor_phizzlethorpeAI : public npc_escortAI
 {
     npc_professor_phizzlethorpeAI(Creature *c) : npc_escortAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
index 0b03bfbd2a8..e9256750d31 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/blackrock_depths.cpp
@@ -119,7 +119,7 @@ enum GrimstoneTexts
 };
 
 //TODO: implement quest part of event (different end boss)
-struct TRINITY_DLL_DECL npc_grimstoneAI : public npc_escortAI
+struct npc_grimstoneAI : public npc_escortAI
 {
     npc_grimstoneAI(Creature *c) : npc_escortAI(c)
     {
@@ -352,7 +352,7 @@ enum PhalanxSpells
     SPELL_MIGHTYBLOW                                       = 14099
 };
 
-struct TRINITY_DLL_DECL mob_phalanxAI : public ScriptedAI
+struct mob_phalanxAI : public ScriptedAI
 {
     mob_phalanxAI(Creature *c) : ScriptedAI(c) {}
 
@@ -566,7 +566,7 @@ enum DughalQuests
 #define GOSSIP_DUGHAL           "You're free, Dughal! Get out of here!"
 
 /*
-struct TRINITY_DLL_DECL npc_dughal_stormwingAI : public npc_escortAI
+struct npc_dughal_stormwingAI : public npc_escortAI
 {
     npc_dughal_stormwingAI(Creature *c) : npc_escortAI(c) {}
 
@@ -666,7 +666,7 @@ bool GossipSelect_npc_dughal_stormwing(Player* pPlayer, Creature* pCreature, uin
 
 Player* pPlayerStart;
 /*
-struct TRINITY_DLL_DECL npc_marshal_windsorAI : public npc_escortAI
+struct npc_marshal_windsorAI : public npc_escortAI
 {
     npc_marshal_windsorAI(Creature *c) : npc_escortAI(c)
     {
@@ -831,7 +831,7 @@ bool QuestAccept_npc_marshal_windsor(Player* pPlayer, Creature* pCreature, Quest
 
 int wp = 0;
 /*
-struct TRINITY_DLL_DECL npc_marshal_reginald_windsorAI : public npc_escortAI
+struct npc_marshal_reginald_windsorAI : public npc_escortAI
 {
     npc_marshal_reginald_windsorAI(Creature *c) : npc_escortAI(c)
     {
@@ -1026,7 +1026,7 @@ CreatureAI* GetAI_npc_marshal_reginald_windsor(Creature* pCreature)
 
 #define SAY_TOBIAS_FREE         "Thank you! I will run for safety immediately!"
 /*
-struct TRINITY_DLL_DECL npc_tobias_seecherAI : public npc_escortAI
+struct npc_tobias_seecherAI : public npc_escortAI
 {
     npc_tobias_seecherAI(Creature *c) :npc_escortAI(c) {}
 
@@ -1134,7 +1134,7 @@ enum RocknotQuests
     QUEST_ALE                                              = 4295
 };
 
-struct TRINITY_DLL_DECL npc_rocknotAI : public npc_escortAI
+struct npc_rocknotAI : public npc_escortAI
 {
     npc_rocknotAI(Creature *c) : npc_escortAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
index 82475e89fec..acbef7f482b 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_ambassador_flamelash.cpp
@@ -28,7 +28,7 @@ enum Spells
     SPELL_FIREBLAST                                        = 15573
 };
 
-struct TRINITY_DLL_DECL boss_ambassador_flamelashAI : public ScriptedAI
+struct boss_ambassador_flamelashAI : public ScriptedAI
 {
     boss_ambassador_flamelashAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp
index 1d96cffca7d..2d13f4abc52 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_anubshiah.cpp
@@ -32,7 +32,7 @@ enum Spells
     SPELL_ENVELOPINGWEB                                    = 15471
 };
 
-struct TRINITY_DLL_DECL boss_anubshiahAI : public ScriptedAI
+struct boss_anubshiahAI : public ScriptedAI
 {
     boss_anubshiahAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
index 09cf80a19b9..8ea01ff5933 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_emperor_dagran_thaurissan.cpp
@@ -35,7 +35,7 @@ enum Spells
     SPELL_AVATAROFFLAME                                    = 15636
 };
 
-struct TRINITY_DLL_DECL boss_draganthaurissanAI : public ScriptedAI
+struct boss_draganthaurissanAI : public ScriptedAI
 {
     boss_draganthaurissanAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp
index fe33defffd7..1ddfa7e959a 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_general_angerforge.cpp
@@ -30,7 +30,7 @@ enum Spells
     SPELL_CLEAVE                                           = 20691
 };
 
-struct TRINITY_DLL_DECL boss_general_angerforgeAI : public ScriptedAI
+struct boss_general_angerforgeAI : public ScriptedAI
 {
     boss_general_angerforgeAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
index b6c2b3321f7..8a9ad969c72 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_gorosh_the_dervish.cpp
@@ -29,7 +29,7 @@ enum Spells
     SPELL_MORTALSTRIKE                                     = 24573
 };
 
-struct TRINITY_DLL_DECL boss_gorosh_the_dervishAI : public ScriptedAI
+struct boss_gorosh_the_dervishAI : public ScriptedAI
 {
     boss_gorosh_the_dervishAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp
index 38b2809f71d..0014fc5fe73 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_grizzle.cpp
@@ -34,7 +34,7 @@ enum Spells
     SPELL_FRENZY                                           = 28371
 };
 
-struct TRINITY_DLL_DECL boss_grizzleAI : public ScriptedAI
+struct boss_grizzleAI : public ScriptedAI
 {
     boss_grizzleAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
index d1505628512..0a7f380138a 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_high_interrogator_gerstahn.cpp
@@ -31,7 +31,7 @@ enum Spells
     SPELL_SHADOWSHIELD                                     = 22417
 };
 
-struct TRINITY_DLL_DECL boss_high_interrogator_gerstahnAI : public ScriptedAI
+struct boss_high_interrogator_gerstahnAI : public ScriptedAI
 {
     boss_high_interrogator_gerstahnAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp
index db3f895ea10..773eaf913cd 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_magmus.cpp
@@ -29,7 +29,7 @@ enum Spells
     SPELL_WARSTOMP                                         = 24375
 };
 
-struct TRINITY_DLL_DECL boss_magmusAI : public ScriptedAI
+struct boss_magmusAI : public ScriptedAI
 {
     boss_magmusAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
index cc25152c46a..570fdb086a7 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_moira_bronzebeard.cpp
@@ -33,7 +33,7 @@ enum Spells
     SPELL_SMITE                                            = 10934
 };
 
-struct TRINITY_DLL_DECL boss_moira_bronzebeardAI : public ScriptedAI
+struct boss_moira_bronzebeardAI : public ScriptedAI
 {
     boss_moira_bronzebeardAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp
index c569cfaf8e0..44417bf1579 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/boss_tomb_of_seven.cpp
@@ -94,7 +94,7 @@ enum DoomrelSpells
     SPELL_SUMMON_VOIDWALKERS                               = 15092
 };
 
-struct TRINITY_DLL_DECL boss_doomrelAI : public ScriptedAI
+struct boss_doomrelAI : public ScriptedAI
 {
     boss_doomrelAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp b/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
index cd07c706e39..e04ed9e99c6 100644
--- a/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_depths/instance_blackrock_depths.cpp
@@ -70,7 +70,7 @@ enum eEnums
     GO_CHEST_SEVEN          = 169243
 };
 
-struct TRINITY_DLL_DECL instance_blackrock_depths : public ScriptedInstance
+struct instance_blackrock_depths : public ScriptedInstance
 {
     instance_blackrock_depths(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp
index d9f8a42688c..fab2c73dc4d 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_drakkisath.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 #define SPELL_CONFLIGURATION            16805
 #define SPELL_THUNDERCLAP               15548               //Not sure if right ID. 23931 would be a harder possibility.
 
-struct TRINITY_DLL_DECL boss_drakkisathAI : public ScriptedAI
+struct boss_drakkisathAI : public ScriptedAI
 {
     boss_drakkisathAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp
index 7321036e8ed..60885cc4de4 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_gyth.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_FREEZE             18763
 #define SPELL_FLAMEBREATH        20712
 
-struct TRINITY_DLL_DECL boss_gythAI : public ScriptedAI
+struct boss_gythAI : public ScriptedAI
 {
     boss_gythAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp
index 932a4c24366..62aff7322e8 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_halycon.cpp
@@ -31,7 +31,7 @@ EndScriptData */
 #define ADD_1Z                  64.401443
 #define ADD_1O                  3.124724
 
-struct TRINITY_DLL_DECL boss_halyconAI : public ScriptedAI
+struct boss_halyconAI : public ScriptedAI
 {
     boss_halyconAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp
index f0cf6a0b34a..9ec1ded5abe 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_highlord_omokk.cpp
@@ -31,7 +31,7 @@ EndScriptData */
 #define SPELL_KNOCKAWAY         20686
 #define SPELL_SLOW              22356
 
-struct TRINITY_DLL_DECL boss_highlordomokkAI : public ScriptedAI
+struct boss_highlordomokkAI : public ScriptedAI
 {
     boss_highlordomokkAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp
index c8e2f7719bf..6cfd8b5ca0e 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_mother_smolderweb.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_MOTHERSMILK               16468
 #define SPELL_SUMMON_SPIRE_SPIDERLING   16103
 
-struct TRINITY_DLL_DECL boss_mothersmolderwebAI : public ScriptedAI
+struct boss_mothersmolderwebAI : public ScriptedAI
 {
     boss_mothersmolderwebAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
index 8923032c70e..1032dc06c78 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_overlord_wyrmthalak.cpp
@@ -38,7 +38,7 @@ EndScriptData */
 #define ADD_2Z 88.195160
 #define ADD_2O 4.613114
 
-struct TRINITY_DLL_DECL boss_overlordwyrmthalakAI : public ScriptedAI
+struct boss_overlordwyrmthalakAI : public ScriptedAI
 {
     boss_overlordwyrmthalakAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
index 1a55ca0006e..25f7a2be61d 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_pyroguard_emberseer.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_FLAMEBUFFET       23341
 #define SPELL_PYROBLAST         17274
 
-struct TRINITY_DLL_DECL boss_pyroguard_emberseerAI : public ScriptedAI
+struct boss_pyroguard_emberseerAI : public ScriptedAI
 {
     boss_pyroguard_emberseerAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
index 39e12905a24..5d88df69915 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_quartermaster_zigris.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 #define SPELL_HEALING_POTION    15504
 #define SPELL_HOOKEDNET         15609
 
-struct TRINITY_DLL_DECL boss_quatermasterzigrisAI : public ScriptedAI
+struct boss_quatermasterzigrisAI : public ScriptedAI
 {
     boss_quatermasterzigrisAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp
index 9c6054f3600..342c110bdaa 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_rend_blackhand.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_CLEAVE                    20691
 #define SPELL_THUNDERCLAP               23931               //Not sure if he cast this spell
 
-struct TRINITY_DLL_DECL boss_rend_blackhandAI : public ScriptedAI
+struct boss_rend_blackhandAI : public ScriptedAI
 {
     boss_rend_blackhandAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
index 765cc4ea81b..4a81b4cd5b2 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_shadow_hunter_voshgajin.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_HEX               16708
 #define SPELL_CLEAVE            20691
 
-struct TRINITY_DLL_DECL boss_shadowvoshAI : public ScriptedAI
+struct boss_shadowvoshAI : public ScriptedAI
 {
     boss_shadowvoshAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp
index 2ebe9016aed..bd60eab0404 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_the_beast.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_IMMOLATE              20294
 #define SPELL_TERRIFYINGROAR        14100
 
-struct TRINITY_DLL_DECL boss_thebeastAI : public ScriptedAI
+struct boss_thebeastAI : public ScriptedAI
 {
     boss_thebeastAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp b/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp
index 8ec565a9adc..b598b40cb8a 100644
--- a/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp
+++ b/src/scripts/eastern_kingdoms/blackrock_spire/boss_warmaster_voone.cpp
@@ -30,7 +30,7 @@ EndScriptData */
 #define SPELL_PUMMEL            15615
 #define SPELL_THROWAXE          16075
 
-struct TRINITY_DLL_DECL boss_warmastervooneAI : public ScriptedAI
+struct boss_warmastervooneAI : public ScriptedAI
 {
     boss_warmastervooneAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
index 664cdb5121d..7706ede2e1f 100644
--- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
+++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_broodlord_lashlayer.cpp
@@ -31,7 +31,7 @@ EndScriptData */
 #define SPELL_MORTALSTRIKE      24573
 #define SPELL_KNOCKBACK         25778
 
-struct TRINITY_DLL_DECL boss_broodlordAI : public ScriptedAI
+struct boss_broodlordAI : public ScriptedAI
 {
     boss_broodlordAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
index 4fc1be6c306..cee08a0bbec 100644
--- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
+++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_chromaggus.cpp
@@ -57,7 +57,7 @@ enum Spells
     SPELL_ENRAGE                                           = 28747
 };
 
-struct TRINITY_DLL_DECL boss_chromaggusAI : public ScriptedAI
+struct boss_chromaggusAI : public ScriptedAI
 {
     boss_chromaggusAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp
index 531c292bd3b..0ccdffbdb90 100644
--- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp
+++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_ebonroc.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 #define SPELL_SHADOWOFEBONROC       23340
 #define SPELL_HEAL                  41386                   //Thea Heal spell of his Shadow
 
-struct TRINITY_DLL_DECL boss_ebonrocAI : public ScriptedAI
+struct boss_ebonrocAI : public ScriptedAI
 {
     boss_ebonrocAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp
index 56b89f7f969..7bcbf72d144 100644
--- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp
+++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_firemaw.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_WINGBUFFET        23339
 #define SPELL_FLAMEBUFFET       23341
 
-struct TRINITY_DLL_DECL boss_firemawAI : public ScriptedAI
+struct boss_firemawAI : public ScriptedAI
 {
     boss_firemawAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp
index 1992a9f61a7..8349d308c4f 100644
--- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp
+++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_flamegor.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 #define SPELL_WINGBUFFET         23339
 #define SPELL_FRENZY             23342                      //This spell periodically triggers fire nova
 
-struct TRINITY_DLL_DECL boss_flamegorAI : public ScriptedAI
+struct boss_flamegorAI : public ScriptedAI
 {
     boss_flamegorAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
index b233829d7f5..a81ca4c9640 100644
--- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
+++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_nefarian.cpp
@@ -58,7 +58,7 @@ EndScriptData */
 #define SPELL_HUNTER                23436                   //bow broke
 #define SPELL_ROGUE                 23414                   //Paralise
 
-struct TRINITY_DLL_DECL boss_nefarianAI : public ScriptedAI
+struct boss_nefarianAI : public ScriptedAI
 {
     boss_nefarianAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp
index db7cd5770bc..44ec9cb83f3 100644
--- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp
+++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_razorgore.cpp
@@ -35,7 +35,7 @@ EndScriptData */
 #define SPELL_FIREBALLVOLLEY    22425
 #define SPELL_CONFLAGRATION     23023
 
-struct TRINITY_DLL_DECL boss_razorgoreAI : public ScriptedAI
+struct boss_razorgoreAI : public ScriptedAI
 {
     boss_razorgoreAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp
index 036a9cee3c6..5fff79ad04c 100644
--- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp
+++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_vaelastrasz.cpp
@@ -38,7 +38,7 @@ EndScriptData */
 #define SPELL_BURNINGADRENALINE     23620
 #define SPELL_CLEAVE                20684                   //Chain cleave is most likely named something different and contains a dummy effect
 
-struct TRINITY_DLL_DECL boss_vaelAI : public ScriptedAI
+struct boss_vaelAI : public ScriptedAI
 {
     boss_vaelAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp b/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
index 3e041de6cea..8d841e71011 100644
--- a/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
+++ b/src/scripts/eastern_kingdoms/blackwing_lair/boss_victor_nefarius.cpp
@@ -67,7 +67,7 @@ EndScriptData */
 //If nefarian dies then he will kill himself then he will kill himself in his hiding place
 //To prevent players from doing the event twice
 
-struct TRINITY_DLL_DECL boss_victor_nefariusAI : public ScriptedAI
+struct boss_victor_nefariusAI : public ScriptedAI
 {
     boss_victor_nefariusAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/boss_kruul.cpp b/src/scripts/eastern_kingdoms/boss_kruul.cpp
index 2e06e33b51b..94ec16b7256 100644
--- a/src/scripts/eastern_kingdoms/boss_kruul.cpp
+++ b/src/scripts/eastern_kingdoms/boss_kruul.cpp
@@ -31,7 +31,7 @@ EndScriptData */
 #define SPELL_RAGE                  21340
 #define SPELL_CAPTURESOUL           21054
 
-struct TRINITY_DLL_DECL boss_kruulAI : public ScriptedAI
+struct boss_kruulAI : public ScriptedAI
 {
     boss_kruulAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/burning_steppes.cpp b/src/scripts/eastern_kingdoms/burning_steppes.cpp
index 4c66ef78412..a4e481dea83 100644
--- a/src/scripts/eastern_kingdoms/burning_steppes.cpp
+++ b/src/scripts/eastern_kingdoms/burning_steppes.cpp
@@ -44,7 +44,7 @@ EndContentData */
 #define GOSSIP_SELECT10 "Ahh... Ironfoe"
 #define GOSSIP_SELECT11 "Thanks, Ragged John. Your story was very uplifting and informative"
 
-struct TRINITY_DLL_DECL npc_ragged_johnAI : public ScriptedAI
+struct npc_ragged_johnAI : public ScriptedAI
 {
     npc_ragged_johnAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp b/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp
index 5d5ce9f7969..78baa137d14 100644
--- a/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp
+++ b/src/scripts/eastern_kingdoms/deadmines/boss_mr_smite.cpp
@@ -38,7 +38,7 @@ enum eSpels
     SAY_AGGRO               = -1036001
 };
 
-struct TRINITY_DLL_DECL boss_mr_smiteAI : public ScriptedAI
+struct boss_mr_smiteAI : public ScriptedAI
 {
     boss_mr_smiteAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
diff --git a/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp b/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
index 57042f9e6f1..1da65ed611a 100644
--- a/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
+++ b/src/scripts/eastern_kingdoms/deadmines/instance_deadmines.cpp
@@ -41,7 +41,7 @@ enum Misc
     DATA_PIRATES_DELAY_TIMER                               = 1000
 };
 
-struct TRINITY_DLL_DECL instance_deadmines : public ScriptedInstance
+struct instance_deadmines : public ScriptedInstance
 {
     instance_deadmines(Map* pMap) : ScriptedInstance(pMap) { Initialize(); };
 
diff --git a/src/scripts/eastern_kingdoms/dun_morogh.cpp b/src/scripts/eastern_kingdoms/dun_morogh.cpp
index 72aeca1b7e3..bdaedb4212c 100644
--- a/src/scripts/eastern_kingdoms/dun_morogh.cpp
+++ b/src/scripts/eastern_kingdoms/dun_morogh.cpp
@@ -34,7 +34,7 @@ EndContentData */
 // signed for 6172
 #define SAY_HEAL -1000280
 
-struct TRINITY_DLL_DECL npc_narm_faulkAI : public ScriptedAI
+struct npc_narm_faulkAI : public ScriptedAI
 {
     uint32 lifeTimer;
     bool spellHit;
diff --git a/src/scripts/eastern_kingdoms/duskwood.cpp b/src/scripts/eastern_kingdoms/duskwood.cpp
index a3e5d90033f..d9aa69a4545 100644
--- a/src/scripts/eastern_kingdoms/duskwood.cpp
+++ b/src/scripts/eastern_kingdoms/duskwood.cpp
@@ -54,7 +54,7 @@ bool AreaTrigger_at_twilight_grove(Player* pPlayer, const AreaTriggerEntry *at)
 #define SPELL_CREATURE_OF_NIGHTMARE 25806
 #define SPELL_LEVEL_UP 24312
 
-struct TRINITY_DLL_DECL boss_twilight_corrupterAI : public ScriptedAI
+struct boss_twilight_corrupterAI : public ScriptedAI
 {
     boss_twilight_corrupterAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp b/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp
index 32316c8def7..83fe34bb572 100644
--- a/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp
+++ b/src/scripts/eastern_kingdoms/eastern_plaguelands.cpp
@@ -34,7 +34,7 @@ EndContentData */
 //id8531 - gibbering ghoul
 //id8532 - diseased flayer
 
-struct TRINITY_DLL_DECL mobs_ghoul_flayerAI : public ScriptedAI
+struct mobs_ghoul_flayerAI : public ScriptedAI
 {
     mobs_ghoul_flayerAI(Creature *c) : ScriptedAI(c) {}
 
@@ -83,7 +83,7 @@ bool GossipSelect_npc_augustus_the_touched(Player* pPlayer, Creature* pCreature,
 
 #define SPELL_SPIRIT_SPAWNIN    17321
 
-struct TRINITY_DLL_DECL npc_darrowshire_spiritAI : public ScriptedAI
+struct npc_darrowshire_spiritAI : public ScriptedAI
 {
     npc_darrowshire_spiritAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/elwynn_forest.cpp b/src/scripts/eastern_kingdoms/elwynn_forest.cpp
index ccef7344808..c4b764cb2bf 100644
--- a/src/scripts/eastern_kingdoms/elwynn_forest.cpp
+++ b/src/scripts/eastern_kingdoms/elwynn_forest.cpp
@@ -33,7 +33,7 @@ EndContentData */
 
 #define SAY_HEAL -1000280
 
-struct TRINITY_DLL_DECL npc_henze_faulkAI : public ScriptedAI
+struct npc_henze_faulkAI : public ScriptedAI
 {
     uint32 lifeTimer;
     bool spellHit;
diff --git a/src/scripts/eastern_kingdoms/eversong_woods.cpp b/src/scripts/eastern_kingdoms/eversong_woods.cpp
index d4d0a0aaaa7..0a6b725f7c6 100644
--- a/src/scripts/eastern_kingdoms/eversong_woods.cpp
+++ b/src/scripts/eastern_kingdoms/eversong_woods.cpp
@@ -44,7 +44,7 @@ EndContentData */
 
 #define QUEST_THE_DWARVEN_SPY 8483
 
-struct TRINITY_DLL_DECL npc_prospector_anvilwardAI : public npc_escortAI
+struct npc_prospector_anvilwardAI : public npc_escortAI
 {
     // CreatureAI functions
     npc_prospector_anvilwardAI(Creature *c) : npc_escortAI(c) {}
@@ -164,7 +164,7 @@ static uint32 PaladinEntry[] = {CHAMPION_BLOODWRATH, CHAMPION_LIGHTREND, CHAMPIO
 ## npc_second_trial_paladin
 ######*/
 
-struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI
+struct npc_secondTrialAI : public ScriptedAI
 {
     npc_secondTrialAI(Creature *c) : ScriptedAI(c) {}
 
@@ -296,7 +296,7 @@ struct TRINITY_DLL_DECL npc_secondTrialAI : public ScriptedAI
 ## npc_second_trial_controller
 ######*/
 
-struct TRINITY_DLL_DECL master_kelerun_bloodmournAI : public ScriptedAI
+struct master_kelerun_bloodmournAI : public ScriptedAI
 {
     master_kelerun_bloodmournAI(Creature *c) : ScriptedAI(c) {}
 
@@ -496,7 +496,7 @@ bool GOHello_go_second_trial(Player* pPlayer, GameObject* pGO)
 #define MOB_GHARZUL     15958
 #define MOB_ANGERSHADE  15656
 
-struct TRINITY_DLL_DECL npc_apprentice_mirvedaAI : public ScriptedAI
+struct npc_apprentice_mirvedaAI : public ScriptedAI
 {
     npc_apprentice_mirvedaAI(Creature* c) : ScriptedAI(c), Summons(m_creature) {}
 
@@ -590,7 +590,7 @@ static Location SpawnLocations[] =
     {8267.97, -7239.17, 139.517}
 };
 
-struct TRINITY_DLL_DECL npc_infused_crystalAI : public Scripted_NoMovementAI
+struct npc_infused_crystalAI : public Scripted_NoMovementAI
 {
     npc_infused_crystalAI(Creature* c) : Scripted_NoMovementAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/ghostlands.cpp b/src/scripts/eastern_kingdoms/ghostlands.cpp
index bb9dd0aceed..91bdca62fe6 100644
--- a/src/scripts/eastern_kingdoms/ghostlands.cpp
+++ b/src/scripts/eastern_kingdoms/ghostlands.cpp
@@ -151,7 +151,7 @@ enum eEnums
     FACTION_SMOON_E     = 1603,
 };
 
-struct TRINITY_DLL_DECL npc_ranger_lilathaAI : public npc_escortAI
+struct npc_ranger_lilathaAI : public npc_escortAI
 {
     npc_ranger_lilathaAI(Creature *c) : npc_escortAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp b/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp
index 4c265a27c77..fd8d34d0bbd 100644
--- a/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp
+++ b/src/scripts/eastern_kingdoms/gnomeregan/gnomeregan.cpp
@@ -86,7 +86,7 @@ const Position SpawnPosition[] =
     {-494.195,-89.553,-149.131,3.254}
 };
 
-struct TRINITY_DLL_DECL npc_blastmaster_emi_shortfuseAI : public npc_escortAI
+struct npc_blastmaster_emi_shortfuseAI : public npc_escortAI
 {
     npc_blastmaster_emi_shortfuseAI(Creature* pCreature) : npc_escortAI(pCreature)
     {
@@ -536,7 +536,7 @@ bool GossipSelect_npc_blastmaster_emi_shortfuse(Player* pPlayer, Creature* pCrea
     return true;
 }
 
-struct TRINITY_DLL_DECL boss_grubbisAI : public ScriptedAI
+struct boss_grubbisAI : public ScriptedAI
 {
     boss_grubbisAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
diff --git a/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp b/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp
index 20041b6e889..3331b69c497 100644
--- a/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp
+++ b/src/scripts/eastern_kingdoms/gnomeregan/instance_gnomeregan.cpp
@@ -21,7 +21,7 @@
 
 #define    MAX_ENCOUNTER  1
 
-struct TRINITY_DLL_DECL instance_gnomeregan : public ScriptedInstance
+struct instance_gnomeregan : public ScriptedInstance
 {
     instance_gnomeregan(Map* pMap) : ScriptedInstance(pMap)
     {
diff --git a/src/scripts/eastern_kingdoms/hinterlands.cpp b/src/scripts/eastern_kingdoms/hinterlands.cpp
index feb873f2450..082f8895e3c 100644
--- a/src/scripts/eastern_kingdoms/hinterlands.cpp
+++ b/src/scripts/eastern_kingdoms/hinterlands.cpp
@@ -50,7 +50,7 @@ enum eOOX
     FACTION_ESCORTEE_H      = 775
 };
 
-struct TRINITY_DLL_DECL npc_00x09hlAI : public npc_escortAI
+struct npc_00x09hlAI : public npc_escortAI
 {
     npc_00x09hlAI(Creature* pCreature) : npc_escortAI(pCreature) { }
 
@@ -177,7 +177,7 @@ Location m_afAmbushMoveTo[] =
     {70.886589,  -2874.335449, 116.675}
 };
 
-struct TRINITY_DLL_DECL npc_rinjiAI : public npc_escortAI
+struct npc_rinjiAI : public npc_escortAI
 {
     npc_rinjiAI(Creature* pCreature) : npc_escortAI(pCreature)
     {
diff --git a/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp b/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp
index 2c1abb16e29..50bbeaec1f5 100644
--- a/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp
+++ b/src/scripts/eastern_kingdoms/isle_of_queldanas.cpp
@@ -37,7 +37,7 @@ EndContentData */
 
 #define SPELL_CONVERT_CREDIT    45009
 
-struct TRINITY_DLL_DECL npc_converted_sentryAI : public ScriptedAI
+struct npc_converted_sentryAI : public ScriptedAI
 {
     npc_converted_sentryAI(Creature *c) : ScriptedAI(c) {}
 
@@ -89,7 +89,7 @@ CreatureAI* GetAI_npc_converted_sentry(Creature* pCreature)
 #define QUESTG  11541
 #define DM      25060
 
-struct TRINITY_DLL_DECL npc_greengill_slaveAI : public ScriptedAI
+struct npc_greengill_slaveAI : public ScriptedAI
 {
     npc_greengill_slaveAI(Creature* c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp
index 4db36f9e384..d723cb3e678 100644
--- a/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/boss_curator.cpp
@@ -41,7 +41,7 @@ EndScriptData */
 #define SPELL_ENRAGE                    30403               //Arcane Infusion: Transforms Curator and adds damage.
 #define SPELL_BERSERK                   26662
 
-struct  TRINITY_DLL_DECL boss_curatorAI : public ScriptedAI
+struct boss_curatorAI : public ScriptedAI
 {
     boss_curatorAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp
index beb79831bcc..d4b0e9c7806 100644
--- a/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/boss_maiden_of_virtue.cpp
@@ -37,7 +37,7 @@ EndScriptData */
 #define SPELL_HOLYGROUND        29512
 #define SPELL_BERSERK           26662
 
-struct TRINITY_DLL_DECL boss_maiden_of_virtueAI : public ScriptedAI
+struct boss_maiden_of_virtueAI : public ScriptedAI
 {
     boss_maiden_of_virtueAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
index eaee589e7c9..d684844c993 100644
--- a/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/boss_midnight.cpp
@@ -44,7 +44,7 @@ EndScriptData */
 //Attumen (TODO: Use the summoning spell instead of Creature id. It works , but is not convenient for us)
 #define SUMMON_ATTUMEN 15550
 
-struct TRINITY_DLL_DECL boss_midnightAI : public ScriptedAI
+struct boss_midnightAI : public ScriptedAI
 {
     boss_midnightAI(Creature *c) : ScriptedAI(c) {}
 
@@ -155,7 +155,7 @@ CreatureAI* GetAI_boss_midnight(Creature* pCreature)
     return new boss_midnightAI(pCreature);
 }
 
-struct TRINITY_DLL_DECL boss_attumenAI : public ScriptedAI
+struct boss_attumenAI : public ScriptedAI
 {
     boss_attumenAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
index 9afabe63ed7..48573456f9a 100644
--- a/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/boss_moroes.cpp
@@ -58,7 +58,7 @@ const uint32 Adds[6]=
     19876,
 };
 
-struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
+struct boss_moroesAI : public ScriptedAI
 {
     boss_moroesAI(Creature *c) : ScriptedAI(c)
     {
@@ -302,7 +302,7 @@ struct TRINITY_DLL_DECL boss_moroesAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI
+struct boss_moroes_guestAI : public ScriptedAI
 {
     ScriptedInstance* pInstance;
 
@@ -367,7 +367,7 @@ struct TRINITY_DLL_DECL boss_moroes_guestAI : public ScriptedAI
 #define SPELL_SWPAIN         34441
 #define SPELL_SHADOWFORM     29406
 
-struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_guestAI
+struct boss_baroness_dorothea_millstipeAI : public boss_moroes_guestAI
 {
     //Shadow Priest
     boss_baroness_dorothea_millstipeAI(Creature *c) : boss_moroes_guestAI(c) {}
@@ -423,7 +423,7 @@ struct TRINITY_DLL_DECL boss_baroness_dorothea_millstipeAI : public boss_moroes_
 #define SPELL_JUDGEMENTOFCOMMAND    29386
 #define SPELL_SEALOFCOMMAND         29385
 
-struct TRINITY_DLL_DECL boss_baron_rafe_dreugerAI : public boss_moroes_guestAI
+struct boss_baron_rafe_dreugerAI : public boss_moroes_guestAI
 {
     //Retr Pally
     boss_baron_rafe_dreugerAI(Creature *c) : boss_moroes_guestAI(c){}
@@ -474,7 +474,7 @@ struct TRINITY_DLL_DECL boss_baron_rafe_dreugerAI : public boss_moroes_guestAI
 #define SPELL_HOLYFIRE              29563
 #define SPELL_PWSHIELD              29408
 
-struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guestAI
+struct boss_lady_catriona_von_indiAI : public boss_moroes_guestAI
 {
     //Holy Priest
     boss_lady_catriona_von_indiAI(Creature *c) : boss_moroes_guestAI(c) {}
@@ -538,7 +538,7 @@ struct TRINITY_DLL_DECL boss_lady_catriona_von_indiAI : public boss_moroes_guest
 #define SPELL_HOLYLIGHT             29562                   //Self or other guest+Moroes
 #define SPELL_DIVINESHIELD          41367
 
-struct TRINITY_DLL_DECL boss_lady_keira_berrybuckAI : public boss_moroes_guestAI
+struct boss_lady_keira_berrybuckAI : public boss_moroes_guestAI
 {
     //Holy Pally
     boss_lady_keira_berrybuckAI(Creature *c) : boss_moroes_guestAI(c)  {}
@@ -605,7 +605,7 @@ struct TRINITY_DLL_DECL boss_lady_keira_berrybuckAI : public boss_moroes_guestAI
 #define SPELL_MORTALSTRIKE      29572
 #define SPELL_WHIRLWIND         29573
 
-struct TRINITY_DLL_DECL boss_lord_robin_darisAI : public boss_moroes_guestAI
+struct boss_lord_robin_darisAI : public boss_moroes_guestAI
 {
     //Arms Warr
     boss_lord_robin_darisAI(Creature *c) : boss_moroes_guestAI(c) {}
@@ -655,7 +655,7 @@ struct TRINITY_DLL_DECL boss_lord_robin_darisAI : public boss_moroes_guestAI
 #define SPELL_SHIELDBASH        11972
 #define SPELL_SHIELDWALL        29390
 
-struct TRINITY_DLL_DECL boss_lord_crispin_ferenceAI : public boss_moroes_guestAI
+struct boss_lord_crispin_ferenceAI : public boss_moroes_guestAI
 {
     //Arms Warr
     boss_lord_crispin_ferenceAI(Creature *c) : boss_moroes_guestAI(c) {}
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
index b7de8aa8700..40f6f2bdab8 100644
--- a/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/boss_netherspite.cpp
@@ -56,7 +56,7 @@ const uint32 PlayerBuff[3] = {30421,30422,30423};
 const uint32 NetherBuff[3] = {30466,30467,30468};
 const uint32 PlayerDebuff[3] = {38637,38638,38639};
 
-struct TRINITY_DLL_DECL boss_netherspiteAI : public ScriptedAI
+struct boss_netherspiteAI : public ScriptedAI
 {
     boss_netherspiteAI(Creature* c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp
index 9c2cf99bfce..d90c0f74e7d 100644
--- a/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/boss_nightbane.cpp
@@ -56,7 +56,7 @@ float IntroWay[8][3] =
     {-11163   , -1903  ,91.473}
 };
 
-struct TRINITY_DLL_DECL boss_nightbaneAI : public ScriptedAI
+struct boss_nightbaneAI : public ScriptedAI
 {
     boss_nightbaneAI(Creature* c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
index dcba83ab249..3434ea54e1a 100644
--- a/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/boss_prince_malchezaar.cpp
@@ -94,7 +94,7 @@ static InfernalPoint InfernalPoints[] =
 #define EQUIP_ID_AXE                33542                      //Axes info
 
 //---------Infernal code first
-struct TRINITY_DLL_DECL netherspite_infernalAI : public ScriptedAI
+struct netherspite_infernalAI : public ScriptedAI
 {
     netherspite_infernalAI(Creature *c) : ScriptedAI(c) ,
         malchezaar(0), HellfireTimer(0), CleanupTimer(0), point(NULL) {}
@@ -153,7 +153,7 @@ struct TRINITY_DLL_DECL netherspite_infernalAI : public ScriptedAI
     void Cleanup();                                         //below ...
 };
 
-struct TRINITY_DLL_DECL boss_malchezaarAI : public ScriptedAI
+struct boss_malchezaarAI : public ScriptedAI
 {
     boss_malchezaarAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
index 24979901574..39dc4481bbc 100644
--- a/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/boss_shade_of_aran.cpp
@@ -79,7 +79,7 @@ enum SuperSpell
     SUPER_AE,
 };
 
-struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
+struct boss_aranAI : public ScriptedAI
 {
     boss_aranAI(Creature *c) : ScriptedAI(c)
     {
@@ -495,7 +495,7 @@ struct TRINITY_DLL_DECL boss_aranAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL water_elementalAI : public ScriptedAI
+struct water_elementalAI : public ScriptedAI
 {
     water_elementalAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp b/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
index 71331dd516c..3e5b888d211 100644
--- a/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/boss_terestian_illhoof.cpp
@@ -54,7 +54,7 @@ EndScriptData */
 #define CREATURE_PORTAL         17265
 #define CREATURE_KILREK         17229
 
-struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI
+struct mob_kilrekAI : public ScriptedAI
 {
     mob_kilrekAI(Creature *c) : ScriptedAI(c)
     {
@@ -114,7 +114,7 @@ struct TRINITY_DLL_DECL mob_kilrekAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_demon_chainAI : public ScriptedAI
+struct mob_demon_chainAI : public ScriptedAI
 {
     mob_demon_chainAI(Creature *c) : ScriptedAI(c) {}
 
@@ -140,7 +140,7 @@ struct TRINITY_DLL_DECL mob_demon_chainAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_fiendish_portalAI : public PassiveAI
+struct mob_fiendish_portalAI : public PassiveAI
 {
     mob_fiendish_portalAI(Creature *c) : PassiveAI(c),summons(m_creature){}
 
@@ -163,7 +163,7 @@ struct TRINITY_DLL_DECL mob_fiendish_portalAI : public PassiveAI
     }
 };
 
-struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
+struct boss_terestianAI : public ScriptedAI
 {
     boss_terestianAI(Creature *c) : ScriptedAI(c)
     {
@@ -330,7 +330,7 @@ struct TRINITY_DLL_DECL boss_terestianAI : public ScriptedAI
 
 #define SPELL_FIREBOLT  30050   // Blasts a target for 181-209 Fire damage.
 
-struct TRINITY_DLL_DECL mob_fiendish_impAI : public ScriptedAI
+struct mob_fiendish_impAI : public ScriptedAI
 {
     mob_fiendish_impAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp b/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp
index 28e67098ada..a1322895e35 100644
--- a/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/bosses_opera.cpp
@@ -100,7 +100,7 @@ void SummonCroneIfReady(ScriptedInstance* pInstance, Creature* pCreature)
     }
 };
 
-struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI
+struct boss_dorotheeAI : public ScriptedAI
 {
     boss_dorotheeAI(Creature* c) : ScriptedAI(c)
     {
@@ -203,7 +203,7 @@ struct TRINITY_DLL_DECL boss_dorotheeAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_titoAI : public ScriptedAI
+struct mob_titoAI : public ScriptedAI
 {
     mob_titoAI(Creature* c) : ScriptedAI(c) {}
 
@@ -258,7 +258,7 @@ void boss_dorotheeAI::SummonTito()
     }
 }
 
-struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI
+struct boss_strawmanAI : public ScriptedAI
 {
     boss_strawmanAI(Creature* c) : ScriptedAI(c)
     {
@@ -361,7 +361,7 @@ struct TRINITY_DLL_DECL boss_strawmanAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI
+struct boss_tinheadAI : public ScriptedAI
 {
     boss_tinheadAI(Creature* c) : ScriptedAI(c)
     {
@@ -459,7 +459,7 @@ struct TRINITY_DLL_DECL boss_tinheadAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI
+struct boss_roarAI : public ScriptedAI
 {
     boss_roarAI(Creature* c) : ScriptedAI(c)
     {
@@ -556,7 +556,7 @@ struct TRINITY_DLL_DECL boss_roarAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL boss_croneAI : public ScriptedAI
+struct boss_croneAI : public ScriptedAI
 {
     boss_croneAI(Creature* c) : ScriptedAI(c)
     {
@@ -626,7 +626,7 @@ struct TRINITY_DLL_DECL boss_croneAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_cycloneAI : public ScriptedAI
+struct mob_cycloneAI : public ScriptedAI
 {
     mob_cycloneAI(Creature* c) : ScriptedAI(c) {}
 
@@ -734,7 +734,7 @@ bool GossipSelect_npc_grandmother(Player* pPlayer, Creature* pCreature, uint32 u
     return true;
 }
 
-struct TRINITY_DLL_DECL boss_bigbadwolfAI : public ScriptedAI
+struct boss_bigbadwolfAI : public ScriptedAI
 {
     boss_bigbadwolfAI(Creature* c) : ScriptedAI(c)
     {
@@ -926,7 +926,7 @@ void Resurrect(Creature *pTarget)
             pTarget->GetMotionMaster()->Initialize();
 };
 
-struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI
+struct boss_julianneAI : public ScriptedAI
 {
     boss_julianneAI(Creature* c) : ScriptedAI(c)
     {
@@ -1037,7 +1037,7 @@ struct TRINITY_DLL_DECL boss_julianneAI : public ScriptedAI
     void UpdateAI(const uint32 diff);
 };
 
-struct TRINITY_DLL_DECL boss_romuloAI : public ScriptedAI
+struct boss_romuloAI : public ScriptedAI
 {
     boss_romuloAI(Creature* c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp b/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
index ab643fefab5..1026a576e95 100644
--- a/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/instance_karazhan.cpp
@@ -41,7 +41,7 @@ EndScriptData */
 11 - Nightbane
 */
 
-struct TRINITY_DLL_DECL instance_karazhan : public ScriptedInstance
+struct instance_karazhan : public ScriptedInstance
 {
     instance_karazhan(Map* pMap) : ScriptedInstance(pMap) {Initialize();}
 
diff --git a/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp b/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp
index 846cf51f433..754e206d778 100644
--- a/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp
+++ b/src/scripts/eastern_kingdoms/karazhan/karazhan.cpp
@@ -100,7 +100,7 @@ float Spawns[6][2]=
 #define SPAWN_Y             -1758
 #define SPAWN_O             4.738
 
-struct TRINITY_DLL_DECL npc_barnesAI : public npc_escortAI
+struct npc_barnesAI : public npc_escortAI
 {
     npc_barnesAI(Creature* c) : npc_escortAI(c)
     {
@@ -444,7 +444,7 @@ bool GossipSelect_npc_berthold(Player* pPlayer, Creature* pCreature, uint32 uiSe
 static float MedivPos[4] = {-11161.49,-1902.24,91.48,1.94};
 static float ArcanagosPos[4] = {-11169.75,-1881.48,95.39,4.83};
 
-struct TRINITY_DLL_DECL npc_image_of_medivhAI : public ScriptedAI
+struct npc_image_of_medivhAI : public ScriptedAI
 {
     npc_image_of_medivhAI(Creature* c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
index 037c948f237..bf61a663521 100644
--- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
+++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_felblood_kaelthas.cpp
@@ -75,7 +75,7 @@ float KaelLocations[3][2]=
 
 #define LOCATION_Z                  -16.727455
 
-struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI
+struct boss_felblood_kaelthasAI : public ScriptedAI
 {
     boss_felblood_kaelthasAI(Creature* c) : ScriptedAI(c)
     {
@@ -415,7 +415,7 @@ struct TRINITY_DLL_DECL boss_felblood_kaelthasAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_felkael_flamestrikeAI : public ScriptedAI
+struct mob_felkael_flamestrikeAI : public ScriptedAI
 {
     mob_felkael_flamestrikeAI(Creature *c) : ScriptedAI(c)
     {
@@ -445,7 +445,7 @@ struct TRINITY_DLL_DECL mob_felkael_flamestrikeAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI
+struct mob_felkael_phoenixAI : public ScriptedAI
 {
     mob_felkael_phoenixAI(Creature* c) : ScriptedAI(c)
     {
@@ -553,7 +553,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenixAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public ScriptedAI
+struct mob_felkael_phoenix_eggAI : public ScriptedAI
 {
     mob_felkael_phoenix_eggAI(Creature *c) : ScriptedAI(c) {}
 
@@ -578,7 +578,7 @@ struct TRINITY_DLL_DECL mob_felkael_phoenix_eggAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_arcane_sphereAI : public ScriptedAI
+struct mob_arcane_sphereAI : public ScriptedAI
 {
     mob_arcane_sphereAI(Creature *c) : ScriptedAI(c) { Reset(); }
 
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
index cdbfe3d088f..f14e1933988 100644
--- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
+++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_priestess_delrissa.cpp
@@ -85,7 +85,7 @@ const uint32 m_auiAddEntries[] =
     24556,                                                  //Zelfan
 };
 
-struct TRINITY_DLL_DECL boss_priestess_delrissaAI : public ScriptedAI
+struct boss_priestess_delrissaAI : public ScriptedAI
 {
     boss_priestess_delrissaAI(Creature* c) : ScriptedAI(c)
     {
@@ -332,7 +332,7 @@ enum eHealingPotion
 };
 
 //all 8 possible lackey use this common
-struct TRINITY_DLL_DECL boss_priestess_lackey_commonAI : public ScriptedAI
+struct boss_priestess_lackey_commonAI : public ScriptedAI
 {
     boss_priestess_lackey_commonAI(Creature* c) : ScriptedAI(c)
     {
@@ -475,7 +475,7 @@ enum eRogueSpells
     SPELL_EVISCERATE        = 27611
 };
 
-struct TRINITY_DLL_DECL boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI
+struct boss_kagani_nightstrikeAI : public boss_priestess_lackey_commonAI
 {
     //Rogue
     boss_kagani_nightstrikeAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
@@ -573,7 +573,7 @@ enum eWarlockSpells
     SPELL_SUMMON_IMP            = 44163
 };
 
-struct TRINITY_DLL_DECL boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI
+struct boss_ellris_duskhallowAI : public boss_priestess_lackey_commonAI
 {
     //Warlock
     boss_ellris_duskhallowAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
@@ -658,7 +658,7 @@ enum eKickDown
     SPELL_SNAP_KICK     = 46182
 };
 
-struct TRINITY_DLL_DECL boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI
+struct boss_eramas_brightblazeAI : public boss_priestess_lackey_commonAI
 {
     //Monk
     boss_eramas_brightblazeAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
@@ -713,7 +713,7 @@ enum eMageSpells
     SPELL_BLINK             = 14514
 };
 
-struct TRINITY_DLL_DECL boss_yazzaiAI : public boss_priestess_lackey_commonAI
+struct boss_yazzaiAI : public boss_priestess_lackey_commonAI
 {
     //Mage
     boss_yazzaiAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
@@ -837,7 +837,7 @@ enum eWarriorSpells
     SPELL_MORTAL_STRIKE         = 44268
 };
 
-struct TRINITY_DLL_DECL boss_warlord_salarisAI : public boss_priestess_lackey_commonAI
+struct boss_warlord_salarisAI : public boss_priestess_lackey_commonAI
 {
     //Warrior
     boss_warlord_salarisAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
@@ -951,7 +951,7 @@ enum eHunterSpells
     NPC_SLIVER                  = 24552
 };
 
-struct TRINITY_DLL_DECL boss_garaxxasAI : public boss_priestess_lackey_commonAI
+struct boss_garaxxasAI : public boss_priestess_lackey_commonAI
 {
     //Hunter
     boss_garaxxasAI(Creature *c) : boss_priestess_lackey_commonAI(c) { m_uiPetGUID = 0; }
@@ -1064,7 +1064,7 @@ enum Spells
     SPELL_EARTHBIND_TOTEM       = 15786
 };
 
-struct TRINITY_DLL_DECL boss_apokoAI : public boss_priestess_lackey_commonAI
+struct boss_apokoAI : public boss_priestess_lackey_commonAI
 {
     //Shaman
     boss_apokoAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
@@ -1156,7 +1156,7 @@ enum eEngineerSpells
     SPELL_SHEEP_EXPLOSION       = 44279
 };
 
-struct TRINITY_DLL_DECL boss_zelfanAI : public boss_priestess_lackey_commonAI
+struct boss_zelfanAI : public boss_priestess_lackey_commonAI
 {
     //Engineer
     boss_zelfanAI(Creature *c) : boss_priestess_lackey_commonAI(c) {}
@@ -1234,7 +1234,7 @@ CreatureAI* GetAI_zelfan(Creature* pCreature)
     return new boss_zelfanAI(pCreature);
 }
 
-//struct TRINITY_DLL_DECL mob_high_explosive_sheepAI : public ScriptedAI
+//struct mob_high_explosive_sheepAI : public ScriptedAI
 //{
 //    mob_high_explosive_sheepAI(Creature *c) : ScriptedAI(c) {}
 //
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
index b8c8c5d6e62..79b92eaa3a5 100644
--- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
+++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_selin_fireheart.cpp
@@ -49,7 +49,7 @@ EndScriptData */
 
 #define CREATURE_FEL_CRYSTAL            24722
 
-struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
+struct boss_selin_fireheartAI : public ScriptedAI
 {
     boss_selin_fireheartAI(Creature* c) : ScriptedAI(c)
     {
@@ -96,7 +96,7 @@ struct TRINITY_DLL_DECL boss_selin_fireheartAI : public ScriptedAI
                 if (pUnit)
                 {
                     if (!pUnit->isAlive())
-                        CAST_CRE(pUnit)->Respawn();      // Let MaNGOS handle setting death state, etc.
+                        CAST_CRE(pUnit)->Respawn();      // Let the core handle setting death state, etc.
 
                     // Only need to set unselectable flag. You can't attack unselectable units so non_attackable flag is not necessary here.
                     pUnit->SetFlag(UNIT_FIELD_FLAGS, UNIT_FLAG_NOT_SELECTABLE);
@@ -310,7 +310,7 @@ CreatureAI* GetAI_boss_selin_fireheart(Creature* pCreature)
     return new boss_selin_fireheartAI (pCreature);
 };
 
-struct TRINITY_DLL_DECL mob_fel_crystalAI : public ScriptedAI
+struct mob_fel_crystalAI : public ScriptedAI
 {
     mob_fel_crystalAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp
index c358a93bd6b..8a3cd78442c 100644
--- a/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp
+++ b/src/scripts/eastern_kingdoms/magisters_terrace/boss_vexallus.cpp
@@ -57,7 +57,7 @@ enum eEnums
     INTERVAL_SWITCH                 = 6
 };
 
-struct  TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI
+struct boss_vexallusAI : public ScriptedAI
 {
     boss_vexallusAI(Creature *c) : ScriptedAI(c)
     {
@@ -142,7 +142,7 @@ struct  TRINITY_DLL_DECL boss_vexallusAI : public ScriptedAI
                 else
                     DoCast(m_creature, SPELL_SUMMON_PURE_ENERGY, false);
 
-                //below are workaround summons, remove when summoning spells w/implicitTarget 73 implemented in Mangos
+                //below are workaround summons, remove when summoning spells w/implicitTarget 73 implemented in the core
                 m_creature->SummonCreature(NPC_PURE_ENERGY, 0.0f, 0.0f, 0.0f, 0.0f, TEMPSUMMON_CORPSE_DESPAWN, 0);
 
                 if (IsHeroic())
@@ -185,7 +185,7 @@ CreatureAI* GetAI_boss_vexallus(Creature* pCreature)
     return new boss_vexallusAI (pCreature);
 };
 
-struct  TRINITY_DLL_DECL mob_pure_energyAI : public ScriptedAI
+struct mob_pure_energyAI : public ScriptedAI
 {
     mob_pure_energyAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
index e181ec9bd41..a501cef391d 100644
--- a/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
+++ b/src/scripts/eastern_kingdoms/magisters_terrace/instance_magisters_terrace.cpp
@@ -33,7 +33,7 @@ EndScriptData */
 3  - Kael'thas Sunstrider
 */
 
-struct TRINITY_DLL_DECL instance_magisters_terrace : public ScriptedInstance
+struct instance_magisters_terrace : public ScriptedInstance
 {
     instance_magisters_terrace(Map* pMap) : ScriptedInstance(pMap) {Initialize();}
 
diff --git a/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp b/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
index 3bd45f85187..96837858535 100644
--- a/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
+++ b/src/scripts/eastern_kingdoms/magisters_terrace/magisters_terrace.cpp
@@ -49,7 +49,7 @@ const float afKaelLandPoint[] = {225.045, -276.236, -5.434};
 
 // This is friendly keal that appear after used Orb.
 // If we assume DB handle summon, summon appear somewhere outside the platform where Orb is
-struct TRINITY_DLL_DECL npc_kalecgosAI : public ScriptedAI
+struct npc_kalecgosAI : public ScriptedAI
 {
     npc_kalecgosAI(Creature* pCreature) : ScriptedAI(pCreature) {}
 
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp
index 4a64f38dcfd..ca20931fc47 100644
--- a/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/boss_baron_geddon.cpp
@@ -30,7 +30,7 @@ EndScriptData */
 #define SPELL_LIVINGBOMB            20475
 #define SPELL_ARMAGEDDOM            20479
 
-struct TRINITY_DLL_DECL boss_baron_geddonAI : public ScriptedAI
+struct boss_baron_geddonAI : public ScriptedAI
 {
     boss_baron_geddonAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp
index 41261972560..447ebc19c98 100644
--- a/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/boss_garr.cpp
@@ -32,7 +32,7 @@ EndScriptData */
 #define SPELL_ERUPTION              19497
 #define SPELL_IMMOLATE              20294
 
-struct TRINITY_DLL_DECL boss_garrAI : public ScriptedAI
+struct boss_garrAI : public ScriptedAI
 {
     boss_garrAI(Creature *c) : ScriptedAI(c) {}
 
@@ -76,7 +76,7 @@ struct TRINITY_DLL_DECL boss_garrAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_fireswornAI : public ScriptedAI
+struct mob_fireswornAI : public ScriptedAI
 {
     mob_fireswornAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp
index e91d3eea75c..5dd34a54b00 100644
--- a/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/boss_gehennas.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_RAINOFFIRE            19717
 #define SPELL_GEHENNASCURSE         19716
 
-struct TRINITY_DLL_DECL boss_gehennasAI : public ScriptedAI
+struct boss_gehennasAI : public ScriptedAI
 {
     boss_gehennasAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp
index cf3f2b22536..4ea1f5514c6 100644
--- a/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/boss_golemagg.cpp
@@ -37,7 +37,7 @@ enum eEnums
     SPELL_MANGLE            = 19820
 };
 
-struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI
+struct boss_golemaggAI : public ScriptedAI
 {
     boss_golemaggAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
@@ -117,7 +117,7 @@ struct TRINITY_DLL_DECL boss_golemaggAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_core_ragerAI : public ScriptedAI
+struct mob_core_ragerAI : public ScriptedAI
 {
     mob_core_ragerAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp
index c5cab836fa0..cf46b06f052 100644
--- a/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/boss_lucifron.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_LUCIFRONCURSE 19703
 #define SPELL_SHADOWSHOCK   20603
 
-struct TRINITY_DLL_DECL boss_lucifronAI : public ScriptedAI
+struct boss_lucifronAI : public ScriptedAI
 {
     boss_lucifronAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp
index da25998246f..f2a23746d10 100644
--- a/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/boss_magmadar.cpp
@@ -31,7 +31,7 @@ EndScriptData */
 #define SPELL_LAVABOMB              19411                   //This calls a dummy server side effect that isn't implemented yet
 #define SPELL_LAVABOMB_ALT          19428                   //This is the spell that the lava bomb casts
 
-struct TRINITY_DLL_DECL boss_magmadarAI : public ScriptedAI
+struct boss_magmadarAI : public ScriptedAI
 {
     boss_magmadarAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp
index cf39b9a0835..35fd2dbffe6 100644
--- a/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/boss_majordomo_executus.cpp
@@ -51,7 +51,7 @@ EndScriptData */
 #define ENTRY_FLAMEWALKER_HEALER    11663
 #define ENTRY_FLAMEWALKER_ELITE     11664
 
-struct TRINITY_DLL_DECL boss_majordomoAI : public ScriptedAI
+struct boss_majordomoAI : public ScriptedAI
 {
     boss_majordomoAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp
index e6139b5bf60..3195ad82591 100644
--- a/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/boss_ragnaros.cpp
@@ -83,7 +83,7 @@ EndScriptData */
 #define ADD_8Z -229.683182
 #define ADD_8O 4.693108
 
-struct TRINITY_DLL_DECL boss_ragnarosAI : public ScriptedAI
+struct boss_ragnarosAI : public ScriptedAI
 {
     boss_ragnarosAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp
index ae8b4845c5a..471bffa635f 100644
--- a/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/boss_shazzrah.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 #define SPELL_DEADENMAGIC               19714
 #define SPELL_COUNTERSPELL              19715
 
-struct TRINITY_DLL_DECL boss_shazzrahAI : public ScriptedAI
+struct boss_shazzrahAI : public ScriptedAI
 {
     boss_shazzrahAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp b/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp
index 69819fd2b34..8fa89d97b54 100644
--- a/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/boss_sulfuron_harbinger.cpp
@@ -35,7 +35,7 @@ EndScriptData */
 #define SPELL_SHADOWWORDPAIN        19776
 #define SPELL_IMMOLATE              20294
 
-struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI
+struct boss_sulfuronAI : public ScriptedAI
 {
     boss_sulfuronAI(Creature *c) : ScriptedAI(c) {}
 
@@ -118,7 +118,7 @@ struct TRINITY_DLL_DECL boss_sulfuronAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_flamewaker_priestAI : public ScriptedAI
+struct mob_flamewaker_priestAI : public ScriptedAI
 {
     mob_flamewaker_priestAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp b/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
index d4399a281a0..ae7693c7b16 100644
--- a/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
+++ b/src/scripts/eastern_kingdoms/molten_core/instance_molten_core.cpp
@@ -38,7 +38,7 @@ EndScriptData */
 #define ID_RAGNAROS     11502
 #define ID_FLAMEWAKERPRIEST     11662
 
-struct TRINITY_DLL_DECL instance_molten_core : public ScriptedInstance
+struct instance_molten_core : public ScriptedInstance
 {
     instance_molten_core(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
diff --git a/src/scripts/eastern_kingdoms/redridge_mountains.cpp b/src/scripts/eastern_kingdoms/redridge_mountains.cpp
index f26e0131181..46378353282 100644
--- a/src/scripts/eastern_kingdoms/redridge_mountains.cpp
+++ b/src/scripts/eastern_kingdoms/redridge_mountains.cpp
@@ -38,7 +38,7 @@ enum eCorporalKeeshan
     SPELL_SHIELD_BASH   = 11972,
 };
 
-struct TRINITY_DLL_DECL npc_corporal_keeshanAI : public npc_escortAI
+struct npc_corporal_keeshanAI : public npc_escortAI
 {
     npc_corporal_keeshanAI(Creature* pCreature) : npc_escortAI(pCreature) {}
 
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
index a92866d0f35..40aca9d9696 100644
--- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter1.cpp
@@ -91,7 +91,7 @@ enum UnworthyInitiatePhase
     PHASE_ATTACKING,
 };
 
-struct TRINITY_DLL_DECL npc_unworthy_initiateAI : public ScriptedAI
+struct npc_unworthy_initiateAI : public ScriptedAI
 {
     npc_unworthy_initiateAI(Creature *c) : ScriptedAI(c)
     {
@@ -170,7 +170,7 @@ CreatureAI* GetAI_npc_unworthy_initiate(Creature* pCreature)
     return new npc_unworthy_initiateAI(pCreature);
 }
 
-struct TRINITY_DLL_DECL npc_unworthy_initiate_anchorAI : public PassiveAI
+struct npc_unworthy_initiate_anchorAI : public PassiveAI
 {
     npc_unworthy_initiate_anchorAI(Creature *c) : PassiveAI(c), prisonerGUID(0) {}
 
@@ -337,7 +337,7 @@ int32 m_auiRandomSay[] =
     SAY_DUEL_A, SAY_DUEL_B, SAY_DUEL_C, SAY_DUEL_D, SAY_DUEL_E, SAY_DUEL_F, SAY_DUEL_G, SAY_DUEL_H, SAY_DUEL_I
 };
 
-struct TRINITY_DLL_DECL npc_death_knight_initiateAI : public CombatAI
+struct npc_death_knight_initiateAI : public CombatAI
 {
     npc_death_knight_initiateAI(Creature* pCreature) : CombatAI(pCreature)
     {
@@ -492,7 +492,7 @@ bool GossipSelect_npc_death_knight_initiate(Player* pPlayer, Creature* pCreature
 #define DESPAWN_HORSE 52267
 #define SAY_DARK_RIDER      "The realm of shadows awaits..."
 
-struct TRINITY_DLL_DECL npc_dark_rider_of_acherusAI : public ScriptedAI
+struct npc_dark_rider_of_acherusAI : public ScriptedAI
 {
     npc_dark_rider_of_acherusAI(Creature *c) : ScriptedAI(c) {}
 
@@ -576,7 +576,7 @@ enum eSalanar
     SPELL_EFFECT_OVERTAKE       = 52349
 };
 
-struct TRINITY_DLL_DECL npc_salanar_the_horsemanAI : public ScriptedAI
+struct npc_salanar_the_horsemanAI : public ScriptedAI
 {
     npc_salanar_the_horsemanAI(Creature *c) : ScriptedAI(c) {}
 
@@ -635,7 +635,7 @@ CreatureAI* GetAI_npc_salanar_the_horseman(Creature* pCreature)
 ## npc_ros_dark_rider
 ######*/
 
-struct TRINITY_DLL_DECL npc_ros_dark_riderAI : public ScriptedAI
+struct npc_ros_dark_riderAI : public ScriptedAI
 {
     npc_ros_dark_riderAI(Creature *c) : ScriptedAI(c) {}
 
@@ -679,7 +679,7 @@ enum SG
     GHOULS = 28845,
     GHOSTS = 28846,
 };
-struct TRINITY_DLL_DECL npc_dkc1_gothikAI : public ScriptedAI
+struct npc_dkc1_gothikAI : public ScriptedAI
 {
     npc_dkc1_gothikAI(Creature *c) : ScriptedAI(c) {}
 
@@ -716,7 +716,7 @@ CreatureAI* GetAI_npc_dkc1_gothik(Creature* pCreature)
     return new npc_dkc1_gothikAI(pCreature);
 }
 
-struct TRINITY_DLL_DECL npc_scarlet_ghoulAI : public ScriptedAI
+struct npc_scarlet_ghoulAI : public ScriptedAI
 {
     npc_scarlet_ghoulAI(Creature *c) : ScriptedAI(c)
     {
@@ -799,7 +799,7 @@ CreatureAI* GetAI_npc_scarlet_ghoul(Creature* pCreature)
 #define SPELL_CART_CHECK     54173
 #define SPELL_CART_DRAG      52465
 
-struct TRINITY_DLL_DECL npc_scarlet_miner_cartAI : public PassiveAI
+struct npc_scarlet_miner_cartAI : public PassiveAI
 {
     npc_scarlet_miner_cartAI(Creature *c) : PassiveAI(c), minerGUID(0)
     {
@@ -846,7 +846,7 @@ CreatureAI* GetAI_npc_scarlet_miner_cart(Creature *_Creature)
 #define SAY_SCARLET_MINER1  "Where'd this come from? I better get this down to the ships before the foreman sees it!"
 #define SAY_SCARLET_MINER2  "Now I can have a rest!"
 
-struct TRINITY_DLL_DECL npc_scarlet_minerAI : public npc_escortAI
+struct npc_scarlet_minerAI : public npc_escortAI
 {
     npc_scarlet_minerAI(Creature *c) : npc_escortAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
index 25c786c4938..45300e9fb1c 100644
--- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter2.cpp
@@ -45,7 +45,7 @@ enum win_friends
     SPELL_PERSUASIVE_STRIKE           = 52781
 };
 
-struct TRINITY_DLL_DECL npc_crusade_persuadedAI : public ScriptedAI
+struct npc_crusade_persuadedAI : public ScriptedAI
 {
     npc_crusade_persuadedAI(Creature *pCreature) : ScriptedAI(pCreature) {}
 
@@ -166,7 +166,7 @@ enum eKoltira
     MODEL_DEATH_KNIGHT_MOUNT        = 25278
 };
 
-struct TRINITY_DLL_DECL npc_koltira_deathweaverAI : public npc_escortAI
+struct npc_koltira_deathweaverAI : public npc_escortAI
 {
     npc_koltira_deathweaverAI(Creature *pCreature) : npc_escortAI(pCreature)
     {
@@ -338,7 +338,7 @@ enum ScarletCourierEnum
     NPC_SCARLET_COURIER                = 29076
 };
 
-struct TRINITY_DLL_DECL mob_scarlet_courierAI : public ScriptedAI
+struct mob_scarlet_courierAI : public ScriptedAI
 {
     mob_scarlet_courierAI(Creature *pCreature) : ScriptedAI(pCreature) {}
 
@@ -425,7 +425,7 @@ enum valroth
     SPELL_SUMMON_VALROTH_REMAINS      = 52929
 };
 
-struct TRINITY_DLL_DECL mob_high_inquisitor_valrothAI : public ScriptedAI
+struct mob_high_inquisitor_valrothAI : public ScriptedAI
 {
     mob_high_inquisitor_valrothAI(Creature *pCreature) : ScriptedAI(pCreature) {}
 
@@ -554,7 +554,7 @@ enum SpecialSurprise
     NPC_PLAGUEFIST              = 29053
 };
 
-struct TRINITY_DLL_DECL npc_a_special_surpriseAI : public ScriptedAI
+struct npc_a_special_surpriseAI : public ScriptedAI
 {
     npc_a_special_surpriseAI(Creature *pCreature) : ScriptedAI(pCreature) {}
 
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
index 6e97f4b831f..4561ec48212 100644
--- a/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_enclave/chapter5.cpp
@@ -284,7 +284,7 @@ static Locations LightofDawnLoc[]=
     {2273.972, -5257.676, 78.862, 0}      // 29 Lich king moves forward
 };
 
-struct TRINITY_DLL_DECL npc_highlord_darion_mograineAI : public npc_escortAI
+struct npc_highlord_darion_mograineAI : public npc_escortAI
 {
     npc_highlord_darion_mograineAI(Creature *pCreature) : npc_escortAI(pCreature)
     {
@@ -1635,7 +1635,7 @@ bool GossipSelect_npc_highlord_darion_mograine(Player* pPlayer, Creature* pCreat
 /*######
 ## npc the lich king in dawn of light
 ######*/
-struct TRINITY_DLL_DECL npc_the_lich_king_tirion_dawnAI : public ScriptedAI
+struct npc_the_lich_king_tirion_dawnAI : public ScriptedAI
 {
     npc_the_lich_king_tirion_dawnAI(Creature* pCreature) : ScriptedAI(pCreature) { Reset(); }
     void Reset() {}
diff --git a/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp b/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
index 55f45b11127..f1ed1ded9b2 100644
--- a/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_enclave/the_scarlet_enclave.cpp
@@ -24,7 +24,7 @@
 #define SPELL_REVIVE 51918
 #define VALK_WHISPER "It is not yet your time, champion. Rise! Rise and fight once more!"
 
-struct TRINITY_DLL_DECL npc_valkyr_battle_maidenAI : public PassiveAI
+struct npc_valkyr_battle_maidenAI : public PassiveAI
 {
     npc_valkyr_battle_maidenAI(Creature *c) : PassiveAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp
index c077f6fcb34..2b357367797 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_arcanist_doan.cpp
@@ -35,7 +35,7 @@ enum eEnums
     SPELL_ARCANEBUBBLE          = 9438,
 };
 
-struct TRINITY_DLL_DECL boss_arcanist_doanAI : public ScriptedAI
+struct boss_arcanist_doanAI : public ScriptedAI
 {
     boss_arcanist_doanAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
index 6430b6fafcd..e8236dd7ce0 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_azshir_the_sleepless.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_TERRIFY                   7399
 #define SPELL_SOULSIPHON                7290
 
-struct TRINITY_DLL_DECL boss_azshir_the_sleeplessAI : public ScriptedAI
+struct boss_azshir_the_sleeplessAI : public ScriptedAI
 {
     boss_azshir_the_sleeplessAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp
index ba39fc29675..6b1be49136b 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_bloodmage_thalnos.cpp
@@ -35,7 +35,7 @@ enum eEnums
     SPELL_FIRENOVA          = 16079,
 };
 
-struct TRINITY_DLL_DECL boss_bloodmage_thalnosAI : public ScriptedAI
+struct boss_bloodmage_thalnosAI : public ScriptedAI
 {
     boss_bloodmage_thalnosAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
index c4afca740b2..e79a8204e17 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_headless_horseman.cpp
@@ -131,7 +131,7 @@ static Summon Text[]=
 
 #define EMOTE_LAUGHS    "Headless Horseman laughs"
 
-struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI
+struct mob_wisp_invisAI : public ScriptedAI
 {
     mob_wisp_invisAI(Creature *c) : ScriptedAI(c)
     {
@@ -206,7 +206,7 @@ struct TRINITY_DLL_DECL mob_wisp_invisAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI
+struct mob_headAI : public ScriptedAI
 {
     mob_headAI(Creature *c) : ScriptedAI(c) {}
 
@@ -332,7 +332,7 @@ struct TRINITY_DLL_DECL mob_headAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL boss_headless_horsemanAI : public ScriptedAI
+struct boss_headless_horsemanAI : public ScriptedAI
 {
     boss_headless_horsemanAI(Creature *c) : ScriptedAI(c)
     {
@@ -749,7 +749,7 @@ void mob_headAI::Disappear()
     }
 }
 
-struct TRINITY_DLL_DECL mob_pulsing_pumpkinAI : public ScriptedAI
+struct mob_pulsing_pumpkinAI : public ScriptedAI
 {
     mob_pulsing_pumpkinAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
index 06b3e3df55e..9df10bd2b13 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_herod.cpp
@@ -38,7 +38,7 @@ EndScriptData */
 #define ENTRY_SCARLET_TRAINEE       6575
 #define ENTRY_SCARLET_MYRMIDON      4295
 
-struct TRINITY_DLL_DECL boss_herodAI : public ScriptedAI
+struct boss_herodAI : public ScriptedAI
 {
     boss_herodAI(Creature *c) : ScriptedAI(c) {}
 
@@ -109,7 +109,7 @@ CreatureAI* GetAI_boss_herod(Creature* pCreature)
     return new boss_herodAI(pCreature);
 }
 
-struct TRINITY_DLL_DECL mob_scarlet_traineeAI : public npc_escortAI
+struct mob_scarlet_traineeAI : public npc_escortAI
 {
     mob_scarlet_traineeAI(Creature *c) : npc_escortAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp
index b549eb7787d..572831eca3a 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_high_inquisitor_fairbanks.cpp
@@ -33,7 +33,7 @@ enum eSpells
     SPELL_SLEEP                     = 8399
 };
 
-struct TRINITY_DLL_DECL boss_high_inquisitor_fairbanksAI : public ScriptedAI
+struct boss_high_inquisitor_fairbanksAI : public ScriptedAI
 {
     boss_high_inquisitor_fairbanksAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp
index b6f71066ac5..0579f007255 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_houndmaster_loksey.cpp
@@ -30,7 +30,7 @@ enum eEnums
     SPELL_BLOODLUST                 = 6742
 };
 
-struct TRINITY_DLL_DECL boss_houndmaster_lokseyAI : public ScriptedAI
+struct boss_houndmaster_lokseyAI : public ScriptedAI
 {
     boss_houndmaster_lokseyAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp
index 29d7a8e389b..e614341ed04 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_interrogator_vishas.cpp
@@ -35,7 +35,7 @@ enum eEnums
     SPELL_SHADOWWORDPAIN    = 2767,
 };
 
-struct TRINITY_DLL_DECL boss_interrogator_vishasAI : public ScriptedAI
+struct boss_interrogator_vishasAI : public ScriptedAI
 {
     boss_interrogator_vishasAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
index 752970bef73..08ddc37a12a 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_mograine_and_whitemane.cpp
@@ -51,7 +51,7 @@ enum eEnums
     SPELL_POWERWORDSHIELD        = 22187
 };
 
-struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI
+struct boss_scarlet_commander_mograineAI : public ScriptedAI
 {
     boss_scarlet_commander_mograineAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
@@ -204,7 +204,7 @@ struct TRINITY_DLL_DECL boss_scarlet_commander_mograineAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL boss_high_inquisitor_whitemaneAI : public ScriptedAI
+struct boss_high_inquisitor_whitemaneAI : public ScriptedAI
 {
     boss_high_inquisitor_whitemaneAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp
index dc5adaeed30..88adb538129 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/boss_scorn.cpp
@@ -28,7 +28,7 @@ EndScriptData */
 #define SPELL_MINDFLAY                  17313
 #define SPELL_FROSTNOVA                 15531
 
-struct TRINITY_DLL_DECL boss_scornAI : public ScriptedAI
+struct boss_scornAI : public ScriptedAI
 {
     boss_scornAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp b/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
index 041268cf425..53dcfba5fe5 100644
--- a/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
+++ b/src/scripts/eastern_kingdoms/scarlet_monastery/instance_scarlet_monastery.cpp
@@ -31,7 +31,7 @@ EndScriptData */
 
 #define MAX_ENCOUNTER 2
 
-struct TRINITY_DLL_DECL instance_scarlet_monastery : public ScriptedInstance
+struct instance_scarlet_monastery : public ScriptedInstance
 {
     instance_scarlet_monastery(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp
index b1db5b8ac51..a1543413ef5 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_darkmaster_gandling.cpp
@@ -48,7 +48,7 @@ EndScriptData */
 #define ADD_4Z 104.732
 #define ADD_4O 3.16
 
-struct TRINITY_DLL_DECL boss_darkmaster_gandlingAI : public ScriptedAI
+struct boss_darkmaster_gandlingAI : public ScriptedAI
 {
     boss_darkmaster_gandlingAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp
index 805410d287e..d0158244bba 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_death_knight_darkreaver.cpp
@@ -23,7 +23,7 @@ EndScriptData */
 
 #include "ScriptedPch.h"
 
-struct TRINITY_DLL_DECL boss_death_knight_darkreaverAI : public ScriptedAI
+struct boss_death_knight_darkreaverAI : public ScriptedAI
 {
     boss_death_knight_darkreaverAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
index ae96e4c4e8d..232ba904a4e 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_doctor_theolen_krastinov.cpp
@@ -33,7 +33,7 @@ enum eEnums
     SPELL_FRENZY                = 8269
 };
 
-struct TRINITY_DLL_DECL boss_theolenkrastinovAI : public ScriptedAI
+struct boss_theolenkrastinovAI : public ScriptedAI
 {
     boss_theolenkrastinovAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp
index 7a07d29483c..23df3ad2c59 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_illucia_barov.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 #define SPELL_SILENCE           15487
 #define SPELL_FEAR              6215
 
-struct TRINITY_DLL_DECL boss_illuciabarovAI : public ScriptedAI
+struct boss_illuciabarovAI : public ScriptedAI
 {
     boss_illuciabarovAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp
index f1ed0cb1255..8c49730e919 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_instructor_malicia.cpp
@@ -30,7 +30,7 @@ EndScriptData */
 #define SPELL_RENEW                10929
 #define SPELL_HEALINGTOUCH         9889
 
-struct TRINITY_DLL_DECL boss_instructormaliciaAI : public ScriptedAI
+struct boss_instructormaliciaAI : public ScriptedAI
 {
     boss_instructormaliciaAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
index e836037ec0e..7f45e9f1f0a 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_jandice_barov.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 //Spells of Illusion of Jandice Barov
 #define SPELL_CLEAVE                15584
 
-struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI
+struct boss_jandicebarovAI : public ScriptedAI
 {
     boss_jandicebarovAI(Creature *c) : ScriptedAI(c) {}
 
@@ -139,7 +139,7 @@ struct TRINITY_DLL_DECL boss_jandicebarovAI : public ScriptedAI
 
 // Illusion of Jandice Barov Script
 
-struct TRINITY_DLL_DECL mob_illusionofjandicebarovAI : public ScriptedAI
+struct mob_illusionofjandicebarovAI : public ScriptedAI
 {
     mob_illusionofjandicebarovAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp
index 15a7729bf36..d4c677e6b78 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_kormok.cpp
@@ -26,7 +26,7 @@ EndScriptData */
 #define SPELL_SHADOWBOLTVOLLEY      20741
 #define SPELL_BONESHIELD            27688
 
-struct TRINITY_DLL_DECL boss_kormokAI : public ScriptedAI
+struct boss_kormokAI : public ScriptedAI
 {
     boss_kormokAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp
index c827622c819..b3b51a48f65 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_lord_alexei_barov.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_IMMOLATE             20294                    // Old ID  was 15570
 #define SPELL_VEILOFSHADOW         17820
 
-struct TRINITY_DLL_DECL boss_lordalexeibarovAI : public ScriptedAI
+struct boss_lordalexeibarovAI : public ScriptedAI
 {
     boss_lordalexeibarovAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp
index 330e54bc287..94cdbe300f5 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_lorekeeper_polkelt.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 #define SPELL_CORROSIVEACID          23313
 #define SPELL_NOXIOUSCATALYST        18151
 
-struct TRINITY_DLL_DECL boss_lorekeeperpolkeltAI : public ScriptedAI
+struct boss_lorekeeperpolkeltAI : public ScriptedAI
 {
     boss_lorekeeperpolkeltAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp
index 8e97ae92428..a4a796f71d8 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_ras_frostwhisper.cpp
@@ -30,7 +30,7 @@ EndScriptData */
 #define SPELL_CHILLNOVA         18099
 #define SPELL_FROSTVOLLEY       8398
 
-struct TRINITY_DLL_DECL boss_rasfrostAI : public ScriptedAI
+struct boss_rasfrostAI : public ScriptedAI
 {
     boss_rasfrostAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp
index f0dbee97e00..2e0066487de 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_the_ravenian.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 #define SPELL_SUNDERINCLEAVE    25174
 #define SPELL_KNOCKAWAY         10101
 
-struct TRINITY_DLL_DECL boss_theravenianAI : public ScriptedAI
+struct boss_theravenianAI : public ScriptedAI
 {
     boss_theravenianAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp b/src/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp
index 7cee6fc0b0d..cb0535bd0b3 100644
--- a/src/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/boss_vectus.cpp
@@ -33,7 +33,7 @@ enum eEnums
     SPELL_FRENZY                 = 8269 //28371,
 };
 
-struct TRINITY_DLL_DECL boss_vectusAI : public ScriptedAI
+struct boss_vectusAI : public ScriptedAI
 {
     boss_vectusAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp b/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
index 819f25fc16b..ce82f3b95df 100644
--- a/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
+++ b/src/scripts/eastern_kingdoms/scholomance/instance_scholomance.cpp
@@ -35,7 +35,7 @@ EndScriptData */
 
 #define MAX_ENCOUNTER          2
 
-struct TRINITY_DLL_DECL instance_scholomance : public ScriptedInstance
+struct instance_scholomance : public ScriptedInstance
 {
     instance_scholomance(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
diff --git a/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp b/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
index 556f47fcf30..a0f097c9b02 100644
--- a/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
+++ b/src/scripts/eastern_kingdoms/shadowfang_keep/instance_shadowfang_keep.cpp
@@ -52,7 +52,7 @@ const Position SpawnLocation[] =
     {-140.794,2178.037,128.448,4.090},
     {-138.640,2170.159,136.577,2.737}
 };
-struct TRINITY_DLL_DECL instance_shadowfang_keep : public ScriptedInstance
+struct instance_shadowfang_keep : public ScriptedInstance
 {
     instance_shadowfang_keep(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
diff --git a/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp b/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
index f948d664204..27d5002e9c1 100644
--- a/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
+++ b/src/scripts/eastern_kingdoms/shadowfang_keep/shadowfang_keep.cpp
@@ -51,7 +51,7 @@ enum eEnums
 
 #define GOSSIP_ITEM_DOOR        "Thanks, I'll follow you to the door."
 
-struct TRINITY_DLL_DECL npc_shadowfang_prisonerAI : public npc_escortAI
+struct npc_shadowfang_prisonerAI : public npc_escortAI
 {
     npc_shadowfang_prisonerAI(Creature *c) : npc_escortAI(c)
     {
@@ -131,7 +131,7 @@ bool GossipSelect_npc_shadowfang_prisoner(Player* pPlayer, Creature* pCreature,
     return true;
 }
 
-struct TRINITY_DLL_DECL npc_arugal_voidwalkerAI : public ScriptedAI
+struct npc_arugal_voidwalkerAI : public ScriptedAI
 {
     npc_arugal_voidwalkerAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
diff --git a/src/scripts/eastern_kingdoms/silvermoon_city.cpp b/src/scripts/eastern_kingdoms/silvermoon_city.cpp
index 226a1794dfb..1c81d701fb0 100644
--- a/src/scripts/eastern_kingdoms/silvermoon_city.cpp
+++ b/src/scripts/eastern_kingdoms/silvermoon_city.cpp
@@ -37,7 +37,7 @@ EndContentData */
 #define SPELL_SHIMMERING_VESSEL         31225
 #define SPELL_REVIVE_SELF               32343
 
-struct TRINITY_DLL_DECL npc_blood_knight_stillbladeAI : public ScriptedAI
+struct npc_blood_knight_stillbladeAI : public ScriptedAI
 {
     npc_blood_knight_stillbladeAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/silverpine_forest.cpp b/src/scripts/eastern_kingdoms/silverpine_forest.cpp
index 3fb546697bf..21667d1fc91 100644
--- a/src/scripts/eastern_kingdoms/silverpine_forest.cpp
+++ b/src/scripts/eastern_kingdoms/silverpine_forest.cpp
@@ -37,7 +37,7 @@ EndContentData */
 #define GOSSIP_HAH "You're Astor Hadren, right?"
 #define GOSSIP_SAH "You've got something I need, Astor. And I'll be taking it now."
 
-struct TRINITY_DLL_DECL npc_astor_hadrenAI : public ScriptedAI
+struct npc_astor_hadrenAI : public ScriptedAI
 {
     npc_astor_hadrenAI(Creature *c) : ScriptedAI(c) {}
 
@@ -115,7 +115,7 @@ enum eErland
     NPC_QUINN           = 1951
 };
 
-struct TRINITY_DLL_DECL npc_deathstalker_erlandAI : public npc_escortAI
+struct npc_deathstalker_erlandAI : public npc_escortAI
 {
     npc_deathstalker_erlandAI(Creature *c) : npc_escortAI(c) {}
 
@@ -203,7 +203,7 @@ static float PyrewoodSpawnPoints[3][4] =
 
 #define WAIT_SECS 6000
 
-struct TRINITY_DLL_DECL pyrewood_ambushAI : public ScriptedAI
+struct pyrewood_ambushAI : public ScriptedAI
 {
     pyrewood_ambushAI(Creature *c) : ScriptedAI(c), Summons(m_creature)
     {
diff --git a/src/scripts/eastern_kingdoms/stormwind_city.cpp b/src/scripts/eastern_kingdoms/stormwind_city.cpp
index 03193e76765..6a9136fa73f 100644
--- a/src/scripts/eastern_kingdoms/stormwind_city.cpp
+++ b/src/scripts/eastern_kingdoms/stormwind_city.cpp
@@ -75,7 +75,7 @@ enum eBartleby
     QUEST_BEAT          = 1640
 };
 
-struct TRINITY_DLL_DECL npc_bartlebyAI : public ScriptedAI
+struct npc_bartlebyAI : public ScriptedAI
 {
     npc_bartlebyAI(Creature *c) : ScriptedAI(c)
     {
@@ -140,7 +140,7 @@ enum eDashel
     FACTION_HOSTILE             = 168
 };
 
-struct TRINITY_DLL_DECL npc_dashel_stonefistAI : public ScriptedAI
+struct npc_dashel_stonefistAI : public ScriptedAI
 {
     npc_dashel_stonefistAI(Creature *c) : ScriptedAI(c)
     {
@@ -262,7 +262,7 @@ enum eLordGregorLescovar
     QUEST_THE_ATTACK    = 434
 };
 
-struct TRINITY_DLL_DECL npc_lord_gregor_lescovarAI : public npc_escortAI
+struct npc_lord_gregor_lescovarAI : public npc_escortAI
 {
     npc_lord_gregor_lescovarAI(Creature* pCreature) : npc_escortAI(pCreature)
     {
@@ -403,7 +403,7 @@ CreatureAI* GetAI_npc_lord_gregor_lescovar(Creature* pCreature)
 ## npc_marzon_silent_blade
 ######*/
 
-struct TRINITY_DLL_DECL npc_marzon_silent_bladeAI : public ScriptedAI
+struct npc_marzon_silent_bladeAI : public ScriptedAI
 {
     npc_marzon_silent_bladeAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
@@ -492,7 +492,7 @@ enum eTyrionSpybot
     NPC_LORD_GREGOR_LESCOVAR = 1754,
 };
 
-struct TRINITY_DLL_DECL npc_tyrion_spybotAI : public npc_escortAI
+struct npc_tyrion_spybotAI : public npc_escortAI
 {
     npc_tyrion_spybotAI(Creature* pCreature) : npc_escortAI(pCreature) {}
 
diff --git a/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp b/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp
index b39179624d3..08893ea977f 100644
--- a/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp
+++ b/src/scripts/eastern_kingdoms/stranglethorn_vale.cpp
@@ -31,7 +31,7 @@ EndContentData */
 ## mob_yenniku
 ######*/
 
-struct TRINITY_DLL_DECL mob_yennikuAI : public ScriptedAI
+struct mob_yennikuAI : public ScriptedAI
 {
     mob_yennikuAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp
index 93dbb8d83d8..4fd3e6c9b9e 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_baron_rivendare.cpp
@@ -75,7 +75,7 @@ EndScriptData */
 #define SPELL_RAISE_DEAD5   17479
 #define SPELL_RAISE_DEAD6   17480
 
-struct TRINITY_DLL_DECL boss_baron_rivendareAI : public ScriptedAI
+struct boss_baron_rivendareAI : public ScriptedAI
 {
     boss_baron_rivendareAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp
index b3ea1b999d1..2ae770ec5b8 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_baroness_anastari.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 #define SPELL_SILENCE    18327
 //#define SPELL_POSSESS   17244
 
-struct TRINITY_DLL_DECL boss_baroness_anastariAI : public ScriptedAI
+struct boss_baroness_anastariAI : public ScriptedAI
 {
     boss_baroness_anastariAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
index 9dee5f470d2..f1a0a57e85c 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_cannon_master_willey.cpp
@@ -74,7 +74,7 @@ EndScriptData */
 #define SPELL_SHOOT    16496
 //#define SPELL_SUMMONCRIMSONRIFLEMAN    17279
 
-struct TRINITY_DLL_DECL boss_cannon_master_willeyAI : public ScriptedAI
+struct boss_cannon_master_willeyAI : public ScriptedAI
 {
     boss_cannon_master_willeyAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp
index 4075bf7d79d..83684cb4fe9 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_dathrohan_balnazzar.cpp
@@ -63,7 +63,7 @@ SummonDef m_aSummonPoint[]=
     {3457.338, -3073.979, 135.002, 3.784}                   //G2 back, right
 };
 
-struct TRINITY_DLL_DECL boss_dathrohan_balnazzarAI : public ScriptedAI
+struct boss_dathrohan_balnazzarAI : public ScriptedAI
 {
     boss_dathrohan_balnazzarAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp
index 5e58a7b4e8c..d99e6f36044 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_magistrate_barthilas.cpp
@@ -32,7 +32,7 @@ EndScriptData */
 #define MODEL_NORMAL            10433
 #define MODEL_HUMAN             3637
 
-struct TRINITY_DLL_DECL boss_magistrate_barthilasAI : public ScriptedAI
+struct boss_magistrate_barthilasAI : public ScriptedAI
 {
     boss_magistrate_barthilasAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp
index 70491c2965a..60e7db37da2 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_maleki_the_pallid.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 #define SPELL_DRAIN_MANA    17243
 #define SPELL_ICETOMB    16869
 
-struct TRINITY_DLL_DECL boss_maleki_the_pallidAI : public ScriptedAI
+struct boss_maleki_the_pallidAI : public ScriptedAI
 {
     boss_maleki_the_pallidAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp
index e3b965926ea..4f3905e8698 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_nerubenkan.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 #define SPELL_CRYPT_SCARABS         31602
 #define SPELL_RAISEUNDEADSCARAB     17235
 
-struct TRINITY_DLL_DECL boss_nerubenkanAI : public ScriptedAI
+struct boss_nerubenkanAI : public ScriptedAI
 {
     boss_nerubenkanAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp
index c35712758c9..6c20e18bcfb 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_order_of_silver_hand.cpp
@@ -41,7 +41,7 @@ EndScriptData */
 #define SPELL_HOLY_LIGHT    25263
 #define SPELL_DIVINE_SHIELD 13874
 
-struct TRINITY_DLL_DECL boss_silver_hand_bossesAI : public ScriptedAI
+struct boss_silver_hand_bossesAI : public ScriptedAI
 {
     boss_silver_hand_bossesAI(Creature* c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp
index fe3145dffaa..0aea76c10f8 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_postmaster_malown.cpp
@@ -34,7 +34,7 @@ EndScriptData */
 #define SPELL_CURSEOFTONGUES    12889
 #define SPELL_CALLOFTHEGRAVE    17831
 
-struct TRINITY_DLL_DECL boss_postmaster_malownAI : public ScriptedAI
+struct boss_postmaster_malownAI : public ScriptedAI
 {
     boss_postmaster_malownAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
index 403c72afffa..5eaa4775b04 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_ramstein_the_gorger.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 
  #define C_MINDLESS_UNDEAD   11030
 
-struct TRINITY_DLL_DECL boss_ramstein_the_gorgerAI : public ScriptedAI
+struct boss_ramstein_the_gorgerAI : public ScriptedAI
 {
     boss_ramstein_the_gorgerAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp b/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp
index c49b33d8bdc..ccff3b32b77 100644
--- a/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/boss_timmy_the_cruel.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 
 #define SPELL_RAVENOUSCLAW    17470
 
-struct TRINITY_DLL_DECL boss_timmy_the_cruelAI : public ScriptedAI
+struct boss_timmy_the_cruelAI : public ScriptedAI
 {
     boss_timmy_the_cruelAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp b/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
index f2ccb1794d5..05f59f2c786 100644
--- a/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/instance_stratholme.cpp
@@ -47,7 +47,7 @@ EndScriptData */
 
 #define MAX_ENCOUNTER              6
 
-struct TRINITY_DLL_DECL instance_stratholme : public ScriptedInstance
+struct instance_stratholme : public ScriptedInstance
 {
     instance_stratholme(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
diff --git a/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp b/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp
index 4c00585647d..6b6bbe13cbd 100644
--- a/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp
+++ b/src/scripts/eastern_kingdoms/stratholme/stratholme.cpp
@@ -77,7 +77,7 @@ bool GOHello_go_gauntlet_gate(Player* pPlayer, GameObject* pGo)
 #define SAY_ZAPPED2 -1329002
 #define SAY_ZAPPED3 -1329003
 
-struct TRINITY_DLL_DECL mob_freed_soulAI : public ScriptedAI
+struct mob_freed_soulAI : public ScriptedAI
 {
     mob_freed_soulAI(Creature *c) : ScriptedAI(c) {}
 
@@ -104,7 +104,7 @@ CreatureAI* GetAI_mob_freed_soul(Creature* pCreature)
 #define ENTRY_RESTLESS      11122
 #define ENTRY_FREED         11136
 
-struct TRINITY_DLL_DECL mob_restless_soulAI : public ScriptedAI
+struct mob_restless_soulAI : public ScriptedAI
 {
     mob_restless_soulAI(Creature *c) : ScriptedAI(c) {}
 
@@ -175,7 +175,7 @@ enum eGhostlyCitizenSpells
     SPELL_SLAP              = 6754
 };
 
-struct TRINITY_DLL_DECL mobs_spectral_ghostly_citizenAI : public ScriptedAI
+struct mobs_spectral_ghostly_citizenAI : public ScriptedAI
 {
     mobs_spectral_ghostly_citizenAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp b/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
index 378ca8324d6..be4c5901ebc 100644
--- a/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
+++ b/src/scripts/eastern_kingdoms/sunken_temple/instance_sunken_temple.cpp
@@ -37,7 +37,7 @@ EndScriptData */
 
 #define NPC_MALFURION_STORMRAGE 15362
 
-struct TRINITY_DLL_DECL instance_sunken_temple : public ScriptedInstance
+struct instance_sunken_temple : public ScriptedInstance
 {
     instance_sunken_temple(Map* pMap) : ScriptedInstance(pMap)
     {
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
index 4bd2e00691a..1f0b1e3a57e 100644
--- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
+++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_brutallus.cpp
@@ -64,7 +64,7 @@ enum Spells
 
 #define FELMYST 25038
 
-struct TRINITY_DLL_DECL boss_brutallusAI : public ScriptedAI
+struct boss_brutallusAI : public ScriptedAI
 {
     boss_brutallusAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
index de17f5ec850..103b008c8d9 100644
--- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
+++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_eredar_twins.cpp
@@ -91,7 +91,7 @@ enum Creatures
     LADY_SACROLASH          =   25165
 };
 
-struct TRINITY_DLL_DECL boss_sacrolashAI : public ScriptedAI
+struct boss_sacrolashAI : public ScriptedAI
 {
     boss_sacrolashAI(Creature *c) : ScriptedAI(c)
     {
@@ -346,7 +346,7 @@ CreatureAI* GetAI_boss_sacrolash(Creature* pCreature)
     return new boss_sacrolashAI (pCreature);
 };
 
-struct TRINITY_DLL_DECL boss_alythessAI : public Scripted_NoMovementAI
+struct boss_alythessAI : public Scripted_NoMovementAI
 {
     boss_alythessAI(Creature *c) : Scripted_NoMovementAI(c)
     {
@@ -673,7 +673,7 @@ CreatureAI* GetAI_boss_alythess(Creature* pCreature)
     return new boss_alythessAI (pCreature);
 };
 
-struct TRINITY_DLL_DECL mob_shadow_imageAI : public ScriptedAI
+struct mob_shadow_imageAI : public ScriptedAI
 {
     mob_shadow_imageAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
index 6e680a16f19..48a51020e73 100644
--- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
+++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_felmyst.cpp
@@ -124,7 +124,7 @@ static EventFelmyst MaxTimer[]=
     EVENT_SUMMON_FOG,
 };
 
-struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
+struct boss_felmystAI : public ScriptedAI
 {
     boss_felmystAI(Creature *c) : ScriptedAI(c)
     {
@@ -548,7 +548,7 @@ struct TRINITY_DLL_DECL boss_felmystAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_felmyst_vaporAI : public ScriptedAI
+struct mob_felmyst_vaporAI : public ScriptedAI
 {
     mob_felmyst_vaporAI(Creature *c) : ScriptedAI(c)
     {
@@ -569,7 +569,7 @@ struct TRINITY_DLL_DECL mob_felmyst_vaporAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_felmyst_trailAI : public ScriptedAI
+struct mob_felmyst_trailAI : public ScriptedAI
 {
     mob_felmyst_trailAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
index f18587fecb5..575bb0afaa1 100644
--- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
+++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kalecgos.cpp
@@ -107,7 +107,7 @@ enum SWPActions
 
 uint32 WildMagic[] = { 44978, 45001, 45002, 45004, 45006, 45010 };
 
-struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI
+struct boss_kalecgosAI : public ScriptedAI
 {
     boss_kalecgosAI(Creature *c) : ScriptedAI(c)
     {
@@ -429,7 +429,7 @@ struct TRINITY_DLL_DECL boss_kalecgosAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
+struct boss_sathrovarrAI : public ScriptedAI
 {
     boss_sathrovarrAI(Creature *c) : ScriptedAI(c)
     {
@@ -653,7 +653,7 @@ struct TRINITY_DLL_DECL boss_sathrovarrAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL boss_kalecAI : public ScriptedAI
+struct boss_kalecAI : public ScriptedAI
 {
     ScriptedInstance *pInstance;
 
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
index d85af40496e..cdb79d5e2f6 100644
--- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
+++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_kiljaeden.cpp
@@ -300,7 +300,7 @@ bool GOHello_go_orb_of_the_blue_flight(Player* pPlayer, GameObject* pGo)
 }
 
 //AI for Kalecgos
-struct TRINITY_DLL_DECL boss_kalecgos_kjAI : public ScriptedAI
+struct boss_kalecgos_kjAI : public ScriptedAI
 {
     boss_kalecgos_kjAI(Creature* c) : ScriptedAI(c)
     {
@@ -431,7 +431,7 @@ CreatureAI* GetAI_boss_kalecgos_kj(Creature* pCreature)
 }
 
 //AI for Kil'jaeden
-struct TRINITY_DLL_DECL boss_kiljaedenAI : public Scripted_NoMovementAI
+struct boss_kiljaedenAI : public Scripted_NoMovementAI
 {
     boss_kiljaedenAI(Creature* c) : Scripted_NoMovementAI(c), Summons(m_creature)
     {
@@ -780,7 +780,7 @@ CreatureAI* GetAI_boss_kiljaeden(Creature* pCreature)
 }
 
 //AI for Kil'jaeden Event Controller
-struct TRINITY_DLL_DECL mob_kiljaeden_controllerAI : public Scripted_NoMovementAI
+struct mob_kiljaeden_controllerAI : public Scripted_NoMovementAI
 {
     mob_kiljaeden_controllerAI(Creature* c) : Scripted_NoMovementAI(c), Summons(m_creature)
     {
@@ -875,7 +875,7 @@ CreatureAI* GetAI_mob_kiljaeden_controller(Creature* pCreature)
 }
 
 //AI for Hand of the Deceiver
-struct TRINITY_DLL_DECL mob_hand_of_the_deceiverAI : public ScriptedAI
+struct mob_hand_of_the_deceiverAI : public ScriptedAI
 {
     mob_hand_of_the_deceiverAI(Creature* c) : ScriptedAI(c)
     {
@@ -965,7 +965,7 @@ CreatureAI* GetAI_mob_hand_of_the_deceiver(Creature* pCreature)
 }
 
 //AI for Felfire Portal
-struct TRINITY_DLL_DECL mob_felfire_portalAI : public Scripted_NoMovementAI
+struct mob_felfire_portalAI : public Scripted_NoMovementAI
 {
     mob_felfire_portalAI(Creature* c) : Scripted_NoMovementAI(c) {}
 
@@ -1010,7 +1010,7 @@ CreatureAI* GetAI_mob_felfire_portal(Creature* pCreature)
 }
 
 //AI for Felfire Fiend
-struct TRINITY_DLL_DECL mob_volatile_felfire_fiendAI : public ScriptedAI
+struct mob_volatile_felfire_fiendAI : public ScriptedAI
 {
     mob_volatile_felfire_fiendAI(Creature* c) : ScriptedAI(c) {}
 
@@ -1061,7 +1061,7 @@ CreatureAI* GetAI_mob_volatile_felfire_fiend(Creature* pCreature)
 }
 
 //AI for Armageddon target
-struct TRINITY_DLL_DECL mob_armageddonAI : public Scripted_NoMovementAI
+struct mob_armageddonAI : public Scripted_NoMovementAI
 {
     mob_armageddonAI(Creature* c) : Scripted_NoMovementAI(c) {}
 
@@ -1109,7 +1109,7 @@ CreatureAI* GetAI_mob_armageddon(Creature* pCreature)
 }
 
 //AI for Shield Orbs
-struct TRINITY_DLL_DECL mob_shield_orbAI : public ScriptedAI
+struct mob_shield_orbAI : public ScriptedAI
 {
     mob_shield_orbAI(Creature* c) : ScriptedAI(c)
     {
@@ -1193,7 +1193,7 @@ CreatureAI* GetAI_mob_shield_orb(Creature* pCreature)
 }
 
 //AI for Sinister Reflection
-struct TRINITY_DLL_DECL mob_sinster_reflectionAI : public ScriptedAI
+struct mob_sinster_reflectionAI : public ScriptedAI
 {
     mob_sinster_reflectionAI(Creature* c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
index 997933725f7..c1b672af831 100644
--- a/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
+++ b/src/scripts/eastern_kingdoms/sunwell_plateau/boss_muru.cpp
@@ -113,7 +113,7 @@ float Humanoides[6][5] =
 };
 
 uint32 EnrageTimer = 600000;
-struct TRINITY_DLL_DECL boss_entropiusAI : public ScriptedAI
+struct boss_entropiusAI : public ScriptedAI
 {
     boss_entropiusAI(Creature *c) : ScriptedAI(c), Summons(m_creature)
     {
@@ -206,7 +206,7 @@ CreatureAI* GetAI_boss_entropius(Creature* pCreature)
     return new boss_entropiusAI (pCreature);
 }
 
-struct TRINITY_DLL_DECL boss_muruAI : public Scripted_NoMovementAI
+struct boss_muruAI : public Scripted_NoMovementAI
 {
     boss_muruAI(Creature *c) : Scripted_NoMovementAI(c), Summons(m_creature)
     {
@@ -364,7 +364,7 @@ CreatureAI* GetAI_boss_muru(Creature* pCreature)
     return new boss_muruAI (pCreature);
 }
 
-struct TRINITY_DLL_DECL npc_muru_portalAI : public Scripted_NoMovementAI
+struct npc_muru_portalAI : public Scripted_NoMovementAI
 {
     npc_muru_portalAI(Creature *c) : Scripted_NoMovementAI(c), Summons(m_creature)
     {
@@ -442,7 +442,7 @@ CreatureAI* GetAI_npc_muru_portal(Creature* pCreature)
     return new npc_muru_portalAI (pCreature);
 }
 
-struct TRINITY_DLL_DECL npc_dark_fiendAI : public ScriptedAI
+struct npc_dark_fiendAI : public ScriptedAI
 {
     npc_dark_fiendAI(Creature *c) : ScriptedAI(c) {}
 
@@ -498,7 +498,7 @@ CreatureAI* GetAI_npc_dark_fiend(Creature* pCreature)
     return new npc_dark_fiendAI (pCreature);
 }
 
-struct TRINITY_DLL_DECL npc_void_sentinelAI : public ScriptedAI
+struct npc_void_sentinelAI : public ScriptedAI
 {
     npc_void_sentinelAI(Creature *c) : ScriptedAI(c){}
 
@@ -547,7 +547,7 @@ CreatureAI* GetAI_npc_void_sentinel(Creature* pCreature)
     return new npc_void_sentinelAI (pCreature);
 }
 
-struct TRINITY_DLL_DECL npc_blackholeAI : public ScriptedAI
+struct npc_blackholeAI : public ScriptedAI
 {
     npc_blackholeAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp b/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
index 199746468cd..cb472e32bdd 100644
--- a/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
+++ b/src/scripts/eastern_kingdoms/sunwell_plateau/instance_sunwell_plateau.cpp
@@ -23,7 +23,7 @@ EndScriptData */
 5 - Kil'Jaeden
 */
 
-struct TRINITY_DLL_DECL instance_sunwell_plateau : public ScriptedInstance
+struct instance_sunwell_plateau : public ScriptedInstance
 {
     instance_sunwell_plateau(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
diff --git a/src/scripts/eastern_kingdoms/tirisfal_glades.cpp b/src/scripts/eastern_kingdoms/tirisfal_glades.cpp
index 5782898864b..65acac15c3b 100644
--- a/src/scripts/eastern_kingdoms/tirisfal_glades.cpp
+++ b/src/scripts/eastern_kingdoms/tirisfal_glades.cpp
@@ -41,7 +41,7 @@ enum eCalvin
     FACTION_HOSTILE     = 168
 };
 
-struct TRINITY_DLL_DECL npc_calvin_montagueAI : public ScriptedAI
+struct npc_calvin_montagueAI : public ScriptedAI
 {
     npc_calvin_montagueAI(Creature* pCreature) : ScriptedAI(pCreature) { }
 
diff --git a/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp b/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
index bccd01aed00..6eeb54f0fa7 100644
--- a/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
+++ b/src/scripts/eastern_kingdoms/uldaman/boss_archaedas.cpp
@@ -46,7 +46,7 @@ EndScriptData */
 #define SPELL_AWAKEN_VAULT_WALKER     10258
 #define SPELL_AWAKEN_EARTHEN_GUARDIAN 10252
 
-struct TRINITY_DLL_DECL boss_archaedasAI : public ScriptedAI
+struct boss_archaedasAI : public ScriptedAI
 {
     boss_archaedasAI(Creature *c) : ScriptedAI(c)
     {
@@ -200,7 +200,7 @@ EndScriptData */
 
 #define SPELL_ARCHAEDAS_AWAKEN        10347
 
-struct TRINITY_DLL_DECL mob_archaedas_minionsAI : public ScriptedAI
+struct mob_archaedas_minionsAI : public ScriptedAI
 {
     mob_archaedas_minionsAI(Creature *c) : ScriptedAI(c)
     {
@@ -350,9 +350,9 @@ EndScriptData */
 
 #include "ScriptedPch.h"
 
-#define SPELL_SELF_DESTRUCT           9874
+#define SPELL_SELF_DESTRUCT          9874
 
-struct TRINITY_DLL_DECL mob_stonekeepersAI : public ScriptedAI
+struct mob_stonekeepersAI : public ScriptedAI
 {
     mob_stonekeepersAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp b/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp
index 5e980d45ae0..604b3453d45 100644
--- a/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp
+++ b/src/scripts/eastern_kingdoms/uldaman/boss_ironaya.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 #define SPELL_KNOCKAWAY             10101
 #define SPELL_WSTOMP                11876
 
-struct TRINITY_DLL_DECL boss_ironayaAI : public ScriptedAI
+struct boss_ironayaAI : public ScriptedAI
 {
     boss_ironayaAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
index 76160ba057c..3e3fcc18adf 100644
--- a/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
+++ b/src/scripts/eastern_kingdoms/uldaman/instance_uldaman.cpp
@@ -27,7 +27,7 @@
 
 #define ANCIENT_VAULT_DOOR              124369
 
-struct TRINITY_DLL_DECL instance_uldaman : public ScriptedInstance
+struct instance_uldaman : public ScriptedInstance
 {
     instance_uldaman(Map* pMap) : ScriptedInstance(pMap)
     {
diff --git a/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp b/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp
index 92f8721fee3..8a9ac246d52 100644
--- a/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp
+++ b/src/scripts/eastern_kingdoms/uldaman/uldaman.cpp
@@ -34,7 +34,7 @@ EndContentData */
 
 #define SPELL_CSLUMBER        3636
 
-struct TRINITY_DLL_DECL mob_jadespine_basiliskAI : public ScriptedAI
+struct mob_jadespine_basiliskAI : public ScriptedAI
 {
     mob_jadespine_basiliskAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/undercity.cpp b/src/scripts/eastern_kingdoms/undercity.cpp
index 06373a839e4..4e0e03208b4 100644
--- a/src/scripts/eastern_kingdoms/undercity.cpp
+++ b/src/scripts/eastern_kingdoms/undercity.cpp
@@ -55,7 +55,7 @@ float HighborneLoc[4][3]=
 #define HIGHBORNE_LOC_Y             -61.00
 #define HIGHBORNE_LOC_Y_NEW         -55.50
 
-struct TRINITY_DLL_DECL npc_lady_sylvanas_windrunnerAI : public ScriptedAI
+struct npc_lady_sylvanas_windrunnerAI : public ScriptedAI
 {
     npc_lady_sylvanas_windrunnerAI(Creature *c) : ScriptedAI(c) {}
 
@@ -136,7 +136,7 @@ bool ChooseReward_npc_lady_sylvanas_windrunner(Player* pPlayer, Creature* pCreat
 ## npc_highborne_lamenter
 ######*/
 
-struct TRINITY_DLL_DECL npc_highborne_lamenterAI : public ScriptedAI
+struct npc_highborne_lamenterAI : public ScriptedAI
 {
     npc_highborne_lamenterAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/western_plaguelands.cpp b/src/scripts/eastern_kingdoms/western_plaguelands.cpp
index 801969e1e76..14f65bd9c80 100644
--- a/src/scripts/eastern_kingdoms/western_plaguelands.cpp
+++ b/src/scripts/eastern_kingdoms/western_plaguelands.cpp
@@ -137,7 +137,7 @@ bool GossipSelect_npc_myranda_the_hag(Player* pPlayer, Creature* pCreature, uint
 ## npc_the_scourge_cauldron
 ######*/
 
-struct TRINITY_DLL_DECL npc_the_scourge_cauldronAI : public ScriptedAI
+struct npc_the_scourge_cauldronAI : public ScriptedAI
 {
     npc_the_scourge_cauldronAI(Creature *c) : ScriptedAI(c) {}
 
@@ -214,7 +214,7 @@ enum eAndorhalTower
     GO_BEACON_TORCH                             = 176093
 };
 
-struct TRINITY_DLL_DECL npc_andorhal_towerAI : public Scripted_NoMovementAI
+struct npc_andorhal_towerAI : public Scripted_NoMovementAI
 {
     npc_andorhal_towerAI(Creature *c) : Scripted_NoMovementAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/westfall.cpp b/src/scripts/eastern_kingdoms/westfall.cpp
index 06861a4975d..c5e72109006 100644
--- a/src/scripts/eastern_kingdoms/westfall.cpp
+++ b/src/scripts/eastern_kingdoms/westfall.cpp
@@ -47,7 +47,7 @@ enum eEnums
     EQUIP_ID_RIFLE      = 2511
 };
 
-struct TRINITY_DLL_DECL npc_daphne_stilwellAI : public npc_escortAI
+struct npc_daphne_stilwellAI : public npc_escortAI
 {
     npc_daphne_stilwellAI(Creature* pCreature) : npc_escortAI(pCreature) {}
 
@@ -191,7 +191,7 @@ CreatureAI* GetAI_npc_daphne_stilwell(Creature* pCreature)
 
 #define QUEST_DEFIAS_BROTHERHOOD    155
 
-struct TRINITY_DLL_DECL npc_defias_traitorAI : public npc_escortAI
+struct npc_defias_traitorAI : public npc_escortAI
 {
     npc_defias_traitorAI(Creature *c) : npc_escortAI(c) { Reset(); }
 
diff --git a/src/scripts/eastern_kingdoms/wetlands.cpp b/src/scripts/eastern_kingdoms/wetlands.cpp
index 3c3c4662abb..a7a4b247da9 100644
--- a/src/scripts/eastern_kingdoms/wetlands.cpp
+++ b/src/scripts/eastern_kingdoms/wetlands.cpp
@@ -43,7 +43,7 @@ enum eTapokeSlim
     NPC_TAPOKE_SLIM_JAHN        = 4962
 };
 
-struct TRINITY_DLL_DECL npc_tapoke_slim_jahnAI : public npc_escortAI
+struct npc_tapoke_slim_jahnAI : public npc_escortAI
 {
     npc_tapoke_slim_jahnAI(Creature* pCreature) : npc_escortAI(pCreature) { }
 
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
index 825059efd67..7090fc8ddb5 100644
--- a/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
+++ b/src/scripts/eastern_kingdoms/zulaman/boss_akilzon.cpp
@@ -57,7 +57,7 @@ EndScriptData */
 #define SE_LOC_Y_MAX 1435
 #define SE_LOC_Y_MIN 1370
 
-struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
+struct boss_akilzonAI : public ScriptedAI
 {
     boss_akilzonAI(Creature *c) : ScriptedAI(c)
     {
@@ -372,7 +372,7 @@ struct TRINITY_DLL_DECL boss_akilzonAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL mob_soaring_eagleAI : public ScriptedAI
+struct mob_soaring_eagleAI : public ScriptedAI
 {
     mob_soaring_eagleAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp
index d7f795275b9..809de7631d3 100644
--- a/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp
+++ b/src/scripts/eastern_kingdoms/zulaman/boss_halazzi.cpp
@@ -71,7 +71,7 @@ enum PhaseHalazzi
     PHASE_ENRAGE = 5
 };
 
-struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
+struct boss_halazziAI : public ScriptedAI
 {
     boss_halazziAI(Creature *c) : ScriptedAI(c)
     {
@@ -326,7 +326,7 @@ struct TRINITY_DLL_DECL boss_halazziAI : public ScriptedAI
 
 // Spirits Lynx AI
 
-struct TRINITY_DLL_DECL boss_spiritlynxAI : public ScriptedAI
+struct boss_spiritlynxAI : public ScriptedAI
 {
     boss_spiritlynxAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp
index 51898b2dc19..dee092536a9 100644
--- a/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp
+++ b/src/scripts/eastern_kingdoms/zulaman/boss_hexlord.cpp
@@ -173,7 +173,7 @@ static PlayerAbilityStruct PlayerAbility[][3] =
     {SPELL_DR_MOONFIRE, ABILITY_TARGET_ENEMY, 8000}}
 };
 
-struct TRINITY_DLL_DECL boss_hexlord_addAI : public ScriptedAI
+struct boss_hexlord_addAI : public ScriptedAI
 {
     ScriptedInstance* pInstance;
 
@@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL boss_hexlord_addAI : public ScriptedAI
     }
 };
 
-struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
+struct boss_hex_lord_malacrassAI : public ScriptedAI
 {
     boss_hex_lord_malacrassAI(Creature *c) : ScriptedAI(c)
     {
@@ -461,7 +461,7 @@ struct TRINITY_DLL_DECL boss_hex_lord_malacrassAI : public ScriptedAI
 #define SPELL_BLOODLUST       43578
 #define SPELL_CLEAVE          15496
 
-struct TRINITY_DLL_DECL boss_thurgAI : public boss_hexlord_addAI
+struct boss_thurgAI : public boss_hexlord_addAI
 {
 
     boss_thurgAI(Creature *c) : boss_hexlord_addAI(c) {}
@@ -506,7 +506,7 @@ struct TRINITY_DLL_DECL boss_thurgAI : public boss_hexlord_addAI
 #define SPELL_FLASH_HEAL     43575
 #define SPELL_DISPEL_MAGIC   43577
 
-struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI
+struct boss_alyson_antilleAI : public boss_hexlord_addAI
 {
     //Holy Priest
     boss_alyson_antilleAI(Creature *c) : boss_hexlord_addAI(c) {}
@@ -591,7 +591,7 @@ struct TRINITY_DLL_DECL boss_alyson_antilleAI : public boss_hexlord_addAI
 
 #define SPELL_FIREBOLT        43584
 
-struct TRINITY_DLL_DECL boss_gazakrothAI : public boss_hexlord_addAI
+struct boss_gazakrothAI : public boss_hexlord_addAI
 {
     boss_gazakrothAI(Creature *c) : boss_hexlord_addAI(c)  {}
 
@@ -636,7 +636,7 @@ struct TRINITY_DLL_DECL boss_gazakrothAI : public boss_hexlord_addAI
 #define SPELL_FLAME_BREATH    43582
 #define SPELL_THUNDERCLAP     43583
 
-struct TRINITY_DLL_DECL boss_lord_raadanAI : public boss_hexlord_addAI
+struct boss_lord_raadanAI : public boss_hexlord_addAI
 {
     boss_lord_raadanAI(Creature *c) : boss_hexlord_addAI(c)  {}
 
@@ -674,7 +674,7 @@ struct TRINITY_DLL_DECL boss_lord_raadanAI : public boss_hexlord_addAI
 
 #define SPELL_PSYCHIC_WAIL   43590
 
-struct TRINITY_DLL_DECL boss_darkheartAI : public boss_hexlord_addAI
+struct boss_darkheartAI : public boss_hexlord_addAI
 {
     boss_darkheartAI(Creature *c) : boss_hexlord_addAI(c)  {}
 
@@ -702,7 +702,7 @@ struct TRINITY_DLL_DECL boss_darkheartAI : public boss_hexlord_addAI
 
 #define SPELL_VENOM_SPIT    43579
 
-struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI
+struct boss_slitherAI : public boss_hexlord_addAI
 {
     boss_slitherAI(Creature *c) : boss_hexlord_addAI(c) {}
 
@@ -748,7 +748,7 @@ struct TRINITY_DLL_DECL boss_slitherAI : public boss_hexlord_addAI
 //Fenstalker
 #define SPELL_VOLATILE_INFECTION 43586
 
-struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI
+struct boss_fenstalkerAI : public boss_hexlord_addAI
 {
     boss_fenstalkerAI(Creature *c) : boss_hexlord_addAI(c) {}
 
@@ -780,7 +780,7 @@ struct TRINITY_DLL_DECL boss_fenstalkerAI : public boss_hexlord_addAI
 #define SPELL_COLD_STARE      43593
 #define SPELL_MIGHTY_BLOW     43592
 
-struct TRINITY_DLL_DECL boss_koraggAI : public boss_hexlord_addAI
+struct boss_koraggAI : public boss_hexlord_addAI
 {
     boss_koraggAI(Creature *c) : boss_hexlord_addAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
index 905fd45d420..8546deb5237 100644
--- a/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
+++ b/src/scripts/eastern_kingdoms/zulaman/boss_janalai.cpp
@@ -100,7 +100,7 @@ float hatcherway[2][5][3] =
     }
 };
 
-struct TRINITY_DLL_DECL boss_janalaiAI : public ScriptedAI
+struct boss_janalaiAI : public ScriptedAI
 {
     boss_janalaiAI(Creature *c) : ScriptedAI(c)
     {
@@ -434,7 +434,7 @@ CreatureAI* GetAI_boss_janalaiAI(Creature* pCreature)
     return new boss_janalaiAI(pCreature);
 }
 
-struct TRINITY_DLL_DECL mob_janalai_firebombAI : public ScriptedAI
+struct mob_janalai_firebombAI : public ScriptedAI
 {
     mob_janalai_firebombAI(Creature *c) : ScriptedAI(c){}
 
@@ -460,7 +460,7 @@ CreatureAI* GetAI_mob_janalai_firebombAI(Creature* pCreature)
     return new mob_janalai_firebombAI(pCreature);
 }
 
-struct TRINITY_DLL_DECL mob_amanishi_hatcherAI : public ScriptedAI
+struct mob_amanishi_hatcherAI : public ScriptedAI
 {
     mob_amanishi_hatcherAI(Creature *c) : ScriptedAI(c)
     {
@@ -583,7 +583,7 @@ CreatureAI* GetAI_mob_amanishi_hatcherAI(Creature* pCreature)
     return new mob_amanishi_hatcherAI(pCreature);
 }
 
-struct TRINITY_DLL_DECL mob_hatchlingAI : public ScriptedAI
+struct mob_hatchlingAI : public ScriptedAI
 {
     mob_hatchlingAI(Creature *c) : ScriptedAI(c)
     {
@@ -632,7 +632,7 @@ CreatureAI* GetAI_mob_hatchlingAI(Creature* pCreature)
     return new mob_hatchlingAI(pCreature);
 }
 
-struct TRINITY_DLL_DECL mob_eggAI : public ScriptedAI
+struct mob_eggAI : public ScriptedAI
 {
     mob_eggAI(Creature *c) : ScriptedAI(c){}
     void Reset() {}
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
index a694ba8d346..4662ee6253e 100644
--- a/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
+++ b/src/scripts/eastern_kingdoms/zulaman/boss_nalorakk.cpp
@@ -88,7 +88,7 @@ float NalorakkWay[8][3] =
 #define YELL_SHIFTEDTOBEAR      "You call on da beast, you gonna get more dan you bargain for!"
 #define SOUND_YELL_TOBEAR       12072
 
-struct TRINITY_DLL_DECL boss_nalorakkAI : public ScriptedAI
+struct boss_nalorakkAI : public ScriptedAI
 {
     boss_nalorakkAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp b/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
index 1f559a9b359..2d374a63e50 100644
--- a/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
+++ b/src/scripts/eastern_kingdoms/zulaman/boss_zuljin.cpp
@@ -138,7 +138,7 @@ static TransformStruct Transform[] =
     {SOUND_TRANSFORM_TO_DRAGONHAWK, YELL_TRANSFORM_TO_DRAGONHAWK, SPELL_SHAPE_OF_THE_DRAGONHAWK, SPELL_SHAPE_OF_THE_LYNX}
 };
 
-struct TRINITY_DLL_DECL boss_zuljinAI : public ScriptedAI
+struct boss_zuljinAI : public ScriptedAI
 {
     boss_zuljinAI(Creature *c) : ScriptedAI(c), Summons(m_creature)
     {
@@ -580,7 +580,7 @@ CreatureAI* GetAI_boss_zuljin(Creature* pCreature)
     return new boss_zuljinAI (pCreature);
 }
 
-struct TRINITY_DLL_DECL feather_vortexAI : public ScriptedAI
+struct feather_vortexAI : public ScriptedAI
 {
     feather_vortexAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp b/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
index e21f7c6f31c..a06c30637c8 100644
--- a/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
+++ b/src/scripts/eastern_kingdoms/zulaman/instance_zulaman.cpp
@@ -49,7 +49,7 @@ static SHostageInfo HostageInfo[] =
 
 };
 
-struct TRINITY_DLL_DECL instance_zulaman : public ScriptedInstance
+struct instance_zulaman : public ScriptedInstance
 {
     instance_zulaman(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
 
diff --git a/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp b/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp
index c1dbccfa3f3..a7476bb6595 100644
--- a/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp
+++ b/src/scripts/eastern_kingdoms/zulaman/zulaman.cpp
@@ -36,7 +36,7 @@ EndContentData */
 #define SPELL_PUSH_MOJO             43923
 #define ENTRY_FOREST_FROG           24396
 
-struct TRINITY_DLL_DECL npc_forest_frogAI : public ScriptedAI
+struct npc_forest_frogAI : public ScriptedAI
 {
     npc_forest_frogAI(Creature* c) : ScriptedAI(c)
     {
@@ -105,7 +105,7 @@ CreatureAI* GetAI_npc_forest_frog(Creature* pCreature)
 static uint32 HostageEntry[] = {23790, 23999, 24024, 24001};
 static uint32 ChestEntry[] = {186648, 187021, 186672, 186667};
 
-struct TRINITY_DLL_DECL npc_zulaman_hostageAI : public ScriptedAI
+struct npc_zulaman_hostageAI : public ScriptedAI
 {
     npc_zulaman_hostageAI(Creature *c) : ScriptedAI(c) {IsLoot = false;}
     bool IsLoot;
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp
index 7cea97bb7c2..27130cf8350 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_arlokk.cpp
@@ -57,7 +57,7 @@ enum eEnums
     NPC_ZULIAN_PROWLER          = 15101
 };
 
-struct TRINITY_DLL_DECL boss_arlokkAI : public ScriptedAI
+struct boss_arlokkAI : public ScriptedAI
 {
     boss_arlokkAI(Creature* pCreature) : ScriptedAI(pCreature)
     {
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp
index d0bae61187b..cd3a6b47560 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_gahzranka.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_MASSIVEGEYSER          22421                  //Not working. Cause its a summon...
 #define SPELL_SLAM                   24326
 
-struct TRINITY_DLL_DECL boss_gahzrankaAI : public ScriptedAI
+struct boss_gahzrankaAI : public ScriptedAI
 {
     boss_gahzrankaAI(Creature *c) : ScriptedAI(c) {}
     uint32 Frostbreath_Timer;
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp
index 110a66e1c3c..e53e05d4682 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_grilek.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_AVARTAR                24646                  //The Enrage Spell
 #define SPELL_GROUNDTREMOR            6524
 
-struct TRINITY_DLL_DECL boss_grilekAI : public ScriptedAI
+struct boss_grilekAI : public ScriptedAI
 {
     boss_grilekAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp
index 718b5c4936c..134a081b95b 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_hakkar.cpp
@@ -42,7 +42,7 @@ EndScriptData */
 #define SPELL_ASPECT_OF_THEKAL       24689
 #define SPELL_ASPECT_OF_ARLOKK       24690
 
-struct TRINITY_DLL_DECL boss_hakkarAI : public ScriptedAI
+struct boss_hakkarAI : public ScriptedAI
 {
     boss_hakkarAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
index 6e6debe7b19..820bd875b3c 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_hazzarah.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_MANABURN         26046
 #define SPELL_SLEEP            24664
 
-struct TRINITY_DLL_DECL boss_hazzarahAI : public ScriptedAI
+struct boss_hazzarahAI : public ScriptedAI
 {
     boss_hazzarahAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp
index 8b1cc05083a..3a0302efebd 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_jeklik.cpp
@@ -41,7 +41,7 @@ EndScriptData */
 
 #define SPELL_BOMB                40332                     //Wrong ID but Magmadars bomb is not working...
 
-struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI
+struct boss_jeklikAI : public ScriptedAI
 {
     boss_jeklikAI(Creature *c) : ScriptedAI(c)
     {
@@ -208,7 +208,7 @@ struct TRINITY_DLL_DECL boss_jeklikAI : public ScriptedAI
 };
 
 //Flying Bat
-struct TRINITY_DLL_DECL mob_batriderAI : public ScriptedAI
+struct mob_batriderAI : public ScriptedAI
 {
     mob_batriderAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp
index b4454225fa7..5673fbfc4a8 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_jindo.cpp
@@ -39,7 +39,7 @@ EndScriptData */
 #define SPELL_SHADOWSHOCK               19460
 #define SPELL_INVISIBLE                 24699
 
-struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI
+struct boss_jindoAI : public ScriptedAI
 {
     boss_jindoAI(Creature *c) : ScriptedAI(c) {}
 
@@ -159,7 +159,7 @@ struct TRINITY_DLL_DECL boss_jindoAI : public ScriptedAI
 };
 
 //Healing Ward
-struct TRINITY_DLL_DECL mob_healing_wardAI : public ScriptedAI
+struct mob_healing_wardAI : public ScriptedAI
 {
     mob_healing_wardAI(Creature *c) : ScriptedAI(c)
     {
@@ -198,7 +198,7 @@ struct TRINITY_DLL_DECL mob_healing_wardAI : public ScriptedAI
 };
 
 //Shade of Jindo
-struct TRINITY_DLL_DECL mob_shade_of_jindoAI : public ScriptedAI
+struct mob_shade_of_jindoAI : public ScriptedAI
 {
     mob_shade_of_jindoAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
index 66e800e1b37..0f8a3d515f3 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_mandokir.cpp
@@ -42,7 +42,7 @@ EndScriptData */
 //Ohgans Spells
 #define SPELL_SUNDERARMOR       24317
 
-struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI
+struct boss_mandokirAI : public ScriptedAI
 {
     boss_mandokirAI(Creature *c) : ScriptedAI(c)
     {
@@ -266,7 +266,7 @@ struct TRINITY_DLL_DECL boss_mandokirAI : public ScriptedAI
 };
 
 //Ohgan
-struct TRINITY_DLL_DECL mob_ohganAI : public ScriptedAI
+struct mob_ohganAI : public ScriptedAI
 {
     mob_ohganAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp
index e4b12ffb972..ff57c3c8b1d 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_marli.cpp
@@ -38,7 +38,7 @@ EndScriptData */
 //The Spider Spells
 #define SPELL_LEVELUP             24312                     //Not right Spell.
 
-struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI
+struct boss_marliAI : public ScriptedAI
 {
     boss_marliAI(Creature *c) : ScriptedAI(c)
     {
@@ -201,7 +201,7 @@ struct TRINITY_DLL_DECL boss_marliAI : public ScriptedAI
 };
 
 //Spawn of Marli
-struct TRINITY_DLL_DECL mob_spawn_of_marliAI : public ScriptedAI
+struct mob_spawn_of_marliAI : public ScriptedAI
 {
     mob_spawn_of_marliAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp
index dc1653d04ee..1bc15936035 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_renataki.cpp
@@ -29,7 +29,7 @@ EndScriptData */
 
 #define EQUIP_ID_MAIN_HAND      0           //was item display id 31818, but this id does not exist
 
-struct TRINITY_DLL_DECL boss_renatakiAI : public ScriptedAI
+struct boss_renatakiAI : public ScriptedAI
 {
     boss_renatakiAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp
index e7002673cd3..85a03475569 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_thekal.cpp
@@ -50,7 +50,7 @@ EndScriptData */
 #define SPELL_KICK                15614
 #define SPELL_BLIND               21060
 
-struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI
+struct boss_thekalAI : public ScriptedAI
 {
     boss_thekalAI(Creature *c) : ScriptedAI(c)
     {
@@ -243,7 +243,7 @@ struct TRINITY_DLL_DECL boss_thekalAI : public ScriptedAI
 };
 
 //Zealot Lor'Khan
-struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI
+struct mob_zealot_lorkhanAI : public ScriptedAI
 {
     mob_zealot_lorkhanAI(Creature *c) : ScriptedAI(c)
     {
@@ -385,7 +385,7 @@ struct TRINITY_DLL_DECL mob_zealot_lorkhanAI : public ScriptedAI
 };
 
 //Zealot Zath
-struct TRINITY_DLL_DECL mob_zealot_zathAI : public ScriptedAI
+struct mob_zealot_zathAI : public ScriptedAI
 {
     mob_zealot_zathAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
index 3b094b74b1e..bcfa15d97af 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_venoxis.cpp
@@ -37,7 +37,7 @@ EndScriptData */
 #define SPELL_BERSERK       23537
 #define SPELL_DISPELL       23859
 
-struct TRINITY_DLL_DECL boss_venoxisAI : public ScriptedAI
+struct boss_venoxisAI : public ScriptedAI
 {
     boss_venoxisAI(Creature *c) : ScriptedAI(c)
     {
diff --git a/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp b/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp
index e3752f60304..c9fc61394b5 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/boss_wushoolay.cpp
@@ -27,7 +27,7 @@ EndScriptData */
 #define SPELL_LIGHTNINGCLOUD         25033
 #define SPELL_LIGHTNINGWAVE          24819
 
-struct TRINITY_DLL_DECL boss_wushoolayAI : public ScriptedAI
+struct boss_wushoolayAI : public ScriptedAI
 {
     boss_wushoolayAI(Creature *c) : ScriptedAI(c) {}
 
diff --git a/src/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp b/src/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp
index 347e478f55e..aaed1c6df3a 100644
--- a/src/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp
+++ b/src/scripts/eastern_kingdoms/zulgurub/instance_zulgurub.cpp
@@ -24,7 +24,7 @@ EndScriptData */
 #include "ScriptedPch.h"
 #include "zulgurub.h"
 
-struct TRINITY_DLL_DECL instance_zulgurub : public ScriptedInstance
+struct instance_zulgurub : public ScriptedInstance
 {
     instance_zulgurub(Map* pMap) : ScriptedInstance(pMap) {Initialize();};
author	Xanadu <none@none>	2010-02-05 00:31:28 +0100
committer	Xanadu <none@none>	2010-02-05 00:31:28 +0100
commit	a5d1bc77abc275402240bec1380fa87f04461ba8 (patch)
tree	f33b3e3f10a4f0723d85b5bec4764f4518501c06 /src/scripts/eastern_kingdoms
parent	b0b261585f4c410736548cd536642cb104cb7023 (diff)