8 files changed, 3 insertions, 19 deletions
diff --git a/src/net/characters.h b/src/net/characters.h
index f9c4802b4..8f0f9a89a 100644
--- a/src/net/characters.h
+++ b/src/net/characters.h
@@ -29,7 +29,7 @@
 
 namespace Net
 {
-    class Character;
+    struct Character;
 
     typedef std::list<Character*> Characters;
 }  // namespace Net
diff --git a/src/net/chathandler.h b/src/net/chathandler.h
index 630946498..2d53fcae7 100644
--- a/src/net/chathandler.h
+++ b/src/net/chathandler.h
@@ -23,7 +23,6 @@
 #ifndef NET_CHATHANDLER_H
 #define NET_CHATHANDLER_H
 
-#include <list>
 #include <string>
 
 #include "localconsts.h"
diff --git a/src/net/ea/playerrecv.cpp b/src/net/ea/playerrecv.cpp
index 3780a1d54..5c207b973 100644
--- a/src/net/ea/playerrecv.cpp
+++ b/src/net/ea/playerrecv.cpp
@@ -37,7 +37,6 @@
 
 #include "resources/map/map.h"
 
-#include "net/messagein.h"
 #include "net/playerhandler.h"
 
 #include "debug.h"
diff --git a/src/net/ea/tradehandler.h b/src/net/ea/tradehandler.h
index 9540f19ee..1ee4bde92 100644
--- a/src/net/ea/tradehandler.h
+++ b/src/net/ea/tradehandler.h
@@ -25,11 +25,6 @@
 
 #include "net/tradehandler.h"
 
-namespace Net
-{
-    class MessageIn;
-}
-
 namespace Ea
 {
 
diff --git a/src/net/eathena/charserverrecv.cpp b/src/net/eathena/charserverrecv.cpp
index 1939749b0..aed472207 100644
--- a/src/net/eathena/charserverrecv.cpp
+++ b/src/net/eathena/charserverrecv.cpp
@@ -33,6 +33,7 @@
 #include "gui/widgets/createwidget.h"
 
 #include "net/character.h"
+#include "net/charserverhandler.h"
 #include "net/playerhandler.h"
 #include "net/serverfeatures.h"
 
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 1b781c3be..b832c167e 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -129,7 +129,7 @@ void InventoryHandler::moveItem2(const int source,
                                  const int amount,
                                  const int destination) const
 {
-    int packet = 0;
+    int16_t packet = 0;
     int offset = INVENTORY_OFFSET;
     if (source == InventoryType::INVENTORY)
     {
diff --git a/src/net/eathena/playerrecv.cpp b/src/net/eathena/playerrecv.cpp
index 4dcfd98bd..d397a6577 100644
--- a/src/net/eathena/playerrecv.cpp
+++ b/src/net/eathena/playerrecv.cpp
@@ -23,7 +23,6 @@
 #include "net/eathena/playerrecv.h"
 
 #include "configuration.h"
-#include "game.h"
 #include "notifymanager.h"
 
 #include "being/beingflag.h"
@@ -41,8 +40,6 @@
 
 #include "net/messagein.h"
 
-#include "resources/map/map.h"
-
 #include "debug.h"
 
 namespace EAthena
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 21bdb5ca0..71f650cf0 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -25,11 +25,6 @@
 
 #include "net/generalhandler.h"
 
-namespace Net
-{
-    class MessageIn;
-}
-
 namespace TmwAthena
 {
 class AdminHandler;
@@ -69,8 +64,6 @@ class SearchStoreHandler;
 class VendingHandler;
 #endif
 
-class ServerFeatures;
-
 class GeneralHandler final : public Net::GeneralHandler
 {
     public: