diff --git a/src/framework/GameSystem/GridReference.h b/src/framework/GameSystem/GridReference.h
index 17f1088f9..2498e3f49 100644
--- a/src/framework/GameSystem/GridReference.h
+++ b/src/framework/GameSystem/GridReference.h
@@ -34,7 +34,7 @@ template<class OBJECT>
  * @brief
  *
  */
-class MANGOS_DLL_SPEC GridReference : public Reference<GridRefManager<OBJECT>, OBJECT>
+class  GridReference : public Reference<GridRefManager<OBJECT>, OBJECT>
 {
     protected:
 
diff --git a/src/framework/Policies/ObjectLifeTime.cpp b/src/framework/Policies/ObjectLifeTime.cpp
index 2b170591d..6ce3699c1 100644
--- a/src/framework/Policies/ObjectLifeTime.cpp
+++ b/src/framework/Policies/ObjectLifeTime.cpp
@@ -32,7 +32,7 @@ namespace MaNGOS
         std::atexit((void (*)())p);
     }
 
-    void MANGOS_DLL_SPEC at_exit(void (*func)())
+    void  at_exit(void (*func)())
     {
         external_wrapper((void*)func);
     }
diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h
index c7fc728f6..d2ee0d13e 100644
--- a/src/framework/Policies/ObjectLifeTime.h
+++ b/src/framework/Policies/ObjectLifeTime.h
@@ -41,7 +41,7 @@ namespace MaNGOS
      *
      * @param (func)()
      */
-    void MANGOS_DLL_SPEC at_exit(void (*func)());
+    void  at_exit(void (*func)());
 
     template<class T>
     /**
diff --git a/src/game/MotionGenerators/ConfusedMovementGenerator.h b/src/game/MotionGenerators/ConfusedMovementGenerator.h
index 75d6517a7..74778cd00 100644
--- a/src/game/MotionGenerators/ConfusedMovementGenerator.h
+++ b/src/game/MotionGenerators/ConfusedMovementGenerator.h
@@ -28,7 +28,7 @@
 #include "MovementGenerator.h"
 
 template<class T>
-class MANGOS_DLL_SPEC ConfusedMovementGenerator
+class  ConfusedMovementGenerator
     : public MovementGeneratorMedium< T, ConfusedMovementGenerator<T> >
 {
     public:
diff --git a/src/game/MotionGenerators/FleeingMovementGenerator.h b/src/game/MotionGenerators/FleeingMovementGenerator.h
index 683eaed95..19f5514b9 100644
--- a/src/game/MotionGenerators/FleeingMovementGenerator.h
+++ b/src/game/MotionGenerators/FleeingMovementGenerator.h
@@ -29,7 +29,7 @@
 #include "ObjectGuid.h"
 
 template<class T>
-class MANGOS_DLL_SPEC FleeingMovementGenerator
+class  FleeingMovementGenerator
     : public MovementGeneratorMedium< T, FleeingMovementGenerator<T> >
 {
     public:
@@ -51,7 +51,7 @@ class MANGOS_DLL_SPEC FleeingMovementGenerator
         TimeTracker i_nextCheckTime;
 };
 
-class MANGOS_DLL_SPEC TimedFleeingMovementGenerator
+class  TimedFleeingMovementGenerator
     : public FleeingMovementGenerator<Creature>
 {
     public:
diff --git a/src/game/MotionGenerators/HomeMovementGenerator.h b/src/game/MotionGenerators/HomeMovementGenerator.h
index 0c5855476..92c2032f9 100644
--- a/src/game/MotionGenerators/HomeMovementGenerator.h
+++ b/src/game/MotionGenerators/HomeMovementGenerator.h
@@ -30,10 +30,10 @@
 class Creature;
 
 template < class T >
-class MANGOS_DLL_SPEC HomeMovementGenerator;
+class  HomeMovementGenerator;
 
 template <>
-class MANGOS_DLL_SPEC HomeMovementGenerator<Creature>
+class  HomeMovementGenerator<Creature>
     : public MovementGeneratorMedium< Creature, HomeMovementGenerator<Creature> >
 {
     public:
diff --git a/src/game/MotionGenerators/IdleMovementGenerator.h b/src/game/MotionGenerators/IdleMovementGenerator.h
index 152cefce7..949aae4bb 100644
--- a/src/game/MotionGenerators/IdleMovementGenerator.h
+++ b/src/game/MotionGenerators/IdleMovementGenerator.h
@@ -27,7 +27,7 @@
 
 #include "MovementGenerator.h"
 
-class MANGOS_DLL_SPEC IdleMovementGenerator : public MovementGenerator
+class  IdleMovementGenerator : public MovementGenerator
 {
     public:
 
@@ -41,7 +41,7 @@ class MANGOS_DLL_SPEC IdleMovementGenerator : public MovementGenerator
 
 extern IdleMovementGenerator si_idleMovement;
 
-class MANGOS_DLL_SPEC DistractMovementGenerator : public MovementGenerator
+class  DistractMovementGenerator : public MovementGenerator
 {
     public:
         explicit DistractMovementGenerator(uint32 timer) : m_timer(timer) {}
@@ -57,7 +57,7 @@ class MANGOS_DLL_SPEC DistractMovementGenerator : public MovementGenerator
         uint32 m_timer;
 };
 
-class MANGOS_DLL_SPEC AssistanceDistractMovementGenerator : public DistractMovementGenerator
+class  AssistanceDistractMovementGenerator : public DistractMovementGenerator
 {
     public:
         AssistanceDistractMovementGenerator(uint32 timer) :
diff --git a/src/game/MotionGenerators/MotionMaster.h b/src/game/MotionGenerators/MotionMaster.h
index 50083b74c..9a451836b 100644
--- a/src/game/MotionGenerators/MotionMaster.h
+++ b/src/game/MotionGenerators/MotionMaster.h
@@ -64,7 +64,7 @@ enum MMCleanFlag
     MMCF_RESET  = 2                                         // Flag if need top()->Reset()
 };
 
-class MANGOS_DLL_SPEC MotionMaster : private std::stack<MovementGenerator*>
+class  MotionMaster : private std::stack<MovementGenerator*>
 {
     private:
         typedef std::stack<MovementGenerator*> Impl;
diff --git a/src/game/MotionGenerators/MovementGenerator.h b/src/game/MotionGenerators/MovementGenerator.h
index 19b9fc485..ab3ce3afb 100644
--- a/src/game/MotionGenerators/MovementGenerator.h
+++ b/src/game/MotionGenerators/MovementGenerator.h
@@ -37,7 +37,7 @@ class Unit;
 class Creature;
 class Player;
 
-class MANGOS_DLL_SPEC MovementGenerator
+class  MovementGenerator
 {
     public:
         virtual ~MovementGenerator();
@@ -70,7 +70,7 @@ class MANGOS_DLL_SPEC MovementGenerator
 };
 
 template<class T, class D>
-class MANGOS_DLL_SPEC MovementGeneratorMedium : public MovementGenerator
+class  MovementGeneratorMedium : public MovementGenerator
 {
     public:
         void Initialize(Unit& u) override
diff --git a/src/game/MotionGenerators/PointMovementGenerator.h b/src/game/MotionGenerators/PointMovementGenerator.h
index 452cae48f..53ceb1493 100644
--- a/src/game/MotionGenerators/PointMovementGenerator.h
+++ b/src/game/MotionGenerators/PointMovementGenerator.h
@@ -28,7 +28,7 @@
 #include "MovementGenerator.h"
 
 template<class T>
-class MANGOS_DLL_SPEC PointMovementGenerator
+class  PointMovementGenerator
     : public MovementGeneratorMedium< T, PointMovementGenerator<T> >
 {
     public:
@@ -52,7 +52,7 @@ class MANGOS_DLL_SPEC PointMovementGenerator
         bool m_generatePath;
 };
 
-class MANGOS_DLL_SPEC AssistanceMovementGenerator
+class  AssistanceMovementGenerator
     : public PointMovementGenerator<Creature>
 {
     public:
@@ -78,7 +78,7 @@ class EffectMovementGenerator : public MovementGenerator
         uint32 m_Id;
 };
 
-class MANGOS_DLL_SPEC FlyOrLandMovementGenerator : public PointMovementGenerator<Creature>
+class  FlyOrLandMovementGenerator : public PointMovementGenerator<Creature>
 {
     public:
         FlyOrLandMovementGenerator(uint32 _id, float _x, float _y, float _z, bool liftOff) :
diff --git a/src/game/MotionGenerators/RandomMovementGenerator.h b/src/game/MotionGenerators/RandomMovementGenerator.h
index 717b5aceb..b98052b12 100644
--- a/src/game/MotionGenerators/RandomMovementGenerator.h
+++ b/src/game/MotionGenerators/RandomMovementGenerator.h
@@ -28,7 +28,7 @@
 #include "MovementGenerator.h"
 
 template<class T>
-class MANGOS_DLL_SPEC RandomMovementGenerator
+class  RandomMovementGenerator
     : public MovementGeneratorMedium< T, RandomMovementGenerator<T> >
 {
     public:
diff --git a/src/game/MotionGenerators/TargetedMovementGenerator.h b/src/game/MotionGenerators/TargetedMovementGenerator.h
index 8ac208c24..07b93cdf8 100644
--- a/src/game/MotionGenerators/TargetedMovementGenerator.h
+++ b/src/game/MotionGenerators/TargetedMovementGenerator.h
@@ -30,7 +30,7 @@
 
 class PathFinder;
 
-class MANGOS_DLL_SPEC TargetedMovementGeneratorBase
+class  TargetedMovementGeneratorBase
 {
     public:
         TargetedMovementGeneratorBase(Unit& target) { i_target.link(&target, this); }
@@ -40,7 +40,7 @@ class MANGOS_DLL_SPEC TargetedMovementGeneratorBase
 };
 
 template<class T, typename D>
-class MANGOS_DLL_SPEC TargetedMovementGeneratorMedium
+class  TargetedMovementGeneratorMedium
     : public MovementGeneratorMedium< T, D >, public TargetedMovementGeneratorBase
 {
     protected:
@@ -78,7 +78,7 @@ class MANGOS_DLL_SPEC TargetedMovementGeneratorMedium
 };
 
 template<class T>
-class MANGOS_DLL_SPEC ChaseMovementGenerator : public TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >
+class  ChaseMovementGenerator : public TargetedMovementGeneratorMedium<T, ChaseMovementGenerator<T> >
 {
     public:
         ChaseMovementGenerator(Unit& target, float offset, float angle)
@@ -103,7 +103,7 @@ class MANGOS_DLL_SPEC ChaseMovementGenerator : public TargetedMovementGeneratorM
 };
 
 template<class T>
-class MANGOS_DLL_SPEC FollowMovementGenerator : public TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >
+class  FollowMovementGenerator : public TargetedMovementGeneratorMedium<T, FollowMovementGenerator<T> >
 {
     public:
         FollowMovementGenerator(Unit& target)
diff --git a/src/game/MotionGenerators/WaypointMovementGenerator.h b/src/game/MotionGenerators/WaypointMovementGenerator.h
index 9d1cc0350..71ed0f3cb 100644
--- a/src/game/MotionGenerators/WaypointMovementGenerator.h
+++ b/src/game/MotionGenerators/WaypointMovementGenerator.h
@@ -42,7 +42,7 @@
 #define STOP_TIME_FOR_PLAYER  (3 * MINUTE * IN_MILLISECONDS)  // 3 Minutes
 
 template<class T, class P>
-class MANGOS_DLL_SPEC PathMovementBase
+class  PathMovementBase
 {
     public:
         PathMovementBase() : i_currentNode(0) {}
@@ -63,10 +63,10 @@ class MANGOS_DLL_SPEC PathMovementBase
  */
 
 template<class T>
