Core: ported headers cleanup from master branch

5 files changed, 23 insertions, 12 deletions

diff --git a/src/server/game/Chat/Channels/Channel.cpp b/src/server/game/Chat/Channels/Channel.cpp
index 83f25ddf0b2..fc6b38f0e69 100644
--- a/src/server/game/Chat/Channels/Channel.cpp
+++ b/src/server/game/Chat/Channels/Channel.cpp
@@ -17,17 +17,20 @@
  */
 
 #include "Channel.h"
+#include "AccountMgr.h"
 #include "ChannelAppenders.h"
 #include "Chat.h"
+#include "DatabaseEnv.h"
+#include "DBCStores.h"
 #include "GridNotifiers.h"
 #include "GridNotifiersImpl.h"
-#include "ObjectMgr.h"
 #include "Language.h"
+#include "Log.h"
+#include "ObjectAccessor.h"
+#include "ObjectMgr.h"
+#include "Player.h"
 #include "SocialMgr.h"
 #include "World.h"
-#include "DatabaseEnv.h"
-#include "AccountMgr.h"
-#include "Player.h"
 
 Channel::Channel(uint32 channelId, uint32 team /*= 0*/, AreaTableEntry const* zoneEntry /*= nullptr*/) :
     _announceEnabled(false),                                        // no join/leave announces
diff --git a/src/server/game/Chat/Channels/Channel.h b/src/server/game/Chat/Channels/Channel.h
index 5c7460f10ec..364bec73a5f 100644
--- a/src/server/game/Chat/Channels/Channel.h
+++ b/src/server/game/Chat/Channels/Channel.h
@@ -20,11 +20,12 @@
 #define _CHANNEL_H
 
 #include "Common.h"
-
-#include "WorldSession.h"
-#include "WorldPacket.h"
+#include "ObjectGuid.h"
+#include <map>
+#include <unordered_set>
 
 class Player;
+struct AreaTableEntry;
 
 enum ChatNotify
 {
diff --git a/src/server/game/Chat/Channels/ChannelAppenders.h b/src/server/game/Chat/Channels/ChannelAppenders.h
index 03daf416f30..a6723ed1f8e 100644
--- a/src/server/game/Chat/Channels/ChannelAppenders.h
+++ b/src/server/game/Chat/Channels/ChannelAppenders.h
@@ -20,6 +20,8 @@
 
 #include "Channel.h"
 #include "CharacterCache.h"
+#include "World.h"
+#include "WorldPacket.h"
 
 // initial packet data (notify type and channel name)
 template<class PacketModifier>
@@ -185,10 +187,7 @@ struct ChannelOwnerAppend
 {
     explicit ChannelOwnerAppend(Channel const* channel, ObjectGuid const& ownerGuid) : _channel(channel), _ownerGuid(ownerGuid)
     {
-        CharacterCacheEntry const* cInfo = sCharacterCache->GetCharacterCacheByGuid(_ownerGuid);
-        if (!cInfo || cInfo->Name.empty())
-            _ownerName = "PLAYER_NOT_FOUND";
-        else
+        if (CharacterCacheEntry const* cInfo = sCharacterCache->GetCharacterCacheByGuid(_ownerGuid))
             _ownerName = cInfo->Name;
     }
 
diff --git a/src/server/game/Chat/Channels/ChannelMgr.cpp b/src/server/game/Chat/Channels/ChannelMgr.cpp
index 86328202737..48fd564af28 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.cpp
+++ b/src/server/game/Chat/Channels/ChannelMgr.cpp
@@ -18,8 +18,10 @@
 
 #include "Channel.h"
 #include "ChannelMgr.h"
+#include "DBCStores.h"
 #include "Player.h"
 #include "World.h"
+#include "WorldSession.h"
 
 ChannelMgr::~ChannelMgr()
 {
diff --git a/src/server/game/Chat/Channels/ChannelMgr.h b/src/server/game/Chat/Channels/ChannelMgr.h
index ff1c7d6fd31..5482c3e2e1c 100644
--- a/src/server/game/Chat/Channels/ChannelMgr.h
+++ b/src/server/game/Chat/Channels/ChannelMgr.h
@@ -18,9 +18,15 @@
 #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;
+class WorldPacket;
+struct AreaTableEntry;
 
 class TC_GAME_API ChannelMgr
 {