*Including style fixing - part 1

--HG--
branch : trunk

40 files changed, 197 insertions, 161 deletions

diff --git a/src/game/AccountMgr.cpp b/src/game/AccountMgr.cpp
index 86de06a30e0..66660766dae 100644
--- a/src/game/AccountMgr.cpp
+++ b/src/game/AccountMgr.cpp
@@ -18,11 +18,12 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "AccountMgr.h"
 #include "Database/DatabaseEnv.h"
+#include "Policies/SingletonImp.h"
+
+#include "AccountMgr.h"
 #include "ObjectAccessor.h"
 #include "Player.h"
-#include "Policies/SingletonImp.h"
 #include "Util.h"
 
 extern DatabaseType LoginDatabase;
diff --git a/src/game/AccountMgr.h b/src/game/AccountMgr.h
index a402b48ad4f..2be0178998e 100644
--- a/src/game/AccountMgr.h
+++ b/src/game/AccountMgr.h
@@ -21,9 +21,10 @@
 #ifndef _ACCMGR_H
 #define _ACCMGR_H
 
+#include <string>
+
 #include "Common.h"
 #include "Policies/Singleton.h"
-#include <string>
 
 enum AccountOpResult
 {
diff --git a/src/game/AchievementMgr.cpp b/src/game/AchievementMgr.cpp
index 2cf8949d4a7..c6ffd223e98 100644
--- a/src/game/AchievementMgr.cpp
+++ b/src/game/AchievementMgr.cpp
@@ -16,24 +16,26 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "AchievementMgr.h"
 #include "Common.h"
-#include "Player.h"
-#include "WorldPacket.h"
 #include "DBCEnums.h"
-#include "GameEventMgr.h"
 #include "ObjectMgr.h"
-#include "Guild.h"
-#include "Database/DatabaseEnv.h"
 #include "World.h"
-#include "SpellMgr.h"
+#include "WorldPacket.h"
+#include "Database/DatabaseEnv.h"
+#include "Policies/SingletonImp.h"
+
+#include "AchievementMgr.h"
 #include "ArenaTeam.h"
-#include "ProgressBar.h"
-#include "GridNotifiersImpl.h"
 #include "CellImpl.h"
+#include "GameEventMgr.h"
+#include "GridNotifiersImpl.h"
+#include "Guild.h"
 #include "Language.h"
+#include "Player.h"
+#include "ProgressBar.h"
+#include "SpellMgr.h"
+
 
-#include "Policies/SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1(AchievementGlobalMgr);
 
diff --git a/src/game/AchievementMgr.h b/src/game/AchievementMgr.h
index 73729f30998..3dd87737960 100644
--- a/src/game/AchievementMgr.h
+++ b/src/game/AchievementMgr.h
@@ -18,15 +18,15 @@
 #ifndef __MANGOS_ACHIEVEMENTMGR_H
 #define __MANGOS_ACHIEVEMENTMGR_H
 
+#include <map>
+#include <string>
+
 #include "Common.h"
 #include "Policies/Singleton.h"
 #include "Database/DatabaseEnv.h"
 #include "DBCEnums.h"
 #include "DBCStores.h"
 
-#include <map>
-#include <string>
-
 typedef std::list<AchievementCriteriaEntry const*> AchievementCriteriaEntryList;
 typedef std::list<AchievementEntry const*>         AchievementEntryList;
 
diff --git a/src/game/AddonHandler.cpp b/src/game/AddonHandler.cpp
index 4dd25c56b26..cac4261944b 100644
--- a/src/game/AddonHandler.cpp
+++ b/src/game/AddonHandler.cpp
@@ -18,12 +18,14 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
+#include "zlib/zlib.h"
+
 #include "AddonHandler.h"
 #include "Database/DatabaseEnv.h"
+#include "Policies/SingletonImp.h"
 #include "Opcodes.h"
+
 #include "Log.h"
-#include "Policies/SingletonImp.h"
-#include "zlib/zlib.h"
 
 INSTANTIATE_SINGLETON_1( AddonHandler );
 
diff --git a/src/game/AddonHandler.h b/src/game/AddonHandler.h
index fd9ad395924..f0d5bcac7f1 100644
--- a/src/game/AddonHandler.h
+++ b/src/game/AddonHandler.h
@@ -22,9 +22,10 @@
 #define __ADDONHANDLER_H
 
 #include "Common.h"
+#include "Config/ConfigEnv.h"
 #include "Policies/Singleton.h"
+
 #include "WorldPacket.h"
-#include "Config/ConfigEnv.h"
 
 class AddonHandler
 {
diff --git a/src/game/ArenaTeam.cpp b/src/game/ArenaTeam.cpp
index 5b2685017cf..f777b0ee8b1 100644
--- a/src/game/ArenaTeam.cpp
+++ b/src/game/ArenaTeam.cpp
@@ -16,8 +16,9 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "WorldPacket.h"
 #include "ObjectMgr.h"
+#include "WorldPacket.h"
+
 #include "ArenaTeam.h"
 
 ArenaTeam::ArenaTeam()
diff --git a/src/game/ArenaTeamHandler.cpp b/src/game/ArenaTeamHandler.cpp
index ab3319ce2ad..be802e822c0 100644
--- a/src/game/ArenaTeamHandler.cpp
+++ b/src/game/ArenaTeamHandler.cpp
@@ -18,14 +18,15 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "WorldSession.h"
+#include "Player.h"
+#include "World.h"
 #include "WorldPacket.h"
-#include "Log.h"
+#include "WorldSession.h"
 #include "Database/DatabaseEnv.h"
-#include "Player.h"
-#include "ObjectMgr.h"
+
 #include "ArenaTeam.h"
-#include "World.h"
+#include "Log.h"
+#include "ObjectMgr.h"
 #include "SocialMgr.h"
 
 void WorldSession::HandleInspectArenaTeamsOpcode(WorldPacket & recv_data)
diff --git a/src/game/AuctionHouseBot.cpp b/src/game/AuctionHouseBot.cpp
index 27315f8e2e9..4ef4eb0e494 100644
--- a/src/game/AuctionHouseBot.cpp
+++ b/src/game/AuctionHouseBot.cpp
@@ -1,17 +1,19 @@
-#include "AuctionHouseBot.h"
-#include "Bag.h"
+#include <vector>
+#include <iostream>
+#include "time.h"
+
+#include "ObjectMgr.h"
+#include "World.h"
+#include "WorldSession.h"
 #include "Config/ConfigEnv.h"
 #include "Database/DatabaseEnv.h"
+
+#include "AuctionHouseBot.h"
+#include "AuctionHouseMgr.h"
+#include "Bag.h"
 #include "Item.h"
 #include "Log.h"
-#include "ObjectMgr.h"
-#include "AuctionHouseMgr.h"
 #include "Player.h"
-#include "World.h"
-#include "WorldSession.h"
-#include "time.h"
-#include <vector>
-#include <iostream>
 
 using namespace std;
 
diff --git a/src/game/AuctionHouseBot.h b/src/game/AuctionHouseBot.h
index 8d5c067a354..9cd073885a3 100644
--- a/src/game/AuctionHouseBot.h
+++ b/src/game/AuctionHouseBot.h
@@ -1,8 +1,11 @@
 #ifndef AUCTION_HOUSE_BOT_H
 #define AUCTION_HOUSE_BOT_H
+
 #include "Common.h"
-#include "Log.h"
 #include "Config/ConfigEnv.h"
+
+#include "Log.h"
+
 #define AHB_GREY        0
 #define AHB_WHITE       1
 #define AHB_GREEN       2
diff --git a/src/game/AuctionHouseHandler.cpp b/src/game/AuctionHouseHandler.cpp
index 1a70162de11..d1f399bf570 100644
--- a/src/game/AuctionHouseHandler.cpp
+++ b/src/game/AuctionHouseHandler.cpp
@@ -18,17 +18,19 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+#include "ObjectMgr.h"
+#include "Player.h"
+#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
+
+#include "AuctionHouseBot.h"
+#include "AuctionHouseMgr.h"
 #include "Log.h"
-#include "World.h"
-#include "ObjectMgr.h"
-#include "Player.h"
+#include "Opcodes.h"
 #include "UpdateMask.h"
-#include "AuctionHouseMgr.h"
 #include "Util.h"
-#include "AuctionHouseBot.h"
+
 
 //please DO NOT use iterator++, because it is slower than ++iterator!!!
 //post-incrementation is always slower than pre-incrementation !
diff --git a/src/game/AuctionHouseMgr.cpp b/src/game/AuctionHouseMgr.cpp
index dd4086db64c..c8876c36063 100644
--- a/src/game/AuctionHouseMgr.cpp
+++ b/src/game/AuctionHouseMgr.cpp
@@ -17,23 +17,23 @@
  */
 
 #include "Common.h"
+#include "ObjectMgr.h"
+#include "Player.h"
+#include "World.h"
+#include "WorldPacket.h"
+#include "WorldSession.h"
 #include "Database/DatabaseEnv.h"
 #include "Database/SQLStorage.h"
+#include "Policies/SingletonImp.h"
 #include "DBCStores.h"
-#include "ProgressBar.h"
 
 #include "AccountMgr.h"
 #include "AuctionHouseMgr.h"
 #include "Item.h"
 #include "Language.h"
 #include "Log.h"
-#include "ObjectMgr.h"
-#include "Player.h"
-#include "World.h"
-#include "WorldPacket.h"
-#include "WorldSession.h"
+#include "ProgressBar.h"
 
-#include "Policies/SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1( AuctionHouseMgr );
 
diff --git a/src/game/AuctionHouseMgr.h b/src/game/AuctionHouseMgr.h
index cfc68497e47..2a106cf20f9 100644
--- a/src/game/AuctionHouseMgr.h
+++ b/src/game/AuctionHouseMgr.h
@@ -21,9 +21,10 @@
 #ifndef _AUCTION_HOUSE_MGR_H
 #define _AUCTION_HOUSE_MGR_H
 
-#include "SharedDefines.h"
 #include "Policies/Singleton.h"
 
+#include "SharedDefines.h"
+
 class Item;
 class Player;
 class WorldPacket;
diff --git a/src/game/Bag.cpp b/src/game/Bag.cpp
index 1edbc06474d..86befec7550 100644
--- a/src/game/Bag.cpp
+++ b/src/game/Bag.cpp
@@ -19,9 +19,10 @@
  */
 
 #include "Common.h"
-#include "Bag.h"
 #include "ObjectMgr.h"
 #include "Database/DatabaseEnv.h"
+
+#include "Bag.h"
 #include "Log.h"
 #include "UpdateData.h"
 
diff --git a/src/game/Bag.h b/src/game/Bag.h
index 1c341b5611d..3ae786512ce 100644
--- a/src/game/Bag.h
+++ b/src/game/Bag.h
@@ -24,8 +24,8 @@
 // Maximum 36 Slots ( (CONTAINER_END - CONTAINER_FIELD_SLOT_1)/2
 #define MAX_BAG_SIZE 36                                     // 2.0.12
 
-#include "ItemPrototype.h"
 #include "Item.h"
+#include "ItemPrototype.h"
 
 class Bag : public Item
 {
diff --git a/src/game/BattleGround.cpp b/src/game/BattleGround.cpp
index 2aa03fd0e80..c14d399e3f1 100644
--- a/src/game/BattleGround.cpp
+++ b/src/game/BattleGround.cpp
@@ -18,22 +18,24 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Object.h"
 #include "Player.h"
+#include "ObjectMgr.h"
+#include "World.h"
+#include "WorldPacket.h"
+
+#include "ArenaTeam.h"
 #include "BattleGround.h"
 #include "BattleGroundMgr.h"
 #include "Creature.h"
-#include "MapManager.h"
+#include "Formulas.h"
+#include "GridNotifiersImpl.h"
+#include "Group.h"
 #include "Language.h"
+#include "MapManager.h"
+#include "Object.h"
 #include "SpellAuras.h"
-#include "ArenaTeam.h"
-#include "World.h"
-#include "Group.h"
-#include "ObjectMgr.h"
-#include "WorldPacket.h"
 #include "Util.h"
-#include "Formulas.h"
-#include "GridNotifiersImpl.h"
+
 
 namespace MaNGOS
 {
diff --git a/src/game/BattleGroundAA.cpp b/src/game/BattleGroundAA.cpp
index 2aac2dde3eb..6133508ece1 100644
--- a/src/game/BattleGroundAA.cpp
+++ b/src/game/BattleGroundAA.cpp
@@ -18,10 +18,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundAA.h"
 #include "Language.h"
+#include "Player.h"
 
 BattleGroundAA::BattleGroundAA()
 {
diff --git a/src/game/BattleGroundAB.cpp b/src/game/BattleGroundAB.cpp
index 40f60960377..f5fba6f4186 100644
--- a/src/game/BattleGroundAB.cpp
+++ b/src/game/BattleGroundAB.cpp
@@ -18,16 +18,17 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
-#include "Player.h"
+#include "ObjectMgr.h"
+#include "World.h"
+#include "WorldPacket.h"
+
 #include "BattleGround.h"
 #include "BattleGroundAB.h"
 #include "Creature.h"
-#include "ObjectMgr.h"
 #include "Language.h"
-#include "World.h"
+#include "Object.h"
+#include "Player.h"
 #include "Util.h"
-#include "WorldPacket.h"
 
 // these variables aren't used outside of this file, so declare them only here
 uint32 BG_AB_HonorScoreTicks[BG_HONOR_MODE_NUM] = {
diff --git a/src/game/BattleGroundAV.cpp b/src/game/BattleGroundAV.cpp
index bc0b50d21f0..a93b304e2b9 100644
--- a/src/game/BattleGroundAV.cpp
+++ b/src/game/BattleGroundAV.cpp
@@ -18,15 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Player.h"
+#include "ObjectMgr.h"
+#include "WorldPacket.h"
+
 #include "BattleGround.h"
 #include "BattleGroundAV.h"
-#include "Language.h"
-#include "SpellAuras.h"
 #include "Formulas.h"
-#include "WorldPacket.h"
-#include "ObjectMgr.h"
 #include "GameObject.h"
+#include "Language.h"
+#include "Player.h"
+#include "SpellAuras.h"
 
 BattleGroundAV::BattleGroundAV()
 {
diff --git a/src/game/BattleGroundBE.cpp b/src/game/BattleGroundBE.cpp
index f61ff697faa..d58c2250948 100644
--- a/src/game/BattleGroundBE.cpp
+++ b/src/game/BattleGroundBE.cpp
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundBE.h"
+#include "Language.h"
+#include "Object.h"
 #include "ObjectMgr.h"
+#include "Player.h"
 #include "WorldPacket.h"
-#include "Language.h"
 
 BattleGroundBE::BattleGroundBE()
 {
diff --git a/src/game/BattleGroundDS.cpp b/src/game/BattleGroundDS.cpp
index 78360b9b194..0be870be175 100644
--- a/src/game/BattleGroundDS.cpp
+++ b/src/game/BattleGroundDS.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundDS.h"
 #include "Language.h"
+#include "Player.h"
 
 BattleGroundDS::BattleGroundDS()
 {
diff --git a/src/game/BattleGroundEY.cpp b/src/game/BattleGroundEY.cpp
index 385ec3d9bc1..9b54ecce643 100644
--- a/src/game/BattleGroundEY.cpp
+++ b/src/game/BattleGroundEY.cpp
@@ -18,15 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
-#include "Player.h"
+#include "ObjectMgr.h"
+#include "World.h"
+#include "WorldPacket.h"
+
 #include "BattleGround.h"
 #include "BattleGroundEY.h"
 #include "Creature.h"
-#include "ObjectMgr.h"
 #include "Language.h"
-#include "World.h" //music
-#include "WorldPacket.h"
+#include "Object.h"
+#include "Player.h"
 #include "Util.h"
 
 // these variables aren't used outside of this file, so declare them only here
diff --git a/src/game/BattleGroundHandler.cpp b/src/game/BattleGroundHandler.cpp
index b22c47e75d5..7a772fce8f1 100644
--- a/src/game/BattleGroundHandler.cpp
+++ b/src/game/BattleGroundHandler.cpp
@@ -19,20 +19,21 @@
  */
 
 #include "Common.h"
-#include "WorldPacket.h"
-#include "Opcodes.h"
-#include "Log.h"
-#include "Player.h"
+#include "ObjectAccessor.h"
 #include "ObjectMgr.h"
+#include "WorldPacket.h"
 #include "WorldSession.h"
-#include "ObjectAccessor.h"
-#include "Object.h"
-#include "Chat.h"
+
+#include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundWS.h"
 #include "BattleGround.h"
-#include "ArenaTeam.h"
+#include "Chat.h"
 #include "Language.h"
+#include "Log.h"
+#include "Player.h"
+#include "Object.h"
+#include "Opcodes.h"
 
 void WorldSession::HandleBattlemasterHelloOpcode( WorldPacket & recv_data )
 {
diff --git a/src/game/BattleGroundMgr.cpp b/src/game/BattleGroundMgr.cpp
index 561953cbf02..ba94f5917c1 100644
--- a/src/game/BattleGroundMgr.cpp
+++ b/src/game/BattleGroundMgr.cpp
@@ -19,8 +19,12 @@
  */
 
 #include "Common.h"
-#include "SharedDefines.h"
-#include "Player.h"
+#include "ObjectMgr.h"
+#include "World.h"
+#include "WorldPacket.h"
+#include "Policies/SingletonImp.h"
+
+#include "ArenaTeam.h"
 #include "BattleGroundMgr.h"
 #include "BattleGroundAV.h"
 #include "BattleGroundAB.h"
@@ -33,18 +37,13 @@
 #include "BattleGroundSA.h"
 #include "BattleGroundDS.h"
 #include "BattleGroundRV.h"
-#include "MapManager.h"
+#include "Chat.h"
 #include "Map.h"
 #include "MapInstanced.h"
-#include "ObjectMgr.h"
-#include "ProgressBar.h"
-#include "Chat.h"
-#include "ArenaTeam.h"
-#include "World.h"
-#include "WorldPacket.h"
+#include "MapManager.h"
+#include "Player.h"
 #include "ProgressBar.h"
-
-#include "Policies/SingletonImp.h"
+#include "SharedDefines.h"
 
 INSTANTIATE_SINGLETON_1( BattleGroundMgr );
 
diff --git a/src/game/BattleGroundMgr.h b/src/game/BattleGroundMgr.h
index d9cc9deae13..8d6bd06b020 100644
--- a/src/game/BattleGroundMgr.h
+++ b/src/game/BattleGroundMgr.h
@@ -23,6 +23,7 @@
 
 #include "Common.h"
 #include "Policies/Singleton.h"
+
 #include "BattleGround.h"
 
 typedef std::map<uint32, BattleGround*> BattleGroundSet;
diff --git a/src/game/BattleGroundNA.cpp b/src/game/BattleGroundNA.cpp
index f46746829e7..92e71c1c283 100644
--- a/src/game/BattleGroundNA.cpp
+++ b/src/game/BattleGroundNA.cpp
@@ -18,13 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundNA.h"
+#include "Language.h"
+#include "Object.h"
 #include "ObjectMgr.h"
+#include "Player.h"
 #include "WorldPacket.h"
-#include "Language.h"
 
 BattleGroundNA::BattleGroundNA()
 {
diff --git a/src/game/BattleGroundRL.cpp b/src/game/BattleGroundRL.cpp
index f8f8bd9fef5..b9f9943bbf2 100644
--- a/src/game/BattleGroundRL.cpp
+++ b/src/game/BattleGroundRL.cpp
@@ -18,12 +18,13 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
-#include "Player.h"
+
 #include "BattleGround.h"
 #include "BattleGroundRL.h"
-#include "ObjectMgr.h"
 #include "Language.h"
+#include "Object.h"
+#include "ObjectMgr.h"
+#include "Player.h"
 #include "WorldPacket.h"
 
 BattleGroundRL::BattleGroundRL()
diff --git a/src/game/BattleGroundRV.cpp b/src/game/BattleGroundRV.cpp
index 8c252c35c97..54070961018 100644
--- a/src/game/BattleGroundRV.cpp
+++ b/src/game/BattleGroundRV.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundRV.h"
 #include "Language.h"
+#include "Player.h"
 
 BattleGroundRV::BattleGroundRV()
 {
diff --git a/src/game/BattleGroundSA.cpp b/src/game/BattleGroundSA.cpp
index c52635a04c7..5f20950070d 100644
--- a/src/game/BattleGroundSA.cpp
+++ b/src/game/BattleGroundSA.cpp
@@ -16,10 +16,10 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundSA.h"
 #include "Language.h"
+#include "Player.h"
 
 BattleGroundSA::BattleGroundSA()
 {
diff --git a/src/game/BattleGroundWS.cpp b/src/game/BattleGroundWS.cpp
index 84da0cc9b65..c4a2402ad67 100644
--- a/src/game/BattleGroundWS.cpp
+++ b/src/game/BattleGroundWS.cpp
@@ -18,16 +18,16 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
  */
 
-#include "Object.h"
-#include "Player.h"
 #include "BattleGround.h"
 #include "BattleGroundWS.h"
 #include "Creature.h"
 #include "GameObject.h"
-#include "ObjectMgr.h"
-#include "WorldPacket.h"
 #include "Language.h"
+#include "Object.h"
+#include "ObjectMgr.h"
+#include "Player.h"
 #include "World.h"
+#include "WorldPacket.h"
 
 // these variables aren't used outside of this file, so declare them only here
 enum BG_WSG_Rewards
diff --git a/src/game/CalendarHandler.cpp b/src/game/CalendarHandler.cpp
index 3cd186c15d3..348cd5297c9 100644
--- a/src/game/CalendarHandler.cpp
+++ b/src/game/CalendarHandler.cpp
@@ -17,12 +17,13 @@
  */
 
 #include "Common.h"
-#include "Log.h"
-#include "Player.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
+
 #include "InstanceSaveMgr.h"
+#include "Log.h"
+#include "Opcodes.h"
+#include "Player.h"
 
 void WorldSession::HandleCalendarGetCalendar(WorldPacket &recv_data)
 {
diff --git a/src/game/Cell.h b/src/game/Cell.h
index 7e66d5d9f73..6ccd3c96a00 100644
--- a/src/game/Cell.h
+++ b/src/game/Cell.h
@@ -21,10 +21,12 @@
 #ifndef TRINITY_CELL_H
 #define TRINITY_CELL_H
 
+#include <cmath>
+
 #include "GameSystem/TypeContainer.h"
 #include "GameSystem/TypeContainerVisitor.h"
+
 #include "GridDefines.h"
-#include <cmath>
 
 class Map;
 
diff --git a/src/game/CellImpl.h b/src/game/CellImpl.h
index e74e0013a19..362c12579bb 100644
--- a/src/game/CellImpl.h
+++ b/src/game/CellImpl.h
@@ -21,9 +21,10 @@
 #ifndef TRINITY_CELLIMPL_H
 #define TRINITY_CELLIMPL_H
 
+#include <cmath>
+
 #include "Cell.h"
 #include "Map.h"
-#include <cmath>
 
 inline Cell::Cell(CellPair const& p)
 {
diff --git a/src/game/Channel.cpp b/src/game/Channel.cpp
index 588eb15f0cc..9bb3463dbdb 100644
--- a/src/game/Channel.cpp
+++ b/src/game/Channel.cpp
@@ -20,8 +20,8 @@
 
 #include "Channel.h"
 #include "ObjectMgr.h"
-#include "World.h"
 #include "SocialMgr.h"
+#include "World.h"
 
 Channel::Channel(const std::string& name, uint32 channel_id)
 : m_announce(true), m_moderate(false), m_name(name), m_flags(0), m_channelId(channel_id), m_ownerGUID(0)
diff --git a/src/game/Channel.h b/src/game/Channel.h
index 924046e4739..c2dd5ecd3ac 100644
--- a/src/game/Channel.h
+++ b/src/game/Channel.h
@@ -21,15 +21,16 @@
 #ifndef _CHANNEL_H
 #define _CHANNEL_H
 
-#include "Common.h"
-#include "WorldPacket.h"
-#include "Opcodes.h"
-#include "Player.h"
-
 #include <list>
 #include <map>
 #include <string>
 
+#include "Common.h"
+
+#include "Opcodes.h"
+#include "Player.h"
+#include "WorldPacket.h"
+
 enum ChatNotify
 {
     CHAT_JOINED_NOTICE                = 0x00,           //+ "%s joined channel.";
diff --git a/src/game/ChannelHandler.cpp b/src/game/ChannelHandler.cpp
index 7359c104751..45cdf8c20b2 100644
--- a/src/game/ChannelHandler.cpp
+++ b/src/game/ChannelHandler.cpp
@@ -18,9 +18,11 @@
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
 
+
+#include "Policies/SingletonImp.h"
+
 #include "ObjectMgr.h"                                      // for normalizePlayerName
 #include "ChannelMgr.h"
-#include "Policies/SingletonImp.h"
 
 INSTANTIATE_SINGLETON_1( AllianceChannelMgr );
 INSTANTIATE_SINGLETON_1( HordeChannelMgr );
diff --git a/src/game/ChannelMgr.h b/src/game/ChannelMgr.h
index 73e69c371ab..aeecfbfa541 100644
--- a/src/game/ChannelMgr.h
+++ b/src/game/ChannelMgr.h
@@ -20,13 +20,14 @@
 #ifndef TRINITYCORE_CHANNELMGR_H
 #define TRINITYCORE_CHANNELMGR_H
 
-#include "Channel.h"
-#include "Policies/Singleton.h"
-#include "World.h"
-
 #include <map>
 #include <string>
 
+#include "Policies/Singleton.h"
+
+#include "Channel.h"
+#include "World.h"
+
 class ChannelMgr
 {
     public:
diff --git a/src/game/CharacterHandler.cpp b/src/game/CharacterHandler.cpp
index 0f4cb5ee0b5..51731c11a98 100644
--- a/src/game/CharacterHandler.cpp
+++ b/src/game/CharacterHandler.cpp
@@ -19,28 +19,29 @@
  */
 
 #include "Common.h"
-#include "Database/DatabaseEnv.h"
+#include "ObjectAccessor.h"
+#include "ObjectMgr.h"
+#include "SystemConfig.h"
+#include "World.h"
 #include "WorldPacket.h"
-#include "SharedDefines.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
-#include "Log.h"
-#include "World.h"
-#include "ObjectMgr.h"
-#include "Player.h"
-#include "Guild.h"
-#include "UpdateMask.h"
 #include "Auth/md5.h"
-#include "ObjectAccessor.h"
-#include "Group.h"
+#include "Database/DatabaseEnv.h"
 #include "Database/DatabaseImpl.h"
+
+#include "ArenaTeam.h"
+#include "Chat.h"
+#include "Group.h"
+#include "Guild.h"
+#include "Language.h"
+#include "Log.h"
+#include "Opcodes.h"
+#include "Player.h"
 #include "PlayerDump.h"
+#include "SharedDefines.h"
 #include "SocialMgr.h"
+#include "UpdateMask.h"
 #include "Util.h"
-#include "ArenaTeam.h"
-#include "Language.h"
-#include "Chat.h"
-#include "SystemConfig.h"
 
 class LoginQueryHolder : public SqlQueryHolder
 {
diff --git a/src/game/Chat.cpp b/src/game/Chat.cpp
index f8c217d5c42..785ecf740ac 100644
--- a/src/game/Chat.cpp
+++ b/src/game/Chat.cpp
@@ -19,20 +19,21 @@
  */
 
 #include "Common.h"
-#include "Language.h"
-#include "Database/DatabaseEnv.h"
+#include "ObjectMgr.h"
+#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "Opcodes.h"
+#include "Database/DatabaseEnv.h"
+
+#include "AccountMgr.h"
+#include "CellImpl.h"
+#include "Chat.h"
+#include "GridNotifiersImpl.h"
+#include "Language.h"
 #include "Log.h"
-#include "World.h"
-#include "ObjectMgr.h"
+#include "Opcodes.h"
 #include "Player.h"
 #include "UpdateMask.h"
-#include "Chat.h"
-#include "GridNotifiersImpl.h"
-#include "CellImpl.h"
-#include "AccountMgr.h"
 #include "TicketMgr.h"
 
 // Supported shift-links (client generated and server side)
diff --git a/src/game/ChatHandler.cpp b/src/game/ChatHandler.cpp
index 142de50b059..ae9da2d9fe5 100644
--- a/src/game/ChatHandler.cpp
+++ b/src/game/ChatHandler.cpp
@@ -19,25 +19,26 @@
  */
 
 #include "Common.h"
-#include "Log.h"
+#include "ObjectAccessor.h"
+#include "ObjectMgr.h"
+#include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
-#include "World.h"
-#include "Opcodes.h"
-#include "ObjectMgr.h"
-#include "Chat.h"
 #include "Database/DatabaseEnv.h"
+
+#include "CellImpl.h"
+#include "Chat.h"
 #include "ChannelMgr.h"
+#include "GridNotifiersImpl.h"
 #include "Group.h"
 #include "Guild.h"
-#include "ObjectAccessor.h"
-#include "ScriptCalls.h"
+#include "Language.h"
+#include "Log.h"
+#include "Opcodes.h"
 #include "Player.h"
+#include "ScriptCalls.h"
 #include "SpellAuras.h"
-#include "Language.h"
 #include "Util.h"
-#include "GridNotifiersImpl.h"
-#include "CellImpl.h"
 
 void WorldSession::HandleMessagechatOpcode( WorldPacket & recv_data )
 {