diff --git a/retroshare-gui/src/gui/FriendsDialog.cpp b/retroshare-gui/src/gui/FriendsDialog.cpp
index 16a44dcec..b42792500 100644
--- a/retroshare-gui/src/gui/FriendsDialog.cpp
+++ b/retroshare-gui/src/gui/FriendsDialog.cpp
@@ -55,8 +55,9 @@
 #include "NetworkView.h"
 #include "NetworkDialog.h"
 #include "gui/Identity/IdDialog.h"
+#ifdef RS_USE_CIRCLES
 #include "gui/Circles/CirclesDialog.h"
-
+#endif
 /* Images for Newsfeed icons */
 //#define IMAGE_NEWSFEED           ""
 //#define IMAGE_NEWSFEED_NEW       ":/images/message-state-new.png"
@@ -258,8 +259,10 @@ void FriendsDialog::activatePage(FriendsDialog::Page page)
 	{
 		case FriendsDialog::IdTab: ui.tabWidget->setCurrentWidget(idDialog) ;
 											  break ;
+#ifdef RS_USE_CIRCLES
 		case FriendsDialog::CirclesTab: ui.tabWidget->setCurrentWidget(circlesDialog) ;
 											  break ;
+#endif
 		case FriendsDialog::NetworkTab: ui.tabWidget->setCurrentWidget(networkDialog) ;
 											  break ;
 		case FriendsDialog::BroadcastTab: ui.tabWidget->setCurrentWidget(networkDialog) ;
diff --git a/retroshare-gui/src/gui/FriendsDialog.h b/retroshare-gui/src/gui/FriendsDialog.h
index 13f1a9c24..e3a04e1f2 100644
--- a/retroshare-gui/src/gui/FriendsDialog.h
+++ b/retroshare-gui/src/gui/FriendsDialog.h
@@ -47,7 +47,9 @@ public:
 		 enum Page {
 						 /* Fixed numbers for load and save the last page */
 			 				IdTab              = 0,  /** Identities page. */
+#ifdef RS_USE_CIRCLES
 							CirclesTab         = 1,  /** Circles page. */
+#endif
 							NetworkTab         = 2,  /** Network page. */
 							NetworkViewTab     = 3,  /** Network new graph. */
 							BroadcastTab       = 4   /** Old group chat page. */
@@ -75,7 +77,9 @@ public:
 	 NetworkDialog *networkDialog ;
 	 NetworkView *networkView ;
 	 
+#ifdef RS_USE_CIRCLES
 	 CirclesDialog *circlesDialog;
+#endif
 	 IdDialog *idDialog;
 	 
 public slots:
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 9816df1d5..b2fb74308 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -93,8 +93,12 @@
 #include "gui/gxschannels/GxsChannelDialog.h"
 #include "gui/gxsforums/GxsForumsDialog.h"
 #include "gui/Identity/IdDialog.h"
+#ifdef RS_USE_CIRCLES
 #include "gui/Circles/CirclesDialog.h"
+#endif
+#ifdef RS_USE_WIKI
 #include "gui/WikiPoos/WikiDialog.h"
+#endif
 #include "gui/Posted/PostedDialog.h"
 #include "gui/statistics/StatisticsWindow.h"
 
@@ -350,8 +354,8 @@ void MainWindow::initStackedPage()
   //notify.push_back(QPair<MainPage*, QAction*>(friendsDialog, action));
   addPage(friendsDialog = new FriendsDialog(ui->stackPages), grp, &notify);
 
-  PeopleDialog *peopleDialog = NULL;
 #ifdef RS_USE_CIRCLES
+  PeopleDialog *peopleDialog = NULL;
   //ui->stackPages->add(peopleDialog = new PeopleDialog(ui->stackPages),
   //                   action = createPageAction(QIcon(IMAGE_IDENTITY), tr("People"), grp));
   //notify.push_back(QPair<MainPage*, QAction*>(peopleDialog, action));
@@ -364,8 +368,8 @@ void MainWindow::initStackedPage()
   //notify.push_back(QPair<MainPage*, QAction*>(idDialog, action));
   addPage(idDialog = new IdDialog(ui->stackPages), grp, &notify);
 
-  CirclesDialog *circlesDialog = NULL;
 #ifdef RS_USE_CIRCLES
+  CirclesDialog *circlesDialog = NULL;
   //ui->stackPages->add(circlesDialog = new CirclesDialog(ui->stackPages),
   //                   action = createPageAction(QIcon(IMAGE_CIRCLES ), tr("Circles"), grp));
   //notify.push_back(QPair<MainPage*, QAction*>(circlesDialog, action));
@@ -399,8 +403,8 @@ void MainWindow::initStackedPage()
   
   addPage(postedDialog = new PostedDialog(ui->stackPages), grp, &notify);
 
-  WikiDialog *wikiDialog = NULL;
 #ifdef RS_USE_WIKI
+  WikiDialog *wikiDialog = NULL;
   addPage(wikiDialog = new WikiDialog(ui->stackPages), grp, &notify);
 #endif