5 files changed, 7 insertions, 37 deletions
diff --git a/src/gui/chatconsts.h b/src/gui/chatconsts.h
deleted file mode 100644
index 8028962c6..000000000
--- a/src/gui/chatconsts.h
+++ /dev/null
@@ -1,32 +0,0 @@
-/*
- *  The ManaPlus Client
- *  Copyright (C) 2009  The Mana World Development Team
- *  Copyright (C) 2009-2010  The Mana Developers
- *  Copyright (C) 2011-2015  The ManaPlus Developers
- *
- *  This file is part of The ManaPlus Client.
- *
- *  This program is free software; you can redistribute it and/or modify
- *  it under the terms of the GNU General Public License as published by
- *  the Free Software Foundation; either version 2 of the License, or
- *  any later version.
- *
- *  This program is distributed in the hope that it will be useful,
- *  but WITHOUT ANY WARRANTY; without even the implied warranty of
- *  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *  GNU General Public License for more details.
- *
- *  You should have received a copy of the GNU General Public License
- *  along with this program.  If not, see <http://www.gnu.org/licenses/>.
- */
-
-#ifndef GUI_CHATCONSTS_H
-#define GUI_CHATCONSTS_H
-
-#include <string>
-
-const std::string GENERAL_CHANNEL = "";
-const std::string GM_CHANNEL = "#gm";
-const std::string TRADE_CHANNEL = "#trade";
-
-#endif  // GUI_CHATCONSTS_H
diff --git a/src/gui/widgets/tabs/chat/gmtab.cpp b/src/gui/widgets/tabs/chat/gmtab.cpp
index a54798fc5..28dfe4e8c 100644
--- a/src/gui/widgets/tabs/chat/gmtab.cpp
+++ b/src/gui/widgets/tabs/chat/gmtab.cpp
@@ -20,13 +20,14 @@
 
 #include "gui/widgets/tabs/chat/gmtab.h"
 
-#include "gui/chatconsts.h"
-#include "net/chathandler.h"
+#include "const/gui/chat.h"
 
 #include "gui/windows/chatwindow.h"
 
 #include "utils/gettext.h"
 
+#include "net/chathandler.h"
+
 #include "debug.h"
 
 GmTab *gmChatTab = nullptr;
diff --git a/src/gui/widgets/tabs/chat/tradetab.cpp b/src/gui/widgets/tabs/chat/tradetab.cpp
index 414c97d9d..44c5cd9f0 100644
--- a/src/gui/widgets/tabs/chat/tradetab.cpp
+++ b/src/gui/widgets/tabs/chat/tradetab.cpp
@@ -22,7 +22,7 @@
 
 #include "gui/widgets/tabs/chat/tradetab.h"
 
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
 
 #include "gui/windows/chatwindow.h"
 
diff --git a/src/gui/windows/chatwindow.cpp b/src/gui/windows/chatwindow.cpp
index c08454623..d290a41a4 100644
--- a/src/gui/windows/chatwindow.cpp
+++ b/src/gui/windows/chatwindow.cpp
@@ -34,9 +34,10 @@
 #include "being/playerinfo.h"
 #include "being/playerrelations.h"
 
+#include "const/gui/chat.h"
+
 #include "input/inputmanager.h"
 
-#include "gui/chatconsts.h"
 #include "gui/focushandler.h"
 #include "gui/gui.h"
 #include "gui/skin.h"
diff --git a/src/gui/windows/shopwindow.cpp b/src/gui/windows/shopwindow.cpp
index 3eff4682b..19a7e31b8 100644
--- a/src/gui/windows/shopwindow.cpp
+++ b/src/gui/windows/shopwindow.cpp
@@ -29,7 +29,7 @@
 #include "gui/windows/shopselldialog.h"
 #include "gui/windows/tradewindow.h"
 
-#include "gui/chatconsts.h"
+#include "const/gui/chat.h"
 #endif
 
 #ifdef EATHENA_SUPPORT