5 files changed, 14 insertions, 0 deletions
diff --git a/src/net/auctionhandler.h b/src/net/auctionhandler.h
index c1a3dc8a8..02d85da22 100644
--- a/src/net/auctionhandler.h
+++ b/src/net/auctionhandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_AUCTIONHANDLER_H
 #define NET_AUCTIONHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include "enums/net/auctionsearchtype.h"
 
 #include <string>
@@ -68,4 +70,5 @@ class AuctionHandler notfinal
 
 extern Net::AuctionHandler *auctionHandler;
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_AUCTIONHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 3dc095cef..527f3a34d 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -41,7 +41,9 @@
 namespace Net
 {
     class AdminHandler;
+#ifdef EATHENA_SUPPORT
     class AuctionHandler;
+#endif
     class BankHandler;
     class BeingHandler;
     class BuyingStoreHandler;
@@ -91,7 +93,9 @@ Net::BuySellHandler *buySellHandler = nullptr;
 Net::ServerFeatures *serverFeatures = nullptr;
 Net::MailHandler *mailHandler = nullptr;
 Net::MercenaryHandler *mercenaryHandler = nullptr;
+#ifdef EATHENA_SUPPORT
 Net::AuctionHandler *auctionHandler = nullptr;
+#endif
 Net::CashShopHandler *cashShopHandler = nullptr;
 Net::FamilyHandler *familyHandler = nullptr;
 Net::BankHandler *bankHandler = nullptr;
diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h
index 5f793a78d..01e1428d7 100644
--- a/src/net/tmwa/auctionhandler.h
+++ b/src/net/tmwa/auctionhandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_TMWA_AUCTIONHANDLER_H
 #define NET_TMWA_AUCTIONHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include "net/auctionhandler.h"
 
 #include "net/tmwa/messagehandler.h"
@@ -65,4 +67,5 @@ class AuctionHandler final : public MessageHandler, public Net::AuctionHandler
 
 }  // namespace TmwAthena
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_AUCTIONHANDLER_H
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 359cc5492..9a0ccd921 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -106,7 +106,9 @@ GeneralHandler::GeneralHandler() :
     mQuestHandler(new QuestHandler),
     mServerFeatures(new ServerFeatures),
     mMailHandler(new MailHandler),
+#ifdef EATHENA_SUPPORT
     mAuctionHandler(new AuctionHandler),
+#endif
     mCashShopHandler(new CashShopHandler),
     mFamilyHandler(new FamilyHandler),
     mBankHandler(new BankHandler),
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 01eda4145..1acc42a9e 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -82,7 +82,9 @@ class GeneralHandler final : public MessageHandler,
         MessageHandlerPtr mQuestHandler;
         ServerFeatures *mServerFeatures;
         MessageHandlerPtr mMailHandler;
+#ifdef EATHENA_SUPPORT
         MessageHandlerPtr mAuctionHandler;
+#endif
         MessageHandlerPtr mCashShopHandler;
         MessageHandlerPtr mFamilyHandler;
         MessageHandlerPtr mBankHandler;