diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp
index 23b750c22..ba22b7bac 100644
--- a/retroshare-gui/src/gui/notifyqt.cpp
+++ b/retroshare-gui/src/gui/notifyqt.cpp
@@ -35,9 +35,9 @@
 #endif
 
 #include "RsAutoUpdatePage.h"
-#include "MainWindow.h"
 
 #ifndef MINIMAL_RSGUI
+#include "MainWindow.h"
 #include "toaster/OnlineToaster.h"
 #include "toaster/MessageToaster.h"
 #include "toaster/DownloadToaster.h"
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp
index 5384ee89c..b0131e899 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.cpp
+++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp
@@ -30,7 +30,11 @@
 #include <rshare.h>
 
 #include "rsharesettings.h"
+#ifdef MINIMAL_RSGUI
+#include <QMainWindow>
+#else
 #include "gui/MainWindow.h"
+#endif // MINIMAL_RSGUI
 
 #include <retroshare/rsnotify.h>
 
@@ -525,6 +529,7 @@ void RshareSettings::loadWidgetInformation(QMainWindow *widget, QToolBar *toolBa
  loadWidgetInformation(widget);
 }
 
+#ifndef MINIMAL_RSGUI
 /* MainWindow */
 int RshareSettings::getLastPageInMainWindow ()
 {
@@ -559,6 +564,7 @@ void RshareSettings::setStatusBarFlag(uint flag, bool enable)
 
     setStatusBarFlags(flags);
 }
+#endif // MINIMAL_RSGUI
 
 /* Messages */
 bool RshareSettings::getMsgSetToReadOnActivate ()
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.h b/retroshare-gui/src/gui/settings/rsharesettings.h
index a01aa5346..be103d4c7 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.h
+++ b/retroshare-gui/src/gui/settings/rsharesettings.h
@@ -192,12 +192,14 @@ public:
   //! Method overload. Restore window and toolbar information.
   void loadWidgetInformation(QMainWindow *widget, QToolBar *toolBar);
 
+#ifndef MINIMAL_RSGUI
   /* MainWindow */
   int  getLastPageInMainWindow ();
   void setLastPageInMainWindow (int value);
   uint getStatusBarFlags();
   void setStatusBarFlags(uint flags);
   void setStatusBarFlag(uint flag, bool enable);
+#endif // MINIMAL_RSGUI
 
   /* Messages */
   bool getMsgSetToReadOnActivate ();
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 8b9038be6..e9b691ab2 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -32,6 +32,7 @@
 #include "gui/SharedFilesDialog.h"
 #include "gui/NetworkDialog.h"
 #include "gui/chat/PopupChatDialog.h"
+#include "gui/QuickStartWizard.h"
 #endif // MINIMAL_RSGUI
 #include "gui/MessengerWindow.h"
 #include "gui/StartDialog.h"
@@ -41,7 +42,6 @@
 #include "gui/connect/ConfCertDialog.h"
 #include "idle/idle.h"
 #include "gui/common/Emoticons.h"
-#include "gui/QuickStartWizard.h"
 
 /*** WINDOWS DON'T LIKE THIS - REDEFINES VER numbers.
 #include <gui/qskinobject/qskinobject.h>