16 files changed, 18 insertions, 25 deletions
diff --git a/src/actions/commands.cpp b/src/actions/commands.cpp
index 36d189399..812a9fa63 100644
--- a/src/actions/commands.cpp
+++ b/src/actions/commands.cpp
@@ -517,7 +517,7 @@ impHandler(imitation)
     return true;
 }
 
-impHandler0(sendMail)
+impHandler(sendMail)
 {
 #ifdef EATHENA_SUPPORT
     const ServerTypeT type = Net::getNetworkType();
diff --git a/src/client.cpp b/src/client.cpp
index d0c4e38c0..83ea42fa7 100644
--- a/src/client.cpp
+++ b/src/client.cpp
@@ -73,6 +73,7 @@
 #include "gui/widgets/desktop.h"
 #include "gui/widgets/windowcontainer.h"
 
+#include "net/charserverhandler.h"
 #include "net/chathandler.h"
 #include "net/download.h"
 #include "net/gamehandler.h"
diff --git a/src/enums/being/badgeindex.h b/src/enums/being/badgeindex.h
index fefc5adff..726c55de7 100644
--- a/src/enums/being/badgeindex.h
+++ b/src/enums/being/badgeindex.h
@@ -33,7 +33,8 @@ enum2Start(BadgeIndex)
     Guild    = 5,
     Party    = 6,
     Name     = 7,
-    BadgeIndexSize,
+
+    BadgeIndexSize
 }
 enum2End(BadgeIndex);
 
diff --git a/src/gui/popups/itempopup.cpp b/src/gui/popups/itempopup.cpp
index 21c00001d..51f1e8108 100644
--- a/src/gui/popups/itempopup.cpp
+++ b/src/gui/popups/itempopup.cpp
@@ -28,8 +28,6 @@
 #include "item.h"
 #include "units.h"
 
-#include "being/being.h"
-
 #include "gui/gui.h"
 
 #include "gui/fonts/font.h"
diff --git a/src/gui/widgets/tabs/setup_other.cpp b/src/gui/widgets/tabs/setup_other.cpp
index 4e86abd8c..cdb22490a 100644
--- a/src/gui/widgets/tabs/setup_other.cpp
+++ b/src/gui/widgets/tabs/setup_other.cpp
@@ -296,7 +296,7 @@ Setup_Other::Setup_Other(const Widget2 *const widget) :
         "enableGuildBotEvent", false);
 
     // TRANSLATORS: settings option
-    new SetupItemCheckBox(_("Enable manamarket bot bot support"),
+    new SetupItemCheckBox(_("Enable manamarket bot support"),
         "", "enableManaMarketBot", this,
         "enableManaMarketBotEvent", false);
 
diff --git a/src/gui/windows/charcreatedialog.cpp b/src/gui/windows/charcreatedialog.cpp
index 6af4a6437..9525805d4 100644
--- a/src/gui/windows/charcreatedialog.cpp
+++ b/src/gui/windows/charcreatedialog.cpp
@@ -37,6 +37,7 @@
 #include "gui/widgets/tabstrip.h"
 #include "gui/widgets/textfield.h"
 
+#include "net/charserverhandler.h"
 #include "net/serverfeatures.h"
 
 #include "resources/iteminfo.h"
diff --git a/src/gui/windows/charselectdialog.cpp b/src/gui/windows/charselectdialog.cpp
index dd0205347..476cd50b9 100644
--- a/src/gui/windows/charselectdialog.cpp
+++ b/src/gui/windows/charselectdialog.cpp
@@ -46,6 +46,7 @@
 #include "gui/widgets/createwidget.h"
 
 #include "net/character.h"
+#include "net/charserverhandler.h"
 #include "net/logindata.h"
 #include "net/loginhandler.h"
 #include "net/registrationoptions.h"
diff --git a/src/gui/windows/charselectdialog.h b/src/gui/windows/charselectdialog.h
index 6827a78ea..39df750ac 100644
--- a/src/gui/windows/charselectdialog.h
+++ b/src/gui/windows/charselectdialog.h
@@ -23,9 +23,11 @@
 #ifndef GUI_WINDOWS_CHARSELECTDIALOG_H
 #define GUI_WINDOWS_CHARSELECTDIALOG_H
 
+#include "enums/simpletypes/beingid.h"
+
 #include "gui/widgets/window.h"
 
-#include "net/charserverhandler.h"
+#include "net/characters.h"
 
 #include "listeners/actionlistener.h"
 #include "listeners/keylistener.h"
@@ -36,6 +38,11 @@ class CharacterViewBase;
 class LoginData;
 class TextDialog;
 
+namespace Net
+{
+    class CharServerHandler;
+}
+
 /**
  * Character selection dialog.
  *
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: