diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
index d5ea4c8d8..0dcd25eb1 100644
--- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
+++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
@@ -27,8 +27,12 @@
 #include <retroshare/rsiface.h>
 
 #include "gui/Identity/IdDialog.h"
+#ifdef RS_USE_CIRCLES
 #include "gui/Circles/CirclesDialog.h"
+#endif
+#ifdef RS_USE_PHOTOSHARE
 #include "gui/PhotoShare/PhotoShare.h"
+#endif
 #include "gui/WikiPoos/WikiDialog.h"
 #include "gui/Posted/PostedDialog.h"
 #include "gui/GxsForumsDialog.h"
@@ -56,9 +60,9 @@
 #define IMAGE_LIBRARY           ":/images/library.png"
 #define IMAGE_PLUGINS           ":/images/extension_32.png"
 #define IMAGE_GXSFORUMS         ":/images/konversation.png"
-#define IMAGE_WIKI				":/images/wikibook_32.png"
-#define IMAGE_POSTED		    ":/images/posted_32.png"
-#define IMAGE_GXSCHANNELS          ":/images/channels.png"
+#define IMAGE_WIKI              ":/images/wikibook_32.png"
+#define IMAGE_POSTED            ":/images/posted_32.png"
+#define IMAGE_GXSCHANNELS       ":/images/channels.png"
 
 /** Constructor */
 ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
@@ -93,13 +97,17 @@ ApplicationWindow::ApplicationWindow(QWidget* parent, Qt::WFlags flags)
     ui.stackPages->add(idDialog = new IdDialog(ui.stackPages),
                       createPageAction(QIcon(IMAGE_LIBRARY), tr("Identities"), grp));
 
-//    CirclesDialog *circlesDialog = NULL;
-//    ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
-//                      createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
+#ifdef RS_USE_CIRCLES
+    CirclesDialog *circlesDialog = NULL;
+    ui.stackPages->add(circlesDialog = new CirclesDialog(ui.stackPages),
+                      createPageAction(QIcon(IMAGE_LIBRARY), tr("Circles"), grp));
+#endif
 
-//    PhotoShare *photoShare = NULL;
-//    ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
-//                     createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));
+#ifdef RS_USE_PHOTOSHARE
+    PhotoShare *photoShare = NULL;
+    ui.stackPages->add(photoShare = new PhotoShare(ui.stackPages),
+                     createPageAction(QIcon(IMAGE_PHOTO), tr("Photo Share"), grp));
+#endif
 
     PostedDialog *postedDialog = NULL;
     ui.stackPages->add(postedDialog = new PostedDialog(ui.stackPages),
diff --git a/retroshare-gui/src/retroshare-gui.pro b/retroshare-gui/src/retroshare-gui.pro
index 092d95746..52f3f7c85 100644
--- a/retroshare-gui/src/retroshare-gui.pro
+++ b/retroshare-gui/src/retroshare-gui.pro
@@ -920,7 +920,8 @@ unfinished {
 	
 	
 photoshare {
-	
+	DEFINES += RS_USE_PHOTOSHARE
+
 	HEADERS += \
 		gui/PhotoShare/PhotoDrop.h \
 		gui/PhotoShare/AlbumItem.h \
@@ -1016,7 +1017,8 @@ identities {
 }
 	
 circles {
-	
+	DEFINES += RS_USE_CIRCLES
+
 	HEADERS +=  \
 		gui/Circles/CirclesDialog.h \
 		gui/Circles/CreateCircleDialog.h \