diff --git a/src/game/AuctionHouseBot/AuctionHouseBot.cpp b/src/game/AuctionHouseBot/AuctionHouseBot.cpp
index 08bd888e7..f2b0d629f 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 ea8fe3b36..f9bc2c40f 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 d5ec46f1e..15f841ced 100644
--- a/src/game/BattleGround/BattleGround.cpp
+++ b/src/game/BattleGround/BattleGround.cpp
@@ -27,9 +27,7 @@
 #include "BattleGround.h"
 #include "BattleGroundMgr.h"
 #include "Creature.h"
-#include "MapManager.h"
 #include "Language.h"
-#include "SpellAuras.h"
 #include "ArenaTeam.h"
 #include "World.h"
 #include "Group.h"
@@ -37,7 +35,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 e83336bdb..86e81ed4a 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/BattleGroundBE.cpp b/src/game/BattleGround/BattleGroundBE.cpp
index 8858a8308..6a69e6c67 100644
--- a/src/game/BattleGround/BattleGroundBE.cpp
+++ b/src/game/BattleGround/BattleGroundBE.cpp
@@ -26,7 +26,6 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
-#include "ObjectMgr.h"
 #include "WorldPacket.h"
 #include "Language.h"
 
diff --git a/src/game/BattleGround/BattleGroundEY.cpp b/src/game/BattleGround/BattleGroundEY.cpp
index c905b5274..82d7d1fb4 100644
--- a/src/game/BattleGround/BattleGroundEY.cpp
+++ b/src/game/BattleGround/BattleGroundEY.cpp
@@ -31,8 +31,6 @@
 #include "BattleGroundMgr.h"
 #include "Language.h"
 #include "WorldPacket.h"
-#include "Util.h"
-#include "MapManager.h"
 
 BattleGroundEY::BattleGroundEY(): m_flagState(), m_towersAlliance(0), m_towersHorde(0), m_honorTicks(0), m_flagRespawnTimer(0), m_resourceUpdateTimer(0), m_felReaverFlagTimer(0)
 {
diff --git a/src/game/BattleGround/BattleGroundHandler.cpp b/src/game/BattleGround/BattleGroundHandler.cpp
index e0fd91527..b5c5931ab 100644
--- a/src/game/BattleGround/BattleGroundHandler.cpp
+++ b/src/game/BattleGround/BattleGroundHandler.cpp
@@ -31,7 +31,6 @@
 #include "ObjectMgr.h"
 #include "WorldSession.h"
 #include "Object.h"
-#include "Chat.h"
 #include "BattleGroundEY.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundWS.h"
diff --git a/src/game/BattleGround/BattleGroundMgr.h b/src/game/BattleGround/BattleGroundMgr.h
index 4c4ba6eed..2c0a65c55 100644
--- a/src/game/BattleGround/BattleGroundMgr.h
+++ b/src/game/BattleGround/BattleGroundMgr.h
@@ -26,12 +26,10 @@
 #define MANGOS_H_BATTLEGROUNDMGR
 
 #include "Common.h"
-#include "Policies/Singleton.h"
 #include "Utilities/EventProcessor.h"
 #include "SharedDefines.h"
 #include "DBCEnums.h"
 #include "BattleGround.h"
-#include "ace/Recursive_Thread_Mutex.h"
 
 #include <mutex>
 
diff --git a/src/game/BattleGround/BattleGroundNA.cpp b/src/game/BattleGround/BattleGroundNA.cpp
index cfefc44ba..4a112c04b 100644
--- a/src/game/BattleGround/BattleGroundNA.cpp
+++ b/src/game/BattleGround/BattleGroundNA.cpp
@@ -26,7 +26,6 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
-#include "ObjectMgr.h"
 #include "WorldPacket.h"
 #include "Language.h"
 
diff --git a/src/game/BattleGround/BattleGroundRL.cpp b/src/game/BattleGround/BattleGroundRL.cpp
index de4089b43..46867da95 100644
--- a/src/game/BattleGround/BattleGroundRL.cpp
+++ b/src/game/BattleGround/BattleGroundRL.cpp
@@ -26,7 +26,6 @@
 #include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
-#include "ObjectMgr.h"
 #include "Language.h"
 #include "WorldPacket.h"
 
diff --git a/src/game/BattleGround/BattleGroundWS.cpp b/src/game/BattleGround/BattleGroundWS.cpp
index 6b21f00f7..09517d92d 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(): m_ReputationCapture(0), m_HonorWinKills(0), m_HonorEndKills(0), m_EndTimer(0), m_LastCapturedFlagTeam()
 {
diff --git a/src/game/MotionGenerators/ConfusedMovementGenerator.cpp b/src/game/MotionGenerators/ConfusedMovementGenerator.cpp
index 5d8f24d66..8c575a340 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/Object/AggressorAI.cpp b/src/game/Object/AggressorAI.cpp
index 5047ae279..4f4333ee0 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->IsCivilian() && !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)
@@ -125,8 +120,7 @@ void AggressorAI::EnterEvadeMode()
     m_creature->SetLootRecipient(NULL);
 }
 
-void
-AggressorAI::UpdateAI(const uint32 /*diff*/)
+void AggressorAI::UpdateAI(const uint32 /*diff*/)
 {
     // update i_victimGuid if m_creature->getVictim() !=0 and changed
     if (!m_creature->SelectHostileTarget() || !m_creature->getVictim())
@@ -137,15 +131,13 @@ AggressorAI::UpdateAI(const uint32 /*diff*/)
     DoMeleeAttackIfReady();
 }
 
-bool
-AggressorAI::IsVisible(Unit* pl) const
+bool AggressorAI::IsVisible(Unit* pl) const
 {
     return m_creature->IsWithinDist(pl, sWorld.getConfig(CONFIG_FLOAT_SIGHT_MONSTER))
            && pl->IsVisibleForOrDetect(m_creature, m_creature, true);
 }
 
