3 files changed, 6 insertions, 3 deletions
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index e525d5b85..2a353df80 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -114,9 +114,9 @@ GeneralHandler::GeneralHandler() :
     mElementalHandler(new ElementalHandler),
     mFamilyHandler(new FamilyHandler),
     mFriendsHandler(new FriendsHandler),
+    mHomunculusHandler(new HomunculusHandler),
 #endif
     mMercenaryHandler(new MercenaryHandler),
-    mHomunculusHandler(new HomunculusHandler),
     mMarketHandler(new MarketHandler),
     mVendingHandler(new VendingHandler),
     mSearchStoreHandler(new SearchStoreHandler)
@@ -244,9 +244,9 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mElementalHandler);
     mNetwork->registerHandler(mFamilyHandler);
     mNetwork->registerHandler(mFriendsHandler);
+    mNetwork->registerHandler(mHomunculusHandler);
 #endif
     mNetwork->registerHandler(mMercenaryHandler);
-    mNetwork->registerHandler(mHomunculusHandler);
     mNetwork->registerHandler(mMarketHandler);
     mNetwork->registerHandler(mVendingHandler);
     mNetwork->registerHandler(mSearchStoreHandler);
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 2075702ef..746df8460 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -90,9 +90,9 @@ class GeneralHandler final : public MessageHandler,
         MessageHandlerPtr mElementalHandler;
         MessageHandlerPtr mFamilyHandler;
         MessageHandlerPtr mFriendsHandler;
+        MessageHandlerPtr mHomunculusHandler;
 #endif
         MessageHandlerPtr mMercenaryHandler;
-        MessageHandlerPtr mHomunculusHandler;
         MessageHandlerPtr mMarketHandler;
         MessageHandlerPtr mVendingHandler;
         MessageHandlerPtr mSearchStoreHandler;
diff --git a/src/net/tmwa/homunculushandler.h b/src/net/tmwa/homunculushandler.h
index bd39b54bb..5b4272161 100644
--- a/src/net/tmwa/homunculushandler.h
+++ b/src/net/tmwa/homunculushandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_TMWA_HOMUNCULUSHANDLER_H
 #define NET_TMWA_HOMUNCULUSHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include "net/homunculushandler.h"
 
 #include "net/tmwa/messagehandler.h"
@@ -59,4 +61,5 @@ class HomunculusHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_HOMUNCULUSHANDLER_H