diff --git a/src/bindings/universal/ScriptMgr.h b/src/bindings/universal/ScriptMgr.h
index 083566cdf38..65eea4e11b9 100644
--- a/src/bindings/universal/ScriptMgr.h
+++ b/src/bindings/universal/ScriptMgr.h
@@ -85,7 +85,7 @@ struct Script
 #define VISIBLE_RANGE (50.0f)
 
 // Read function descriptions in CreatureAI
-struct MANGOS_DLL_DECL ScriptedAI : public CreatureAI
+struct ScriptedAI : public CreatureAI
 {
     explicit ScriptedAI(Creature* creature) : CreatureAI(creature) {}
     ~ScriptedAI() {}
diff --git a/src/framework/Dynamic/FactoryHolder.h b/src/framework/Dynamic/FactoryHolder.h
index 4b60fcd8422..f68be691bc8 100644
--- a/src/framework/Dynamic/FactoryHolder.h
+++ b/src/framework/Dynamic/FactoryHolder.h
@@ -27,7 +27,7 @@
 /** FactoryHolder holds a factory object of a specific type
  */
 template<class T, class Key = std::string>
-class MANGOS_DLL_DECL FactoryHolder
+class FactoryHolder
 {
     public:
         typedef ObjectRegistry<FactoryHolder<T, Key >, Key > FactoryHolderRegistry;
diff --git a/src/framework/Dynamic/ObjectRegistry.h b/src/framework/Dynamic/ObjectRegistry.h
index 5dd030d5e23..82a3cbfd0a1 100644
--- a/src/framework/Dynamic/ObjectRegistry.h
+++ b/src/framework/Dynamic/ObjectRegistry.h
@@ -30,7 +30,7 @@
 /** ObjectRegistry holds all registry item of the same type
  */
 template<class T, class Key = std::string>
-class MANGOS_DLL_DECL ObjectRegistry
+class ObjectRegistry
 {
     public:
         typedef std::map<Key, T*> RegistryMapType;
diff --git a/src/framework/GameSystem/Grid.h b/src/framework/GameSystem/Grid.h
index 76882e2fc70..0fc646b4bde 100644
--- a/src/framework/GameSystem/Grid.h
+++ b/src/framework/GameSystem/Grid.h
@@ -44,7 +44,7 @@ class ACTIVE_OBJECT,
       class WORLD_OBJECT_TYPES,
       class GRID_OBJECT_TYPES
       >
-class MANGOS_DLL_DECL Grid
+class Grid
 {
         // allows the GridLoader to access its internals
         template<class A, class T, class O> friend class GridLoader;
diff --git a/src/framework/GameSystem/GridLoader.h b/src/framework/GameSystem/GridLoader.h
index 112a4a3b7d0..10758f8ec73 100644
--- a/src/framework/GameSystem/GridLoader.h
+++ b/src/framework/GameSystem/GridLoader.h
@@ -40,7 +40,7 @@ class ACTIVE_OBJECT,
       class WORLD_OBJECT_TYPES,
       class GRID_OBJECT_TYPES
       >
-class MANGOS_DLL_DECL GridLoader
+class GridLoader
 {
     public:
 
diff --git a/src/framework/GameSystem/NGrid.h b/src/framework/GameSystem/NGrid.h
index b4ae661dc7b..9ee80ab1b91 100644
--- a/src/framework/GameSystem/NGrid.h
+++ b/src/framework/GameSystem/NGrid.h
@@ -80,7 +80,7 @@ uint32 N,
        class WORLD_OBJECT_TYPES,
        class GRID_OBJECT_TYPES
        >
-class MANGOS_DLL_DECL NGrid
+class NGrid
 {
     public:
 
diff --git a/src/framework/GameSystem/TypeContainer.h b/src/framework/GameSystem/TypeContainer.h
index c6c5640c75b..8ca7b912bc4 100644
--- a/src/framework/GameSystem/TypeContainer.h
+++ b/src/framework/GameSystem/TypeContainer.h
@@ -206,7 +206,7 @@ struct ContainerMapList<TypeList<H, T> >
  */
 
 template<class OBJECT_TYPES>
-class MANGOS_DLL_DECL TypeMapContainer
+class TypeMapContainer
 {
     public:
 
diff --git a/src/framework/GameSystem/TypeContainerVisitor.h b/src/framework/GameSystem/TypeContainerVisitor.h
index f47abce67fe..8d59dd3ca51 100644
--- a/src/framework/GameSystem/TypeContainerVisitor.h
+++ b/src/framework/GameSystem/TypeContainerVisitor.h
@@ -66,7 +66,7 @@ void VisitorHelper(VISITOR& v, TypeMapContainer<OBJECT_TYPES>& c)
 }
 
 template<class VISITOR, class TYPE_CONTAINER>
-class MANGOS_DLL_DECL TypeContainerVisitor
+class TypeContainerVisitor
 {
     public:
 
diff --git a/src/framework/Platform/Define.h b/src/framework/Platform/Define.h
index 0c2e9a1dfd7..6c6081af0eb 100644
--- a/src/framework/Platform/Define.h
+++ b/src/framework/Platform/Define.h
@@ -64,20 +64,6 @@ typedef ACE_SHLIB_HANDLE MANGOS_LIBRARY_HANDLE;
 #  endif //__APPLE_CC__ && BIG_ENDIAN
 #endif // PLATFORM
 
-#if PLATFORM == PLATFORM_WINDOWS
-#  ifdef MANGOS_WIN32_DLL_IMPORT
-#    define MANGOS_DLL_DECL __declspec(dllimport)
-#  else //!MANGOS_WIN32_DLL_IMPORT
-#    ifdef MANGOS_WIND_DLL_EXPORT
-#      define MANGOS_DLL_DECL __declspec(dllexport)
-#    else //!MANGOS_WIND_DLL_EXPORT
-#      define MANGOS_DLL_DECL
-#    endif // MANGOS_WIND_DLL_EXPORT
-#  endif // MANGOS_WIN32_DLL_IMPORT
-#else // PLATFORM != PLATFORM_WINDOWS
-#  define MANGOS_DLL_DECL
-#endif // PLATFORM
-
 #if PLATFORM == PLATFORM_WINDOWS
 #  define MANGOS_DLL_SPEC __declspec(dllexport)
 #  ifndef DECLSPEC_NORETURN
diff --git a/src/framework/Policies/CreationPolicy.h b/src/framework/Policies/CreationPolicy.h
index 6a618c919f7..9b8a434e079 100644
--- a/src/framework/Policies/CreationPolicy.h
+++ b/src/framework/Policies/CreationPolicy.h
@@ -28,7 +28,7 @@ namespace MaNGOS
      * OperatorNew policy creates an object on the heap using new.
      */
     template<class T>
-    class MANGOS_DLL_DECL OperatorNew
+    class OperatorNew
     {
         public:
 
@@ -48,7 +48,7 @@ namespace MaNGOS
      * the first time call Create.
      */
     template<class T>
-    class MANGOS_DLL_DECL LocalStaticCreation
+    class LocalStaticCreation
     {
             union MaxAlign
             {
@@ -82,7 +82,7 @@ namespace MaNGOS
      * CreateUsingMalloc by pass the memory manger.
      */
     template<class T>
-    class MANGOS_DLL_DECL CreateUsingMalloc
+    class CreateUsingMalloc
     {
         public:
 
@@ -107,7 +107,7 @@ namespace MaNGOS
      * CreateOnCallBack creates the object base on the call back.
      */
     template<class T, class CALL_BACK>
-    class MANGOS_DLL_DECL CreateOnCallBack
+    class CreateOnCallBack
     {
         public:
             static T* Create()
diff --git a/src/framework/Policies/ObjectLifeTime.h b/src/framework/Policies/ObjectLifeTime.h
index ecc930b7d58..9b78aeff4eb 100644
--- a/src/framework/Policies/ObjectLifeTime.h
+++ b/src/framework/Policies/ObjectLifeTime.h
@@ -29,7 +29,7 @@ namespace MaNGOS
     void MANGOS_DLL_SPEC at_exit(void (*func)());
 
     template<class T>
-    class MANGOS_DLL_DECL ObjectLifeTime
+    class ObjectLifeTime
     {
         public:
 
diff --git a/src/framework/Policies/Singleton.h b/src/framework/Policies/Singleton.h
index 06fa169cc73..d7f42daa0eb 100644
--- a/src/framework/Policies/Singleton.h
+++ b/src/framework/Policies/Singleton.h
@@ -36,7 +36,7 @@ namespace MaNGOS
              class CreatePolicy = MaNGOS::OperatorNew<T>,
              class LifeTimePolicy = MaNGOS::ObjectLifeTime<T>
              >
-    class MANGOS_DLL_DECL Singleton
+    class Singleton
     {
         public:
 
@@ -103,15 +103,15 @@ namespace MaNGOS
 }
 
 #define INSTANTIATE_SINGLETON_1(TYPE) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
+    template class MaNGOS::Singleton<TYPE, MaNGOS::SingleThreaded<TYPE>, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
 
 #define INSTANTIATE_SINGLETON_2(TYPE, THREADINGMODEL) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
+    template class MaNGOS::Singleton<TYPE, THREADINGMODEL, MaNGOS::OperatorNew<TYPE>, MaNGOS::ObjectLifeTime<TYPE> >;
 
 #define INSTANTIATE_SINGLETON_3(TYPE, THREADINGMODEL, CREATIONPOLICY ) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >;
+    template class MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, MaNGOS::ObjectLifeTime<TYPE> >;
 
 #define INSTANTIATE_SINGLETON_4(TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME) \
-    template class MANGOS_DLL_DECL MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >;
+    template class MaNGOS::Singleton<TYPE, THREADINGMODEL, CREATIONPOLICY, OBJECTLIFETIME >;
 
 #endif
diff --git a/src/framework/Policies/ThreadingModel.h b/src/framework/Policies/ThreadingModel.h
index 980b2214b26..cd921ce1666 100644
--- a/src/framework/Policies/ThreadingModel.h
+++ b/src/framework/Policies/ThreadingModel.h
@@ -29,7 +29,7 @@
 namespace MaNGOS
 {
     template<typename MUTEX>
-    class MANGOS_DLL_DECL GeneralLock
+    class GeneralLock
     {
         public:
 
@@ -52,7 +52,7 @@ namespace MaNGOS
     };
 
     template<class T>
-    class MANGOS_DLL_DECL SingleThreaded
+    class SingleThreaded
     {
         public:
 
@@ -72,7 +72,7 @@ namespace MaNGOS
     };
 
     template<class T, class MUTEX>
-    class MANGOS_DLL_DECL ObjectLevelLockable
+    class ObjectLevelLockable
     {
         public:
 
@@ -107,7 +107,7 @@ namespace MaNGOS
     };
 
     template<class T, class MUTEX>
-    class MANGOS_DLL_DECL ClassLevelLockable
+    class ClassLevelLockable
     {
         public:
 
@@ -151,6 +151,6 @@ namespace MaNGOS
 template<class T, class MUTEX> MUTEX MaNGOS::ClassLevelLockable<T, MUTEX>::si_mtx;
 
 #define INSTANTIATE_CLASS_MUTEX(CTYPE, MUTEX) \
-    template class MANGOS_DLL_DECL MaNGOS::ClassLevelLockable<CTYPE, MUTEX>
+    template class MaNGOS::ClassLevelLockable<CTYPE, MUTEX>
 
 #endif
diff --git a/src/game/AggressorAI.h b/src/game/AggressorAI.h
index 7be2660e2f1..df993f6b6f3 100644
--- a/src/game/AggressorAI.h
+++ b/src/game/AggressorAI.h
@@ -25,7 +25,7 @@
 
 class Creature;
 
-class MANGOS_DLL_DECL AggressorAI : public CreatureAI
+class AggressorAI : public CreatureAI
 {
         enum AggressorState
         {
diff --git a/src/game/Cell.h b/src/game/Cell.h
index a6185811c1a..9b4e7c14ece 100644
--- a/src/game/Cell.h
+++ b/src/game/Cell.h
@@ -27,7 +27,7 @@
 class Map;
 class WorldObject;
 
-struct MANGOS_DLL_DECL CellArea
+struct CellArea
 {
     CellArea() {}
     CellArea(CellPair low, CellPair high) : low_bound(low), high_bound(high) {}
@@ -44,7 +44,7 @@ struct MANGOS_DLL_DECL CellArea
     CellPair high_bound;
 };
 
-struct MANGOS_DLL_DECL Cell
+struct Cell
 {
         Cell() { data.All = 0; }
         Cell(const Cell& cell) { data.All = cell.data.All; }
diff --git a/src/game/GridDefines.h b/src/game/GridDefines.h
index 0d111fc5b91..aef1191ef07 100644
--- a/src/game/GridDefines.h
+++ b/src/game/GridDefines.h
@@ -75,7 +75,7 @@ typedef TypeMapContainer<AllGridObjectTypes> GridTypeMapContainer;
 typedef TypeMapContainer<AllWorldObjectTypes> WorldTypeMapContainer;
 
 template<const unsigned int LIMIT>
-struct MANGOS_DLL_DECL CoordPair
+struct CoordPair
 {
     CoordPair(uint32 x = 0, uint32 y = 0) : x_coord(x), y_coord(y) {}
     CoordPair(const CoordPair<LIMIT>& obj) : x_coord(obj.x_coord), y_coord(obj.y_coord) {}
diff --git a/src/game/GridMap.h b/src/game/GridMap.h
index cadcde0fd0b..5efbc373717 100644
--- a/src/game/GridMap.h
+++ b/src/game/GridMap.h
@@ -275,7 +275,7 @@ class MANGOS_DLL_SPEC TerrainInfo : public Referencable<AtomicLong>
 };
 
 // class for managing TerrainData object and all sort of geometry querying operations
-class MANGOS_DLL_DECL TerrainManager : public MaNGOS::Singleton<TerrainManager, MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex> >
+class TerrainManager : public MaNGOS::Singleton<TerrainManager, MaNGOS::ClassLevelLockable<TerrainManager, ACE_Thread_Mutex> >
 {
         typedef UNORDERED_MAP<uint32,  TerrainInfo*> TerrainDataMap;
         friend class MaNGOS::OperatorNew<TerrainManager>;
diff --git a/src/game/GridNotifiers.h b/src/game/GridNotifiers.h
index d113c0e7021..85595aa4978 100644
--- a/src/game/GridNotifiers.h
+++ b/src/game/GridNotifiers.h
@@ -32,7 +32,7 @@
 
 namespace MaNGOS
 {
-    struct MANGOS_DLL_DECL VisibleNotifier
+    struct VisibleNotifier
     {
         Camera& i_camera;
         UpdateData i_data;
@@ -45,7 +45,7 @@ namespace MaNGOS
         void Notify(void);
     };
 
-    struct MANGOS_DLL_DECL VisibleChangesNotifier
+    struct VisibleChangesNotifier
     {
         WorldObject& i_object;
 
@@ -54,7 +54,7 @@ namespace MaNGOS
         void Visit(CameraMapType&);
     };
 
-    struct MANGOS_DLL_DECL MessageDeliverer
+    struct MessageDeliverer
     {
         Player const& i_player;
         WorldPacket* i_message;
@@ -77,7 +77,7 @@ namespace MaNGOS
         template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
-    struct MANGOS_DLL_DECL ObjectMessageDeliverer
+    struct ObjectMessageDeliverer
     {
         uint32 i_phaseMask;
         WorldPacket* i_message;
@@ -87,7 +87,7 @@ namespace MaNGOS
         template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
-    struct MANGOS_DLL_DECL MessageDistDeliverer
+    struct MessageDistDeliverer
     {
         Player const& i_player;
         WorldPacket* i_message;
@@ -101,7 +101,7 @@ namespace MaNGOS
         template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
-    struct MANGOS_DLL_DECL ObjectMessageDistDeliverer
+    struct ObjectMessageDistDeliverer
     {
         WorldObject const& i_object;
         WorldPacket* i_message;
@@ -111,7 +111,7 @@ namespace MaNGOS
         template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
-    struct MANGOS_DLL_DECL ObjectUpdater
+    struct ObjectUpdater
     {
         uint32 i_timeDiff;
         explicit ObjectUpdater(const uint32& diff) : i_timeDiff(diff) {}
@@ -122,7 +122,7 @@ namespace MaNGOS
         void Visit(CreatureMapType&);
     };
 
-    struct MANGOS_DLL_DECL PlayerRelocationNotifier
+    struct PlayerRelocationNotifier
     {
         Player& i_player;
         PlayerRelocationNotifier(Player& pl) : i_player(pl) {}
@@ -130,7 +130,7 @@ namespace MaNGOS
         void Visit(CreatureMapType&);
     };
 
-    struct MANGOS_DLL_DECL CreatureRelocationNotifier
+    struct CreatureRelocationNotifier
     {
         Creature& i_creature;
         CreatureRelocationNotifier(Creature& c) : i_creature(c) {}
@@ -140,7 +140,7 @@ namespace MaNGOS
 #endif
     };
 
-    struct MANGOS_DLL_DECL DynamicObjectUpdater
+    struct DynamicObjectUpdater
     {
         DynamicObject& i_dynobject;
         Unit* i_check;
@@ -166,7 +166,7 @@ namespace MaNGOS
 
     /* Model Searcher class:
     template<class Check>
-    struct MANGOS_DLL_DECL SomeSearcher
+    struct SomeSearcher
     {
         ResultType& i_result;
         Check & i_check;
@@ -197,7 +197,7 @@ namespace MaNGOS
     // WorldObject searchers & workers
 
     template<class Check>
-    struct MANGOS_DLL_DECL WorldObjectSearcher
+    struct WorldObjectSearcher
     {
         uint32 i_phaseMask;
         WorldObject*& i_object;
@@ -216,7 +216,7 @@ namespace MaNGOS
     };
 
     template<class Check>
-    struct MANGOS_DLL_DECL WorldObjectListSearcher
+    struct WorldObjectListSearcher
     {
         uint32 i_phaseMask;
         std::list<WorldObject*>& i_objects;
@@ -235,7 +235,7 @@ namespace MaNGOS
     };
 
     template<class Do>
-    struct MANGOS_DLL_DECL WorldObjectWorker
+    struct WorldObjectWorker
     {
         uint32 i_phaseMask;
         Do const& i_do;
@@ -283,7 +283,7 @@ namespace MaNGOS
     // Gameobject searchers
 
     template<class Check>
-    struct MANGOS_DLL_DECL GameObjectSearcher
+    struct GameObjectSearcher
     {
         uint32 i_phaseMask;
         GameObject*& i_object;
@@ -299,7 +299,7 @@ namespace MaNGOS
 
     // Last accepted by Check GO if any (Check can change requirements at each call)
     template<class Check>
-    struct MANGOS_DLL_DECL GameObjectLastSearcher
+    struct GameObjectLastSearcher
     {
         uint32 i_phaseMask;
         GameObject*& i_object;
@@ -314,7 +314,7 @@ namespace MaNGOS
     };
 
     template<class Check>
-    struct MANGOS_DLL_DECL GameObjectListSearcher
+    struct GameObjectListSearcher
     {
         uint32 i_phaseMask;
         std::list<GameObject*>& i_objects;
@@ -332,7 +332,7 @@ namespace MaNGOS
 
     // First accepted by Check Unit if any
     template<class Check>
-    struct MANGOS_DLL_DECL UnitSearcher
+    struct UnitSearcher
     {
         uint32 i_phaseMask;
         Unit*& i_object;
@@ -349,7 +349,7 @@ namespace MaNGOS
 
     // Last accepted by Check Unit if any (Check can change requirements at each call)
     template<class Check>
-    struct MANGOS_DLL_DECL UnitLastSearcher
+    struct UnitLastSearcher
     {
         uint32 i_phaseMask;
         Unit*& i_object;
@@ -366,7 +366,7 @@ namespace MaNGOS
 
     // All accepted by Check units if any
     template<class Check>
-    struct MANGOS_DLL_DECL UnitListSearcher
+    struct UnitListSearcher
     {
         uint32 i_phaseMask;
         std::list<Unit*>& i_objects;
@@ -384,7 +384,7 @@ namespace MaNGOS
     // Creature searchers
 
     template<class Check>
-    struct MANGOS_DLL_DECL CreatureSearcher
+    struct CreatureSearcher
     {
         uint32 i_phaseMask;
         Creature*& i_object;
@@ -400,7 +400,7 @@ namespace MaNGOS
 
     // Last accepted by Check Creature if any (Check can change requirements at each call)
     template<class Check>
-    struct MANGOS_DLL_DECL CreatureLastSearcher
+    struct CreatureLastSearcher
     {
         uint32 i_phaseMask;
         Creature*& i_object;
@@ -415,7 +415,7 @@ namespace MaNGOS
     };
 
     template<class Check>
-    struct MANGOS_DLL_DECL CreatureListSearcher
+    struct CreatureListSearcher
     {
         uint32 i_phaseMask;
         std::list<Creature*>& i_objects;
@@ -430,7 +430,7 @@ namespace MaNGOS
     };
 
     template<class Do>
-    struct MANGOS_DLL_DECL CreatureWorker
+    struct CreatureWorker
     {
         uint32 i_phaseMask;
         Do& i_do;
@@ -451,7 +451,7 @@ namespace MaNGOS
     // Player searchers
 
     template<class Check>
-    struct MANGOS_DLL_DECL PlayerSearcher
+    struct PlayerSearcher
     {
         uint32 i_phaseMask;
         Player*& i_object;
@@ -466,7 +466,7 @@ namespace MaNGOS
     };
 
     template<class Check>
-    struct MANGOS_DLL_DECL PlayerListSearcher
+    struct PlayerListSearcher
     {
         uint32 i_phaseMask;
         std::list<Player*>& i_objects;
@@ -481,7 +481,7 @@ namespace MaNGOS
     };
 
     template<class Do>
-    struct MANGOS_DLL_DECL PlayerWorker
+    struct PlayerWorker
     {
         uint32 i_phaseMask;
         Do& i_do;
@@ -500,7 +500,7 @@ namespace MaNGOS
     };
 
     template<class Do>
-    struct MANGOS_DLL_DECL CameraDistWorker
+    struct CameraDistWorker
     {
         WorldObject const* i_searcher;
         float i_dist;
diff --git a/src/game/GridStates.h b/src/game/GridStates.h
index ffd6301ca58..64c8b6ff70b 100644
--- a/src/game/GridStates.h
+++ b/src/game/GridStates.h
@@ -21,35 +21,35 @@
 
 #include "Map.h"
 
-class MANGOS_DLL_DECL GridState
+class GridState
 {
     public:
 
         virtual void Update(Map&, NGridType&, GridInfo&, const uint32& x, const uint32& y, const uint32& t_diff) const = 0;
 };
 
-class MANGOS_DLL_DECL InvalidState : public GridState
+class InvalidState : public GridState
 {
     public:
 
         void Update(Map&, NGridType&, GridInfo&, const uint32& x, const uint32& y, const uint32& t_diff) const override;
 };
 
-class MANGOS_DLL_DECL ActiveState : public GridState
+class ActiveState : public GridState
 {
     public:
 
         void Update(Map&, NGridType&, GridInfo&, const uint32& x, const uint32& y, const uint32& t_diff) const override;
 };
 
-class MANGOS_DLL_DECL IdleState : public GridState
+class IdleState : public GridState
 {
     public:
 
         void Update(Map&, NGridType&, GridInfo&, const uint32& x, const uint32& y, const uint32& t_diff) const override;
 };
 
-class MANGOS_DLL_DECL RemovalState : public GridState
+class RemovalState : public GridState
 {
     public:
 
diff --git a/src/game/GuardAI.h b/src/game/GuardAI.h
index e5ced9e42f4..ef4f5cf219f 100644
--- a/src/game/GuardAI.h
+++ b/src/game/GuardAI.h
@@ -25,7 +25,7 @@
 
 class Creature;
 
-class MANGOS_DLL_DECL GuardAI : public CreatureAI
+class GuardAI : public CreatureAI
 {
         enum GuardState
         {
diff --git a/src/game/MapManager.h b/src/game/MapManager.h
index 9d774cd27ea..f0b1c188ce6 100644
--- a/src/game/MapManager.h
+++ b/src/game/MapManager.h
@@ -29,7 +29,7 @@
 class Transport;
 class BattleGround;
 
-struct MANGOS_DLL_DECL MapID
+struct MapID
 {
     explicit MapID(uint32 id) : nMapId(id), nInstanceId(0) {}
     MapID(uint32 id, uint32 instid) : nMapId(id), nInstanceId(instid) {}
@@ -48,7 +48,7 @@ struct MANGOS_DLL_DECL MapID
     uint32 nInstanceId;
 };
 
-class MANGOS_DLL_DECL MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::ClassLevelLockable<MapManager, ACE_Recursive_Thread_Mutex> >
+class MapManager : public MaNGOS::Singleton<MapManager, MaNGOS::ClassLevelLockable<MapManager, ACE_Recursive_Thread_Mutex> >
 {
         friend class MaNGOS::OperatorNew<MapManager>;
 
diff --git a/src/game/MapPersistentStateMgr.h b/src/game/MapPersistentStateMgr.h
index 57d715bdcf2..6aeac5e743b 100644
--- a/src/game/MapPersistentStateMgr.h
+++ b/src/game/MapPersistentStateMgr.h
@@ -334,7 +334,7 @@ class DungeonResetScheduler
         ResetTimeQueue m_resetTimeQueue;
 };
 
-class MANGOS_DLL_DECL MapPersistentStateManager : public MaNGOS::Singleton<MapPersistentStateManager, MaNGOS::ClassLevelLockable<MapPersistentStateManager, ACE_Thread_Mutex> >
+class MapPersistentStateManager : public MaNGOS::Singleton<MapPersistentStateManager, MaNGOS::ClassLevelLockable<MapPersistentStateManager, ACE_Thread_Mutex> >
 {
         friend class DungeonResetScheduler;
     public:                                                 // constructors
diff --git a/src/game/NullCreatureAI.h b/src/game/NullCreatureAI.h
index e4216e6b2f4..bc461b02c3d 100644
--- a/src/game/NullCreatureAI.h
+++ b/src/game/NullCreatureAI.h
@@ -21,7 +21,7 @@
 
 #include "CreatureAI.h"
 
-class MANGOS_DLL_DECL NullCreatureAI : public CreatureAI
+class NullCreatureAI : public CreatureAI
 {
     public:
 
diff --git a/src/game/ObjectAccessor.h b/src/game/ObjectAccessor.h
index c9fbc0df48e..d2a2b60a548 100644
--- a/src/game/ObjectAccessor.h
+++ b/src/game/ObjectAccessor.h
@@ -83,7 +83,7 @@ class HashMapHolder
         static MapType  m_objectMap;
 };
 
-class MANGOS_DLL_DECL ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor, MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> >
+class ObjectAccessor : public MaNGOS::Singleton<ObjectAccessor, MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex> >
 {
         friend class MaNGOS::OperatorNew<ObjectAccessor>;
 
diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp
index 18a79e930e4..1c9b67a1aec 100644
--- a/src/game/ObjectGridLoader.cpp
+++ b/src/game/ObjectGridLoader.cpp
@@ -28,7 +28,7 @@
 #include "CellImpl.h"
 #include "GridDefines.h"
 
-class MANGOS_DLL_DECL ObjectGridRespawnMover
+class ObjectGridRespawnMover
 {
     public:
         ObjectGridRespawnMover() {}
diff --git a/src/game/ObjectGridLoader.h b/src/game/ObjectGridLoader.h
index 2a567b88586..37b18de1215 100644
--- a/src/game/ObjectGridLoader.h
+++ b/src/game/ObjectGridLoader.h
@@ -28,7 +28,7 @@
 
 class ObjectWorldLoader;
 
-class MANGOS_DLL_DECL ObjectGridLoader
+class ObjectGridLoader
 {
         friend class ObjectWorldLoader;
 
@@ -55,7 +55,7 @@ class MANGOS_DLL_DECL ObjectGridLoader
         uint32 i_corpses;
 };
 
-class MANGOS_DLL_DECL ObjectGridUnloader
+class ObjectGridUnloader
 {
     public:
         ObjectGridUnloader(NGridType& grid) : i_grid(grid) {}
@@ -79,7 +79,7 @@ class MANGOS_DLL_DECL ObjectGridUnloader
         NGridType& i_grid;
 };
 
-class MANGOS_DLL_DECL ObjectGridStoper
+class ObjectGridStoper
 {
     public:
         ObjectGridStoper(NGridType& grid) : i_grid(grid) {}
diff --git a/src/game/PetAI.h b/src/game/PetAI.h
index 17e568a9eb4..3d4c9cfa9a7 100644
--- a/src/game/PetAI.h
+++ b/src/game/PetAI.h
@@ -26,7 +26,7 @@
 class Creature;
 class Spell;
 
-class MANGOS_DLL_DECL PetAI : public CreatureAI
+class PetAI : public CreatureAI
 {
     public:
 
diff --git a/src/game/ReactorAI.h b/src/game/ReactorAI.h
index 5ee0129c8a8..744ce339ca9 100644
--- a/src/game/ReactorAI.h
+++ b/src/game/ReactorAI.h
@@ -24,7 +24,7 @@
 
 class Unit;
 
-class MANGOS_DLL_DECL ReactorAI : public CreatureAI
+class ReactorAI : public CreatureAI
 {
     public:
 
diff --git a/src/game/Spell.h b/src/game/Spell.h
index 90cd1db891f..44e638a206d 100644
--- a/src/game/Spell.h
+++ b/src/game/Spell.h
@@ -697,7 +697,7 @@ enum ReplenishType
 
 namespace MaNGOS
 {
-    struct MANGOS_DLL_DECL SpellNotifierPlayer              // Currently unused. When put to use this one requires handling for source-location (smilar to below)
+    struct SpellNotifierPlayer              // Currently unused. When put to use this one requires handling for source-location (smilar to below)
     {
         Spell::UnitList& i_data;
         Spell& i_spell;
@@ -732,7 +732,7 @@ namespace MaNGOS
         template<class SKIP> void Visit(GridRefManager<SKIP>&) {}
     };
 
-    struct MANGOS_DLL_DECL SpellNotifierCreatureAndPlayer
+    struct SpellNotifierCreatureAndPlayer
     {
         Spell::UnitList* i_data;
         Spell& i_spell;
diff --git a/src/game/TotemAI.h b/src/game/TotemAI.h
index 98a3c03b93d..93c6e12d555 100644
--- a/src/game/TotemAI.h
+++ b/src/game/TotemAI.h
@@ -26,7 +26,7 @@
 class Creature;
 class Totem;
 
-class MANGOS_DLL_DECL TotemAI : public CreatureAI
+class TotemAI : public CreatureAI
 {
     public: