diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/ArenaTeamHandler.cpp
index f2a71f8c1..c31f39514 100644
--- a/src/game/ArenaTeamHandler.cpp
+++ b/src/game/ArenaTeamHandler.cpp
@@ -25,7 +25,6 @@
 #include "ArenaTeam.h"
 #include "World.h"
 #include "SocialMgr.h"
-#include "Language.h"
 
 void WorldSession::HandleInspectArenaStatsOpcode(WorldPacket & recv_data)
 {
diff --git a/src/game/Bag.cpp b/src/game/Bag.cpp
index 2f967752e..eae355166 100644
--- a/src/game/Bag.cpp
+++ b/src/game/Bag.cpp
@@ -21,9 +21,7 @@
 #include "ObjectMgr.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
-#include "WorldPacket.h"
 #include "UpdateData.h"
-#include "WorldSession.h"
 
 Bag::Bag( ): Item()
 {
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index 7dd0dcc67..441cd1bff 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -26,6 +26,7 @@
 #include "Chat.h"
 #include "SpellAuras.h"
 #include "ArenaTeam.h"
+#include "World.h"
 #include "Group.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
@@ -1639,4 +1640,4 @@ void BattleGround::SetBgRaid( uint32 TeamID, Group *bg_raid )
 WorldSafeLocsEntry const* BattleGround::GetClosestGraveYard( Player* player )
 {
     return objmgr.GetClosestGraveYard( player->GetPositionX(), player->GetPositionY(), player->GetPositionZ(), player->GetMapId(), player->GetTeam() );
-}
\ No newline at end of file
+}
diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp
index e45909788..fe9efde5c 100644
--- a/src/game/BattleGroundAB.cpp
+++ b/src/game/BattleGroundAB.cpp
@@ -23,7 +23,6 @@
 #include "Creature.h"
 #include "Chat.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "Language.h"
 #include "Util.h"
 #include "WorldPacket.h"
diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp
index e622ccd86..af5bd2360 100644
--- a/src/game/BattleGroundAV.cpp
+++ b/src/game/BattleGroundAV.cpp
@@ -20,7 +20,6 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
-#include "MapManager.h"
 #include "Language.h"
 
 BattleGroundAV::BattleGroundAV()
diff --git a/src/game/BattleGroundBE.cpp b/src/game/BattleGroundBE.cpp
index 6f36fd4b7..d2764c13f 100644
--- a/src/game/BattleGroundBE.cpp
+++ b/src/game/BattleGroundBE.cpp
@@ -21,7 +21,6 @@
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "WorldPacket.h"
 #include "Language.h"
 
diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp
index 9d425fbc1..6428dd428 100644
--- a/src/game/BattleGroundEY.cpp
+++ b/src/game/BattleGroundEY.cpp
@@ -23,7 +23,6 @@
 #include "Creature.h"
 #include "Chat.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "Language.h"
 #include "WorldPacket.h"
 #include "Util.h"
diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
index 8cb821cca..5990c4309 100644
--- a/src/game/BattleGroundHandler.cpp
+++ b/src/game/BattleGroundHandler.cpp
@@ -23,7 +23,6 @@
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "WorldSession.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Object.h"
 #include "Chat.h"
diff --git a/src/game/BattleGroundNA.cpp b/src/game/BattleGroundNA.cpp
index f9b79f2d4..0207cea84 100644
--- a/src/game/BattleGroundNA.cpp
+++ b/src/game/BattleGroundNA.cpp
@@ -21,7 +21,6 @@
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "WorldPacket.h"
 #include "Language.h"
 
diff --git a/src/game/BattleGroundRL.cpp b/src/game/BattleGroundRL.cpp
index 8f5a5e9b9..a75ce9a62 100644
--- a/src/game/BattleGroundRL.cpp
+++ b/src/game/BattleGroundRL.cpp
@@ -21,7 +21,6 @@
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "Language.h"
 #include "WorldPacket.h"
 
diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp
index f6e1b8b95..0e8f4057d 100644
--- a/src/game/BattleGroundWS.cpp
+++ b/src/game/BattleGroundWS.cpp
@@ -23,7 +23,6 @@
 #include "Creature.h"
 #include "GameObject.h"
 #include "Chat.h"
-#include "MapManager.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
 #include "Language.h"
diff --git a/src/game/Channel.h b/src/game/Channel.h
index 9839a8312..6e2fab2a5 100644
--- a/src/game/Channel.h
+++ b/src/game/Channel.h
@@ -21,7 +21,6 @@
 
 #include "Common.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "Opcodes.h"
 #include "Player.h"
 
diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index 423866c94..682100d40 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -29,7 +29,6 @@
 #include "Guild.h"
 #include "UpdateMask.h"
 #include "Auth/md5.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Group.h"
 #include "Database/DatabaseImpl.h"
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index b943865c0..e2eba78ba 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -28,7 +28,6 @@
 #include "Player.h"
 #include "UpdateMask.h"
 #include "Chat.h"
-#include "MapManager.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "AccountMgr.h"
diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index 0edfd30c8..1bde9d37d 100644
--- a/src/game/ChatHandler.cpp
+++ b/src/game/ChatHandler.cpp
@@ -28,7 +28,6 @@
 #include "ChannelMgr.h"
 #include "Group.h"
 #include "Guild.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "ScriptCalls.h"
 #include "Player.h"
diff --git a/src/game/Corpse.cpp b/src/game/Corpse.cpp
index 3fe362a8e..5dc0be3e6 100644
--- a/src/game/Corpse.cpp
+++ b/src/game/Corpse.cpp
@@ -20,12 +20,9 @@
 #include "Corpse.h"
 #include "Player.h"
 #include "UpdateMask.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
-#include "WorldSession.h"
-#include "WorldPacket.h"
 #include "GossipDef.h"
 #include "World.h"
 
diff --git a/src/game/Creature.cpp b/src/game/Creature.cpp
index bfdd2d58a..785d99858 100644
--- a/src/game/Creature.cpp
+++ b/src/game/Creature.cpp
@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -35,7 +34,6 @@
 #include "CreatureAI.h"
 #include "CreatureAISelector.h"
 #include "Formulas.h"
-#include "SpellAuras.h"
 #include "WaypointMovementGenerator.h"
 #include "InstanceData.h"
 #include "BattleGroundMgr.h"
@@ -2117,4 +2115,4 @@ void Creature::SetActiveObjectState( bool on )
 
     if(world)
         map->Add(this);
-}
\ No newline at end of file
+}
diff --git a/src/game/CreatureAIRegistry.cpp b/src/game/CreatureAIRegistry.cpp
index fa14bbe43..83fd1cbe4 100644
--- a/src/game/CreatureAIRegistry.cpp
+++ b/src/game/CreatureAIRegistry.cpp
@@ -25,7 +25,6 @@
 #include "RandomMovementGenerator.h"
 #include "CreatureAIImpl.h"
 #include "MovementGeneratorImpl.h"
