4 files changed, 4 insertions, 1 deletions
diff --git a/qpid/cpp/src/qpid/NullSaslServer.cpp b/qpid/cpp/src/qpid/NullSaslServer.cpp
index 5139fec42f..8f415ba3ba 100644
--- a/qpid/cpp/src/qpid/NullSaslServer.cpp
+++ b/qpid/cpp/src/qpid/NullSaslServer.cpp
@@ -20,6 +20,7 @@
  */
 #include "NullSaslServer.h"
 #include "qpid/log/Statement.h"
+#include "qpid/sys/SecurityLayer.h"
 #include <assert.h>
 #include <boost/format.hpp>
 
diff --git a/qpid/cpp/src/qpid/amqp/MessageId.cpp b/qpid/cpp/src/qpid/amqp/MessageId.cpp
index 05ee77874a..e6f6f4a231 100644
--- a/qpid/cpp/src/qpid/amqp/MessageId.cpp
+++ b/qpid/cpp/src/qpid/amqp/MessageId.cpp
@@ -19,6 +19,7 @@
  *
  */
 #include "qpid/amqp/MessageId.h"
+#include <assert.h>
 #include <boost/lexical_cast.hpp>
 
 namespace qpid {
diff --git a/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
index 39eaa3ffad..54de3eae45 100644
--- a/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/EncodedMessage.cpp
@@ -193,7 +193,7 @@ bool EncodedMessage::hasHeaderChanged(const qpid::messaging::MessageImpl& msg) c
     if (!durable) {
         if (msg.isDurable()) return true;
     } else {
-        if (durable != msg.isDurable()) return true;
+        if (durable.get() != msg.isDurable()) return true;
     }
 
     if (!priority) {
diff --git a/qpid/cpp/src/qpid/messaging/amqp/Transport.cpp b/qpid/cpp/src/qpid/messaging/amqp/Transport.cpp
index 4c2d212689..21f51046b1 100644
--- a/qpid/cpp/src/qpid/messaging/amqp/Transport.cpp
+++ b/qpid/cpp/src/qpid/messaging/amqp/Transport.cpp
@@ -21,6 +21,7 @@
 #include "qpid/messaging/amqp/Transport.h"
 #include "qpid/messaging/amqp/TransportContext.h"
 #include <map>
+#include <string>
 
 namespace qpid {
 namespace messaging {