From c5d3dd90bea3889ef5fcd33c9ef0d59d7c544f8a Mon Sep 17 00:00:00 2001
From: Shauren <shauren.trinity@gmail.com>
Date: Thu, 18 May 2017 23:52:58 +0200
Subject: Core/Game: Include cleanup

* Mostly aimed at removing Log/DatabaseEnv includes from other headers
* Fix most packet headers including other packet headers - moved common structures such as ItemInstance to their own files
* Moved SAI function definitions to source files (massive or requiring many different dependencies)
---
 src/server/game/Chat/Channels/Channel.cpp  |  7 ++++---
 src/server/game/Chat/Channels/Channel.h    |  2 +-
 src/server/game/Chat/Channels/ChannelMgr.h |  5 ++++-
 src/server/game/Chat/Chat.cpp              | 14 +++++++-------
 src/server/game/Chat/Chat.h                |  3 +++
 src/server/game/Chat/ChatLink.cpp          |  1 +
 6 files changed, 20 insertions(+), 12 deletions(-)

(limited to 'src/server/game/Chat')

diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp
index d587b1fef4e..5605cb730eb 100644
--- a/src/server/game/Chat/Channels/Channel.cpp
+++ b/src/server/game/Chat/Channels/Channel.cpp
@@ -17,14 +17,15 @@
  */
 
 #include "Channel.h"
-#include "ChannelAppenders.h"
 #include "AccountMgr.h"
+#include "ChannelAppenders.h"
 #include "Chat.h"
+#include "DatabaseEnv.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
-#include "DatabaseEnv.h"
-#include "ObjectMgr.h"
 #include "Language.h"
+#include "Log.h"
+#include "ObjectMgr.h"
 #include "Player.h"
 #include "SocialMgr.h"
 #include "World.h"
diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index 50dd5c8ee96..d094fec6435 100644
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -21,8 +21,8 @@
 
 #include "Common.h"
 #include "ObjectGuid.h"
-#include "WorldPacket.h"
 #include <map>
+#include <unordered_set>
 
 class Player;
 
diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h
index 66d57c38d55..866717a422e 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.h
+++ b/src/server/game/Chat/Channels/ChannelMgr.h
@@ -18,11 +18,14 @@
 #ifndef __TRINITY_CHANNELMGR_H
 #define __TRINITY_CHANNELMGR_H
 
-#include "Common.h"
+#include "Define.h"
 #include "Hash.h"
+#include <string>
 #include <unordered_map>
 
 class Channel;
+class Player;
+struct AreaTableEntry;
 
 class TC_GAME_API ChannelMgr
 {
diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index b935734a0f8..a4596f64549 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -17,21 +17,21 @@
  */
 
 #include "Common.h"
-#include "ObjectMgr.h"
-#include "World.h"
-#include "WorldSession.h"
-#include "DatabaseEnv.h"
-
 #include "AccountMgr.h"
 #include "CellImpl.h"
 #include "Chat.h"
+#include "ChatLink.h"
+#include "DatabaseEnv.h"
 #include "GridNotifiersImpl.h"
+#include "Group.h"
 #include "Language.h"
 #include "Log.h"
+#include "ObjectMgr.h"
 #include "Player.h"
+#include "Realm.h"
 #include "ScriptMgr.h"
-#include "ChatLink.h"
-#include "Group.h"
+#include "World.h"
+#include "WorldSession.h"
 
 ChatCommand::ChatCommand(char const* name, uint32 permission, bool allowConsole, pHandler handler, std::string help, std::vector<ChatCommand> childCommands /*= std::vector<ChatCommand>()*/)
     : Name(ASSERT_NOTNULL(name)), Permission(permission), AllowConsole(allowConsole), Handler(handler), Help(std::move(help)), ChildCommands(std::move(childCommands))
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index e20479d8c51..e6cb5e445f1 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -29,6 +29,7 @@
 
 class ChatHandler;
 class Creature;
+class GameObject;
 class Group;
 class Player;
 class Unit;
@@ -37,6 +38,8 @@ class WorldObject;
 
 struct GameTele;
 
+enum LocaleConstant : uint8;
+
 class TC_GAME_API ChatCommand
 {
     typedef bool(*pHandler)(ChatHandler*, char const*);
diff --git a/src/server/game/Chat/ChatLink.cpp b/src/server/game/Chat/ChatLink.cpp
index 6beae331e51..74f1a1c8696 100644
--- a/src/server/game/Chat/ChatLink.cpp
+++ b/src/server/game/Chat/ChatLink.cpp
@@ -16,6 +16,7 @@
  */
 
 #include "ChatLink.h"
+#include "Log.h"
 #include "SpellMgr.h"
 #include "ObjectMgr.h"
 #include "SpellInfo.h"
-- 
cgit v1.2.3