3 files changed, 6 insertions, 3 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index a1b1f45bc..5acf3040c 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -115,9 +115,9 @@ GeneralHandler::GeneralHandler() :
     mFriendsHandler(new FriendsHandler),
     mHomunculusHandler(new HomunculusHandler),
     mMailHandler(new MailHandler),
+    mMarketHandler(new MarketHandler),
 #endif
     mMercenaryHandler(new MercenaryHandler),
-    mMarketHandler(new MarketHandler),
     mVendingHandler(new VendingHandler),
     mSearchStoreHandler(new SearchStoreHandler)
 {
@@ -245,9 +245,9 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mFriendsHandler);
     mNetwork->registerHandler(mHomunculusHandler);
     mNetwork->registerHandler(mMailHandler);
+    mNetwork->registerHandler(mMarketHandler);
 #endif
     mNetwork->registerHandler(mMercenaryHandler);
-    mNetwork->registerHandler(mMarketHandler);
     mNetwork->registerHandler(mVendingHandler);
     mNetwork->registerHandler(mSearchStoreHandler);
 }
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index dcd717b70..c037da7c2 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -91,9 +91,9 @@ class GeneralHandler final : public MessageHandler,
         MessageHandlerPtr mFriendsHandler;
         MessageHandlerPtr mHomunculusHandler;
         MessageHandlerPtr mMailHandler;
+        MessageHandlerPtr mMarketHandler;
 #endif
         MessageHandlerPtr mMercenaryHandler;
-        MessageHandlerPtr mMarketHandler;
         MessageHandlerPtr mVendingHandler;
         MessageHandlerPtr mSearchStoreHandler;
 };
diff --git a/src/net/tmwa/markethandler.h b/src/net/tmwa/markethandler.h
index 5ac55d993..bf817ac04 100644
--- a/src/net/tmwa/markethandler.h
+++ b/src/net/tmwa/markethandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_TMWA_MARKETHANDLER_H
 #define NET_TMWA_MARKETHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include "net/markethandler.h"
 
 #include "net/tmwa/messagehandler.h"
@@ -47,4 +49,5 @@ class MarketHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_MARKETHANDLER_H