diff --git a/libretroshare/src/chat/distributedchat.h b/libretroshare/src/chat/distributedchat.h
index ed5a438f9..ca7155dd2 100644
--- a/libretroshare/src/chat/distributedchat.h
+++ b/libretroshare/src/chat/distributedchat.h
@@ -30,7 +30,7 @@
 
 typedef RsPeerId ChatLobbyVirtualPeerId ;
 
-class RsItem ;
+struct RsItem;
 class p3HistoryMgr ;
 class p3IdService ;
 class p3ServiceControl;
diff --git a/libretroshare/src/grouter/grouterclientservice.h b/libretroshare/src/grouter/grouterclientservice.h
index a6bef29e1..35c22614a 100644
--- a/libretroshare/src/grouter/grouterclientservice.h
+++ b/libretroshare/src/grouter/grouterclientservice.h
@@ -34,7 +34,7 @@
 #include <stdlib.h>
 #include <grouter/grouteritems.h>
 
-class RsItem ;
+struct RsItem;
 
 static const uint32_t GROUTER_CLIENT_SERVICE_DATA_STATUS_UNKNOWN  = 0x0000 ;	// unused.
 static const uint32_t GROUTER_CLIENT_SERVICE_DATA_STATUS_RECEIVED = 0x0001 ;	// sent when data has been received and a receipt is available.
diff --git a/libretroshare/src/grouter/groutermatrix.h b/libretroshare/src/grouter/groutermatrix.h
index 99c9ae1bd..cb567b9bc 100644
--- a/libretroshare/src/grouter/groutermatrix.h
+++ b/libretroshare/src/grouter/groutermatrix.h
@@ -31,7 +31,7 @@
 #include "retroshare/rsgrouter.h"
 #include "groutertypes.h"
 
-class RsItem ;
+struct RsItem;
 
 // The routing matrix records the event clues received from each friend
 //
diff --git a/libretroshare/src/pqi/pqihandler.h b/libretroshare/src/pqi/pqihandler.h
index cf1f19429..c285c4ef7 100644
--- a/libretroshare/src/pqi/pqihandler.h
+++ b/libretroshare/src/pqi/pqihandler.h
@@ -38,7 +38,7 @@
 class PQInterface;
 class RSTrafficClue;
 class RsBwRates;
-class RsItem;
+struct RsItem;
 class RsRawItem;
 
 class SearchModule
diff --git a/libretroshare/src/pqi/pqiloopback.cc b/libretroshare/src/pqi/pqiloopback.cc
index ba4078ce2..8a8ba342b 100644
--- a/libretroshare/src/pqi/pqiloopback.cc
+++ b/libretroshare/src/pqi/pqiloopback.cc
@@ -27,7 +27,7 @@
 
 #include <stddef.h>  // for NULL
 
-class RsItem;
+struct RsItem;
 
 /***
 #define LOOPBACK_DEBUG 1
diff --git a/libretroshare/src/pqi/pqiloopback.h b/libretroshare/src/pqi/pqiloopback.h
index 7186dd440..82c3923d8 100644
--- a/libretroshare/src/pqi/pqiloopback.h
+++ b/libretroshare/src/pqi/pqiloopback.h
@@ -31,7 +31,7 @@
 #include "pqi/pqi_base.h"        // for NetInterface (ptr only), PQInterface
 #include "retroshare/rstypes.h"  // for RsPeerId
 
-class RsItem;
+struct RsItem;
 
 class pqiloopback: public PQInterface
 {
diff --git a/libretroshare/src/pqi/pqistreamer.h b/libretroshare/src/pqi/pqistreamer.h
index fe2754854..9908651b2 100644
--- a/libretroshare/src/pqi/pqistreamer.h
+++ b/libretroshare/src/pqi/pqistreamer.h
@@ -38,7 +38,7 @@
 #include "retroshare/rstypes.h"   // for RsPeerId
 #include "util/rsthreads.h"       // for RsMutex
 
-class RsItem;
+struct RsItem;
 class RsSerialiser;
 
 struct PartialPacketRecord
diff --git a/libretroshare/src/serialiser/rsserial.h b/libretroshare/src/serialiser/rsserial.h
index 206f69608..ee3a79537 100644
--- a/libretroshare/src/serialiser/rsserial.h
+++ b/libretroshare/src/serialiser/rsserial.h
@@ -64,7 +64,7 @@ const uint8_t RS_PKT_CLASS_CONFIG    = 0x02;
 
 const uint8_t RS_PKT_SUBTYPE_DEFAULT = 0x01; /* if only one subtype */
 
