5 files changed, 11 insertions, 5 deletions
diff --git a/src/net/friendshandler.h b/src/net/friendshandler.h
index 068df8761..57dcec2e6 100644
--- a/src/net/friendshandler.h
+++ b/src/net/friendshandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_FRIENDSHANDLER_H
 #define NET_FRIENDSHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include <string>
 
 #include "localconsts.h"
@@ -47,4 +49,5 @@ class FriendsHandler notfinal
 
 extern Net::FriendsHandler *friendsHandler;
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_FRIENDSHANDLER_H
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 3b86526cb..47ab9d8a0 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -47,13 +47,13 @@ namespace Net
     class CashShopHandler;
     class ElementalHandler;
     class FamilyHandler;
+    class FriendsHandler;
 #endif
     class AdminHandler;
     class BeingHandler;
     class BuySellHandler;
     class CharServerHandler;
     class ChatHandler;
-    class FriendsHandler;
     class GameHandler;
     class GeneralHandler;
     class GuildHandler;
@@ -100,10 +100,10 @@ Net::BuyingStoreHandler *buyingStoreHandler = nullptr;
 Net::CashShopHandler *cashShopHandler = nullptr;
 Net::ElementalHandler *elementalHandler = nullptr;
 Net::FamilyHandler *familyHandler = nullptr;
+Net::FriendsHandler *friendsHandler = nullptr;
 #endif
 Net::QuestHandler *questHandler = nullptr;
 Net::HomunculusHandler *homunculusHandler = nullptr;
-Net::FriendsHandler *friendsHandler = nullptr;
 Net::MarketHandler *marketHandler = nullptr;
 Net::VendingHandler *vendingHandler = nullptr;
 Net::SearchStoreHandler *searchStoreHandler = nullptr;
diff --git a/src/net/tmwa/friendshandler.h b/src/net/tmwa/friendshandler.h
index b5abdf8c4..2021352e4 100644
--- a/src/net/tmwa/friendshandler.h
+++ b/src/net/tmwa/friendshandler.h
@@ -21,6 +21,8 @@
 #ifndef NET_TMWA_FRIENDSHANDLER_H
 #define NET_TMWA_FRIENDSHANDLER_H
 
+#ifdef EATHENA_SUPPORT
+
 #include "net/friendshandler.h"
 
 #include "net/tmwa/messagehandler.h"
@@ -49,4 +51,5 @@ class FriendsHandler final : public MessageHandler,
 
 }  // namespace TmwAthena
 
+#endif  // EATHENA_SUPPORT
 #endif  // NET_TMWA_FRIENDSHANDLER_H
diff --git a/src/net/tmwa/generalhandler.cpp b/src/net/tmwa/generalhandler.cpp
index 7008a70f8..e525d5b85 100644
--- a/src/net/tmwa/generalhandler.cpp
+++ b/src/net/tmwa/generalhandler.cpp
@@ -113,10 +113,10 @@ GeneralHandler::GeneralHandler() :
     mCashShopHandler(new CashShopHandler),
     mElementalHandler(new ElementalHandler),
     mFamilyHandler(new FamilyHandler),
+    mFriendsHandler(new FriendsHandler),
 #endif
     mMercenaryHandler(new MercenaryHandler),
     mHomunculusHandler(new HomunculusHandler),
-    mFriendsHandler(new FriendsHandler),
     mMarketHandler(new MarketHandler),
     mVendingHandler(new VendingHandler),
     mSearchStoreHandler(new SearchStoreHandler)
@@ -243,10 +243,10 @@ void GeneralHandler::load()
     mNetwork->registerHandler(mCashShopHandler);
     mNetwork->registerHandler(mElementalHandler);
     mNetwork->registerHandler(mFamilyHandler);
+    mNetwork->registerHandler(mFriendsHandler);
 #endif
     mNetwork->registerHandler(mMercenaryHandler);
     mNetwork->registerHandler(mHomunculusHandler);
-    mNetwork->registerHandler(mFriendsHandler);
     mNetwork->registerHandler(mMarketHandler);
     mNetwork->registerHandler(mVendingHandler);
     mNetwork->registerHandler(mSearchStoreHandler);
diff --git a/src/net/tmwa/generalhandler.h b/src/net/tmwa/generalhandler.h
index 7f4d4793c..2075702ef 100644
--- a/src/net/tmwa/generalhandler.h
+++ b/src/net/tmwa/generalhandler.h
@@ -89,10 +89,10 @@ class GeneralHandler final : public MessageHandler,
         MessageHandlerPtr mCashShopHandler;
         MessageHandlerPtr mElementalHandler;
         MessageHandlerPtr mFamilyHandler;
+        MessageHandlerPtr mFriendsHandler;
 #endif
         MessageHandlerPtr mMercenaryHandler;
         MessageHandlerPtr mHomunculusHandler;
-        MessageHandlerPtr mFriendsHandler;
         MessageHandlerPtr mMarketHandler;
         MessageHandlerPtr mVendingHandler;
         MessageHandlerPtr mSearchStoreHandler;