4 files changed, 10 insertions, 4 deletions
diff --git a/src/net/mercenaryhandler.h b/src/net/mercenaryhandler.h
index 857ecd035..40a92bbd7 100644
--- a/src/net/mercenaryhandler.h
+++ b/src/net/mercenaryhandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_MERCENARYHANDLER_H
 #define NET_MERCENARYHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include <string>
 
 #include "localconsts.h"
@@ -55,4 +57,5 @@ class MercenaryHandler notfinal
 
 extern Net::MercenaryHandler *mercenaryHandler;
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_MERCENARYHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 7b7afd157..7b0d34d9a 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -51,6 +51,7 @@ namespace Net
     class HomunculusHandler;
     class MailHandler;
     class MarketHandler;
+    class MercenaryHandler;
 #endif
     class AdminHandler;
     class BeingHandler;
@@ -61,7 +62,6 @@ namespace Net
     class GeneralHandler;
     class GuildHandler;
     class InventoryHandler;
-    class MercenaryHandler;
     class NpcHandler;
     class PartyHandler;
     class PetHandler;
@@ -91,7 +91,6 @@ Net::TradeHandler *tradeHandler = nullptr;
 Net::BeingHandler *beingHandler = nullptr;
 Net::BuySellHandler *buySellHandler = nullptr;
 Net::ServerFeatures *serverFeatures = nullptr;
-Net::MercenaryHandler *mercenaryHandler = nullptr;
 #ifdef EATHENA_SUPPORT
 Net::AuctionHandler *auctionHandler = nullptr;
 Net::BankHandler *bankHandler = nullptr;
@@ -103,6 +102,7 @@ Net::FriendsHandler *friendsHandler = nullptr;
 Net::HomunculusHandler *homunculusHandler = nullptr;
 Net::MailHandler *mailHandler = nullptr;
 Net::MarketHandler *marketHandler = nullptr;
+Net::MercenaryHandler *mercenaryHandler = nullptr;
 #endif
 Net::QuestHandler *questHandler = nullptr;
 Net::VendingHandler *vendingHandler = nullptr;
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 5acf3040c..9205db800 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -116,8 +116,8 @@ GeneralHandler::GeneralHandler() :
     mHomunculusHandler(new HomunculusHandler),
     mMailHandler(new MailHandler),
     mMarketHandler(new MarketHandler),
-#endif
     mMercenaryHandler(new MercenaryHandler),
+#endif
     mVendingHandler(new VendingHandler),
     mSearchStoreHandler(new SearchStoreHandler)
 {
@@ -246,8 +246,8 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mHomunculusHandler);
     mNetwork->registerHandler(mMailHandler);
     mNetwork->registerHandler(mMarketHandler);
-#endif
     mNetwork->registerHandler(mMercenaryHandler);
+#endif
     mNetwork->registerHandler(mVendingHandler);
     mNetwork->registerHandler(mSearchStoreHandler);
 }
diff --git a/src/net/tmwa/mercenaryhandler.h b/src/net/tmwa/mercenaryhandler.h
index 5833ab68c..1d5a40b8a 100644
--- a/src/net/tmwa/mercenaryhandler.h
+++ b/src/net/tmwa/mercenaryhandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_TMWA_MERCENARYHANDLER_H
 #define NET_TMWA_MERCENARYHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include "net/mercenaryhandler.h"
 
 #include "net/tmwa/messagehandler.h"
@@ -57,4 +59,5 @@ class MercenaryHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_MERCENARYHANDLER_H