Core/Misc: Optimize ChatCommand includes (include only where neccessary)

3 files changed, 11 insertions, 3 deletions

diff --git a/src/server/game/Chat/Chat.cpp b/src/server/game/Chat/Chat.cpp
index dc26c3cf0c7..1a219ba9085 100644
--- a/src/server/game/Chat/Chat.cpp
+++ b/src/server/game/Chat/Chat.cpp
@@ -19,6 +19,7 @@
 #include "AccountMgr.h"
 #include "CellImpl.h"
 #include "CharacterCache.h"
+#include "ChatCommand.h"
 #include "ChatPackets.h"
 #include "Common.h"
 #include "DatabaseEnv.h"
@@ -40,6 +41,13 @@
 
 Player* ChatHandler::GetPlayer() { return m_session ? m_session->GetPlayer() : nullptr; }
 
+char* ChatHandler::LineFromMessage(char*& pos)
+{
+    char* start = strtok(pos, "\n");
+    pos = nullptr;
+    return start;
+}
+
 // Lazy loading of the command table cache from commands and the
 // ScriptMgr should be thread safe since the player commands,
 // cli commands and ScriptMgr updates are all dispatched one after
diff --git a/src/server/game/Chat/Chat.h b/src/server/game/Chat/Chat.h
index 9aa32019ae2..46db7e56246 100644
--- a/src/server/game/Chat/Chat.h
+++ b/src/server/game/Chat/Chat.h
@@ -18,12 +18,11 @@
 #ifndef TRINITYCORE_CHAT_H
 #define TRINITYCORE_CHAT_H
 
-#include "ChatCommand.h"
 #include "ObjectGuid.h"
-#include "SharedDefines.h"
 #include "StringFormat.h"
 #include <vector>
 
+class ChatCommand;
 class ChatHandler;
 class Creature;
 class GameObject;
@@ -45,7 +44,7 @@ class TC_GAME_API ChatHandler
         explicit ChatHandler(WorldSession* session) : m_session(session), sentErrorMessage(false) { }
         virtual ~ChatHandler() { }
 
-        static char* LineFromMessage(char*& pos) { char* start = strtok(pos, "\n"); pos = nullptr; return start; }
+        static char* LineFromMessage(char*& pos);
 
         // function with different implementation for chat/console
         virtual char const* GetTrinityString(uint32 entry) const;
diff --git a/src/server/game/Scripting/ScriptMgr.cpp b/src/server/game/Scripting/ScriptMgr.cpp
index a439949cd26..1ca7264aa2d 100644
--- a/src/server/game/Scripting/ScriptMgr.cpp
+++ b/src/server/game/Scripting/ScriptMgr.cpp
@@ -20,6 +20,7 @@
 #include "AreaTrigger.h"
 #include "AreaTriggerAI.h"
 #include "Chat.h"
+#include "ChatCommand.h"
 #include "Conversation.h"
 #include "Creature.h"
 #include "CreatureAI.h"