-void
-AggressorAI::AttackStart(Unit* u)
+void AggressorAI::AttackStart(Unit* u)
 {
     if (!u || !m_creature->CanAttackByItself())
         return;
diff --git a/src/game/Object/AuctionHouseMgr.h b/src/game/Object/AuctionHouseMgr.h
index ccbc2a226..1b9b53fd9 100644
--- a/src/game/Object/AuctionHouseMgr.h
+++ b/src/game/Object/AuctionHouseMgr.h
@@ -26,8 +26,6 @@
 #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 36c81d6bc..d542cfe47 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/Calendar.cpp b/src/game/Object/Calendar.cpp
index ac0b2509e..120118dc0 100644
--- a/src/game/Object/Calendar.cpp
+++ b/src/game/Object/Calendar.cpp
@@ -23,7 +23,6 @@
  */
 
 #include "Calendar.h"
-#include "Guild.h"
 #include "Mail.h"
 #include "ObjectMgr.h"
 #include "ProgressBar.h"
diff --git a/src/game/Object/Calendar.h b/src/game/Object/Calendar.h
index af797452a..a42bd0b93 100644
--- a/src/game/Object/Calendar.h
+++ b/src/game/Object/Calendar.h
@@ -25,10 +25,8 @@
 #ifndef MANGOS_CALENDAR_H
 #define MANGOS_CALENDAR_H
 
-#include "Policies/Singleton.h"
 #include "Common.h"
 #include "ObjectGuid.h"
-#include "SharedDefines.h"
 
 enum CalendarEventType
 {
@@ -234,7 +232,7 @@ class CalendarMgr
 
         CalendarEvent* AddEvent(ObjectGuid const& guid, std::string title, std::string description, uint32 type, uint32 repeatable, uint32 maxInvites,
                                 int32 dungeonId, time_t eventTime, time_t unkTime, uint32 flags);
-        
+
         CalendarInvite* AddInvite(CalendarEvent* event, ObjectGuid const& senderGuid, ObjectGuid const& inviteeGuid, CalendarInviteStatus status, CalendarModerationRank rank, const std::string& text, time_t statusTime);
 
         void RemoveEvent(uint64 eventId, Player* remover);
diff --git a/src/game/Object/Corpse.cpp b/src/game/Object/Corpse.cpp
index 4395367b3..46c4aacb5 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 c711e57e0..e774769f2 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 978caceb5..ad82ca806 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 4ce1dda18..246a9e5be 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 "SharedDefines.h"
 #include "Dynamic/FactoryHolder.h"
 #include "ObjectGuid.h"
 
diff --git a/src/game/Object/CreatureAISelector.cpp b/src/game/Object/CreatureAISelector.cpp
index acc755679..db5e7f7b1 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/WorldHandlers/AccountMgr.h b/src/game/WorldHandlers/AccountMgr.h
index 66fa3b0fa..f7c53a2b5 100644
--- a/src/game/WorldHandlers/AccountMgr.h
+++ b/src/game/WorldHandlers/AccountMgr.h
@@ -26,8 +26,6 @@
 #define _ACCMGR_H
 
 #include "Common.h"
-#include "Policies/Singleton.h"
-#include <string>
 
 enum AccountOpResult
 {
diff --git a/src/game/WorldHandlers/ArenaTeamHandler.cpp b/src/game/WorldHandlers/ArenaTeamHandler.cpp
index bce909296..26b5395e9 100644
--- a/src/game/WorldHandlers/ArenaTeamHandler.cpp
+++ b/src/game/WorldHandlers/ArenaTeamHandler.cpp
@@ -25,7 +25,6 @@
 #include "WorldSession.h"
 #include "WorldPacket.h"
 #include "Log.h"
-#include "Database/DatabaseEnv.h"
 #include "Player.h"
 #include "ObjectMgr.h"
 #include "ArenaTeam.h"
diff --git a/src/game/WorldHandlers/AuctionHouseHandler.cpp b/src/game/WorldHandlers/AuctionHouseHandler.cpp
index b70adc250..34be04922 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 76be4baed..18cb35e21 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 bff7e253e..f2f24fadd 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 034a8dee8..9a5b2b99b 100644
--- a/src/game/WorldHandlers/ChannelMgr.h
+++ b/src/game/WorldHandlers/ChannelMgr.h
@@ -26,10 +26,8 @@
 
 #include "Common.h"
 #include "Channel.h"
-#include "Policies/Singleton.h"
 
 #include <map>
-#include <string>
 
 class ChannelMgr
 {
diff --git a/src/game/WorldHandlers/CharacterHandler.cpp b/src/game/WorldHandlers/CharacterHandler.cpp
index f0512cffb..1f3ef81bc 100644
--- a/src/game/WorldHandlers/CharacterHandler.cpp
+++ b/src/game/WorldHandlers/CharacterHandler.cpp
@@ -34,15 +34,12 @@
 #include "Player.h"
 #include "Guild.h"
 #include "GuildMgr.h"
-#include "UpdateMask.h"
-#include "Auth/md5.h"
 #include "ObjectAccessor.h"
 #include "Group.h"
 #include "Database/DatabaseImpl.h"
 #include "PlayerDump.h"
 #include "SocialMgr.h"
 #include "Util.h"
-#include "ArenaTeam.h"
 #include "Language.h"
 #include "SpellMgr.h"
 #include "Calendar.h"
diff --git a/src/game/WorldHandlers/Chat.cpp b/src/game/WorldHandlers/Chat.cpp
index c6b3a1581..5f235f5ff 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 de9dd947e..096b3dd18 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 a2e6c62ab..3bb83d186 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"