Merge branch 'master' into Playerbot

src/server/game/Server/WorldPacket.h

@@ -19,7 +19,6 @@
 #define _WORLDPACKET_H_
 
 #include "ByteBuffer.h"
-#include "Common.h"
 #include "Duration.h"
 #include "Opcodes.h"
 

src/server/game/Server/WorldSession.cpp

@@ -43,7 +43,6 @@
 #include "QueryHolder.h"
 #include "ScriptMgr.h"
 #include "SocialMgr.h"
-#include "Tokenize.h"
 #include "Transport.h"
 #include "Vehicle.h"
 #include "WardenWin.h"

src/server/game/Server/WorldSocket.cpp

@@ -33,6 +33,8 @@
 #include "zlib.h"
 #include <memory>
 
+#include "ServerPktHeader.h"
+
 using boost::asio::ip::tcp;
 
 void compressBuff(void* dst, uint32* dst_size, void* src, int src_size)

src/server/game/Server/WorldSocket.h

@@ -21,7 +21,6 @@
 #include "AuthCrypt.h"
 #include "Common.h"
 #include "MPSCQueue.h"
-#include "ServerPktHeader.h"
 #include "Socket.h"
 #include "Util.h"
 #include "WorldPacket.h"