3 files changed, 13 insertions, 10 deletions
diff --git a/src/net/eathena/adminhandler.cpp b/src/net/eathena/adminhandler.cpp
index 6a68446f3..86b57a2b2 100644
--- a/src/net/eathena/adminhandler.cpp
+++ b/src/net/eathena/adminhandler.cpp
@@ -22,12 +22,13 @@
 
 #include "net/eathena/adminhandler.h"
 
-#include "notifications.h"
 #include "notifymanager.h"
 
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
+#include "resources/notifytypes.h"
+
 #include <string>
 
 #include "debug.h"
@@ -56,9 +57,9 @@ void AdminHandler::handleMessage(Net::MessageIn &msg)
     {
         case SMSG_ADMIN_KICK_ACK:
             if (msg.readInt32() == 0)
-                NotifyManager::notify(NotifyManager::KICK_FAIL);
+                NotifyManager::notify(NotifyTypes::KICK_FAIL);
             else
-                NotifyManager::notify(NotifyManager::KICK_SUCCEED);
+                NotifyManager::notify(NotifyTypes::KICK_SUCCEED);
             break;
         default:
             break;
diff --git a/src/net/eathena/buysellhandler.cpp b/src/net/eathena/buysellhandler.cpp
index 65e955d91..30fb8beae 100644
--- a/src/net/eathena/buysellhandler.cpp
+++ b/src/net/eathena/buysellhandler.cpp
@@ -22,7 +22,6 @@
 
 #include "net/eathena/buysellhandler.h"
 
-#include "notifications.h"
 #include "notifymanager.h"
 
 #include "being/attributes.h"
@@ -34,6 +33,8 @@
 
 #include "net/eathena/protocol.h"
 
+#include "resources/notifytypes.h"
+
 #include "debug.h"
 
 extern Net::BuySellHandler *buySellHandler;
@@ -113,17 +114,17 @@ void BuySellHandler::processNpcSellResponse(Net::MessageIn &msg)
     switch (msg.readInt8())
     {
         case 0:
-            NotifyManager::notify(NotifyManager::SOLD);
+            NotifyManager::notify(NotifyTypes::SOLD);
             break;
         case 1:
         default:
-            NotifyManager::notify(NotifyManager::SELL_FAILED);
+            NotifyManager::notify(NotifyTypes::SELL_FAILED);
             break;
         case 2:
-            NotifyManager::notify(NotifyManager::SELL_TRADE_FAILED);
+            NotifyManager::notify(NotifyTypes::SELL_TRADE_FAILED);
             break;
         case 3:
-            NotifyManager::notify(NotifyManager::SELL_UNSELLABLE_FAILED);
+            NotifyManager::notify(NotifyTypes::SELL_UNSELLABLE_FAILED);
             break;
     }
 }
diff --git a/src/net/eathena/partyhandler.cpp b/src/net/eathena/partyhandler.cpp
index bfbe5c8f7..08074fa23 100644
--- a/src/net/eathena/partyhandler.cpp
+++ b/src/net/eathena/partyhandler.cpp
@@ -22,7 +22,6 @@
 #include "net/eathena/partyhandler.h"
 
 #include "actormanager.h"
-#include "notifications.h"
 #include "notifymanager.h"
 #include "party.h"
 
@@ -31,6 +30,8 @@
 #include "net/eathena/messageout.h"
 #include "net/eathena/protocol.h"
 
+#include "resources/notifytypes.h"
+
 #include "debug.h"
 
 extern Net::PartyHandler *partyHandler;
@@ -167,7 +168,7 @@ void PartyHandler::kick(const std::string &name) const
     const PartyMember *const m = Ea::taParty->getMember(name);
     if (!m)
     {
-        NotifyManager::notify(NotifyManager::PARTY_USER_NOT_IN_PARTY, name);
+        NotifyManager::notify(NotifyTypes::PARTY_USER_NOT_IN_PARTY, name);
         return;
     }