-#include "MapManager.h"
 #include "CreatureAIRegistry.h"
 #include "WaypointMovementGenerator.h"
 
diff --git a/src/game/DuelHandler.cpp b/src/game/DuelHandler.cpp
index d98b444cc..e9e1fa0b6 100644
--- a/src/game/DuelHandler.cpp
+++ b/src/game/DuelHandler.cpp
@@ -22,7 +22,6 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "UpdateData.h"
-#include "MapManager.h"
 #include "Player.h"
 
 void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
diff --git a/src/game/DynamicObject.cpp b/src/game/DynamicObject.cpp
index 5b11ce800..e41f41668 100644
--- a/src/game/DynamicObject.cpp
+++ b/src/game/DynamicObject.cpp
@@ -17,16 +17,11 @@
  */
 
 #include "Common.h"
-#include "GameObject.h"
 #include "UpdateMask.h"
 #include "Opcodes.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
 #include "World.h"
 #include "ObjectAccessor.h"
 #include "Database/DatabaseEnv.h"
-#include "SpellAuras.h"
-#include "MapManager.h"
 #include "GridNotifiers.h"
 #include "CellImpl.h"
 #include "GridNotifiersImpl.h"
diff --git a/src/game/FleeingMovementGenerator.h b/src/game/FleeingMovementGenerator.h
index ec3d3f91a..045f02498 100644
--- a/src/game/FleeingMovementGenerator.h
+++ b/src/game/FleeingMovementGenerator.h
@@ -22,7 +22,6 @@
 #include "MovementGenerator.h"
 #include "DestinationHolder.h"
 #include "Traveller.h"
