Remove some useless includes.

103 files changed, 41 insertions, 392 deletions

diff --git a/src/net/beinghandler.h b/src/net/beinghandler.h
index a3c7cc2f6..4e0ac021e 100644
--- a/src/net/beinghandler.h
+++ b/src/net/beinghandler.h
@@ -26,8 +26,6 @@
 
 #include "enums/being/rank.h"
 
-#include "net/messagein.h"
-
 namespace Net
 {
 
diff --git a/src/net/buysellhandler.h b/src/net/buysellhandler.h
index ef089885b..7e7472ce6 100644
--- a/src/net/buysellhandler.h
+++ b/src/net/buysellhandler.h
@@ -23,8 +23,6 @@
 #ifndef NET_BUYSELLHANDLER_H
 #define NET_BUYSELLHANDLER_H
 
-#include "net/messagein.h"
-
 #include "shopitem.h"
 
 namespace Net
diff --git a/src/net/ea/beingrecv.h b/src/net/ea/beingrecv.h
index 9b77ce714..6a6397a4d 100644
--- a/src/net/ea/beingrecv.h
+++ b/src/net/ea/beingrecv.h
@@ -60,7 +60,7 @@ namespace Ea
                        const ItemColor colorId = ItemColor_one,
                        const bool isWeapon = false,
                        const bool isTempSprite = false);
-    }  // namespace Being
+    }  // namespace BeingRecv
 }  // namespace Ea
 
 #endif  // NET_EA_BEINGRECV_H
diff --git a/src/net/ea/buysellrecv.cpp b/src/net/ea/buysellrecv.cpp
index e49305a7f..28c0409f8 100644
--- a/src/net/ea/buysellrecv.cpp
+++ b/src/net/ea/buysellrecv.cpp
@@ -23,6 +23,7 @@
 #include "net/ea/buysellrecv.h"
 
 #include "inventory.h"
+#include "item.h"
 #include "notifymanager.h"
 
 #include "being/playerinfo.h"
@@ -35,7 +36,7 @@
 
 #include "gui/widgets/createwidget.h"
 
-#include "net/buysellhandler.h"
+#include "net/messagein.h"
 
 #include "net/ea/eaprotocol.h"
 
diff --git a/src/net/ea/charserverhandler.cpp b/src/net/ea/charserverhandler.cpp
index c8964b1a1..0983a2007 100644
--- a/src/net/ea/charserverhandler.cpp
+++ b/src/net/ea/charserverhandler.cpp
@@ -22,7 +22,6 @@
 
 #include "net/ea/charserverhandler.h"
 
-#include "net/character.h"
 #include "net/serverinfo.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/ea/inventoryhandler.h b/src/net/ea/inventoryhandler.h
index ffac7e282..313485dd4 100644
--- a/src/net/ea/inventoryhandler.h
+++ b/src/net/ea/inventoryhandler.h
@@ -29,8 +29,6 @@
 
 #include "net/inventoryhandler.h"
 
-#include "net/ea/inventoryitem.h"
-
 #include <queue>
 
 namespace Ea