-class MANGOS_DLL_SPEC WaypointMovementGenerator;
+class  WaypointMovementGenerator;
 
 template<>
-class MANGOS_DLL_SPEC WaypointMovementGenerator<Creature>
+class  WaypointMovementGenerator<Creature>
     : public MovementGeneratorMedium< Creature, WaypointMovementGenerator<Creature> >,
   public PathMovementBase<Creature, WaypointPath const*>
 {
@@ -110,7 +110,7 @@ class MANGOS_DLL_SPEC WaypointMovementGenerator<Creature>
 /** FlightPathMovementGenerator generates movement of the player for the paths
  * and hence generates ground and activities for the player.
  */
-class MANGOS_DLL_SPEC FlightPathMovementGenerator
+class  FlightPathMovementGenerator
     : public MovementGeneratorMedium< Player, FlightPathMovementGenerator >,
   public PathMovementBase<Player, TaxiPathNodeList const*>
 {
diff --git a/src/game/Object/Camera.h b/src/game/Object/Camera.h
index 9f8e191a6..09117435c 100644
--- a/src/game/Object/Camera.h
+++ b/src/game/Object/Camera.h
@@ -35,7 +35,7 @@ class WorldPacket;
 class Player;
 
 /// Camera - object-receiver. Receives broadcast packets from nearby worldobjects, object visibility changes and sends them to client
-class MANGOS_DLL_SPEC Camera
+class  Camera
 {
         friend class ViewPoint;
     public:
@@ -83,7 +83,7 @@ class MANGOS_DLL_SPEC Camera
 };
 
 /// Object-observer, notifies farsight object state to cameras that attached to it
-class MANGOS_DLL_SPEC ViewPoint
+class  ViewPoint
 {
         friend class Camera;
 
diff --git a/src/game/Object/Creature.h b/src/game/Object/Creature.h
index 77f2306ef..5933927db 100644
--- a/src/game/Object/Creature.h
+++ b/src/game/Object/Creature.h
@@ -478,7 +478,7 @@ enum TemporaryFactionFlags                                  // Used at real fact
     TEMPFACTION_ALL,
 };
 
-class MANGOS_DLL_SPEC Creature : public Unit
+class  Creature : public Unit
 {
         CreatureAI* i_AI;
 
diff --git a/src/game/Object/CreatureAI.h b/src/game/Object/CreatureAI.h
index 27af2f1af..932975525 100644
--- a/src/game/Object/CreatureAI.h
+++ b/src/game/Object/CreatureAI.h
@@ -97,7 +97,7 @@ enum AIEventType
     AI_EVENT_CUSTOM_F           = 1005,
 };
 
-class MANGOS_DLL_SPEC CreatureAI
+class  CreatureAI
 {
     public:
         explicit CreatureAI(Creature* creature) :
diff --git a/src/game/Object/CreatureEventAI.h b/src/game/Object/CreatureEventAI.h
index f27c91a97..15c8e3750 100644
--- a/src/game/Object/CreatureEventAI.h
+++ b/src/game/Object/CreatureEventAI.h
@@ -615,7 +615,7 @@ struct CreatureEventAIHolder
     bool UpdateRepeatTimer(Creature* creature, uint32 repeatMin, uint32 repeatMax);
 };
 
-class MANGOS_DLL_SPEC CreatureEventAI : public CreatureAI
+class  CreatureEventAI : public CreatureAI
 {
     public:
         explicit CreatureEventAI(Creature* c);
diff --git a/src/game/Object/GameObject.h b/src/game/Object/GameObject.h
index e968da598..971f97254 100644
--- a/src/game/Object/GameObject.h
+++ b/src/game/Object/GameObject.h
@@ -638,7 +638,7 @@ struct GameObjectDisplayInfoEntry;
 
 #define GO_ANIMPROGRESS_DEFAULT 0xFF
 
-class MANGOS_DLL_SPEC GameObject : public WorldObject
+class  GameObject : public WorldObject
 {
     public:
         explicit GameObject();
diff --git a/src/game/Object/Item.h b/src/game/Object/Item.h
index 0cf9f06a0..46537e1ef 100644
--- a/src/game/Object/Item.h
+++ b/src/game/Object/Item.h
@@ -283,7 +283,7 @@ struct ItemRequiredTarget
 
 bool ItemCanGoIntoBag(ItemPrototype const* proto, ItemPrototype const* pBagProto);
 
-class MANGOS_DLL_SPEC Item : public Object
+class  Item : public Object
 {
     public:
         static Item* CreateItem(uint32 item, uint32 count, Player const* player = NULL, uint32 randomPropertyId = 0);
diff --git a/src/game/Object/Object.h b/src/game/Object/Object.h
index e48d52fcc..a9114af88 100644
--- a/src/game/Object/Object.h
+++ b/src/game/Object/Object.h
@@ -125,7 +125,7 @@ class WorldUpdateCounter
         uint32 m_tmStart;
 };
 
-class MANGOS_DLL_SPEC Object
+class  Object
 {
     public:
         virtual ~Object();
@@ -413,7 +413,7 @@ class MANGOS_DLL_SPEC Object
 
 struct WorldObjectChangeAccumulator;
 
-class MANGOS_DLL_SPEC WorldObject : public Object
+class  WorldObject : public Object
 {
         friend struct WorldObjectChangeAccumulator;
 
@@ -421,7 +421,7 @@ class MANGOS_DLL_SPEC WorldObject : public Object
 
         // class is used to manipulate with WorldUpdateCounter
         // it is needed in order to get time diff between two object's Update() calls
-        class MANGOS_DLL_SPEC UpdateHelper
+        class  UpdateHelper
         {
             public:
                 explicit UpdateHelper(WorldObject* obj) : m_obj(obj) {}
diff --git a/src/game/Object/ObjectGuid.h b/src/game/Object/ObjectGuid.h
index eef68a37c..42c5b59c1 100644
--- a/src/game/Object/ObjectGuid.h
+++ b/src/game/Object/ObjectGuid.h
@@ -95,7 +95,7 @@ struct PackedGuidReader
 
 #define NUM_GUID_BYTES sizeof(uint64)
 
-class MANGOS_DLL_SPEC ObjectGuid
+class  ObjectGuid
 {
     public:                                                 // constructors
         ObjectGuid() : m_guid(0) {}
diff --git a/src/game/Object/ObjectMgr.h b/src/game/Object/ObjectMgr.h
index 394454e47..5ad31a149 100644
--- a/src/game/Object/ObjectMgr.h
+++ b/src/game/Object/ObjectMgr.h
@@ -494,7 +494,7 @@ typedef std::vector<HotfixInfo> HotfixData;
 
 bool normalizePlayerName(std::string& name);
 
-struct MANGOS_DLL_SPEC LanguageDesc
+struct  LanguageDesc
 {
     Language lang_id;
     uint32   spell_id;
@@ -502,7 +502,7 @@ struct MANGOS_DLL_SPEC LanguageDesc
 };
 
 extern LanguageDesc lang_description[LANGUAGES_COUNT];
-MANGOS_DLL_SPEC LanguageDesc const* GetLanguageDescByID(uint32 lang);
+ LanguageDesc const* GetLanguageDescByID(uint32 lang);
 
 class PlayerDumpReader;
 
@@ -1301,12 +1301,12 @@ class ObjectMgr
 #define sObjectMgr MaNGOS::Singleton<ObjectMgr>::Instance()
 
 /// generic text function
-MANGOS_DLL_SPEC bool DoDisplayText(WorldObject* source, int32 entry, Unit const* target = NULL);
+ bool DoDisplayText(WorldObject* source, int32 entry, Unit const* target = NULL);
 
 // scripting access functions
-MANGOS_DLL_SPEC bool LoadMangosStrings(DatabaseType& db, char const* table, int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min(), bool extra_content = false);
-MANGOS_DLL_SPEC CreatureInfo const* GetCreatureTemplateStore(uint32 entry);
-MANGOS_DLL_SPEC Quest const* GetQuestTemplateStore(uint32 entry);
-MANGOS_DLL_SPEC MangosStringLocale const* GetMangosStringData(int32 entry);
+ bool LoadMangosStrings(DatabaseType& db, char const* table, int32 start_value = MAX_CREATURE_AI_TEXT_STRING_ID, int32 end_value = std::numeric_limits<int32>::min(), bool extra_content = false);
+ CreatureInfo const* GetCreatureTemplateStore(uint32 entry);
+ Quest const* GetQuestTemplateStore(uint32 entry);
+ MangosStringLocale const* GetMangosStringData(int32 entry);
 
 #endif
diff --git a/src/game/Object/Pet.h b/src/game/Object/Pet.h
index c1c4860ac..a2d70dab9 100644
--- a/src/game/Object/Pet.h
+++ b/src/game/Object/Pet.h
@@ -133,7 +133,7 @@ typedef std::vector<uint32> AutoSpellList;
 
 class Player;
 
-class MANGOS_DLL_SPEC Pet : public Creature
+class  Pet : public Creature
 {
     public:
         explicit Pet(PetType type = MAX_PET_TYPE);
diff --git a/src/game/Object/Player.h b/src/game/Object/Player.h
index ed26617fc..52b75548e 100644
--- a/src/game/Object/Player.h
+++ b/src/game/Object/Player.h
@@ -881,7 +881,7 @@ enum PlayerRestState
     REST_STATE_RAF_LINKED       = 0x04                      // Exact use unknown
 };
 
-class MANGOS_DLL_SPEC PlayerTaxi
+class  PlayerTaxi
 {
     public:
         PlayerTaxi();
@@ -1015,7 +1015,7 @@ class TradeData
         ObjectGuid m_items[TRADE_SLOT_COUNT];               // traded itmes from m_player side including non-traded slot
 };
 
-class MANGOS_DLL_SPEC Player : public Unit
+class  Player : public Unit
 {
         friend class WorldSession;
         friend void Item::AddToUpdateQueueOf(Player* player);
diff --git a/src/game/Object/TemporarySummon.h b/src/game/Object/TemporarySummon.h
index 712a18930..ddee5a9ed 100644
--- a/src/game/Object/TemporarySummon.h
+++ b/src/game/Object/TemporarySummon.h
@@ -36,7 +36,7 @@ class TemporarySummon : public Creature
 
         void Update(uint32 update_diff, uint32 time) override;
         void Summon(TempSummonType type, uint32 lifetime);
-        void MANGOS_DLL_SPEC UnSummon();
+        void  UnSummon();
         void SaveToDB();
         ObjectGuid const& GetSummonerGuid() const { return m_summoner ; }
         Unit* GetSummoner() const { return ObjectAccessor::GetUnit(*this, m_summoner); }
diff --git a/src/game/Object/Unit.h b/src/game/Object/Unit.h
index f89171b32..6c86f8bd0 100644
--- a/src/game/Object/Unit.h
+++ b/src/game/Object/Unit.h
@@ -1241,7 +1241,7 @@ struct SpellProcEventEntry;                                 // used only private
 
 #define MAX_OBJECT_SLOT 5
 
-class MANGOS_DLL_SPEC Unit : public WorldObject
+class  Unit : public WorldObject
 {
     public:
         typedef std::set<Unit*> AttackerSet;
diff --git a/src/game/Object/UnitEvents.h b/src/game/Object/UnitEvents.h
index 16b4ce7cd..2e7091b46 100644
--- a/src/game/Object/UnitEvents.h
+++ b/src/game/Object/UnitEvents.h
@@ -67,7 +67,7 @@ enum UnitThreatEventType
 
 //==============================================================
 
-class MANGOS_DLL_SPEC UnitBaseEvent
+class  UnitBaseEvent
 {
     private:
         uint32 iType;
@@ -81,7 +81,7 @@ class MANGOS_DLL_SPEC UnitBaseEvent
 
 //==============================================================
 
-class MANGOS_DLL_SPEC ThreatRefStatusChangeEvent : public UnitBaseEvent
+class  ThreatRefStatusChangeEvent : public UnitBaseEvent
 {
     private:
         HostileReference* iHostileReference;
@@ -118,7 +118,7 @@ class MANGOS_DLL_SPEC ThreatRefStatusChangeEvent : public UnitBaseEvent
 
 //==============================================================
 
-class MANGOS_DLL_SPEC ThreatManagerEvent : public ThreatRefStatusChangeEvent
+class  ThreatManagerEvent : public ThreatRefStatusChangeEvent
 {
     private:
         ThreatContainer* iThreatContainer;
diff --git a/src/game/References/FollowerReference.h b/src/game/References/FollowerReference.h
index 2270bc366..441641e9c 100644
--- a/src/game/References/FollowerReference.h
+++ b/src/game/References/FollowerReference.h
@@ -30,7 +30,7 @@
 class TargetedMovementGeneratorBase;
 class Unit;
 
-class MANGOS_DLL_SPEC FollowerReference : public Reference<Unit, TargetedMovementGeneratorBase>
+class  FollowerReference : public Reference<Unit, TargetedMovementGeneratorBase>
 {
     protected:
         void targetObjectBuildLink() override;
diff --git a/src/game/References/GroupReference.h b/src/game/References/GroupReference.h
index 4e6e76ccd..44c6ab49f 100644
--- a/src/game/References/GroupReference.h
+++ b/src/game/References/GroupReference.h
@@ -30,7 +30,7 @@
 class Group;
 class Player;
 
-class MANGOS_DLL_SPEC GroupReference : public Reference<Group, Player>
+class  GroupReference : public Reference<Group, Player>
 {
     protected:
         uint8 iSubGroup;
diff --git a/src/game/References/MapReference.h b/src/game/References/MapReference.h
index cd7c9aa9e..11965a989 100644
--- a/src/game/References/MapReference.h
+++ b/src/game/References/MapReference.h
@@ -28,7 +28,7 @@
 #include "Utilities/LinkedReference/Reference.h"
 #include "Map.h"
 
-class MANGOS_DLL_SPEC MapReference : public Reference<Map, Player>
+class  MapReference : public Reference<Map, Player>
 {
     protected:
         void targetObjectBuildLink() override
diff --git a/src/game/References/ThreatManager.h b/src/game/References/ThreatManager.h
index 0e6ea1cbb..e66ed9f67 100644
--- a/src/game/References/ThreatManager.h
+++ b/src/game/References/ThreatManager.h
@@ -52,7 +52,7 @@ class ThreatCalcHelper
 };
 
 //==============================================================
-class MANGOS_DLL_SPEC HostileReference : public Reference<Unit, ThreatManager>
+class  HostileReference : public Reference<Unit, ThreatManager>
 {
     public:
         HostileReference(Unit* pUnit, ThreatManager* pThreatManager, float pThreat);
@@ -142,7 +142,7 @@ class ThreatManager;
 
 typedef std::list<HostileReference*> ThreatList;
 
-class MANGOS_DLL_SPEC ThreatContainer
+class  ThreatContainer
 {
     private:
         ThreatList iThreatList;
@@ -180,7 +180,7 @@ class MANGOS_DLL_SPEC ThreatContainer
 
 //=================================================
 
-class MANGOS_DLL_SPEC ThreatManager
+class  ThreatManager
 {
     public:
         friend class HostileReference;
diff --git a/src/game/Server/DBCStores.cpp b/src/game/Server/DBCStores.cpp
index 8fe9b3960..f7e751843 100644
--- a/src/game/Server/DBCStores.cpp
+++ b/src/game/Server/DBCStores.cpp
@@ -1217,10 +1217,10 @@ float GetCurrencyPrecision(uint32 currencyId)
 }
 
 // script support functions
-MANGOS_DLL_SPEC DBCStorage <SoundEntriesEntry>  const* GetSoundEntriesStore()   { return &sSoundEntriesStore;   }
-MANGOS_DLL_SPEC DBCStorage <SpellEntry>         const* GetSpellStore()          { return &sSpellStore;          }
-MANGOS_DLL_SPEC DBCStorage <SpellRangeEntry>    const* GetSpellRangeStore()     { return &sSpellRangeStore;     }
-MANGOS_DLL_SPEC DBCStorage <FactionEntry>       const* GetFactionStore()        { return &sFactionStore;        }
-MANGOS_DLL_SPEC DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore() { return &sCreatureDisplayInfoStore; }
-MANGOS_DLL_SPEC DBCStorage <EmotesEntry>        const* GetEmotesStore()         { return &sEmotesStore;         }
-MANGOS_DLL_SPEC DBCStorage <EmotesTextEntry>    const* GetEmotesTextStore()     { return &sEmotesTextStore;     }
+ DBCStorage <SoundEntriesEntry>  const* GetSoundEntriesStore()   { return &sSoundEntriesStore;   }
+ DBCStorage <SpellEntry>         const* GetSpellStore()          { return &sSpellStore;          }
+ DBCStorage <SpellRangeEntry>    const* GetSpellRangeStore()     { return &sSpellRangeStore;     }
+ DBCStorage <FactionEntry>       const* GetFactionStore()        { return &sFactionStore;        }
+ DBCStorage <CreatureDisplayInfoEntry> const* GetCreatureDisplayStore() { return &sCreatureDisplayInfoStore; }
+ DBCStorage <EmotesEntry>        const* GetEmotesStore()         { return &sEmotesStore;         }
+ DBCStorage <EmotesTextEntry>    const* GetEmotesTextStore()     { return &sEmotesTextStore;     }
diff --git a/src/game/Server/DBCStores.h b/src/game/Server/DBCStores.h
index 7d0ff6733..9f16269d8 100644
--- a/src/game/Server/DBCStores.h
+++ b/src/game/Server/DBCStores.h
@@ -48,8 +48,8 @@ uint32 GetAreaFlagByMapId(uint32 mapid);
 
 WMOAreaTableEntry const* GetWMOAreaTableEntryByTripple(int32 rootid, int32 adtid, int32 groupid);
 
-MANGOS_DLL_SPEC AreaTableEntry const* GetAreaEntryByAreaID(uint32 area_id);
-MANGOS_DLL_SPEC AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag, uint32 map_id);
+ AreaTableEntry const* GetAreaEntryByAreaID(uint32 area_id);
+ AreaTableEntry const* GetAreaEntryByAreaFlagAndMap(uint32 area_flag, uint32 map_id);
 
 uint32 GetVirtualMapForMapAndZone(uint32 mapid, uint32 zoneId);
 
@@ -105,7 +105,7 @@ bool IsPointInAreaTriggerZone(AreaTriggerEntry const* atEntry, uint32 mapid, flo
 PvPDifficultyEntry const* GetBattlegroundBracketByLevel(uint32 mapid, uint32 level);
 PvPDifficultyEntry const* GetBattlegroundBracketById(uint32 mapid, BattleGroundBracketId id);
 
-MANGOS_DLL_SPEC uint32 GetCreatureModelRace(uint32 model_id);
+ uint32 GetCreatureModelRace(uint32 model_id);
 
 float GetCurrencyPrecision(uint32 currencyId);
 
@@ -259,12 +259,12 @@ extern DBCStorage <WorldPvPAreaEntry>            sWorldPvPAreaStore;
 void LoadDBCStores(const std::string& dataPath);
 
 // script support functions
-MANGOS_DLL_SPEC DBCStorage <SoundEntriesEntry>          const* GetSoundEntriesStore();
-MANGOS_DLL_SPEC DBCStorage <SpellEntry>                 const* GetSpellStore();
-MANGOS_DLL_SPEC DBCStorage <SpellRangeEntry>            const* GetSpellRangeStore();
-MANGOS_DLL_SPEC DBCStorage <FactionEntry>               const* GetFactionStore();
-MANGOS_DLL_SPEC DBCStorage <CreatureDisplayInfoEntry>   const* GetCreatureDisplayStore();
-MANGOS_DLL_SPEC DBCStorage <EmotesEntry>                const* GetEmotesStore();
-MANGOS_DLL_SPEC DBCStorage <EmotesTextEntry>            const* GetEmotesTextStore();
+ DBCStorage <SoundEntriesEntry>          const* GetSoundEntriesStore();
+ DBCStorage <SpellEntry>                 const* GetSpellStore();
+ DBCStorage <SpellRangeEntry>            const* GetSpellRangeStore();
+ DBCStorage <FactionEntry>               const* GetFactionStore();
+ DBCStorage <CreatureDisplayInfoEntry>   const* GetCreatureDisplayStore();
+ DBCStorage <EmotesEntry>                const* GetEmotesStore();
+ DBCStorage <EmotesTextEntry>            const* GetEmotesTextStore();
 
 #endif
diff --git a/src/game/Server/DBCStructure.h b/src/game/Server/DBCStructure.h
index 2c67d2924..c3a4ed452 100644
--- a/src/game/Server/DBCStructure.h
+++ b/src/game/Server/DBCStructure.h
@@ -1931,7 +1931,7 @@ struct SpellTotemsEntry
 };
 
 // Spell.dbc
-struct MANGOS_DLL_SPEC SpellEntry
+struct  SpellEntry
 {
     uint32    Id;                                           // 0        m_ID
     uint32    Attributes;                                   // 1        m_attribute
diff --git a/src/game/Server/WorldSession.h b/src/game/Server/WorldSession.h
index 30e23a66f..66db9ded7 100644
--- a/src/game/Server/WorldSession.h
+++ b/src/game/Server/WorldSession.h
@@ -233,7 +233,7 @@ class WorldSessionFilter : public PacketFilter
 };
 
 /// Player session in the World
-class MANGOS_DLL_SPEC WorldSession
+class  WorldSession
 {
         friend class CharacterHandler;
 
diff --git a/src/game/WorldHandlers/Chat.h b/src/game/WorldHandlers/Chat.h
index 37ac11470..2988ff739 100644
--- a/src/game/WorldHandlers/Chat.h
+++ b/src/game/WorldHandlers/Chat.h
@@ -69,7 +69,7 @@ enum ChatCommandSearchResult
     CHAT_COMMAND_UNKNOWN_SUBCOMMAND,                        // command found but some level subcommand not find in subcommand list
 };
 
-class MANGOS_DLL_SPEC ChatHandler
+class  ChatHandler
 {
     public:
         explicit ChatHandler(WorldSession* session);
diff --git a/src/game/WorldHandlers/GameEventMgr.cpp b/src/game/WorldHandlers/GameEventMgr.cpp
index 992a1de65..e4aa59ff5 100644
--- a/src/game/WorldHandlers/GameEventMgr.cpp
+++ b/src/game/WorldHandlers/GameEventMgr.cpp
@@ -1033,7 +1033,7 @@ bool GameEventMgr::IsActiveHoliday(HolidayIds id)
     return false;
 }
 
-MANGOS_DLL_SPEC bool IsHolidayActive(HolidayIds id)
+ bool IsHolidayActive(HolidayIds id)
 {
     return sGameEventMgr.IsActiveHoliday(id);
 }
diff --git a/src/game/WorldHandlers/GameEventMgr.h b/src/game/WorldHandlers/GameEventMgr.h
index 4977e07b7..7cf1dd919 100644
--- a/src/game/WorldHandlers/GameEventMgr.h
+++ b/src/game/WorldHandlers/GameEventMgr.h
@@ -136,6 +136,6 @@ class GameEventMgr
 
 #define sGameEventMgr MaNGOS::Singleton<GameEventMgr>::Instance()
 
-MANGOS_DLL_SPEC bool IsHolidayActive(HolidayIds id);
+ bool IsHolidayActive(HolidayIds id);
 
 #endif
diff --git a/src/game/WorldHandlers/GossipDef.h b/src/game/WorldHandlers/GossipDef.h
index b58f52e3f..a8b5d85c8 100644
--- a/src/game/WorldHandlers/GossipDef.h
+++ b/src/game/WorldHandlers/GossipDef.h
@@ -161,7 +161,7 @@ struct QuestMenuItem
 
 typedef std::vector<QuestMenuItem> QuestMenuItemList;
 
-class MANGOS_DLL_SPEC GossipMenu
+class  GossipMenu
 {
     public:
         explicit GossipMenu(WorldSession* session);
@@ -249,7 +249,7 @@ class QuestMenu
         QuestMenuItemList m_qItems;
 };
 
-class MANGOS_DLL_SPEC PlayerMenu
+class  PlayerMenu
 {
     private:
         GossipMenu mGossipMenu;
diff --git a/src/game/WorldHandlers/GridMap.h b/src/game/WorldHandlers/GridMap.h
index 67732f8a3..be9ebdfae 100644
--- a/src/game/WorldHandlers/GridMap.h
+++ b/src/game/WorldHandlers/GridMap.h
@@ -191,7 +191,7 @@ class GridMap
 };
 
 template<typename Countable>
-class MANGOS_DLL_SPEC Referencable
+class  Referencable
 {
     public:
         Referencable() { m_count = 0; }
@@ -217,7 +217,7 @@ typedef ACE_Atomic_Op<ACE_Thread_Mutex, long> AtomicLong;
 #define DEFAULT_WATER_SEARCH      50.0f                     // default search distance to case detection water level
 
 // class for sharing and managin GridMap objects
-class MANGOS_DLL_SPEC TerrainInfo : public Referencable<AtomicLong>
+class  TerrainInfo : public Referencable<AtomicLong>
 {
     public:
         TerrainInfo(uint32 mapid);
diff --git a/src/game/WorldHandlers/Group.h b/src/game/WorldHandlers/Group.h
index 7a2f9450e..5b758b7fb 100644
--- a/src/game/WorldHandlers/Group.h
+++ b/src/game/WorldHandlers/Group.h
@@ -214,7 +214,7 @@ struct InstanceGroupBind
 
 /** request member stats checken **/
 /** todo: uninvite people that not accepted invite **/
-class MANGOS_DLL_SPEC Group
+class  Group
 {
     public:
         struct MemberSlot
diff --git a/src/game/WorldHandlers/InstanceData.h b/src/game/WorldHandlers/InstanceData.h
index adf6a7983..eb6a62a6a 100644
--- a/src/game/WorldHandlers/InstanceData.h
+++ b/src/game/WorldHandlers/InstanceData.h
@@ -55,7 +55,7 @@ enum InstanceConditionIDs                                   // Suggested values
     INSTANCE_CONDITION_ID_ULDUAR            = 33113,
 };
 
-class MANGOS_DLL_SPEC InstanceData
+class  InstanceData
 {
     public:
 
diff --git a/src/game/WorldHandlers/Map.h b/src/game/WorldHandlers/Map.h
index fefa14113..b780489b7 100644
--- a/src/game/WorldHandlers/Map.h
+++ b/src/game/WorldHandlers/Map.h
@@ -99,7 +99,7 @@ enum LevelRequirementVsMode
 
 #define MIN_UNLOAD_DELAY      1                             // immediate unload
 
-class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
+class  Map : public GridRefManager<NGridType>
 {
         friend class MapReference;
         friend class ObjectGridLoader;
@@ -384,7 +384,7 @@ class MANGOS_DLL_SPEC Map : public GridRefManager<NGridType>
         DynamicMapTree m_dyn_tree;
 };
 
-class MANGOS_DLL_SPEC WorldMap : public Map
+class  WorldMap : public Map
 {
     private:
         using Map::GetPersistentState;                      // hide in subclass for overwrite
@@ -396,7 +396,7 @@ class MANGOS_DLL_SPEC WorldMap : public Map
         WorldPersistentState* GetPersistanceState() const;
 };
 
-class MANGOS_DLL_SPEC DungeonMap : public Map
+class  DungeonMap : public Map
 {
     private:
         using Map::GetPersistentState;                      // hide in subclass for overwrite
@@ -421,7 +421,7 @@ class MANGOS_DLL_SPEC DungeonMap : public Map
         bool m_unloadWhenEmpty;
 };
 
-class MANGOS_DLL_SPEC BattleGroundMap : public Map
+class  BattleGroundMap : public Map
 {
     private:
         using Map::GetPersistentState;                      // hide in subclass for overwrite
diff --git a/src/game/WorldHandlers/ScriptMgr.h b/src/game/WorldHandlers/ScriptMgr.h
index 6a26ac194..eb5104a54 100644
--- a/src/game/WorldHandlers/ScriptMgr.h
+++ b/src/game/WorldHandlers/ScriptMgr.h
@@ -582,10 +582,10 @@ bool StartEvents_Event(Map* map, uint32 id, Object* source, Object* target, bool
 
 #define sScriptMgr MaNGOS::Singleton<ScriptMgr>::Instance()
 
-MANGOS_DLL_SPEC uint32 GetAreaTriggerScriptId(uint32 triggerId);
-MANGOS_DLL_SPEC uint32 GetEventIdScriptId(uint32 eventId);
-MANGOS_DLL_SPEC uint32 GetScriptId(const char* name);
-MANGOS_DLL_SPEC char const* GetScriptName(uint32 id);
-MANGOS_DLL_SPEC uint32 GetScriptIdsCount();
+ uint32 GetAreaTriggerScriptId(uint32 triggerId);
+ uint32 GetEventIdScriptId(uint32 eventId);
+ uint32 GetScriptId(const char* name);
+ char const* GetScriptName(uint32 id);
+ uint32 GetScriptIdsCount();
 
 #endif
diff --git a/src/game/WorldHandlers/Spell.h b/src/game/WorldHandlers/Spell.h
index f569fdb1b..a34045799 100644
--- a/src/game/WorldHandlers/Spell.h
+++ b/src/game/WorldHandlers/Spell.h
@@ -433,7 +433,7 @@ class Spell
         bool CheckTarget(Unit* target, SpellEffectIndex eff);
         bool CanAutoCast(Unit* target);
 
-        static void MANGOS_DLL_SPEC SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 cast_count, SpellCastResult result, bool isPetCastResult = false);
+        static void  SendCastResult(Player* caster, SpellEntry const* spellInfo, uint8 cast_count, SpellCastResult result, bool isPetCastResult = false);
         void SendCastResult(SpellCastResult result);
         void SendSpellStart();
         void SendSpellGo();
diff --git a/src/game/WorldHandlers/SpellAuras.h b/src/game/WorldHandlers/SpellAuras.h
index 9ab3fb560..08d2ca10c 100644
--- a/src/game/WorldHandlers/SpellAuras.h
+++ b/src/game/WorldHandlers/SpellAuras.h
@@ -80,7 +80,7 @@ class Aura;
 // internal helper
 struct ReapplyAffectedPassiveAurasHelper;
 
-class MANGOS_DLL_SPEC SpellAuraHolder
+class  SpellAuraHolder
 {
     public:
         SpellAuraHolder(SpellEntry const* spellproto, Unit* target, WorldObject* caster, Item* castItem);
@@ -243,7 +243,7 @@ typedef void(Aura::*pAuraHandler)(bool Apply, bool Real);
 //      each setting object update field code line moved under if(Real) check is significant mangos speedup, and less server->client data sends
 //      each packet sending code moved under if(Real) check is _large_ mangos speedup, and lot less server->client data sends
 
-class MANGOS_DLL_SPEC Aura
+class  Aura
 {
         friend struct ReapplyAffectedPassiveAurasHelper;
         friend Aura* CreateAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolder* holder, Unit* target, Unit* caster, Item* castItem);
@@ -538,7 +538,7 @@ class MANGOS_DLL_SPEC Aura
         void ReapplyAffectedPassiveAuras(Unit* target, bool owner_mode);
 };
 
-class MANGOS_DLL_SPEC AreaAura : public Aura
+class  AreaAura : public Aura
 {
     public:
         AreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolder* holder, Unit* target, Unit* caster = NULL, Item* castItem = NULL);
@@ -550,7 +550,7 @@ class MANGOS_DLL_SPEC AreaAura : public Aura
         AreaAuraType m_areaAuraType;
 };
 
-class MANGOS_DLL_SPEC PersistentAreaAura : public Aura
+class  PersistentAreaAura : public Aura
 {
     public:
         PersistentAreaAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolder* holder, Unit* target, Unit* caster = NULL, Item* castItem = NULL);
@@ -559,7 +559,7 @@ class MANGOS_DLL_SPEC PersistentAreaAura : public Aura
         void Update(uint32 diff) override;
 };
 
-class MANGOS_DLL_SPEC SingleEnemyTargetAura : public Aura
+class  SingleEnemyTargetAura : public Aura
 {
         friend Aura* CreateAura(SpellEntry const* spellproto, SpellEffectIndex eff, int32* currentBasePoints, SpellAuraHolder* holder, Unit* target, Unit* caster, Item* castItem);
 
diff --git a/src/game/movement/MoveSplineInit.h b/src/game/movement/MoveSplineInit.h
index f54ce8c68..5ff1b28c9 100644
--- a/src/game/movement/MoveSplineInit.h
+++ b/src/game/movement/MoveSplineInit.h
@@ -43,7 +43,7 @@ namespace Movement
      * @brief Initializes and launches spline movement
      *
      */
-    class MANGOS_DLL_SPEC MoveSplineInit
+    class  MoveSplineInit
     {
         public:
 
diff --git a/src/shared/Config/Config.h b/src/shared/Config/Config.h
index b2cfff24a..2e38e9b5d 100644
--- a/src/shared/Config/Config.h
+++ b/src/shared/Config/Config.h
@@ -31,7 +31,7 @@
 
 class ACE_Configuration_Heap;
 
-class MANGOS_DLL_SPEC Config
+class  Config
 {
     public:
 
diff --git a/src/shared/Database/Database.h b/src/shared/Database/Database.h
index 2bbee4c41..2797b8f4c 100644
--- a/src/shared/Database/Database.h
+++ b/src/shared/Database/Database.h
@@ -44,7 +44,7 @@ class Database;
 #define MAX_QUERY_LEN   (32*1024)
 
 //
-class MANGOS_DLL_SPEC SqlConnection
+class  SqlConnection
 {
     public:
         virtual ~SqlConnection() {}
@@ -106,7 +106,7 @@ class MANGOS_DLL_SPEC SqlConnection
         StmtHolder m_holder;
 };
 
-class MANGOS_DLL_SPEC Database
+class  Database
 {
     public:
         virtual ~Database();
@@ -243,7 +243,7 @@ class MANGOS_DLL_SPEC Database
         // factory method to create SqlDelayThread objects
         virtual SqlDelayThread* CreateDelayThread();
 
-        class MANGOS_DLL_SPEC TransHelper
+        class  TransHelper
         {
             public:
                 TransHelper() : m_pTrans(NULL) {}
diff --git a/src/shared/Database/DatabaseMysql.h b/src/shared/Database/DatabaseMysql.h
index ab3967d84..eed35e5de 100644
--- a/src/shared/Database/DatabaseMysql.h
+++ b/src/shared/Database/DatabaseMysql.h
@@ -41,7 +41,7 @@
 #endif
 
 // MySQL prepared statement class
-class MANGOS_DLL_SPEC MySqlPreparedStatement : public SqlPreparedStatement
+class  MySqlPreparedStatement : public SqlPreparedStatement
 {
     public:
         MySqlPreparedStatement(const std::string& fmt, SqlConnection& conn, MYSQL* mysql);
@@ -72,7 +72,7 @@ class MANGOS_DLL_SPEC MySqlPreparedStatement : public SqlPreparedStatement
         MYSQL_RES* m_pResultMetadata;
 };
 
-class MANGOS_DLL_SPEC MySQLConnection : public SqlConnection
+class  MySQLConnection : public SqlConnection
 {
     public:
         MySQLConnection(Database& db) : SqlConnection(db), mMysql(NULL) {}
@@ -102,7 +102,7 @@ class MANGOS_DLL_SPEC MySQLConnection : public SqlConnection
         MYSQL* mMysql;
 };
 
-class MANGOS_DLL_SPEC DatabaseMysql : public Database
+class  DatabaseMysql : public Database
 {
         friend class MaNGOS::OperatorNew<DatabaseMysql>;
 
diff --git a/src/shared/Database/DatabasePostgre.h b/src/shared/Database/DatabasePostgre.h
index dcd4e6547..8b9779898 100644
--- a/src/shared/Database/DatabasePostgre.h
+++ b/src/shared/Database/DatabasePostgre.h
@@ -40,7 +40,7 @@
 #include <libpq-fe.h>
 #endif
 
-class MANGOS_DLL_SPEC PostgreSQLConnection : public SqlConnection
+class  PostgreSQLConnection : public SqlConnection
 {
     public:
         PostgreSQLConnection() : mPGconn(NULL) {}
@@ -65,7 +65,7 @@ class MANGOS_DLL_SPEC PostgreSQLConnection : public SqlConnection
         PGconn* mPGconn;
 };
 
-class MANGOS_DLL_SPEC DatabasePostgre : public Database
+class  DatabasePostgre : public Database
 {
         friend class MaNGOS::OperatorNew<DatabasePostgre>;
 
diff --git a/src/shared/Database/QueryResult.h b/src/shared/Database/QueryResult.h
index 8805c65a2..0f26a15b8 100644
--- a/src/shared/Database/QueryResult.h
+++ b/src/shared/Database/QueryResult.h
@@ -29,7 +29,7 @@
 #include "Errors.h"
 #include "Field.h"
 
-class MANGOS_DLL_SPEC QueryResult
+class  QueryResult
 {
     public:
         QueryResult(uint64 rowCount, uint32 fieldCount)
@@ -54,7 +54,7 @@ class MANGOS_DLL_SPEC QueryResult
 
 typedef std::vector<std::string> QueryFieldNames;
 
-class MANGOS_DLL_SPEC QueryNamedResult
+class  QueryNamedResult
 {
     public:
         explicit QueryNamedResult(QueryResult* query, QueryFieldNames const& names) : mQuery(query), mFieldNames(names) {}
diff --git a/src/shared/Database/SqlPreparedStatement.h b/src/shared/Database/SqlPreparedStatement.h
index 216f2bce5..3a612bd04 100644
--- a/src/shared/Database/SqlPreparedStatement.h
+++ b/src/shared/Database/SqlPreparedStatement.h
@@ -68,7 +68,7 @@ enum SqlStmtFieldType
 
 // templates might be the best choice here
 // but I didn't have time to play with them
-class MANGOS_DLL_SPEC SqlStmtFieldData
+class  SqlStmtFieldData
 {
     public:
         SqlStmtFieldData() : m_type(FIELD_NONE) { m_binaryData.ui64 = 0; }
@@ -145,7 +145,7 @@ template<> inline void SqlStmtFieldData::set(const char* val) { m_type = FIELD_S
 
 class SqlStatement;
 // prepared statement executor
-class MANGOS_DLL_SPEC SqlStmtParameters
+class  SqlStmtParameters
 {
     public:
         typedef std::vector<SqlStmtFieldData> ParameterContainer;
@@ -194,7 +194,7 @@ class SqlStatementID
 };
 
 // statement index
-class MANGOS_DLL_SPEC SqlStatement
+class  SqlStatement
 {
     public:
         ~SqlStatement() { delete m_pParams; }
@@ -301,7 +301,7 @@ class MANGOS_DLL_SPEC SqlStatement
 };
 
 // base prepared statement class
-class MANGOS_DLL_SPEC SqlPreparedStatement
+class  SqlPreparedStatement
 {
     public:
         virtual ~SqlPreparedStatement() {}
@@ -336,7 +336,7 @@ class MANGOS_DLL_SPEC SqlPreparedStatement
 };
 
 // prepared statements via plain SQL string requests
-class MANGOS_DLL_SPEC SqlPlainPreparedStatement : public SqlPreparedStatement
+class  SqlPlainPreparedStatement : public SqlPreparedStatement
 {
     public:
         SqlPlainPreparedStatement(const std::string& fmt, SqlConnection& conn);
diff --git a/src/shared/Log.h b/src/shared/Log.h
index 5c2c8b34e..360a20099 100644
--- a/src/shared/Log.h
+++ b/src/shared/Log.h
@@ -481,43 +481,43 @@ class Log : public MaNGOS::Singleton<Log, MaNGOS::ClassLevelLockable<Log, ACE_Th
  *
  * @param str...
  */
-void MANGOS_DLL_SPEC outstring_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void  outstring_log(const char* str, ...) ATTR_PRINTF(1, 2);
 /**
  * @brief
  *
  * @param str...
  */
-void MANGOS_DLL_SPEC detail_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void  detail_log(const char* str, ...) ATTR_PRINTF(1, 2);
 /**
  * @brief
  *
  * @param str...
  */
-void MANGOS_DLL_SPEC debug_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void  debug_log(const char* str, ...) ATTR_PRINTF(1, 2);
 /**
  * @brief
  *
  * @param str...
  */
-void MANGOS_DLL_SPEC error_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void  error_log(const char* str, ...) ATTR_PRINTF(1, 2);
 /**
  * @brief
  *
  * @param str...
  */
-void MANGOS_DLL_SPEC error_db_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void  error_db_log(const char* str, ...) ATTR_PRINTF(1, 2);
 /**
  * @brief
  *
  * @param fname
  * @param libName
  */
-void MANGOS_DLL_SPEC setScriptLibraryErrorFile(char const* fname, char const* libName);
+void  setScriptLibraryErrorFile(char const* fname, char const* libName);
 /**
  * @brief
  *
  * @param str...
  */
-void MANGOS_DLL_SPEC script_error_log(const char* str, ...) ATTR_PRINTF(1, 2);
+void  script_error_log(const char* str, ...) ATTR_PRINTF(1, 2);
 
 #endif
diff --git a/src/shared/ProgressBar.h b/src/shared/ProgressBar.h
index 8ab334d68..cbb6ae775 100644
--- a/src/shared/ProgressBar.h
+++ b/src/shared/ProgressBar.h
@@ -31,7 +31,7 @@
  * @brief
  *
  */
-class MANGOS_DLL_SPEC BarGoLink
+class  BarGoLink
 {
     public:
         /**
diff --git a/src/shared/Timer.h b/src/shared/Timer.h
index 1d1bacab7..35db41ab7 100644
--- a/src/shared/Timer.h
+++ b/src/shared/Timer.h
@@ -68,19 +68,19 @@ class WorldTimer
          *
          * @return uint32
          */
-        static MANGOS_DLL_SPEC uint32 tickTime();
+        static  uint32 tickTime();
         /**
          * @brief get previous world tick time
          *
          * @return uint32
          */
-        static MANGOS_DLL_SPEC uint32 tickPrevTime();
+        static  uint32 tickPrevTime();
         /**
          * @brief tick world timer
          *
          * @return uint32
          */
-        static MANGOS_DLL_SPEC uint32 tick();
+        static  uint32 tick();
 
     private:
         /**
@@ -103,8 +103,8 @@ class WorldTimer
          */
         static uint32 getMSTime_internal(bool savetime = false);
 
-        static MANGOS_DLL_SPEC uint32 m_iTime; /**< TODO */
-        static MANGOS_DLL_SPEC uint32 m_iPrevTime; /**< TODO */
+        static  uint32 m_iTime; /**< TODO */
+        static  uint32 m_iPrevTime; /**< TODO */
 };
 
 /**
diff --git a/src/shared/Util.h b/src/shared/Util.h
index 4adf2d0f7..5675064a1 100644
--- a/src/shared/Util.h
+++ b/src/shared/Util.h
@@ -114,7 +114,7 @@ inline uint32 secsToTimeBitFields(time_t secs)
  * @param max
  * @return int32
  */
-MANGOS_DLL_SPEC int32 irand(int32 min, int32 max);
+ int32 irand(int32 min, int32 max);
 
 /**
  * @brief Return a random number in the range min..max (inclusive).
@@ -126,7 +126,7 @@ MANGOS_DLL_SPEC int32 irand(int32 min, int32 max);
  * @param max
  * @return uint32
  */
-MANGOS_DLL_SPEC uint32 urand(uint32 min, uint32 max);
+ uint32 urand(uint32 min, uint32 max);
 
 /**
  * @brief Return a random number in the range min..max (inclusive).
@@ -135,14 +135,14 @@ MANGOS_DLL_SPEC uint32 urand(uint32 min, uint32 max);
  * @param max
  * @return float
  */
-MANGOS_DLL_SPEC float frand(float min, float max);
+ float frand(float min, float max);
 
 /**
  * @brief Return a random number in the range 0 .. RAND32_MAX.
  *
  * @return int32
  */
-MANGOS_DLL_SPEC int32 rand32();
+ int32 rand32();
 
 /**
  * @brief Return a random double from 0.0 to 1.0 (exclusive).
@@ -153,14 +153,14 @@ MANGOS_DLL_SPEC int32 rand32();
  *
  * @return double
  */
-MANGOS_DLL_SPEC double rand_norm(void);
+ double rand_norm(void);
 
 /**
  * @brief
  *
  * @return float
  */
-MANGOS_DLL_SPEC float rand_norm_f(void);
+ float rand_norm_f(void);
 
 /**
  * @brief Return a random double from 0.0 to 99.9999999999999.
@@ -171,14 +171,14 @@ MANGOS_DLL_SPEC float rand_norm_f(void);
  *
  * @return double
  */
-MANGOS_DLL_SPEC double rand_chance(void);
+ double rand_chance(void);
 
 /**
  * @brief
  *
  * @return float
  */
-MANGOS_DLL_SPEC float rand_chance_f(void);
+ float rand_chance_f(void);
 
 /**
  * @brief Return true if a random roll gets above the given chance