-#include "MapManager.h"
 
 template<class T>
 class MANGOS_DLL_SPEC FleeingMovementGenerator
diff --git a/src/game/GameObject.cpp b/src/game/GameObject.cpp
index 6a5fb5687..29ed63eaa 100644
--- a/src/game/GameObject.cpp
+++ b/src/game/GameObject.cpp
@@ -26,10 +26,8 @@
 #include "UpdateMask.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "World.h"
 #include "Database/DatabaseEnv.h"
-#include "MapManager.h"
 #include "LootMgr.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
diff --git a/src/game/GridNotifiers.cpp b/src/game/GridNotifiers.cpp
index 8f49150d3..b1acc2b61 100644
--- a/src/game/GridNotifiers.cpp
+++ b/src/game/GridNotifiers.cpp
@@ -22,7 +22,6 @@
 #include "UpdateData.h"
 #include "Item.h"
 #include "Map.h"
-#include "MapManager.h"
 #include "Transports.h"
 #include "ObjectAccessor.h"
 
diff --git a/src/game/GridStates.cpp b/src/game/GridStates.cpp
index 4743860f5..289be47a1 100644
--- a/src/game/GridStates.cpp
+++ b/src/game/GridStates.cpp
@@ -18,7 +18,6 @@
 
 #include "GridStates.h"
 #include "GridNotifiers.h"
-#include "ObjectAccessor.h"
 #include "GameSystem/Grid.h"
 #include "Log.h"
 
diff --git a/src/game/GroupHandler.cpp b/src/game/GroupHandler.cpp
index 16da66253..44fa9c290 100644
--- a/src/game/GroupHandler.cpp
+++ b/src/game/GroupHandler.cpp
@@ -26,8 +26,6 @@
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Group.h"
-#include "ObjectAccessor.h"
-#include "MapManager.h"
 #include "SocialMgr.h"
 #include "Util.h"
 
diff --git a/src/game/Guild.cpp b/src/game/Guild.cpp
index 4ff5471e0..239782f9e 100644
--- a/src/game/Guild.cpp
+++ b/src/game/Guild.cpp
@@ -19,7 +19,6 @@
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "MapManager.h"
 #include "Player.h"
 #include "Opcodes.h"
 #include "ObjectMgr.h"
diff --git a/src/game/GuildHandler.cpp b/src/game/GuildHandler.cpp
index 7a2e17cca..7b77ddf44 100644
--- a/src/game/GuildHandler.cpp
+++ b/src/game/GuildHandler.cpp
@@ -24,7 +24,6 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "Guild.h"
-#include "MapManager.h"
 #include "GossipDef.h"
 #include "SocialMgr.h"
 
diff --git a/src/game/HomeMovementGenerator.cpp b/src/game/HomeMovementGenerator.cpp
index 2c9ae048f..a0c090989 100644
--- a/src/game/HomeMovementGenerator.cpp
+++ b/src/game/HomeMovementGenerator.cpp
@@ -20,8 +20,6 @@
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "Traveller.h"
-#include "MapManager.h"
-#include "ObjectAccessor.h"
 #include "DestinationHolderImp.h"
 #include "ObjectMgr.h"
 #include "WorldPacket.h"
diff --git a/src/game/InstanceSaveMgr.cpp b/src/game/InstanceSaveMgr.cpp
index cc7b0b116..200068aa1 100644
--- a/src/game/InstanceSaveMgr.cpp
+++ b/src/game/InstanceSaveMgr.cpp
@@ -21,7 +21,6 @@
 
 #include "Player.h"
 #include "GridNotifiers.h"
-#include "WorldSession.h"
 #include "Log.h"
 #include "GridStates.h"
 #include "CellImpl.h"
@@ -33,7 +32,6 @@
 #include "GridNotifiersImpl.h"
 #include "Config/ConfigEnv.h"
 #include "Transports.h"
-#include "ObjectAccessor.h"
 #include "ObjectMgr.h"
 #include "World.h"
 #include "Group.h"