diff --git a/src/net/ea/inventoryrecv.h b/src/net/ea/inventoryrecv.h
index a55d88716..b6d6dbdce 100644
--- a/src/net/ea/inventoryrecv.h
+++ b/src/net/ea/inventoryrecv.h
@@ -40,10 +40,10 @@ class Inventory;
 
 namespace Ea
 {
-    class EquipBackend;
-
     typedef std::queue<BeingId> PickupQueue;
 
+    class EquipBackend;
+
     namespace InventoryRecv
     {
         extern EquipBackend mEquips;
diff --git a/src/net/ea/loginhandler.cpp b/src/net/ea/loginhandler.cpp
index e87650a29..bf3621c53 100644
--- a/src/net/ea/loginhandler.cpp
+++ b/src/net/ea/loginhandler.cpp
@@ -32,7 +32,6 @@
 #include "net/logindata.h"
 
 #include "net/ea/loginrecv.h"
-#include "net/ea/token.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/loginrecv.cpp b/src/net/ea/loginrecv.cpp
index 6ebfa90c8..37cc96b8b 100644
--- a/src/net/ea/loginrecv.cpp
+++ b/src/net/ea/loginrecv.cpp
@@ -36,8 +36,6 @@
 #include "net/loginhandler.h"
 #include "net/messagein.h"
 
-#include "net/ea/token.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/loginrecv.h b/src/net/ea/loginrecv.h
index 2f2c509a3..57f6e08b0 100644
--- a/src/net/ea/loginrecv.h
+++ b/src/net/ea/loginrecv.h
@@ -27,10 +27,6 @@
 
 #include "net/ea/token.h"
 
-#include <string>
-
-class LoginData;
-
 namespace Net
 {
     class MessageIn;
diff --git a/src/net/ea/network.cpp b/src/net/ea/network.cpp
index 8910beccc..ac938f7bc 100644
--- a/src/net/ea/network.cpp
+++ b/src/net/ea/network.cpp
@@ -29,8 +29,6 @@
 #include "utils/gettext.h"
 #include "utils/sdlhelper.h"
 
-#include "net/packetinfo.h"
-
 #include <sstream>
 
 #include "debug.h"
diff --git a/src/net/ea/playerhandler.cpp b/src/net/ea/playerhandler.cpp
index 70d162cbc..907c6e61e 100644
--- a/src/net/ea/playerhandler.cpp
+++ b/src/net/ea/playerhandler.cpp
@@ -22,10 +22,8 @@
 
 #include "net/ea/playerhandler.h"
 
-#include "game.h"
 #include "party.h"
 #include "notifymanager.h"
-#include "soundmanager.h"
 #include "units.h"
 
 #include "being/localplayer.h"
@@ -33,22 +31,14 @@
 
 #include "enums/resources/notifytypes.h"
 
-#include "gui/viewport.h"
-
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/statuswindow.h"
 
-#include "resources/map/map.h"
-
 #include "net/ea/eaprotocol.h"
 #include "net/ea/playerrecv.h"
 
 #include "debug.h"
 
-// Max. distance we are willing to scroll after a teleport;
-// everything beyond will reset the port hard.
-static const int MAP_TELEPORT_SCROLL_DISTANCE = 8;
-
 namespace Ea
 {
 
diff --git a/src/net/ea/playerrecv.cpp b/src/net/ea/playerrecv.cpp
index cd24559dd..e223cfdbb 100644
--- a/src/net/ea/playerrecv.cpp
+++ b/src/net/ea/playerrecv.cpp
@@ -23,10 +23,8 @@
 #include "net/ea/playerrecv.h"
 
 #include "game.h"
-#include "party.h"
 #include "notifymanager.h"
 #include "soundmanager.h"
-#include "units.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -35,12 +33,12 @@
 
 #include "gui/viewport.h"
 
-#include "gui/windows/skilldialog.h"
 #include "gui/windows/statuswindow.h"
 
 #include "resources/map/map.h"
 
-#include "net/ea/eaprotocol.h"
+#include "net/messagein.h"
+#include "net/playerhandler.h"
 
 #include "debug.h"
 
diff --git a/src/net/ea/playerrecv.h b/src/net/ea/playerrecv.h
index ec1d20685..35ef92d4a 100644
--- a/src/net/ea/playerrecv.h
+++ b/src/net/ea/playerrecv.h
@@ -23,8 +23,6 @@
 #ifndef NET_EA_PLAYERRECV_H
 #define NET_EA_PLAYERRECV_H
 
-#include "net/playerhandler.h"
-
 #include <climits>
 
 namespace Net
@@ -45,6 +43,7 @@ namespace Ea
         void processPlayerArrowMessage(Net::MessageIn &msg);
         void processMapMusic(Net::MessageIn &msg);
     }  // namespace PlayerRecv
+
     static const int NoStat = INT_MAX;
 }  // namespace Ea
 
diff --git a/src/net/ea/skillhandler.cpp b/src/net/ea/skillhandler.cpp
index c5ce14cdf..ff121bf4a 100644
--- a/src/net/ea/skillhandler.cpp
+++ b/src/net/ea/skillhandler.cpp
@@ -22,12 +22,6 @@
 
 #include "net/ea/skillhandler.h"
 
-#include "being/playerinfo.h"
-
-#include "gui/windows/skilldialog.h"
-
-#include "net/messagein.h"
-
 #include "debug.h"
 
 namespace Ea
diff --git a/src/net/ea/skillrecv.h b/src/net/ea/skillrecv.h
index a980d9739..f968f0f36 100644
--- a/src/net/ea/skillrecv.h
+++ b/src/net/ea/skillrecv.h
@@ -23,8 +23,6 @@
 #ifndef NET_EA_SKILLRECV_H
 #define NET_EA_SKILLRECV_H
 
-#include "net/skillhandler.h"
-
 #include "localconsts.h"
 
 namespace Net
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 9329844c9..e82f29dc2 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -22,28 +22,10 @@
 
 #include "net/ea/tradehandler.h"
 
-#include "notifymanager.h"
-
-#include "being/playerinfo.h"
-#include "being/playerrelation.h"
-
-#include "enums/resources/notifytypes.h"
-
-#include "gui/windows/tradewindow.h"
-
-#include "gui/widgets/createwidget.h"
-
-#include "net/messagein.h"
-
-#include "utils/gettext.h"
-#include "utils/stringutils.h"
-
 #include "listeners/requesttradelistener.h"
 
 #include "debug.h"
 
-extern std::string tradePartnerName;
-
 /**
  * Listener for request trade dialogs
  */
diff --git a/src/net/ea/traderecv.h b/src/net/ea/traderecv.h
index 2d388a135..e1abdb433 100644
--- a/src/net/ea/traderecv.h
+++ b/src/net/ea/traderecv.h
@@ -23,7 +23,13 @@
 #ifndef NET_EA_TRADERECV_H
 #define NET_EA_TRADERECV_H
 
-#include "net/tradehandler.h"
+#if defined(__GXX_EXPERIMENTAL_CXX0X__)
+#include <cstdint>
+#else
+#include <stdint.h>
+#endif
+
+#include <string>
 
 namespace Net
 {
@@ -39,7 +45,7 @@ namespace Ea
         void processTradeComplete(Net::MessageIn &msg);
         void processTradeRequestContinue(const std::string &partner);
         void processTradeResponseContinue(const uint8_t type);
-    } // namespace TradeRecv
+    }  // namespace TradeRecv
 }  // namespace Ea
 
 #endif  // NET_EA_TRADERECV_H
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index b9d6a81bc..abb15365f 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -24,9 +24,6 @@
 
 #include "being/being.h"
 
-#include "net/ea/adminrecv.h"
-
-#include "net/eathena/adminrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/auctionhandler.cpp b/src/net/eathena/auctionhandler.cpp
index 154ccaa35..742253423 100644
--- a/src/net/eathena/auctionhandler.cpp
+++ b/src/net/eathena/auctionhandler.cpp
@@ -24,7 +24,6 @@
 
 #include "net/ea/eaprotocol.h"
 
-#include "net/eathena/auctionrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/bankhandler.cpp b/src/net/eathena/bankhandler.cpp
index 94535474c..1ff63fe1f 100644
--- a/src/net/eathena/bankhandler.cpp
+++ b/src/net/eathena/bankhandler.cpp
@@ -20,7 +20,6 @@
 
 #include "net/eathena/bankhandler.h"
 
-#include "net/eathena/bankrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/battlegroundhandler.cpp b/src/net/eathena/battlegroundhandler.cpp
index 997338659..544f51f76 100644
--- a/src/net/eathena/battlegroundhandler.cpp
+++ b/src/net/eathena/battlegroundhandler.cpp
@@ -20,7 +20,6 @@
 
 #include "net/eathena/battlegroundhandler.h"
 
-#include "net/eathena/battlegroundrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/battlegroundrecv.h b/src/net/eathena/battlegroundrecv.h
index 912580203..20b0c6ebf 100644
--- a/src/net/eathena/battlegroundrecv.h
+++ b/src/net/eathena/battlegroundrecv.h
@@ -40,7 +40,7 @@ namespace EAthena
         void processBattleBegins(Net::MessageIn &msg);
         void processBattleNoticeDelete(Net::MessageIn &msg);
         void processBattleJoined(Net::MessageIn &msg);
-    }  // namespace BattleGround
+    }  // namespace BattleGroundRecv
 }  // namespace EAthena
 
 #endif  // EATHENA_SUPPORT
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index cad80eac9..683f5ec0d 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -22,9 +22,6 @@
 
 #include "net/eathena/beinghandler.h"
 
-#include "net/ea/beingrecv.h"
-
-#include "net/eathena/beingrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 #include "net/eathena/sprite.h"
diff --git a/src/net/eathena/buyingstorehandler.cpp b/src/net/eathena/buyingstorehandler.cpp
index d3b411a67..e59954968 100644
--- a/src/net/eathena/buyingstorehandler.cpp
+++ b/src/net/eathena/buyingstorehandler.cpp
@@ -27,7 +27,6 @@
 
 #include "net/ea/eaprotocol.h"
 
-#include "net/eathena/buyingstorerecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp
index b4cd56fc6..7de9b1bdb 100644
--- a/src/net/eathena/buysellhandler.cpp
+++ b/src/net/eathena/buysellhandler.cpp
@@ -24,7 +24,6 @@
 
 #include "net/ea/buysellrecv.h"
 
-#include "net/eathena/buysellrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/cashshoprecv.cpp b/src/net/eathena/cashshoprecv.cpp
index 3cf22fcec..c0b339ac1 100644
--- a/src/net/eathena/cashshoprecv.cpp
+++ b/src/net/eathena/cashshoprecv.cpp
@@ -20,8 +20,6 @@
 
 #include "net/eathena/cashshoprecv.h"
 
-#include "logger.h"
-
 #include "being/playerinfo.h"
 
 #include "gui/windows/buydialog.h"
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 634283a8e..4a0010529 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -29,8 +29,6 @@
 
 #include "net/ea/token.h"
 
-#include "net/ea/charserverrecv.h"
-
 #include "net/eathena/charserverrecv.h"
 #include "net/eathena/loginhandler.h"
 #include "net/eathena/messageout.h"
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 2b908e794..62be4a694 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -38,8 +38,6 @@
 
 #include "net/ea/token.h"
 
-#include "net/messagein.h"
-
 #include "net/eathena/gamehandler.h"
 #include "net/eathena/loginhandler.h"
 #include "net/eathena/messageout.h"
diff --git a/src/net/eathena/charserverrecv.h b/src/net/eathena/charserverrecv.h
index b98885be4..3b03bf324 100644
--- a/src/net/eathena/charserverrecv.h
+++ b/src/net/eathena/charserverrecv.h
@@ -29,8 +29,9 @@
 
 namespace Net
 {
-    class Character;
     class MessageIn;
+
+    struct Character;
 }
 
 namespace EAthena
diff --git a/src/net/eathena/elementalhandler.cpp b/src/net/eathena/elementalhandler.cpp
index e23758647..96413e3ce 100644
--- a/src/net/eathena/elementalhandler.cpp
+++ b/src/net/eathena/elementalhandler.cpp
@@ -20,9 +20,6 @@
 
 #include "net/eathena/elementalhandler.h"
 
-#include "net/eathena/elementalrecv.h"
-#include "net/eathena/protocol.h"
-
 #include "debug.h"
 
 extern Net::ElementalHandler *elementalHandler;
diff --git a/src/net/eathena/friendshandler.cpp b/src/net/eathena/friendshandler.cpp
index 844c292f1..1e13b196e 100644
--- a/src/net/eathena/friendshandler.cpp
+++ b/src/net/eathena/friendshandler.cpp
@@ -20,7 +20,6 @@
 
 #include "net/eathena/friendshandler.h"
 
-#include "net/eathena/friendsrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/gamehandler.cpp b/src/net/eathena/gamehandler.cpp
index 5cdec491f..9c23c1435 100644
--- a/src/net/eathena/gamehandler.cpp
+++ b/src/net/eathena/gamehandler.cpp
@@ -32,7 +32,6 @@
 
 #include "net/ea/gamerecv.h"
 
-#include "net/eathena/gamerecv.h"
 #include "net/eathena/loginhandler.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/network.h"
diff --git a/src/net/eathena/generalhandler.cpp b/src/net/eathena/generalhandler.cpp
index ba3c0aadb..ecfa7eeda 100644
--- a/src/net/eathena/generalhandler.cpp
+++ b/src/net/eathena/generalhandler.cpp
@@ -32,8 +32,6 @@
 #include "gui/widgets/tabs/chat/guildtab.h"
 #include "gui/widgets/tabs/chat/partytab.h"
 
-#include "net/eathena/generalrecv.h"
-
 #include "net/eathena/adminhandler.h"
 #include "net/eathena/auctionhandler.h"
 #include "net/eathena/bankhandler.h"
@@ -62,7 +60,6 @@
 #include "net/eathena/partyhandler.h"
 #include "net/eathena/pethandler.h"
 #include "net/eathena/playerhandler.h"
-#include "net/eathena/protocol.h"
 #include "net/eathena/roulettehandler.h"
 #include "net/eathena/searchstorehandler.h"
 #include "net/eathena/serverfeatures.h"
diff --git a/src/net/eathena/generalhandler.h b/src/net/eathena/generalhandler.h
index d8f23a4c6..8806f105b 100644
--- a/src/net/eathena/generalhandler.h
+++ b/src/net/eathena/generalhandler.h
@@ -63,8 +63,6 @@ class RouletteHandler;
 class SearchStoreHandler;
 class VendingHandler;
 
