remove unused includes from net directory.

41 files changed, 21 insertions, 171 deletions

diff --git a/src/net/tmwa/adminhandler.cpp b/src/net/tmwa/adminhandler.cpp
index c43f608eb..99d0f8935 100644
--- a/src/net/tmwa/adminhandler.cpp
+++ b/src/net/tmwa/adminhandler.cpp
@@ -22,15 +22,10 @@
 
 #include "net/tmwa/adminhandler.h"
 
-#include "actorspritemanager.h"
-#include "game.h"
 #include "notifications.h"
 #include "notifymanager.h"
 
-#include "being/playerrelations.h"
-
-#include "net/chathandler.h"
-
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
 #include <string>
diff --git a/src/net/tmwa/adminhandler.h b/src/net/tmwa/adminhandler.h
index 18185225f..1f339e485 100644
--- a/src/net/tmwa/adminhandler.h
+++ b/src/net/tmwa/adminhandler.h
@@ -23,9 +23,6 @@
 #ifndef NET_TMWA_ADMINHANDLER_H
 #define NET_TMWA_ADMINHANDLER_H
 
-#include "net/adminhandler.h"
-#include "net/net.h"
-
 #include "net/ea/adminhandler.h"
 
 #include "net/tmwa/messagehandler.h"
diff --git a/src/net/tmwa/beinghandler.cpp b/src/net/tmwa/beinghandler.cpp
index 13504cde3..c4ff7014f 100644
--- a/src/net/tmwa/beinghandler.cpp
+++ b/src/net/tmwa/beinghandler.cpp
@@ -24,35 +24,19 @@
 
 #include "actorspritemanager.h"
 #include "client.h"
-#include "configuration.h"
-#include "effectmanager.h"
 #include "guild.h"
 #include "guildmanager.h"
 #include "party.h"
 #include "position.h"
 
 #include "being/localplayer.h"
-#include "being/playerrelations.h"
-
-#include "input/keyboardconfig.h"
-
-#include "gui/botcheckerwindow.h"
-#include "gui/outfitwindow.h"
-#include "gui/socialwindow.h"
-#include "gui/killstats.h"
-
-#include "utils/gettext.h"
-
-#include "net/playerhandler.h"
 
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
-#include "resources/colordb.h"
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
-#include <iostream>
-
 #include "debug.h"
 
 extern Net::BeingHandler *beingHandler;
diff --git a/src/net/tmwa/beinghandler.h b/src/net/tmwa/beinghandler.h
index eea967168..1e8455d6a 100644
--- a/src/net/tmwa/beinghandler.h
+++ b/src/net/tmwa/beinghandler.h
@@ -23,9 +23,6 @@
 #ifndef NET_TMWA_BEINGHANDLER_H
 #define NET_TMWA_BEINGHANDLER_H
 
-#include "net/beinghandler.h"
-#include "net/net.h"
-
 #include "net/ea/beinghandler.h"
 
 #include "net/tmwa/messagehandler.h"
diff --git a/src/net/tmwa/buysellhandler.cpp b/src/net/tmwa/buysellhandler.cpp
index d0a7b67b7..08719e0b6 100644
--- a/src/net/tmwa/buysellhandler.cpp
+++ b/src/net/tmwa/buysellhandler.cpp
@@ -22,27 +22,15 @@
 
 #include "net/tmwa/buysellhandler.h"
 
-#include "actorspritemanager.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/buyselldialog.h"
-#include "gui/selldialog.h"
-#include "gui/shopwindow.h"
-
-#include "gui/widgets/chattab.h"
-
-#include "net/chathandler.h"
 
 #include "net/ea/eaprotocol.h"
 
-#include "net/tmwa/chathandler.h"
 #include "net/tmwa/protocol.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/buysellhandler.h b/src/net/tmwa/buysellhandler.h
index 8571e9d8a..388830165 100644
--- a/src/net/tmwa/buysellhandler.h
+++ b/src/net/tmwa/buysellhandler.h
@@ -23,8 +23,6 @@
 #ifndef NET_TMWA_BUYSELLHANDLER_H
 #define NET_TMWA_BUYSELLHANDLER_H
 
-#include "net/buysellhandler.h"
-
 #include "net/ea/buysellhandler.h"
 
 #include "net/tmwa/messagehandler.h"
diff --git a/src/net/tmwa/charserverhandler.cpp b/src/net/tmwa/charserverhandler.cpp
index 6e58f5ee7..584ec0c38 100644
--- a/src/net/tmwa/charserverhandler.cpp
+++ b/src/net/tmwa/charserverhandler.cpp
@@ -25,16 +25,14 @@
 #include "client.h"
 #include "configuration.h"
 
