4 files changed, 10 insertions, 3 deletions
diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 83e8ec3b3b..564db08905 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -101,6 +101,7 @@ libqpidamqp_0_10_la_SOURCES= \
   qpid/amqp_0_10/Array.cpp \
   qpid/amqp_0_10/Body.h \
   qpid/amqp_0_10/Command.h \
+  qpid/amqp_0_10/CommmandPacker.h \
   qpid/amqp_0_10/Control.h \
   qpid/amqp_0_10/Header.h \
   qpid/amqp_0_10/Header.cpp \
@@ -118,6 +119,7 @@ libqpidamqp_0_10_la_SOURCES= \
   qpid/amqp_0_10/Struct32.cpp \
   qpid/amqp_0_10/Unit.h \
   qpid/amqp_0_10/Unit.cpp \
+  qpid/amqp_0_10/UnitHandler.h \
   qpid/amqp_0_10/UnknownType.h \
   qpid/amqp_0_10/UnknownType.cpp \
   qpid/amqp_0_10/UnknownStruct.h \
@@ -300,6 +302,7 @@ nobase_include_HEADERS = \
   qpid/Url.h \
   qpid/InlineVector.h \
   qpid/InlineAllocator.h \
+  qpid/log/Statement.h \
   qpid/memory.h \
   qpid/shared_ptr.h \
   qpid/broker/Broker.h \
diff --git a/cpp/src/qpid/framing/TransferContent.cpp b/cpp/src/qpid/framing/TransferContent.cpp
index 99f5d365e8..42af2027eb 100644
--- a/cpp/src/qpid/framing/TransferContent.cpp
+++ b/cpp/src/qpid/framing/TransferContent.cpp
@@ -38,8 +38,11 @@ AMQHeaderBody TransferContent::getHeader() const
     return header;
 }
 
-const std::string& TransferContent::getData() const
-{
+const std::string& TransferContent::getData() const {
+    return data;
+}
+
+std::string& TransferContent::getData() {
     return data;
 }
 
diff --git a/cpp/src/qpid/framing/TransferContent.h b/cpp/src/qpid/framing/TransferContent.h
index 88f45b7e0a..f9f69da25e 100644
--- a/cpp/src/qpid/framing/TransferContent.h
+++ b/cpp/src/qpid/framing/TransferContent.h
@@ -46,6 +46,7 @@ public:
     DeliveryProperties& getDeliveryProperties();
 
     const std::string& getData() const;
+    std::string& getData();
     const MessageProperties& getMessageProperties() const;
     const DeliveryProperties& getDeliveryProperties() const;
     bool hasMessageProperties() const;
diff --git a/cpp/src/tests/Makefile.am b/cpp/src/tests/Makefile.am
index 18f6f3bfa7..b7fe79f56c 100644
--- a/cpp/src/tests/Makefile.am
+++ b/cpp/src/tests/Makefile.am
@@ -40,7 +40,7 @@ unit_test_SOURCES= unit_test.cpp unit_test.h \
 	ISList.cpp IList.cpp \
 	ClientSessionTest.cpp \
 	SequenceSet.cpp \
-	amqp_0_10/serialize.cpp \
+	amqp_0_10/serialize.cpp allSegmentTypes.h \
 	amqp_0_10/ProxyTemplate.cpp \
 	amqp_0_10/apply.cpp \
 	IncompleteMessageList.cpp \