diff --git a/src/game/Level0.cpp b/src/game/Level0.cpp
index 15e0747e7..8cea1ee30 100644
--- a/src/game/Level0.cpp
+++ b/src/game/Level0.cpp
@@ -18,13 +18,10 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
 #include "World.h"
 #include "Player.h"
 #include "Opcodes.h"
 #include "Chat.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Language.h"
 #include "AccountMgr.h"
diff --git a/src/game/Level2.cpp b/src/game/Level2.cpp
index a98131145..4d8bc4fae 100644
--- a/src/game/Level2.cpp
+++ b/src/game/Level2.cpp
@@ -18,8 +18,6 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Item.h"
diff --git a/src/game/Level3.cpp b/src/game/Level3.cpp
index ec2bd95d5..d1d0c28b0 100644
--- a/src/game/Level3.cpp
+++ b/src/game/Level3.cpp
@@ -33,7 +33,6 @@
 #include "Guild.h"
 #include "ObjectAccessor.h"
 #include "MapManager.h"
-#include "SpellAuras.h"
 #include "ScriptCalls.h"
 #include "Language.h"
 #include "GridNotifiersImpl.h"
diff --git a/src/game/Map.cpp b/src/game/Map.cpp
index 0796e3a4f..e86a687da 100644
--- a/src/game/Map.cpp
+++ b/src/game/Map.cpp
@@ -19,7 +19,6 @@
 #include "MapManager.h"
 #include "Player.h"
 #include "GridNotifiers.h"
-#include "WorldSession.h"
 #include "Log.h"
 #include "GridStates.h"
 #include "CellImpl.h"
diff --git a/src/game/MiscHandler.cpp b/src/game/MiscHandler.cpp
index d52d80c10..6b7582cbc 100644
--- a/src/game/MiscHandler.cpp
+++ b/src/game/MiscHandler.cpp
@@ -34,11 +34,9 @@
 #include "Chat.h"
 #include "ScriptCalls.h"
 #include <zlib/zlib.h>
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Object.h"
 #include "BattleGround.h"
-#include "SpellAuras.h"
 #include "Pet.h"
 #include "SocialMgr.h"
 
diff --git a/src/game/NPCHandler.cpp b/src/game/NPCHandler.cpp
index 12f7bfb93..78308b08c 100644
--- a/src/game/NPCHandler.cpp
+++ b/src/game/NPCHandler.cpp
@@ -27,12 +27,10 @@
 #include "SpellMgr.h"
 #include "Player.h"
 #include "GossipDef.h"
-#include "SpellAuras.h"
 #include "UpdateMask.h"
 #include "ScriptCalls.h"
 #include "ObjectAccessor.h"
 #include "Creature.h"
-#include "MapManager.h"
 #include "Pet.h"
 #include "BattleGroundMgr.h"
 #include "BattleGround.h"
diff --git a/src/game/Object.cpp b/src/game/Object.cpp
index 29039ecfc..c6081d5c5 100644
--- a/src/game/Object.cpp
+++ b/src/game/Object.cpp
@@ -26,7 +26,6 @@
 #include "Creature.h"
 #include "Player.h"
 #include "ObjectMgr.h"
-#include "WorldSession.h"
 #include "UpdateData.h"
 #include "UpdateMask.h"
 #include "Util.h"
diff --git a/src/game/ObjectAccessor.cpp b/src/game/ObjectAccessor.cpp
index 6750f023b..6103d4703 100644
--- a/src/game/ObjectAccessor.cpp
+++ b/src/game/ObjectAccessor.cpp
@@ -23,7 +23,6 @@
 #include "Creature.h"
 #include "GameObject.h"
 #include "DynamicObject.h"
-#include "WorldSession.h"
 #include "WorldPacket.h"
 #include "Item.h"
 #include "Corpse.h"
diff --git a/src/game/ObjectGridLoader.cpp b/src/game/ObjectGridLoader.cpp
index 04a343d36..de73ee183 100644
--- a/src/game/ObjectGridLoader.cpp
+++ b/src/game/ObjectGridLoader.cpp
@@ -19,7 +19,6 @@
 #include "ObjectGridLoader.h"
 #include "ObjectAccessor.h"
 #include "ObjectMgr.h"
