Remove useless includes.

29 files changed, 3 insertions, 89 deletions

diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index 3b7ed813f..ae45d44d6 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -22,22 +22,16 @@
 
 #include "net/tmwa/adminhandler.h"
 
-#include "net/ea/adminhandler.h"
-
 #include "actorspritemanager.h"
-#include "being.h"
 #include "depricatedevent.h"
 #include "game.h"
-#include "logger.h"
 #include "playerrelations.h"
 
 #include "net/chathandler.h"
-#include "net/net.h"
 
 #include "net/tmwa/protocol.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <string>
 
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index dc815bf1c..9a2827ee5 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -23,14 +23,12 @@
 #include "net/tmwa/beinghandler.h"
 
 #include "actorspritemanager.h"
-#include "being.h"
 #include "client.h"
 #include "effectmanager.h"
 #include "guild.h"
 #include "guildmanager.h"
 #include "keyboardconfig.h"
 #include "localplayer.h"
-#include "logger.h"
 #include "party.h"
 #include "playerrelations.h"
 #include "configuration.h"
@@ -41,10 +39,8 @@
 #include "gui/killstats.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "net/playerhandler.h"
-#include "net/net.h"
 
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index aa0a07d9d..5a3877734 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -26,10 +26,8 @@
 #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 +37,6 @@
 #include "gui/widgets/chattab.h"
 
 #include "net/chathandler.h"
-#include "net/messagein.h"
-#include "net/net.h"
 
 #include "net/ea/eaprotocol.h"
 
@@ -52,6 +48,7 @@
 #include "debug.h"
 
 extern Net::BuySellHandler *buySellHandler;
+extern int serverVersion;
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index e4d07511f..69188099f 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -27,10 +27,6 @@
 
 #include "net/ea/buysellhandler.h"
 
-#include "being.h"
-
-#include "net/net.h"
-
 #include "net/tmwa/messagehandler.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 0a660a79d..777abc54e 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -24,13 +24,10 @@
 
 #include "client.h"
 #include "configuration.h"
-#include "logger.h"
 
 #include "gui/charcreatedialog.h"
 
 #include "net/logindata.h"
-#include "net/messagein.h"
-#include "net/net.h"
 
 #include "net/tmwa/gamehandler.h"
 #include "net/tmwa/loginhandler.h"
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 915c6dba5..7a6629237 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -27,8 +27,6 @@
 
 #include "net/ea/charserverhandler.h"
 
-#include "net/serverinfo.h"
-
 #include "net/tmwa/messagehandler.h"
 
 #include "net/ea/token.h"
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 81c7ea5b6..6b695c1ee 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -23,22 +23,17 @@
 #include "net/tmwa/chathandler.h"
 
 #include "actorspritemanager.h"
-#include "being.h"
 #include "configuration.h"
 #include "depricatedevent.h"
 #include "game.h"
 #include "localplayer.h"
 #include "playerrelations.h"
-#include "logger.h"
 
 #include "gui/chatwindow.h"
 #include "gui/shopwindow.h"
 
 #include "gui/widgets/chattab.h"
 
-#include "net/messagein.h"
-#include "net/messageout.h"
-
 #include "net/tmwa/protocol.h"
 
 #include <string>
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index a6096d4d9..15a4477ff 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -23,13 +23,8 @@
 #include "net/tmwa/gamehandler.h"
 
 #include "client.h"
-#include "depricatedevent.h"
 #include "game.h"
 #include "localplayer.h"
-#include "logger.h"
-
-#include "net/messagein.h"
-#include "net/messageout.h"
 
 #include "net/tmwa/loginhandler.h"
 #include "net/tmwa/network.h"
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 455ec3646..8f399d230 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -25,7 +25,6 @@
 
 #include "net/gamehandler.h"
 #include "net/net.h"
-#include "net/serverinfo.h"
 
 #include "net/tmwa/messagehandler.h"
 
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index c5ca7b529..2a38fcefe 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -33,13 +33,8 @@
 #include "gui/socialwindow.h"
 #include "gui/statuswindow.h"
 
-#include "net/messagein.h"
-#include "net/messageout.h"
-#include "net/serverinfo.h"
-
 #include "net/ea/guildhandler.h"
 
-#include "net/ea/gui/guildtab.h"
 #include "net/ea/gui/partytab.h"
 
 #include "net/tmwa/adminhandler.h"
@@ -64,8 +59,6 @@
 #include "net/tmwa/gui/guildtab.h"
 #include "net/tmwa/gui/partytab.h"
 
-#include "resources/itemdb.h"
-
 #include "utils/gettext.h"
 
 #include <list>
diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp
index 496ba64f5..752a33746 100644
--- a/src/net/tmwa/gui/guildtab.cpp
+++ b/src/net/tmwa/gui/guildtab.cpp
@@ -35,9 +35,7 @@
 #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/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp
index 02bcfd54f..40ed53fcf 100644
--- a/src/net/tmwa/gui/partytab.cpp
+++ b/src/net/tmwa/gui/partytab.cpp
@@ -35,9 +35,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/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 8bd8e9754..e57ae8e98 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -23,7 +23,6 @@
 
 #include "actorspritemanager.h"
 #include "localplayer.h"
