diff --git a/retroshare-gui/src/gui/ChatLobbyWidget.cpp b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
index 3e1b600fa..c669df327 100644
--- a/retroshare-gui/src/gui/ChatLobbyWidget.cpp
+++ b/retroshare-gui/src/gui/ChatLobbyWidget.cpp
@@ -40,7 +40,6 @@
 
 #include "retroshare/rsmsgs.h"
 #include "retroshare/rspeers.h"
-#include "retroshare/rsnotify.h"
 #include "retroshare/rsidentity.h"
 
 #include <QGridLayout>
diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index 93f56d00f..f829602b3 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -39,7 +39,6 @@
 #include "retroshare/rstor.h"
 #include "retroshare/rsidentity.h"
 #include "retroshare/rsinit.h"
-#include "retroshare/rsnotify.h"
 #include "rsserver/rsaccounts.h"
 #include "util/rsrandom.h"
 
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 9984436fa..12b2342a5 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -101,7 +101,6 @@
 #include "retroshare/rsiface.h"
 #include "retroshare/rspeers.h"
 #include "retroshare/rsfiles.h"
-#include "retroshare/rsnotify.h"
 #include "retroshare/rsinit.h"
 
 #include "gui/gxschannels/GxsChannelDialog.h"
diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp
index 28db4a7ee..7e18cbb0b 100644
--- a/retroshare-gui/src/gui/MessengerWindow.cpp
+++ b/retroshare-gui/src/gui/MessengerWindow.cpp
@@ -29,7 +29,6 @@
 #include <retroshare/rspeers.h>
 #include <retroshare/rsmsgs.h>
 #include <retroshare/rsstatus.h>
-#include <retroshare/rsnotify.h>
 
 #include "rshare.h"
 #include "MessengerWindow.h"
diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp
index 60791d975..8a9b506ce 100644
--- a/retroshare-gui/src/gui/NewsFeed.cpp
+++ b/retroshare-gui/src/gui/NewsFeed.cpp
@@ -27,7 +27,6 @@
 #include <retroshare/rsgxschannels.h>
 #include <retroshare/rsgxsforums.h>
 #include <retroshare/rsmsgs.h>
-#include <retroshare/rsnotify.h>
 #include <retroshare/rspeers.h>
 #include <retroshare/rsplugin.h>
 #include <retroshare/rsposted.h>
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index 212ca95b5..a22f9ced8 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -41,7 +41,6 @@
 #include <retroshare/rsgxsforums.h>
 #include <retroshare/rsidentity.h>
 #include <retroshare/rsmsgs.h>
-#include <retroshare/rsnotify.h>
 #include <retroshare/rspeers.h>
 
 #include <QApplication>
diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp
index 4f71b102f..f52179c39 100644
--- a/retroshare-gui/src/gui/StartDialog.cpp
+++ b/retroshare-gui/src/gui/StartDialog.cpp
@@ -25,7 +25,6 @@
 #include "settings/rsharesettings.h"
 
 #include "retroshare/rsinit.h"
-#include "retroshare/rsnotify.h"
 
 #include <QLineEdit>
 #include <QMessageBox>
diff --git a/retroshare-gui/src/gui/chat/ChatDialog.cpp b/retroshare-gui/src/gui/chat/ChatDialog.cpp
index 90389c36f..22e45cdc9 100644
--- a/retroshare-gui/src/gui/chat/ChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatDialog.cpp
@@ -35,7 +35,6 @@
 #include "gui/SoundManager.h"
 
 #include <retroshare/rsiface.h>
-#include <retroshare/rsnotify.h>
 #include <retroshare/rspeers.h>
 
 static std::map<ChatId, ChatDialog*> chatDialogsList;
diff --git a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
index cec0095e0..71f884ed5 100644
--- a/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
+++ b/retroshare-gui/src/gui/chat/ChatLobbyDialog.cpp
@@ -45,7 +45,6 @@
 #include "util/HandleRichText.h"
 #include "util/RsQtVersion.h"
 
-#include "retroshare/rsnotify.h"
 #include "util/rstime.h"
 #include "util/DateTime.h"
 