-#include "MapManager.h"
 #include "Creature.h"
 #include "GameObject.h"
 #include "DynamicObject.h"
diff --git a/src/game/ObjectMgr.cpp b/src/game/ObjectMgr.cpp
index 282da0002..d5d858e2a 100644
--- a/src/game/ObjectMgr.cpp
+++ b/src/game/ObjectMgr.cpp
@@ -28,7 +28,6 @@
 #include "SpellMgr.h"
 #include "UpdateMask.h"
 #include "World.h"
-#include "WorldSession.h"
 #include "Group.h"
 #include "Guild.h"
 #include "ArenaTeam.h"
@@ -43,7 +42,6 @@
 #include "SpellAuras.h"
 #include "Util.h"
 #include "WaypointManager.h"
-#include "BattleGround.h"
 
 INSTANTIATE_SINGLETON_1(ObjectMgr);
 
diff --git a/src/game/Pet.cpp b/src/game/Pet.cpp
index 7cf205f67..7ae39ebb3 100644
--- a/src/game/Pet.cpp
+++ b/src/game/Pet.cpp
@@ -19,12 +19,10 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
-#include "WorldSession.h"
 #include "WorldPacket.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
 #include "Pet.h"
-#include "MapManager.h"
 #include "Formulas.h"
 #include "SpellAuras.h"
 #include "CreatureAI.h"
diff --git a/src/game/PetHandler.cpp b/src/game/PetHandler.cpp
index 37697ec7c..626bee716 100644
--- a/src/game/PetHandler.cpp
+++ b/src/game/PetHandler.cpp
@@ -25,11 +25,9 @@
 #include "Opcodes.h"
 #include "Spell.h"
 #include "ObjectAccessor.h"
-#include "MapManager.h"
 #include "CreatureAI.h"
 #include "Util.h"
 #include "Pet.h"
