Remove useless includes.

20 files changed, 6 insertions, 54 deletions

diff --git a/src/net/ea/adminhandler.cpp b/src/net/ea/adminhandler.cpp
index f70be3cc8..3a7501fb6 100644
--- a/src/net/ea/adminhandler.cpp
+++ b/src/net/ea/adminhandler.cpp
@@ -23,7 +23,6 @@
 #include "net/ea/adminhandler.h"
 
 #include "net/chathandler.h"
-#include "net/net.h"
 
 #include <string>
 
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index 765cbc651..5a3ca3cc7 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -25,15 +25,14 @@
 #include "net/ea/eaprotocol.h"
 
 #include "actorspritemanager.h"
-#include "being.h"
 #include "client.h"
 #include "effectmanager.h"
+#include "game.h"
 #include "guild.h"
 #include "guildmanager.h"
 #include "inputmanager.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "logger.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "configuration.h"
@@ -44,10 +43,8 @@
 #include "gui/killstats.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "net/playerhandler.h"
-#include "net/net.h"
 
 #include "resources/colordb.h"
 #include "resources/itemdb.h"
diff --git a/src/net/ea/buysellhandler.cpp b/src/net/ea/buysellhandler.cpp
index 46292bae5..d9080b969 100644
--- a/src/net/ea/buysellhandler.cpp
+++ b/src/net/ea/buysellhandler.cpp
@@ -23,13 +23,12 @@
 #include "net/ea/buysellhandler.h"
 
 #include "actorspritemanager.h"
+#include "client.h"
 #include "configuration.h"
 #include "depricatedevent.h"
 #include "inventory.h"
-#include "item.h"
 #include "localplayer.h"
 #include "playerinfo.h"
-#include "shopitem.h"
 
 #include "gui/buydialog.h"
 #include "gui/buyselldialog.h"
@@ -39,8 +38,6 @@
 #include "gui/widgets/chattab.h"
 
 #include "net/chathandler.h"
-#include "net/messagein.h"
-#include "net/net.h"
 
 #include "utils/gettext.h"
 
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index 942ba79a6..62c9090e9 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -23,13 +23,10 @@
 #include "net/ea/charserverhandler.h"
 
 #include "client.h"
-#include "logger.h"
 
 #include "gui/charcreatedialog.h"
 #include "gui/okdialog.h"
 
-#include "net/net.h"
-
 #include "net/ea/loginhandler.h"
 #include "net/ea/eaprotocol.h"
 
diff --git a/src/net/ea/charserverhandler.h b/src/net/ea/charserverhandler.h
index bec8d2011..c0978157c 100644
--- a/src/net/ea/charserverhandler.h
+++ b/src/net/ea/charserverhandler.h
@@ -26,7 +26,6 @@
 #include "net/charhandler.h"
 #include "net/messagein.h"
 #include "net/net.h"
-#include "net/serverinfo.h"
 
 class LoginData;
 
diff --git a/src/net/ea/chathandler.cpp b/src/net/ea/chathandler.cpp
index d44830644..0ab2c903c 100644
--- a/src/net/ea/chathandler.cpp
+++ b/src/net/ea/chathandler.cpp
@@ -23,12 +23,10 @@
 #include "net/ea/chathandler.h"
 
 #include "actorspritemanager.h"
-#include "being.h"
 #include "configuration.h"
 #include "guildmanager.h"
 #include "localplayer.h"
 #include "playerrelations.h"
-#include "logger.h"
 
 #include "gui/chatwindow.h"
 #include "gui/shopwindow.h"
@@ -36,7 +34,6 @@
 #include "gui/widgets/chattab.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <string>
 
diff --git a/src/net/ea/gamehandler.cpp b/src/net/ea/gamehandler.cpp
index 69f4089ad..1cb105204 100644
--- a/src/net/ea/gamehandler.cpp
+++ b/src/net/ea/gamehandler.cpp
@@ -23,15 +23,11 @@
 #include "net/ea/gamehandler.h"
 
 #include "client.h"
-#include "depricatedevent.h"
 #include "game.h"
 #include "localplayer.h"
-#include "logger.h"
 
 #include "gui/okdialog.h"
 
-#include "net/messagein.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/ea/gui/guildtab.cpp b/src/net/ea/gui/guildtab.cpp
index 3ab6a48eb..b41e69418 100644
--- a/src/net/ea/gui/guildtab.cpp
+++ b/src/net/ea/gui/guildtab.cpp
@@ -34,14 +34,10 @@
 
 #include "net/ea/guildhandler.h"
 
-#include "net/guildhandler.h"
-
 #include "resources/iteminfo.h"
 #include "resources/itemdb.h"
 
-#include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/gui/partytab.cpp b/src/net/ea/gui/partytab.cpp
index 0e3b51928..edbd867d9 100644
--- a/src/net/ea/gui/partytab.cpp
+++ b/src/net/ea/gui/partytab.cpp
@@ -36,9 +36,7 @@
 #include "resources/iteminfo.h"
 #include "resources/itemdb.h"
 
-#include "utils/dtor.h"
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "net/chathandler.h"
 
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 7c2361531..fb14540cb 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -22,10 +22,7 @@
 #include "net/ea/guildhandler.h"
 
 #include "actorspritemanager.h"
-#include "depricatedevent.h"
-#include "guild.h"
 #include "localplayer.h"
-#include "logger.h"
 
 #include "gui/socialwindow.h"
 
diff --git a/src/net/ea/inventoryhandler.cpp b/src/net/ea/inventoryhandler.cpp
index b194afd0d..6a4818129 100644
--- a/src/net/ea/inventoryhandler.cpp
+++ b/src/net/ea/inventoryhandler.cpp
@@ -22,20 +22,18 @@
 
 #include "net/ea/inventoryhandler.h"
 
-#include "inventory.h"
 #include "localplayer.h"
-#include "logger.h"
 
 #include "gui/ministatuswindow.h"
 
-#include "net/messagein.h"
-
 #include "net/ea/eaprotocol.h"
 
 #include "utils/gettext.h"
 
 #include "debug.h"
 
+extern int serverVersion;
+
 const Equipment::Slot EQUIP_POINTS[Equipment::EQUIP_VECTOREND] =
 {
     Equipment::EQUIP_LEGS_SLOT,
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index b868b5dfa..15c2e0994 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -26,14 +26,11 @@
 #include "equipment.h"
 #include "inventory.h"
 #include "localconsts.h"
-#include "logger.h"
 #include "playerinfo.h"
 
 #include "gui/inventorywindow.h"
 
-#include "net/inventoryhandler.h"
 #include "net/messagein.h"
-#include "net/net.h"
 
 #include <vector>
 #include <queue>
diff --git a/src/net/ea/itemhandler.cpp b/src/net/ea/itemhandler.cpp
index dcc17421f..f4954d3d5 100644
--- a/src/net/ea/itemhandler.cpp
+++ b/src/net/ea/itemhandler.cpp
@@ -24,8 +24,6 @@
 
 #include "actorspritemanager.h"
 
-#include "net/messagein.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index 2a7afb189..18cc26351 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -23,8 +23,8 @@
 #include "net/ea/loginhandler.h"
 
 #include "client.h"
-#include "logger.h"
 #include "configuration.h"
+#include "logger.h"
 
 #include "utils/dtor.h"
 #include "utils/gettext.h"
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index ccf126a22..fc50c0971 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -26,12 +26,10 @@
 #include "logger.h"
 
 #include "net/messagehandler.h"
-#include "net/messagein.h"
 
 #include "net/eathena/protocol.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <assert.h>
 #include <sstream>
diff --git a/src/net/ea/npchandler.cpp b/src/net/ea/npchandler.cpp
index 18b0ca39a..9ce72fd96 100644
--- a/src/net/ea/npchandler.cpp
+++ b/src/net/ea/npchandler.cpp
@@ -24,9 +24,6 @@
 
 #include "gui/npcdialog.h"
 
-#include "net/messagein.h"
-#include "net/net.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/partyhandler.cpp b/src/net/ea/partyhandler.cpp
index 68d712db1..fa853bb4b 100644
--- a/src/net/ea/partyhandler.cpp
+++ b/src/net/ea/partyhandler.cpp
@@ -23,14 +23,9 @@
 
 #include "actorspritemanager.h"
 #include "localplayer.h"
-#include "logger.h"
 
 #include "gui/socialwindow.h"
 
-#include "net/messagein.h"
-
-#include "net/ea/gui/partytab.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 130b31046..aa998158c 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -22,10 +22,9 @@
 
 #include "net/ea/playerhandler.h"
 
+#include "game.h"
 #include "localplayer.h"
-#include "logger.h"
 #include "party.h"
-#include "playerinfo.h"
 #include "units.h"
 
 #include "gui/ministatuswindow.h"
@@ -34,7 +33,6 @@
 #include "gui/statuswindow.h"
 #include "gui/viewport.h"
 
-#include "net/messagein.h"
 #include "net/npchandler.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/ea/specialhandler.cpp b/src/net/ea/specialhandler.cpp
index 7a760c5b4..7db3f1b31 100644
--- a/src/net/ea/specialhandler.cpp
+++ b/src/net/ea/specialhandler.cpp
@@ -30,7 +30,6 @@
 
 #include "gui/widgets/chattab.h"
 
-#include "net/messagein.h"
 #include "net/messageout.h"
 
 #include "utils/gettext.h"
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 80104ea67..fb49bdc62 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -33,7 +33,6 @@
 #include "gui/tradewindow.h"
 
 #include "net/inventoryhandler.h"
-#include "net/messagein.h"
 
 #include "net/ea/eaprotocol.h"