diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
index 6309bd57..e0626a04 100644
--- a/src/game/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
@@ -29,6 +29,7 @@
 #include "AuctionHouseMgr.h"
 #include "SystemConfig.h"
 #include "SQLStorages.h"
+#include "World.h"
 
 /** \addtogroup auctionbot
  * @{
diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.h b/src/game/AuctionHouseBot/AuctionHouseBot.h
index ea8fe3b3..f9bc2c40 100644
--- a/src/game/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/game/AuctionHouseBot/AuctionHouseBot.h
@@ -25,7 +25,6 @@
 #ifndef AUCTION_HOUSE_BOT_H
 #define AUCTION_HOUSE_BOT_H
 
-#include "World.h"
 #include "Config/Config.h"
 #include "AuctionHouseMgr.h"
 #include "SharedDefines.h"
diff --git a/src/game/BattleGround/BattleGround.cpp b/src/game/BattleGround/BattleGround.cpp
index 403e1fde..9eebcc21 100644
--- a/src/game/BattleGround/BattleGround.cpp
+++ b/src/game/BattleGround/BattleGround.cpp
@@ -36,7 +36,6 @@
 #include "ObjectMgr.h"
 #include "Mail.h"
 #include "WorldPacket.h"
-#include "Util.h"
 #include "Formulas.h"
 #include "GridNotifiersImpl.h"
 #include "Chat.h"
diff --git a/src/game/BattleGround/BattleGroundAB.cpp b/src/game/BattleGround/BattleGroundAB.cpp
index 34880707..e0699af8 100644
--- a/src/game/BattleGround/BattleGroundAB.cpp
+++ b/src/game/BattleGround/BattleGroundAB.cpp
@@ -26,13 +26,10 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAB.h"
-#include "Creature.h"
 #include "GameObject.h"
 #include "BattleGroundMgr.h"
 #include "Language.h"
-#include "Util.h"
 #include "WorldPacket.h"
-#include "MapManager.h"
 #include "DBCStores.h"                                   // TODO REMOVE this when graveyard handling for pvp is updated
 
 /// <summary>
diff --git a/src/game/BattleGround/BattleGroundWS.cpp b/src/game/BattleGround/BattleGroundWS.cpp
index e36e7868..0490350d 100644
--- a/src/game/BattleGround/BattleGroundWS.cpp
+++ b/src/game/BattleGround/BattleGroundWS.cpp
@@ -26,13 +26,11 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundWS.h"
-#include "Creature.h"
 #include "GameObject.h"
 #include "ObjectMgr.h"
 #include "BattleGroundMgr.h"
 #include "WorldPacket.h"
 #include "Language.h"
-#include "MapManager.h"
 
 BattleGroundWS::BattleGroundWS()
 {
diff --git a/src/game/ChatCommands/Level2.cpp b/src/game/ChatCommands/Level2.cpp
index ae39e5b0..e2fcfafe 100644
--- a/src/game/ChatCommands/Level2.cpp
+++ b/src/game/ChatCommands/Level2.cpp
@@ -40,7 +40,6 @@
 #include "Language.h"
 #include "World.h"
 #include "GameEventMgr.h"
-#include "ScriptMgr.h"
 #include "SpellMgr.h"
 #include "MapPersistentStateMgr.h"
 #include "AccountMgr.h"
@@ -52,11 +51,6 @@
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "WaypointMovementGenerator.h"
-#include <cctype>
-#include <iostream>
-#include <fstream>
-#include <map>
-#include <typeinfo>
 #include "Formulas.h"
 #include "G3D/Quat.h"                                       // for turning GO's
 #include "TargetedMovementGenerator.h"                      // for HandleNpcUnFollowCommand
@@ -64,6 +58,10 @@
 #include "PathFinder.h"                                     // for mmap commands
 #include "movement/MoveSplineInit.h"
 
+#include <fstream>
+#include <map>
+#include <typeinfo>
+
 static uint32 ReputationRankStrIndex[MAX_REPUTATION_RANK] =
 {
     LANG_REP_HATED,    LANG_REP_HOSTILE, LANG_REP_UNFRIENDLY, LANG_REP_NEUTRAL,
diff --git a/src/game/ChatCommands/Level3.cpp b/src/game/ChatCommands/Level3.cpp
index d8dc673c..0448d946 100644
--- a/src/game/ChatCommands/Level3.cpp
+++ b/src/game/ChatCommands/Level3.cpp
@@ -24,7 +24,6 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
-#include "WorldPacket.h"
 #include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
@@ -32,7 +31,6 @@
 #include "PlayerDump.h"
 #include "SpellMgr.h"
 #include "Player.h"
-#include "Opcodes.h"
 #include "GameObject.h"
 #include "Chat.h"
 #include "Log.h"
diff --git a/src/game/ChatCommands/debugcmds.cpp b/src/game/ChatCommands/debugcmds.cpp
index 76631864..3a07f8dd 100644
--- a/src/game/ChatCommands/debugcmds.cpp
+++ b/src/game/ChatCommands/debugcmds.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
 #include "DBCStores.h"
 #include "WorldPacket.h"
 #include "Player.h"
diff --git a/src/game/MotionGenerators/ConfusedMovementGenerator.cpp b/src/game/MotionGenerators/ConfusedMovementGenerator.cpp
index 4a271bce..3e0b579d 100644
--- a/src/game/MotionGenerators/ConfusedMovementGenerator.cpp
+++ b/src/game/MotionGenerators/ConfusedMovementGenerator.cpp
@@ -23,12 +23,10 @@
  */
 
 #include "ConfusedMovementGenerator.h"
-#include "MapManager.h"
 #include "Creature.h"
 #include "Player.h"
 #include "movement/MoveSplineInit.h"
 #include "movement/MoveSpline.h"
-#include "PathFinder.h"
 
 template<class T>
 void ConfusedMovementGenerator<T>::Initialize(T& unit)
diff --git a/src/game/MotionGenerators/FleeingMovementGenerator.cpp b/src/game/MotionGenerators/FleeingMovementGenerator.cpp
index bc9bcd74..beb61c79 100644
--- a/src/game/MotionGenerators/FleeingMovementGenerator.cpp
+++ b/src/game/MotionGenerators/FleeingMovementGenerator.cpp
@@ -24,7 +24,6 @@
 
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "MapManager.h"
 #include "FleeingMovementGenerator.h"
 #include "ObjectAccessor.h"
 #include "movement/MoveSplineInit.h"
diff --git a/src/game/MotionGenerators/HomeMovementGenerator.cpp b/src/game/MotionGenerators/HomeMovementGenerator.cpp
index c6bb12a3..631b0849 100644
--- a/src/game/MotionGenerators/HomeMovementGenerator.cpp
+++ b/src/game/MotionGenerators/HomeMovementGenerator.cpp
@@ -25,8 +25,6 @@
 #include "HomeMovementGenerator.h"
 #include "Creature.h"
 #include "CreatureAI.h"
-#include "ObjectMgr.h"
-#include "WorldPacket.h"
 #include "movement/MoveSplineInit.h"
 #include "movement/MoveSpline.h"
 
diff --git a/src/game/MotionGenerators/MotionMaster.cpp b/src/game/MotionGenerators/MotionMaster.cpp
index 14a58070..06934016 100644
--- a/src/game/MotionGenerators/MotionMaster.cpp
+++ b/src/game/MotionGenerators/MotionMaster.cpp
@@ -39,6 +39,7 @@
 #include "CreatureLinkingMgr.h"
 #include "Pet.h"
 #include "DBCStores.h"
+#include "Log.h"
 
 #include <cassert>
 
diff --git a/src/game/MotionGenerators/MovementGenerator.h b/src/game/MotionGenerators/MovementGenerator.h
index 98429c8a..5a94f8e9 100644
--- a/src/game/MotionGenerators/MovementGenerator.h
+++ b/src/game/MotionGenerators/MovementGenerator.h
@@ -25,10 +25,7 @@
 #ifndef MANGOS_MOVEMENTGENERATOR_H
 #define MANGOS_MOVEMENTGENERATOR_H
 
-#include "Common.h"
 #include "Platform/Define.h"
-#include "Policies/Singleton.h"
-#include "Dynamic/ObjectRegistry.h"
 #include "Dynamic/FactoryHolder.h"
 #include "MotionMaster.h"
 #include "Timer.h"
diff --git a/src/game/MotionGenerators/PointMovementGenerator.cpp b/src/game/MotionGenerators/PointMovementGenerator.cpp
index 9d1989cf..11084c22 100644
--- a/src/game/MotionGenerators/PointMovementGenerator.cpp
+++ b/src/game/MotionGenerators/PointMovementGenerator.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "PointMovementGenerator.h"
-#include "Errors.h"
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "TemporarySummon.h"
diff --git a/src/game/MotionGenerators/RandomMovementGenerator.cpp b/src/game/MotionGenerators/RandomMovementGenerator.cpp
index f89f4a7d..6acd8619 100644
--- a/src/game/MotionGenerators/RandomMovementGenerator.cpp
+++ b/src/game/MotionGenerators/RandomMovementGenerator.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "Creature.h"
-#include "MapManager.h"
 #include "RandomMovementGenerator.h"
 #include "Map.h"
 #include "Util.h"
