diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
index f2b0d629f..08bd888e7 100644
--- a/src/game/AuctionHouseBot/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
@@ -29,7 +29,6 @@
 #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 f9bc2c40f..ea8fe3b36 100644
--- a/src/game/AuctionHouseBot/AuctionHouseBot.h
+++ b/src/game/AuctionHouseBot/AuctionHouseBot.h
@@ -25,6 +25,7 @@
 #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 baf93ff16..d5ec46f1e 100644
--- a/src/game/BattleGround/BattleGround.cpp
+++ b/src/game/BattleGround/BattleGround.cpp
@@ -37,6 +37,7 @@
 #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 86e81ed4a..e83336bdb 100644
--- a/src/game/BattleGround/BattleGroundAB.cpp
+++ b/src/game/BattleGround/BattleGroundAB.cpp
@@ -26,10 +26,13 @@
 #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 09517d92d..6b21f00f7 100644
--- a/src/game/BattleGround/BattleGroundWS.cpp
+++ b/src/game/BattleGround/BattleGroundWS.cpp
@@ -26,11 +26,13 @@
 #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(): m_ReputationCapture(0), m_HonorWinKills(0), m_HonorEndKills(0), m_EndTimer(0), m_LastCapturedFlagTeam()
 {
diff --git a/src/game/ChatCommands/Level2.cpp b/src/game/ChatCommands/Level2.cpp
index bd3b0ddbb..c7d2ec47c 100644
--- a/src/game/ChatCommands/Level2.cpp
+++ b/src/game/ChatCommands/Level2.cpp
@@ -40,6 +40,7 @@
 #include "Language.h"
 #include "World.h"
 #include "GameEventMgr.h"
+#include "ScriptMgr.h"
 #include "SpellMgr.h"
 #include "MapPersistentStateMgr.h"
 #include "AccountMgr.h"
@@ -51,17 +52,17 @@
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
 #include "WaypointMovementGenerator.h"
-#include "Formulas.h"
+#include <cctype>
+#include <iostream>
+#include <fstream>
+#include <map>
+#include <typeinfo>
 
 #include "TargetedMovementGenerator.h"                      // for HandleNpcUnFollowCommand
 #include "MoveMap.h"                                        // for mmap manager
 #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 44070cf1a..ee20328ff 100644
--- a/src/game/ChatCommands/Level3.cpp
+++ b/src/game/ChatCommands/Level3.cpp
@@ -24,6 +24,7 @@
 
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
+#include "WorldPacket.h"
 #include "WorldSession.h"
 #include "World.h"
 #include "ObjectMgr.h"
@@ -31,6 +32,7 @@
 #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 f26af75da..54897c1ab 100644
--- a/src/game/ChatCommands/debugcmds.cpp
+++ b/src/game/ChatCommands/debugcmds.cpp
@@ -23,7 +23,7 @@
  */
 
 #include "Common.h"
-#include "DBCStores.h"
+#include "Database/DatabaseEnv.h"
 #include "WorldPacket.h"
 #include "Player.h"
 #include "Opcodes.h"
diff --git a/src/game/MotionGenerators/ConfusedMovementGenerator.cpp b/src/game/MotionGenerators/ConfusedMovementGenerator.cpp
index 8c575a340..5d8f24d66 100644
--- a/src/game/MotionGenerators/ConfusedMovementGenerator.cpp
+++ b/src/game/MotionGenerators/ConfusedMovementGenerator.cpp
@@ -23,10 +23,12 @@
  */
 
 #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 de5155b9c..fb2a14869 100644
--- a/src/game/MotionGenerators/FleeingMovementGenerator.cpp
+++ b/src/game/MotionGenerators/FleeingMovementGenerator.cpp
@@ -24,6 +24,7 @@
 
 #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 cfef844d8..02bb32cfd 100644
--- a/src/game/MotionGenerators/HomeMovementGenerator.cpp
+++ b/src/game/MotionGenerators/HomeMovementGenerator.cpp
@@ -25,6 +25,8 @@
 #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 514da01e5..19c230a4d 100644
--- a/src/game/MotionGenerators/MotionMaster.cpp
+++ b/src/game/MotionGenerators/MotionMaster.cpp
@@ -39,7 +39,6 @@
 #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 b5c8853c2..a3680c3e6 100644
--- a/src/game/MotionGenerators/MovementGenerator.h
+++ b/src/game/MotionGenerators/MovementGenerator.h
@@ -25,7 +25,10 @@
 #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 0144e0758..04b5b3e45 100644
--- a/src/game/MotionGenerators/PointMovementGenerator.cpp
+++ b/src/game/MotionGenerators/PointMovementGenerator.cpp
@@ -23,6 +23,7 @@
  */
 
 #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 f3073a744..122275e95 100644
--- a/src/game/MotionGenerators/RandomMovementGenerator.cpp
+++ b/src/game/MotionGenerators/RandomMovementGenerator.cpp
@@ -23,6 +23,7 @@
  */
 
 #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 a94d4654c..b94efd590 100644
--- a/src/game/MotionGenerators/TargetedMovementGenerator.cpp
+++ b/src/game/MotionGenerators/TargetedMovementGenerator.cpp
@@ -23,6 +23,8 @@
  */
 
 #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 beec77b56..7e0c86984 100644
--- a/src/game/MotionGenerators/WaypointMovementGenerator.cpp
+++ b/src/game/MotionGenerators/WaypointMovementGenerator.cpp
@@ -22,12 +22,15 @@
  * 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 dcf495155..64a23b0b6 100644
--- a/src/game/MotionGenerators/WaypointMovementGenerator.h
+++ b/src/game/MotionGenerators/WaypointMovementGenerator.h
@@ -35,6 +35,7 @@
 #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 949cfe4ef..5047ae279 100644
--- a/src/game/Object/AggressorAI.cpp
+++ b/src/game/Object/AggressorAI.cpp
@@ -25,12 +25,16 @@
 #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"
 
-int AggressorAI::Permissible(const Creature* creature)
+#include <list>
+
+int
+AggressorAI::Permissible(const Creature* creature)
 {
     // have some hostile factions, it will be selected by IsHostileTo check at MoveInLineOfSight
     if (!creature->IsCivilian() && !creature->IsNeutralToAll())
@@ -43,7 +47,8 @@ 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 1b9b53fd9..ccbc2a226 100644
--- a/src/game/Object/AuctionHouseMgr.h
+++ b/src/game/Object/AuctionHouseMgr.h
@@ -26,6 +26,8 @@
 #define _AUCTION_HOUSE_MGR_H
 
 #include "Common.h"
+#include "SharedDefines.h"
+#include "Policies/Singleton.h"
 #include "DBCStructure.h"
 
 class Item;
diff --git a/src/game/Object/Bag.cpp b/src/game/Object/Bag.cpp
index d542cfe47..36c81d6bc 100644
--- a/src/game/Object/Bag.cpp
+++ b/src/game/Object/Bag.cpp
@@ -25,6 +25,7 @@
 #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 46c4aacb5..4395367b3 100644
--- a/src/game/Object/Corpse.cpp
+++ b/src/game/Object/Corpse.cpp
@@ -24,9 +24,12 @@
 
 #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 e774769f2..c711e57e0 100644
--- a/src/game/Object/Creature.cpp
+++ b/src/game/Object/Creature.cpp
@@ -31,6 +31,7 @@
 #include "ObjectGuid.h"
 #include "SQLStorages.h"
 #include "SpellMgr.h"
+#include "QuestDef.h"
 #include "GossipDef.h"
 #include "Player.h"
 #include "GameEventMgr.h"
@@ -41,6 +42,8 @@
 #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 ad82ca806..978caceb5 100644
--- a/src/game/Object/Creature.h
+++ b/src/game/Object/Creature.h
@@ -27,9 +27,12 @@
 
 #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 d89d2ca75..4ce1dda18 100644
--- a/src/game/Object/CreatureAI.h
+++ b/src/game/Object/CreatureAI.h
@@ -25,7 +25,10 @@
 #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 db5e7f7b1..acc755679 100644
--- a/src/game/Object/CreatureAISelector.cpp
+++ b/src/game/Object/CreatureAISelector.cpp
@@ -30,7 +30,6 @@
 #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 e93843631..be40b98ce 100644
--- a/src/game/Object/CreatureEventAI.cpp
+++ b/src/game/Object/CreatureEventAI.cpp
@@ -26,9 +26,11 @@
 #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 d6333612d..9897751eb 100644
--- a/src/game/Object/CreatureEventAIMgr.cpp
+++ b/src/game/Object/CreatureEventAIMgr.cpp
@@ -30,6 +30,7 @@
 #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 5b2c0c689..6b84bcde9 100644
--- a/src/game/Object/DynamicObject.cpp
+++ b/src/game/Object/DynamicObject.cpp
@@ -23,8 +23,11 @@
  */
 
 #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 b93b8402b..6cc49f291 100644
--- a/src/game/Object/GameObject.cpp
+++ b/src/game/Object/GameObject.cpp
@@ -28,6 +28,7 @@
 #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 b9a11a8cd..e76f45ed8 100644
--- a/src/game/Object/GameObject.h
+++ b/src/game/Object/GameObject.h
@@ -29,6 +29,7 @@
 #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 85acc0cb8..818fac578 100644
--- a/src/game/Object/GuardAI.cpp
+++ b/src/game/Object/GuardAI.cpp
@@ -23,6 +23,7 @@
  */
 
 #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 c54e486d8..2dd36269c 100644
--- a/src/game/Object/ItemEnchantmentMgr.cpp
+++ b/src/game/Object/ItemEnchantmentMgr.cpp
@@ -22,15 +22,16 @@
  * 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 14e748fa8..017469d94 100644
--- a/src/game/Object/LootMgr.cpp
+++ b/src/game/Object/LootMgr.cpp
@@ -32,7 +32,6 @@
 #include "SpellMgr.h"
 #include "DBCStores.h"
 #include "SQLStorages.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 4cb883c15..99060626c 100644
--- a/src/game/Object/LootMgr.h
+++ b/src/game/Object/LootMgr.h
@@ -25,10 +25,12 @@
 #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 be1f4e2e0..faece63f8 100644
--- a/src/game/Object/Object.cpp
+++ b/src/game/Object/Object.cpp
@@ -37,6 +37,11 @@
 #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 0eed1d512..eea8e395c 100644
--- a/src/game/Object/Object.h
+++ b/src/game/Object/Object.h
@@ -34,6 +34,7 @@
 #include "Util.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 bfb303f04..36f99fba0 100644
--- a/src/game/Object/ObjectAccessor.cpp
+++ b/src/game/Object/ObjectAccessor.cpp
@@ -26,14 +26,21 @@
 #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 <mutex>
+
+#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 9feeac983..f1ecfa288 100644
--- a/src/game/Object/ObjectAccessor.h
+++ b/src/game/Object/ObjectAccessor.h
@@ -40,6 +40,11 @@
 #include "Player.h"
 #include "Corpse.h"
 
+#include <mutex>
+
+#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 14b11e95a..74e795750 100644
--- a/src/game/Object/ObjectGuid.h
+++ b/src/game/Object/ObjectGuid.h
@@ -28,6 +28,8 @@
 #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 e0500b12f..eeeb90050 100644
--- a/src/game/Object/ObjectMgr.cpp
+++ b/src/game/Object/ObjectMgr.cpp
@@ -32,6 +32,7 @@
 #include "ObjectGuid.h"
 #include "ScriptMgr.h"
 #include "SpellMgr.h"
+#include "UpdateMask.h"
 #include "World.h"
 #include "Group.h"
 #include "ArenaTeam.h"
@@ -40,10 +41,13 @@
 #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 "InstanceData.h"
@@ -53,7 +57,6 @@
 #include "GridNotifiersImpl.h"
 #include "CellImpl.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 cdeea3854..97e9a5ca0 100644
--- a/src/game/Object/ObjectMgr.h
+++ b/src/game/Object/ObjectMgr.h
@@ -26,11 +26,13 @@
 #define _OBJECTMGR_H
 
 #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"
@@ -41,6 +43,7 @@
 #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 56504322b..34c8d2bf5 100644
--- a/src/game/Object/Pet.cpp
+++ b/src/game/Object/Pet.cpp
@@ -30,7 +30,9 @@
 #include "SpellMgr.h"
 #include "Formulas.h"
 #include "SpellAuras.h"
+#include "CreatureAI.h"
 #include "Unit.h"
+#include "Util.h"
 
 Pet::Pet(PetType type) :
     Creature(CREATURE_SUBTYPE_PET),
diff --git a/src/game/Object/PetAI.cpp b/src/game/Object/PetAI.cpp
index 8500cd9f0..130abf3e0 100644
--- a/src/game/Object/PetAI.cpp
+++ b/src/game/Object/PetAI.cpp
@@ -28,6 +28,7 @@
 #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 3ab42c9db..7086d939a 100644
--- a/src/game/Object/Player.cpp
+++ b/src/game/Object/Player.cpp
@@ -46,6 +46,7 @@
 #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 ca9d21200..b41f393d1 100644
--- a/src/game/Object/Player.h
+++ b/src/game/Object/Player.h
@@ -31,6 +31,7 @@
 #include "Item.h"
 
 #include "Database/DatabaseEnv.h"
+#include "NPCHandler.h"
 #include "QuestDef.h"
 #include "Group.h"
 #include "Bag.h"
@@ -44,6 +45,7 @@
 #include "SharedDefines.h"
 #include "Chat.h"
 
+#include<string>
 #include<vector>
 
 struct Mail;
diff --git a/src/game/Object/ReactorAI.cpp b/src/game/Object/ReactorAI.cpp
index 70ccfc08a..59b0cb64a 100644
--- a/src/game/Object/ReactorAI.cpp
+++ b/src/game/Object/ReactorAI.cpp
@@ -22,7 +22,9 @@
  * 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 ae3e1544e..f917de313 100644
--- a/src/game/Object/SocialMgr.h
+++ b/src/game/Object/SocialMgr.h
@@ -25,6 +25,7 @@
 #ifndef __MANGOS_SOCIALMGR_H
 #define __MANGOS_SOCIALMGR_H
 
+#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 2355ed1d9..6d7600c7f 100644
--- a/src/game/Object/SpellMgr.cpp
+++ b/src/game/Object/SpellMgr.cpp
@@ -28,10 +28,12 @@
 #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 1e5a192d7..aa60cabc0 100644
--- a/src/game/Object/Totem.cpp
+++ b/src/game/Object/Totem.cpp
@@ -23,6 +23,7 @@
  */
 
 #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 89f3c1c9e..5b3216b85 100644
--- a/src/game/Object/TotemAI.cpp
+++ b/src/game/Object/TotemAI.cpp
@@ -27,6 +27,7 @@
 #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 71a208b24..4d039a50f 100644
--- a/src/game/Object/TotemAI.h
+++ b/src/game/Object/TotemAI.h
@@ -27,6 +27,7 @@
 
 #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 97f8daa8c..42e4be8c3 100644
--- a/src/game/Object/Unit.cpp
+++ b/src/game/Object/Unit.cpp
@@ -31,14 +31,17 @@
 #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"
@@ -49,6 +52,7 @@
 #include "MapPersistentStateMgr.h"
 #include "GridNotifiersImpl.h"
 #include "CellImpl.h"
+#include "VMapFactory.h"
 #include "MovementGenerator.h"
 #include "movement/MoveSplineInit.h"
 #include "movement/MoveSpline.h"
@@ -60,6 +64,7 @@
 #endif /* ENABLE_ELUNA */
 
 #include <math.h>
+#include <stdarg.h>
 
 float baseMoveSpeed[MAX_MOVE_TYPE] =
 {
diff --git a/src/game/Object/Unit.h b/src/game/Object/Unit.h
index aa9dd3f54..2389b3b3b 100644
--- a/src/game/Object/Unit.h
+++ b/src/game/Object/Unit.h
@@ -43,10 +43,9 @@
 #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 f696536e5..d4cf6d267 100644
--- a/src/game/Object/UpdateMask.h
+++ b/src/game/Object/UpdateMask.h
@@ -25,6 +25,7 @@
 #ifndef __UPDATEMASK_H
 #define __UPDATEMASK_H
 
+#include "UpdateFields.h"
 #include "Errors.h"
 
 class UpdateMask
diff --git a/src/game/OutdoorPvP/OutdoorPvP.cpp b/src/game/OutdoorPvP/OutdoorPvP.cpp
index 1adf1d82d..7652ab4c0 100644
--- a/src/game/OutdoorPvP/OutdoorPvP.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvP.cpp
@@ -20,6 +20,8 @@
  */
 
 #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 fdc4ac281..23f276922 100644
--- a/src/game/OutdoorPvP/OutdoorPvPMgr.h
+++ b/src/game/OutdoorPvP/OutdoorPvPMgr.h
@@ -23,6 +23,7 @@
 #define WORLD_PVP_MGR_H
 
 #include "Common.h"
+#include "Policies/Singleton.h"
 #include "Timer.h"
 
 enum
diff --git a/src/game/OutdoorPvP/OutdoorPvPSI.cpp b/src/game/OutdoorPvP/OutdoorPvPSI.cpp
index 2c0490260..f3fb46c82 100644
--- a/src/game/OutdoorPvP/OutdoorPvPSI.cpp
+++ b/src/game/OutdoorPvP/OutdoorPvPSI.cpp
@@ -27,7 +27,6 @@
 #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 00ca867af..f493fb7d1 100644
--- a/src/game/OutdoorPvP/OutdoorPvPSI.h
+++ b/src/game/OutdoorPvP/OutdoorPvPSI.h
@@ -24,6 +24,7 @@
 
 #include "Common.h"
 #include "OutdoorPvP.h"
+#include "Language.h"
 
 enum
 {
diff --git a/src/game/References/GroupReference.cpp b/src/game/References/GroupReference.cpp
index 09aaed14d..f017f42b0 100644
--- a/src/game/References/GroupReference.cpp
+++ b/src/game/References/GroupReference.cpp
@@ -22,6 +22,7 @@
  * 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 b506b4938..22a807d2a 100644
--- a/src/game/Server/DBCStores.cpp
+++ b/src/game/Server/DBCStores.cpp
@@ -28,6 +28,8 @@
 #include "Log.h"
 #include "ProgressBar.h"
 #include "SharedDefines.h"
+#include "SpellAuraDefines.h"
+#include "ObjectGuid.h"
 
 #include "DBCfmt.h"
 
diff --git a/src/game/Server/DBCStructure.h b/src/game/Server/DBCStructure.h
index 58e6dde2a..011c6e0ae 100644
--- a/src/game/Server/DBCStructure.h
+++ b/src/game/Server/DBCStructure.h
@@ -25,6 +25,7 @@
 #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 b3302857d..c37d4ab55 100644
--- a/src/game/Server/SQLStorages.h
+++ b/src/game/Server/SQLStorages.h
@@ -25,6 +25,7 @@
 #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 203b48ecc..2f64d3a6f 100644
--- a/src/game/Server/SharedDefines.h
+++ b/src/game/Server/SharedDefines.h
@@ -26,6 +26,7 @@
 #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 4200e4178..ccea09412 100644
--- a/src/game/Server/WorldSession.cpp
+++ b/src/game/Server/WorldSession.cpp
@@ -41,6 +41,7 @@
 #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 78cbe4010..86ef7bf97 100644
--- a/src/game/Tools/PlayerDump.h
+++ b/src/game/Tools/PlayerDump.h
@@ -25,6 +25,8 @@
 #ifndef _PLAYER_DUMP_H
 #define _PLAYER_DUMP_H
 
+#include <string>
+#include <map>
 #include <set>
 
 enum DumpTableType
diff --git a/src/game/WorldHandlers/AccountMgr.h b/src/game/WorldHandlers/AccountMgr.h
index f7c53a2b5..66fa3b0fa 100644
--- a/src/game/WorldHandlers/AccountMgr.h
+++ b/src/game/WorldHandlers/AccountMgr.h
@@ -26,6 +26,8 @@
 #define _ACCMGR_H
 
 #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 34be04922..b70adc250 100644
--- a/src/game/WorldHandlers/AuctionHouseHandler.cpp
+++ b/src/game/WorldHandlers/AuctionHouseHandler.cpp
@@ -30,6 +30,7 @@
 #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 18cb35e21..76be4baed 100644
--- a/src/game/WorldHandlers/Cell.h
+++ b/src/game/WorldHandlers/Cell.h
@@ -25,8 +25,10 @@
 #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 f2f24fadd..bff7e253e 100644
--- a/src/game/WorldHandlers/Channel.h
+++ b/src/game/WorldHandlers/Channel.h
@@ -28,9 +28,12 @@
 #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 9a5b2b99b..034a8dee8 100644
--- a/src/game/WorldHandlers/ChannelMgr.h
+++ b/src/game/WorldHandlers/ChannelMgr.h
@@ -26,8 +26,10 @@
 
 #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 5f235f5ff..c6b3a1581 100644
--- a/src/game/WorldHandlers/Chat.cpp
+++ b/src/game/WorldHandlers/Chat.cpp
@@ -33,6 +33,7 @@
 #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 096b3dd18..de9dd947e 100644
--- a/src/game/WorldHandlers/ChatHandler.cpp
+++ b/src/game/WorldHandlers/ChatHandler.cpp
@@ -30,6 +30,7 @@
 #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 3bb83d186..a2e6c62ab 100644
--- a/src/game/WorldHandlers/CombatHandler.cpp
+++ b/src/game/WorldHandlers/CombatHandler.cpp
@@ -26,6 +26,7 @@
 #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 ec55b34a3..020e6632a 100644
--- a/src/game/WorldHandlers/DuelHandler.cpp
+++ b/src/game/WorldHandlers/DuelHandler.cpp
@@ -26,6 +26,8 @@
 #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 5fb5c6584..d99d866d6 100644
--- a/src/game/WorldHandlers/GameEventMgr.cpp
+++ b/src/game/WorldHandlers/GameEventMgr.cpp
@@ -33,6 +33,7 @@
 #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 c694ba268..35cfee731 100644
--- a/src/game/WorldHandlers/GameEventMgr.h
+++ b/src/game/WorldHandlers/GameEventMgr.h
@@ -28,6 +28,7 @@
 #include "Common.h"
 #include "SharedDefines.h"
 #include "Platform/Define.h"
+#include "Policies/Singleton.h"
 
 #include <mutex>
 
diff --git a/src/game/WorldHandlers/GridMap.cpp b/src/game/WorldHandlers/GridMap.cpp
index 199f6fa60..f0144e941 100644
--- a/src/game/WorldHandlers/GridMap.cpp
+++ b/src/game/WorldHandlers/GridMap.cpp
@@ -22,7 +22,9 @@
  * 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 a5ff83e38..1d43d394c 100644
--- a/src/game/WorldHandlers/GridMap.h
+++ b/src/game/WorldHandlers/GridMap.h
@@ -27,7 +27,10 @@
 
 #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 ecfbccca8..0c9a9857b 100644
--- a/src/game/WorldHandlers/GridNotifiers.cpp
+++ b/src/game/WorldHandlers/GridNotifiers.cpp
@@ -26,6 +26,7 @@
 #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 2e9e77315..cbda55c9d 100644
--- a/src/game/WorldHandlers/GridNotifiers.h
+++ b/src/game/WorldHandlers/GridNotifiers.h
@@ -25,7 +25,9 @@
 #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 7f3117fc3..533fa38e5 100644
--- a/src/game/WorldHandlers/GridNotifiersImpl.h
+++ b/src/game/WorldHandlers/GridNotifiersImpl.h
@@ -27,7 +27,9 @@
 
 #include "GridNotifiers.h"
 #include "WorldPacket.h"
+#include "Corpse.h"
 #include "Player.h"
+#include "UpdateData.h"
 #include "CreatureAI.h"
 #include "SpellAuras.h"
 #include "DBCEnums.h"
diff --git a/src/game/WorldHandlers/GridStates.cpp b/src/game/WorldHandlers/GridStates.cpp
index 1c964da18..4885cc855 100644
--- a/src/game/WorldHandlers/GridStates.cpp
+++ b/src/game/WorldHandlers/GridStates.cpp
@@ -23,7 +23,8 @@
  */
 
 #include "GridStates.h"
-#include "ObjectGridLoader.h"
+#include "GridNotifiers.h"
+#include "GameSystem/Grid.h"
 #include "Log.h"
 
 void
diff --git a/src/game/WorldHandlers/Group.cpp b/src/game/WorldHandlers/Group.cpp
index cd55558da..3debbd12f 100644
--- a/src/game/WorldHandlers/Group.cpp
+++ b/src/game/WorldHandlers/Group.cpp
@@ -27,6 +27,7 @@
 #include "WorldPacket.h"
 #include "WorldSession.h"
 #include "Player.h"
+#include "World.h"
 #include "ObjectMgr.h"
 #include "ObjectGuid.h"
 #include "Group.h"
@@ -35,6 +36,7 @@
 #include "BattleGround/BattleGround.h"
 #include "MapManager.h"
 #include "MapPersistentStateMgr.h"
+#include "Util.h"
 #include "LootMgr.h"
 
 #ifdef ENABLE_ELUNA
diff --git a/src/game/WorldHandlers/Group.h b/src/game/WorldHandlers/Group.h
index 0c9143386..fa9d8aab3 100644
--- a/src/game/WorldHandlers/Group.h
+++ b/src/game/WorldHandlers/Group.h
@@ -34,6 +34,11 @@
 #include "DBCEnums.h"
 #include "SharedDefines.h"
 
+#include <map>
+#include <vector>
+
+struct ItemPrototype;
+
 class WorldSession;
 class Map;
 class BattleGround;
diff --git a/src/game/WorldHandlers/GuildHandler.cpp b/src/game/WorldHandlers/GuildHandler.cpp
index 7c7480734..9fd93e112 100644
--- a/src/game/WorldHandlers/GuildHandler.cpp
+++ b/src/game/WorldHandlers/GuildHandler.cpp
@@ -31,6 +31,7 @@
 #include "Opcodes.h"
 #include "Guild.h"
 #include "GuildMgr.h"
+#include "GossipDef.h"
 #include "SocialMgr.h"
 #include "Calendar.h"
 #ifdef ENABLE_ELUNA
diff --git a/src/game/WorldHandlers/GuildMgr.h b/src/game/WorldHandlers/GuildMgr.h
index 02969bdd2..732869d42 100644
--- a/src/game/WorldHandlers/GuildMgr.h
+++ b/src/game/WorldHandlers/GuildMgr.h
@@ -26,6 +26,7 @@
 #define _GUILDMGR_H
 
 #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 c6e843563..711bfc920 100644
--- a/src/game/WorldHandlers/LootHandler.cpp
+++ b/src/game/WorldHandlers/LootHandler.cpp
@@ -25,6 +25,8 @@
 #include "Common.h"
 #include "WorldPacket.h"
 #include "Log.h"
+#include "Corpse.h"
+#include "GameObject.h"
 #include "Player.h"
 #include "ObjectAccessor.h"
 #include "ObjectGuid.h"
@@ -32,7 +34,9 @@
 #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 3b649c30d..c0782c6cb 100644
--- a/src/game/WorldHandlers/Map.cpp
+++ b/src/game/WorldHandlers/Map.cpp
@@ -27,6 +27,7 @@
 #include "Player.h"
 #include "GridNotifiers.h"
 #include "Log.h"
+#include "GridStates.h"
 #include "CellImpl.h"
 #include "InstanceData.h"
 #include "GridNotifiersImpl.h"
@@ -41,13 +42,10 @@
 #include "MapPersistentStateMgr.h"
 #include "VMapFactory.h"
 #include "MoveMap.h"
-//#include "BattleGround/BattleGroundMgr.h"
+#include "BattleGround/BattleGroundMgr.h"
 #include "Calendar.h"
 #include "Chat.h"
 #include "Weather.h"
-#include "Transports.h"
-#include "ObjectGridLoader.h"
-
 #ifdef ENABLE_ELUNA
 #include "LuaEngine.h"
 #endif /* ENABLE_ELUNA */
diff --git a/src/game/WorldHandlers/Map.h b/src/game/WorldHandlers/Map.h
index 0f1c2633a..e5839a7ca 100644
--- a/src/game/WorldHandlers/Map.h
+++ b/src/game/WorldHandlers/Map.h
@@ -35,15 +35,18 @@
 #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 665b7ae64..862592e9b 100644
--- a/src/game/WorldHandlers/MapManager.cpp
+++ b/src/game/WorldHandlers/MapManager.cpp
@@ -31,6 +31,7 @@
 #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 f516b06ca..c6e55a83f 100644
--- a/src/game/WorldHandlers/MapPersistentStateMgr.cpp
+++ b/src/game/WorldHandlers/MapPersistentStateMgr.cpp
@@ -26,12 +26,15 @@
 
 #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 cd2d10fca..0e80c9652 100644
--- a/src/game/WorldHandlers/MassMailMgr.h
+++ b/src/game/WorldHandlers/MassMailMgr.h
@@ -42,6 +42,9 @@
 
 #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 0f68d7578..7e7cab627 100644
--- a/src/game/WorldHandlers/MiscHandler.cpp
+++ b/src/game/WorldHandlers/MiscHandler.cpp
@@ -34,6 +34,8 @@
 #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 5de419d7d..92c5298a8 100644
--- a/src/game/WorldHandlers/MoveMap.cpp
+++ b/src/game/WorldHandlers/MoveMap.cpp
@@ -22,9 +22,11 @@
  * 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 5aa341377..b37e165f3 100644
--- a/src/game/WorldHandlers/MovementHandler.cpp
+++ b/src/game/WorldHandlers/MovementHandler.cpp
@@ -27,6 +27,7 @@
 #include "WorldSession.h"
 #include "Opcodes.h"
 #include "Log.h"
+#include "Corpse.h"
 #include "Player.h"
 #include "Vehicle.h"
 #include "SpellAuras.h"
diff --git a/src/game/WorldHandlers/NPCHandler.cpp b/src/game/WorldHandlers/NPCHandler.cpp
index 20707c2d6..d238b76ac 100644
--- a/src/game/WorldHandlers/NPCHandler.cpp
+++ b/src/game/WorldHandlers/NPCHandler.cpp
@@ -33,6 +33,7 @@
 #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 a8c2ddd0d..6b7f02ca1 100644
--- a/src/game/WorldHandlers/ObjectGridLoader.cpp
+++ b/src/game/WorldHandlers/ObjectGridLoader.cpp
@@ -27,6 +27,7 @@
 #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 7404ee152..815fb2514 100644
--- a/src/game/WorldHandlers/ObjectGridLoader.h
+++ b/src/game/WorldHandlers/ObjectGridLoader.h
@@ -26,6 +26,7 @@
 #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 5f7332d8c..e802d6acb 100644
--- a/src/game/WorldHandlers/PoolManager.cpp
+++ b/src/game/WorldHandlers/PoolManager.cpp
@@ -28,6 +28,7 @@
 #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 fc8017b49..5e5a37e25 100644
--- a/src/game/WorldHandlers/PoolManager.h
+++ b/src/game/WorldHandlers/PoolManager.h
@@ -27,6 +27,7 @@
 
 #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 313150575..c433c3746 100644
--- a/src/game/WorldHandlers/QueryHandler.cpp
+++ b/src/game/WorldHandlers/QueryHandler.cpp
@@ -34,7 +34,10 @@
 #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 172379aeb..604d701db 100644
--- a/src/game/WorldHandlers/QuestDef.h
+++ b/src/game/WorldHandlers/QuestDef.h
@@ -28,6 +28,7 @@
 #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 441a60fdb..d15d1001d 100644
--- a/src/game/WorldHandlers/ScriptMgr.cpp
+++ b/src/game/WorldHandlers/ScriptMgr.cpp
@@ -28,6 +28,7 @@
 #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 0d2474f47..8b84158cb 100644
--- a/src/game/WorldHandlers/ScriptMgr.h
+++ b/src/game/WorldHandlers/ScriptMgr.h
@@ -26,6 +26,7 @@
 #define MANGOS_H_SCRIPTMGR
 
 #include "Common.h"
+#include "Policies/Singleton.h"
 #include "ObjectGuid.h"
 #include "DBCEnums.h"
 //#include <ace/Atomic_Op.h>  <- delete this if the #include below works
diff --git a/src/game/WorldHandlers/SkillHandler.cpp b/src/game/WorldHandlers/SkillHandler.cpp
index 2f0885427..98fc624a4 100644
--- a/src/game/WorldHandlers/SkillHandler.cpp
+++ b/src/game/WorldHandlers/SkillHandler.cpp
@@ -23,11 +23,14 @@
  */
 
 #include "Common.h"
+#include "Database/DatabaseEnv.h"
+#include "DBCStores.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 3accd16b2..e99585d93 100644
--- a/src/game/WorldHandlers/Spell.cpp
+++ b/src/game/WorldHandlers/Spell.cpp
@@ -30,6 +30,7 @@
 #include "GridNotifiersImpl.h"
 #include "Opcodes.h"
 #include "Log.h"
+#include "UpdateMask.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -39,6 +40,7 @@
 #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 22ffc8592..8b9dd5faf 100644
--- a/src/game/WorldHandlers/SpellAuras.cpp
+++ b/src/game/WorldHandlers/SpellAuras.cpp
@@ -28,6 +28,7 @@
 #include "WorldSession.h"
 #include "Opcodes.h"
 #include "Log.h"
+#include "UpdateMask.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -41,6 +42,7 @@
 #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 27778fe79..b81016449 100644
--- a/src/game/WorldHandlers/SpellEffects.cpp
+++ b/src/game/WorldHandlers/SpellEffects.cpp
@@ -27,6 +27,7 @@
 #include "WorldPacket.h"
 #include "Opcodes.h"
 #include "Log.h"
+#include "UpdateMask.h"
 #include "World.h"
 #include "ObjectMgr.h"
 #include "SpellMgr.h"
@@ -36,7 +37,10 @@
 #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"
@@ -50,6 +54,7 @@
 #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 d109b923f..9f7651ac4 100644
--- a/src/game/WorldHandlers/TaxiHandler.cpp
+++ b/src/game/WorldHandlers/TaxiHandler.cpp
@@ -30,6 +30,7 @@
 #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 08b68c21d..337a2c29f 100644
--- a/src/game/WorldHandlers/TradeHandler.cpp
+++ b/src/game/WorldHandlers/TradeHandler.cpp
@@ -33,8 +33,8 @@
 #include "Item.h"
 #include "Spell.h"
 #include "SocialMgr.h"
-#include "DBCStores.h"
 #include "Language.h"
+#include "DBCStores.h"
 
 void WorldSession::SendTradeStatus(TradeStatus status)
 {
diff --git a/src/game/WorldHandlers/Transports.h b/src/game/WorldHandlers/Transports.h
index dd945fa40..88e55a01f 100644
--- a/src/game/WorldHandlers/Transports.h
+++ b/src/game/WorldHandlers/Transports.h
@@ -29,6 +29,7 @@
 
 #include <map>
 #include <set>
+#include <string>
 
 class Transport : public GameObject
 {
diff --git a/src/game/WorldHandlers/UnitAuraProcHandler.cpp b/src/game/WorldHandlers/UnitAuraProcHandler.cpp
index a11af553a..af1ba8dfa 100644
--- a/src/game/WorldHandlers/UnitAuraProcHandler.cpp
+++ b/src/game/WorldHandlers/UnitAuraProcHandler.cpp
@@ -32,7 +32,8 @@
 #include "SpellAuras.h"
 #include "Totem.h"
 #include "Creature.h"
-#include "ScriptMgr.h"
+#include "Formulas.h"
+#include "CreatureAI.h"
 #include "Util.h"
 
 pAuraProcHandler AuraProcHandler[TOTAL_AURAS] =
diff --git a/src/game/WorldHandlers/WaypointManager.h b/src/game/WorldHandlers/WaypointManager.h
index c5e945f96..b73727501 100644
--- a/src/game/WorldHandlers/WaypointManager.h
+++ b/src/game/WorldHandlers/WaypointManager.h
@@ -26,7 +26,10 @@
 #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 74659f8ae..72e30967c 100644
--- a/src/game/WorldHandlers/World.cpp
+++ b/src/game/WorldHandlers/World.cpp
@@ -58,6 +58,7 @@
 #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 6a5c4fdc1..8131308c7 100644
--- a/src/game/WorldHandlers/World.h
+++ b/src/game/WorldHandlers/World.h
@@ -34,6 +34,7 @@
 #include "Policies/Singleton.h"
 #include "SharedDefines.h"
 
+#include <map>
 #include <set>
 #include <list>
 #include <mutex>
diff --git a/src/game/movement/MoveSplineFlag.h b/src/game/movement/MoveSplineFlag.h
index 753bd2eec..9f07e0646 100644
--- a/src/game/movement/MoveSplineFlag.h
+++ b/src/game/movement/MoveSplineFlag.h
@@ -26,6 +26,8 @@
 #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 727fa9958..f550d146e 100644
--- a/src/game/movement/util.cpp
+++ b/src/game/movement/util.cpp
@@ -24,6 +24,7 @@
 
 #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 1fb0e8f9b..fa144ace5 100644
--- a/src/game/vmap/BIH.h
+++ b/src/game/vmap/BIH.h
@@ -25,17 +25,18 @@
 #ifndef MANGOS_H_BIH
 #define MANGOS_H_BIH
 
-#include <stdexcept>
-#include <vector>
-#include <algorithm>
-#include <cmath>
-
-#include <Platform/Define.h>
-
 #include <G3D/Vector3.h>
 #include <G3D/Ray.h>
 #include <G3D/AABox.h>
 
+#include <Platform/Define.h>
+
+#include <stdexcept>
+#include <vector>
+#include <algorithm>
+#include <limits>
+#include <cmath>
+
 #define MAX_STACK_SIZE 64
 
 #ifdef _MSC_VER
diff --git a/src/game/vmap/GameObjectModel.cpp b/src/game/vmap/GameObjectModel.cpp
index 617591703..e9ba34503 100644
--- a/src/game/vmap/GameObjectModel.cpp
+++ b/src/game/vmap/GameObjectModel.cpp
@@ -31,6 +31,7 @@
 #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 38a850a9c..dc7b5f383 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 798e19163..6a440ca37 100644
--- a/src/game/vmap/RegularGrid.h
+++ b/src/game/vmap/RegularGrid.h
@@ -28,6 +28,7 @@
 #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 fc7c5561d..a94cefdfe 100644
--- a/src/game/vmap/TileAssembler.cpp
+++ b/src/game/vmap/TileAssembler.cpp
@@ -22,15 +22,15 @@
  * and lore are copyrighted by Blizzard Entertainment, Inc.
  */
 
-#include <set>
-#include <iomanip>
-#include <sstream>
-
 #include "TileAssembler.h"
 #include "MapTree.h"
 #include "BIH.h"
 #include "VMapDefinitions.h"
 
+#include <set>
+#include <iomanip>
+#include <sstream>
+#include <iomanip>
 
 using G3D::Vector3;
 using G3D::AABox;
diff --git a/src/game/vmap/VMapDefinitions.h b/src/game/vmap/VMapDefinitions.h
index 19c3f336f..9e774f05e 100644
--- a/src/game/vmap/VMapDefinitions.h
+++ b/src/game/vmap/VMapDefinitions.h
@@ -25,6 +25,8 @@
 #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 bc1caeedd..9d1b9343e 100644
--- a/src/game/vmap/VMapFactory.cpp
+++ b/src/game/vmap/VMapFactory.cpp
@@ -22,6 +22,7 @@
  * 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 44f325bb9..6981f916e 100644
--- a/src/game/vmap/VMapManager2.cpp
+++ b/src/game/vmap/VMapManager2.cpp
@@ -22,6 +22,7 @@
  * 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 91234bc0d..e2ffa8306 100644
--- a/src/game/vmap/WorldModel.h
+++ b/src/game/vmap/WorldModel.h
@@ -25,8 +25,7 @@
 #ifndef MANGOS_H_WORLDMODEL
 #define MANGOS_H_WORLDMODEL
 
-#include "Platform/Define.h"
-
+#include <G3D/HashTrait.h>
 #include <G3D/Vector3.h>
 #include <G3D/AABox.h>
 #include <G3D/Ray.h>