Core/Misc: Minor game include cleanup

18 files changed, 3 insertions, 20 deletions

diff --git a/src/server/game/Server/Packets/AuthenticationPackets.cpp b/src/server/game/Server/Packets/AuthenticationPackets.cpp
index d4fc5a6e862..f999709a061 100644
--- a/src/server/game/Server/Packets/AuthenticationPackets.cpp
+++ b/src/server/game/Server/Packets/AuthenticationPackets.cpp
@@ -22,7 +22,6 @@
 #include "HMAC.h"
 #include "ObjectMgr.h"
 #include "RSA.h"
-#include "Util.h"
 
 ByteBuffer& operator<<(ByteBuffer& data, WorldPackets::Auth::VirtualRealmNameInfo const& virtualRealmInfo)
 {
diff --git a/src/server/game/Server/Packets/CombatPackets.h b/src/server/game/Server/Packets/CombatPackets.h
index 6d29f67d575..6163fb81aca 100644
--- a/src/server/game/Server/Packets/CombatPackets.h
+++ b/src/server/game/Server/Packets/CombatPackets.h
@@ -20,7 +20,8 @@
 
 #include "Packet.h"
 #include "ObjectGuid.h"
-#include "CombatLogPacketsCommon.h"
+
+class Unit;
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/GameObjectPackets.h b/src/server/game/Server/Packets/GameObjectPackets.h
index f3bcf758425..234cf0dee6c 100644
--- a/src/server/game/Server/Packets/GameObjectPackets.h
+++ b/src/server/game/Server/Packets/GameObjectPackets.h
@@ -19,9 +19,7 @@
 #define GOPackets_h__
 
 #include "Packet.h"
-#include "DB2Stores.h"
 #include "GameObject.h"
-#include "WorldSession.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/HotfixPackets.h b/src/server/game/Server/Packets/HotfixPackets.h
index 385afb32de4..02d0cb9e453 100644
--- a/src/server/game/Server/Packets/HotfixPackets.h
+++ b/src/server/game/Server/Packets/HotfixPackets.h
@@ -22,7 +22,6 @@
 #include "Common.h"
 #include "DB2Stores.h"
 #include "ObjectGuid.h"
-#include "Optional.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/ItemPackets.cpp b/src/server/game/Server/Packets/ItemPackets.cpp
index 98e26997857..1c6c2117e76 100644
--- a/src/server/game/Server/Packets/ItemPackets.cpp
+++ b/src/server/game/Server/Packets/ItemPackets.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "ItemPackets.h"
-#include "Player.h"
 
 void WorldPackets::Item::BuyBackItem::Read()
 {
diff --git a/src/server/game/Server/Packets/ItemPackets.h b/src/server/game/Server/Packets/ItemPackets.h
index 60c291c77a0..caa18789635 100644
--- a/src/server/game/Server/Packets/ItemPackets.h
+++ b/src/server/game/Server/Packets/ItemPackets.h
@@ -22,7 +22,6 @@
 #include "DBCEnums.h"
 #include "ItemDefines.h"
 #include "ItemPacketsCommon.h"
-#include "PacketUtilities.h"
 #include "ObjectGuid.h"
 #include "Optional.h"
 #include <array>
diff --git a/src/server/game/Server/Packets/LFGPacketsCommon.h b/src/server/game/Server/Packets/LFGPacketsCommon.h
index b2bc72651f4..eb3b41ee538 100644
--- a/src/server/game/Server/Packets/LFGPacketsCommon.h
+++ b/src/server/game/Server/Packets/LFGPacketsCommon.h
@@ -18,7 +18,6 @@
 #ifndef LFGPacketsCommon_h__
 #define LFGPacketsCommon_h__
 
-#include "Packet.h"
 #include "ObjectGuid.h"
 #include "PacketUtilities.h"
 
diff --git a/src/server/game/Server/Packets/MailPackets.cpp b/src/server/game/Server/Packets/MailPackets.cpp
index eb05a665eb9..e916410f78b 100644
--- a/src/server/game/Server/Packets/MailPackets.cpp
+++ b/src/server/game/Server/Packets/MailPackets.cpp
@@ -20,7 +20,6 @@
 #include "Item.h"
 #include "Mail.h"
 #include "Player.h"
-#include "World.h"
 
 WorldPackets::Mail::MailAttachedItem::MailAttachedItem(::Item const* item, uint8 pos)
 {
diff --git a/src/server/game/Server/Packets/MovementPackets.cpp b/src/server/game/Server/Packets/MovementPackets.cpp
index 266c99b4f08..5aac9eaffca 100644
--- a/src/server/game/Server/Packets/MovementPackets.cpp
+++ b/src/server/game/Server/Packets/MovementPackets.cpp
@@ -19,7 +19,6 @@
 #include "MoveSpline.h"
 #include "MoveSplineFlag.h"
 #include "MovementTypedefs.h"
-#include "PacketUtilities.h"
 #include "Unit.h"
 #include "Util.h"
 
diff --git a/src/server/game/Server/Packets/MythicPlusPacketsCommon.h b/src/server/game/Server/Packets/MythicPlusPacketsCommon.h
index b0ada2e947e..c78c07fa3ad 100644
--- a/src/server/game/Server/Packets/MythicPlusPacketsCommon.h
+++ b/src/server/game/Server/Packets/MythicPlusPacketsCommon.h
@@ -18,7 +18,6 @@
 #ifndef MythicPlusPacketsCommon_h__
 #define MythicPlusPacketsCommon_h__
 
-#include "Packet.h"
 #include "ObjectGuid.h"
 #include "PacketUtilities.h"
 
diff --git a/src/server/game/Server/Packets/PacketUtilities.cpp b/src/server/game/Server/Packets/PacketUtilities.cpp
index 426b3be9b8f..699e63814ac 100644
--- a/src/server/game/Server/Packets/PacketUtilities.cpp
+++ b/src/server/game/Server/Packets/PacketUtilities.cpp
@@ -17,7 +17,6 @@
 
 #include "PacketUtilities.h"
 #include "Hyperlinks.h"
-#include "Errors.h"
 #include <utf8.h>
 #include <sstream>
 
diff --git a/src/server/game/Server/Packets/PetitionPackets.h b/src/server/game/Server/Packets/PetitionPackets.h
index e5f0a2e80ce..71d909e4028 100644
--- a/src/server/game/Server/Packets/PetitionPackets.h
+++ b/src/server/game/Server/Packets/PetitionPackets.h
@@ -20,7 +20,6 @@
 
 #include "Packet.h"
 #include "ObjectGuid.h"
-#include "WorldSession.h"
 
 namespace WorldPackets
 {
diff --git a/src/server/game/Server/Packets/QueryPackets.h b/src/server/game/Server/Packets/QueryPackets.h
index 26fb9da11c1..90c467fb372 100644
--- a/src/server/game/Server/Packets/QueryPackets.h
+++ b/src/server/game/Server/Packets/QueryPackets.h
@@ -24,7 +24,7 @@
 #include "ObjectGuid.h"
 #include "PacketUtilities.h"
 #include "Position.h"
-#include "QuestDef.h"
+#include "RaceMask.h"
 #include "SharedDefines.h"
 #include "UnitDefines.h"
 #include <array>
diff --git a/src/server/game/Server/Packets/SocialPackets.cpp b/src/server/game/Server/Packets/SocialPackets.cpp
index d899536bb48..61aea784296 100644
--- a/src/server/game/Server/Packets/SocialPackets.cpp
+++ b/src/server/game/Server/Packets/SocialPackets.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "SocialPackets.h"
-#include "ObjectMgr.h"
 #include "SocialMgr.h"
 #include "World.h"
 
diff --git a/src/server/game/Server/Packets/VoidStoragePackets.cpp b/src/server/game/Server/Packets/VoidStoragePackets.cpp
index 69914f4ad76..5601060d5c4 100644
--- a/src/server/game/Server/Packets/VoidStoragePackets.cpp
+++ b/src/server/game/Server/Packets/VoidStoragePackets.cpp
@@ -16,7 +16,6 @@
  */
 
 #include "VoidStoragePackets.h"
-#include "SharedDefines.h"
 
 WorldPacket const* WorldPackets::VoidStorage::VoidTransferResult::Write()
 {
diff --git a/src/server/game/Server/WorldSession.h b/src/server/game/Server/WorldSession.h
index bd2289d8bc9..ac7ad4e05be 100644
--- a/src/server/game/Server/WorldSession.h
+++ b/src/server/game/Server/WorldSession.h
@@ -39,7 +39,6 @@
 #include <map>
 #include <memory>
 #include <unordered_map>
-#include <unordered_set>
 
 class BlackMarketEntry;
 class CollectionMgr;
diff --git a/src/server/game/Server/WorldSocket.cpp b/src/server/game/Server/WorldSocket.cpp
index a3318602612..2e4b44411bf 100644
--- a/src/server/game/Server/WorldSocket.cpp
+++ b/src/server/game/Server/WorldSocket.cpp
@@ -31,7 +31,6 @@
 #include "RBAC.h"
 #include "ScriptMgr.h"
 #include "SessionKeyGenerator.h"
-#include "Util.h"
 #include "World.h"
 #include "WorldPacket.h"
 #include "WorldSession.h"
diff --git a/src/server/game/Server/WorldSocket.h b/src/server/game/Server/WorldSocket.h
index 0bf75b8300f..dbd0019562a 100644
--- a/src/server/game/Server/WorldSocket.h
+++ b/src/server/game/Server/WorldSocket.h
@@ -18,7 +18,6 @@
 #ifndef __WORLDSOCKET_H__
 #define __WORLDSOCKET_H__
 
-#include "Common.h"
 #include "AsyncCallbackProcessor.h"
 #include "AuthDefines.h"
 #include "DatabaseEnvFwd.h"
@@ -29,7 +28,6 @@
 #include "MPSCQueue.h"
 #include <array>
 #include <boost/asio/ip/tcp.hpp>
-#include <functional>
 #include <mutex>
 
 typedef struct z_stream_s z_stream;