improve includes.

40 files changed, 111 insertions, 31 deletions

diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 0f592b123..d55a3cea6 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -39,8 +39,6 @@
 #include "net/chathandler.h"
 #include "net/net.h"
 
-#include "net/ea/eaprotocol.h"
-
 #include "utils/timer.h"
 
 #include "debug.h"
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index a11c157fd..d541ce09b 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -33,6 +33,7 @@
 #include "net/ea/gamehandler.h"
 #include "net/ea/network.h"
 
+#include "net/messagein.h"
 #include "net/net.h"
 
 #include "utils/dtor.h"
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index 5ffd714f2..af6aafa9b 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -24,8 +24,13 @@
 #define NET_EA_CHARSERVERHANDLER_H
 
 #include "net/charserverhandler.h"
-#include "net/messagein.h"
-#include "net/serverinfo.h"
+
+class ServerInfo;
+
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace Ea
 {
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index 6654950f2..997e4bfc1 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -38,6 +38,8 @@
 
 #include "gui/widgets/tabs/chattab.h"
 
+#include "net/messagein.h"
+
 #include <string>
 
 #include "debug.h"
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index 1fabda09d..237abf10a 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -24,10 +24,14 @@
 #define NET_EA_CHATHANDLER_H
 
 #include "net/chathandler.h"
-#include "net/messagein.h"
 
 #include <queue>
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 6e1982b6d..de1d6f151 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -31,6 +31,8 @@
 
 #include "gui/windows/okdialog.h"
 
+#include "net/messagein.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 8a31ee030..4a0624be0 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -24,7 +24,11 @@
 #define NET_EA_GAMEHANDLER_H
 
 #include "net/gamehandler.h"
-#include "net/messagein.h"
+
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace Ea
 {
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 46b1f1649..af8c3b8df 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -28,10 +28,9 @@
 #include "soundconsts.h"
 #include "soundmanager.h"
 
+#include "net/guildhandler.h"
 #include "net/net.h"
 
-#include "net/ea/guildhandler.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 536c93263..1e56ac75b 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -30,6 +30,10 @@
 
 #include "gui/windows/socialwindow.h"
 
+#include "net/messagein.h"
+
+#include "net/ea/gui/guildtab.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/guildhandler.h b/src/net/ea/guildhandler.h
index 191d6fd44..e8bec6a09 100644
--- a/src/net/ea/guildhandler.h
+++ b/src/net/ea/guildhandler.h
@@ -23,12 +23,15 @@
 #define NET_EA_GUILDHANDLER_H
 
 #include "net/guildhandler.h"
-#include "net/messagein.h"
 
-#include "net/ea/gui/guildtab.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace Ea
 {
+class GuildTab;
 
 class GuildHandler : public Net::GuildHandler
 {
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index 74f0a4ba7..3f4eb9228 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -29,6 +29,8 @@
 
 #include "gui/windows/ministatuswindow.h"
 
+#include "net/messagein.h"
+
 #include "net/ea/eaprotocol.h"
 
 #include "debug.h"
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index 6e8ecec38..494b9145a 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -33,11 +33,15 @@
 #include "gui/windows/inventorywindow.h"
 
 #include "net/inventoryhandler.h"
-#include "net/messagein.h"
 
 #include <vector>
 #include <queue>
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp
index 9ce85a59b..383ba2753 100644
--- a/src/net/ea/itemhandler.cpp
+++ b/src/net/ea/itemhandler.cpp
@@ -24,6 +24,8 @@
 
 #include "actormanager.h"
 
+#include "net/messagein.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h
index 6bc23fb10..80c0a4dbf 100644
--- a/src/net/ea/itemhandler.h
+++ b/src/net/ea/itemhandler.h
@@ -25,6 +25,13 @@
 
 #include "net/messagein.h"
 
+#include "localconsts.h"
+
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 57edcefbf..62514b10b 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -32,6 +32,8 @@
 #include "utils/gettext.h"
 #include "utils/paths.h"
 
+#include "net/messagein.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 8fea9d49f..f539176f5 100644
--- a/src/net/ea/loginhandler.h
+++ b/src/net/ea/loginhandler.h
@@ -24,7 +24,6 @@
 #define NET_EA_LOGINHANDLER_H
 
 #include "net/loginhandler.h"
-#include "net/messagein.h"
 
 #include "net/ea/token.h"
 
@@ -32,6 +31,11 @@
 
 class LoginData;
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 70c4ce08a..03def7298 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -24,6 +24,8 @@
 
 #include "gui/windows/npcdialog.h"
 
+#include "net/messagein.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index b8a10bc18..07c281587 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -23,11 +23,17 @@
 #ifndef NET_EA_NPCHANDLER_H
 #define NET_EA_NPCHANDLER_H
 
-#include "net/messagein.h"
 #include "net/npchandler.h"
 
+#include "localconsts.h"
+
 class NpcDialog;
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 98dec750a..7f29f277a 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -25,11 +25,16 @@
 #include "configuration.h"
 #include "notifications.h"
 #include "notifymanager.h"
+#include "party.h"
 
 #include "being/localplayer.h"
 
 #include "gui/windows/socialwindow.h"
 
+#include "net/messagein.h"
+
+#include "net/ea/gui/partytab.h"
+
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index e7ab8f8ef..29f242285 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -22,15 +22,18 @@
 #ifndef NET_EA_PARTYHANDLER_H
 #define NET_EA_PARTYHANDLER_H
 
-#include "net/messagein.h"
 #include "net/partyhandler.h"
 
-#include "net/ea/gui/partytab.h"
+class Party;
 
-#include "party.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace Ea
 {
+class PartyTab;
 
 class PartyHandler : public Net::PartyHandler
 {
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 28f16735c..de376cead 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -41,6 +41,7 @@
 
 #include "resources/db/deaddb.h"
 
+#include "net/messagein.h"
 #include "net/net.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/ea/playerhandler.h b/src/net/ea/playerhandler.h
index 589874e2e..087627f92 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -23,9 +23,13 @@
 #ifndef NET_EA_PLAYERHANDLER_H
 #define NET_EA_PLAYERHANDLER_H
 
-#include "net/messagein.h"
 #include "net/playerhandler.h"
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 3a5a1ab75..fd10a6087 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -33,6 +33,8 @@
 
 #include "utils/stringutils.h"
 
+#include "net/messagein.h"
+
 #include "debug.h"
 
 /** job dependend identifiers (?)  */
diff --git a/src/net/ea/skillhandler.h b/src/net/ea/skillhandler.h
index 8dc724e0a..484ca6878 100644
--- a/src/net/ea/skillhandler.h
+++ b/src/net/ea/skillhandler.h
@@ -23,9 +23,15 @@
 #ifndef NET_EA_SKILLHANDLER_H
 #define NET_EA_SKILLHANDLER_H
 
-#include "net/messagein.h"
 #include "net/skillhandler.h"
 
+#include "localconsts.h"
+
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 4cb424fc9..19e597967 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -34,6 +34,7 @@
 #include "gui/windows/confirmdialog.h"
 #include "gui/windows/tradewindow.h"
 
+#include "net/messagein.h"
 #include "net/net.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index 22a78e9e6..d4c9510b8 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -23,9 +23,13 @@
 #ifndef NET_EA_TRADEHANDLER_H
 #define NET_EA_TRADEHANDLER_H
 
-#include "net/messagein.h"
 #include "net/tradehandler.h"
 
+namespace Net
+{
+    class MessageIn;
+}
+
 namespace Ea
 {
 
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index 61e0a8404..a9d11f563 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -24,8 +24,7 @@
 
 #include "being/localplayer.h"
 
-#include "gui/widgets/tabs/chattab.h"
-
+#include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
 #include <string>
diff --git a/src/net/eathena/chathandler.h b/src/net/eathena/chathandler.h
index 9c6b8ea0c..3efaf2d31 100644
--- a/src/net/eathena/chathandler.h
+++ b/src/net/eathena/chathandler.h
@@ -26,10 +26,10 @@
 #include "net/ea/chathandler.h"
 
 #include "net/eathena/messagehandler.h"
-#include "net/eathena/messageout.h"
 
 namespace EAthena
 {
+class MessageOut;
 
 class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 {
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index ebb5d46d7..3a18dede9 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -33,6 +33,7 @@
 
 #include "net/ea/guildhandler.h"
 
+#include "net/ea/gui/guildtab.h"
 #include "net/ea/gui/partytab.h"
 
 #include "net/eathena/adminhandler.h"
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index 56d4f5aae..0162d82e8 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -24,6 +24,7 @@
 
 #include "logger.h"
 
+#include "net/eathena/messagehandler.h"
 #include "net/eathena/messagein.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/network.h b/src/net/eathena/network.h
index 4c9349f96..fae4f06d5 100644
--- a/src/net/eathena/network.h
+++ b/src/net/eathena/network.h
@@ -25,8 +25,6 @@
 
 #include "net/ea/network.h"
 
-#include "net/eathena/messagehandler.h"
-
 /**
  * Protocol version, reported to the eAthena char and mapserver who can adjust
  * the protocol accordingly.
@@ -35,6 +33,7 @@
 
 namespace EAthena
 {
+class MessageHandler;
 
 class Network final : public Ea::Network
 {
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index fcc650171..cfec2fe81 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -24,6 +24,7 @@
 #include "actormanager.h"
 #include "notifications.h"
 #include "notifymanager.h"
+#include "party.h"
 
 #include "being/localplayer.h"
 
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index af236f00b..d00f12dd3 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -24,8 +24,7 @@
 
 #include "being/localplayer.h"
 
-#include "gui/widgets/tabs/chattab.h"
-
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
 #include <string>
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index a7226c52c..c4f51fec7 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -26,10 +26,10 @@
 #include "net/ea/chathandler.h"
 
 #include "net/tmwa/messagehandler.h"
-#include "net/tmwa/messageout.h"
 
 namespace TmwAthena
 {
+class MessageOut;
 
 class ChatHandler final : public MessageHandler, public Ea::ChatHandler
 {
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 683eb0711..46d1d490f 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -33,6 +33,7 @@
 
 #include "net/ea/guildhandler.h"
 
+#include "net/ea/gui/guildtab.h"
 #include "net/ea/gui/partytab.h"
 
 #include "net/tmwa/adminhandler.h"
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index c91387898..cc94b6161 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -24,6 +24,7 @@
 
 #include "logger.h"
 
+#include "net/tmwa/messagehandler.h"
 #include "net/tmwa/messagein.h"
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 6d05d0e48..bf9381227 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -25,8 +25,6 @@
 
 #include "net/ea/network.h"
 
-#include "net/tmwa/messagehandler.h"
-
 /**
  * Protocol version, reported to the eAthena char and mapserver who can adjust
  * the protocol accordingly.
@@ -36,6 +34,7 @@
 
 namespace TmwAthena
 {
+class MessageHandler;
 
 class Network final : public Ea::Network
 {
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 78d56f669..ba18a9efa 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -24,6 +24,7 @@
 #include "actormanager.h"
 #include "notifications.h"
 #include "notifymanager.h"
+#include "party.h"
 
 #include "being/localplayer.h"
 
diff --git a/src/net/tmwa/pethandler.cpp b/src/net/tmwa/pethandler.cpp
index 6b9e5adb7..3293b7edd 100644
--- a/src/net/tmwa/pethandler.cpp
+++ b/src/net/tmwa/pethandler.cpp
@@ -24,8 +24,7 @@
 
 #include "net/net.h"
 
-#include "net/tmwa/chathandler.h"
-#include "net/tmwa/protocol.h"
+#include "net/chathandler.h"
 
 #include "debug.h"
 
diff --git a/src/net/tradehandler.h b/src/net/tradehandler.h
index 823352239..21ca65e97 100644
--- a/src/net/tradehandler.h
+++ b/src/net/tradehandler.h
@@ -29,6 +29,8 @@
 
 #include "localconsts.h"
 
+class Item;
+
 namespace Net
 {
 class TradeHandler