remove unused includes from net directory.

24 files changed, 14 insertions, 57 deletions

diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index 5e1c188a0..583239f0c 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -23,6 +23,7 @@
 #include "net/ea/adminhandler.h"
 
 #include "net/chathandler.h"
+#include "net/net.h"
 
 #include <string>
 
diff --git a/src/net/ea/adminhandler.h b/src/net/ea/adminhandler.h
index aeaa1154f..f32c02ffd 100644
--- a/src/net/ea/adminhandler.h
+++ b/src/net/ea/adminhandler.h
@@ -24,7 +24,8 @@
 #define NET_EA_ADMINHANDLER_H
 
 #include "net/adminhandler.h"
-#include "net/net.h"
+
+#include "localconsts.h"
 
 namespace Ea
 {
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 20b7b23f6..7702a5a9b 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -29,7 +29,6 @@
 #include "configuration.h"
 #include "effectmanager.h"
 #include "game.h"
-#include "guild.h"
 #include "guildmanager.h"
 #include "party.h"
 
@@ -38,7 +37,6 @@
 
 #include "particle/particle.h"
 
-#include "input/inputmanager.h"
 #include "input/keyboardconfig.h"
 
 #include "gui/botcheckerwindow.h"
@@ -47,16 +45,9 @@
 #include "gui/killstats.h"
 #include "gui/questswindow.h"
 
-#include "utils/gettext.h"
-
-#include "net/playerhandler.h"
-
-#include "resources/colordb.h"
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
-#include <iostream>
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/beinghandler.h b/src/net/ea/beinghandler.h
index 6798726bd..ad57e128e 100644
--- a/src/net/ea/beinghandler.h
+++ b/src/net/ea/beinghandler.h
@@ -24,7 +24,6 @@
 #define NET_EA_BEINGHANDLER_H
 
 #include "net/beinghandler.h"
-#include "net/net.h"
 
 namespace Ea
 {
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 053f54db8..f1eb536fd 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -22,24 +22,24 @@
 
 #include "net/ea/buysellhandler.h"
 
-#include "actorspritemanager.h"
 #include "client.h"
 #include "configuration.h"
 #include "inventory.h"
 #include "notifications.h"
 #include "notifymanager.h"
 
-#include "being/localplayer.h"
 #include "being/playerinfo.h"
 
 #include "gui/buydialog.h"
+#include "gui/chatwindow.h"
 #include "gui/buyselldialog.h"
 #include "gui/selldialog.h"
 #include "gui/shopwindow.h"
 
-#include "gui/widgets/chattab.h"
-
 #include "net/chathandler.h"
+#include "net/net.h"
+
+#include "net/ea/eaprotocol.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/buysellhandler.h b/src/net/ea/buysellhandler.h
index f46a8dcb4..87bed3d83 100644
--- a/src/net/ea/buysellhandler.h
+++ b/src/net/ea/buysellhandler.h
@@ -25,10 +25,6 @@
 
 #include "net/buysellhandler.h"
 
-#include "being/being.h"
-
-#include "net/net.h"
-
 class BuyDialog;
 
 namespace Ea
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index f428aea54..7ff7e6eb8 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -33,6 +33,8 @@
 #include "net/ea/gamehandler.h"
 #include "net/ea/network.h"
 
+#include "net/net.h"
+
 #include "utils/dtor.h"
 #include "utils/gettext.h"
 
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index aeb8d2d09..83da865a1 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -25,9 +25,7 @@
 
 #include "net/charserverhandler.h"
 #include "net/messagein.h"
-#include "net/net.h"
-
-class LoginData;
+#include "net/serverinfo.h"
 
 namespace Ea
 {
diff --git a/src/net/ea/chathandler.h b/src/net/ea/chathandler.h
index 327a708cd..37e0328ce 100644
--- a/src/net/ea/chathandler.h
+++ b/src/net/ea/chathandler.h
@@ -25,8 +25,6 @@
 
 #include "net/chathandler.h"
 #include "net/messagein.h"
-#include "net/messageout.h"
-#include "net/net.h"
 
 #include <queue>
 
diff --git a/src/net/ea/gamehandler.h b/src/net/ea/gamehandler.h
index 5fe74af68..559a9a860 100644
--- a/src/net/ea/gamehandler.h
+++ b/src/net/ea/gamehandler.h
@@ -25,7 +25,6 @@
 
 #include "net/gamehandler.h"
 #include "net/messagein.h"
-#include "net/net.h"
 
 namespace Ea
 {
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 615d0334b..1cfdd7b90 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -28,15 +28,10 @@
 #include "soundconsts.h"
 #include "soundmanager.h"
 
-#include "being/localplayer.h"
-
 #include "net/net.h"
 
 #include "net/ea/guildhandler.h"
 
-#include "resources/iteminfo.h"
-#include "resources/itemdb.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index c41fad098..eb4801cbf 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -23,7 +23,7 @@
 #include "net/ea/gui/partytab.h"
 
 #include "chatlogger.h"
-#include "commandhandler.h"
+#include "commands.h"
 #include "party.h"
 #include "soundconsts.h"
 #include "soundmanager.h"
@@ -33,13 +33,8 @@
 #include "net/net.h"
 #include "net/partyhandler.h"
 
-#include "resources/iteminfo.h"
-#include "resources/itemdb.h"
-
 #include "utils/gettext.h"
 
-#include "net/chathandler.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/itemhandler.h b/src/net/ea/itemhandler.h
index 72f64bfb8..8847090f6 100644
--- a/src/net/ea/itemhandler.h
+++ b/src/net/ea/itemhandler.h
@@ -23,7 +23,6 @@
 #ifndef NET_EA_ITEMHANDLER_H
 #define NET_EA_ITEMHANDLER_H
 
-#include "net/net.h"
 #include "net/messagein.h"
 
 namespace Ea
diff --git a/src/net/ea/loginhandler.h b/src/net/ea/loginhandler.h
index 0d60a7622..e6dadac2e 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/net.h"
 #include "net/messagein.h"
 
 #include "net/ea/token.h"
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 92cbb14f8..01270bcbc 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -25,10 +25,6 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "net/messagehandler.h"
-
-#include "net/eathena/protocol.h"
-
 #include "utils/gettext.h"
 #include "utils/sdlhelper.h"
 
diff --git a/src/net/ea/network.h b/src/net/ea/network.h
index 2f8a1c0d1..81a95566b 100644
--- a/src/net/ea/network.h
+++ b/src/net/ea/network.h
@@ -25,14 +25,10 @@
 
 #include "net/serverinfo.h"
 
-#include "net/messagein.h"
-#include "net/messageout.h"
-
 #include "net/sdltcpnet.h"
 
 #include <SDL_thread.h>
 
-#include <map>
 #include <string>
 
 namespace Ea
diff --git a/src/net/ea/npchandler.h b/src/net/ea/npchandler.h
index 9c50b8c50..714bc594c 100644
--- a/src/net/ea/npchandler.h
+++ b/src/net/ea/npchandler.h
@@ -24,11 +24,8 @@
 #define NET_EA_NPCHANDLER_H
 
 #include "net/messagein.h"
-#include "net/net.h"
 #include "net/npchandler.h"
 
-#include <map>
-
 class NpcDialog;
 
 namespace Ea
diff --git a/src/net/ea/partyhandler.h b/src/net/ea/partyhandler.h
index 5b42f557f..4b829f73e 100644
--- a/src/net/ea/partyhandler.h
+++ b/src/net/ea/partyhandler.h
@@ -23,7 +23,6 @@
 #define NET_EA_PARTYHANDLER_H
 
 #include "net/messagein.h"
-#include "net/net.h"
 #include "net/partyhandler.h"
 
 #include "net/ea/gui/partytab.h"
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index bca770e70..320727e01 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -40,7 +40,7 @@
 
 #include "resources/deaddb.h"
 
-#include "net/npchandler.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 e5135ea3d..219ea17f2 100644
--- a/src/net/ea/playerhandler.h
+++ b/src/net/ea/playerhandler.h
@@ -24,7 +24,6 @@
 #define NET_EA_PLAYERHANDLER_H
 
 #include "net/messagein.h"
-#include "net/net.h"
 #include "net/playerhandler.h"
 
 namespace Ea
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index 9ec815c53..47dc2c2d4 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -31,9 +31,7 @@
 
 #include "gui/skilldialog.h"
 
-#include "gui/widgets/chattab.h"
-
-#include "net/messageout.h"
+#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/skillhandler.h b/src/net/ea/skillhandler.h
index 155f81ba7..54566135e 100644
--- a/src/net/ea/skillhandler.h
+++ b/src/net/ea/skillhandler.h
@@ -24,7 +24,6 @@
 #define NET_EA_SKILLHANDLER_H
 
 #include "net/messagein.h"
-#include "net/net.h"
 #include "net/skillhandler.h"
 
 namespace Ea
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 6fa76eca5..77f71d75a 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -35,6 +35,7 @@
 #include "gui/tradewindow.h"
 
 #include "net/inventoryhandler.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 9abc7e84b..98dbd8383 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -24,7 +24,6 @@
 #define NET_EA_TRADEHANDLER_H
 
 #include "net/messagein.h"
-#include "net/net.h"
 #include "net/tradehandler.h"
 
 namespace Ea