diff --git a/src/game/MotionGenerators/TargetedMovementGenerator.cpp b/src/game/MotionGenerators/TargetedMovementGenerator.cpp
index d8dda78f..e90efe41 100644
--- a/src/game/MotionGenerators/TargetedMovementGenerator.cpp
+++ b/src/game/MotionGenerators/TargetedMovementGenerator.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "TargetedMovementGenerator.h"
-#include "ByteBuffer.h"
-#include "Errors.h"
 #include "PathFinder.h"
 #include "Unit.h"
 #include "Creature.h"
diff --git a/src/game/MotionGenerators/WaypointMovementGenerator.cpp b/src/game/MotionGenerators/WaypointMovementGenerator.cpp
index b87f8dbb..2cc3877c 100644
--- a/src/game/MotionGenerators/WaypointMovementGenerator.cpp
+++ b/src/game/MotionGenerators/WaypointMovementGenerator.cpp
@@ -22,15 +22,12 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include <ctime>
-
 #include "WaypointMovementGenerator.h"
 #include "ObjectMgr.h"
 #include "Player.h"
 #include "Creature.h"
 #include "CreatureAI.h"
 #include "WaypointManager.h"
-#include "WorldPacket.h"
 #include "ScriptMgr.h"
 #include "movement/MoveSplineInit.h"
 #include "movement/MoveSpline.h"
diff --git a/src/game/MotionGenerators/WaypointMovementGenerator.h b/src/game/MotionGenerators/WaypointMovementGenerator.h
index 6d29f931..6075667f 100644
--- a/src/game/MotionGenerators/WaypointMovementGenerator.h
+++ b/src/game/MotionGenerators/WaypointMovementGenerator.h
@@ -35,7 +35,6 @@
 #include "WaypointManager.h"
 #include "DBCStructure.h"
 
-#include <vector>
 #include <set>
 
 #define FLIGHT_TRAVEL_UPDATE  100
diff --git a/src/game/Object/AggressorAI.cpp b/src/game/Object/AggressorAI.cpp
index b961cb9f..de27c98d 100644
--- a/src/game/Object/AggressorAI.cpp
+++ b/src/game/Object/AggressorAI.cpp
@@ -25,16 +25,12 @@
 #include "AggressorAI.h"
 #include "Errors.h"
 #include "Creature.h"
-#include "SharedDefines.h"
-#include "VMapFactory.h"
 #include "World.h"
 #include "DBCStores.h"
 #include "Map.h"
+#include "Log.h"
 
