diff --git a/plugins/FeedReader/gui/FeedReaderDialog.cpp b/plugins/FeedReader/gui/FeedReaderDialog.cpp
index 87db9cf9c..4fa66f6d1 100644
--- a/plugins/FeedReader/gui/FeedReaderDialog.cpp
+++ b/plugins/FeedReader/gui/FeedReaderDialog.cpp
@@ -73,7 +73,7 @@ FeedReaderDialog::FeedReaderDialog(RsFeedReader *feedReader, FeedReaderNotify *n
 	connect(mNotify, &FeedReaderNotify::feedChanged, this, &FeedReaderDialog::feedChanged, Qt::QueuedConnection);
 	connect(mNotify, &FeedReaderNotify::optimizeImage, this, &FeedReaderDialog::optimizeImage, Qt::QueuedConnection);
 
-	connect(NotifyQt::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
+	connect(RsGUIEventManager::getInstance(), SIGNAL(settingsChanged()), this, SLOT(settingsChanged()));
 
 	/* connect signals */
 	connect(ui->feedTreeWidget, SIGNAL(itemActivated(QTreeWidgetItem*,int)), this, SLOT(feedTreeItemActivated(QTreeWidgetItem*)));
diff --git a/retroshare-gui/src/gui/RsGUIEventManager.cpp b/retroshare-gui/src/gui/RsGUIEventManager.cpp
index f7831dfbf..bad13ab9d 100644
--- a/retroshare-gui/src/gui/RsGUIEventManager.cpp
+++ b/retroshare-gui/src/gui/RsGUIEventManager.cpp
@@ -21,7 +21,6 @@
 #include "gui/common/FilesDefs.h"
 #include <retroshare/rsgxsifacehelper.h>
 
-#include "notifyqt.h"
 #include <retroshare/rspeers.h>
 #include <retroshare/rsidentity.h>
 #include <retroshare/rsmsgs.h>
@@ -42,6 +41,7 @@
 #include "toaster/FriendRequestToaster.h"
 #include "toaster/ToasterItem.h"
 #include "common/ToasterNotify.h"
+#include "RsGUIEventManager.h"
 
 #include "chat/ChatDialog.h"
 #include "chat/ChatLobbyDialog.h"
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 130b32775..dd343bf03 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -108,7 +108,7 @@ __declspec(dllexport) __cdecl BOOL _OPENSSL_isservice(void)
 #include <util/stringutil.h>
 #include <retroshare/rsinit.h>
 #include <retroshare/rsiface.h>
-#include "gui/notifyqt.h"
+#include "gui/RsGUIEventManager.h"
 #include <unistd.h>
 
 static void showHelp(const argstream& as)
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 4be85fadc..32aa52360 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -371,7 +371,7 @@ HEADERS +=  rshare.h \
             retroshare-gui/configpage.h \
             retroshare-gui/RsAutoUpdatePage.h \
             retroshare-gui/mainpage.h \
-            gui/notifyqt.h \
+            gui/RsGUIEventManager.h \
             control/bandwidthevent.h \
             control/eventtype.h \
             gui/QuickStartWizard.h \
@@ -620,22 +620,6 @@ HEADERS +=  rshare.h \
             gui/NetworkDialog/pgpid_item_proxy.h \
             gui/common/RsCollection.h \
             util/retroshareWin32.h
-#            gui/ForumsDialog.h \
-#            gui/forums/ForumDetails.h \
-#            gui/forums/EditForumDetails.h \
-#            gui/forums/CreateForum.h \
-#            gui/forums/CreateForumMsg.h \
-#            gui/forums/ForumUserNotify.h \
-#            gui/feeds/ForumNewItem.h \
-#            gui/feeds/ForumMsgItem.h \
-#            gui/ChannelFeed.h \
-#            gui/feeds/ChanNewItem.h \
-#            gui/feeds/ChanMsgItem.h \
-#            gui/channels/CreateChannel.h \
-#            gui/channels/ChannelDetails.h \
-#            gui/channels/CreateChannelMsg.h \
-#            gui/channels/EditChanDetails.h \
-#            gui/channels/ChannelUserNotify.h \
 
 FORMS +=    gui/StartDialog.ui \
             gui/HomePage.ui\
@@ -654,7 +638,6 @@ FORMS +=    gui/StartDialog.ui \
             gui/NetworkView.ui \
             gui/FriendsDialog.ui \
             gui/ShareManager.ui \
-#            gui/ShareDialog.ui \
             gui/help/browser/helpbrowser.ui \
             gui/HelpDialog.ui \
             gui/ServicePermissionDialog.ui \
@@ -761,7 +744,7 @@ FORMS +=    gui/StartDialog.ui \
 
 SOURCES +=  main.cpp \
             rshare.cpp \
-            gui/notifyqt.cpp \
+            gui/RsGUIEventManager.cpp \
             gui/AboutDialog.cpp \
             gui/AboutWidget.cpp \
             gui/QuickStartWizard.cpp \