5 files changed, 4 insertions, 9 deletions
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 124e09734..686048554 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -22,13 +22,9 @@
 
 #include "net/eathena/adminhandler.h"
 
-#include "notifymanager.h"
-
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
-#include "resources/notifytypes.h"
-
 #include <string>
 
 #include "debug.h"
diff --git a/src/net/eathena/chathandler.cpp b/src/net/eathena/chathandler.cpp
index e7b8e66ec..50d4569dc 100644
--- a/src/net/eathena/chathandler.cpp
+++ b/src/net/eathena/chathandler.cpp
@@ -422,7 +422,8 @@ std::string ChatHandler::extractChannelFromMessage(std::string &chatMsg)
     return channel;
 }
 
-void ChatHandler::processChatContinue(std::string chatMsg, ChatMsgType::Type own)
+void ChatHandler::processChatContinue(std::string chatMsg,
+                                      ChatMsgType::Type own)
 {
     const std::string channel = extractChannelFromMessage(chatMsg);
     bool allow(true);
diff --git a/src/net/eathena/inventoryhandler.cpp b/src/net/eathena/inventoryhandler.cpp
index a7315c506..14fa4df3b 100644
--- a/src/net/eathena/inventoryhandler.cpp
+++ b/src/net/eathena/inventoryhandler.cpp
@@ -29,8 +29,6 @@
 
 #include "listeners/arrowslistener.h"
 
-#include "net/serverfeatures.h"
-
 #include "net/eathena/itemflags.h"
 #include "net/eathena/menu.h"
 #include "net/eathena/messageout.h"
diff --git a/src/net/eathena/tradehandler.cpp b/src/net/eathena/tradehandler.cpp
index 3d76d9e78..ef08a5521 100644
--- a/src/net/eathena/tradehandler.cpp
+++ b/src/net/eathena/tradehandler.cpp
@@ -46,7 +46,7 @@ extern Net::TradeHandler *tradeHandler;
 namespace EAthena
 {
 int TradeHandler::mQuantity = 0;
-uint16_t TradeHandler::mItemIndex = -1;
+int TradeHandler::mItemIndex = -1;
 
 TradeHandler::TradeHandler() :
     MessageHandler(),
diff --git a/src/net/eathena/tradehandler.h b/src/net/eathena/tradehandler.h
index 36336f002..ccfee1101 100644
--- a/src/net/eathena/tradehandler.h
+++ b/src/net/eathena/tradehandler.h
@@ -66,7 +66,7 @@ class TradeHandler final : public MessageHandler, public Ea::TradeHandler
         static void processTradeItemAddResponse(Net::MessageIn &msg);
 
         static int mQuantity;
-        static uint16_t mItemIndex;
+        static int mItemIndex;
 };
 
 }  // namespace EAthena