9 files changed, 7 insertions, 12 deletions
diff --git a/src/being/localplayer.cpp b/src/being/localplayer.cpp
index 720207b5b..60518842d 100644
--- a/src/being/localplayer.cpp
+++ b/src/being/localplayer.cpp
@@ -851,7 +851,10 @@ void LocalPlayer::pickedUp(const ItemInfo &itemInfo, const int amount,
                 // TRANSLATORS: pickup error message
                 msg = N_("Your item stack has max amount.");
                 break;
+            case Pickup::OKAY:
+                break;
             default:
+            case Pickup::UNKNOWN:
                 // TRANSLATORS: pickup error message
                 msg = N_("Unknown problem picking up item.");
                 break;
diff --git a/src/gui/widgets/tabs/chat/whispertab.cpp b/src/gui/widgets/tabs/chat/whispertab.cpp
index 2830df0f8..53712c6b2 100644
--- a/src/gui/widgets/tabs/chat/whispertab.cpp
+++ b/src/gui/widgets/tabs/chat/whispertab.cpp
@@ -31,7 +31,6 @@
 #include "gui/widgets/windowcontainer.h"
 
 #include "utils/chatutils.h"
-#include "utils/stringutils.h"
 
 #include "debug.h"
 
diff --git a/src/net/eathena/charserverhandler.cpp b/src/net/eathena/charserverhandler.cpp
index 4d90e4505..a4908413d 100644
--- a/src/net/eathena/charserverhandler.cpp
+++ b/src/net/eathena/charserverhandler.cpp
@@ -204,7 +204,7 @@ void CharServerHandler::readPlayerData(Net::MessageIn &msg,
     msg.readInt16("speed");
     tempPlayer->setSubtype(msg.readInt16("class"), 0);
     const int hairStyle = msg.readInt16("hair style");
-    const uint16_t weapon = msg.readInt32("weapon");
+    const int weapon = msg.readInt32("weapon");
 
     tempPlayer->setSprite(SPRITE_WEAPON, weapon, "", 1, true);
 
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index 14fa4df3b..b55aea477 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -25,7 +25,6 @@
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
-#include "being/pickup.h"
 
 #include "listeners/arrowslistener.h"
 
diff --git a/src/net/eathena/network.cpp b/src/net/eathena/network.cpp
index f0f727462..d47166d78 100644
--- a/src/net/eathena/network.cpp
+++ b/src/net/eathena/network.cpp
@@ -145,7 +145,7 @@ bool Network::messageReady()
             len = 10;
         }
         else if (msgId >= 0 && static_cast<unsigned int>(msgId)
-            < packet_lengths_size)
+                 < packet_lengths_size)
         {
             len = packet_lengths[msgId];
         }
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 219cedc3d..995d5b4b1 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -33,7 +33,6 @@
 #include "gui/windows/socialwindow.h"
 #include "gui/windows/statuswindow.h"
 
-#include "gui/widgets/tabs/chat/guildtab.h"
 #include "gui/widgets/tabs/chat/partytab.h"
 
 #include "net/tmwa/adminhandler.h"
diff --git a/src/net/tmwa/inventoryhandler.cpp b/src/net/tmwa/inventoryhandler.cpp
index 43cc5fd3b..83bc38e6a 100644
--- a/src/net/tmwa/inventoryhandler.cpp
+++ b/src/net/tmwa/inventoryhandler.cpp
@@ -25,7 +25,6 @@
 #include "notifymanager.h"
 
 #include "being/localplayer.h"
-#include "being/pickup.h"
 
 #include "listeners/arrowslistener.h"
 
diff --git a/src/resources/db/commandsdb.cpp b/src/resources/db/commandsdb.cpp
index c5c1d9e3c..6b7580dea 100644
--- a/src/resources/db/commandsdb.cpp
+++ b/src/resources/db/commandsdb.cpp
@@ -28,9 +28,6 @@
 
 #include "resources/beingcommon.h"
 
-#include "utils/dtor.h"
-#include "utils/gettext.h"
-
 #include "debug.h"
 
 namespace
@@ -121,7 +118,8 @@ void CommandsDB::loadXmlFile(const std::string &fileName)
         if (skill1)
         {
             cmd = new TextCommand(id, name, command, comment,
-                targetType, icon, level1, static_cast<MagicSchool>(skill2), level2, mana);
+                targetType, icon, level1, static_cast<MagicSchool>(skill2),
+                level2, mana);
         }
         else
         {
diff --git a/src/resources/db/commandsdb.h b/src/resources/db/commandsdb.h
index 1725171d1..d45cf19fe 100644
--- a/src/resources/db/commandsdb.h
+++ b/src/resources/db/commandsdb.h
@@ -23,8 +23,6 @@
 #ifndef RESOURCES_DB_COMMANDSDB_H
 #define RESOURCES_DB_COMMANDSDB_H
 
-#include "resources/modinfo.h"
-
 #include <map>
 #include <string>