-#include "logger.h"
 #include "playerinfo.h"
 
 #include "net/tmwa/messagein.h"
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index e1d2d7c29..cb149655c 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -26,8 +26,6 @@
 
 #include "net/ea/guildhandler.h"
 
-#include "net/ea/gui/guildtab.h"
-
 #include "net/tmwa/messagehandler.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 9977df34d..5838bae1c 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -22,10 +22,6 @@
 
 #include "net/tmwa/inventoryhandler.h"
 
-#include "logger.h"
-
-#include "net/messagein.h"
-
 #include "net/tmwa/protocol.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp
index 58c564d77..4e6a9bfa1 100644
--- a/src/net/tmwa/itemhandler.cpp
+++ b/src/net/tmwa/itemhandler.cpp
@@ -22,8 +22,6 @@
 
 #include "net/tmwa/itemhandler.h"
 
-#include "net/messagein.h"
-
 #include "net/tmwa/protocol.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 67c6aa932..d95cbfe54 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -23,10 +23,8 @@
 #include "net/tmwa/loginhandler.h"
 
 #include "client.h"
-#include "logger.h"
 #include "configuration.h"
-
-#include "net/messagein.h"
+#include "logger.h"
 
 #include "net/tmwa/network.h"
 #include "net/tmwa/protocol.h"
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index b27b0af77..ecd9d2428 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -29,8 +29,6 @@
 
 #include "net/tmwa/messagehandler.h"
 
-#include "net/ea/token.h"
-
 #include <string>
 
 class LoginData;
diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h
index 7607e5c80..930fe4858 100644
--- a/src/net/tmwa/messagehandler.h
+++ b/src/net/tmwa/messagehandler.h
@@ -24,7 +24,6 @@
 #define NET_TA_MESSAGEHANDLER_H
 
 #include "net/messagehandler.h"
-#include "net/messagein.h"
 
 #include "net/tmwa/messageout.h"
 
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index 1ceb806be..1c802d3e8 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -28,8 +28,6 @@
 
 #include "logger.h"
 
-#include "utils/stringutils.h"
-
 #include <SDL.h>
 #include <SDL_endian.h>
 
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 0492f6609..aab05c7b9 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -25,13 +25,9 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "net/messagehandler.h"
-#include "net/messagein.h"
-
 #include "net/tmwa/protocol.h"
 
 #include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include <assert.h>
 #include <sstream>
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index b110b7fb9..57fa339e1 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -25,11 +25,8 @@
 
 #include "net/ea/network.h"
 
-#include "net/serverinfo.h"
-
 #include "net/tmwa/messagehandler.h"
 #include "net/tmwa/messagein.h"
-#include "net/tmwa/messageout.h"
 
 #include <SDL_net.h>
 #include <SDL_thread.h>
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 6cd02c6e2..d68a78c8c 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -27,10 +27,6 @@
 #include "gui/npcdialog.h"
 #include "gui/viewport.h"
 
-#include "net/messagein.h"
-#include "net/net.h"
-#include "net/npchandler.h"
-
 #include "net/tmwa/protocol.h"
 
 #include "net/ea/eaprotocol.h"
@@ -40,6 +36,7 @@
 #include "debug.h"
 
 extern Net::NpcHandler *npcHandler;
+extern int serverVersion;
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 74826e5cd..8a59f2a48 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -23,9 +23,6 @@
 
 #include "actorspritemanager.h"
 #include "localplayer.h"
-#include "logger.h"
-
-#include "net/messagein.h"
 
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index eb3f68a70..c4d20b353 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -29,8 +29,6 @@
 
 #include "net/ea/partyhandler.h"
 
-#include "party.h"
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index ce0ce4019..4549234f4 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -24,9 +24,6 @@
 
 #include "configuration.h"
 #include "client.h"
-#include "logger.h"
-
-#include "net/messagein.h"
 
 #include "net/tmwa/protocol.h"
 #include "net/tmwa/npchandler.h"
diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp
index 68ab75806..759037bb5 100644
--- a/src/net/tmwa/questhandler.cpp
+++ b/src/net/tmwa/questhandler.cpp
@@ -24,9 +24,6 @@
 
 #include "gui/questswindow.h"
 
-#include "net/messagein.h"
-#include "net/net.h"
-
 #include "net/tmwa/protocol.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/tmwa/specialhandler.cpp b/src/net/tmwa/specialhandler.cpp
index 8033d7a1d..58424cadc 100644
--- a/src/net/tmwa/specialhandler.cpp
+++ b/src/net/tmwa/specialhandler.cpp
@@ -24,8 +24,6 @@
 
 #include "logger.h"
 
-#include "net/messagein.h"
-
 #include "net/tmwa/protocol.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index f572e6cff..14614e62d 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -23,11 +23,8 @@
 #include "net/tmwa/tradehandler.h"
 
 #include "item.h"
-#include "logger.h"
 #include "playerinfo.h"
 
-#include "net/messagein.h"
-
 #include "net/tmwa/protocol.h"
 
 #include "net/ea/eaprotocol.h"