3 files changed, 7 insertions, 6 deletions
diff --git a/qpid/cpp/src/qpid/amqp/MessageId.h b/qpid/cpp/src/qpid/amqp/MessageId.h
index f81dc9be2c..ee440f3011 100644
--- a/qpid/cpp/src/qpid/amqp/MessageId.h
+++ b/qpid/cpp/src/qpid/amqp/MessageId.h
@@ -23,6 +23,7 @@
  */
 #include "qpid/amqp/CharSequence.h"
 #include "qpid/types/Variant.h"
+#include "qpid/CommonImportExport.h"
 
 namespace qpid {
 namespace amqp {
@@ -41,10 +42,10 @@ struct MessageId
         ULONG
     } type;
 
-    MessageId();
-    void assign(std::string&) const;
-    void set(qpid::amqp::CharSequence bytes, qpid::types::VariantType t);
-    void set(uint64_t ulong);
+    QPID_COMMON_EXTERN MessageId();
+    QPID_COMMON_EXTERN void assign(std::string&) const;
+    QPID_COMMON_EXTERN void set(qpid::amqp::CharSequence bytes, qpid::types::VariantType t);
+    QPID_COMMON_EXTERN void set(uint64_t ulong);
 
 };
 
diff --git a/qpid/cpp/src/qpid/amqp/MessageReader.h b/qpid/cpp/src/qpid/amqp/MessageReader.h
index 54ca0bb7e8..5d26b288f5 100644
--- a/qpid/cpp/src/qpid/amqp/MessageReader.h
+++ b/qpid/cpp/src/qpid/amqp/MessageReader.h
@@ -102,7 +102,7 @@ class MessageReader : public Reader
     virtual void onBody(const qpid::types::Variant&, const Descriptor&) = 0;
     virtual void onFooter(const CharSequence&) = 0;
 
-    CharSequence getBareMessage() const;
+    QPID_COMMON_EXTERN CharSequence getBareMessage() const;
 
   private:
     /*
diff --git a/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.h b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.h
index 4616fcd5d6..09a9d948d5 100644
--- a/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.h
+++ b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.h
@@ -34,7 +34,7 @@ struct Descriptor;
 }
 namespace messaging {
 class Address;
-struct MessageImpl;
+class MessageImpl;
 namespace amqp {
 
 /**