3 files changed, 3 insertions, 7 deletions
diff --git a/src/net/net.cpp b/src/net/net.cpp
index 4e904778c..ee375cfc3 100644
--- a/src/net/net.cpp
+++ b/src/net/net.cpp
@@ -53,6 +53,7 @@ namespace Net
     class InventoryHandler;
     class LoginHandler;
     class MailHandler;
+    class NpcHandler;
 }
 
 Net::AdminHandler *adminHandler = nullptr;
@@ -78,11 +79,6 @@ Net::CashShopHandler *cashShopHandler = nullptr;
 Net::FamilyHandler *familyHandler = nullptr;
 Net::BankHandler *bankHandler = nullptr;
 
-Net::NpcHandler *Net::getNpcHandler()
-{
-    return npcHandler;
-}
-
 Net::PartyHandler *Net::getPartyHandler()
 {
     return partyHandler;
diff --git a/src/net/net.h b/src/net/net.h
index b1e6a52ca..e550cfc75 100644
--- a/src/net/net.h
+++ b/src/net/net.h
@@ -36,7 +36,6 @@
 namespace Net
 {
 
-class NpcHandler;
 class PartyHandler;
 class PetHandler;
 class PlayerHandler;
@@ -44,7 +43,6 @@ class SkillHandler;
 class TradeHandler;
 class ServerFeatures;
 
-NpcHandler *getNpcHandler() A_WARN_UNUSED;
 PartyHandler *getPartyHandler() A_WARN_UNUSED;
 PetHandler *getPetHandler() A_WARN_UNUSED;
 PlayerHandler *getPlayerHandler() A_WARN_UNUSED;
diff --git a/src/net/npchandler.h b/src/net/npchandler.h
index 9dfc7dbbc..706f6d7c3 100644
--- a/src/net/npchandler.h
+++ b/src/net/npchandler.h
@@ -93,4 +93,6 @@ class NpcHandler notfinal
 
 }  // namespace Net
 
+extern Net::NpcHandler *npcHandler;
+
 #endif  // NET_NPCHANDLER_H