5 files changed, 12 insertions, 6 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 7b0d34d9a..326361b1c 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -52,6 +52,7 @@ namespace Net
     class MailHandler;
     class MarketHandler;
     class MercenaryHandler;
+    class SearchStoreHandler;
 #endif
     class AdminHandler;
     class BeingHandler;
@@ -67,7 +68,6 @@ namespace Net
     class PetHandler;
     class PlayerHandler;
     class QuestHandler;
-    class SearchStoreHandler;
     class ServerFeatures;
     class SkillHandler;
     class TradeHandler;
@@ -103,10 +103,10 @@ Net::HomunculusHandler *homunculusHandler = nullptr;
 Net::MailHandler *mailHandler = nullptr;
 Net::MarketHandler *marketHandler = nullptr;
 Net::MercenaryHandler *mercenaryHandler = nullptr;
+Net::SearchStoreHandler *searchStoreHandler = nullptr;
 #endif
 Net::QuestHandler *questHandler = nullptr;
 Net::VendingHandler *vendingHandler = nullptr;
-Net::SearchStoreHandler *searchStoreHandler = nullptr;
 
 namespace Net
 {
diff --git a/src/net/searchstorehandler.h b/src/net/searchstorehandler.h
index 3f65730fd..19ef98af6 100644
--- a/src/net/searchstorehandler.h
+++ b/src/net/searchstorehandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_SEARCHSTOREHANDLER_H
 #define NET_SEARCHSTOREHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include <string>
 
 #include "enums/net/storesearchtype.h"
@@ -54,4 +56,5 @@ class SearchStoreHandler notfinal
 
 extern Net::SearchStoreHandler *searchStoreHandler;
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_SEARCHSTOREHANDLER_H
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 9205db800..3326ae3e7 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -117,9 +117,9 @@ GeneralHandler::GeneralHandler() :
     mMailHandler(new MailHandler),
     mMarketHandler(new MarketHandler),
     mMercenaryHandler(new MercenaryHandler),
+    mSearchStoreHandler(new SearchStoreHandler),
 #endif
-    mVendingHandler(new VendingHandler),
-    mSearchStoreHandler(new SearchStoreHandler)
+    mVendingHandler(new VendingHandler)
 {
     static const uint16_t _messages[] =
     {
@@ -247,9 +247,9 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mMailHandler);
     mNetwork->registerHandler(mMarketHandler);
     mNetwork->registerHandler(mMercenaryHandler);
+    mNetwork->registerHandler(mSearchStoreHandler);
 #endif
     mNetwork->registerHandler(mVendingHandler);
-    mNetwork->registerHandler(mSearchStoreHandler);
 }
 
 void GeneralHandler::reload()
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index c037da7c2..69208b4db 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -92,10 +92,10 @@ class GeneralHandler final : public MessageHandler,
         MessageHandlerPtr mHomunculusHandler;
         MessageHandlerPtr mMailHandler;
         MessageHandlerPtr mMarketHandler;
+        MessageHandlerPtr mSearchStoreHandler;
 #endif
         MessageHandlerPtr mMercenaryHandler;
         MessageHandlerPtr mVendingHandler;
-        MessageHandlerPtr mSearchStoreHandler;
 };
 
 }  // namespace TmwAthena
diff --git a/src/net/tmwa/searchstorehandler.h b/src/net/tmwa/searchstorehandler.h
index 4f2f9a6de..b0217d3cb 100644
--- a/src/net/tmwa/searchstorehandler.h
+++ b/src/net/tmwa/searchstorehandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_TMWA_SEARCHSTOREHANDLER_H
 #define NET_TMWA_SEARCHSTOREHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include "net/searchstorehandler.h"
 
 #include "net/tmwa/messagehandler.h"
@@ -53,4 +55,5 @@ class SearchStoreHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_SEARCHSTOREHANDLER_H