diff --git a/retroshare-gui/src/gui/chat/ChatUserNotify.cpp b/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
index 0ee262dff..2d438f022 100644
--- a/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
+++ b/retroshare-gui/src/gui/chat/ChatUserNotify.cpp
@@ -29,7 +29,6 @@
 #include "util/qtthreadsutils.h"
 
 #include <algorithm>
-#include <retroshare/rsnotify.h>
 #include <retroshare/rsmsgs.h>
 
 static std::map<ChatId, int> waitingChats;
diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
index 6d5c9dd0b..793835d70 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
@@ -32,7 +32,6 @@
 
 #include <retroshare/rspeers.h>
 #include <retroshare/rsiface.h>
-#include <retroshare/rsnotify.h>
 
 #include <algorithm>
 
diff --git a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp
index 2c02ba8e0..eb2f6d7a0 100644
--- a/retroshare-gui/src/gui/chat/PopupChatWindow.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatWindow.cpp
@@ -39,7 +39,6 @@
 
 #include <retroshare/rsidentity.h>
 #include <retroshare/rsmsgs.h>
-#include <retroshare/rsnotify.h>
 
 
 #define IMAGE_TYPING         ":/images/white-bubble-64.png"
diff --git a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp
index 2039e0804..9f306685d 100644
--- a/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp
+++ b/retroshare-gui/src/gui/feeds/SecurityIpItem.cpp
@@ -33,7 +33,6 @@
 
 #include <retroshare/rspeers.h>
 #include <retroshare/rsbanlist.h>
-#include <retroshare/rsnotify.h>
 
 /*****
  * #define DEBUG_ITEM 1
diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp
index e4ee26b85..fe7e387e4 100644
--- a/retroshare-gui/src/gui/notifyqt.cpp
+++ b/retroshare-gui/src/gui/notifyqt.cpp
@@ -22,7 +22,6 @@
 #include <retroshare/rsgxsifacehelper.h>
 
 #include "notifyqt.h"
-#include <retroshare/rsnotify.h>
 #include <retroshare/rspeers.h>
 #include <retroshare/rsidentity.h>
 #include <retroshare/rsmsgs.h>
diff --git a/retroshare-gui/src/gui/notifyqt.h b/retroshare-gui/src/gui/notifyqt.h
index aae3b1728..8f7a75529 100644
--- a/retroshare-gui/src/gui/notifyqt.h
+++ b/retroshare-gui/src/gui/notifyqt.h
@@ -23,7 +23,6 @@
 
 #include <retroshare/rsiface.h>
 #include <retroshare/rsturtle.h>
-#include <retroshare/rsnotify.h>
 #include <retroshare/rsmsgs.h>
 #include <QObject>
 #include <QMutex>
diff --git a/retroshare-gui/src/gui/settings/ChatPage.cpp b/retroshare-gui/src/gui/settings/ChatPage.cpp
index 769ec28c2..57a2a86f3 100644
--- a/retroshare-gui/src/gui/settings/ChatPage.cpp
+++ b/retroshare-gui/src/gui/settings/ChatPage.cpp
@@ -31,7 +31,6 @@
 #include "retroshare/rsconfig.h"
 #include "retroshare/rshistory.h"
 #include "retroshare/rsmsgs.h"
-#include "retroshare/rsnotify.h"
 #include "retroshare/rspeers.h"
 
 #include <QColorDialog>
diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp
index 046895414..0dc7e6d9e 100755
--- a/retroshare-gui/src/gui/settings/NotifyPage.cpp
+++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp
@@ -21,7 +21,6 @@
 #include <rshare.h>
 #include "NotifyPage.h"
 
-#include <retroshare/rsnotify.h>
 #include <retroshare/rsplugin.h>
 #include "rsharesettings.h"
 
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp
index 17d8db2b5..887d4276f 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.cpp
+++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp
@@ -37,7 +37,6 @@
 #include <retroshare/rsjsonapi.h>
 #endif
 
-#include <retroshare/rsnotify.h>
 #include <retroshare/rspeers.h>
 
 #ifdef Q_OS_WIN