3 files changed, 16 insertions, 26 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index f18940630..867f9e10e 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -37,39 +37,42 @@
 #include "gui/widgets/tabs/chat/partytab.h"
 
 #include "net/tmwa/adminhandler.h"
-#include "net/tmwa/auctionhandler.h"
-#include "net/tmwa/bankhandler.h"
 #include "net/tmwa/beinghandler.h"
-#include "net/tmwa/buyingstorehandler.h"
 #include "net/tmwa/buysellhandler.h"
-#include "net/tmwa/cashshophandler.h"
 #include "net/tmwa/chathandler.h"
 #include "net/tmwa/charserverhandler.h"
-#include "net/tmwa/elementalhandler.h"
-#include "net/tmwa/familyhandler.h"
-#include "net/tmwa/friendshandler.h"
 #include "net/tmwa/gamehandler.h"
 #include "net/tmwa/guildhandler.h"
-#include "net/tmwa/homunculushandler.h"
 #include "net/tmwa/inventoryhandler.h"
 #include "net/tmwa/itemhandler.h"
 #include "net/tmwa/loginhandler.h"
-#include "net/tmwa/mailhandler.h"
-#include "net/tmwa/maphandler.h"
-#include "net/tmwa/markethandler.h"
-#include "net/tmwa/mercenaryhandler.h"
 #include "net/tmwa/network.h"
 #include "net/tmwa/npchandler.h"
 #include "net/tmwa/partyhandler.h"
 #include "net/tmwa/pethandler.h"
 #include "net/tmwa/playerhandler.h"
 #include "net/tmwa/protocol.h"
-#include "net/tmwa/searchstorehandler.h"
 #include "net/tmwa/serverfeatures.h"
 #include "net/tmwa/tradehandler.h"
 #include "net/tmwa/skillhandler.h"
 #include "net/tmwa/questhandler.h"
+
+#ifdef EATHENA_SUPPORT
+#include "net/tmwa/auctionhandler.h"
+#include "net/tmwa/bankhandler.h"
+#include "net/tmwa/buyingstorehandler.h"
+#include "net/tmwa/cashshophandler.h"
+#include "net/tmwa/elementalhandler.h"
+#include "net/tmwa/familyhandler.h"
+#include "net/tmwa/friendshandler.h"
+#include "net/tmwa/homunculushandler.h"
+#include "net/tmwa/mailhandler.h"
+#include "net/tmwa/maphandler.h"
+#include "net/tmwa/markethandler.h"
+#include "net/tmwa/mercenaryhandler.h"
+#include "net/tmwa/searchstorehandler.h"
 #include "net/tmwa/vendinghandler.h"
+#endif
 
 #include "resources/db/itemdbstat.h"
 
diff --git a/src/net/tmwa/maphandler.cpp b/src/net/tmwa/maphandler.cpp
index da0cb2421..5cbae31b0 100644
--- a/src/net/tmwa/maphandler.cpp
+++ b/src/net/tmwa/maphandler.cpp
@@ -20,13 +20,6 @@
 
 #include "net/tmwa/maphandler.h"
 
-#include "logger.h"
-
-#include "net/ea/eaprotocol.h"
-
-#include "net/tmwa/messageout.h"
-#include "net/tmwa/protocol.h"
-
 #include "debug.h"
 
 extern Net::MapHandler *mapHandler;
@@ -47,11 +40,6 @@ MapHandler::MapHandler() :
 
 void MapHandler::handleMessage(Net::MessageIn &msg)
 {
-    switch (msg.getId())
-    {
-        default:
-            break;
-    }
 }
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/maphandler.h b/src/net/tmwa/maphandler.h
index 184137ef2..f532c1bb6 100644
--- a/src/net/tmwa/maphandler.h
+++ b/src/net/tmwa/maphandler.h
@@ -29,7 +29,6 @@
 
 namespace TmwAthena
 {
-class MessageOut;
 
 class MapHandler final : public MessageHandler, public Net::MapHandler
 {