improve includes.

6 files changed, 6 insertions, 5 deletions

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"