diff --git a/libretroshare/src/pgp/rscertificate.h b/libretroshare/src/pgp/rscertificate.h
index b0fd70801..177440530 100644
--- a/libretroshare/src/pgp/rscertificate.h
+++ b/libretroshare/src/pgp/rscertificate.h
@@ -47,7 +47,7 @@
 #include <set>
 #include <string>
 
-class RsPeerDetails ;
+struct RsPeerDetails;
 
 class RsCertificate
 {
diff --git a/libretroshare/src/pqi/authgpg.h b/libretroshare/src/pqi/authgpg.h
index 6d3337580..6bfab7935 100644
--- a/libretroshare/src/pqi/authgpg.h
+++ b/libretroshare/src/pqi/authgpg.h
@@ -38,7 +38,7 @@
 
 #define MAX_GPG_SIGNATURE_SIZE  4096
 
-class RsPeerDetails;
+struct RsPeerDetails;
 
 /*!
  * gpgcert is the identifier for a person.
diff --git a/libretroshare/src/pqi/p3linkmgr.h b/libretroshare/src/pqi/p3linkmgr.h
index 57638c174..afcd94b45 100644
--- a/libretroshare/src/pqi/p3linkmgr.h
+++ b/libretroshare/src/pqi/p3linkmgr.h
@@ -129,7 +129,7 @@ class peerConnectState
 
 class p3tunnel; 
 class RsPeerGroupItem_deprecated;
-class RsGroupInfo;
+struct RsGroupInfo;
 
 class p3PeerMgr;
 class p3NetMgr;
diff --git a/libretroshare/src/pqi/pqi_base.h b/libretroshare/src/pqi/pqi_base.h
index 0741df1c5..b7c2746d2 100644
--- a/libretroshare/src/pqi/pqi_base.h
+++ b/libretroshare/src/pqi/pqi_base.h
@@ -31,7 +31,7 @@
 
 #include "pqi/pqinetwork.h"
 
-class RSTrafficClue ;
+struct RSTrafficClue;
 
 /*** Base DataTypes: ****/
 #include "serialiser/rsserial.h"
@@ -46,7 +46,7 @@ class RSTrafficClue ;
 int getPQIsearchId();
 int fixme(char *str, int n);
 
-class RsPeerCryptoParams ;
+struct RsPeerCryptoParams;
 
 //! controlling data rates
 /*!
diff --git a/libretroshare/src/pqi/pqihandler.h b/libretroshare/src/pqi/pqihandler.h
index 755b13cfd..40a2c3a27 100644
--- a/libretroshare/src/pqi/pqihandler.h
+++ b/libretroshare/src/pqi/pqihandler.h
@@ -32,7 +32,7 @@
 #include "util/rsthreads.h"      // for RsStackMutex, RsMutex
 
 class PQInterface;
-class RSTrafficClue;
+struct RSTrafficClue;
 class RsBwRates;
 struct RsItem;
 class RsRawItem;
diff --git a/libretroshare/src/pqi/pqiperson.h b/libretroshare/src/pqi/pqiperson.h
index 895af2925..e5b6f7f2c 100644
--- a/libretroshare/src/pqi/pqiperson.h
+++ b/libretroshare/src/pqi/pqiperson.h
@@ -30,7 +30,7 @@
 #include <list>
 
 class pqiperson;
-class RsPeerCryptoParams ;
+struct RsPeerCryptoParams;
 
 static const int CONNECT_RECEIVED     = 1; 
 static const int CONNECT_SUCCESS      = 2;
diff --git a/libretroshare/src/pqi/pqipersongrp.h b/libretroshare/src/pqi/pqipersongrp.h
index 0afd00a78..5b57aebb1 100644
--- a/libretroshare/src/pqi/pqipersongrp.h
+++ b/libretroshare/src/pqi/pqipersongrp.h
@@ -40,7 +40,7 @@
 const unsigned long PQIPERSON_NO_LISTENER = 	0x0001;
 
 const unsigned long PQIPERSON_ALL_BW_LIMITED =  0x0010;
-class RsPeerCryptoParams ;
+struct RsPeerCryptoParams;
 
 class pqipersongrp: public pqihandler, public pqiMonitor, public p3ServiceServer, public pqiNetListener
 {
diff --git a/libretroshare/src/retroshare/rsiface.h b/libretroshare/src/retroshare/rsiface.h
index 83eda2eae..1f9041d3e 100644
--- a/libretroshare/src/retroshare/rsiface.h
+++ b/libretroshare/src/retroshare/rsiface.h
@@ -29,7 +29,7 @@
 
 class RsServer;
 class RsInit;
-class RsPeerCryptoParams;
+struct RsPeerCryptoParams;
 class RsControl;
 
 /// RsInit -> Configuration Parameters for RetroShare Startup
diff --git a/libretroshare/src/retroshare/rsnotify.h b/libretroshare/src/retroshare/rsnotify.h
index cf7777e9e..d2077e7f0 100644
--- a/libretroshare/src/retroshare/rsnotify.h
+++ b/libretroshare/src/retroshare/rsnotify.h
@@ -33,7 +33,7 @@
 
 class ChatId;
 class ChatMessage;
-class RsGxsChanges;
+struct RsGxsChanges;
 
 class RsNotify;
 extern RsNotify   *rsNotify;
diff --git a/libretroshare/src/rsitems/rsconfigitems.h b/libretroshare/src/rsitems/rsconfigitems.h
index 376bebb78..4bb41150c 100644
--- a/libretroshare/src/rsitems/rsconfigitems.h
+++ b/libretroshare/src/rsitems/rsconfigitems.h
@@ -37,7 +37,7 @@
 
 #include "serialiser/rsserializer.h"
 
-class RsGroupInfo;
+struct RsGroupInfo;
 
 const uint8_t RS_PKT_TYPE_GENERAL_CONFIG = 0x01;
 const uint8_t RS_PKT_TYPE_PEER_CONFIG    = 0x02;