1 files changed, 3 insertions, 3 deletions
diff --git a/cpp/include/qpid/messaging/Message.h b/cpp/include/qpid/messaging/Message.h
index 329388048e..e68d8a1141 100644
--- a/cpp/include/qpid/messaging/Message.h
+++ b/cpp/include/qpid/messaging/Message.h
@@ -33,9 +33,9 @@ namespace client {
 
 namespace messaging {
 
-class Address;
+struct Address;
 class Codec;
-class MessageImpl;
+struct MessageImpl;
 
 /**
  * Representation of a message.
@@ -81,7 +81,7 @@ class Message
 
   private:
     MessageImpl* impl;
-  friend class MessageImplAccess;
+    friend struct MessageImplAccess;
 };
 }} // namespace qpid::messaging