-#include "Language.h"
 
 void WorldSession::HandlePetAction( WorldPacket & recv_data )
 {
diff --git a/src/game/PetitionsHandler.cpp b/src/game/PetitionsHandler.cpp
index 181c0556a..a4a6594c8 100644
--- a/src/game/PetitionsHandler.cpp
+++ b/src/game/PetitionsHandler.cpp
@@ -26,7 +26,6 @@
 #include "Opcodes.h"
 #include "Guild.h"
 #include "ArenaTeam.h"
-#include "MapManager.h"
 #include "GossipDef.h"
 #include "SocialMgr.h"
 
diff --git a/src/game/Player.cpp b/src/game/Player.cpp
index f6547288c..7fd006d38 100644
--- a/src/game/Player.cpp
+++ b/src/game/Player.cpp
@@ -46,7 +46,6 @@
 #include "Group.h"
 #include "Guild.h"
 #include "Pet.h"
-#include "SpellAuras.h"
 #include "Util.h"
 #include "Transports.h"
 #include "Weather.h"
diff --git a/src/game/PointMovementGenerator.cpp b/src/game/PointMovementGenerator.cpp
index 5da26c9bf..fda73463c 100644
--- a/src/game/PointMovementGenerator.cpp
+++ b/src/game/PointMovementGenerator.cpp
@@ -20,7 +20,6 @@
 #include "Errors.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "MapManager.h"
 #include "DestinationHolderImp.h"
 
 //----- Point Movement Generator
diff --git a/src/game/PoolHandler.cpp b/src/game/PoolHandler.cpp
index 4d040146f..bd47c7b6a 100644
--- a/src/game/PoolHandler.cpp
+++ b/src/game/PoolHandler.cpp
@@ -19,7 +19,6 @@
 #include "PoolHandler.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
-#include "Language.h"
 #include "Log.h"
 #include "MapManager.h"
 #include "Policies/SingletonImp.h"
diff --git a/src/game/QueryHandler.cpp b/src/game/QueryHandler.cpp
index 42ca28e25..b58a63159 100644
--- a/src/game/QueryHandler.cpp
+++ b/src/game/QueryHandler.cpp
@@ -29,7 +29,6 @@
 #include "Player.h"
 #include "UpdateMask.h"
 #include "NPCHandler.h"
-#include "ObjectAccessor.h"
 #include "Pet.h"
 #include "MapManager.h"
 
diff --git a/src/game/SkillDiscovery.cpp b/src/game/SkillDiscovery.cpp
index 9e2ba8f6f..242487a38 100644
--- a/src/game/SkillDiscovery.cpp
+++ b/src/game/SkillDiscovery.cpp
@@ -20,7 +20,6 @@
 #include "Log.h"
 #include "ProgressBar.h"
 #include "Policies/SingletonImp.h"
-#include "ObjectAccessor.h"
 #include "World.h"
 #include "Util.h"
 #include "SkillDiscovery.h"
diff --git a/src/game/SkillHandler.cpp b/src/game/SkillHandler.cpp
index 8e20d50df..dac37e6b0 100644
--- a/src/game/SkillHandler.cpp
+++ b/src/game/SkillHandler.cpp
@@ -25,7 +25,6 @@
 #include "WorldSession.h"
 #include "ObjectAccessor.h"
 #include "UpdateMask.h"
-#include "SpellAuras.h"
 
 void WorldSession::HandleLearnTalentOpcode( WorldPacket & recv_data )
 {
diff --git a/src/game/SocialMgr.cpp b/src/game/SocialMgr.cpp
index 82cdf2e64..928411192 100644
--- a/src/game/SocialMgr.cpp
+++ b/src/game/SocialMgr.cpp
@@ -21,7 +21,6 @@
 #include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "World.h"
diff --git a/src/game/Spell.cpp b/src/game/Spell.cpp
index ab28d2cc5..25372e51e 100644
--- a/src/game/Spell.cpp
+++ b/src/game/Spell.cpp
@@ -33,7 +33,6 @@
 #include "Unit.h"
 #include "Spell.h"
 #include "DynamicObject.h"
-#include "SpellAuras.h"
 #include "Group.h"
 #include "UpdateData.h"
 #include "MapManager.h"
diff --git a/src/game/SpellAuras.cpp b/src/game/SpellAuras.cpp
index 9da84e653..d266abf4f 100644
--- a/src/game/SpellAuras.cpp
+++ b/src/game/SpellAuras.cpp
@@ -29,11 +29,9 @@
 #include "Player.h"
 #include "Unit.h"
 #include "Spell.h"
-#include "SpellAuras.h"
 #include "DynamicObject.h"
 #include "Group.h"
 #include "UpdateData.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "Policies/SingletonImp.h"
 #include "Totem.h"
diff --git a/src/game/SpellEffects.cpp b/src/game/SpellEffects.cpp
index aba08adce..cbbf73a05 100644
--- a/src/game/SpellEffects.cpp
+++ b/src/game/SpellEffects.cpp
@@ -19,7 +19,6 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "UpdateMask.h"
diff --git a/src/game/SpellHandler.cpp b/src/game/SpellHandler.cpp
index 26d328e82..89ce47123 100644
--- a/src/game/SpellHandler.cpp
+++ b/src/game/SpellHandler.cpp
@@ -25,9 +25,6 @@
 #include "Log.h"
 #include "Opcodes.h"
 #include "Spell.h"
-#include "SpellAuras.h"
-#include "BattleGround.h"
-#include "MapManager.h"
 #include "ScriptCalls.h"
 #include "Totem.h"
 
diff --git a/src/game/TargetedMovementGenerator.cpp b/src/game/TargetedMovementGenerator.cpp
index e0a25477f..6f4aa4c73 100644
--- a/src/game/TargetedMovementGenerator.cpp
+++ b/src/game/TargetedMovementGenerator.cpp
@@ -20,7 +20,6 @@
 #include "TargetedMovementGenerator.h"
 #include "Errors.h"
 #include "Creature.h"
-#include "MapManager.h"
 #include "DestinationHolderImp.h"
 #include "World.h"
 
diff --git a/src/game/TemporarySummon.cpp b/src/game/TemporarySummon.cpp
index d24e3ba83..293ac9d5c 100644
--- a/src/game/TemporarySummon.cpp
+++ b/src/game/TemporarySummon.cpp
@@ -17,8 +17,6 @@
  */
 
 #include "TemporarySummon.h"
-#include "WorldPacket.h"
-#include "MapManager.h"
 #include "Log.h"
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
diff --git a/src/game/ThreatManager.cpp b/src/game/ThreatManager.cpp
index 7932d46c4..66ab9c2a6 100644
--- a/src/game/ThreatManager.cpp
+++ b/src/game/ThreatManager.cpp
@@ -21,7 +21,6 @@
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "Map.h"
-#include "MapManager.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "UnitEvents.h"
diff --git a/src/game/Totem.cpp b/src/game/Totem.cpp
index c5043a472..8f0fb902f 100644
--- a/src/game/Totem.cpp
+++ b/src/game/Totem.cpp
@@ -18,7 +18,6 @@
 
 #include "Totem.h"
 #include "WorldPacket.h"
-#include "MapManager.h"
 #include "Log.h"
 #include "Group.h"
 #include "Player.h"
diff --git a/src/game/TotemAI.cpp b/src/game/TotemAI.cpp
index b1a0ba475..b91020a23 100644
--- a/src/game/TotemAI.cpp
+++ b/src/game/TotemAI.cpp
@@ -20,7 +20,6 @@
 #include "Totem.h"
 #include "Creature.h"
 #include "Database/DBCStores.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "SpellMgr.h"
 
diff --git a/src/game/Traveller.h b/src/game/Traveller.h
index 6aa55eb14..c0531631c 100644
--- a/src/game/Traveller.h
+++ b/src/game/Traveller.h
@@ -19,7 +19,6 @@
 #ifndef MANGOS_TRAVELLER_H
 #define MANGOS_TRAVELLER_H
 
-#include "MapManager.h"
 #include "Creature.h"
 #include "Player.h"
 #include <cassert>
diff --git a/src/game/Vehicle.cpp b/src/game/Vehicle.cpp
index b533609d7..cd24472d7 100644
--- a/src/game/Vehicle.cpp
+++ b/src/game/Vehicle.cpp
@@ -18,13 +18,8 @@
 
 #include "Common.h"
 #include "Log.h"
-#include "WorldSession.h"
-#include "WorldPacket.h"
 #include "ObjectMgr.h"
-#include "SpellMgr.h"
 #include "Vehicle.h"
-#include "MapManager.h"
-#include "SpellAuras.h"
 #include "Unit.h"
 #include "Util.h"
 
diff --git a/src/game/Weather.cpp b/src/game/Weather.cpp
index be1aec79c..5065761fd 100644
--- a/src/game/Weather.cpp
+++ b/src/game/Weather.cpp
@@ -22,7 +22,6 @@
 
 #include "Weather.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "Player.h"
 #include "World.h"
 #include "Log.h"
diff --git a/src/game/WorldSession.cpp b/src/game/WorldSession.cpp
index ab27d928d..e0f2b29e9 100644
--- a/src/game/WorldSession.cpp
+++ b/src/game/WorldSession.cpp
@@ -32,11 +32,8 @@
 #include "Group.h"
 #include "Guild.h"
 #include "World.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "BattleGroundMgr.h"
-#include "Language.h"                                       // for CMSG_CANCEL_MOUNT_AURA handler
-#include "Chat.h"
 #include "SocialMgr.h"
 
 /// WorldSession constructor
diff --git a/src/game/debugcmds.cpp b/src/game/debugcmds.cpp
index a2271783d..9a789c438 100644
--- a/src/game/debugcmds.cpp
+++ b/src/game/debugcmds.cpp
@@ -19,16 +19,13 @@
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
-#include "WorldSession.h"
 #include "Player.h"
 #include "Opcodes.h"
 #include "Chat.h"
 #include "Log.h"
 #include "Unit.h"
-#include "ObjectAccessor.h"
 #include "GossipDef.h"
 #include "Language.h"
-#include "MapManager.h"
 #include "BattleGroundMgr.h"
 #include <fstream>
 #include "ObjectMgr.h"
diff --git a/src/shared/revision_nr.h b/src/shared/revision_nr.h
index 407f659f9..87863ccbe 100644
--- a/src/shared/revision_nr.h
+++ b/src/shared/revision_nr.h
@@ -1,4 +1,4 @@
 #ifndef __REVISION_NR_H__
 #define __REVISION_NR_H__
- #define REVISION_NR "7402"
+ #define REVISION_NR "7403"
 #endif // __REVISION_NR_H__