From 8b6ce73cebaf116ff71e65e0a9ae9bf08be50f31 Mon Sep 17 00:00:00 2001
From: csoler <retroshare.project@gmail.com>
Date: Fri, 7 Mar 2014 13:38:46 +0000
Subject: [PATCH] removed circular dependencies between includes

git-svn-id: http://svn.code.sf.net/p/retroshare/code/branches/v0.6-IdCleaning@7171 b45a01b8-16f6-495d-af2f-9b41ad6348cc
---
 libretroshare/src/retroshare/rsgxscircles.h    |  6 +++++-
 libretroshare/src/retroshare/rsgxsifacetypes.h | 10 +++++-----
 libretroshare/src/retroshare/rsgxsservice.h    |  3 +++
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/libretroshare/src/retroshare/rsgxscircles.h b/libretroshare/src/retroshare/rsgxscircles.h
index 991f229c6..78d70b565 100644
--- a/libretroshare/src/retroshare/rsgxscircles.h
+++ b/libretroshare/src/retroshare/rsgxscircles.h
@@ -32,6 +32,11 @@
 #include <set>
 
 #include "retroshare/rstypes.h"
+
+//typedef std::string RsGxsCircleId;
+//typedef RsPgpId RsPgpId;
+//typedef std::string RsCircleInternalId;
+
 #include "retroshare/rstokenservice.h"
 #include "retroshare/rsgxsifacehelper.h"
 
@@ -42,7 +47,6 @@
 class RsGxsCircles;
 extern RsGxsCircles *rsGxsCircles;
 
-
 typedef RsPgpId RsPgpId;
 typedef std::string RsCircleInternalId;
 
diff --git a/libretroshare/src/retroshare/rsgxsifacetypes.h b/libretroshare/src/retroshare/rsgxsifacetypes.h
index f1b979178..193a6438c 100644
--- a/libretroshare/src/retroshare/rsgxsifacetypes.h
+++ b/libretroshare/src/retroshare/rsgxsifacetypes.h
@@ -12,13 +12,13 @@
 #include <vector>
 #include <string>
 #include <inttypes.h>
-#include <retroshare/rstypes.h>
-#include <retroshare/rsids.h>
 
-typedef GXSGroupId RsGxsGroupId;
+#include <retroshare/rstypes.h>
+
+typedef GXSGroupId   RsGxsGroupId;
 typedef Sha1CheckSum RsGxsMessageId;
-typedef GXSId RsGxsId;
-typedef GXSCircleId RsGxsCircleId;
+typedef GXSId        RsGxsId;
+typedef GXSCircleId  RsGxsCircleId;
 
 typedef std::map<RsGxsGroupId, std::vector<RsGxsMessageId> > GxsMsgIdResult;
 typedef std::pair<RsGxsGroupId, RsGxsMessageId> RsGxsGrpMsgIdPair;
diff --git a/libretroshare/src/retroshare/rsgxsservice.h b/libretroshare/src/retroshare/rsgxsservice.h
index 9de4b4320..be8321828 100644
--- a/libretroshare/src/retroshare/rsgxsservice.h
+++ b/libretroshare/src/retroshare/rsgxsservice.h
@@ -2,8 +2,11 @@
 #define RSGXSSERVICE_H
 
 
+#include "retroshare/rsgxsifacetypes.h"
 #include "retroshare/rstokenservice.h"
 
+class RsMsgMetaData ;
+
 typedef std::map<RsGxsGroupId, std::vector<RsMsgMetaData> > GxsMsgMetaMap;
 typedef std::map<RsGxsGrpMsgIdPair, std::vector<RsMsgMetaData> > GxsMsgRelatedMetaMap;