Remove some useless includes.

54 files changed, 9 insertions, 175 deletions

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