-class ServerFeatures;
-
 class GeneralHandler final : public Net::GeneralHandler
 {
     public:
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 27a4183c0..98adedbc4 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -28,7 +28,6 @@
 
 #include "net/ea/guildrecv.h"
 
-#include "net/eathena/guildrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/guildrecv.cpp b/src/net/eathena/guildrecv.cpp
index 65b3309a3..fd8a938ad 100644
--- a/src/net/eathena/guildrecv.cpp
+++ b/src/net/eathena/guildrecv.cpp
@@ -22,7 +22,6 @@
 #include "net/eathena/guildrecv.h"
 
 #include "configuration.h"
-#include "guild.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
diff --git a/src/net/eathena/homunculushandler.cpp b/src/net/eathena/homunculushandler.cpp
index c29149f44..359b0a856 100644
--- a/src/net/eathena/homunculushandler.cpp
+++ b/src/net/eathena/homunculushandler.cpp
@@ -24,7 +24,6 @@
 
 #include "net/serverfeatures.h"
 
-#include "net/eathena/homunculusrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 4b24479d2..dd5c655b3 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -26,8 +26,6 @@
 
 #include "enums/equipslot.h"
 
-#include "net/ea/inventoryrecv.h"
-
 #include "net/eathena/inventoryrecv.h"
 #include "net/eathena/menu.h"
 #include "net/eathena/messageout.h"
diff --git a/src/net/eathena/itemhandler.cpp b/src/net/eathena/itemhandler.cpp
index 8f3ceee41..5eb88677f 100644
--- a/src/net/eathena/itemhandler.cpp
+++ b/src/net/eathena/itemhandler.cpp
@@ -22,11 +22,6 @@
 
 #include "net/eathena/itemhandler.h"
 
-#include "net/ea/itemrecv.h"
-
-#include "net/eathena/itemrecv.h"
-#include "net/eathena/protocol.h"
-
 #include "debug.h"
 
 namespace EAthena
diff --git a/src/net/eathena/loginhandler.cpp b/src/net/eathena/loginhandler.cpp
index 2b90965ff..52435cf24 100644
--- a/src/net/eathena/loginhandler.cpp
+++ b/src/net/eathena/loginhandler.cpp
@@ -27,9 +27,6 @@
 #include "net/generalhandler.h"
 #include "net/serverfeatures.h"
 
-#include "net/ea/loginrecv.h"
-
-#include "net/eathena/loginrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/network.h"
 #include "net/eathena/protocol.h"
diff --git a/src/net/eathena/mailhandler.cpp b/src/net/eathena/mailhandler.cpp
index 3561f3e6a..8ab0fc9d8 100644
--- a/src/net/eathena/mailhandler.cpp
+++ b/src/net/eathena/mailhandler.cpp
@@ -22,7 +22,6 @@
 
 #include "net/ea/eaprotocol.h"
 
-#include "net/eathena/mailrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/mailhandler.h b/src/net/eathena/mailhandler.h
index 8f4b272a5..a29531baf 100644
--- a/src/net/eathena/mailhandler.h
+++ b/src/net/eathena/mailhandler.h
@@ -25,7 +25,6 @@
 
 namespace EAthena
 {
-class MessageOut;
 
 class MailHandler final : public Net::MailHandler
 {
diff --git a/src/net/eathena/maphandler.cpp b/src/net/eathena/maphandler.cpp
index 0616e3e1f..7f6a6d23a 100644
--- a/src/net/eathena/maphandler.cpp
+++ b/src/net/eathena/maphandler.cpp
@@ -20,9 +20,6 @@
 
 #include "net/eathena/maphandler.h"
 
-#include "net/eathena/maprecv.h"
-#include "net/eathena/protocol.h"
-
 #include "debug.h"
 
 extern Net::MapHandler *mapHandler;
diff --git a/src/net/eathena/mercenaryhandler.cpp b/src/net/eathena/mercenaryhandler.cpp
index 8f6ca2d39..a7b9c957c 100644
--- a/src/net/eathena/mercenaryhandler.cpp
+++ b/src/net/eathena/mercenaryhandler.cpp
@@ -24,7 +24,6 @@
 
 #include "net/serverfeatures.h"
 
-#include "net/eathena/mercenaryrecv.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index a45b720b6..2842760a7 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -78,9 +78,6 @@
 #include "net/eathena/vendingrecv.h"
 
 #include "net/eathena/messagein.h"
-#include "net/eathena/protocol.h"
-
-#include "utils/delete2.h"
 
 #include "debug.h"
 
diff --git a/src/net/eathena/npchandler.cpp b/src/net/eathena/npchandler.cpp
index f8e8c1249..00afb763b 100644
--- a/src/net/eathena/npchandler.cpp
+++ b/src/net/eathena/npchandler.cpp
@@ -34,7 +34,6 @@
 #include "net/ea/npcrecv.h"
 
 #include "net/eathena/messageout.h"
-#include "net/eathena/npcrecv.h"
 #include "net/eathena/protocol.h"
 
 #include "debug.h"
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index ea672e11a..18c0c3517 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -32,7 +32,6 @@
 #include "net/ea/partyrecv.h"
 
 #include "net/eathena/messageout.h"
-#include "net/eathena/partyrecv.h"
 #include "net/eathena/protocol.h"
 
 #include "debug.h"
diff --git a/src/net/eathena/pethandler.cpp b/src/net/eathena/pethandler.cpp
index 729c0704d..8a005d265 100644
--- a/src/net/eathena/pethandler.cpp
+++ b/src/net/eathena/pethandler.cpp
@@ -25,7 +25,6 @@
 #include "net/serverfeatures.h"
 
 #include "net/eathena/messageout.h"
-#include "net/eathena/petrecv.h"
 #include "net/eathena/protocol.h"
 
 #include "debug.h"
diff --git a/src/net/eathena/playerhandler.cpp b/src/net/eathena/playerhandler.cpp
index 7c4bab97a..28fa63a27 100644
--- a/src/net/eathena/playerhandler.cpp
+++ b/src/net/eathena/playerhandler.cpp
@@ -22,32 +22,12 @@
 
 #include "net/eathena/playerhandler.h"
 
-#include "configuration.h"
-#include "game.h"
-#include "notifymanager.h"
-
-#include "being/beingflag.h"
-#include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "enums/resources/notifytypes.h"
-
-#include "gui/onlineplayer.h"
-
-#include "gui/windows/statuswindow.h"
-#include "gui/windows/whoisonline.h"
-
-#include "input/inputmanager.h"
-
-#include "net/ea/playerrecv.h"
-
 #include "net/eathena/messageout.h"
-#include "net/eathena/playerrecv.h"
 #include "net/eathena/protocol.h"
 #include "net/eathena/inventoryhandler.h"
 
-#include "resources/map/map.h"
-
 #include "debug.h"
 
 extern Net::PlayerHandler *playerHandler;
diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp
index 778cb7579..fbde1fb2f 100644
--- a/src/net/eathena/playerrecv.cpp
+++ b/src/net/eathena/playerrecv.cpp
@@ -39,9 +39,7 @@
 
 #include "input/inputmanager.h"
 
-#include "net/eathena/messageout.h"
-#include "net/eathena/protocol.h"
-#include "net/eathena/inventoryhandler.h"
+#include "net/messagein.h"
 
 #include "resources/map/map.h"
 
diff --git a/src/net/eathena/playerrecv.h b/src/net/eathena/playerrecv.h
index 76769629f..242e62838 100644
--- a/src/net/eathena/playerrecv.h
+++ b/src/net/eathena/playerrecv.h
@@ -23,7 +23,10 @@
 #ifndef NET_EATHENA_PLAYERRECV_H
 #define NET_EATHENA_PLAYERRECV_H
 
-#include "net/ea/playerhandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace EAthena
 {
diff --git a/src/net/eathena/questhandler.cpp b/src/net/eathena/questhandler.cpp
index 8d92a698e..f1c77aa1a 100644
--- a/src/net/eathena/questhandler.cpp
+++ b/src/net/eathena/questhandler.cpp
@@ -20,14 +20,8 @@
 
 #include "net/eathena/questhandler.h"
 
-#include "gui/windows/skilldialog.h"
-#include "gui/windows/questswindow.h"
-
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
-#include "net/eathena/questrecv.h"
-
-#include "resources/skillconsts.h"
 
 #include "debug.h"
 
diff --git a/src/net/eathena/questrecv.cpp b/src/net/eathena/questrecv.cpp
index e89fb83c5..e2af6cc6b 100644
--- a/src/net/eathena/questrecv.cpp
+++ b/src/net/eathena/questrecv.cpp
@@ -25,9 +25,6 @@
 
 #include "net/messagein.h"
 
-#include "net/eathena/messageout.h"
-#include "net/eathena/protocol.h"
-
 #include "resources/skillconsts.h"
 
 #include "debug.h"
diff --git a/src/net/eathena/questrecv.h b/src/net/eathena/questrecv.h
index 48a1a7782..78697b983 100644
--- a/src/net/eathena/questrecv.h
+++ b/src/net/eathena/questrecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_QUESTRECV_H
 #define NET_EATHENA_QUESTRECV_H
 
-#include "net/questhandler.h"
-
 namespace Net
 {
     class MessageIn;
diff --git a/src/net/eathena/roulettehandler.cpp b/src/net/eathena/roulettehandler.cpp
index 0518e99ad..54a4c05f8 100644
--- a/src/net/eathena/roulettehandler.cpp
+++ b/src/net/eathena/roulettehandler.cpp
@@ -20,11 +20,6 @@
 
 #include "net/eathena/roulettehandler.h"
 
-#include "logger.h"
-
-#include "net/eathena/protocol.h"
-#include "net/eathena/rouletterecv.h"
-
 #include "debug.h"
 
 extern Net::RouletteHandler *rouletteHandler;
diff --git a/src/net/eathena/rouletterecv.cpp b/src/net/eathena/rouletterecv.cpp
index a9c099473..b3f419f54 100644
--- a/src/net/eathena/rouletterecv.cpp
+++ b/src/net/eathena/rouletterecv.cpp
@@ -24,8 +24,6 @@
 
 #include "net/messagein.h"
 
-#include "net/eathena/protocol.h"
-
 #include "debug.h"
 
 namespace EAthena
diff --git a/src/net/eathena/rouletterecv.h b/src/net/eathena/rouletterecv.h
index db336ef10..9fb5b962a 100644
--- a/src/net/eathena/rouletterecv.h
+++ b/src/net/eathena/rouletterecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_ROULETTERECV_H
 #define NET_EATHENA_ROULETTERECV_H
 
-#include "net/roulettehandler.h"
-
 namespace Net
 {
     class MessageIn;
diff --git a/src/net/eathena/searchstorehandler.cpp b/src/net/eathena/searchstorehandler.cpp
index 8a170cb5d..871807f62 100644
--- a/src/net/eathena/searchstorehandler.cpp
+++ b/src/net/eathena/searchstorehandler.cpp
@@ -20,14 +20,8 @@
 
 #include "net/eathena/searchstorehandler.h"
 
-#include "logger.h"
-#include "notifymanager.h"
-
-#include "enums/resources/notifytypes.h"
-
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
-#include "net/eathena/searchstorerecv.h"
 
 #include "debug.h"
 
diff --git a/src/net/eathena/searchstorerecv.cpp b/src/net/eathena/searchstorerecv.cpp
index cba23cdfc..d6545fdea 100644
--- a/src/net/eathena/searchstorerecv.cpp
+++ b/src/net/eathena/searchstorerecv.cpp
@@ -27,9 +27,6 @@
 
 #include "net/messagein.h"
 
-#include "net/eathena/messageout.h"
-#include "net/eathena/protocol.h"
-
 #include "debug.h"
 
 namespace EAthena
diff --git a/src/net/eathena/searchstorerecv.h b/src/net/eathena/searchstorerecv.h
index 50005530b..a18a6a17d 100644
--- a/src/net/eathena/searchstorerecv.h
+++ b/src/net/eathena/searchstorerecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_SEARCHSTORERECV_H
 #define NET_EATHENA_SEARCHSTORERECV_H
 
-#include "net/searchstorehandler.h"
-
 namespace Net
 {
     class MessageIn;
diff --git a/src/net/eathena/skillhandler.cpp b/src/net/eathena/skillhandler.cpp
index a1e29df53..82eab62c7 100644
--- a/src/net/eathena/skillhandler.cpp
+++ b/src/net/eathena/skillhandler.cpp
@@ -22,26 +22,8 @@
 
 #include "net/eathena/skillhandler.h"
 
-#include "notifymanager.h"
-
-#include "being/localplayer.h"
-#include "being/playerinfo.h"
-
-#include "enums/resources/notifytypes.h"
-
-#include "gui/widgets/skillinfo.h"
-
-#include "gui/windows/skilldialog.h"
-
-#include "net/ea/skillrecv.h"
-
-#include "net/eathena/menu.h"
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
-#include "net/eathena/skillrecv.h"
-
-#include "utils/gettext.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/net/eathena/skillrecv.cpp b/src/net/eathena/skillrecv.cpp
index 9a36d5db5..faf72c478 100644
--- a/src/net/eathena/skillrecv.cpp
+++ b/src/net/eathena/skillrecv.cpp
@@ -38,9 +38,6 @@
 #include "net/ea/skillrecv.h"
 
 #include "net/eathena/menu.h"
-#include "net/eathena/messageout.h"
-#include "net/eathena/protocol.h"
-#include "net/eathena/skillrecv.h"
 
 #include "utils/gettext.h"
 #include "utils/stringutils.h"
diff --git a/src/net/eathena/skillrecv.h b/src/net/eathena/skillrecv.h
index a968910de..56dbb1100 100644
--- a/src/net/eathena/skillrecv.h
+++ b/src/net/eathena/skillrecv.h
@@ -23,8 +23,6 @@
 #ifndef NET_EATHENA_SKILLRECV_H
 #define NET_EATHENA_SKILLRECV_H
 
-#include "net/ea/skillhandler.h"
-
 namespace Net
 {
     class MessageIn;
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index d0dfe207f..8a59b6739 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -22,19 +22,10 @@
 
 #include "net/eathena/tradehandler.h"
 
-#include "inventory.h"
 #include "item.h"
-#include "itemcolormanager.h"
-#include "notifymanager.h"
 
 #include "being/playerinfo.h"
 
-#include "enums/resources/notifytypes.h"
-
-#include "gui/windows/tradewindow.h"
-
-#include "net/ea/traderecv.h"
-
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 #include "net/eathena/traderecv.h"
diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h
index 96029fdd2..844445617 100644
--- a/src/net/eathena/tradehandler.h
+++ b/src/net/eathena/tradehandler.h
@@ -25,11 +25,6 @@
 
 #include "net/ea/tradehandler.h"
 
-namespace Net
-{
-    class MessageIn;
-}
-
 namespace EAthena
 {
 
diff --git a/src/net/eathena/traderecv.cpp b/src/net/eathena/traderecv.cpp
index b9ec536e9..0c922f93b 100644
--- a/src/net/eathena/traderecv.cpp
+++ b/src/net/eathena/traderecv.cpp
@@ -35,16 +35,10 @@
 
 #include "net/messagein.h"
 
-#include "net/ea/eaprotocol.h"
 #include "net/ea/traderecv.h"
 
-#include "net/eathena/messageout.h"
-#include "net/eathena/protocol.h"
-
 #include "debug.h"
 
-extern Net::TradeHandler *tradeHandler;
-
 namespace EAthena
 {
 
diff --git a/src/net/eathena/traderecv.h b/src/net/eathena/traderecv.h
index 9599cc3a0..33f21025e 100644
--- a/src/net/eathena/traderecv.h
+++ b/src/net/eathena/traderecv.h
@@ -23,8 +23,6 @@
 #ifndef NET_EATHENA_TRADERECV_H
 #define NET_EATHENA_TRADERECV_H
 
-#include "net/ea/tradehandler.h"
-
 namespace Net
 {
     class MessageIn;
diff --git a/src/net/eathena/vendinghandler.cpp b/src/net/eathena/vendinghandler.cpp
index d8a3f72b7..f56ad677c 100644
--- a/src/net/eathena/vendinghandler.cpp
+++ b/src/net/eathena/vendinghandler.cpp
@@ -20,22 +20,11 @@
 
 #include "net/eathena/vendinghandler.h"
 
-#include "actormanager.h"
-#include "itemcolormanager.h"
 #include "shopitem.h"
 
-#include "being/localplayer.h"
+#include "being/being.h"
 #include "being/playerinfo.h"
 
-#include "gui/windows/buydialog.h"
-
-#include "gui/widgets/createwidget.h"
-
-#include "listeners/vendingmodelistener.h"
-#include "listeners/vendingslotslistener.h"
-
-#include "net/messagein.h"
-
 #include "net/ea/eaprotocol.h"
 
 #include "net/eathena/messageout.h"
diff --git a/src/net/eathena/vendinghandler.h b/src/net/eathena/vendinghandler.h
index b08a7a292..912162c77 100644
--- a/src/net/eathena/vendinghandler.h
+++ b/src/net/eathena/vendinghandler.h
@@ -23,8 +23,6 @@
 
 #include "net/vendinghandler.h"
 
-class BuyDialog;
-
 namespace EAthena
 {
 class VendingHandler final : public Net::VendingHandler
diff --git a/src/net/eathena/vendingrecv.cpp b/src/net/eathena/vendingrecv.cpp
index 6195b2724..567cc8177 100644
--- a/src/net/eathena/vendingrecv.cpp
+++ b/src/net/eathena/vendingrecv.cpp
@@ -36,11 +36,6 @@
 
 #include "net/messagein.h"
 
-#include "net/ea/eaprotocol.h"
-
-#include "net/eathena/messageout.h"
-#include "net/eathena/protocol.h"
-
 #include "debug.h"
 
 namespace EAthena
diff --git a/src/net/eathena/vendingrecv.h b/src/net/eathena/vendingrecv.h
index 815b18329..86c30fad2 100644
--- a/src/net/eathena/vendingrecv.h
+++ b/src/net/eathena/vendingrecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_EATHENA_VENDINGRECV_H
 #define NET_EATHENA_VENDINGRECV_H
 
-#include "net/vendinghandler.h"
-
 class BuyDialog;
 
 namespace Net
diff --git a/src/net/net.cpp b/src/net/net.cpp
index e706680de..9b31499dd 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -66,7 +66,6 @@ namespace Net
     class GameHandler;
     class GuildHandler;
     class InventoryHandler;
-    class ItemHandler;
     class NpcHandler;
     class PartyHandler;
     class PetHandler;
diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index fa2f012f1..fe2151df0 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -26,8 +26,6 @@
 
 #include "net/chathandler.h"
 
-#include "net/ea/adminrecv.h"
-
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 7fa28ce2b..3bc0f0175 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -25,11 +25,6 @@
 
 #include "net/ea/adminhandler.h"
 
-namespace Net
-{
-    class MessageIn;
-}
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index b3529b53c..fd334b712 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -22,9 +22,6 @@
 
 #include "net/tmwa/beinghandler.h"
 
-#include "net/ea/beingrecv.h"
-
-#include "net/tmwa/beingrecv.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 #include "net/tmwa/sprite.h"
diff --git a/src/net/tmwa/beingrecv.cpp b/src/net/tmwa/beingrecv.cpp
index d77a4bffa..1dfa00e08 100644
--- a/src/net/tmwa/beingrecv.cpp
+++ b/src/net/tmwa/beingrecv.cpp
@@ -37,9 +37,10 @@
 #include "gui/windows/socialwindow.h"
 
 #include "net/beinghandler.h"
-#include "net/messagein.h"
 #include "net/serverfeatures.h"
 
+#include "net/messagein.h"
+
 #include "net/ea/beingrecv.h"
 
 #include "net/tmwa/guildmanager.h"
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index b2582a595..144b70379 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -31,9 +31,6 @@
 
 #include "net/ea/buysellrecv.h"
 
-#include "net/tmwa/buysellrecv.h"
-#include "net/tmwa/protocol.h"
-
 #include "utils/timer.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/buysellrecv.cpp b/src/net/tmwa/buysellrecv.cpp
index 52f04cac2..c5d28f35e 100644
--- a/src/net/tmwa/buysellrecv.cpp
+++ b/src/net/tmwa/buysellrecv.cpp
@@ -32,7 +32,7 @@
 
 #include "gui/widgets/createwidget.h"
 
-#include "net/buysellhandler.h"
+#include "net/messagein.h"
 
 #include "net/ea/buysellrecv.h"
 
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 487e0bbfc..76e428156 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -30,9 +30,6 @@
 
 #include "net/ea/token.h"
 
-#include "net/ea/charserverrecv.h"
-
-#include "net/tmwa/charserverrecv.h"
 #include "net/tmwa/loginhandler.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/network.h"
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index a3071c1a5..5ec871685 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -30,7 +30,6 @@
 
 #include "net/ea/chatrecv.h"
 
-#include "net/tmwa/chatrecv.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/chatrecv.cpp b/src/net/tmwa/chatrecv.cpp
index 561511041..a768dab2e 100644
--- a/src/net/tmwa/chatrecv.cpp
+++ b/src/net/tmwa/chatrecv.cpp
@@ -43,7 +43,6 @@
 #include "net/messagein.h"
 
 #include "net/tmwa/guildmanager.h"
-#include "net/tmwa/protocol.h"
 
 #include "debug.h"
 
@@ -123,7 +122,6 @@ void ChatRecv::processChatContinue(std::string chatMsg,
 void ChatRecv::processGmChat(Net::MessageIn &msg)
 {
     BLOCK_START("ChatRecv::processChat")
-    const bool normalChat = msg.getId() == SMSG_PLAYER_CHAT;
     int chatMsgLength = msg.readInt16("len") - 4;
     if (chatMsgLength <= 0)
     {
@@ -132,57 +130,8 @@ void ChatRecv::processGmChat(Net::MessageIn &msg)
     }
 
     std::string chatMsg = msg.readRawString(chatMsgLength, "message");
-    const size_t pos = chatMsg.find(" : ", 0);
-
-    if (normalChat)
-    {
-        bool allow(true);
-        if (chatWindow)
-        {
-            allow = chatWindow->resortChatLog(chatMsg,
-                ChatMsgType::BY_PLAYER,
-                GENERAL_CHANNEL,
-                IgnoreRecord_false,
-                TryRemoveColors_true);
-        }
-
-        const std::string senseStr("You sense the following: ");
-        if (actorManager && !chatMsg.find(senseStr))
-        {
-            actorManager->parseLevels(
-                chatMsg.substr(senseStr.size()));
-        }
 
-        if (pos == std::string::npos &&
-            !Ea::ChatRecv::mShowMotd &&
-            Ea::ChatRecv::mSkipping)
-        {
-            // skip motd from "new" tmw server
-            if (Ea::ChatRecv::mMotdTime == -1)
-            {
-                Ea::ChatRecv::mMotdTime = cur_time + 1;
-            }
-            else if (Ea::ChatRecv::mMotdTime == cur_time ||
-                     Ea::ChatRecv::mMotdTime < cur_time)
-            {
-                Ea::ChatRecv::mSkipping = false;
-            }
-            BLOCK_END("ChatRecv::processChat")
-            return;
-        }
-
-        if (pos != std::string::npos)
-            chatMsg.erase(0, pos + 3);
-
-        trim(chatMsg);
-
-        if (localPlayer)
-        {
-            if ((chatWindow || Ea::ChatRecv::mShowMotd) && allow)
-                localPlayer->setSpeech(chatMsg, GENERAL_CHANNEL);
-        }
-    }
-    else if (localChatTab)
+    if (localChatTab)
     {
         if (chatWindow)
             chatWindow->addGlobalMessage(chatMsg);
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 7d6d912fa..8e1c8970d 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -30,7 +30,6 @@
 
 #include "net/ea/gamerecv.h"
 
-#include "net/tmwa/gamerecv.h"
 #include "net/tmwa/loginhandler.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/network.h"
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index b844261d5..818e2d7a2 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -32,8 +32,6 @@
 #include "gui/widgets/tabs/chat/guildtab.h"
 #include "gui/widgets/tabs/chat/partytab.h"
 
-#include "net/tmwa/generalrecv.h"
-
 #include "net/tmwa/adminhandler.h"
 #include "net/tmwa/beinghandler.h"
 #include "net/tmwa/buysellhandler.h"
@@ -49,7 +47,6 @@
 #include "net/tmwa/partyhandler.h"
 #include "net/tmwa/pethandler.h"
 #include "net/tmwa/playerhandler.h"
-#include "net/tmwa/protocol.h"
 #include "net/tmwa/serverfeatures.h"
 #include "net/tmwa/tradehandler.h"
 #include "net/tmwa/skillhandler.h"
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index e2074ac27..3494c87bb 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -26,11 +26,8 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "net/serverfeatures.h"
-
 #include "net/ea/guildrecv.h"
 
-#include "net/tmwa/guildrecv.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/guildrecv.cpp b/src/net/tmwa/guildrecv.cpp
index 0a6a84fc7..3e22992cd 100644
--- a/src/net/tmwa/guildrecv.cpp
+++ b/src/net/tmwa/guildrecv.cpp
@@ -22,7 +22,6 @@
 #include "net/tmwa/guildrecv.h"
 
 #include "configuration.h"
-#include "guild.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 33d260673..2cca7ebc3 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -23,13 +23,9 @@
 #include "net/tmwa/inventoryhandler.h"
 
 #include "item.h"
-#include "logger.h"
 
 #include "enums/equipslot.h"
 
-#include "net/ea/inventoryrecv.h"
-
-#include "net/tmwa/inventoryrecv.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/itemhandler.cpp b/src/net/tmwa/itemhandler.cpp
index eb42aa2a3..e331d4a5e 100644
--- a/src/net/tmwa/itemhandler.cpp
+++ b/src/net/tmwa/itemhandler.cpp
@@ -22,11 +22,6 @@
 
 #include "net/tmwa/itemhandler.h"
 
-#include "net/ea/itemrecv.h"
-
-#include "net/tmwa/itemrecv.h"
-#include "net/tmwa/protocol.h"
-
 #include "debug.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index de9196814..c2cf125d4 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -28,7 +28,6 @@
 
 #include "net/ea/loginrecv.h"
 
-#include "net/tmwa/loginrecv.h"
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/network.h"
 #include "net/tmwa/protocol.h"
@@ -67,7 +66,8 @@ bool LoginHandler::isConnected() const
     if (!Network::mInstance)
         return false;
 
-    return Ea::LoginRecv::mVersionResponse && Network::mInstance->isConnected();
+    return Ea::LoginRecv::mVersionResponse &&
+        Network::mInstance->isConnected();
 }
 
 void LoginHandler::disconnect()
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index 069ff373a..16f4c073f 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -61,8 +61,6 @@
 #include "net/tmwa/messagein.h"
 #include "net/tmwa/protocol.h"
 
-#include "utils/delete2.h"
-
 #include "debug.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index b20516363..6c721ffd1 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -32,7 +32,6 @@
 #include "net/ea/partyrecv.h"
 
 #include "net/tmwa/messageout.h"
-#include "net/tmwa/partyrecv.h"
 #include "net/tmwa/protocol.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index d637aed4d..5591c903e 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -25,13 +25,8 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "gui/windows/statuswindow.h"
-
-#include "net/ea/playerrecv.h"
-
 #include "net/tmwa/inventoryhandler.h"
 #include "net/tmwa/messageout.h"
-#include "net/tmwa/playerrecv.h"
 #include "net/tmwa/protocol.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/playerrecv.cpp b/src/net/tmwa/playerrecv.cpp
index 88d2062bb..813006448 100644
--- a/src/net/tmwa/playerrecv.cpp
+++ b/src/net/tmwa/playerrecv.cpp
@@ -27,9 +27,7 @@
 
 #include "gui/windows/statuswindow.h"
 
-#include "net/tmwa/inventoryhandler.h"
-#include "net/tmwa/messageout.h"
-#include "net/tmwa/protocol.h"
+#include "net/messagein.h"
 
 #include "debug.h"
 
diff --git a/src/net/tmwa/playerrecv.h b/src/net/tmwa/playerrecv.h
index 929591be6..c0f39acff 100644
--- a/src/net/tmwa/playerrecv.h
+++ b/src/net/tmwa/playerrecv.h
@@ -23,7 +23,10 @@
 #ifndef NET_TMWA_PLAYERRECV_H
 #define NET_TMWA_PLAYERRECV_H
 
-#include "net/ea/playerhandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp
index 8ecf0b83e..5a7fd894e 100644
--- a/src/net/tmwa/questhandler.cpp
+++ b/src/net/tmwa/questhandler.cpp
@@ -20,14 +20,6 @@
 
 #include "net/tmwa/questhandler.h"
 
-#include "gui/windows/skilldialog.h"
-#include "gui/windows/questswindow.h"
-
-#include "net/tmwa/protocol.h"
-#include "net/tmwa/questrecv.h"
-
-#include "resources/skillconsts.h"
-
 #include "debug.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/questrecv.cpp b/src/net/tmwa/questrecv.cpp
index 0f05413af..f95a7463a 100644
--- a/src/net/tmwa/questrecv.cpp
+++ b/src/net/tmwa/questrecv.cpp
@@ -25,8 +25,6 @@
 
 #include "net/messagein.h"
 
-#include "net/tmwa/protocol.h"
-
 #include "resources/skillconsts.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/questrecv.h b/src/net/tmwa/questrecv.h
index f81653cf6..cc7472881 100644
--- a/src/net/tmwa/questrecv.h
+++ b/src/net/tmwa/questrecv.h
@@ -21,8 +21,6 @@
 #ifndef NET_TMWA_QUESTRECV_H
 #define NET_TMWA_QUESTRECV_H
 
-#include "net/questhandler.h"
-
 namespace Net
 {
     class MessageIn;
diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp
index ed9909e18..a666dec96 100644
--- a/src/net/tmwa/skillhandler.cpp
+++ b/src/net/tmwa/skillhandler.cpp
@@ -22,22 +22,8 @@
 
 #include "net/tmwa/skillhandler.h"
 
-#include "notifymanager.h"
-
-#include "being/localplayer.h"
-#include "being/playerinfo.h"
-
-#include "enums/resources/notifytypes.h"
-
-#include "gui/windows/skilldialog.h"
-
-#include "net/ea/skillrecv.h"
-
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
-#include "net/tmwa/skillrecv.h"
-
-#include "utils/gettext.h"
 
 #include "debug.h"
 
diff --git a/src/net/tmwa/skillrecv.cpp b/src/net/tmwa/skillrecv.cpp
index 9c29be38c..0330d3566 100644
--- a/src/net/tmwa/skillrecv.cpp
+++ b/src/net/tmwa/skillrecv.cpp
@@ -35,9 +35,6 @@
 
 #include "net/ea/skillrecv.h"
 
-#include "net/tmwa/messageout.h"
-#include "net/tmwa/protocol.h"
-
 #include "utils/gettext.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/skillrecv.h b/src/net/tmwa/skillrecv.h
index 7d0b84cc2..fd2e6f66f 100644
--- a/src/net/tmwa/skillrecv.h
+++ b/src/net/tmwa/skillrecv.h
@@ -23,8 +23,6 @@
 #ifndef NET_TMWA_SKILLRECV_H
 #define NET_TMWA_SKILLRECV_H
 
-#include "net/ea/skillhandler.h"
-
 namespace Net
 {
     class MessageIn;
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 3eccd966d..1d889b1db 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -22,28 +22,15 @@
 
 #include "net/tmwa/tradehandler.h"
 
-#include "inventory.h"
 #include "item.h"
-#include "notifymanager.h"
 
 #include "being/playerinfo.h"
-#include "being/playerrelation.h"
-#include "being/playerrelations.h"
-
-#include "enums/resources/notifytypes.h"
-
-#include "gui/windows/tradewindow.h"
-
-#include "net/ea/traderecv.h"
 
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
-#include "net/tmwa/traderecv.h"
 
 #include "net/ea/eaprotocol.h"
 
-#include "utils/stringutils.h"
-
 #include "debug.h"
 
 extern Net::TradeHandler *tradeHandler;
diff --git a/src/net/tmwa/traderecv.cpp b/src/net/tmwa/traderecv.cpp
index 654b9eeb5..e616313c0 100644
--- a/src/net/tmwa/traderecv.cpp
+++ b/src/net/tmwa/traderecv.cpp
@@ -35,19 +35,15 @@
 #include "gui/windows/tradewindow.h"
 
 #include "net/messagein.h"
+#include "net/tradehandler.h"
 
 #include "net/ea/eaprotocol.h"
 #include "net/ea/traderecv.h"
 
-#include "net/tmwa/messageout.h"
-#include "net/tmwa/protocol.h"
-
 #include "utils/stringutils.h"
 
 #include "debug.h"
 
-extern Net::TradeHandler *tradeHandler;
-
 extern std::string tradePartnerName;
 
 namespace TmwAthena
diff --git a/src/net/tmwa/traderecv.h b/src/net/tmwa/traderecv.h
index 3b7166267..1a08f17ea 100644
--- a/src/net/tmwa/traderecv.h
+++ b/src/net/tmwa/traderecv.h
@@ -23,7 +23,10 @@
 #ifndef NET_TMWA_TRADERECV_H
 #define NET_TMWA_TRADERECV_H
 
-#include "net/ea/tradehandler.h"
+namespace Net
+{
+    class MessageIn;
+}
 
 namespace TmwAthena
 {