diff --git a/libretroshare/src/gxs/rsgenexchange.h b/libretroshare/src/gxs/rsgenexchange.h
index 71f607ca1..363711386 100644
--- a/libretroshare/src/gxs/rsgenexchange.h
+++ b/libretroshare/src/gxs/rsgenexchange.h
@@ -32,12 +32,10 @@
 #include "rsgxs.h"
 #include "rsgds.h"
 #include "rsnxs.h"
-#include "rsgixs.h"
 #include "rsgxsdataaccess.h"
 #include "rsnxsobserver.h"
 #include "retroshare/rsgxsservice.h"
 #include "serialiser/rsnxsitems.h"
-//#include "rsgixs.h"
 
 typedef std::map<RsGxsGroupId, std::vector<RsGxsMsgItem*> > GxsMsgDataMap;
 typedef std::map<RsGxsGroupId, RsGxsGrpItem*> GxsGroupDataMap;
@@ -63,6 +61,9 @@ typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > GxsMsgMetaMap;
  *              Also notifications are made here on receipt of new data from \n
  *              connected peers
  */
+
+class RsGixs;
+
 class RsGenExchange : public RsGxsService, public RsNxsObserver
 {
 public:
diff --git a/libretroshare/src/gxs/rsgixs.h b/libretroshare/src/gxs/rsgixs.h
index 316a5e82c..25b1d7a25 100644
--- a/libretroshare/src/gxs/rsgixs.h
+++ b/libretroshare/src/gxs/rsgixs.h
@@ -180,14 +180,17 @@ public:
 
 /*** This Class pulls all the GXS Interfaces together ****/
 
-//class RsGxsIdExchange: public RsGenExchange, public RsGixsReputation, public RsGixs
-//{
-//public:
-//    RsGxsIdExchange(RsGeneralDataService* gds, RsNetworkExchangeService* ns, RsSerialType* serviceSerialiser, uint16_t mServType)
-//    :RsGenExchange(gds,ns,serviceSerialiser,mServType) { return; }
-//virtual ~RsGxsIdExchange() { return; }
+class RsGxsIdExchange: 
+	public RsGenExchange, 
+	public RsGixsReputation, 
+	public RsGixs
+{
+public:
+    RsGxsIdExchange(RsGeneralDataService* gds, RsNetworkExchangeService* ns, RsSerialType* serviceSerialiser, uint16_t mServType)
+    :RsGenExchange(gds,ns,serviceSerialiser,mServType, this) { return; }
+virtual ~RsGxsIdExchange() { return; }
 
-//};
+};
 
 
 
diff --git a/libretroshare/src/libretroshare.pro b/libretroshare/src/libretroshare.pro
index 7b0bf9a71..b04ebcc32 100644
--- a/libretroshare/src/libretroshare.pro
+++ b/libretroshare/src/libretroshare.pro
@@ -638,7 +638,7 @@ HEADERS += retroshare/rsgame.h \
                 services/p3idservice.h \
                 serialiser/rsgxsiditems.h
 
-            #SOURCES += services/p3idservice.cc
+            SOURCES += services/p3idservice.cc
             #    serialiser/rsgxsiditems.cc \
 
             # Wiki Service