12 files changed, 6 insertions, 31 deletions
diff --git a/src/net/ea/beinghandler.cpp b/src/net/ea/beinghandler.cpp
index f2aed075d..9f3320dd0 100644
--- a/src/net/ea/beinghandler.cpp
+++ b/src/net/ea/beinghandler.cpp
@@ -24,15 +24,12 @@
 
 #include "actormanager.h"
 #include "configuration.h"
-#include "effectmanager.h"
 #include "game.h"
 #include "party.h"
 
 #include "being/localplayer.h"
 #include "being/playerrelations.h"
 
-#include "particle/particle.h"
-
 #include "gui/viewport.h"
 
 #include "gui/windows/botcheckerwindow.h"
@@ -390,8 +387,7 @@ void BeingHandler::processPlayerStop(Net::MessageIn &msg) const
     BLOCK_END("BeingHandler::processPlayerStop")
 }
 
-void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg A_UNUSED)
-                                             const
+void BeingHandler::processPlayerMoveToAttack(Net::MessageIn &msg) const
 {
     BLOCK_START("BeingHandler::processPlayerStop")
     msg.readInt32("target id");
diff --git a/src/net/ea/eaprotocol.h b/src/net/ea/eaprotocol.h
index 00cf0f067..c2c5c1970 100644
--- a/src/net/ea/eaprotocol.h
+++ b/src/net/ea/eaprotocol.h
@@ -71,7 +71,7 @@ namespace Ea
         ATTACK_DELAY = 53,
         JOB          = 55
     };
-}  // namespace Net
+}  // namespace Ea
 
 enum
 {
diff --git a/src/net/ea/guildhandler.cpp b/src/net/ea/guildhandler.cpp
index 234ad4933..ebbb93eaf 100644
--- a/src/net/ea/guildhandler.cpp
+++ b/src/net/ea/guildhandler.cpp
@@ -22,13 +22,11 @@
 #include "net/ea/guildhandler.h"
 
 #include "actormanager.h"
-#include "configuration.h"
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
 
-#include "gui/windows/chatwindow.h"
 #include "gui/windows/skilldialog.h"
 #include "gui/windows/socialwindow.h"
 
@@ -38,6 +36,7 @@
 
 #include "utils/delete2.h"
 #include "utils/gettext.h"
+#include "utils/stringutils.h"
 
 #include "resources/notifytypes.h"
 
diff --git a/src/net/ea/tradehandler.cpp b/src/net/ea/tradehandler.cpp
index 16e0ca0ad..41e8be6d7 100644
--- a/src/net/ea/tradehandler.cpp
+++ b/src/net/ea/tradehandler.cpp
@@ -22,9 +22,6 @@
 
 #include "net/ea/tradehandler.h"
 
-#include "inventory.h"
-#include "item.h"
-#include "logger.h"
 #include "notifymanager.h"
 
 #include "being/playerinfo.h"
@@ -35,8 +32,6 @@
 
 #include "net/messagein.h"
 
-#include "net/ea/eaprotocol.h"
-
 #include "utils/gettext.h"
 
 #include "resources/notifytypes.h"
diff --git a/src/net/eathena/beinghandler.cpp b/src/net/eathena/beinghandler.cpp
index 7b3c3fcaf..d0c3f1640 100644
--- a/src/net/eathena/beinghandler.cpp
+++ b/src/net/eathena/beinghandler.cpp
@@ -1947,7 +1947,7 @@ void BeingHandler::processBeingFakeName(Net::MessageIn &msg) const
         msg.readUInt8("object type"));
     const int id = msg.readInt32("npc id");
     msg.skip(8, "unused");
-    const int job = msg.readInt16("class?");  // 111
+    const uint16_t job = msg.readInt16("class?");  // 111
     msg.skip(30, "unused");
     uint16_t x, y;
     uint8_t dir;
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 5308fdaea..5db0a0d79 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -569,8 +569,8 @@ void CharServerHandler::processCharRename(Net::MessageIn &msg)
 void CharServerHandler::changeSlot(const int oldSlot, const int newSlot)
 {
     createOutPacket(CMSG_CHAR_CHANGE_SLOT);
-    outMsg.writeInt16(oldSlot, "old slot");
-    outMsg.writeInt16(newSlot, "new slot");
+    outMsg.writeInt16(static_cast<int16_t>(oldSlot), "old slot");
+    outMsg.writeInt16(static_cast<int16_t>(newSlot), "new slot");
     outMsg.writeInt16(0, "unused");
 }
 
diff --git a/src/net/eathena/guildhandler.cpp b/src/net/eathena/guildhandler.cpp
index 5e7ed61a7..a1ea449c5 100644
--- a/src/net/eathena/guildhandler.cpp
+++ b/src/net/eathena/guildhandler.cpp
@@ -23,7 +23,6 @@
 
 #include "actormanager.h"
 #include "configuration.h"
-#include "notifymanager.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -36,10 +35,6 @@
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
-#include "resources/notifytypes.h"
-
-#include "utils/delete2.h"
-
 #include "debug.h"
 
 extern Net::GuildHandler *guildHandler;
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index 05fd893ca..ef38a4e67 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -22,7 +22,6 @@
 
 #include "net/eathena/tradehandler.h"
 
-#include "inventory.h"
 #include "item.h"
 #include "notifymanager.h"
 
diff --git a/src/net/messagein.cpp b/src/net/messagein.cpp
index fbe5359e8..dee3c2c64 100644
--- a/src/net/messagein.cpp
+++ b/src/net/messagein.cpp
@@ -22,7 +22,6 @@
 
 #include "net/messagein.h"
 
-#include "net/net.h"
 #include "net/packetcounters.h"
 
 #include "utils/stringutils.h"
diff --git a/src/net/packetlimiter.cpp b/src/net/packetlimiter.cpp
index f14daff77..bfa7b8caa 100644
--- a/src/net/packetlimiter.cpp
+++ b/src/net/packetlimiter.cpp
@@ -23,7 +23,6 @@
 #include "configuration.h"
 #include "settings.h"
 
-//#include "utils/stringutils.h"
 #include "utils/timer.h"
 
 #include <fstream>
diff --git a/src/net/tmwa/guildhandler.cpp b/src/net/tmwa/guildhandler.cpp
index 0c1757f86..a22cd69b0 100644
--- a/src/net/tmwa/guildhandler.cpp
+++ b/src/net/tmwa/guildhandler.cpp
@@ -23,7 +23,6 @@
 
 #include "actormanager.h"
 #include "configuration.h"
-#include "notifymanager.h"
 
 #include "being/localplayer.h"
 #include "being/playerinfo.h"
@@ -38,10 +37,6 @@
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
-#include "resources/notifytypes.h"
-
-#include "utils/delete2.h"
-
 #include "debug.h"
 
 extern Net::GuildHandler *guildHandler;
diff --git a/src/net/tmwa/playerhandler.cpp b/src/net/tmwa/playerhandler.cpp
index 5d648e538..8d332016e 100644
--- a/src/net/tmwa/playerhandler.cpp
+++ b/src/net/tmwa/playerhandler.cpp
@@ -25,7 +25,6 @@
 #include "configuration.h"
 #include "game.h"
 #include "soundmanager.h"
-#include "units.h"
 
 #include "being/attributes.h"
 #include "being/beingflag.h"
@@ -37,7 +36,6 @@
 #include "net/tmwa/messageout.h"
 #include "net/tmwa/protocol.h"
 
-#include "gui/windows/skilldialog.h"
 #include "gui/windows/whoisonline.h"
 
 #include "gui/onlineplayer.h"