6 files changed, 34 insertions, 27 deletions
diff --git a/src/trinitycore/CliRunnable.cpp b/src/trinitycore/CliRunnable.cpp
index 96719b25cf7..1da2a30b4f7 100644
--- a/src/trinitycore/CliRunnable.cpp
+++ b/src/trinitycore/CliRunnable.cpp
@@ -23,19 +23,20 @@
 /// \file
 
 #include "Common.h"
-#include "Language.h"
-#include "Log.h"
-#include "World.h"
-#include "ScriptCalls.h"
 #include "ObjectMgr.h"
+#include "World.h"
 #include "WorldSession.h"
 #include "Config/ConfigEnv.h"
-#include "Util.h"
+
 #include "AccountMgr.h"
+#include "Chat.h"
 #include "CliRunnable.h"
+#include "Language.h"
+#include "Log.h"
 #include "MapManager.h"
 #include "Player.h"
-#include "Chat.h"
+#include "ScriptCalls.h"
+#include "Util.h"
 
 void utf8print(const char* str)
 {
diff --git a/src/trinitycore/Main.cpp b/src/trinitycore/Main.cpp
index 34a9cc3b2f1..eb51c770896 100644
--- a/src/trinitycore/Main.cpp
+++ b/src/trinitycore/Main.cpp
@@ -22,13 +22,16 @@
 /// @{
 /// \file
 
+#include <openssl/opensslv.h>
+#include <openssl/crypto.h>
+
 #include "Common.h"
 #include "Database/DatabaseEnv.h"
 #include "Config/ConfigEnv.h"
+
 #include "Log.h"
 #include "Master.h"
-#include <openssl/opensslv.h>
-#include <openssl/crypto.h>
+
 
 #ifndef _TRINITY_CORE_CONFIG
 # define _TRINITY_CORE_CONFIG  "TrinityCore.conf"
diff --git a/src/trinitycore/Master.cpp b/src/trinitycore/Master.cpp
index 2e2d75d5c3c..4d7eca8f04e 100644
--- a/src/trinitycore/Master.cpp
+++ b/src/trinitycore/Master.cpp
@@ -24,21 +24,22 @@
 
 #include <ace/OS_NS_signal.h>
 
-#include "WorldSocketMgr.h"
 #include "Common.h"
-#include "Master.h"
-#include "WorldSocket.h"
-#include "WorldRunnable.h"
-#include "World.h"
-#include "Log.h"
-#include "Timer.h"
-#include "Policies/SingletonImp.h"
 #include "SystemConfig.h"
+#include "World.h"
+#include "WorldRunnable.h"
+#include "WorldSocket.h"
+#include "WorldSocketMgr.h"
 #include "Config/ConfigEnv.h"
 #include "Database/DatabaseEnv.h"
+#include "Policies/SingletonImp.h"
+
 #include "CliRunnable.h"
+#include "Log.h"
+#include "Master.h"
 #include "RASocket.h"
 #include "ScriptCalls.h"
+#include "Timer.h"
 #include "Util.h"
 
 #include "sockets/TcpSocket.h"
diff --git a/src/trinitycore/RASocket.cpp b/src/trinitycore/RASocket.cpp
index ccda5ba7548..50a1af87256 100644
--- a/src/trinitycore/RASocket.cpp
+++ b/src/trinitycore/RASocket.cpp
@@ -23,13 +23,14 @@
 */
 
 #include "Common.h"
+#include "Config/ConfigEnv.h"
 #include "Database/DatabaseEnv.h"
+
+#include "AccountMgr.h"
 #include "Log.h"
 #include "RASocket.h"
-#include "World.h"
-#include "Config/ConfigEnv.h"
 #include "Util.h"
-#include "AccountMgr.h"
+#include "World.h"
 
 /// \todo Make this thread safe if in the future 2 admins should be able to log at the same time.
 SOCKET r;
diff --git a/src/trinitycore/RASocket.h b/src/trinitycore/RASocket.h
index 8900e689b2c..330c85defa4 100644
--- a/src/trinitycore/RASocket.h
+++ b/src/trinitycore/RASocket.h
@@ -25,9 +25,10 @@
 #ifndef _RASOCKET_H
 #define _RASOCKET_H
 
-#include "Common.h"
 #include "sockets/TcpSocket.h"
 
+#include "Common.h"
+
 #define RA_BUFF_SIZE 1024
 
 class ISocketHandler;
diff --git a/src/trinitycore/WorldRunnable.cpp b/src/trinitycore/WorldRunnable.cpp
index bd4d3170c52..ad0243a36ae 100644
--- a/src/trinitycore/WorldRunnable.cpp
+++ b/src/trinitycore/WorldRunnable.cpp
@@ -22,17 +22,17 @@
     \ingroup Trinityd
 */
 
-#include "WorldSocketMgr.h"
 #include "Common.h"
-#include "World.h"
-#include "WorldRunnable.h"
-#include "Timer.h"
 #include "ObjectAccessor.h"
-#include "MapManager.h"
-#include "BattleGroundMgr.h"
-
+#include "World.h"
+#include "WorldSocketMgr.h"
 #include "Database/DatabaseEnv.h"
 
+#include "BattleGroundMgr.h"
+#include "MapManager.h"
+#include "Timer.h"
+#include "WorldRunnable.h"
+
 #if (defined(WIN32) || defined(SHORT_SLEEP))
 #define WORLD_SLEEP_CONST 50
 #else