diff --git a/src/server/game/AuctionHouse/AuctionHouseMgr.h b/src/server/game/AuctionHouse/AuctionHouseMgr.h
index 7fbee6e9132..ff8fc4d0773 100644
--- a/src/server/game/AuctionHouse/AuctionHouseMgr.h
+++ b/src/server/game/AuctionHouse/AuctionHouseMgr.h
@@ -21,7 +21,9 @@
 
 #include <ace/Singleton.h>
 
-#include "SharedDefines.h"
+#include "Common.h"
+#include "DatabaseEnv.h"
+#include "DBCStructure.h"
 
 class Item;
 class Player;
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index b1087989180..3d8f04fa23d 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -23,9 +23,12 @@
 #include "DatabaseEnv.h"
 #include "DBCStores.h"
 #include "ObjectMgr.h"
+#include "OutdoorPvPMgr.h"
 #include "ProgressBar.h"
 #include "ScriptLoader.h"
 #include "ScriptSystem.h"
+#include "Transport.h"
+
 
 // Utility macros to refer to the script registry.
 #define SCR_REG_MAP(T) ScriptRegistry<T>::ScriptMap
@@ -1369,6 +1372,8 @@ template class ScriptMgr::ScriptRegistry<VehicleScript>;
 template class ScriptMgr::ScriptRegistry<DynamicObjectScript>;
 template class ScriptMgr::ScriptRegistry<TransportScript>;
 template class ScriptMgr::ScriptRegistry<AchievementCriteriaScript>;
+template class ScriptMgr::ScriptRegistry<PlayerScript>;
+template class ScriptMgr::ScriptRegistry<GuildScript>;
 
 // Undefine utility macros.
 #undef GET_SCRIPT_RET
diff --git a/src/server/game/Scripting/ScriptMgr.h b/src/server/game/Scripting/ScriptMgr.h
index 0c1135a2416..622b39c2805 100644
--- a/src/server/game/Scripting/ScriptMgr.h
+++ b/src/server/game/Scripting/ScriptMgr.h
@@ -22,38 +22,50 @@
 #define SC_SCRIPTMGR_H
 
 #include "Common.h"
-#include "CompilerDefs.h"
-#include "DBCStructure.h"
-#include "Config.h"
-#include "ObjectMgr.h"
-#include "Battleground.h"
-#include "OutdoorPvPMgr.h"
-#include "SharedDefines.h"
-#include "Chat.h"
-#include "Weather.h"
-#include "AuctionHouseMgr.h"
-#include "ConditionMgr.h"
-#include "Vehicle.h"
-#include "Transport.h"
-#include "AchievementMgr.h"
+#include <ace/Singleton.h>
 
-class Player;
+#include "DBCStores.h"
+#include "Player.h"
+#include "SharedDefines.h"
+#include "World.h"
+#include "Weather.h"
+
+class AuctionHouseObject;
+class AuraScript;
+class Battleground;
+class BattlegroundMap;
+class Channel;
+class ChatCommand;
 class Creature;
 class CreatureAI;
-class InstanceScript;
-class SpellScript;
-class AuraScript;
-class Quest;
-class Item;
+class DynamicObject;
 class GameObject;
-class SpellCastTargets;
+class Guild;
+class GridMap;
+class Group;
+class InstanceMap;
+class InstanceScript;
+class Item;
 class Map;
-class Unit;
-class WorldObject;
-struct ItemPrototype;
-class Spell;
+class OutdoorPvP;
+class Player;
+class Quest;
 class ScriptMgr;
+class Spell;
+class SpellScript;
+class SpellCastTargets;
+class Transport;
+class Unit;
+class Vehicle;
+class WorldPacket;
 class WorldSocket;
+class WorldObject;
+
+struct AchievementCriteriaData;
+struct AuctionEntry;
+struct Condition;
+struct ItemPrototype;
+struct OutdoorPvPData;
 
 #define VISIBLE_RANGE       (166.0f)                        //MAX visible range (size of grid)
 #define DEFAULT_TEXT        "<Trinity Script Text Entry Missing!>"
@@ -67,7 +79,6 @@ void DoScriptText(int32 textEntry, WorldObject* pSource, Unit *pTarget = NULL);
     MailScript
     SessionScript
     CollisionScript
-    GroupScript
     ArenaTeamScript
 
 */
@@ -744,7 +755,7 @@ class ScriptMgr
 
         void CreateSpellScripts(uint32 spell_id, std::list<SpellScript*>& script_vector);
         void CreateAuraScripts(uint32 spell_id, std::list<AuraScript*>& script_vector);
-        void CreateSpellScriptLoaders(uint32 spell_id, std::vector<std::pair<SpellScriptLoader*, SpellScriptsMap::iterator> >& script_vector);
+        void CreateSpellScriptLoaders(uint32 spell_id, std::vector<std::pair<SpellScriptLoader*, std::multimap<uint32, uint32>::iterator> >& script_vector);
 
     public: /* ServerScript */