6 files changed, 11 insertions, 6 deletions
diff --git a/src/net/familyhandler.h b/src/net/familyhandler.h
index cbb8451ad..df151560e 100644
--- a/src/net/familyhandler.h
+++ b/src/net/familyhandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_FAMILYHANDLER_H
 #define NET_FAMILYHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include <string>
 
 #include "localconsts.h"
@@ -45,4 +47,5 @@ class FamilyHandler notfinal
 
 extern Net::FamilyHandler *familyHandler;
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_FAMILYHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index e421bfe1a..3b86526cb 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -46,13 +46,13 @@ namespace Net
     class BuyingStoreHandler;
     class CashShopHandler;
     class ElementalHandler;
+    class FamilyHandler;
 #endif
     class AdminHandler;
     class BeingHandler;
     class BuySellHandler;
     class CharServerHandler;
     class ChatHandler;
-    class FamilyHandler;
     class FriendsHandler;
     class GameHandler;
     class GeneralHandler;
@@ -99,8 +99,8 @@ Net::BankHandler *bankHandler = nullptr;
 Net::BuyingStoreHandler *buyingStoreHandler = nullptr;
 Net::CashShopHandler *cashShopHandler = nullptr;
 Net::ElementalHandler *elementalHandler = nullptr;
-#endif
 Net::FamilyHandler *familyHandler = nullptr;
+#endif
 Net::QuestHandler *questHandler = nullptr;
 Net::HomunculusHandler *homunculusHandler = nullptr;
 Net::FriendsHandler *friendsHandler = nullptr;
diff --git a/src/net/tmwa/auctionhandler.h b/src/net/tmwa/auctionhandler.h
index 01e1428d7..0cc72f184 100644
--- a/src/net/tmwa/auctionhandler.h
+++ b/src/net/tmwa/auctionhandler.h
@@ -29,7 +29,6 @@
 
 namespace TmwAthena
 {
-
 class AuctionHandler final : public MessageHandler, public Net::AuctionHandler
 {
     public:
diff --git a/src/net/tmwa/familyhandler.h b/src/net/tmwa/familyhandler.h
index 56e5d9873..e284312b9 100644
--- a/src/net/tmwa/familyhandler.h
+++ b/src/net/tmwa/familyhandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_TMWA_FAMILYHANDLER_H
 #define NET_TMWA_FAMILYHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include "net/familyhandler.h"
 
 #include "net/tmwa/messagehandler.h"
@@ -45,4 +47,5 @@ class FamilyHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_FAMILYHANDLER_H
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index bf36f1fc3..7008a70f8 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -112,8 +112,8 @@ GeneralHandler::GeneralHandler() :
     mBuyingStoreHandler(new BuyingStoreHandler),
     mCashShopHandler(new CashShopHandler),
     mElementalHandler(new ElementalHandler),
-#endif
     mFamilyHandler(new FamilyHandler),
+#endif
     mMercenaryHandler(new MercenaryHandler),
     mHomunculusHandler(new HomunculusHandler),
     mFriendsHandler(new FriendsHandler),
@@ -242,8 +242,8 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mBuyingStoreHandler);
     mNetwork->registerHandler(mCashShopHandler);
     mNetwork->registerHandler(mElementalHandler);
-#endif
     mNetwork->registerHandler(mFamilyHandler);
+#endif
     mNetwork->registerHandler(mMercenaryHandler);
     mNetwork->registerHandler(mHomunculusHandler);
     mNetwork->registerHandler(mFriendsHandler);
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 08ef109a9..7f4d4793c 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -88,8 +88,8 @@ class GeneralHandler final : public MessageHandler,
         MessageHandlerPtr mBuyingStoreHandler;
         MessageHandlerPtr mCashShopHandler;
         MessageHandlerPtr mElementalHandler;
-#endif
         MessageHandlerPtr mFamilyHandler;
+#endif
         MessageHandlerPtr mMercenaryHandler;
         MessageHandlerPtr mHomunculusHandler;
         MessageHandlerPtr mFriendsHandler;