diff --git a/src/include/rados/librados.hpp b/src/include/rados/librados.hpp
index 1818fd34a39..92aa9f66e3a 100644
--- a/src/include/rados/librados.hpp
+++ b/src/include/rados/librados.hpp
@@ -30,8 +30,8 @@ namespace librados
   struct ObjListCtx;
   struct PoolAsyncCompletionImpl;
   class RadosClient;
-  class ListObjectImpl;
-  struct NObjectIteratorImpl;
+  struct ListObjectImpl;
+  class NObjectIteratorImpl;
 
   typedef void *list_ctx_t;
   typedef uint64_t auid_t;
diff --git a/src/librados/ListObjectImpl.h b/src/librados/ListObjectImpl.h
index 08754dfad0b..fdbe509d154 100644
--- a/src/librados/ListObjectImpl.h
+++ b/src/librados/ListObjectImpl.h
@@ -40,9 +40,9 @@ inline std::ostream& operator<<(std::ostream& out, const struct ListObjectImpl&
   return out;
 }
 
-class ObjListCtx;
+struct ObjListCtx;
 
-struct NObjectIteratorImpl {
+class NObjectIteratorImpl {
   public:
     NObjectIteratorImpl() {}
     ~NObjectIteratorImpl();
@@ -57,7 +57,7 @@ struct NObjectIteratorImpl {
     NObjectIteratorImpl operator++(int); // Postincrement
     const ListObject *get_listobjectp() { return &cur_obj; }
     friend class IoCtx;
-    friend class ListObjectImpl;
+    friend struct ListObjectImpl;
     //friend class ListObject;
     friend class NObjectIterator;
 
diff --git a/src/msg/simple/PipeConnection.h b/src/msg/simple/PipeConnection.h
index 00f6d0e16d3..9e27ec4a58d 100644
--- a/src/msg/simple/PipeConnection.h
+++ b/src/msg/simple/PipeConnection.h
@@ -19,7 +19,7 @@
 
 class Pipe;
 
-struct PipeConnection : public Connection {
+class PipeConnection : public Connection {
   Pipe* pipe;
 
   friend class boost::intrusive_ptr<PipeConnection>;