diff --git a/libretroshare/src/dbase/fimonitor.cc b/libretroshare/src/dbase/fimonitor.cc
index 1e96a6ca9..f4e946573 100644
--- a/libretroshare/src/dbase/fimonitor.cc
+++ b/libretroshare/src/dbase/fimonitor.cc
@@ -28,8 +28,8 @@
 #include "dbase/fimonitor.h"
 #include "util/rsdir.h"
 #include "serialiser/rsserviceids.h"
-#include "rsiface/rsiface.h"
-#include "rsiface/rsnotify.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rsnotify.h"
 #include "util/folderiterator.h"
 #include <errno.h>
 
diff --git a/libretroshare/src/dbase/fimonitor.h b/libretroshare/src/dbase/fimonitor.h
index 066e62e70..0da674eea 100644
--- a/libretroshare/src/dbase/fimonitor.h
+++ b/libretroshare/src/dbase/fimonitor.h
@@ -27,7 +27,7 @@
 #include "dbase/cachestrapper.h"
 #include "dbase/findex.h"
 #include "util/rsthreads.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 
 /******************************************************************************************
  * The Local Monitoring Class: FileIndexMonitor.
diff --git a/libretroshare/src/dbase/findex.cc b/libretroshare/src/dbase/findex.cc
index 8659979d7..7e1f62b05 100644
--- a/libretroshare/src/dbase/findex.cc
+++ b/libretroshare/src/dbase/findex.cc
@@ -23,7 +23,7 @@
 
 #include <util/rswin.h>
 #include "dbase/findex.h"
-#include "rsiface/rsexpr.h"
+#include "retroshare/rsexpr.h"
 #include "util/rsdir.h"
 
 #include <assert.h>
diff --git a/libretroshare/src/dbase/findex.h b/libretroshare/src/dbase/findex.h
index 67febd805..cbb9e5d6b 100644
--- a/libretroshare/src/dbase/findex.h
+++ b/libretroshare/src/dbase/findex.h
@@ -30,7 +30,7 @@
 #include <list>
 #include <vector>
 #include <stdint.h>
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 
 class ostream;
 
diff --git a/libretroshare/src/dbase/fistore.cc b/libretroshare/src/dbase/fistore.cc
index d507c7a98..da8725a6a 100644
--- a/libretroshare/src/dbase/fistore.cc
+++ b/libretroshare/src/dbase/fistore.cc
@@ -22,7 +22,7 @@
  */
 
 #include "dbase/fistore.h"
-#include "rsiface/rsexpr.h"
+#include "retroshare/rsexpr.h"
 #include "serialiser/rsserviceids.h"
 #include "pqi/p3connmgr.h"
 
diff --git a/libretroshare/src/dbase/fistore.h b/libretroshare/src/dbase/fistore.h
index 88cb803e1..5569ef413 100644
--- a/libretroshare/src/dbase/fistore.h
+++ b/libretroshare/src/dbase/fistore.h
@@ -38,7 +38,7 @@ class p3ConnectMgr ;
 
 #include "dbase/findex.h"
 #include "dbase/cachestrapper.h"
