5 files changed, 9 insertions, 4 deletions
diff --git a/qpid/cpp/src/qmf/PrivateImplRef.h b/qpid/cpp/src/qmf/PrivateImplRef.h
index 8b698c4199..960cbb2e09 100644
--- a/qpid/cpp/src/qmf/PrivateImplRef.h
+++ b/qpid/cpp/src/qmf/PrivateImplRef.h
@@ -23,8 +23,8 @@
  */
 
 #include "qmf/ImportExport.h"
-#include <boost/intrusive_ptr.hpp>
 #include "qpid/RefCounted.h"
+#include <boost/intrusive_ptr.hpp>
 
 namespace qmf {
 
diff --git a/qpid/cpp/src/qpid/RefCounted.h b/qpid/cpp/src/qpid/RefCounted.h
index e7a9bf31c1..f9e0107103 100644
--- a/qpid/cpp/src/qpid/RefCounted.h
+++ b/qpid/cpp/src/qpid/RefCounted.h
@@ -53,8 +53,10 @@ protected:
 
 // intrusive_ptr support.
 namespace boost {
-inline void intrusive_ptr_add_ref(const qpid::RefCounted* p) { p->addRef(); }
-inline void intrusive_ptr_release(const qpid::RefCounted* p) { p->release(); }
+template <typename T>
+inline void intrusive_ptr_add_ref(const T* p) { p->qpid::RefCounted::addRef(); }
+template <typename T>
+inline void intrusive_ptr_release(const T* p) { p->qpid::RefCounted::release(); }
 }
 
 
diff --git a/qpid/cpp/src/qpid/cluster/Connection.h b/qpid/cpp/src/qpid/cluster/Connection.h
index b290824805..a0da9efbb8 100644
--- a/qpid/cpp/src/qpid/cluster/Connection.h
+++ b/qpid/cpp/src/qpid/cluster/Connection.h
@@ -24,10 +24,10 @@
 
 #include "types.h"
 #include "OutputInterceptor.h"
-#include "EventFrame.h"
 #include "McastFrameHandler.h"
 #include "UpdateReceiver.h"
 
+#include "qpid/RefCounted.h"
 #include "qpid/broker/Connection.h"
 #include "qpid/broker/SecureConnection.h"
 #include "qpid/broker/SemanticState.h"
@@ -55,6 +55,7 @@ class TxAccept;
 namespace cluster {
 class Cluster;
 class Event;
+struct EventFrame;
 
 /** Intercept broker::Connection calls for shadow and local cluster connections. */
 class Connection :
diff --git a/qpid/cpp/src/qpid/cluster/types.h b/qpid/cpp/src/qpid/cluster/types.h
index 0795e5e77a..bfb4fd5b9e 100644
--- a/qpid/cpp/src/qpid/cluster/types.h
+++ b/qpid/cpp/src/qpid/cluster/types.h
@@ -24,6 +24,7 @@
 
 #include "config.h"
 #include "qpid/Url.h"
+#include "qpid/RefCounted.h"
 #include "qpid/sys/IntegerTypes.h"
 #include <boost/intrusive_ptr.hpp>
 #include <utility>
diff --git a/qpid/cpp/src/qpid/framing/MethodBodyFactory.h b/qpid/cpp/src/qpid/framing/MethodBodyFactory.h
index 607ec9d959..88bc444795 100644
--- a/qpid/cpp/src/qpid/framing/MethodBodyFactory.h
+++ b/qpid/cpp/src/qpid/framing/MethodBodyFactory.h
@@ -22,6 +22,7 @@
  *
  */
 #include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
 #include <boost/intrusive_ptr.hpp>
 
 namespace qpid {