-#include <list>
-
-int
-AggressorAI::Permissible(const Creature* creature)
+int AggressorAI::Permissible(const Creature* creature)
 {
     // have some hostile factions, it will be selected by IsHostileTo check at MoveInLineOfSight
     if (!(creature->GetCreatureInfo()->ExtraFlags & CREATURE_EXTRA_FLAG_NO_AGGRO) && !creature->IsNeutralToAll())
@@ -47,8 +43,7 @@ AggressorAI::AggressorAI(Creature* c) : CreatureAI(c), i_state(STATE_NORMAL), i_
 {
 }
 
-void
-AggressorAI::MoveInLineOfSight(Unit* u)
+void AggressorAI::MoveInLineOfSight(Unit* u)
 {
     // Ignore Z for flying creatures
     if (!m_creature->CanFly() && m_creature->GetDistanceZ(u) > CREATURE_Z_ATTACK_RANGE)
diff --git a/src/game/Object/AuctionHouseMgr.h b/src/game/Object/AuctionHouseMgr.h
index ab38f7c9..aee98538 100644
--- a/src/game/Object/AuctionHouseMgr.h
+++ b/src/game/Object/AuctionHouseMgr.h
@@ -39,8 +39,6 @@
 #define MANGOS_H_AUCTION_HOUSE_MGR
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "Policies/Singleton.h"
 #include "DBCStructure.h"
 
 /** \addtogroup auctionhouse
diff --git a/src/game/Object/Bag.cpp b/src/game/Object/Bag.cpp
index b812055a..fbd22a66 100644
--- a/src/game/Object/Bag.cpp
+++ b/src/game/Object/Bag.cpp
@@ -25,7 +25,6 @@
 #include "Bag.h"
 #include "ObjectMgr.h"
 #include "Database/DatabaseEnv.h"
-#include "Log.h"
 #include "UpdateData.h"
 
 Bag::Bag(): Item()
diff --git a/src/game/Object/Corpse.cpp b/src/game/Object/Corpse.cpp
index 466f7d4b..a756f767 100644
--- a/src/game/Object/Corpse.cpp
+++ b/src/game/Object/Corpse.cpp
@@ -24,12 +24,9 @@
 
 #include "Corpse.h"
 #include "Player.h"
-#include "UpdateMask.h"
 #include "ObjectAccessor.h"
 #include "ObjectGuid.h"
 #include "Database/DatabaseEnv.h"
-#include "Opcodes.h"
-#include "GossipDef.h"
 #include "World.h"
 #include "ObjectMgr.h"
 
diff --git a/src/game/Object/Creature.cpp b/src/game/Object/Creature.cpp
index 1a35a7bc..51f9f9d3 100644
--- a/src/game/Object/Creature.cpp
+++ b/src/game/Object/Creature.cpp
@@ -31,7 +31,6 @@
 #include "ObjectGuid.h"
 #include "SQLStorages.h"
 #include "SpellMgr.h"
-#include "QuestDef.h"
 #include "GossipDef.h"
 #include "Player.h"
 #include "GameEventMgr.h"
@@ -42,8 +41,6 @@
 #include "MapManager.h"
 #include "CreatureAI.h"
 #include "CreatureAISelector.h"
-#include "Formulas.h"
-#include "WaypointMovementGenerator.h"
 #include "InstanceData.h"
 #include "MapPersistentStateMgr.h"
 #include "BattleGround/BattleGroundMgr.h"
diff --git a/src/game/Object/Creature.h b/src/game/Object/Creature.h
index 7baf53cd..72d909fd 100644
--- a/src/game/Object/Creature.h
+++ b/src/game/Object/Creature.h
@@ -27,12 +27,9 @@
 
 #include "Common.h"
 #include "Unit.h"
-#include "UpdateMask.h"
-#include "ItemPrototype.h"
 #include "SharedDefines.h"
 #include "LootMgr.h"
 #include "DBCEnums.h"
-#include "Database/DatabaseEnv.h"
 #include "Cell.h"
 
 #include <list>
diff --git a/src/game/Object/CreatureAI.h b/src/game/Object/CreatureAI.h
index 37d7a0fa..b6c1c9ef 100644
--- a/src/game/Object/CreatureAI.h
+++ b/src/game/Object/CreatureAI.h
@@ -25,10 +25,7 @@
 #ifndef MANGOS_CREATUREAI_H
 #define MANGOS_CREATUREAI_H
 
-#include "Common.h"
 #include "Platform/Define.h"
-#include "Policies/Singleton.h"
-#include "Dynamic/ObjectRegistry.h"
 #include "Dynamic/FactoryHolder.h"
 #include "ObjectGuid.h"
 
diff --git a/src/game/Object/CreatureAISelector.cpp b/src/game/Object/CreatureAISelector.cpp
index 7b66128d..f33caf1e 100644
--- a/src/game/Object/CreatureAISelector.cpp
+++ b/src/game/Object/CreatureAISelector.cpp
@@ -30,6 +30,7 @@
 #include "MovementGenerator.h"
 #include "ScriptMgr.h"
 #include "Pet.h"
+#include "Log.h"
 
 INSTANTIATE_SINGLETON_1(CreatureAIRegistry);
 INSTANTIATE_SINGLETON_1(MovementGeneratorRegistry);
diff --git a/src/game/Object/CreatureEventAI.cpp b/src/game/Object/CreatureEventAI.cpp
index c7a32774..cd590d8b 100644
--- a/src/game/Object/CreatureEventAI.cpp
+++ b/src/game/Object/CreatureEventAI.cpp
@@ -26,11 +26,9 @@
 #include "CreatureEventAI.h"
 #include "CreatureEventAIMgr.h"
 #include "ObjectMgr.h"
-#include "Spell.h"
 #include "World.h"
 #include "Cell.h"
 #include "CellImpl.h"
-#include "GameEventMgr.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "InstanceData.h"
diff --git a/src/game/Object/CreatureEventAIMgr.cpp b/src/game/Object/CreatureEventAIMgr.cpp
index b07c03de..fdfdd3eb 100644
--- a/src/game/Object/CreatureEventAIMgr.cpp
+++ b/src/game/Object/CreatureEventAIMgr.cpp
@@ -30,7 +30,6 @@
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
 #include "Policies/Singleton.h"
-#include "ObjectGuid.h"
 #include "GridDefines.h"
 #include "SpellMgr.h"
 #include "World.h"
diff --git a/src/game/Object/DynamicObject.cpp b/src/game/Object/DynamicObject.cpp
index 3f7c38ef..81cf11de 100644
--- a/src/game/Object/DynamicObject.cpp
+++ b/src/game/Object/DynamicObject.cpp
@@ -23,11 +23,8 @@
  */
 
 #include "Common.h"
-#include "UpdateMask.h"
-#include "Opcodes.h"
 #include "World.h"
 #include "ObjectAccessor.h"
-#include "Database/DatabaseEnv.h"
 #include "GridNotifiers.h"
 #include "CellImpl.h"
 #include "GridNotifiersImpl.h"
diff --git a/src/game/Object/GameObject.cpp b/src/game/Object/GameObject.cpp
index e194e478..a7b141ea 100644
--- a/src/game/Object/GameObject.cpp
+++ b/src/game/Object/GameObject.cpp
@@ -29,7 +29,6 @@
 #include "PoolManager.h"
 #include "SpellMgr.h"
 #include "Spell.h"
-#include "UpdateMask.h"
 #include "Opcodes.h"
 #include "WorldPacket.h"
 #include "World.h"
diff --git a/src/game/Object/GameObject.h b/src/game/Object/GameObject.h
index 11219ad9..1b981047 100644
--- a/src/game/Object/GameObject.h
+++ b/src/game/Object/GameObject.h
@@ -29,7 +29,6 @@
 #include "SharedDefines.h"
 #include "Object.h"
 #include "LootMgr.h"
-#include "Database/DatabaseEnv.h"
 #include "Utilities/EventProcessor.h"
 
 // GCC have alternative #pragma pack(N) syntax and old gcc version not support pack(push,N), also any gcc version not support it at some platform
diff --git a/src/game/Object/GuardAI.cpp b/src/game/Object/GuardAI.cpp
index f9c32307..94db6653 100644
--- a/src/game/Object/GuardAI.cpp
+++ b/src/game/Object/GuardAI.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "GuardAI.h"
-#include "Errors.h"
 #include "Creature.h"
 #include "Player.h"
 #include "World.h"
diff --git a/src/game/Object/ItemEnchantmentMgr.cpp b/src/game/Object/ItemEnchantmentMgr.cpp
index e05cfee9..13e15317 100644
--- a/src/game/Object/ItemEnchantmentMgr.cpp
+++ b/src/game/Object/ItemEnchantmentMgr.cpp
@@ -22,16 +22,15 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include <stdlib.h>
-#include <functional>
 #include "ItemEnchantmentMgr.h"
 #include "Database/DatabaseEnv.h"
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
+#include "Util.h"
+
 #include <list>
 #include <vector>
-#include "Util.h"
 
 struct EnchStoreItem
 {
diff --git a/src/game/Object/LootMgr.cpp b/src/game/Object/LootMgr.cpp
index ded259a0..bb380e05 100644
--- a/src/game/Object/LootMgr.cpp
+++ b/src/game/Object/LootMgr.cpp
@@ -32,6 +32,7 @@
 #include "DBCStores.h"
 #include "SQLStorages.h"
 #include "DisableMgr.h"
+#include "ItemEnchantmentMgr.h"
 
 static eConfigFloatValues const qualityToRate[MAX_ITEM_QUALITY] =
 {
diff --git a/src/game/Object/LootMgr.h b/src/game/Object/LootMgr.h
index a14f0b7b..91e85875 100644
--- a/src/game/Object/LootMgr.h
+++ b/src/game/Object/LootMgr.h
@@ -25,12 +25,10 @@
 #ifndef MANGOS_LOOTMGR_H
 #define MANGOS_LOOTMGR_H
 
-#include "ItemEnchantmentMgr.h"
 #include "ByteBuffer.h"
 #include "ObjectGuid.h"
 #include "Utilities/LinkedReference/RefManager.h"
 
-#include <map>
 #include <vector>
 
 class Player;
diff --git a/src/game/Object/Object.cpp b/src/game/Object/Object.cpp
index 24cc174b..d5f7a174 100644
--- a/src/game/Object/Object.cpp
+++ b/src/game/Object/Object.cpp
@@ -36,11 +36,6 @@
 #include "UpdateMask.h"
 #include "Util.h"
 #include "MapManager.h"
-#include "Log.h"
-#include "Transports.h"
-#include "TargetedMovementGenerator.h"
-#include "WaypointMovementGenerator.h"
-#include "VMapFactory.h"
 #include "CellImpl.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
diff --git a/src/game/Object/Object.h b/src/game/Object/Object.h
index fda92ad6..4ad6fd96 100644
--- a/src/game/Object/Object.h
+++ b/src/game/Object/Object.h
@@ -33,7 +33,6 @@
 #include "Camera.h"
 
 #include <set>
-#include <string>
 
 #define CONTACT_DISTANCE            0.5f
 #define INTERACTION_DISTANCE        5.0f
diff --git a/src/game/Object/ObjectAccessor.cpp b/src/game/Object/ObjectAccessor.cpp
index 90491074..909f4b5b 100644
--- a/src/game/Object/ObjectAccessor.cpp
+++ b/src/game/Object/ObjectAccessor.cpp
@@ -26,19 +26,14 @@
 #include "ObjectMgr.h"
 #include "Policies/Singleton.h"
 #include "Player.h"
-#include "WorldPacket.h"
 #include "Item.h"
 #include "Corpse.h"
-#include "GridNotifiers.h"
 #include "MapManager.h"
 #include "Map.h"
 #include "CellImpl.h"
 #include "GridNotifiersImpl.h"
 #include "ObjectGuid.h"
 #include "World.h"
-
-#include <cmath>
-
 #define CLASS_LOCK MaNGOS::ClassLevelLockable<ObjectAccessor, ACE_Thread_Mutex>
 INSTANTIATE_SINGLETON_2(ObjectAccessor, CLASS_LOCK);
 INSTANTIATE_CLASS_MUTEX(ObjectAccessor, ACE_Thread_Mutex);
diff --git a/src/game/Object/ObjectAccessor.h b/src/game/Object/ObjectAccessor.h
index 87e07b6d..04f21e3d 100644
--- a/src/game/Object/ObjectAccessor.h
+++ b/src/game/Object/ObjectAccessor.h
@@ -40,9 +40,6 @@
 #include "Player.h"
 #include "Corpse.h"
 
-#include <set>
-#include <list>
-
 class Unit;
 class WorldObject;
 class Map;
diff --git a/src/game/Object/ObjectGuid.h b/src/game/Object/ObjectGuid.h
index 180ccbf7..4ed32e52 100644
--- a/src/game/Object/ObjectGuid.h
+++ b/src/game/Object/ObjectGuid.h
@@ -28,8 +28,6 @@
 #include "Common.h"
 #include "ByteBuffer.h"
 
-#include <functional>
-
 enum TypeID
 {
     TYPEID_OBJECT        = 0,
diff --git a/src/game/Object/ObjectMgr.cpp b/src/game/Object/ObjectMgr.cpp
index dea78657..2a176bf3 100644
--- a/src/game/Object/ObjectMgr.cpp
+++ b/src/game/Object/ObjectMgr.cpp
@@ -32,7 +32,6 @@
 #include "ObjectGuid.h"
 #include "ScriptMgr.h"
 #include "SpellMgr.h"
-#include "UpdateMask.h"
 #include "World.h"
 #include "Group.h"
 #include "Transports.h"
@@ -40,13 +39,10 @@
 #include "Language.h"
 #include "PoolManager.h"
 #include "GameEventMgr.h"
-#include "Spell.h"
 #include "Chat.h"
-#include "AccountMgr.h"
 #include "MapPersistentStateMgr.h"
 #include "SpellAuras.h"
 #include "Util.h"
-#include "WaypointManager.h"
 #include "GossipDef.h"
 #include "Mail.h"
 #include "Formulas.h"
@@ -56,6 +52,7 @@
 #include "CellImpl.h"
 #include "DisableMgr.h"
 
+#include "ItemEnchantmentMgr.h"
 #include <limits>
 
 INSTANTIATE_SINGLETON_1(ObjectMgr);
diff --git a/src/game/Object/ObjectMgr.h b/src/game/Object/ObjectMgr.h
index 4e8d2a8e..6eae42da 100644
--- a/src/game/Object/ObjectMgr.h
+++ b/src/game/Object/ObjectMgr.h
@@ -26,13 +26,11 @@
 #define MANGOS_H_OBJECTMGR
 
 #include "Common.h"
-#include "Log.h"
 #include "Object.h"
 #include "Bag.h"
 #include "Creature.h"
 #include "Player.h"
 #include "GameObject.h"
-#include "Corpse.h"
 #include "QuestDef.h"
 #include "ItemPrototype.h"
 #include "NPCHandler.h"
@@ -43,7 +41,6 @@
 #include "ObjectGuid.h"
 #include "Policies/Singleton.h"
 
-#include <string>
 #include <map>
 #include <limits>
 
diff --git a/src/game/Object/Pet.cpp b/src/game/Object/Pet.cpp
index 64228ca8..41026dad 100644
--- a/src/game/Object/Pet.cpp
+++ b/src/game/Object/Pet.cpp
@@ -30,9 +30,7 @@
 #include "SpellMgr.h"
 #include "Formulas.h"
 #include "SpellAuras.h"
-#include "CreatureAI.h"
 #include "Unit.h"
-#include "Util.h"
 
 // numbers represent minutes * 100 while happy (you get 100 loyalty points per min while happy)
 uint32 const LevelUpLoyalty[6] =
diff --git a/src/game/Object/PetAI.cpp b/src/game/Object/PetAI.cpp
index f9cad01f..9d759f0a 100644
--- a/src/game/Object/PetAI.cpp
+++ b/src/game/Object/PetAI.cpp
@@ -28,7 +28,6 @@
 #include "Player.h"
 #include "DBCStores.h"
 #include "Spell.h"
-#include "ObjectAccessor.h"
 #include "SpellMgr.h"
 #include "Creature.h"
 #include "World.h"
diff --git a/src/game/Object/Player.cpp b/src/game/Object/Player.cpp
index d7a7ff88..eb793c20 100644
--- a/src/game/Object/Player.cpp
+++ b/src/game/Object/Player.cpp
@@ -45,7 +45,6 @@
 #include "CellImpl.h"
 #include "ObjectMgr.h"
 #include "ObjectAccessor.h"
-#include "CreatureAI.h"
 #include "Formulas.h"
 #include "Group.h"
 #include "Guild.h"
diff --git a/src/game/Object/Player.h b/src/game/Object/Player.h
index c54b1b81..6b407a1f 100644
--- a/src/game/Object/Player.h
+++ b/src/game/Object/Player.h
@@ -31,7 +31,6 @@
 #include "Item.h"
 
 #include "Database/DatabaseEnv.h"
-#include "NPCHandler.h"
 #include "QuestDef.h"
 #include "Group.h"
 #include "Bag.h"
@@ -46,7 +45,6 @@
 #include "Chat.h"
 #include "GMTicketMgr.h"
 
-#include<string>
 #include<vector>
 
 struct Mail;
diff --git a/src/game/Object/ReactorAI.cpp b/src/game/Object/ReactorAI.cpp
index c2093188..2b65c38e 100644
--- a/src/game/Object/ReactorAI.cpp
+++ b/src/game/Object/ReactorAI.cpp
@@ -22,9 +22,7 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include "ByteBuffer.h"
 #include "ReactorAI.h"
-#include "Errors.h"
 #include "Creature.h"
 #include "Map.h"
 #include "Log.h"
diff --git a/src/game/Object/SocialMgr.h b/src/game/Object/SocialMgr.h
index 6398912e..48848681 100644
--- a/src/game/Object/SocialMgr.h
+++ b/src/game/Object/SocialMgr.h
@@ -25,7 +25,6 @@
 #ifndef MANGOS_H_MANGOS_SOCIALMGR
 #define MANGOS_H_MANGOS_SOCIALMGR
 
-#include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "ObjectGuid.h"
 
diff --git a/src/game/Object/SpellMgr.cpp b/src/game/Object/SpellMgr.cpp
index 2d86ece8..6640595c 100644
--- a/src/game/Object/SpellMgr.cpp
+++ b/src/game/Object/SpellMgr.cpp
@@ -28,12 +28,10 @@
 #include "ProgressBar.h"
 #include "DBCStores.h"
 #include "SQLStorages.h"
-#include "World.h"
 #include "Chat.h"
 #include "Spell.h"
-#include "BattleGround/BattleGroundMgr.h"
-#include "MapManager.h"
 #include "Unit.h"
+#include "World.h"
 
 bool IsPrimaryProfessionSkill(uint32 skill)
 {
diff --git a/src/game/Object/Totem.cpp b/src/game/Object/Totem.cpp
index 86a1fad4..3566c04c 100644
--- a/src/game/Object/Totem.cpp
+++ b/src/game/Object/Totem.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "Totem.h"
-#include "WorldPacket.h"
 #include "Log.h"
 #include "Group.h"
 #include "Player.h"
diff --git a/src/game/Object/TotemAI.cpp b/src/game/Object/TotemAI.cpp
index 06276da6..2115d25f 100644
--- a/src/game/Object/TotemAI.cpp
+++ b/src/game/Object/TotemAI.cpp
@@ -27,7 +27,6 @@
 #include "Creature.h"
 #include "DBCStores.h"
 #include "SpellMgr.h"
-
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
diff --git a/src/game/Object/TotemAI.h b/src/game/Object/TotemAI.h
index 4d039a50..71a208b2 100644
--- a/src/game/Object/TotemAI.h
+++ b/src/game/Object/TotemAI.h
@@ -27,7 +27,6 @@
 
 #include "CreatureAI.h"
 #include "ObjectGuid.h"
-#include "Timer.h"
 
 class Creature;
 class Totem;
diff --git a/src/game/Object/Unit.cpp b/src/game/Object/Unit.cpp
index 99076217..a25acc62 100644
--- a/src/game/Object/Unit.cpp
+++ b/src/game/Object/Unit.cpp
@@ -31,17 +31,14 @@
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "SpellMgr.h"
-#include "QuestDef.h"
 #include "Player.h"
 #include "Creature.h"
 #include "Spell.h"
 #include "Group.h"
 #include "SpellAuras.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "CreatureAI.h"
 #include "TemporarySummon.h"
-#include "Formulas.h"
 #include "Pet.h"
 #include "Util.h"
 #include "Totem.h"
@@ -51,8 +48,6 @@
 #include "MapPersistentStateMgr.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
-#include "DBCStores.h"
-#include "VMapFactory.h"
 #include "MovementGenerator.h"
 #include "movement/MoveSplineInit.h"
 #include "movement/MoveSpline.h"
@@ -63,7 +58,6 @@
 #endif /* ENABLE_ELUNA */
 
 #include <math.h>
-#include <stdarg.h>
 
 #ifdef WIN32
 inline uint32 getMSTime() { return GetTickCount(); }
diff --git a/src/game/Object/Unit.h b/src/game/Object/Unit.h
index 9f52a99e..5c727ed4 100644
--- a/src/game/Object/Unit.h
+++ b/src/game/Object/Unit.h
@@ -43,10 +43,10 @@
 #include "Utilities/EventProcessor.h"
 #include "MotionMaster.h"
 #include "DBCStructure.h"
-#include "Path.h"
 #include "WorldPacket.h"
 #include "Timer.h"
 #include "Log.h"
+
 #include <list>
 
 enum SpellInterruptFlags
diff --git a/src/game/Object/UpdateMask.h b/src/game/Object/UpdateMask.h
index acc39ffa..5ea53dd9 100644
--- a/src/game/Object/UpdateMask.h
+++ b/src/game/Object/UpdateMask.h
@@ -25,7 +25,6 @@
 #ifndef MANGOS_H_UPDATEMASK
 #define MANGOS_H_UPDATEMASK
 
-#include "UpdateFields.h"
 #include "Errors.h"
 #include "ByteBuffer.h"
 
diff --git a/src/game/OutdoorPvP/OutdoorPvP.cpp b/src/game/OutdoorPvP/OutdoorPvP.cpp
index b6693c9b..c60f35dd 100644
--- a/src/game/OutdoorPvP/OutdoorPvP.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvP.cpp
@@ -23,8 +23,6 @@
  */
 
 #include "OutdoorPvP.h"
-#include "Language.h"
-#include "World.h"
 #include "ObjectMgr.h"
 #include "Object.h"
 #include "GameObject.h"
diff --git a/src/game/OutdoorPvP/OutdoorPvPMgr.h b/src/game/OutdoorPvP/OutdoorPvPMgr.h
index 8ad9be4d..f58b421a 100644
--- a/src/game/OutdoorPvP/OutdoorPvPMgr.h
+++ b/src/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -26,7 +26,6 @@
 #define WORLD_PVP_MGR_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
 #include "Timer.h"
 
 /**
diff --git a/src/game/OutdoorPvP/OutdoorPvPSI.cpp b/src/game/OutdoorPvP/OutdoorPvPSI.cpp
index 388294c5..9eb80b5c 100644
--- a/src/game/OutdoorPvP/OutdoorPvPSI.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPSI.cpp
@@ -30,6 +30,7 @@
 #include "Creature.h"
 #include "GameObject.h"
 #include "Player.h"
+#include "Language.h"
 
 OutdoorPvPSI::OutdoorPvPSI() : OutdoorPvP(),
     m_resourcesAlliance(0),
diff --git a/src/game/OutdoorPvP/OutdoorPvPSI.h b/src/game/OutdoorPvP/OutdoorPvPSI.h
index 1f45120d..f1217c52 100644
--- a/src/game/OutdoorPvP/OutdoorPvPSI.h
+++ b/src/game/OutdoorPvP/OutdoorPvPSI.h
@@ -27,7 +27,6 @@
 
 #include "Common.h"
 #include "OutdoorPvP.h"
-#include "Language.h"
 
 /**
  * @brief
diff --git a/src/game/References/GroupReference.cpp b/src/game/References/GroupReference.cpp
index f017f42b..09aaed14 100644
--- a/src/game/References/GroupReference.cpp
+++ b/src/game/References/GroupReference.cpp
@@ -22,7 +22,6 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include "Player.h"
 #include "Group.h"
 #include "GroupReference.h"
 
diff --git a/src/game/Server/DBCStores.cpp b/src/game/Server/DBCStores.cpp
index 4e75e6d8..052ad1a7 100644
--- a/src/game/Server/DBCStores.cpp
+++ b/src/game/Server/DBCStores.cpp
@@ -27,7 +27,6 @@
 #include "Log.h"
 #include "ProgressBar.h"
 #include "SharedDefines.h"
-#include "ObjectGuid.h"
 
 #include "DBCfmt.h"
 
diff --git a/src/game/Server/DBCStructure.h b/src/game/Server/DBCStructure.h
index b565201c..156faaea 100644
--- a/src/game/Server/DBCStructure.h
+++ b/src/game/Server/DBCStructure.h
@@ -25,7 +25,6 @@
 #ifndef MANGOS_DBCSTRUCTURE_H
 #define MANGOS_DBCSTRUCTURE_H
 
-#include "Common.h"
 #include "DBCEnums.h"
 #include "Path.h"
 #include "Platform/Define.h"
diff --git a/src/game/Server/SQLStorages.h b/src/game/Server/SQLStorages.h
index b712bab6..ab10a50f 100644
--- a/src/game/Server/SQLStorages.h
+++ b/src/game/Server/SQLStorages.h
@@ -25,7 +25,6 @@
 #ifndef MANGOS_SQLSTORAGES_H
 #define MANGOS_SQLSTORAGES_H
 
-#include "Common.h"
 #include "Database/SQLStorage.h"
 
 extern SQLStorage sCreatureStorage;
diff --git a/src/game/Server/SharedDefines.h b/src/game/Server/SharedDefines.h
index 6d6c7964..e836014f 100644
--- a/src/game/Server/SharedDefines.h
+++ b/src/game/Server/SharedDefines.h
@@ -26,7 +26,6 @@
 #define MANGOS_SHAREDDEFINES_H
 
 #include "Platform/Define.h"
-#include <cassert>
 
 #ifndef MANGOS
 #define MANGOS
diff --git a/src/game/Server/WorldSession.cpp b/src/game/Server/WorldSession.cpp
index 6ae7c7fd..c89708a8 100644
--- a/src/game/Server/WorldSession.cpp
+++ b/src/game/Server/WorldSession.cpp
@@ -41,7 +41,6 @@
 #include "World.h"
 #include "ObjectAccessor.h"
 #include "BattleGround/BattleGroundMgr.h"
-#include "MapManager.h"
 #include "SocialMgr.h"
 #ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
diff --git a/src/game/Tools/PlayerDump.h b/src/game/Tools/PlayerDump.h
index ec6ea707..9531db3f 100644
--- a/src/game/Tools/PlayerDump.h
+++ b/src/game/Tools/PlayerDump.h
@@ -25,8 +25,6 @@
 #ifndef MANGOS_H_PLAYER_DUMP
 #define MANGOS_H_PLAYER_DUMP
 
-#include <string>
-#include <map>
 #include <set>
 
 enum DumpTableType
diff --git a/src/game/WorldHandlers/AccountMgr.h b/src/game/WorldHandlers/AccountMgr.h
index 7ed4e8b2..af0ca152 100644
--- a/src/game/WorldHandlers/AccountMgr.h
+++ b/src/game/WorldHandlers/AccountMgr.h
@@ -26,8 +26,6 @@
 #define MANGOS_H_ACCMGR
 
 #include "Common.h"
-#include "Policies/Singleton.h"
-#include <string>
 
 enum AccountOpResult
 {
diff --git a/src/game/WorldHandlers/AuctionHouseHandler.cpp b/src/game/WorldHandlers/AuctionHouseHandler.cpp
index f45dbdd8..72a63ee6 100644
--- a/src/game/WorldHandlers/AuctionHouseHandler.cpp
+++ b/src/game/WorldHandlers/AuctionHouseHandler.cpp
@@ -30,7 +30,6 @@
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "Player.h"
-#include "UpdateMask.h"
 #include "AuctionHouseMgr.h"
 #include "Mail.h"
 #include "Util.h"
diff --git a/src/game/WorldHandlers/Cell.h b/src/game/WorldHandlers/Cell.h
index 9e31fbaa..4c9a0c0d 100644
--- a/src/game/WorldHandlers/Cell.h
+++ b/src/game/WorldHandlers/Cell.h
@@ -25,10 +25,8 @@
 #ifndef MANGOS_CELL_H
 #define MANGOS_CELL_H
 
-#include "GameSystem/TypeContainer.h"
 #include "GameSystem/TypeContainerVisitor.h"
 #include "GridDefines.h"
-#include <cmath>
 
 class Map;
 class WorldObject;
diff --git a/src/game/WorldHandlers/Channel.h b/src/game/WorldHandlers/Channel.h
index 43bbea7b..aa404694 100644
--- a/src/game/WorldHandlers/Channel.h
+++ b/src/game/WorldHandlers/Channel.h
@@ -28,12 +28,9 @@
 #include "Common.h"
 #include "ObjectGuid.h"
 #include "WorldPacket.h"
-#include "Opcodes.h"
 #include "Player.h"
 
-#include <list>
 #include <map>
-#include <string>
 
 enum ChatNotify
 {
diff --git a/src/game/WorldHandlers/ChannelMgr.h b/src/game/WorldHandlers/ChannelMgr.h
index 87a98f11..1d8136f7 100644
--- a/src/game/WorldHandlers/ChannelMgr.h
+++ b/src/game/WorldHandlers/ChannelMgr.h
@@ -27,10 +27,8 @@
 
 #include "Common.h"
 #include "Channel.h"
-#include "Policies/Singleton.h"
 
 #include <map>
-#include <string>
 
 class ChannelMgr
 {
diff --git a/src/game/WorldHandlers/Chat.cpp b/src/game/WorldHandlers/Chat.cpp
index 5fa4cb30..428cd23b 100644
--- a/src/game/WorldHandlers/Chat.cpp
+++ b/src/game/WorldHandlers/Chat.cpp
@@ -33,7 +33,6 @@
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "Player.h"
-#include "UpdateMask.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "AccountMgr.h"
diff --git a/src/game/WorldHandlers/ChatHandler.cpp b/src/game/WorldHandlers/ChatHandler.cpp
index a2183001..444db5bd 100644
--- a/src/game/WorldHandlers/ChatHandler.cpp
+++ b/src/game/WorldHandlers/ChatHandler.cpp
@@ -30,7 +30,6 @@
 #include "Opcodes.h"
 #include "ObjectMgr.h"
 #include "Chat.h"
-#include "Database/DatabaseEnv.h"
 #include "ChannelMgr.h"
 #include "Group.h"
 #include "Guild.h"
diff --git a/src/game/WorldHandlers/CombatHandler.cpp b/src/game/WorldHandlers/CombatHandler.cpp
index 8c658c42..4ba730ca 100644
--- a/src/game/WorldHandlers/CombatHandler.cpp
+++ b/src/game/WorldHandlers/CombatHandler.cpp
@@ -26,7 +26,6 @@
 #include "Log.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "CreatureAI.h"
 #include "ObjectGuid.h"
 #include "Player.h"
 
diff --git a/src/game/WorldHandlers/DuelHandler.cpp b/src/game/WorldHandlers/DuelHandler.cpp
index 46a481ef..ee49c8f4 100644
--- a/src/game/WorldHandlers/DuelHandler.cpp
+++ b/src/game/WorldHandlers/DuelHandler.cpp
@@ -26,8 +26,6 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Log.h"
-#include "Opcodes.h"
-#include "UpdateData.h"
 #include "Player.h"
 
 void WorldSession::HandleDuelAcceptedOpcode(WorldPacket& recvPacket)
diff --git a/src/game/WorldHandlers/GameEventMgr.cpp b/src/game/WorldHandlers/GameEventMgr.cpp
index 504a0a4b..ab6eaee6 100644
--- a/src/game/WorldHandlers/GameEventMgr.cpp
+++ b/src/game/WorldHandlers/GameEventMgr.cpp
@@ -33,7 +33,6 @@
 #include "MapManager.h"
 #include "BattleGround/BattleGroundMgr.h"
 #include "MassMailMgr.h"
-#include "SpellMgr.h"
 #include "Policies/Singleton.h"
 
 INSTANTIATE_SINGLETON_1(GameEventMgr);
diff --git a/src/game/WorldHandlers/GameEventMgr.h b/src/game/WorldHandlers/GameEventMgr.h
index fec30ec2..aab9c777 100644
--- a/src/game/WorldHandlers/GameEventMgr.h
+++ b/src/game/WorldHandlers/GameEventMgr.h
@@ -28,7 +28,6 @@
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Platform/Define.h"
-#include "Policies/Singleton.h"
 
 #define max_ge_check_delay 86400                            // 1 day in seconds
 
diff --git a/src/game/WorldHandlers/GridMap.cpp b/src/game/WorldHandlers/GridMap.cpp
index bcacdce4..3b264180 100644
--- a/src/game/WorldHandlers/GridMap.cpp
+++ b/src/game/WorldHandlers/GridMap.cpp
@@ -22,9 +22,7 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include "MapManager.h"
 #include "Log.h"
-#include "GridStates.h"
 #include "CellImpl.h"
 #include "Map.h"
 #include "DBCEnums.h"
diff --git a/src/game/WorldHandlers/GridMap.h b/src/game/WorldHandlers/GridMap.h
index b88547c8..19d49fb3 100644
--- a/src/game/WorldHandlers/GridMap.h
+++ b/src/game/WorldHandlers/GridMap.h
@@ -27,10 +27,7 @@
 
 #include "Platform/Define.h"
 #include "Policies/Singleton.h"
-#include "DBCStructure.h"
 #include "GridDefines.h"
-#include "Object.h"
-#include "SharedDefines.h"
 
 #include <bitset>
 #include <list>
diff --git a/src/game/WorldHandlers/GridNotifiers.cpp b/src/game/WorldHandlers/GridNotifiers.cpp
index 651427ac..b38f596d 100644
--- a/src/game/WorldHandlers/GridNotifiers.cpp
+++ b/src/game/WorldHandlers/GridNotifiers.cpp
@@ -26,7 +26,6 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "UpdateData.h"
-#include "Item.h"
 #include "Map.h"
 #include "Transports.h"
 #include "ObjectAccessor.h"
diff --git a/src/game/WorldHandlers/GridNotifiers.h b/src/game/WorldHandlers/GridNotifiers.h
index ce00f236..8073b222 100644
--- a/src/game/WorldHandlers/GridNotifiers.h
+++ b/src/game/WorldHandlers/GridNotifiers.h
@@ -25,9 +25,7 @@
 #ifndef MANGOS_GRIDNOTIFIERS_H
 #define MANGOS_GRIDNOTIFIERS_H
 
-#include "ObjectGridLoader.h"
 #include "UpdateData.h"
-#include <iostream>
 
 #include "Corpse.h"
 #include "Object.h"
diff --git a/src/game/WorldHandlers/GridNotifiersImpl.h b/src/game/WorldHandlers/GridNotifiersImpl.h
index acee088f..9ae0898c 100644
--- a/src/game/WorldHandlers/GridNotifiersImpl.h
+++ b/src/game/WorldHandlers/GridNotifiersImpl.h
@@ -27,9 +27,7 @@
 
 #include "GridNotifiers.h"
 #include "WorldPacket.h"
-#include "Corpse.h"
 #include "Player.h"
-#include "UpdateData.h"
 #include "CreatureAI.h"
 #include "SpellAuras.h"
 #include "DBCStores.h"
diff --git a/src/game/WorldHandlers/GridStates.cpp b/src/game/WorldHandlers/GridStates.cpp
index 1805ade3..55779926 100644
--- a/src/game/WorldHandlers/GridStates.cpp
+++ b/src/game/WorldHandlers/GridStates.cpp
@@ -23,8 +23,7 @@
  */
 
 #include "GridStates.h"
-#include "GridNotifiers.h"
-#include "GameSystem/Grid.h"
+#include "ObjectGridLoader.h"
 #include "Log.h"
 
 GridState::~GridState()
diff --git a/src/game/WorldHandlers/Group.cpp b/src/game/WorldHandlers/Group.cpp
index 733b0b0d..67ca15ec 100644
--- a/src/game/WorldHandlers/Group.cpp
+++ b/src/game/WorldHandlers/Group.cpp
@@ -27,7 +27,6 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Player.h"
-#include "World.h"
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "Group.h"
@@ -36,7 +35,6 @@
 #include "BattleGround/BattleGround.h"
 #include "MapManager.h"
 #include "MapPersistentStateMgr.h"
-#include "Util.h"
 #include "LootMgr.h"
 #include "LFGMgr.h"
 #include "LFGHandler.h"
diff --git a/src/game/WorldHandlers/Group.h b/src/game/WorldHandlers/Group.h
index d8e85ed6..1f17fcce 100644
--- a/src/game/WorldHandlers/Group.h
+++ b/src/game/WorldHandlers/Group.h
@@ -36,9 +36,6 @@
 #include "LFGHandler.h"
 #include "LFGMgr.h"
 
-#include <map>
-#include <vector>
-
 class WorldSession;
 class Map;
 class BattleGround;
diff --git a/src/game/WorldHandlers/GuildHandler.cpp b/src/game/WorldHandlers/GuildHandler.cpp
index 0846f7f7..5720c2bf 100644
--- a/src/game/WorldHandlers/GuildHandler.cpp
+++ b/src/game/WorldHandlers/GuildHandler.cpp
@@ -31,7 +31,6 @@
 #include "Opcodes.h"
 #include "Guild.h"
 #include "GuildMgr.h"
-#include "GossipDef.h"
 #include "SocialMgr.h"
 #ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
diff --git a/src/game/WorldHandlers/GuildMgr.h b/src/game/WorldHandlers/GuildMgr.h
index 01e2883c..b6082be5 100644
--- a/src/game/WorldHandlers/GuildMgr.h
+++ b/src/game/WorldHandlers/GuildMgr.h
@@ -26,7 +26,6 @@
 #define MANGOS_H_GUILDMGR
 
 #include "Common.h"
-#include "Policies/Singleton.h"
 
 class Guild;
 class ObjectGuid;
diff --git a/src/game/WorldHandlers/LootHandler.cpp b/src/game/WorldHandlers/LootHandler.cpp
index 9e1af657..a2c0551b 100644
--- a/src/game/WorldHandlers/LootHandler.cpp
+++ b/src/game/WorldHandlers/LootHandler.cpp
@@ -25,8 +25,6 @@
 #include "Common.h"
 #include "WorldPacket.h"
 #include "Log.h"
-#include "Corpse.h"
-#include "GameObject.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "ObjectGuid.h"
@@ -34,9 +32,7 @@
 #include "LootMgr.h"
 #include "Object.h"
 #include "Group.h"
-#include "World.h"
-#include "Util.h"
-#include "DBCStores.h"
+
 #ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
 #endif /* ENABLE_ELUNA */
diff --git a/src/game/WorldHandlers/Map.cpp b/src/game/WorldHandlers/Map.cpp
index ec0f65b0..741fc91c 100644
--- a/src/game/WorldHandlers/Map.cpp
+++ b/src/game/WorldHandlers/Map.cpp
@@ -27,7 +27,6 @@
 #include "Player.h"
 #include "GridNotifiers.h"
 #include "Log.h"
-#include "GridStates.h"
 #include "CellImpl.h"
 #include "InstanceData.h"
 #include "GridNotifiersImpl.h"
@@ -41,10 +40,10 @@
 #include "MapPersistentStateMgr.h"
 #include "VMapFactory.h"
 #include "MoveMap.h"
-#include "BattleGround/BattleGroundMgr.h"
 #include "Chat.h"
 #include "Weather.h"
 #include "Transports.h"
+#include "ObjectGridLoader.h"
 
 #ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
diff --git a/src/game/WorldHandlers/Map.h b/src/game/WorldHandlers/Map.h
index d92eac30..5ea64cbc 100644
--- a/src/game/WorldHandlers/Map.h
+++ b/src/game/WorldHandlers/Map.h
@@ -35,18 +35,15 @@
 #include "GridDefines.h"
 #include "Cell.h"
 #include "Object.h"
-#include "Timer.h"
 #include "SharedDefines.h"
 #include "GridMap.h"
 #include "GameSystem/GridRefManager.h"
 #include "MapRefManager.h"
-#include "Utilities/TypeList.h"
 #include "ScriptMgr.h"
 #include "CreatureLinkingMgr.h"
 #include "DynamicTree.h"
 
 #include <bitset>
-#include <list>
 
 struct CreatureInfo;
 class Creature;
diff --git a/src/game/WorldHandlers/MapManager.cpp b/src/game/WorldHandlers/MapManager.cpp
index a83035cf..471e4c72 100644
--- a/src/game/WorldHandlers/MapManager.cpp
+++ b/src/game/WorldHandlers/MapManager.cpp
@@ -31,7 +31,6 @@
 #include "GridDefines.h"
 #include "World.h"
 #include "CellImpl.h"
-#include "Corpse.h"
 #include "ObjectMgr.h"
 
 #define CLASS_LOCK MaNGOS::ClassLevelLockable<MapManager, ACE_Recursive_Thread_Mutex>
diff --git a/src/game/WorldHandlers/MapPersistentStateMgr.cpp b/src/game/WorldHandlers/MapPersistentStateMgr.cpp
index 9c60f777..043583ab 100644
--- a/src/game/WorldHandlers/MapPersistentStateMgr.cpp
+++ b/src/game/WorldHandlers/MapPersistentStateMgr.cpp
@@ -25,15 +25,12 @@
 #include "MapPersistentStateMgr.h"
 #include "SQLStorages.h"
 #include "Player.h"
-#include "GridNotifiers.h"
 #include "Log.h"
-#include "GridStates.h"
 #include "CellImpl.h"
 #include "Map.h"
 #include "MapManager.h"
 #include "Timer.h"
 #include "GridNotifiersImpl.h"
-#include "Transports.h"
 #include "ObjectMgr.h"
 #include "GameEventMgr.h"
 #include "World.h"
diff --git a/src/game/WorldHandlers/MassMailMgr.h b/src/game/WorldHandlers/MassMailMgr.h
index 1578a502..23f7ff6c 100644
--- a/src/game/WorldHandlers/MassMailMgr.h
+++ b/src/game/WorldHandlers/MassMailMgr.h
@@ -42,9 +42,6 @@
 
 #include "Common.h"
 #include "Mail.h"
-#include "Policies/Singleton.h"
-
-#include <memory>
 
 /**
  * A class to represent the mail send factory to multiple (often all existing) characters.
diff --git a/src/game/WorldHandlers/MiscHandler.cpp b/src/game/WorldHandlers/MiscHandler.cpp
index 462a417f..cff9c02d 100644
--- a/src/game/WorldHandlers/MiscHandler.cpp
+++ b/src/game/WorldHandlers/MiscHandler.cpp
@@ -35,8 +35,6 @@
 #include "GuildMgr.h"
 #include "ObjectMgr.h"
 #include "WorldSession.h"
-#include "Auth/BigNumber.h"
-#include "Auth/Sha1.h"
 #include "UpdateData.h"
 #include "LootMgr.h"
 #include "Chat.h"
diff --git a/src/game/WorldHandlers/MoveMap.cpp b/src/game/WorldHandlers/MoveMap.cpp
index 67c74cbc..f4779634 100644
--- a/src/game/WorldHandlers/MoveMap.cpp
+++ b/src/game/WorldHandlers/MoveMap.cpp
@@ -22,11 +22,9 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include "GridMap.h"
 #include "Log.h"
 #include "World.h"
 #include "Creature.h"
-
 #include "MoveMap.h"
 #include "MoveMapSharedDefines.h"
 
diff --git a/src/game/WorldHandlers/MovementHandler.cpp b/src/game/WorldHandlers/MovementHandler.cpp
index af17a2d3..5d79af70 100644
--- a/src/game/WorldHandlers/MovementHandler.cpp
+++ b/src/game/WorldHandlers/MovementHandler.cpp
@@ -27,7 +27,6 @@
 #include "WorldSession.h"
 #include "Opcodes.h"
 #include "Log.h"
-#include "Corpse.h"
 #include "Player.h"
 #include "MapManager.h"
 #include "Transports.h"
diff --git a/src/game/WorldHandlers/NPCHandler.cpp b/src/game/WorldHandlers/NPCHandler.cpp
index 2d02bdc7..d0de60fb 100644
--- a/src/game/WorldHandlers/NPCHandler.cpp
+++ b/src/game/WorldHandlers/NPCHandler.cpp
@@ -33,7 +33,6 @@
 #include "SpellMgr.h"
 #include "Player.h"
 #include "GossipDef.h"
-#include "UpdateMask.h"
 #include "ScriptMgr.h"
 #include "Creature.h"
 #include "Pet.h"
diff --git a/src/game/WorldHandlers/ObjectGridLoader.cpp b/src/game/WorldHandlers/ObjectGridLoader.cpp
index 646e61b8..7e508478 100644
--- a/src/game/WorldHandlers/ObjectGridLoader.cpp
+++ b/src/game/WorldHandlers/ObjectGridLoader.cpp
@@ -27,7 +27,6 @@
 #include "ObjectMgr.h"
 #include "MapPersistentStateMgr.h"
 #include "Creature.h"
-#include "GameObject.h"
 #include "DynamicObject.h"
 #include "Corpse.h"
 #include "World.h"
diff --git a/src/game/WorldHandlers/ObjectGridLoader.h b/src/game/WorldHandlers/ObjectGridLoader.h
index 03ea4a60..42711dce 100644
--- a/src/game/WorldHandlers/ObjectGridLoader.h
+++ b/src/game/WorldHandlers/ObjectGridLoader.h
@@ -26,7 +26,6 @@
 #define MANGOS_OBJECTGRIDLOADER_H
 
 #include "Common.h"
-#include "Utilities/TypeList.h"
 #include "Platform/Define.h"
 #include "GameSystem/GridLoader.h"
 #include "GridDefines.h"
diff --git a/src/game/WorldHandlers/PoolManager.cpp b/src/game/WorldHandlers/PoolManager.cpp
index a95ed06b..7c81c2e4 100644
--- a/src/game/WorldHandlers/PoolManager.cpp
+++ b/src/game/WorldHandlers/PoolManager.cpp
@@ -28,7 +28,6 @@
 #include "ProgressBar.h"
 #include "Log.h"
 #include "MapPersistentStateMgr.h"
-#include "MapManager.h"
 #include "World.h"
 #include "Policies/Singleton.h"
 
diff --git a/src/game/WorldHandlers/PoolManager.h b/src/game/WorldHandlers/PoolManager.h
index aa061220..08fb094c 100644
--- a/src/game/WorldHandlers/PoolManager.h
+++ b/src/game/WorldHandlers/PoolManager.h
@@ -27,7 +27,6 @@
 
 #include "Common.h"
 #include "Platform/Define.h"
-#include "Policies/Singleton.h"
 #include "Creature.h"
 #include "GameObject.h"
 
diff --git a/src/game/WorldHandlers/QueryHandler.cpp b/src/game/WorldHandlers/QueryHandler.cpp
index 29b6f2f7..751f875d 100644
--- a/src/game/WorldHandlers/QueryHandler.cpp
+++ b/src/game/WorldHandlers/QueryHandler.cpp
@@ -34,10 +34,7 @@
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "Player.h"
-#include "UpdateMask.h"
 #include "NPCHandler.h"
-#include "Pet.h"
-#include "MapManager.h"
 #include "SQLStorages.h"
 
 void WorldSession::SendNameQueryOpcode(Player* p)
diff --git a/src/game/WorldHandlers/QuestDef.h b/src/game/WorldHandlers/QuestDef.h
index e61132bb..9676eac5 100644
--- a/src/game/WorldHandlers/QuestDef.h
+++ b/src/game/WorldHandlers/QuestDef.h
@@ -28,7 +28,6 @@
 #include "Platform/Define.h"
 #include "Database/DatabaseEnv.h"
 
-#include <string>
 #include <vector>
 
 class Player;
diff --git a/src/game/WorldHandlers/ScriptMgr.cpp b/src/game/WorldHandlers/ScriptMgr.cpp
index 1cf26f2a..bc956db9 100644
--- a/src/game/WorldHandlers/ScriptMgr.cpp
+++ b/src/game/WorldHandlers/ScriptMgr.cpp
@@ -28,7 +28,6 @@
 #include "ProgressBar.h"
 #include "ObjectMgr.h"
 #include "WaypointManager.h"
-#include "World.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
 #include "Cell.h"
diff --git a/src/game/WorldHandlers/ScriptMgr.h b/src/game/WorldHandlers/ScriptMgr.h
index 95b051ff..cef7ff2c 100644
--- a/src/game/WorldHandlers/ScriptMgr.h
+++ b/src/game/WorldHandlers/ScriptMgr.h
@@ -26,7 +26,6 @@
 #define MANGOS_H_SCRIPTMGR
 
 #include "Common.h"
-#include "Policies/Singleton.h"
 #include "ObjectGuid.h"
 #include "DBCEnums.h"
 #include <ace/Atomic_Op.h>
diff --git a/src/game/WorldHandlers/SkillHandler.cpp b/src/game/WorldHandlers/SkillHandler.cpp
index 8b644d00..d6be25bc 100644
--- a/src/game/WorldHandlers/SkillHandler.cpp
+++ b/src/game/WorldHandlers/SkillHandler.cpp
@@ -23,13 +23,11 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
 #include "Opcodes.h"
 #include "Log.h"
 #include "Player.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "UpdateMask.h"
 
 void WorldSession::HandleLearnTalentOpcode(WorldPacket& recv_data)
 {
diff --git a/src/game/WorldHandlers/Spell.cpp b/src/game/WorldHandlers/Spell.cpp
index 64e0bfb6..2eb80081 100644
--- a/src/game/WorldHandlers/Spell.cpp
+++ b/src/game/WorldHandlers/Spell.cpp
@@ -30,7 +30,6 @@
 #include "GridNotifiersImpl.h"
 #include "Opcodes.h"
 #include "Log.h"
-#include "UpdateMask.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -40,7 +39,6 @@
 #include "DynamicObject.h"
 #include "Group.h"
 #include "UpdateData.h"
-#include "MapManager.h"
 #include "ObjectAccessor.h"
 #include "CellImpl.h"
 #include "Policies/Singleton.h"
diff --git a/src/game/WorldHandlers/SpellAuras.cpp b/src/game/WorldHandlers/SpellAuras.cpp
index 08ee565c..016cc18b 100644
--- a/src/game/WorldHandlers/SpellAuras.cpp
+++ b/src/game/WorldHandlers/SpellAuras.cpp
@@ -28,7 +28,6 @@
 #include "WorldSession.h"
 #include "Opcodes.h"
 #include "Log.h"
-#include "UpdateMask.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -42,7 +41,6 @@
 #include "Policies/Singleton.h"
 #include "Totem.h"
 #include "Creature.h"
-#include "Formulas.h"
 #include "BattleGround/BattleGround.h"
 #include "OutdoorPvP/OutdoorPvP.h"
 #include "CreatureAI.h"
diff --git a/src/game/WorldHandlers/SpellEffects.cpp b/src/game/WorldHandlers/SpellEffects.cpp
index 2411fa3e..94fd2368 100644
--- a/src/game/WorldHandlers/SpellEffects.cpp
+++ b/src/game/WorldHandlers/SpellEffects.cpp
@@ -27,7 +27,6 @@
 #include "WorldPacket.h"
 #include "Opcodes.h"
 #include "Log.h"
-#include "UpdateMask.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -36,10 +35,7 @@
 #include "Spell.h"
 #include "DynamicObject.h"
 #include "SpellAuras.h"
-#include "Group.h"
 #include "UpdateData.h"
-#include "MapManager.h"
-#include "ObjectAccessor.h"
 #include "SharedDefines.h"
 #include "Pet.h"
 #include "GameObject.h"
@@ -52,7 +48,6 @@
 #include "BattleGround/BattleGroundWS.h"
 #include "Language.h"
 #include "SocialMgr.h"
-#include "VMapFactory.h"
 #include "Util.h"
 #include "TemporarySummon.h"
 #include "ScriptMgr.h"
diff --git a/src/game/WorldHandlers/TaxiHandler.cpp b/src/game/WorldHandlers/TaxiHandler.cpp
index a6869512..89dc3ec6 100644
--- a/src/game/WorldHandlers/TaxiHandler.cpp
+++ b/src/game/WorldHandlers/TaxiHandler.cpp
@@ -30,7 +30,6 @@
 #include "Log.h"
 #include "ObjectMgr.h"
 #include "Player.h"
-#include "UpdateMask.h"
 #include "Path.h"
 #include "WaypointMovementGenerator.h"
 
diff --git a/src/game/WorldHandlers/TradeHandler.cpp b/src/game/WorldHandlers/TradeHandler.cpp
index a68cd345..c4facb6c 100644
--- a/src/game/WorldHandlers/TradeHandler.cpp
+++ b/src/game/WorldHandlers/TradeHandler.cpp
@@ -33,7 +33,6 @@
 #include "Item.h"
 #include "Spell.h"
 #include "SocialMgr.h"
-#include "Language.h"
 #include "DBCStores.h"
 
 void WorldSession::SendTradeStatus(const TradeStatusInfo& info)
diff --git a/src/game/WorldHandlers/Transports.h b/src/game/WorldHandlers/Transports.h
index 4512508e..fdfd0b63 100644
--- a/src/game/WorldHandlers/Transports.h
+++ b/src/game/WorldHandlers/Transports.h
@@ -29,7 +29,6 @@
 
 #include <map>
 #include <set>
-#include <string>
 
 typedef std::set<Unit*> UnitSet;
 
diff --git a/src/game/WorldHandlers/UnitAuraProcHandler.cpp b/src/game/WorldHandlers/UnitAuraProcHandler.cpp
index 1173c117..fc9d8aff 100644
--- a/src/game/WorldHandlers/UnitAuraProcHandler.cpp
+++ b/src/game/WorldHandlers/UnitAuraProcHandler.cpp
@@ -32,8 +32,6 @@
 #include "SpellAuras.h"
 #include "Totem.h"
 #include "Creature.h"
-#include "Formulas.h"
-#include "CreatureAI.h"
 #include "ScriptMgr.h"
 #include "Util.h"
 
diff --git a/src/game/WorldHandlers/WaypointManager.h b/src/game/WorldHandlers/WaypointManager.h
index 2a574248..f8fc946f 100644
--- a/src/game/WorldHandlers/WaypointManager.h
+++ b/src/game/WorldHandlers/WaypointManager.h
@@ -26,10 +26,7 @@
 #define MANGOS_WAYPOINTMANAGER_H
 
 #include "Common.h"
-#include <vector>
-#include <string>
 #include "Utilities/UnorderedMapSet.h"
-#include "Policies/Singleton.h"
 
 enum WaypointPathOrigin
 {
diff --git a/src/game/WorldHandlers/World.cpp b/src/game/WorldHandlers/World.cpp
index d23e04f4..47c1fde2 100644
--- a/src/game/WorldHandlers/World.cpp
+++ b/src/game/WorldHandlers/World.cpp
@@ -53,7 +53,6 @@
 #include "Policies/Singleton.h"
 #include "BattleGround/BattleGroundMgr.h"
 #include "OutdoorPvP/OutdoorPvP.h"
-#include "TemporarySummon.h"
 #include "VMapFactory.h"
 #include "MoveMap.h"
 #include "GameEventMgr.h"
diff --git a/src/game/WorldHandlers/World.h b/src/game/WorldHandlers/World.h
index f6b16ad2..9838fee5 100644
--- a/src/game/WorldHandlers/World.h
+++ b/src/game/WorldHandlers/World.h
@@ -34,7 +34,6 @@
 #include "Policies/Singleton.h"
 #include "SharedDefines.h"
 
-#include <map>
 #include <set>
 #include <list>
 
diff --git a/src/game/movement/MoveSplineFlag.h b/src/game/movement/MoveSplineFlag.h
index acc9b26d..b17bb789 100644
--- a/src/game/movement/MoveSplineFlag.h
+++ b/src/game/movement/MoveSplineFlag.h
@@ -26,8 +26,6 @@
 #define MANGOSSERVER_MOVESPLINEFLAG_H
 
 #include "typedefs.h"
-#include <string>
-
 namespace Movement
 {
 #if defined( __GNUC__ )
diff --git a/src/game/movement/util.cpp b/src/game/movement/util.cpp
index f5e9be0b..9011911f 100644
--- a/src/game/movement/util.cpp
+++ b/src/game/movement/util.cpp
@@ -24,7 +24,6 @@
 
 #include "MoveSplineFlag.h"
 #include <math.h>
-#include <string>
 
 namespace Movement
 {
diff --git a/src/game/vmap/BIH.h b/src/game/vmap/BIH.h
index 087a3d03..4e95e5e7 100644
--- a/src/game/vmap/BIH.h
+++ b/src/game/vmap/BIH.h
@@ -28,8 +28,6 @@
 #include <stdexcept>
 #include <vector>
 #include <algorithm>
-#include <limits>
-#include <cmath>
 
 #include <Platform/Define.h>
 
diff --git a/src/game/vmap/GameObjectModel.cpp b/src/game/vmap/GameObjectModel.cpp
index 4c5c2583..8225927f 100644
--- a/src/game/vmap/GameObjectModel.cpp
+++ b/src/game/vmap/GameObjectModel.cpp
@@ -31,7 +31,6 @@
 #include "World.h"
 #include "GameObjectModel.h"
 #include "DBCStores.h"
-#include "Creature.h"
 
 struct GameobjectModelData
 {
diff --git a/src/game/vmap/IVMapManager.h b/src/game/vmap/IVMapManager.h
index dc7b5f38..38a850a9 100644
--- a/src/game/vmap/IVMapManager.h
+++ b/src/game/vmap/IVMapManager.h
@@ -25,7 +25,7 @@
 #ifndef MANGOS_H_IVMAPMANAGER
 #define MANGOS_H_IVMAPMANAGER
 
-#include<string>
+#include <string>
 #include <Platform/Define.h>
 
 //===========================================================
diff --git a/src/game/vmap/RegularGrid.h b/src/game/vmap/RegularGrid.h
index 6a440ca3..798e1916 100644
--- a/src/game/vmap/RegularGrid.h
+++ b/src/game/vmap/RegularGrid.h
@@ -28,7 +28,6 @@
 #include <G3D/Ray.h>
 #include <G3D/AABox.h>
 #include <G3D/Table.h>
-#include <G3D/BoundsTrait.h>
 #include <G3D/PositionTrait.h>
 
 #include "Errors.h"
diff --git a/src/game/vmap/TileAssembler.cpp b/src/game/vmap/TileAssembler.cpp
index 176146a7..a15896c6 100644
--- a/src/game/vmap/TileAssembler.cpp
+++ b/src/game/vmap/TileAssembler.cpp
@@ -25,7 +25,6 @@
 #include <set>
 #include <iomanip>
 #include <sstream>
-#include <iomanip>
 
 #include "TileAssembler.h"
 #include "MapTree.h"
diff --git a/src/game/vmap/VMapDefinitions.h b/src/game/vmap/VMapDefinitions.h
index 042b77d6..e7b225ac 100644
--- a/src/game/vmap/VMapDefinitions.h
+++ b/src/game/vmap/VMapDefinitions.h
@@ -25,8 +25,6 @@
 #ifndef MANGOS_H_VMAPDEFINITIONS
 #define MANGOS_H_VMAPDEFINITIONS
 
-#include <cstring>
-
 #define LIQUID_TILE_SIZE (533.333f / 128.f)
 
 namespace VMAP
diff --git a/src/game/vmap/VMapFactory.cpp b/src/game/vmap/VMapFactory.cpp
index 9d1b9343..bc1caeed 100644
--- a/src/game/vmap/VMapFactory.cpp
+++ b/src/game/vmap/VMapFactory.cpp
@@ -22,7 +22,6 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include <sys/types.h>
 #include "VMapFactory.h"
 #include "VMapManager2.h"
 
diff --git a/src/game/vmap/VMapManager2.cpp b/src/game/vmap/VMapManager2.cpp
index 1fc5b9c4..3a90cf68 100644
--- a/src/game/vmap/VMapManager2.cpp
+++ b/src/game/vmap/VMapManager2.cpp
@@ -22,7 +22,6 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include <iostream>
 #include <iomanip>
 #include <string>
 #include <sstream>
diff --git a/src/game/vmap/WorldModel.h b/src/game/vmap/WorldModel.h
index cb3387cc..1c125a7a 100644
--- a/src/game/vmap/WorldModel.h
+++ b/src/game/vmap/WorldModel.h
@@ -27,7 +27,6 @@
 
 #include "Platform/Define.h"
 
-#include <G3D/HashTrait.h>
 #include <G3D/Vector3.h>
 #include <G3D/AABox.h>
 #include <G3D/Ray.h>