-#include "rsiface/rsiface.h"
+#include "retroshare/rsiface.h"
 
 class FileStoreResult
 {
diff --git a/libretroshare/src/dbase/rsexpr.cc b/libretroshare/src/dbase/rsexpr.cc
index d403b25f3..ac819209d 100644
--- a/libretroshare/src/dbase/rsexpr.cc
+++ b/libretroshare/src/dbase/rsexpr.cc
@@ -25,7 +25,7 @@
 
 
 #include "dbase/findex.h"
-#include "rsiface/rsexpr.h"
+#include "retroshare/rsexpr.h"
 #include <algorithm>
 #include <functional>
 
diff --git a/libretroshare/src/ft/ftchunkmap.cc b/libretroshare/src/ft/ftchunkmap.cc
index 9002c6f38..5b28649e6 100644
--- a/libretroshare/src/ft/ftchunkmap.cc
+++ b/libretroshare/src/ft/ftchunkmap.cc
@@ -3,8 +3,8 @@
 #endif
 #include <math.h>
 #include <stdlib.h>
-#include <rsiface/rspeers.h>
-#include <rsiface/rsturtle.h>
+#include "retroshare/rspeers.h"
+#include "retroshare/rsturtle.h"
 #include "ftchunkmap.h"
 #include <time.h>
 
diff --git a/libretroshare/src/ft/ftchunkmap.h b/libretroshare/src/ft/ftchunkmap.h
index d91485c4e..36b5ad8e7 100644
--- a/libretroshare/src/ft/ftchunkmap.h
+++ b/libretroshare/src/ft/ftchunkmap.h
@@ -1,7 +1,7 @@
 #pragma once
 
 #include <map>
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 
 // ftChunkMap: 
 // 	- handles chunk map over a complete file
diff --git a/libretroshare/src/ft/ftcontroller.h b/libretroshare/src/ft/ftcontroller.h
index ae2e0fcc3..a38b72e03 100644
--- a/libretroshare/src/ft/ftcontroller.h
+++ b/libretroshare/src/ft/ftcontroller.h
@@ -51,7 +51,7 @@ class p3turtle ;
 #include "pqi/pqimonitor.h"
 #include "pqi/p3cfgmgr.h"
 
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 #include "serialiser/rsconfigitems.h"
 
 #include <map>
diff --git a/libretroshare/src/ft/ftdatamultiplex.h b/libretroshare/src/ft/ftdatamultiplex.h
index 6f5c26a2a..7a5436618 100644
--- a/libretroshare/src/ft/ftdatamultiplex.h
+++ b/libretroshare/src/ft/ftdatamultiplex.h
@@ -45,7 +45,7 @@ class ftSearch;
 #include "util/rsthreads.h"
 
 #include "ft/ftdata.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 
 
 class ftClient
diff --git a/libretroshare/src/ft/ftextralist.h b/libretroshare/src/ft/ftextralist.h
index 7dc1a5843..c9c73abd7 100644
--- a/libretroshare/src/ft/ftextralist.h
+++ b/libretroshare/src/ft/ftextralist.h
@@ -59,7 +59,7 @@
 
 #include "ft/ftsearch.h"
 #include "util/rsthreads.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 #include "pqi/p3cfgmgr.h"
 
 class FileDetails
diff --git a/libretroshare/src/ft/ftfileprovider.h b/libretroshare/src/ft/ftfileprovider.h
index 85d304619..617d879e4 100644
--- a/libretroshare/src/ft/ftfileprovider.h
+++ b/libretroshare/src/ft/ftfileprovider.h
@@ -33,7 +33,7 @@
 #include <iostream>
 #include <stdint.h>
 #include "util/rsthreads.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 
 class ftFileProvider
 {
diff --git a/libretroshare/src/ft/ftsearch.h b/libretroshare/src/ft/ftsearch.h
index 4c428a515..c7581370c 100644
--- a/libretroshare/src/ft/ftsearch.h
+++ b/libretroshare/src/ft/ftsearch.h
@@ -34,7 +34,7 @@
  *
  */
 
-#include "rsiface/rsfiles.h" // includes rsiface/rstypes.h too!
+#include "retroshare/rsfiles.h" // includes retroshare/rstypes.h too!
 
 class ftSearch
 {
diff --git a/libretroshare/src/ft/ftserver.cc b/libretroshare/src/ft/ftserver.cc
index 3c68f8803..dd6b3cbce 100644
--- a/libretroshare/src/ft/ftserver.cc
+++ b/libretroshare/src/ft/ftserver.cc
@@ -26,7 +26,7 @@
 #include <sstream>
 #include "util/rsdebug.h"
 #include "util/rsdir.h"
-#include "rsiface/rstypes.h"
+#include "retroshare/rstypes.h"
 const int ftserverzone = 29539;
 
 #include "ft/ftserver.h"
diff --git a/libretroshare/src/ft/ftserver.h b/libretroshare/src/ft/ftserver.h
index dad8f6a37..14d259550 100644
--- a/libretroshare/src/ft/ftserver.h
+++ b/libretroshare/src/ft/ftserver.h
@@ -44,7 +44,7 @@
 #include <iostream>
 
 #include "ft/ftdata.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsfiles.h"
 //#include "dbase/cachestrapper.h"
 
 #include "pqi/pqi.h"
diff --git a/libretroshare/src/ft/fttransfermodule.cc b/libretroshare/src/ft/fttransfermodule.cc
index 0ad6b9e0e..67b686993 100644
--- a/libretroshare/src/ft/fttransfermodule.cc
+++ b/libretroshare/src/ft/fttransfermodule.cc
@@ -27,7 +27,7 @@
  * #define FT_DEBUG 1
  *****/
 
-#include <rsiface/rsturtle.h>
+#include "retroshare/rsturtle.h"
 #include "fttransfermodule.h"
 
 /*************************************************************************
diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index a18693427..4be085397 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -92,29 +92,33 @@ use_blogs {
 	DEFINES *= RS_USE_BLOGS
 }
 
-PUBLIC_HEADERS =	rsiface/rsblogs.h \
-					rsiface/rschannels.h \
-					rsiface/rsdisc.h \
-					rsiface/rsdistrib.h \
-					rsiface/rsexpr.h \
-					rsiface/rsfiles.h \
-					rsiface/rsforums.h \
-					rsiface/rsgame.h \
-					rsiface/rsiface.h \
-					rsiface/rsmsgs.h \
-					rsiface/rsnotify.h \
-					rsiface/rspeers.h \
-					rsiface/rsphoto.h \
-					rsiface/rsrank.h \
-					rsiface/rsstatus.h \
-					rsiface/rstypes.h
+PUBLIC_HEADERS =	retroshare/rsblogs.h \
+					retroshare/rschannels.h \
+					retroshare/rsdisc.h \
+					retroshare/rsdistrib.h \
+					retroshare/rsexpr.h \
+					retroshare/rsfiles.h \
+					retroshare/rsforums.h \
+					retroshare/rsiface.h \
+					retroshare/rsinit.h \
+					retroshare/rsmsgs.h \
+					retroshare/rsnotify.h \
+					retroshare/rspeers.h \
+					retroshare/rsrank.h \
+					retroshare/rsstatus.h \
+					retroshare/rsturtle.h \
+					retroshare/rstypes.h
 
 HEADERS += $$PUBLIC_HEADERS
 
+# public headers to be...
+HEADERS +=		retroshare/rsgame.h \
+					retroshare/rsphoto.h
+
 ################################# Linux ##########################################
 linux-* {
 	isEmpty(PREFIX)  { PREFIX = /usr }
-	isEmpty(INC_DIR) { INC_DIR = $${PREFIX}/include/libretroshare/ }
+	isEmpty(INC_DIR) { INC_DIR = $${PREFIX}/include/retroshare/ }
 	isEmpty(LIB_DIR) { LIB_DIR = $${PREFIX}/lib/ }
 
 	DESTDIR = lib
@@ -146,7 +150,7 @@ linux-* {
 	INSTALLS *= target
 
 	# where to put the library's interface
-	include_rsiface.path = $${INC_DIR}/rsiface
+	include_rsiface.path = $${INC_DIR}
 	include_rsiface.files = $$PUBLIC_HEADERS
 	INSTALLS += include_rsiface
 
diff --git a/libretroshare/src/pqi/authgpg.cc b/libretroshare/src/pqi/authgpg.cc
index 3edc6453c..5e02b6b55 100644
--- a/libretroshare/src/pqi/authgpg.cc
+++ b/libretroshare/src/pqi/authgpg.cc
@@ -25,8 +25,8 @@
  */
 
 #include "authgpg.h"
-#include <rsiface/rsiface.h>
-#include <rsiface/rsinit.h>
+#include "retroshare/rsiface.h"
+#include "retroshare/rsinit.h"
 #include <util/rsdir.h>
 #include <iostream>
 #include <sstream>
diff --git a/libretroshare/src/pqi/authgpg.h b/libretroshare/src/pqi/authgpg.h
index 876d61ca7..99cf29cb1 100644
--- a/libretroshare/src/pqi/authgpg.h
+++ b/libretroshare/src/pqi/authgpg.h
@@ -43,7 +43,7 @@
 #include <openssl/ssl.h>
 #include <openssl/evp.h>
 #include "util/rsthreads.h"
-#include "rsiface/rspeers.h"
+#include "retroshare/rspeers.h"
 #include <string>
 #include <list>
 #include <set>
diff --git a/libretroshare/src/pqi/p3cfgmgr.cc b/libretroshare/src/pqi/p3cfgmgr.cc
index 3086f9c0b..ce8af99b8 100644
--- a/libretroshare/src/pqi/p3cfgmgr.cc
+++ b/libretroshare/src/pqi/p3cfgmgr.cc
@@ -24,7 +24,7 @@
  */
 
 #include "util/rsdir.h"
-#include "rsiface/rspeers.h"
+#include "retroshare/rspeers.h"
 #include "pqi/p3cfgmgr.h"
 #include "pqi/authssl.h"
 #include "pqi/pqibin.h"
diff --git a/libretroshare/src/pqi/p3notify.h b/libretroshare/src/pqi/p3notify.h
index 75e95ef57..983077a51 100644
--- a/libretroshare/src/pqi/p3notify.h
+++ b/libretroshare/src/pqi/p3notify.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsnotify.h"
+#include "retroshare/rsnotify.h"
 #include "pqi/pqinotify.h"
 
 #include "util/rsthreads.h"
diff --git a/libretroshare/src/pqi/pqinotify.h b/libretroshare/src/pqi/pqinotify.h
index 7d09aff73..ab30afacd 100644
--- a/libretroshare/src/pqi/pqinotify.h
+++ b/libretroshare/src/pqi/pqinotify.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsnotify.h"  /* for ids */
+#include "retroshare/rsnotify.h"  /* for ids */
 
 	/* Interface for System Notification: Implemented in rsserver */
 	/* Global Access -> so we don't need everyone to have a pointer to this! */
diff --git a/libretroshare/src/rsiface/Makefile b/libretroshare/src/retroshare/Makefile
similarity index 100%
rename from libretroshare/src/rsiface/Makefile
rename to libretroshare/src/retroshare/Makefile
diff --git a/libretroshare/src/rsiface/rsblogs.h b/libretroshare/src/retroshare/rsblogs.h
similarity index 93%
rename from libretroshare/src/rsiface/rsblogs.h
rename to libretroshare/src/retroshare/rsblogs.h
index 343a2599a..35586c3b4 100644
--- a/libretroshare/src/rsiface/rsblogs.h
+++ b/libretroshare/src/retroshare/rsblogs.h
@@ -31,8 +31,8 @@
 #include <iostream>
 #include <string>
 
-#include "rsiface/rstypes.h"
-#include "rsiface/rsdistrib.h" /* For FLAGS */
+#include "rstypes.h"
+#include "rsdistrib.h" /* For FLAGS */
 
 class BlogInfo 
 {
diff --git a/libretroshare/src/rsiface/rschannels.h b/libretroshare/src/retroshare/rschannels.h
similarity index 98%
rename from libretroshare/src/rsiface/rschannels.h
rename to libretroshare/src/retroshare/rschannels.h
index 47aa2ab6c..2a702caa1 100644
--- a/libretroshare/src/rsiface/rschannels.h
+++ b/libretroshare/src/retroshare/rschannels.h
@@ -31,8 +31,8 @@
 #include <iostream>
 #include <string>
 
-#include "rsiface/rstypes.h"
-#include "rsiface/rsdistrib.h" /* For FLAGS */
+#include "rstypes.h"
+#include "rsdistrib.h" /* For FLAGS */
 
 //! Stores information for a give channel id
 /*!
diff --git a/libretroshare/src/rsiface/rsdisc.h b/libretroshare/src/retroshare/rsdisc.h
similarity index 100%
rename from libretroshare/src/rsiface/rsdisc.h
rename to libretroshare/src/retroshare/rsdisc.h
diff --git a/libretroshare/src/rsiface/rsdistrib.h b/libretroshare/src/retroshare/rsdistrib.h
similarity index 100%
rename from libretroshare/src/rsiface/rsdistrib.h
rename to libretroshare/src/retroshare/rsdistrib.h
diff --git a/libretroshare/src/rsiface/rsexpr.h b/libretroshare/src/retroshare/rsexpr.h
similarity index 100%
rename from libretroshare/src/rsiface/rsexpr.h
rename to libretroshare/src/retroshare/rsexpr.h
diff --git a/libretroshare/src/rsiface/rsfiles.h b/libretroshare/src/retroshare/rsfiles.h
similarity index 99%
rename from libretroshare/src/rsiface/rsfiles.h
rename to libretroshare/src/retroshare/rsfiles.h
index e94ad3bf4..fca7babdc 100644
--- a/libretroshare/src/rsiface/rsfiles.h
+++ b/libretroshare/src/retroshare/rsfiles.h
@@ -31,7 +31,7 @@
 #include <iostream>
 #include <string>
 
-#include "rsiface/rstypes.h"
+#include "rstypes.h"
 
 class RsFiles;
 extern RsFiles  *rsFiles;
diff --git a/libretroshare/src/rsiface/rsforums.h b/libretroshare/src/retroshare/rsforums.h
similarity index 97%
rename from libretroshare/src/rsiface/rsforums.h
rename to libretroshare/src/retroshare/rsforums.h
index 6ffcd5ec3..18f3862a5 100644
--- a/libretroshare/src/rsiface/rsforums.h
+++ b/libretroshare/src/retroshare/rsforums.h
@@ -31,8 +31,8 @@
 #include <iostream>
 #include <string>
 
-#include "rsiface/rstypes.h"
-#include "rsiface/rsdistrib.h" /* For FLAGS */
+#include "rstypes.h"
+#include "rsdistrib.h" /* For FLAGS */
 
 #define RS_FORUMMSG_NEW       0x0010 
 
diff --git a/libretroshare/src/rsiface/rsgame.h b/libretroshare/src/retroshare/rsgame.h
similarity index 100%
rename from libretroshare/src/rsiface/rsgame.h
rename to libretroshare/src/retroshare/rsgame.h
diff --git a/libretroshare/src/rsiface/rsiface.h b/libretroshare/src/retroshare/rsiface.h
similarity index 100%
rename from libretroshare/src/rsiface/rsiface.h
rename to libretroshare/src/retroshare/rsiface.h
diff --git a/libretroshare/src/rsiface/rsinit.h b/libretroshare/src/retroshare/rsinit.h
similarity index 100%
rename from libretroshare/src/rsiface/rsinit.h
rename to libretroshare/src/retroshare/rsinit.h
diff --git a/libretroshare/src/rsiface/rsmsgs.h b/libretroshare/src/retroshare/rsmsgs.h
similarity index 99%
rename from libretroshare/src/rsiface/rsmsgs.h
rename to libretroshare/src/retroshare/rsmsgs.h
index 0bd560b17..59a8c8cbf 100644
--- a/libretroshare/src/rsiface/rsmsgs.h
+++ b/libretroshare/src/retroshare/rsmsgs.h
@@ -31,7 +31,7 @@
 #include <iostream>
 #include <string>
 
-#include "rsiface/rstypes.h"
+#include "rstypes.h"
 
 /********************** For Messages and Channels *****************/
 
diff --git a/libretroshare/src/rsiface/rsnotify.h b/libretroshare/src/retroshare/rsnotify.h
similarity index 100%
rename from libretroshare/src/rsiface/rsnotify.h
rename to libretroshare/src/retroshare/rsnotify.h
diff --git a/libretroshare/src/rsiface/rspeers.h b/libretroshare/src/retroshare/rspeers.h
similarity index 100%
rename from libretroshare/src/rsiface/rspeers.h
rename to libretroshare/src/retroshare/rspeers.h
diff --git a/libretroshare/src/rsiface/rsphoto.h b/libretroshare/src/retroshare/rsphoto.h
similarity index 100%
rename from libretroshare/src/rsiface/rsphoto.h
rename to libretroshare/src/retroshare/rsphoto.h
diff --git a/libretroshare/src/rsiface/rsrank.h b/libretroshare/src/retroshare/rsrank.h
similarity index 100%
rename from libretroshare/src/rsiface/rsrank.h
rename to libretroshare/src/retroshare/rsrank.h
diff --git a/libretroshare/src/rsiface/rsstatus.h b/libretroshare/src/retroshare/rsstatus.h
similarity index 100%
rename from libretroshare/src/rsiface/rsstatus.h
rename to libretroshare/src/retroshare/rsstatus.h
diff --git a/libretroshare/src/rsiface/rsturtle.h b/libretroshare/src/retroshare/rsturtle.h
similarity index 100%
rename from libretroshare/src/rsiface/rsturtle.h
rename to libretroshare/src/retroshare/rsturtle.h
diff --git a/libretroshare/src/rsiface/rstypes.h b/libretroshare/src/retroshare/rstypes.h
similarity index 100%
rename from libretroshare/src/rsiface/rstypes.h
rename to libretroshare/src/retroshare/rstypes.h
diff --git a/libretroshare/src/rsserver/p3discovery.h b/libretroshare/src/rsserver/p3discovery.h
index ace69c382..1ca9b6fc9 100644
--- a/libretroshare/src/rsserver/p3discovery.h
+++ b/libretroshare/src/rsserver/p3discovery.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsdisc.h"
+#include "retroshare/rsdisc.h"
 #include "services/p3disc.h"
 
 class p3Discovery: public RsDisc
diff --git a/libretroshare/src/rsserver/p3face-config.cc b/libretroshare/src/rsserver/p3face-config.cc
index 3af3d9492..b4ef8d45c 100644
--- a/libretroshare/src/rsserver/p3face-config.cc
+++ b/libretroshare/src/rsserver/p3face-config.cc
@@ -31,7 +31,7 @@
 #include <sstream>
 #include "pqi/authssl.h"
 #include "pqi/authgpg.h"
-#include "rsiface/rsinit.h"
+#include "retroshare/rsinit.h"
 #include "util/rsdebug.h"
 const int p3facemsgzone = 11453;
 
diff --git a/libretroshare/src/rsserver/p3face.h b/libretroshare/src/rsserver/p3face.h
index 8f5f7107a..347e9850c 100644
--- a/libretroshare/src/rsserver/p3face.h
+++ b/libretroshare/src/rsserver/p3face.h
@@ -34,8 +34,8 @@
 #include "pqi/p3connmgr.h"
 #include "pqi/pqipersongrp.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rstypes.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rstypes.h"
 #include "util/rsthreads.h"
 
 #include "services/p3disc.h"
diff --git a/libretroshare/src/rsserver/p3msgs.cc b/libretroshare/src/rsserver/p3msgs.cc
index 7b33ab10c..63026ba3d 100644
--- a/libretroshare/src/rsserver/p3msgs.cc
+++ b/libretroshare/src/rsserver/p3msgs.cc
@@ -36,7 +36,7 @@ const int p3facemsgzone = 11453;
 #include <sys/time.h>
 #include <time.h>
 
-#include "rsiface/rstypes.h"
+#include "retroshare/rstypes.h"
 #include "rsserver/p3msgs.h"
 
 #include "services/p3msgservice.h"
diff --git a/libretroshare/src/rsserver/p3msgs.h b/libretroshare/src/rsserver/p3msgs.h
index 59976b452..5b6a34291 100644
--- a/libretroshare/src/rsserver/p3msgs.h
+++ b/libretroshare/src/rsserver/p3msgs.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsmsgs.h"
+#include "retroshare/rsmsgs.h"
 
 class p3MsgService;
 class p3ChatService;
diff --git a/libretroshare/src/rsserver/p3peers.cc b/libretroshare/src/rsserver/p3peers.cc
index d3e934677..7d50f68c9 100644
--- a/libretroshare/src/rsserver/p3peers.cc
+++ b/libretroshare/src/rsserver/p3peers.cc
@@ -28,7 +28,7 @@
 #include "pqi/p3connmgr.h"
 #include "pqi/authssl.h"
 #include "pqi/authgpg.h"
-#include <rsiface/rsinit.h>
+#include "retroshare/rsinit.h"
 #include "pqi/cleanupxpgp.h"
 
 
diff --git a/libretroshare/src/rsserver/p3peers.h b/libretroshare/src/rsserver/p3peers.h
index 593dfcf94..91d5aefc3 100644
--- a/libretroshare/src/rsserver/p3peers.h
+++ b/libretroshare/src/rsserver/p3peers.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rspeers.h"
+#include "retroshare/rspeers.h"
 #include "pqi/p3connmgr.h"
 
 class p3Peers: public RsPeers 
diff --git a/libretroshare/src/rsserver/p3photo.h b/libretroshare/src/rsserver/p3photo.h
index 3c8986e38..897af193b 100644
--- a/libretroshare/src/rsserver/p3photo.h
+++ b/libretroshare/src/rsserver/p3photo.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsphoto.h"
+#include "retroshare/rsphoto.h"
 #include "services/p3photoservice.h"
 
 class p3Photo: public RsPhoto
diff --git a/libretroshare/src/rsserver/p3rank.h b/libretroshare/src/rsserver/p3rank.h
index fc35c978b..cdf9bbfd5 100644
--- a/libretroshare/src/rsserver/p3rank.h
+++ b/libretroshare/src/rsserver/p3rank.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsrank.h"
+#include "retroshare/rsrank.h"
 #include "services/p3ranking.h"
 
 class p3Rank: public RsRanks
diff --git a/libretroshare/src/rsserver/p3status.h b/libretroshare/src/rsserver/p3status.h
index 57f29f610..7cc504c9e 100644
--- a/libretroshare/src/rsserver/p3status.h
+++ b/libretroshare/src/rsserver/p3status.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsstatus.h"
+#include "retroshare/rsstatus.h"
 
 
 class p3StatusService;
diff --git a/libretroshare/src/rsserver/rsiface.cc b/libretroshare/src/rsserver/rsiface.cc
index a7f34a71e..f2e5ba071 100644
--- a/libretroshare/src/rsserver/rsiface.cc
+++ b/libretroshare/src/rsserver/rsiface.cc
@@ -26,7 +26,7 @@
 
 
 
-#include "rsiface/rsiface.h"
+#include "retroshare/rsiface.h"
 #include "util/rsdir.h"
 
 /* global variable */			
diff --git a/libretroshare/src/rsserver/rsinit.cc b/libretroshare/src/rsserver/rsinit.cc
index d3606b17c..bb2b8c4f2 100644
--- a/libretroshare/src/rsserver/rsinit.cc
+++ b/libretroshare/src/rsserver/rsinit.cc
@@ -35,7 +35,7 @@
 
 #include "util/rsdebug.h"
 #include "util/rsdir.h"
-#include "rsiface/rsinit.h"
+#include "retroshare/rsinit.h"
 
 #include <list>
 #include <string>
@@ -1980,8 +1980,8 @@ void RsInit::setAutoLogin(bool autoLogin){
 #include "ft/ftserver.h"
 #include "ft/ftcontroller.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rsturtle.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rsturtle.h"
 
 /* global variable now points straight to 
  * ft/ code so variable defined here.
@@ -2033,7 +2033,7 @@ RsTurtle *rsTurtle = NULL ;
 #include "rsserver/p3discovery.h"
 #include "rsserver/p3photo.h"
 #include "rsserver/p3status.h"
-#include "rsiface/rsgame.h"
+#include "retroshare/rsgame.h"
 
 #include "pqi/p3notify.h" // HACK - moved to pqi for compilation order.
 
diff --git a/libretroshare/src/rsserver/rstypes.cc b/libretroshare/src/rsserver/rstypes.cc
index fd9e172bd..dbfcf531c 100644
--- a/libretroshare/src/rsserver/rstypes.cc
+++ b/libretroshare/src/rsserver/rstypes.cc
@@ -29,7 +29,7 @@
  * only prints stuff out at the moment
  */
 
-#include "rsiface/rstypes.h"
+#include "retroshare/rstypes.h"
 #include <iostream>
 #include <sstream>
 #include <iomanip>
diff --git a/libretroshare/src/serialiser/rsbaseitems.h b/libretroshare/src/serialiser/rsbaseitems.h
index 5a4a65231..89cd21107 100644
--- a/libretroshare/src/serialiser/rsbaseitems.h
+++ b/libretroshare/src/serialiser/rsbaseitems.h
@@ -28,7 +28,7 @@
 
 #include <map>
 
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvtypes.h"
 
diff --git a/libretroshare/src/serialiser/rsconfigitems.h b/libretroshare/src/serialiser/rsconfigitems.h
index baef5b56f..445fcdcb4 100644
--- a/libretroshare/src/serialiser/rsconfigitems.h
+++ b/libretroshare/src/serialiser/rsconfigitems.h
@@ -29,7 +29,7 @@
 #include <map>
 #include <vector>
 
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rstlvtypes.h"
diff --git a/libretroshare/src/services/p3blogs.h b/libretroshare/src/services/p3blogs.h
index d5e3b4f48..07c6c4dc8 100644
--- a/libretroshare/src/services/p3blogs.h
+++ b/libretroshare/src/services/p3blogs.h
@@ -26,8 +26,8 @@
  *
  */
 
-#include "rsiface/rsblogs.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsblogs.h"
+#include "retroshare/rsfiles.h"
 #include "services/p3distrib.h"
 
 #include "serialiser/rstlvtypes.h"
diff --git a/libretroshare/src/services/p3channels.h b/libretroshare/src/services/p3channels.h
index b311c05b8..f36ffea79 100644
--- a/libretroshare/src/services/p3channels.h
+++ b/libretroshare/src/services/p3channels.h
@@ -26,8 +26,8 @@
  *
  */
 
-#include "rsiface/rschannels.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rschannels.h"
+#include "retroshare/rsfiles.h"
 #include "services/p3distrib.h"
 
 #include "serialiser/rstlvtypes.h"
diff --git a/libretroshare/src/services/p3chatservice.cc b/libretroshare/src/services/p3chatservice.cc
index 3c2d44e0f..e6044e872 100644
--- a/libretroshare/src/services/p3chatservice.cc
+++ b/libretroshare/src/services/p3chatservice.cc
@@ -24,7 +24,7 @@
  */
 
 #include "util/rsdir.h"
-#include "rsiface/rsiface.h"
+#include "retroshare/rsiface.h"
 #include "pqi/pqibin.h"
 #include "pqi/pqinotify.h"
 #include "pqi/pqistore.h"
diff --git a/libretroshare/src/services/p3disc.cc b/libretroshare/src/services/p3disc.cc
index d6897522f..a2d84da5d 100644
--- a/libretroshare/src/services/p3disc.cc
+++ b/libretroshare/src/services/p3disc.cc
@@ -24,9 +24,9 @@
  */
 
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rsinit.h" /* for PGPSSL flag */
-#include "rsiface/rspeers.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rsinit.h" /* for PGPSSL flag */
+#include "retroshare/rspeers.h"
 #include "services/p3disc.h"
 
 #include "pqi/authssl.h"
diff --git a/libretroshare/src/services/p3distrib.cc b/libretroshare/src/services/p3distrib.cc
index fd461ab4d..ce89c47fb 100644
--- a/libretroshare/src/services/p3distrib.cc
+++ b/libretroshare/src/services/p3distrib.cc
@@ -33,7 +33,7 @@
 #include <openssl/rand.h>
 #include <algorithm>
 
-#include "rsiface/rsdistrib.h"
+#include "retroshare/rsdistrib.h"
 #include "services/p3distrib.h"
 #include "serialiser/rsdistribitems.h"
 
diff --git a/libretroshare/src/services/p3forums.h b/libretroshare/src/services/p3forums.h
index a6c94b849..87e98287f 100644
--- a/libretroshare/src/services/p3forums.h
+++ b/libretroshare/src/services/p3forums.h
@@ -26,7 +26,7 @@
  *
  */
 
-#include "rsiface/rsforums.h"
+#include "retroshare/rsforums.h"
 #include "services/p3distrib.h"
 #include "serialiser/rsforumitems.h"
 
diff --git a/libretroshare/src/services/p3gamelauncher.h b/libretroshare/src/services/p3gamelauncher.h
index 9eea70b6a..70e55a191 100644
--- a/libretroshare/src/services/p3gamelauncher.h
+++ b/libretroshare/src/services/p3gamelauncher.h
@@ -37,7 +37,7 @@
 
 #include "services/p3service.h"
 #include "serialiser/rsgameitems.h"
-#include "rsiface/rsgame.h"
+#include "retroshare/rsgame.h"
 
 class p3ConnectMgr;
 
diff --git a/libretroshare/src/services/p3msgservice.cc b/libretroshare/src/services/p3msgservice.cc
index 7a92b66c7..4d6e842b8 100644
--- a/libretroshare/src/services/p3msgservice.cc
+++ b/libretroshare/src/services/p3msgservice.cc
@@ -24,7 +24,7 @@
  */
 
 
-#include "rsiface/rsiface.h"
+#include "retroshare/rsiface.h"
 
 #include "pqi/pqibin.h"
 #include "pqi/pqiarchive.h"
diff --git a/libretroshare/src/services/p3msgservice.h b/libretroshare/src/services/p3msgservice.h
index a551eb072..a7813d727 100644
--- a/libretroshare/src/services/p3msgservice.h
+++ b/libretroshare/src/services/p3msgservice.h
@@ -31,7 +31,7 @@
 #include <map>
 #include <iostream>
 
-#include "rsiface/rsmsgs.h"
+#include "retroshare/rsmsgs.h"
 
 #include "pqi/pqi.h"
 #include "pqi/pqiindic.h"
diff --git a/libretroshare/src/services/p3photoservice.h b/libretroshare/src/services/p3photoservice.h
index e9aa583eb..5d57a35bd 100644
--- a/libretroshare/src/services/p3photoservice.h
+++ b/libretroshare/src/services/p3photoservice.h
@@ -33,7 +33,7 @@
 #include "serialiser/rsserial.h"
 #include "serialiser/rsphotoitems.h"
 
-#include "rsiface/rsphoto.h"
+#include "retroshare/rsphoto.h"
 
 /* 
  * Photo Service
diff --git a/libretroshare/src/services/p3ranking.h b/libretroshare/src/services/p3ranking.h
index 852058b41..887aaab61 100644
--- a/libretroshare/src/services/p3ranking.h
+++ b/libretroshare/src/services/p3ranking.h
@@ -34,7 +34,7 @@
 
 #include "serialiser/rsserial.h"
 
-#include "rsiface/rsrank.h"
+#include "retroshare/rsrank.h"
 
 /* 
  * A Generic Ranking system.
diff --git a/libretroshare/src/services/p3statusservice.h b/libretroshare/src/services/p3statusservice.h
index a39b2d3fc..c7c23f59a 100644
--- a/libretroshare/src/services/p3statusservice.h
+++ b/libretroshare/src/services/p3statusservice.h
@@ -30,7 +30,7 @@
 #include <list>
 
 #include "serialiser/rsstatusitems.h"
-#include "rsiface/rsstatus.h"
+#include "retroshare/rsstatus.h"
 #include "services/p3service.h"
 #include "pqi/p3connmgr.h"
 
diff --git a/libretroshare/src/services/p3tunnel.cc b/libretroshare/src/services/p3tunnel.cc
index 075fb982b..d9bc45bce 100644
--- a/libretroshare/src/services/p3tunnel.cc
+++ b/libretroshare/src/services/p3tunnel.cc
@@ -24,9 +24,9 @@
  */
 
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rsinit.h" /* for PGPSSL flag */
-#include "rsiface/rspeers.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rsinit.h" /* for PGPSSL flag */
+#include "retroshare/rspeers.h"
 #include "services/p3tunnel.h"
 #include "pqi/pqissltunnel.h"
 #include <sstream>
diff --git a/libretroshare/src/tests/ft/ftcrc32test.cc b/libretroshare/src/tests/ft/ftcrc32test.cc
index 937667306..fcdb8462e 100644
--- a/libretroshare/src/tests/ft/ftcrc32test.cc
+++ b/libretroshare/src/tests/ft/ftcrc32test.cc
@@ -24,7 +24,7 @@
  */
 
 #include <iostream>
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 #include <util/rsdir.h>
 #include <ft/ftchunkmap.h>
 
diff --git a/libretroshare/src/tests/ft/ftserver3test.cc b/libretroshare/src/tests/ft/ftserver3test.cc
index 045da5976..f46497c23 100644
--- a/libretroshare/src/tests/ft/ftserver3test.cc
+++ b/libretroshare/src/tests/ft/ftserver3test.cc
@@ -37,7 +37,7 @@
 #include "util/rswin.h"
 #endif
 
-#include "rsiface/rsexpr.h"
+#include "retroshare/rsexpr.h"
 
 #include "ft/ftserver.h"
 
diff --git a/libretroshare/src/tests/serialiser/distribitem_test.cc b/libretroshare/src/tests/serialiser/distribitem_test.cc
index 54327c3d7..471d07523 100644
--- a/libretroshare/src/tests/serialiser/distribitem_test.cc
+++ b/libretroshare/src/tests/serialiser/distribitem_test.cc
@@ -29,7 +29,7 @@
 #include "serialiser/rschannelitems.h"
 #include "serialiser/rsforumitems.h"
 #include "serialiser/rsblogitems.h"
-#include "rsiface/rsdistrib.h"
+#include "retroshare/rsdistrib.h"
 #include "serialiser/rstlvutil.h"
 #include "util/utest.h"
 #include "support.h"
diff --git a/libretroshare/src/turtle/p3turtle.cc b/libretroshare/src/turtle/p3turtle.cc
index af04517cc..e9ab09f74 100644
--- a/libretroshare/src/turtle/p3turtle.cc
+++ b/libretroshare/src/turtle/p3turtle.cc
@@ -32,9 +32,9 @@
 #include <assert.h>
 #endif
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsfiles.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rspeers.h"
+#include "retroshare/rsfiles.h"
 
 #include "pqi/authssl.h"
 #include "pqi/p3connmgr.h"
diff --git a/libretroshare/src/turtle/p3turtle.h b/libretroshare/src/turtle/p3turtle.h
index 1822417a3..29070b0bb 100644
--- a/libretroshare/src/turtle/p3turtle.h
+++ b/libretroshare/src/turtle/p3turtle.h
@@ -145,7 +145,7 @@
 #include "pqi/pqimonitor.h"
 #include "services/p3service.h"
 #include "ft/ftsearch.h"
-#include "rsiface/rsturtle.h"
+#include "retroshare/rsturtle.h"
 #include "rsturtleitem.h"
 
 class ftServer ;
diff --git a/libretroshare/src/turtle/rsturtleitem.h b/libretroshare/src/turtle/rsturtleitem.h
index 6b83021b3..4232e71de 100644
--- a/libretroshare/src/turtle/rsturtleitem.h
+++ b/libretroshare/src/turtle/rsturtleitem.h
@@ -3,9 +3,9 @@
 #include "serialiser/rsserial.h"
 #include "serialiser/rstlvbase.h"
 #include "serialiser/rsbaseserial.h"
-#include "rsiface/rsturtle.h"
-#include "rsiface/rsexpr.h"
-#include "rsiface/rstypes.h"
+#include "retroshare/rsturtle.h"
+#include "retroshare/rsexpr.h"
+#include "retroshare/rstypes.h"
 #include "serialiser/rsserviceids.h"
 #include "turtle/turtletypes.h"
 
diff --git a/libretroshare/src/turtle/turtletypes.h b/libretroshare/src/turtle/turtletypes.h
index 8feca5973..e1dc80e12 100644
--- a/libretroshare/src/turtle/turtletypes.h
+++ b/libretroshare/src/turtle/turtletypes.h
@@ -1,6 +1,6 @@
 #pragma once
 
-#include "rsiface/rsturtle.h"
+#include "retroshare/rsturtle.h"
 
 typedef std::string 	TurtlePeerId ;
 typedef std::string 	TurtleVirtualPeerId ;
diff --git a/libretroshare/src/util/rsdir.cc b/libretroshare/src/util/rsdir.cc
index 96081a236..58ad469a4 100644
--- a/libretroshare/src/util/rsdir.cc
+++ b/libretroshare/src/util/rsdir.cc
@@ -31,7 +31,7 @@
 
 #include "util/rsdir.h"
 #include "pqi/pqinotify.h"
-#include <rsiface/rstypes.h>
+#include "retroshare/rstypes.h"
 #include <string>
 #include <iostream>
 #include <algorithm>
diff --git a/libretroshare/src/util/rsdiscspace.cc b/libretroshare/src/util/rsdiscspace.cc
index 87a4aec24..232beba56 100644
--- a/libretroshare/src/util/rsdiscspace.cc
+++ b/libretroshare/src/util/rsdiscspace.cc
@@ -24,9 +24,9 @@
  */
 
 #include <iostream>
-#include <rsiface/rsfiles.h>
-#include <rsiface/rsiface.h>
-#include <rsiface/rsinit.h>
+#include "retroshare/rsfiles.h"
+#include "retroshare/rsiface.h"
+#include "retroshare/rsinit.h"
 #include "rsdiscspace.h"
 #include <util/rsthreads.h>
 #ifndef WIN32
diff --git a/retroshare-gui/src/gui/AboutDialog.cpp b/retroshare-gui/src/gui/AboutDialog.cpp
index 15766710f..e83b6a893 100644
--- a/retroshare-gui/src/gui/AboutDialog.cpp
+++ b/retroshare-gui/src/gui/AboutDialog.cpp
@@ -23,8 +23,8 @@
 #include "AboutDialog.h"
 #include "HelpDialog.h"
 
-#include "rsiface/rsdisc.h"
-#include "rsiface/rsiface.h"
+#include <retroshare/rsdisc.h>
+#include <retroshare/rsiface.h>
 #include "settings/rsharesettings.h"
 
 #include <QtGui/QHBoxLayout>
diff --git a/retroshare-gui/src/gui/AddLinksDialog.cpp b/retroshare-gui/src/gui/AddLinksDialog.cpp
index 75874ee22..c4059f4c8 100644
--- a/retroshare-gui/src/gui/AddLinksDialog.cpp
+++ b/retroshare-gui/src/gui/AddLinksDialog.cpp
@@ -23,7 +23,7 @@
 
 #include "AddLinksDialog.h"
 #include "RetroShareLink.h"
-#include "rsiface/rsrank.h"
+#include <retroshare/rsrank.h>
 
 /* Images for context menu icons */
 #define IMAGE_EXPORTFRIEND      ":/images/exportpeers_16x16.png"
diff --git a/retroshare-gui/src/gui/ChannelFeed.cpp b/retroshare-gui/src/gui/ChannelFeed.cpp
index caa12d27c..1f0447c87 100644
--- a/retroshare-gui/src/gui/ChannelFeed.cpp
+++ b/retroshare-gui/src/gui/ChannelFeed.cpp
@@ -26,7 +26,7 @@
 #include <iostream>
 #include <algorithm>
 
-#include "rsiface/rschannels.h"
+#include <retroshare/rschannels.h>
 
 #include "ChannelFeed.h"
 
diff --git a/retroshare-gui/src/gui/DLListDelegate.cpp b/retroshare-gui/src/gui/DLListDelegate.cpp
index c2bf7cce8..e2dfc1c96 100644
--- a/retroshare-gui/src/gui/DLListDelegate.cpp
+++ b/retroshare-gui/src/gui/DLListDelegate.cpp
@@ -19,7 +19,7 @@
  *  Boston, MA  02110-1301, USA.
  ****************************************************************/
 
-#include <rsiface/rstypes.h>
+#include <retroshare/rstypes.h>
 #include <QModelIndex>
 #include <QPainter>
 #include <QStyleOptionProgressBarV2>
diff --git a/retroshare-gui/src/gui/FileTransferInfoWidget.cpp b/retroshare-gui/src/gui/FileTransferInfoWidget.cpp
index f528c915b..508fcaf95 100644
--- a/retroshare-gui/src/gui/FileTransferInfoWidget.cpp
+++ b/retroshare-gui/src/gui/FileTransferInfoWidget.cpp
@@ -23,8 +23,8 @@
 #include <math.h>
 #include <QStylePainter>
 #include <QDebug>
-#include <rsiface/rsfiles.h>
-#include <rsiface/rstypes.h>
+#include <retroshare/rsfiles.h>
+#include <retroshare/rstypes.h>
 #include "util/misc.h"
 #include "FileTransferInfoWidget.h"
 
diff --git a/retroshare-gui/src/gui/ForumsDialog.cpp b/retroshare-gui/src/gui/ForumsDialog.cpp
index be3a897da..91bc7e1fd 100644
--- a/retroshare-gui/src/gui/ForumsDialog.cpp
+++ b/retroshare-gui/src/gui/ForumsDialog.cpp
@@ -32,8 +32,8 @@
 #include "msgs/MessageComposer.h"
 #include "gui/settings/rsharesettings.h"
 
-#include "rsiface/rspeers.h"
-#include "rsiface/rsforums.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsforums.h>
 
 #include <sstream>
 #include <algorithm>
diff --git a/retroshare-gui/src/gui/GenCertDialog.cpp b/retroshare-gui/src/gui/GenCertDialog.cpp
index 076ed9f74..47841c249 100644
--- a/retroshare-gui/src/gui/GenCertDialog.cpp
+++ b/retroshare-gui/src/gui/GenCertDialog.cpp
@@ -20,7 +20,7 @@
  ****************************************************************/
 
 #include <rshare.h>
-#include <rsiface/rsinit.h>
+#include <retroshare/rsinit.h>
 #include "GenCertDialog.h"
 #include "InfoDialog.h"
 #include <QAbstractEventDispatcher>
diff --git a/retroshare-gui/src/gui/HelpDialog.cpp b/retroshare-gui/src/gui/HelpDialog.cpp
index 3f61ab949..c5d07d4f3 100644
--- a/retroshare-gui/src/gui/HelpDialog.cpp
+++ b/retroshare-gui/src/gui/HelpDialog.cpp
@@ -21,8 +21,8 @@
 
 
 #include "HelpDialog.h"
-#include "rsiface/rsiface.h"
-#include "rsiface/rsdisc.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rsdisc.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/retroshare-gui/src/gui/HelpDialog.h b/retroshare-gui/src/gui/HelpDialog.h
index 3c3a007f7..2e25adb58 100644
--- a/retroshare-gui/src/gui/HelpDialog.h
+++ b/retroshare-gui/src/gui/HelpDialog.h
@@ -28,7 +28,7 @@
 //#include "mainpage.h"
 #include "ui_HelpDialog.h"
 
-#include "rsiface/rstypes.h"
+#include <retroshare/rstypes.h>
 
 class HelpDialog : public QDialog 
 {
diff --git a/retroshare-gui/src/gui/InfoDialog.cpp b/retroshare-gui/src/gui/InfoDialog.cpp
index 3aa28e012..7c6074b74 100644
--- a/retroshare-gui/src/gui/InfoDialog.cpp
+++ b/retroshare-gui/src/gui/InfoDialog.cpp
@@ -21,7 +21,7 @@
 
 
 #include "InfoDialog.h"
-#include "rsiface/rsiface.h"
+#include <retroshare/rsiface.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/retroshare-gui/src/gui/InfoDialog.h b/retroshare-gui/src/gui/InfoDialog.h
index 3f6364ab2..dc395a46c 100644
--- a/retroshare-gui/src/gui/InfoDialog.h
+++ b/retroshare-gui/src/gui/InfoDialog.h
@@ -26,7 +26,7 @@
 
 #include "ui_InfoDialog.h"
 
-#include "rsiface/rstypes.h"
+#include <retroshare/rstypes.h>
 
 class InfoDialog : public QDialog 
 {
diff --git a/retroshare-gui/src/gui/LinksDialog.cpp b/retroshare-gui/src/gui/LinksDialog.cpp
index 767a0c222..ff6a0c8c8 100644
--- a/retroshare-gui/src/gui/LinksDialog.cpp
+++ b/retroshare-gui/src/gui/LinksDialog.cpp
@@ -27,9 +27,9 @@
 
 #include "LinksDialog.h"
 #include "RetroShareLink.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsrank.h"
-#include "rsiface/rsfiles.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsrank.h>
+#include <retroshare/rsfiles.h>
 
 #include <sstream>
 
diff --git a/retroshare-gui/src/gui/MainWindow.cpp b/retroshare-gui/src/gui/MainWindow.cpp
index 75ee251c9..bba0f0374 100644
--- a/retroshare-gui/src/gui/MainWindow.cpp
+++ b/retroshare-gui/src/gui/MainWindow.cpp
@@ -62,11 +62,11 @@
 #include "statusbar/peerstatus.h"
 #include "statusbar/natstatus.h"
 #include "statusbar/ratesstatus.h"
-#include "rsiface/rsstatus.h"
+#include <retroshare/rsstatus.h>
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsfiles.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsfiles.h>
 
 #include "gui/connect/ConnectFriendWizard.h"
 #include "util/rsversion.h"
diff --git a/retroshare-gui/src/gui/MessagesDialog.cpp b/retroshare-gui/src/gui/MessagesDialog.cpp
index 2b5554b44..598d191db 100644
--- a/retroshare-gui/src/gui/MessagesDialog.cpp
+++ b/retroshare-gui/src/gui/MessagesDialog.cpp
@@ -38,9 +38,9 @@
 #include "settings/rsharesettings.h"
 #include "util/misc.h"
 
-#include "rsiface/rsinit.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsfiles.h"
+#include <retroshare/rsinit.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsfiles.h>
 
 
 /* Images for context menu icons */
diff --git a/retroshare-gui/src/gui/MessagesDialog.h b/retroshare-gui/src/gui/MessagesDialog.h
index d88534d26..51f193b2a 100644
--- a/retroshare-gui/src/gui/MessagesDialog.h
+++ b/retroshare-gui/src/gui/MessagesDialog.h
@@ -29,7 +29,7 @@
 
 #include <QVariant>
 
-#include "rsiface/rsmsgs.h"
+#include <retroshare/rsmsgs.h>
 #include "mainpage.h"
 #include "ui_MessagesDialog.h"
 
diff --git a/retroshare-gui/src/gui/MessengerWindow.cpp b/retroshare-gui/src/gui/MessengerWindow.cpp
index b674a656b..ca98cec1c 100644
--- a/retroshare-gui/src/gui/MessengerWindow.cpp
+++ b/retroshare-gui/src/gui/MessengerWindow.cpp
@@ -24,11 +24,11 @@
 #include <QWidgetAction>
 #include "common/vmessagebox.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsmsgs.h"
-#include "rsiface/rsstatus.h"
-#include "rsiface/rsnotify.h"
+#include <retroshare/rsiface.h>
+#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/NetworkDialog.cpp b/retroshare-gui/src/gui/NetworkDialog.cpp
index 92fd75856..824fe59df 100644
--- a/retroshare-gui/src/gui/NetworkDialog.cpp
+++ b/retroshare-gui/src/gui/NetworkDialog.cpp
@@ -26,9 +26,9 @@
 #include <QTime>
 #include <QMenu>
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsdisc.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsdisc.h>
 
 #include "common/vmessagebox.h"
 #include "NetworkDialog.h"
diff --git a/retroshare-gui/src/gui/NetworkView.cpp b/retroshare-gui/src/gui/NetworkView.cpp
index 1e78f0e88..00951edee 100644
--- a/retroshare-gui/src/gui/NetworkView.cpp
+++ b/retroshare-gui/src/gui/NetworkView.cpp
@@ -20,7 +20,7 @@
  ****************************************************************/
 
 #include "NetworkView.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rspeers.h>
 
 #include <gpgme.h>
 
diff --git a/retroshare-gui/src/gui/NewsFeed.cpp b/retroshare-gui/src/gui/NewsFeed.cpp
index e57fc76e1..031808aeb 100644
--- a/retroshare-gui/src/gui/NewsFeed.cpp
+++ b/retroshare-gui/src/gui/NewsFeed.cpp
@@ -23,7 +23,7 @@
 
 #include "NewsFeed.h"
 
-#include "rsiface/rsnotify.h"
+#include <retroshare/rsnotify.h>
 
 #include "feeds/ChanNewItem.h"
 #include "feeds/ChanMsgItem.h"
diff --git a/retroshare-gui/src/gui/PeersDialog.cpp b/retroshare-gui/src/gui/PeersDialog.cpp
index eef250071..bfe3e187f 100644
--- a/retroshare-gui/src/gui/PeersDialog.cpp
+++ b/retroshare-gui/src/gui/PeersDialog.cpp
@@ -33,11 +33,11 @@
 
 #include "rshare.h"
 #include "PeersDialog.h"
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsstatus.h"
-#include "rsiface/rsmsgs.h"
-#include "rsiface/rsnotify.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsstatus.h>
+#include <retroshare/rsmsgs.h>
+#include <retroshare/rsnotify.h>
 #include "settings/rsharesettings.h"
 
 #include "chat/PopupChatDialog.h"
diff --git a/retroshare-gui/src/gui/QuickStartWizard.cpp b/retroshare-gui/src/gui/QuickStartWizard.cpp
index 862b5617d..840159368 100644
--- a/retroshare-gui/src/gui/QuickStartWizard.cpp
+++ b/retroshare-gui/src/gui/QuickStartWizard.cpp
@@ -28,9 +28,9 @@
 #include <QComboBox>
 #include <QHeaderView>
 
-#include "rsiface/rsfiles.h"
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rsfiles.h>
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
 #include "settings/rsharesettings.h"
 
 
diff --git a/retroshare-gui/src/gui/RemoteDirModel.cpp b/retroshare-gui/src/gui/RemoteDirModel.cpp
index 8905e9fba..664607949 100644
--- a/retroshare-gui/src/gui/RemoteDirModel.cpp
+++ b/retroshare-gui/src/gui/RemoteDirModel.cpp
@@ -26,8 +26,8 @@
 #include <QMimeData>
 
 #include "RemoteDirModel.h"
-#include "rsiface/rsfiles.h"
-#include "rsiface/rstypes.h"
+#include <retroshare/rsfiles.h>
+#include <retroshare/rstypes.h>
 #include "util/misc.h"
 
 #include <set>
diff --git a/retroshare-gui/src/gui/RetroShareLink.cpp b/retroshare-gui/src/gui/RetroShareLink.cpp
index dc4cc4d2a..83991fbee 100644
--- a/retroshare-gui/src/gui/RetroShareLink.cpp
+++ b/retroshare-gui/src/gui/RetroShareLink.cpp
@@ -30,8 +30,8 @@
 
 #include "RetroShareLink.h"
 
-#include "rsiface/rsfiles.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rsfiles.h>
+#include <retroshare/rspeers.h>
 
 #define DEBUG_RSLINK 1
 
diff --git a/retroshare-gui/src/gui/SearchDialog.cpp b/retroshare-gui/src/gui/SearchDialog.cpp
index 01ae16f24..2a08fd86a 100644
--- a/retroshare-gui/src/gui/SearchDialog.cpp
+++ b/retroshare-gui/src/gui/SearchDialog.cpp
@@ -28,8 +28,8 @@
 #include "settings/rsharesettings.h"
 #include "advsearch/advancedsearchdialog.h"
 
-#include "rsiface/rsfiles.h"
-#include "rsiface/rsturtle.h"
+#include <retroshare/rsfiles.h>
+#include <retroshare/rsturtle.h>
 
 /* Images for context menu icons */
 #define IMAGE_START  		    ":/images/download.png"
diff --git a/retroshare-gui/src/gui/SearchDialog.h b/retroshare-gui/src/gui/SearchDialog.h
index 0bebaef02..b3201e0b3 100644
--- a/retroshare-gui/src/gui/SearchDialog.h
+++ b/retroshare-gui/src/gui/SearchDialog.h
@@ -22,7 +22,7 @@
 #ifndef _SEARCHDIALOG_H
 #define _SEARCHDIALOG_H
 
-#include "rsiface/rstypes.h"
+#include <retroshare/rstypes.h>
 #include "ui_SearchDialog.h"
 #include "mainpage.h"
 
diff --git a/retroshare-gui/src/gui/SendLinkDialog.cpp b/retroshare-gui/src/gui/SendLinkDialog.cpp
index d13614fbc..7ac679cdd 100644
--- a/retroshare-gui/src/gui/SendLinkDialog.cpp
+++ b/retroshare-gui/src/gui/SendLinkDialog.cpp
@@ -20,10 +20,10 @@
  ****************************************************************/
 #include "SendLinkDialog.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsdisc.h"
-#include "rsiface/rsmsgs.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsdisc.h>
+#include <retroshare/rsmsgs.h>
 
 
 #include <QTime>
diff --git a/retroshare-gui/src/gui/ShareDialog.cpp b/retroshare-gui/src/gui/ShareDialog.cpp
index 6c8ce2804..54d7b7b32 100644
--- a/retroshare-gui/src/gui/ShareDialog.cpp
+++ b/retroshare-gui/src/gui/ShareDialog.cpp
@@ -20,7 +20,7 @@
  ****************************************************************/
 #include "ShareDialog.h"
 
-#include "rsiface/rsfiles.h"
+#include <retroshare/rsfiles.h>
 
 #include <QContextMenuEvent>
 
diff --git a/retroshare-gui/src/gui/ShareManager.cpp b/retroshare-gui/src/gui/ShareManager.cpp
index 43486aeeb..915471a02 100644
--- a/retroshare-gui/src/gui/ShareManager.cpp
+++ b/retroshare-gui/src/gui/ShareManager.cpp
@@ -20,7 +20,7 @@
  ****************************************************************/
 #include "ShareManager.h"
 
-#include "rsiface/rsfiles.h"
+#include <retroshare/rsfiles.h>
 #include "ShareDialog.h"
 
 #include <QContextMenuEvent>
diff --git a/retroshare-gui/src/gui/SharedFilesDialog.cpp b/retroshare-gui/src/gui/SharedFilesDialog.cpp
index d7eff0b18..50db2fe08 100644
--- a/retroshare-gui/src/gui/SharedFilesDialog.cpp
+++ b/retroshare-gui/src/gui/SharedFilesDialog.cpp
@@ -35,8 +35,8 @@
 #include "RetroShareLink.h"
 #include "gui/RemoteDirModel.h"
 
-#include "rsiface/rspeers.h"
-#include "rsiface/rsfiles.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsfiles.h>
 
 
 /* Images for context menu icons */
diff --git a/retroshare-gui/src/gui/StartDialog.cpp b/retroshare-gui/src/gui/StartDialog.cpp
index c1f66de8a..e9a883e9d 100644
--- a/retroshare-gui/src/gui/StartDialog.cpp
+++ b/retroshare-gui/src/gui/StartDialog.cpp
@@ -20,7 +20,7 @@
  ****************************************************************/
 
 #include <rshare.h>
-#include <rsiface/rsinit.h>
+#include <retroshare/rsinit.h>
 #include "StartDialog.h"
 #include "InfoDialog.h"
 #include "LogoBar.h"
diff --git a/retroshare-gui/src/gui/StartDialog.h b/retroshare-gui/src/gui/StartDialog.h
index 597c8109c..cfb1b87e6 100644
--- a/retroshare-gui/src/gui/StartDialog.h
+++ b/retroshare-gui/src/gui/StartDialog.h
@@ -23,7 +23,7 @@
 #ifndef _STARTDIALOG_H
 #define _STARTDIALOG_H
 
-#include "rsiface/rsiface.h"
+#include <retroshare/rsiface.h>
 /********
 #if (QT_VERSION >= 040300)
 #include "qskinobject/qskinobject.h"
diff --git a/retroshare-gui/src/gui/TransfersDialog.cpp b/retroshare-gui/src/gui/TransfersDialog.cpp
index e6a364f92..0d0eeeec9 100644
--- a/retroshare-gui/src/gui/TransfersDialog.cpp
+++ b/retroshare-gui/src/gui/TransfersDialog.cpp
@@ -40,9 +40,9 @@
 #include "TurtleRouterDialog.h"
 #include "xprogressbar.h"
 
-#include "rsiface/rsfiles.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsdisc.h"
+#include <retroshare/rsfiles.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsdisc.h>
 #include "util/misc.h"
 
 /* Images for context menu icons */
diff --git a/retroshare-gui/src/gui/TransfersDialog.h b/retroshare-gui/src/gui/TransfersDialog.h
index f2b4958e9..1a52adf3f 100644
--- a/retroshare-gui/src/gui/TransfersDialog.h
+++ b/retroshare-gui/src/gui/TransfersDialog.h
@@ -24,7 +24,7 @@
 
 #include <set>
 
-#include "rsiface/rstypes.h"
+#include <retroshare/rstypes.h>
 #include "RsAutoUpdatePage.h"
 
 #include "ui_TransfersDialog.h"
diff --git a/retroshare-gui/src/gui/TrustView.cpp b/retroshare-gui/src/gui/TrustView.cpp
index 7fbd81667..d5ee4d50e 100644
--- a/retroshare-gui/src/gui/TrustView.cpp
+++ b/retroshare-gui/src/gui/TrustView.cpp
@@ -2,8 +2,8 @@
 #include <QTimer>
 #include <QWheelEvent>
 #include <QHeaderView>
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
 
 #include <QTableView>
 #include "TrustView.h"
diff --git a/retroshare-gui/src/gui/TurtleRouterDialog.cpp b/retroshare-gui/src/gui/TurtleRouterDialog.cpp
index b5f67b5b5..3cd08a42a 100644
--- a/retroshare-gui/src/gui/TurtleRouterDialog.cpp
+++ b/retroshare-gui/src/gui/TurtleRouterDialog.cpp
@@ -1,6 +1,6 @@
 #include <iostream>
 #include <QTimer>
-#include <rsiface/rsturtle.h>
+#include <retroshare/rsturtle.h>
 #include "TurtleRouterDialog.h"
 
 TurtleRouterDialog::TurtleRouterDialog(QWidget *parent)
diff --git a/retroshare-gui/src/gui/advsearch/advancedsearchdialog.h b/retroshare-gui/src/gui/advsearch/advancedsearchdialog.h
index 91a4d6053..296829057 100644
--- a/retroshare-gui/src/gui/advsearch/advancedsearchdialog.h
+++ b/retroshare-gui/src/gui/advsearch/advancedsearchdialog.h
@@ -28,7 +28,7 @@
 #include <QSizePolicy>
 #include "ui_AdvancedSearchDialog.h"
 #include "expressionwidget.h"
-#include "rsiface/rsexpr.h"
+#include <retroshare/rsexpr.h>
 
 class AdvancedSearchDialog : public QDialog, public Ui::AdvancedSearchDialog 
 {
diff --git a/retroshare-gui/src/gui/advsearch/expressionwidget.h b/retroshare-gui/src/gui/advsearch/expressionwidget.h
index 3651206b0..21f964449 100644
--- a/retroshare-gui/src/gui/advsearch/expressionwidget.h
+++ b/retroshare-gui/src/gui/advsearch/expressionwidget.h
@@ -24,7 +24,7 @@
 #include <QWidget>
 #include <QLabel>
 
-#include "rsiface/rsexpr.h"
+#include <retroshare/rsexpr.h>
 #include "guiexprelement.h"
 #include "ui_expressionwidget.h"
 
diff --git a/retroshare-gui/src/gui/advsearch/guiexprelement.h b/retroshare-gui/src/gui/advsearch/guiexprelement.h
index 3bee85200..0c80557b4 100644
--- a/retroshare-gui/src/gui/advsearch/guiexprelement.h
+++ b/retroshare-gui/src/gui/advsearch/guiexprelement.h
@@ -38,7 +38,7 @@
 
 #include <iostream>
 
-#include "rsiface/rsexpr.h"
+#include <retroshare/rsexpr.h>
 
 enum ExprSearchType
 {
diff --git a/retroshare-gui/src/gui/bwgraph/bwgraph.cpp b/retroshare-gui/src/gui/bwgraph/bwgraph.cpp
index b7a659061..57b6f88af 100644
--- a/retroshare-gui/src/gui/bwgraph/bwgraph.cpp
+++ b/retroshare-gui/src/gui/bwgraph/bwgraph.cpp
@@ -25,7 +25,7 @@
 #include <control/bandwidthevent.h>
 #include "bwgraph.h"
 #include <gui/RsAutoUpdatePage.h>
-#include "rsiface/rsiface.h"
+#include <retroshare/rsiface.h>
 
 #include <sstream>
 #include <iomanip>
diff --git a/retroshare-gui/src/gui/channels/ChannelDetails.cpp b/retroshare-gui/src/gui/channels/ChannelDetails.cpp
index 06965cf38..de99b091c 100644
--- a/retroshare-gui/src/gui/channels/ChannelDetails.cpp
+++ b/retroshare-gui/src/gui/channels/ChannelDetails.cpp
@@ -20,10 +20,10 @@
  ****************************************************************/
 #include "ChannelDetails.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsdisc.h"
-#include "rsiface/rschannels.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsdisc.h>
+#include <retroshare/rschannels.h>
 
 #include <QTime>
 #include <QDateTime>
diff --git a/retroshare-gui/src/gui/channels/CreateChannel.cpp b/retroshare-gui/src/gui/channels/CreateChannel.cpp
index 0c3ab9a24..200711e35 100644
--- a/retroshare-gui/src/gui/channels/CreateChannel.cpp
+++ b/retroshare-gui/src/gui/channels/CreateChannel.cpp
@@ -27,8 +27,8 @@
 
 #include "CreateChannel.h"
 
-#include "rsiface/rschannels.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rschannels.h>
+#include <retroshare/rspeers.h>
 
 /** Constructor */
 CreateChannel::CreateChannel(QWidget *parent)
diff --git a/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp b/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp
index d0ce92cd2..68474bbca 100644
--- a/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp
+++ b/retroshare-gui/src/gui/channels/CreateChannelMsg.cpp
@@ -29,8 +29,8 @@
 #include "CreateChannelMsg.h"
 #include "gui/feeds/SubFileItem.h"
 
-#include "rsiface/rschannels.h"
-#include "rsiface/rsfiles.h"
+#include <retroshare/rschannels.h>
+#include <retroshare/rsfiles.h>
 
 #include <iostream>
 
diff --git a/retroshare-gui/src/gui/channels/EditChanDetails.cpp b/retroshare-gui/src/gui/channels/EditChanDetails.cpp
index 8f441df17..748be3773 100644
--- a/retroshare-gui/src/gui/channels/EditChanDetails.cpp
+++ b/retroshare-gui/src/gui/channels/EditChanDetails.cpp
@@ -20,7 +20,7 @@
  ****************************************************************/
 #include "EditChanDetails.h"
 
-#include "rsiface/rschannels.h"
+#include <retroshare/rschannels.h>
 
 #include <list>
 #include <iostream>
diff --git a/retroshare-gui/src/gui/channels/ShareKey.cpp b/retroshare-gui/src/gui/channels/ShareKey.cpp
index b27386a96..9298950ce 100644
--- a/retroshare-gui/src/gui/channels/ShareKey.cpp
+++ b/retroshare-gui/src/gui/channels/ShareKey.cpp
@@ -24,8 +24,8 @@
 #include <QMessageBox>
 #include <algorithm>
 
-#include "rsiface/rschannels.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rschannels.h>
+#include <retroshare/rspeers.h>
 
 ShareKey::ShareKey(QWidget *parent, Qt::WFlags flags, std::string chanId) :
         QDialog(parent, flags), mChannelId(chanId)
diff --git a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
index 678b4265b..f1f0c50a5 100644
--- a/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
+++ b/retroshare-gui/src/gui/chat/PopupChatDialog.cpp
@@ -37,11 +37,11 @@
 #include <gui/RetroShareLink.h>
 #include "rshare.h"
 
-#include "rsiface/rspeers.h"
-#include "rsiface/rsmsgs.h"
-#include "rsiface/rsfiles.h"
-#include "rsiface/rsnotify.h"
-#include "rsiface/rsiface.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsmsgs.h>
+#include <retroshare/rsfiles.h>
+#include <retroshare/rsnotify.h>
+#include <retroshare/rsiface.h>
 #include "gui/settings/rsharesettings.h"
 
 
diff --git a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
index 8a5a5bd75..afe632d0e 100644
--- a/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
+++ b/retroshare-gui/src/gui/connect/ConfCertDialog.cpp
@@ -27,8 +27,8 @@
 
 #include <iostream>
 
-#include "rsiface/rspeers.h"
-#include "rsiface/rsdisc.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsdisc.h>
 
 #include "gui/help/browser/helpbrowser.h"
 
diff --git a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
index fef7d6758..9a2799c21 100755
--- a/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
+++ b/retroshare-gui/src/gui/connect/ConnectFriendWizard.cpp
@@ -21,8 +21,8 @@
 
 #include "ConnectFriendWizard.h"
 
-#include "rsiface/rspeers.h" //for rsPeers variable
-#include "rsiface/rsiface.h"
+#include <retroshare/rspeers.h> //for rsPeers variable
+#include <retroshare/rsiface.h>
 
 #include <QLineEdit>
 #include <QTextEdit>
diff --git a/retroshare-gui/src/gui/elastic/graphwidget.cpp b/retroshare-gui/src/gui/elastic/graphwidget.cpp
index 0a812aed0..2a4d8cef6 100644
--- a/retroshare-gui/src/gui/elastic/graphwidget.cpp
+++ b/retroshare-gui/src/gui/elastic/graphwidget.cpp
@@ -39,7 +39,7 @@
 #include "arrow.h"
 #include "node.h"
 
-#include "rsiface/rspeers.h"
+#include <retroshare/rspeers.h>
 
 #include <QDebug>
 #include <QGraphicsScene>
diff --git a/retroshare-gui/src/gui/elastic/node.cpp b/retroshare-gui/src/gui/elastic/node.cpp
index 87b18cf4c..5a037e58c 100644
--- a/retroshare-gui/src/gui/elastic/node.cpp
+++ b/retroshare-gui/src/gui/elastic/node.cpp
@@ -47,7 +47,7 @@
 #include <math.h>
 #include "../connect/ConfCertDialog.h"
 
-#include "rsiface/rspeers.h"
+#include <retroshare/rspeers.h>
 
 #include <iostream>
 
diff --git a/retroshare-gui/src/gui/feeds/AttachFileItem.cpp b/retroshare-gui/src/gui/feeds/AttachFileItem.cpp
index f932a4f7e..7a8ea01b7 100644
--- a/retroshare-gui/src/gui/feeds/AttachFileItem.cpp
+++ b/retroshare-gui/src/gui/feeds/AttachFileItem.cpp
@@ -23,7 +23,7 @@
 
 #include "AttachFileItem.h"
 
-#include "rsiface/rsfiles.h"
+#include <retroshare/rsfiles.h>
 
 /****
  * #define DEBUG_ITEM 1
diff --git a/retroshare-gui/src/gui/feeds/BlogNewItem.cpp b/retroshare-gui/src/gui/feeds/BlogNewItem.cpp
index 03ba9fe05..a71e9d71a 100644
--- a/retroshare-gui/src/gui/feeds/BlogNewItem.cpp
+++ b/retroshare-gui/src/gui/feeds/BlogNewItem.cpp
@@ -22,7 +22,7 @@
 #include "BlogNewItem.h"
 #include "FeedHolder.h"
 
-#include "rsiface/rsblogs.h"
+#include <retroshare/rsblogs.h>
 
 #define BLOG_DEFAULT_IMAGE ":/images/hi64-app-kblogger.png"
 
diff --git a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
index 13b737923..dbc5aa35f 100644
--- a/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChanMsgItem.cpp
@@ -27,7 +27,7 @@
 #include "FeedHolder.h"
 #include "SubFileItem.h"
 
-#include "rsiface/rschannels.h"
+#include <retroshare/rschannels.h>
 
 #include <sstream>
 
diff --git a/retroshare-gui/src/gui/feeds/ChanNewItem.cpp b/retroshare-gui/src/gui/feeds/ChanNewItem.cpp
index dfe4a1e0b..f5cddf696 100644
--- a/retroshare-gui/src/gui/feeds/ChanNewItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ChanNewItem.cpp
@@ -22,7 +22,7 @@
 #include "ChanNewItem.h"
 #include "FeedHolder.h"
 
-#include "rsiface/rschannels.h"
+#include <retroshare/rschannels.h>
 
 #define CHAN_DEFAULT_IMAGE ":/images/channels.png"
 
diff --git a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
index e67e6ff67..57365a9f8 100644
--- a/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ForumMsgItem.cpp
@@ -24,7 +24,7 @@
 #include "ForumMsgItem.h"
 #include "FeedHolder.h"
 
-#include "rsiface/rsforums.h"
+#include <retroshare/rsforums.h>
 #include "gui/forums/CreateForumMsg.h"
 
 
diff --git a/retroshare-gui/src/gui/feeds/ForumNewItem.cpp b/retroshare-gui/src/gui/feeds/ForumNewItem.cpp
index 304bb4026..1bb702e73 100644
--- a/retroshare-gui/src/gui/feeds/ForumNewItem.cpp
+++ b/retroshare-gui/src/gui/feeds/ForumNewItem.cpp
@@ -22,7 +22,7 @@
 #include "ForumNewItem.h"
 #include "FeedHolder.h"
 
-#include "rsiface/rsforums.h"
+#include <retroshare/rsforums.h>
 #include "gui/forums/CreateForumMsg.h"
 
 /****
diff --git a/retroshare-gui/src/gui/feeds/MsgItem.cpp b/retroshare-gui/src/gui/feeds/MsgItem.cpp
index 57bba4b8c..9d5fe6b44 100644
--- a/retroshare-gui/src/gui/feeds/MsgItem.cpp
+++ b/retroshare-gui/src/gui/feeds/MsgItem.cpp
@@ -27,8 +27,8 @@
 #include "SubFileItem.h"
 #include "gui/msgs/MessageComposer.h"
 
-#include "rsiface/rsmsgs.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rsmsgs.h>
+#include <retroshare/rspeers.h>
 
 /****
  * #define DEBUG_ITEM 1
diff --git a/retroshare-gui/src/gui/feeds/PeerItem.cpp b/retroshare-gui/src/gui/feeds/PeerItem.cpp
index 3dc1ce717..70a746576 100644
--- a/retroshare-gui/src/gui/feeds/PeerItem.cpp
+++ b/retroshare-gui/src/gui/feeds/PeerItem.cpp
@@ -27,8 +27,8 @@
 #include "../RsAutoUpdatePage.h"
 #include "gui/msgs/MessageComposer.h"
 
-#include "rsiface/rsmsgs.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rsmsgs.h>
+#include <retroshare/rspeers.h>
 
 #include <sstream>
 
diff --git a/retroshare-gui/src/gui/feeds/SubDestItem.cpp b/retroshare-gui/src/gui/feeds/SubDestItem.cpp
index 0406713da..dec9c23eb 100644
--- a/retroshare-gui/src/gui/feeds/SubDestItem.cpp
+++ b/retroshare-gui/src/gui/feeds/SubDestItem.cpp
@@ -22,9 +22,9 @@
 #include "SubDestItem.h"
 #include "FeedHolder.h"
 
-#include "rsiface/rspeers.h"
-#include "rsiface/rsforums.h"
-#include "rsiface/rschannels.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsforums.h>
+#include <retroshare/rschannels.h>
 
 /****
  * #define DEBUG_ITEM 1
diff --git a/retroshare-gui/src/gui/feeds/SubFileItem.cpp b/retroshare-gui/src/gui/feeds/SubFileItem.cpp
index cedc1101a..c4c61615d 100644
--- a/retroshare-gui/src/gui/feeds/SubFileItem.cpp
+++ b/retroshare-gui/src/gui/feeds/SubFileItem.cpp
@@ -27,7 +27,7 @@
 
 #include "SubFileItem.h"
 
-#include "rsiface/rsfiles.h"
+#include <retroshare/rsfiles.h>
 
 
 /****
diff --git a/retroshare-gui/src/gui/forums/CreateForum.cpp b/retroshare-gui/src/gui/forums/CreateForum.cpp
index af895798b..7b9393c3a 100644
--- a/retroshare-gui/src/gui/forums/CreateForum.cpp
+++ b/retroshare-gui/src/gui/forums/CreateForum.cpp
@@ -23,7 +23,7 @@
 
 #include "CreateForum.h"
 
-#include "rsiface/rsforums.h"
+#include <retroshare/rsforums.h>
 
 /** Constructor */
 CreateForum::CreateForum(QWidget *parent)
diff --git a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
index 66dc07bfb..911916ecd 100644
--- a/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
+++ b/retroshare-gui/src/gui/forums/CreateForumMsg.cpp
@@ -29,8 +29,8 @@
 #include <QDropEvent>
 
 
-#include "rsiface/rsforums.h"
-#include "rsiface/rsfiles.h"
+#include <retroshare/rsforums.h>
+#include <retroshare/rsfiles.h>
 
 #include "gui/settings/rsharesettings.h"
 #include "gui/RetroShareLink.h"
diff --git a/retroshare-gui/src/gui/forums/ForumDetails.cpp b/retroshare-gui/src/gui/forums/ForumDetails.cpp
index 78a2a5958..30c6d42bd 100644
--- a/retroshare-gui/src/gui/forums/ForumDetails.cpp
+++ b/retroshare-gui/src/gui/forums/ForumDetails.cpp
@@ -20,10 +20,10 @@
  ****************************************************************/
 #include "ForumDetails.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsdisc.h"
-#include "rsiface/rsforums.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsdisc.h>
+#include <retroshare/rsforums.h>
 
 #include <QTime>
 #include <QDateTime>
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.cpp b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
index 542a55698..a4640e3c6 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.cpp
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.cpp
@@ -34,9 +34,9 @@
 #include "rshare.h"
 #include "MessageComposer.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsmsgs.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsmsgs.h>
 
 #include "gui/RetroShareLink.h"
 #include <gui/settings/rsharesettings.h>
diff --git a/retroshare-gui/src/gui/msgs/MessageComposer.h b/retroshare-gui/src/gui/msgs/MessageComposer.h
index 25baf71e9..5c93685b1 100644
--- a/retroshare-gui/src/gui/msgs/MessageComposer.h
+++ b/retroshare-gui/src/gui/msgs/MessageComposer.h
@@ -24,7 +24,7 @@
 
 #include <QMainWindow>
 #include <QSettings>
-#include "rsiface/rstypes.h"
+#include <retroshare/rstypes.h>
 #include "ui_MessageComposer.h"
 
 class QAction;
diff --git a/retroshare-gui/src/gui/notifyqt.cpp b/retroshare-gui/src/gui/notifyqt.cpp
index 6720fcb47..af3a0eaf5 100644
--- a/retroshare-gui/src/gui/notifyqt.cpp
+++ b/retroshare-gui/src/gui/notifyqt.cpp
@@ -2,11 +2,11 @@
 #include <QMessageBox>
 
 #include "notifyqt.h"
-#include "rsiface/rsnotify.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsphoto.h"
+#include <retroshare/rsnotify.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsphoto.h>
 #ifdef TURTLE_HOPPING
-#include <rsiface/rsturtle.h>
+#include <retroshare/rsturtle.h>
 #endif
 
 #include "gui/RsAutoUpdatePage.h"
diff --git a/retroshare-gui/src/gui/notifyqt.h b/retroshare-gui/src/gui/notifyqt.h
index 5e5b2efe5..063956a5d 100644
--- a/retroshare-gui/src/gui/notifyqt.h
+++ b/retroshare-gui/src/gui/notifyqt.h
@@ -1,8 +1,8 @@
 #ifndef RSIFACE_NOTIFY_TXT_H
 #define RSIFACE_NOTIFY_TXT_H
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rsturtle.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rsturtle.h>
 #include <QObject>
 
 #include <string>
diff --git a/retroshare-gui/src/gui/profile/ProfileEdit.cpp b/retroshare-gui/src/gui/profile/ProfileEdit.cpp
index 758ce0ef1..e3f99d6ab 100644
--- a/retroshare-gui/src/gui/profile/ProfileEdit.cpp
+++ b/retroshare-gui/src/gui/profile/ProfileEdit.cpp
@@ -21,7 +21,7 @@
 
 #include "gui/profile/ProfileEdit.h"
 
-#include "rsiface/rspeers.h"
+#include <retroshare/rspeers.h>
 
 #include <sstream>
 
diff --git a/retroshare-gui/src/gui/profile/ProfileView.cpp b/retroshare-gui/src/gui/profile/ProfileView.cpp
index 696e2745e..8a53a155c 100644
--- a/retroshare-gui/src/gui/profile/ProfileView.cpp
+++ b/retroshare-gui/src/gui/profile/ProfileView.cpp
@@ -22,8 +22,8 @@
 #include "gui/profile/ProfileView.h"
 #include "gui/profile/ProfileEdit.h"
 
-#include "rsiface/rspeers.h"
-#include "rsiface/rsmsgs.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsmsgs.h>
 
 #include <sstream>
 
diff --git a/retroshare-gui/src/gui/profile/ProfileWidget.cpp b/retroshare-gui/src/gui/profile/ProfileWidget.cpp
index be0f5d478..4149928c1 100644
--- a/retroshare-gui/src/gui/profile/ProfileWidget.cpp
+++ b/retroshare-gui/src/gui/profile/ProfileWidget.cpp
@@ -20,9 +20,9 @@
  ****************************************************************/
 #include "ProfileWidget.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsdisc.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsdisc.h>
 
 #include "StatusMessage.h"
 
diff --git a/retroshare-gui/src/gui/profile/StatusMessage.cpp b/retroshare-gui/src/gui/profile/StatusMessage.cpp
index fcb737c07..e9ed4679d 100644
--- a/retroshare-gui/src/gui/profile/StatusMessage.cpp
+++ b/retroshare-gui/src/gui/profile/StatusMessage.cpp
@@ -20,10 +20,10 @@
  ****************************************************************/
 #include "StatusMessage.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsdisc.h"
-#include "rsiface/rsmsgs.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsdisc.h>
+#include <retroshare/rsmsgs.h>
 #include "gui/settings/rsharesettings.h"
 
 
diff --git a/retroshare-gui/src/gui/settings/CryptoPage.cpp b/retroshare-gui/src/gui/settings/CryptoPage.cpp
index 7b7844925..5a89838db 100755
--- a/retroshare-gui/src/gui/settings/CryptoPage.cpp
+++ b/retroshare-gui/src/gui/settings/CryptoPage.cpp
@@ -27,7 +27,7 @@
 
 #include "CryptoPage.h"
 
-#include "rsiface/rspeers.h" //for rsPeers variable
+#include <retroshare/rspeers.h> //for rsPeers variable
 
 /** Constructor */
 CryptoPage::CryptoPage(QWidget * parent, Qt::WFlags flags)
diff --git a/retroshare-gui/src/gui/settings/DirectoriesPage.cpp b/retroshare-gui/src/gui/settings/DirectoriesPage.cpp
index 5fbc6f1ea..9ca38218c 100755
--- a/retroshare-gui/src/gui/settings/DirectoriesPage.cpp
+++ b/retroshare-gui/src/gui/settings/DirectoriesPage.cpp
@@ -23,7 +23,7 @@
 #include "gui/ShareManager.h"
 
 #include "rshare.h"
-#include "rsiface/rsfiles.h"
+#include <retroshare/rsfiles.h>
 
 #include <algorithm>
 
diff --git a/retroshare-gui/src/gui/settings/GeneralPage.cpp b/retroshare-gui/src/gui/settings/GeneralPage.cpp
index ba517e607..5dc77a169 100755
--- a/retroshare-gui/src/gui/settings/GeneralPage.cpp
+++ b/retroshare-gui/src/gui/settings/GeneralPage.cpp
@@ -21,7 +21,7 @@
 
 #include <iostream>
 #include <rshare.h>
-#include <rsiface/rsinit.h>
+#include <retroshare/rsinit.h>
 #include "GeneralPage.h"
 #include <util/stringutil.h>
 #include <QSystemTrayIcon>
diff --git a/retroshare-gui/src/gui/settings/NotifyPage.cpp b/retroshare-gui/src/gui/settings/NotifyPage.cpp
index 94cc05269..4275efbd0 100755
--- a/retroshare-gui/src/gui/settings/NotifyPage.cpp
+++ b/retroshare-gui/src/gui/settings/NotifyPage.cpp
@@ -25,7 +25,7 @@
 #include <iostream>
 #include <sstream>
 
-#include "rsiface/rsnotify.h"
+#include <retroshare/rsnotify.h>
 #include "rsharesettings.h"
 
 #include "gui/MainWindow.h"
diff --git a/retroshare-gui/src/gui/settings/ServerPage.cpp b/retroshare-gui/src/gui/settings/ServerPage.cpp
index 52323e6e9..1eff8ff9a 100755
--- a/retroshare-gui/src/gui/settings/ServerPage.cpp
+++ b/retroshare-gui/src/gui/settings/ServerPage.cpp
@@ -27,8 +27,8 @@
 #include <iostream>
 #include <sstream>
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
 
 #include <QTimer>
 
diff --git a/retroshare-gui/src/gui/settings/TransferPage.cpp b/retroshare-gui/src/gui/settings/TransferPage.cpp
index 796bd2e8f..b3521d6ce 100644
--- a/retroshare-gui/src/gui/settings/TransferPage.cpp
+++ b/retroshare-gui/src/gui/settings/TransferPage.cpp
@@ -26,9 +26,9 @@
 #include <iostream>
 #include <sstream>
 
-#include <rsiface/rsiface.h>
-#include <rsiface/rsfiles.h>
-#include <rsiface/rspeers.h>
+#include <retroshare/rsiface.h>
+#include <retroshare/rsfiles.h>
+#include <retroshare/rspeers.h>
 
 #include <QTimer>
 
diff --git a/retroshare-gui/src/gui/settings/rsettings.cpp b/retroshare-gui/src/gui/settings/rsettings.cpp
index badb50bef..643dcaa8a 100644
--- a/retroshare-gui/src/gui/settings/rsettings.cpp
+++ b/retroshare-gui/src/gui/settings/rsettings.cpp
@@ -24,7 +24,7 @@
 #include <iostream>
 
 #include "rsettings.h"
-#include "rsiface/rsinit.h"
+#include <retroshare/rsinit.h>
 
 /** The file in which all settings will read and written. */
 #define SETTINGS_FILE   (RsInit::RsProfileConfigDirectory() + "/RetroShare.conf")
diff --git a/retroshare-gui/src/gui/settings/rsharesettings.cpp b/retroshare-gui/src/gui/settings/rsharesettings.cpp
index 005d68e0b..d2058a797 100644
--- a/retroshare-gui/src/gui/settings/rsharesettings.cpp
+++ b/retroshare-gui/src/gui/settings/rsharesettings.cpp
@@ -30,7 +30,7 @@
 
 #include "rsharesettings.h"
 
-#include "rsiface/rsnotify.h"
+#include <retroshare/rsnotify.h>
 
 #include <QWidget>
 #include <QMainWindow>
diff --git a/retroshare-gui/src/gui/statusbar/hashingstatus.cpp b/retroshare-gui/src/gui/statusbar/hashingstatus.cpp
index c2e77b1f7..d9456a6fc 100644
--- a/retroshare-gui/src/gui/statusbar/hashingstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/hashingstatus.cpp
@@ -29,9 +29,9 @@
 #include <QPainter>
 #include <QPixmap>
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/notifyqt.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/notifyqt.h>
 
 #include <sstream>
 #include <iomanip>
diff --git a/retroshare-gui/src/gui/statusbar/natstatus.cpp b/retroshare-gui/src/gui/statusbar/natstatus.cpp
index 2d969d573..7098a713b 100644
--- a/retroshare-gui/src/gui/statusbar/natstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/natstatus.cpp
@@ -23,7 +23,7 @@
 
 #include "natstatus.h"
 
-#include "rsiface/rsiface.h"
+#include <retroshare/rsiface.h>
 
 NATStatus::NATStatus(QWidget *parent)
  : QWidget(parent)
diff --git a/retroshare-gui/src/gui/statusbar/ratesstatus.cpp b/retroshare-gui/src/gui/statusbar/ratesstatus.cpp
index 81d1f19ea..f23af1052 100644
--- a/retroshare-gui/src/gui/statusbar/ratesstatus.cpp
+++ b/retroshare-gui/src/gui/statusbar/ratesstatus.cpp
@@ -22,7 +22,7 @@
 #include <QLabel>
 
 #include "ratesstatus.h"
-#include "rsiface/rsiface.h"
+#include <retroshare/rsiface.h>
 
 #include <sstream>
 #include <iomanip>
diff --git a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
index 516f3e5fd..81354db4a 100644
--- a/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
+++ b/retroshare-gui/src/gui/unfinished/ApplicationWindow.cpp
@@ -30,7 +30,7 @@
 #include <rshare.h>
 #include "ApplicationWindow.h"
 
-#include "rsiface/rsiface.h"
+#include <retroshare/rsiface.h>
 
 #include "GamesDialog.h"
 #include "PhotoDialog.h"
diff --git a/retroshare-gui/src/gui/unfinished/CalDialog.cpp b/retroshare-gui/src/gui/unfinished/CalDialog.cpp
index 2449821fb..30e4ab09e 100644
--- a/retroshare-gui/src/gui/unfinished/CalDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/CalDialog.cpp
@@ -28,8 +28,8 @@
 
 //#include "rshare.h"
 #include "CalDialog.h"
-//#include "rsiface/rspeers.h"
-//#include "rsiface/rsrank.h"
+//#include <retroshare/rspeers.h>
+//#include <retroshare/rsrank.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp
index 8cce00a7f..e54317075 100644
--- a/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/ExampleDialog.cpp
@@ -24,7 +24,7 @@
 
 #include "rshare.h"
 #include "ExampleDialog.h"
-#include "rsiface/rsiface.h"
+#include <retroshare/rsiface.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp
index ba333fc66..014784777 100644
--- a/retroshare-gui/src/gui/unfinished/GamesDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/GamesDialog.cpp
@@ -23,9 +23,9 @@
 #include <QFileInfo>
 
 #include "GamesDialog.h"
-#include "rsiface/rsiface.h"
-#include "rsiface/rsgame.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rsgame.h>
+#include <retroshare/rspeers.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/retroshare-gui/src/gui/unfinished/LibraryDialog.h b/retroshare-gui/src/gui/unfinished/LibraryDialog.h
index e1754e5f8..8d3ea2e60 100644
--- a/retroshare-gui/src/gui/unfinished/LibraryDialog.h
+++ b/retroshare-gui/src/gui/unfinished/LibraryDialog.h
@@ -27,7 +27,7 @@
 #include "gui/mainpage.h"
 #include "ui_LibraryDialog.h"
 
-#include "rsiface/rstypes.h"
+#include <retroshare/rstypes.h>
 #include "gui/RemoteDirModel.h"
 
 class LibraryDialog : public MainPage 
diff --git a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
index 2cce1ea8a..0b7b7d985 100644
--- a/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/PhotoDialog.cpp
@@ -24,8 +24,8 @@
 
 #include "PhotoDialog.h"
 #include "PhotoShow.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsphoto.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsphoto.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/retroshare-gui/src/gui/unfinished/PhotoShow.cpp b/retroshare-gui/src/gui/unfinished/PhotoShow.cpp
index ba076dc24..58af772c9 100644
--- a/retroshare-gui/src/gui/unfinished/PhotoShow.cpp
+++ b/retroshare-gui/src/gui/unfinished/PhotoShow.cpp
@@ -23,8 +23,8 @@
 #include <QFileInfo>
 
 #include "PhotoShow.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsphoto.h"
+#include <retroshare/rspeers.h>
+#include <retroshare/rsphoto.h>
 
 #include <iostream>
 #include <sstream>
diff --git a/retroshare-gui/src/gui/unfinished/StatisticDialog.cpp b/retroshare-gui/src/gui/unfinished/StatisticDialog.cpp
index 085c1456d..84bf094d2 100644
--- a/retroshare-gui/src/gui/unfinished/StatisticDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/StatisticDialog.cpp
@@ -23,7 +23,7 @@
 #include "StatisticDialog.h"
 #include <control/bandwidthevent.h>
 
-#include "rsiface/rsiface.h"
+#include <retroshare/rsiface.h>
 
 #include <QTime>
 #include <QHeaderView>
diff --git a/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.cpp b/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.cpp
index a15752205..bc80e6ccc 100644
--- a/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.cpp
+++ b/retroshare-gui/src/gui/unfinished/blogs/BlogDetails.cpp
@@ -20,10 +20,10 @@
  ****************************************************************/
 #include "BlogDetails.h"
 
-#include "rsiface/rsiface.h"
-#include "rsiface/rspeers.h"
-#include "rsiface/rsdisc.h"
-#include "rsiface/rsblogs.h"
+#include <retroshare/rsiface.h>
+#include <retroshare/rspeers.h>
+#include <retroshare/rsdisc.h>
+#include <retroshare/rsblogs.h>
 
 #include <QTime>
 #include <QDateTime>
diff --git a/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp b/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp
index 9129c7ba4..c506a4501 100644
--- a/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp
+++ b/retroshare-gui/src/gui/unfinished/blogs/BlogsDialog.cpp
@@ -25,8 +25,8 @@
 
 #include <algorithm>
 
-#include "rsiface/rsblogs.h"
-#include "rsiface/rspeers.h" //to retrieve peer/usrId info
+#include <retroshare/rsblogs.h>
+#include <retroshare/rspeers.h> //to retrieve peer/usrId info
 
 #include "BlogsDialog.h"
 
diff --git a/retroshare-gui/src/gui/unfinished/blogs/BlogsMsgItem.cpp b/retroshare-gui/src/gui/unfinished/blogs/BlogsMsgItem.cpp
index 5da9e157f..7536b242b 100644
--- a/retroshare-gui/src/gui/unfinished/blogs/BlogsMsgItem.cpp
+++ b/retroshare-gui/src/gui/unfinished/blogs/BlogsMsgItem.cpp
@@ -24,7 +24,7 @@
 #include "BlogsMsgItem.h"
 #include "gui/feeds/FeedHolder.h"
 
-#include "rsiface/rsblogs.h"
+#include <retroshare/rsblogs.h>
 
 
 /****
diff --git a/retroshare-gui/src/gui/unfinished/blogs/CreateBlog.cpp b/retroshare-gui/src/gui/unfinished/blogs/CreateBlog.cpp
index 08d77c74b..da72637a4 100644
--- a/retroshare-gui/src/gui/unfinished/blogs/CreateBlog.cpp
+++ b/retroshare-gui/src/gui/unfinished/blogs/CreateBlog.cpp
@@ -25,7 +25,7 @@
 
 #include "CreateBlog.h"
 
-#include "rsiface/rsblogs.h"
+#include <retroshare/rsblogs.h>
 
 /** Constructor */
 CreateBlog::CreateBlog(QWidget *parent, bool isForum)
diff --git a/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.cpp b/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.cpp
index 02d3be1ba..ee65c73c2 100644
--- a/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.cpp
+++ b/retroshare-gui/src/gui/unfinished/blogs/CreateBlogMsg.cpp
@@ -36,7 +36,7 @@
 #include "CreateBlogMsg.h"
 #include "gui/msgs/textformat.h"
 
-#include "rsiface/rsblogs.h"
+#include <retroshare/rsblogs.h>
 
 /** Constructor */
 CreateBlogMsg::CreateBlogMsg(std::string cId ,QWidget* parent, Qt::WFlags flags)
diff --git a/retroshare-gui/src/gui/xprogressbar.cpp b/retroshare-gui/src/gui/xprogressbar.cpp
index 4d949aa01..304ddcfc4 100644
--- a/retroshare-gui/src/gui/xprogressbar.cpp
+++ b/retroshare-gui/src/gui/xprogressbar.cpp
@@ -25,7 +25,7 @@
  ****************************************************************/
 
 #include <math.h>
-#include <rsiface/rstypes.h>
+#include <retroshare/rstypes.h>
 #include "xprogressbar.h"
 
 xProgressBar::xProgressBar(const FileProgressInfo& pinfo,QRect rect, QPainter *painter, int schemaIndex)
diff --git a/retroshare-gui/src/gui/xprogressbar.h b/retroshare-gui/src/gui/xprogressbar.h
index 80ef3c30b..d10bdac04 100644
--- a/retroshare-gui/src/gui/xprogressbar.h
+++ b/retroshare-gui/src/gui/xprogressbar.h
@@ -34,7 +34,7 @@
 #include <QLinearGradient>
 #include <QLocale>
 
-#include <rsiface/rstypes.h>
+#include <retroshare/rstypes.h>
 
 class FileProgressInfo
 {
diff --git a/retroshare-gui/src/main.cpp b/retroshare-gui/src/main.cpp
index 6492169eb..06f40ba11 100644
--- a/retroshare-gui/src/main.cpp
+++ b/retroshare-gui/src/main.cpp
@@ -41,8 +41,8 @@
 ****/
 
 #include <util/stringutil.h>
-#include "rsiface/rsinit.h"
-#include "rsiface/rsiface.h"
+#include <retroshare/rsinit.h>
+#include <retroshare/rsiface.h>
 #include "gui/notifyqt.h"
 
 int main(int argc, char *argv[])
diff --git a/retroshare-nogui/src/notifytxt.cc b/retroshare-nogui/src/notifytxt.cc
index 9f788b15d..d7f6b445a 100644
--- a/retroshare-nogui/src/notifytxt.cc
+++ b/retroshare-nogui/src/notifytxt.cc
@@ -25,7 +25,7 @@
 
 
 #include "notifytxt.h"
-#include "rsiface/rspeers.h"
+#include <retroshare/rspeers.h>
 #include <string.h>
 
 #include <iostream>
diff --git a/retroshare-nogui/src/notifytxt.h b/retroshare-nogui/src/notifytxt.h
index abb641592..274b07892 100644
--- a/retroshare-nogui/src/notifytxt.h
+++ b/retroshare-nogui/src/notifytxt.h
@@ -26,7 +26,7 @@
  */
 
 
-#include "rsiface/rsiface.h"
+#include <retroshare/rsiface.h>
 
 #include <string>
 
diff --git a/retroshare-nogui/src/retroshare.cc b/retroshare-nogui/src/retroshare.cc
index 3dee7efc6..7578e02a4 100644
--- a/retroshare-nogui/src/retroshare.cc
+++ b/retroshare-nogui/src/retroshare.cc
@@ -25,8 +25,8 @@
  */
 
 
-#include "rsiface/rsiface.h"   /* definition of iface */
-#include "rsiface/rsinit.h"   /* definition of iface */
+#include <retroshare/rsiface.h>   /* definition of iface */
+#include <retroshare/rsinit.h>   /* definition of iface */
 
 #include "notifytxt.h"