-#include "gui/charcreatedialog.h"
-
 #include "net/logindata.h"
+#include "net/net.h"
 
-#include "net/tmwa/gamehandler.h"
 #include "net/tmwa/loginhandler.h"
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/network.h"
 #include "net/tmwa/protocol.h"
 
-#include "resources/colordb.h"
 #include "resources/itemdb.h"
 #include "resources/iteminfo.h"
 
diff --git a/src/net/tmwa/charserverhandler.h b/src/net/tmwa/charserverhandler.h
index 412c77385..602a2f079 100644
--- a/src/net/tmwa/charserverhandler.h
+++ b/src/net/tmwa/charserverhandler.h
@@ -23,16 +23,10 @@
 #ifndef NET_TMWA_CHARSERVERHANDLER_H
 #define NET_TMWA_CHARSERVERHANDLER_H
 
-#include "net/charserverhandler.h"
-
 #include "net/ea/charserverhandler.h"
 
 #include "net/tmwa/messagehandler.h"
 
-#include "net/ea/token.h"
-
-class LoginData;
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/chathandler.cpp b/src/net/tmwa/chathandler.cpp
index 7a01736e2..7ff5ed0f0 100644
--- a/src/net/tmwa/chathandler.cpp
+++ b/src/net/tmwa/chathandler.cpp
@@ -22,15 +22,7 @@
 
 #include "net/tmwa/chathandler.h"
 
-#include "actorspritemanager.h"
-#include "configuration.h"
-#include "game.h"
-
 #include "being/localplayer.h"
-#include "being/playerrelations.h"
-
-#include "gui/chatwindow.h"
-#include "gui/shopwindow.h"
 
 #include "gui/widgets/chattab.h"
 
diff --git a/src/net/tmwa/chathandler.h b/src/net/tmwa/chathandler.h
index 4a0429416..6da3a8eef 100644
--- a/src/net/tmwa/chathandler.h
+++ b/src/net/tmwa/chathandler.h
@@ -23,12 +23,10 @@
 #ifndef NET_TMWA_CHATHANDLER_H
 #define NET_TMWA_CHATHANDLER_H
 
-#include "net/chathandler.h"
-#include "net/net.h"
-
 #include "net/ea/chathandler.h"
 
 #include "net/tmwa/messagehandler.h"