-class RsItem ;
+struct RsItem;
 class RsSerialType ;
 
 
diff --git a/libretroshare/src/serialiser/rsserializer.h b/libretroshare/src/serialiser/rsserializer.h
index 63b565a9b..dcc4d089f 100644
--- a/libretroshare/src/serialiser/rsserializer.h
+++ b/libretroshare/src/serialiser/rsserializer.h
@@ -160,7 +160,7 @@
 #include "serialiser/rsserial.h"
 #include "util/rsdeprecate.h"
 
-class RsItem ;
+struct RsItem;
 
 #define SERIALIZE_ERROR() std::cerr << __PRETTY_FUNCTION__ << " : " 
 
diff --git a/libretroshare/src/turtle/turtleclientservice.h b/libretroshare/src/turtle/turtleclientservice.h
index d9552c662..51a9dbdc3 100644
--- a/libretroshare/src/turtle/turtleclientservice.h
+++ b/libretroshare/src/turtle/turtleclientservice.h
@@ -36,7 +36,7 @@
 #include <serialiser/rsserial.h>
 #include <turtle/rsturtleitem.h>
 
-class RsItem ;
+struct RsItem;
 class p3turtle ;
 
 class RsTurtleClientService
diff --git a/tests/librssimulator/testing/IsolatedServiceTester.h b/tests/librssimulator/testing/IsolatedServiceTester.h
index aca9695ed..3fa5e2afc 100644
--- a/tests/librssimulator/testing/IsolatedServiceTester.h
+++ b/tests/librssimulator/testing/IsolatedServiceTester.h
@@ -4,7 +4,7 @@
 #include "retroshare/rsids.h"
 #include "pqi/p3linkmgr.h"
 
-class RsItem;
+struct RsItem;
 class PeerNode;
 class RsSerialType;
 class RsSerialiser;
diff --git a/tests/librssimulator/testing/SetFilter.h b/tests/librssimulator/testing/SetFilter.h
index 9b9a8b15d..50df26955 100644
--- a/tests/librssimulator/testing/SetFilter.h
+++ b/tests/librssimulator/testing/SetFilter.h
@@ -4,7 +4,7 @@
 #include "retroshare/rsids.h"
 #include "SetPacket.h"
 
-class RsItem;
+struct RsItem;
 
 class SetFilter
 {
diff --git a/tests/librssimulator/testing/SetPacket.h b/tests/librssimulator/testing/SetPacket.h
index ae529f37b..1e377191e 100644
--- a/tests/librssimulator/testing/SetPacket.h
+++ b/tests/librssimulator/testing/SetPacket.h
@@ -5,7 +5,7 @@
 #include <list>
 #include "retroshare/rsids.h"
 
-class RsItem;
+struct RsItem;
 
 class SetPacket
 {
diff --git a/tests/librssimulator/testing/SetServiceTester.h b/tests/librssimulator/testing/SetServiceTester.h
index ad03aed4e..862fc43e0 100644
--- a/tests/librssimulator/testing/SetServiceTester.h
+++ b/tests/librssimulator/testing/SetServiceTester.h
@@ -8,7 +8,7 @@
 #include "SetPacket.h"
 #include "SetFilter.h"
 
-class RsItem;
+struct RsItem;
 class PeerNode;
 class RsSerialType;
 class RsSerialiser;