+#include "net/tmwa/messageout.h"
 
 namespace TmwAthena
 {
diff --git a/src/net/tmwa/gamehandler.cpp b/src/net/tmwa/gamehandler.cpp
index 57771559d..a8d72897d 100644
--- a/src/net/tmwa/gamehandler.cpp
+++ b/src/net/tmwa/gamehandler.cpp
@@ -23,11 +23,13 @@
 #include "net/tmwa/gamehandler.h"
 
 #include "client.h"
-#include "game.h"
 
 #include "being/localplayer.h"
 
+#include "net/net.h"
+
 #include "net/tmwa/loginhandler.h"
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/network.h"
 #include "net/tmwa/protocol.h"
 
diff --git a/src/net/tmwa/gamehandler.h b/src/net/tmwa/gamehandler.h
index 755bd69dc..b38db877c 100644
--- a/src/net/tmwa/gamehandler.h
+++ b/src/net/tmwa/gamehandler.h
@@ -23,9 +23,6 @@
 #ifndef NET_TMWA_GAMEHANDLER_H
 #define NET_TMWA_GAMEHANDLER_H
 
-#include "net/gamehandler.h"
-#include "net/net.h"
-
 #include "net/tmwa/messagehandler.h"
 
 #include "net/ea/gamehandler.h"
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 1d92e1eb8..cb01e6509 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -26,9 +26,7 @@
 #include "configuration.h"
 #include "logger.h"
 
-#include "gui/charselectdialog.h"
 #include "gui/inventorywindow.h"
-#include "gui/registerdialog.h"
 #include "gui/skilldialog.h"
 #include "gui/socialwindow.h"
 #include "gui/statuswindow.h"
@@ -56,13 +54,8 @@
 #include "net/tmwa/skillhandler.h"
 #include "net/tmwa/questhandler.h"
 
-#include "net/tmwa/gui/guildtab.h"
-#include "net/tmwa/gui/partytab.h"
-
 #include "utils/gettext.h"
 
-#include <list>
-
 #include "debug.h"
 
 extern Net::GeneralHandler *generalHandler;
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 0b471e93f..47ca0081a 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -24,7 +24,6 @@
 #define NET_TMWA_GENERALHANDLER_H
 
 #include "net/generalhandler.h"
-#include "net/net.h"
 
 #include "net/tmwa/messagehandler.h"
 
diff --git a/src/net/tmwa/gui/guildtab.cpp b/src/net/tmwa/gui/guildtab.cpp
index cc907295f..dcfa97d21 100644
--- a/src/net/tmwa/gui/guildtab.cpp
+++ b/src/net/tmwa/gui/guildtab.cpp
@@ -22,19 +22,6 @@
 
 #include "net/tmwa/gui/guildtab.h"
 
-#include "chatlogger.h"
-#include "guild.h"
-
-#include "being/localplayer.h"
-
-#include "net/net.h"
-#include "net/guildhandler.h"
-
-#include "resources/iteminfo.h"
-#include "resources/itemdb.h"
-
-#include "utils/gettext.h"
-
 #include "debug.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/gui/partytab.cpp b/src/net/tmwa/gui/partytab.cpp
index e0c28ab4a..b26d84f8f 100644
--- a/src/net/tmwa/gui/partytab.cpp
+++ b/src/net/tmwa/gui/partytab.cpp
@@ -22,21 +22,6 @@
 
 #include "net/tmwa/gui/partytab.h"
 
-#include "chatlogger.h"
-#include "party.h"
-
-#include "being/localplayer.h"
-
-#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 TmwAthena
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 65b984dbd..862c437ed 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -26,7 +26,7 @@
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "net/tmwa/messagein.h"
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/guildhandler.h b/src/net/tmwa/guildhandler.h
index 2a0c8d7db..d2238ff83 100644
--- a/src/net/tmwa/guildhandler.h
+++ b/src/net/tmwa/guildhandler.h
@@ -22,8 +22,6 @@
 #ifndef NET_TMWA_GUILDHANDLER_H
 #define NET_TMWA_GUILDHANDLER_H
 
-#include "net/guildhandler.h"
-
 #include "net/ea/guildhandler.h"
 
 #include "net/tmwa/messagehandler.h"
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index d1cfc7136..a993bb35c 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -22,6 +22,7 @@
 
 #include "net/tmwa/inventoryhandler.h"
 
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/tmwa/inventoryhandler.h b/src/net/tmwa/inventoryhandler.h
index a02be49ee..9d7e877cf 100644
--- a/src/net/tmwa/inventoryhandler.h
+++ b/src/net/tmwa/inventoryhandler.h
@@ -23,10 +23,6 @@
 #ifndef NET_TMWA_INVENTORYHANDLER_H
 #define NET_TMWA_INVENTORYHANDLER_H
 
-#include "logger.h"
-
-#include "net/net.h"
-
 #include "net/ea/inventoryhandler.h"
 
 #include "net/tmwa/messagehandler.h"
diff --git a/src/net/tmwa/loginhandler.cpp b/src/net/tmwa/loginhandler.cpp
index 91e2c3027..4fe225de6 100644
--- a/src/net/tmwa/loginhandler.cpp
+++ b/src/net/tmwa/loginhandler.cpp
@@ -23,13 +23,12 @@
 #include "net/tmwa/loginhandler.h"
 
 #include "client.h"
-#include "configuration.h"
 #include "logger.h"
 
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/network.h"
 #include "net/tmwa/protocol.h"
 
-#include "utils/gettext.h"
 #include "utils/paths.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/loginhandler.h b/src/net/tmwa/loginhandler.h
index d05d0a747..972bf353a 100644
--- a/src/net/tmwa/loginhandler.h
+++ b/src/net/tmwa/loginhandler.h
@@ -23,16 +23,12 @@
 #ifndef NET_TMWA_LOGINHANDLER_H
 #define NET_TMWA_LOGINHANDLER_H
 
-#include "net/loginhandler.h"
-
 #include "net/ea/loginhandler.h"
 
 #include "net/tmwa/messagehandler.h"
 
 #include <string>
 
-class LoginData;
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/messagehandler.h b/src/net/tmwa/messagehandler.h
index 5afe28bff..578926478 100644
--- a/src/net/tmwa/messagehandler.h
+++ b/src/net/tmwa/messagehandler.h
@@ -25,9 +25,7 @@
 
 #include "net/messagehandler.h"
 
-#include "net/tmwa/messageout.h"
-
-#include <SDL_types.h>
+//#include <SDL_types.h>
 
 #include <memory>
 
diff --git a/src/net/tmwa/messagein.cpp b/src/net/tmwa/messagein.cpp
index a9a2ce5a5..dac641414 100644
--- a/src/net/tmwa/messagein.cpp
+++ b/src/net/tmwa/messagein.cpp
@@ -28,7 +28,6 @@
 
 #include "utils/stringutils.h"
 
-#include <SDL.h>
 #include <SDL_endian.h>
 
 #include "debug.h"
diff --git a/src/net/tmwa/messagein.h b/src/net/tmwa/messagein.h
index 75e85b044..a17260177 100644
--- a/src/net/tmwa/messagein.h
+++ b/src/net/tmwa/messagein.h
@@ -25,9 +25,6 @@
 
 #include "net/messagein.h"
 
-#include <SDL_types.h>
-#include <string>
-
 #include "localconsts.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/messageout.cpp b/src/net/tmwa/messageout.cpp
index 2fc0ff2d9..7a96497ee 100644
--- a/src/net/tmwa/messageout.cpp
+++ b/src/net/tmwa/messageout.cpp
@@ -28,7 +28,6 @@
 
 #include "logger.h"
 
-#include <SDL.h>
 #include <SDL_endian.h>
 
 #include <cstring>
diff --git a/src/net/tmwa/messageout.h b/src/net/tmwa/messageout.h
index 1d7b76800..a68e4788f 100644
--- a/src/net/tmwa/messageout.h
+++ b/src/net/tmwa/messageout.h
@@ -25,9 +25,6 @@
 
 #include "net/messageout.h"
 
-#include <iosfwd>
-#include <SDL_types.h>
-
 #include "localconsts.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/network.cpp b/src/net/tmwa/network.cpp
index a77fbbf7c..73288d4d1 100644
--- a/src/net/tmwa/network.cpp
+++ b/src/net/tmwa/network.cpp
@@ -22,16 +22,11 @@
 
 #include "net/tmwa/network.h"
 
-#include "configuration.h"
 #include "logger.h"
 
+#include "net/tmwa/messagein.h"
 #include "net/tmwa/protocol.h"
 
-#include "utils/gettext.h"
-
-#include <assert.h>
-#include <sstream>
-
 #include "debug.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/network.h b/src/net/tmwa/network.h
index 29b9de002..9d2e49183 100644
--- a/src/net/tmwa/network.h
+++ b/src/net/tmwa/network.h
@@ -26,7 +26,6 @@
 #include "net/ea/network.h"
 
 #include "net/tmwa/messagehandler.h"
-#include "net/tmwa/messagein.h"
 
 /**
  * Protocol version, reported to the eAthena char and mapserver who can adjust
diff --git a/src/net/tmwa/npchandler.cpp b/src/net/tmwa/npchandler.cpp
index 2f4fc2e70..026727a6e 100644
--- a/src/net/tmwa/npchandler.cpp
+++ b/src/net/tmwa/npchandler.cpp
@@ -27,6 +27,7 @@
 #include "gui/npcdialog.h"
 #include "gui/viewport.h"
 
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/tmwa/npchandler.h b/src/net/tmwa/npchandler.h
index 8b5adfcac..52d77b769 100644
--- a/src/net/tmwa/npchandler.h
+++ b/src/net/tmwa/npchandler.h
@@ -23,17 +23,10 @@
 #ifndef NET_TMWA_NPCHANDLER_H
 #define NET_TMWA_NPCHANDLER_H
 
-#include "net/net.h"
-#include "net/npchandler.h"
-
 #include "net/ea/npchandler.h"
 
 #include "net/tmwa/messagehandler.h"
 
-#include <map>
-
-class NpcDialog;
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/partyhandler.cpp b/src/net/tmwa/partyhandler.cpp
index 2124679e9..92c79d447 100644
--- a/src/net/tmwa/partyhandler.cpp
+++ b/src/net/tmwa/partyhandler.cpp
@@ -27,10 +27,9 @@
 
 #include "being/localplayer.h"
 
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
-#include "net/tmwa/gui/partytab.h"
-
 #include "debug.h"
 
 extern Net::PartyHandler *partyHandler;
diff --git a/src/net/tmwa/partyhandler.h b/src/net/tmwa/partyhandler.h
index 892dfd70d..d403b557a 100644
--- a/src/net/tmwa/partyhandler.h
+++ b/src/net/tmwa/partyhandler.h
@@ -22,7 +22,6 @@
 #ifndef NET_TMWA_PARTYHANDLER_H
 #define NET_TMWA_PARTYHANDLER_H
 
-#include "net/net.h"
 #include "net/partyhandler.h"
 
 #include "net/tmwa/messagehandler.h"
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 645959fbc..dc6244f43 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -25,9 +25,11 @@
 #include "configuration.h"
 #include "client.h"
 
-#include "net/tmwa/protocol.h"
-#include "net/tmwa/npchandler.h"
+#include "net/net.h"
+
 #include "net/tmwa/inventoryhandler.h"
+#include "net/tmwa/messageout.h"
+#include "net/tmwa/protocol.h"
 
 #include "gui/whoisonline.h"
 
diff --git a/src/net/tmwa/playerhandler.h b/src/net/tmwa/playerhandler.h
index 94f993377..aa6cf1d94 100644
--- a/src/net/tmwa/playerhandler.h
+++ b/src/net/tmwa/playerhandler.h
@@ -23,9 +23,6 @@
 #ifndef NET_TMWA_PLAYERHANDLER_H
 #define NET_TMWA_PLAYERHANDLER_H
 
-#include "net/net.h"
-#include "net/playerhandler.h"
-
 #include "net/ea/playerhandler.h"
 
 #include "net/tmwa/messagehandler.h"
diff --git a/src/net/tmwa/questhandler.cpp b/src/net/tmwa/questhandler.cpp
index 9a5f52330..4df7f06ce 100644
--- a/src/net/tmwa/questhandler.cpp
+++ b/src/net/tmwa/questhandler.cpp
@@ -20,17 +20,11 @@
 
 #include "net/tmwa/questhandler.h"
 
-#include "being/localplayer.h"
-
 #include "gui/skilldialog.h"
 #include "gui/questswindow.h"
 
 #include "net/tmwa/protocol.h"
 
-#include "net/ea/eaprotocol.h"
-
-#include "utils/langs.h"
-
 #include "debug.h"
 
 namespace TmwAthena
diff --git a/src/net/tmwa/questhandler.h b/src/net/tmwa/questhandler.h
index ef6e79c13..80d39e67b 100644
--- a/src/net/tmwa/questhandler.h
+++ b/src/net/tmwa/questhandler.h
@@ -21,15 +21,8 @@
 #ifndef NET_TMWA_QUESTHANDLER_H
 #define NET_TMWA_QUESTHANDLER_H
 
-#include "net/net.h"
-#include "net/npchandler.h"
-
-#include "net/ea/npchandler.h"
-
 #include "net/tmwa/messagehandler.h"
 
-#include <map>
-
 namespace TmwAthena
 {
 
diff --git a/src/net/tmwa/skillhandler.cpp b/src/net/tmwa/skillhandler.cpp
index 75edaf63b..5edb1c0b4 100644
--- a/src/net/tmwa/skillhandler.cpp
+++ b/src/net/tmwa/skillhandler.cpp
@@ -22,8 +22,7 @@
 
 #include "net/tmwa/skillhandler.h"
 
-#include "logger.h"
-
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
 #include "debug.h"
diff --git a/src/net/tmwa/skillhandler.h b/src/net/tmwa/skillhandler.h
index d472faaff..129331ff3 100644
--- a/src/net/tmwa/skillhandler.h
+++ b/src/net/tmwa/skillhandler.h
@@ -23,9 +23,6 @@
 #ifndef NET_TMWA_SKILLHANDLER_H
 #define NET_TMWA_SKILLHANDLER_H
 
-#include "net/net.h"
-#include "net/skillhandler.h"
-
 #include "net/ea/skillhandler.h"
 
 #include "net/tmwa/messagehandler.h"
diff --git a/src/net/tmwa/tradehandler.cpp b/src/net/tmwa/tradehandler.cpp
index 3d49a63d0..6b144cd5a 100644
--- a/src/net/tmwa/tradehandler.cpp
+++ b/src/net/tmwa/tradehandler.cpp
@@ -26,6 +26,7 @@
 
 #include "being/playerinfo.h"
 
+#include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
 #include "net/ea/eaprotocol.h"
diff --git a/src/net/tmwa/tradehandler.h b/src/net/tmwa/tradehandler.h
index 707384d85..9e6137f87 100644
--- a/src/net/tmwa/tradehandler.h
+++ b/src/net/tmwa/tradehandler.h
@@ -23,9 +23,6 @@
 #ifndef NET_TMWA_TRADEHANDLER_H
 #define NET_TMWA_TRADEHANDLER_H
 
-#include "net/net.h"
-#include "net/tradehandler.h"
-
 #include "net/ea/tradehandler.h"
 
 #include "net/tmwa/messagehandler.h"