summaryrefslogtreecommitdiff
path: root/cpp/src/qpid/cluster
diff options
context:
space:
mode:
authorAlan Conway <aconway@apache.org>2009-07-14 14:32:39 +0000
committerAlan Conway <aconway@apache.org>2009-07-14 14:32:39 +0000
commitc7b58ba05104496a96cce3c7acd035253fd89f79 (patch)
tree6fb65c261f7ac7e53e8d9360e79e39635046a0b5 /cpp/src/qpid/cluster
parentd2e4e9a156c15bfc4c11fd0e6088940caabd5339 (diff)
downloadqpid-python-c7b58ba05104496a96cce3c7acd035253fd89f79.tar.gz
Add directory to #include
git-svn-id: https://svn.apache.org/repos/asf/qpid/trunk/qpid@793909 13f79535-47bb-0310-9956-ffa450edef68
Diffstat (limited to 'cpp/src/qpid/cluster')
-rw-r--r--cpp/src/qpid/cluster/Cluster.cpp14
-rw-r--r--cpp/src/qpid/cluster/Cluster.h30
-rw-r--r--cpp/src/qpid/cluster/ClusterMap.cpp2
-rw-r--r--cpp/src/qpid/cluster/ClusterMap.h2
-rw-r--r--cpp/src/qpid/cluster/ClusterPlugin.cpp6
-rw-r--r--cpp/src/qpid/cluster/Connection.cpp6
-rw-r--r--cpp/src/qpid/cluster/Connection.h8
-rw-r--r--cpp/src/qpid/cluster/ConnectionCodec.cpp8
-rw-r--r--cpp/src/qpid/cluster/Cpg.cpp2
-rw-r--r--cpp/src/qpid/cluster/Decoder.cpp4
-rw-r--r--cpp/src/qpid/cluster/Decoder.h2
-rw-r--r--cpp/src/qpid/cluster/ErrorCheck.cpp8
-rw-r--r--cpp/src/qpid/cluster/ErrorCheck.h4
-rw-r--r--cpp/src/qpid/cluster/Event.cpp6
-rw-r--r--cpp/src/qpid/cluster/Event.h4
-rw-r--r--cpp/src/qpid/cluster/EventFrame.cpp4
-rw-r--r--cpp/src/qpid/cluster/EventFrame.h4
-rw-r--r--cpp/src/qpid/cluster/ExpiryPolicy.cpp4
-rw-r--r--cpp/src/qpid/cluster/ExpiryPolicy.h2
-rw-r--r--cpp/src/qpid/cluster/FailoverExchange.cpp2
-rw-r--r--cpp/src/qpid/cluster/LockedConnectionMap.h4
-rw-r--r--cpp/src/qpid/cluster/McastFrameHandler.h4
-rw-r--r--cpp/src/qpid/cluster/Multicaster.cpp4
-rw-r--r--cpp/src/qpid/cluster/Multicaster.h4
-rw-r--r--cpp/src/qpid/cluster/OutputInterceptor.cpp6
-rw-r--r--cpp/src/qpid/cluster/OutputInterceptor.h2
-rw-r--r--cpp/src/qpid/cluster/PollerDispatch.cpp2
-rw-r--r--cpp/src/qpid/cluster/PollerDispatch.h2
-rw-r--r--cpp/src/qpid/cluster/Quorum.h4
-rw-r--r--cpp/src/qpid/cluster/Quorum_cman.cpp2
-rw-r--r--cpp/src/qpid/cluster/RetractClient.cpp4
-rw-r--r--cpp/src/qpid/cluster/UpdateClient.cpp12
-rw-r--r--cpp/src/qpid/cluster/UpdateClient.h2
-rw-r--r--cpp/src/qpid/cluster/UpdateExchange.h2
34 files changed, 88 insertions, 88 deletions
diff --git a/cpp/src/qpid/cluster/Cluster.cpp b/cpp/src/qpid/cluster/Cluster.cpp
index 92859cc641..fc8faf08ec 100644
--- a/cpp/src/qpid/cluster/Cluster.cpp
+++ b/cpp/src/qpid/cluster/Cluster.cpp
@@ -84,13 +84,13 @@
* - Connection control events carrying non-cluster frames: frames sent to the client.
* e.g. flow-control frames generated on a timer.
*/
-#include "Cluster.h"
-#include "ClusterSettings.h"
-#include "Connection.h"
-#include "UpdateClient.h"
-#include "RetractClient.h"
-#include "FailoverExchange.h"
-#include "UpdateExchange.h"
+#include "qpid/cluster/Cluster.h"
+#include "qpid/cluster/ClusterSettings.h"
+#include "qpid/cluster/Connection.h"
+#include "qpid/cluster/UpdateClient.h"
+#include "qpid/cluster/RetractClient.h"
+#include "qpid/cluster/FailoverExchange.h"
+#include "qpid/cluster/UpdateExchange.h"
#include "qpid/assert.h"
#include "qmf/org/apache/qpid/cluster/ArgsClusterStopClusterNode.h"
diff --git a/cpp/src/qpid/cluster/Cluster.h b/cpp/src/qpid/cluster/Cluster.h
index 170b465ff3..e83cf6a1e2 100644
--- a/cpp/src/qpid/cluster/Cluster.h
+++ b/cpp/src/qpid/cluster/Cluster.h
@@ -19,21 +19,21 @@
*
*/
-#include "ClusterMap.h"
-#include "ClusterSettings.h"
-#include "Cpg.h"
-#include "Decoder.h"
-#include "ErrorCheck.h"
-#include "Event.h"
-#include "EventFrame.h"
-#include "ExpiryPolicy.h"
-#include "FailoverExchange.h"
-#include "LockedConnectionMap.h"
-#include "Multicaster.h"
-#include "NoOpConnectionOutputHandler.h"
-#include "PollableQueue.h"
-#include "PollerDispatch.h"
-#include "Quorum.h"
+#include "qpid/cluster/ClusterMap.h"
+#include "qpid/cluster/ClusterSettings.h"
+#include "qpid/cluster/Cpg.h"
+#include "qpid/cluster/Decoder.h"
+#include "qpid/cluster/ErrorCheck.h"
+#include "qpid/cluster/Event.h"
+#include "qpid/cluster/EventFrame.h"
+#include "qpid/cluster/ExpiryPolicy.h"
+#include "qpid/cluster/FailoverExchange.h"
+#include "qpid/cluster/LockedConnectionMap.h"
+#include "qpid/cluster/Multicaster.h"
+#include "qpid/cluster/NoOpConnectionOutputHandler.h"
+#include "qpid/cluster/PollableQueue.h"
+#include "qpid/cluster/PollerDispatch.h"
+#include "qpid/cluster/Quorum.h"
#include "qmf/org/apache/qpid/cluster/Cluster.h"
#include "qpid/Url.h"
diff --git a/cpp/src/qpid/cluster/ClusterMap.cpp b/cpp/src/qpid/cluster/ClusterMap.cpp
index e8c421d4eb..e4e0e50fe3 100644
--- a/cpp/src/qpid/cluster/ClusterMap.cpp
+++ b/cpp/src/qpid/cluster/ClusterMap.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include "ClusterMap.h"
+#include "qpid/cluster/ClusterMap.h"
#include "qpid/Url.h"
#include "qpid/framing/FieldTable.h"
#include "qpid/log/Statement.h"
diff --git a/cpp/src/qpid/cluster/ClusterMap.h b/cpp/src/qpid/cluster/ClusterMap.h
index 7e42ed1c19..1b891f73f0 100644
--- a/cpp/src/qpid/cluster/ClusterMap.h
+++ b/cpp/src/qpid/cluster/ClusterMap.h
@@ -22,7 +22,7 @@
*
*/
-#include "types.h"
+#include "qpid/cluster/types.h"
#include "qpid/Url.h"
#include "qpid/framing/ClusterConnectionMembershipBody.h"
diff --git a/cpp/src/qpid/cluster/ClusterPlugin.cpp b/cpp/src/qpid/cluster/ClusterPlugin.cpp
index 695bd8bfeb..935a84a7a9 100644
--- a/cpp/src/qpid/cluster/ClusterPlugin.cpp
+++ b/cpp/src/qpid/cluster/ClusterPlugin.cpp
@@ -17,9 +17,9 @@
*/
#include "config.h"
-#include "Connection.h"
-#include "ConnectionCodec.h"
-#include "ClusterSettings.h"
+#include "qpid/cluster/Connection.h"
+#include "qpid/cluster/ConnectionCodec.h"
+#include "qpid/cluster/ClusterSettings.h"
#include "qpid/cluster/Cluster.h"
#include "qpid/cluster/ConnectionCodec.h"
diff --git a/cpp/src/qpid/cluster/Connection.cpp b/cpp/src/qpid/cluster/Connection.cpp
index c129ecbd65..15cd028e10 100644
--- a/cpp/src/qpid/cluster/Connection.cpp
+++ b/cpp/src/qpid/cluster/Connection.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include "Connection.h"
-#include "UpdateClient.h"
-#include "Cluster.h"
+#include "qpid/cluster/Connection.h"
+#include "qpid/cluster/UpdateClient.h"
+#include "qpid/cluster/Cluster.h"
#include "qpid/broker/SessionState.h"
#include "qpid/broker/SemanticState.h"
diff --git a/cpp/src/qpid/cluster/Connection.h b/cpp/src/qpid/cluster/Connection.h
index 687b0585d3..ac2b6cd50c 100644
--- a/cpp/src/qpid/cluster/Connection.h
+++ b/cpp/src/qpid/cluster/Connection.h
@@ -22,10 +22,10 @@
*
*/
-#include "types.h"
-#include "OutputInterceptor.h"
-#include "EventFrame.h"
-#include "McastFrameHandler.h"
+#include "qpid/cluster/types.h"
+#include "qpid/cluster/OutputInterceptor.h"
+#include "qpid/cluster/EventFrame.h"
+#include "qpid/cluster/McastFrameHandler.h"
#include "qpid/broker/Connection.h"
#include "qpid/amqp_0_10/Connection.h"
diff --git a/cpp/src/qpid/cluster/ConnectionCodec.cpp b/cpp/src/qpid/cluster/ConnectionCodec.cpp
index 007337792b..0c791cdf44 100644
--- a/cpp/src/qpid/cluster/ConnectionCodec.cpp
+++ b/cpp/src/qpid/cluster/ConnectionCodec.cpp
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include "ConnectionCodec.h"
-#include "Connection.h"
-#include "Cluster.h"
-#include "ProxyInputHandler.h"
+#include "qpid/cluster/ConnectionCodec.h"
+#include "qpid/cluster/Connection.h"
+#include "qpid/cluster/Cluster.h"
+#include "qpid/cluster/ProxyInputHandler.h"
#include "qpid/broker/Connection.h"
#include "qpid/framing/ConnectionCloseBody.h"
#include "qpid/framing/ConnectionCloseOkBody.h"
diff --git a/cpp/src/qpid/cluster/Cpg.cpp b/cpp/src/qpid/cluster/Cpg.cpp
index 6d9799a0a5..f5e79012d9 100644
--- a/cpp/src/qpid/cluster/Cpg.cpp
+++ b/cpp/src/qpid/cluster/Cpg.cpp
@@ -16,7 +16,7 @@
*
*/
-#include "Cpg.h"
+#include "qpid/cluster/Cpg.h"
#include "qpid/sys/Mutex.h"
#include "qpid/sys/Time.h"
#include "qpid/sys/posix/PrivatePosix.h"
diff --git a/cpp/src/qpid/cluster/Decoder.cpp b/cpp/src/qpid/cluster/Decoder.cpp
index a57edb3b7f..23ba372d78 100644
--- a/cpp/src/qpid/cluster/Decoder.cpp
+++ b/cpp/src/qpid/cluster/Decoder.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include "Decoder.h"
-#include "EventFrame.h"
+#include "qpid/cluster/Decoder.h"
+#include "qpid/cluster/EventFrame.h"
#include "qpid/framing/ClusterConnectionDeliverCloseBody.h"
#include "qpid/framing/Buffer.h"
#include "qpid/framing/AMQFrame.h"
diff --git a/cpp/src/qpid/cluster/Decoder.h b/cpp/src/qpid/cluster/Decoder.h
index 6bcd877a75..2e2af2868f 100644
--- a/cpp/src/qpid/cluster/Decoder.h
+++ b/cpp/src/qpid/cluster/Decoder.h
@@ -22,7 +22,7 @@
*
*/
-#include "types.h"
+#include "qpid/cluster/types.h"
#include "qpid/framing/FrameDecoder.h"
#include "qpid/sys/Mutex.h"
#include <boost/function.hpp>
diff --git a/cpp/src/qpid/cluster/ErrorCheck.cpp b/cpp/src/qpid/cluster/ErrorCheck.cpp
index c22ed17239..2af820c8a0 100644
--- a/cpp/src/qpid/cluster/ErrorCheck.cpp
+++ b/cpp/src/qpid/cluster/ErrorCheck.cpp
@@ -18,10 +18,10 @@
* under the License.
*
*/
-#include "ErrorCheck.h"
-#include "EventFrame.h"
-#include "ClusterMap.h"
-#include "Cluster.h"
+#include "qpid/cluster/ErrorCheck.h"
+#include "qpid/cluster/EventFrame.h"
+#include "qpid/cluster/ClusterMap.h"
+#include "qpid/cluster/Cluster.h"
#include "qpid/framing/ClusterErrorCheckBody.h"
#include "qpid/framing/ClusterConfigChangeBody.h"
#include "qpid/log/Statement.h"
diff --git a/cpp/src/qpid/cluster/ErrorCheck.h b/cpp/src/qpid/cluster/ErrorCheck.h
index 236b820116..51312046b8 100644
--- a/cpp/src/qpid/cluster/ErrorCheck.h
+++ b/cpp/src/qpid/cluster/ErrorCheck.h
@@ -22,8 +22,8 @@
*
*/
-#include "types.h"
-#include "Multicaster.h"
+#include "qpid/cluster/types.h"
+#include "qpid/cluster/Multicaster.h"
#include "qpid/framing/enum.h"
#include <boost/function.hpp>
#include <deque>
diff --git a/cpp/src/qpid/cluster/Event.cpp b/cpp/src/qpid/cluster/Event.cpp
index ae62994e88..30866d3154 100644
--- a/cpp/src/qpid/cluster/Event.cpp
+++ b/cpp/src/qpid/cluster/Event.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include "types.h"
-#include "Event.h"
-#include "Cpg.h"
+#include "qpid/cluster/types.h"
+#include "qpid/cluster/Event.h"
+#include "qpid/cluster/Cpg.h"
#include "qpid/framing/Buffer.h"
#include "qpid/framing/AMQFrame.h"
#include "qpid/assert.h"
diff --git a/cpp/src/qpid/cluster/Event.h b/cpp/src/qpid/cluster/Event.h
index 3175dd9ed2..07f74d3ba5 100644
--- a/cpp/src/qpid/cluster/Event.h
+++ b/cpp/src/qpid/cluster/Event.h
@@ -22,13 +22,13 @@
*
*/
-#include "types.h"
+#include "qpid/cluster/types.h"
#include "qpid/RefCountedBuffer.h"
#include "qpid/framing/AMQFrame.h"
#include <sys/uio.h> // For iovec
#include <iosfwd>
-#include "types.h"
+#include "qpid/cluster/types.h"
namespace qpid {
diff --git a/cpp/src/qpid/cluster/EventFrame.cpp b/cpp/src/qpid/cluster/EventFrame.cpp
index a48d134f1b..5fbe1fe57c 100644
--- a/cpp/src/qpid/cluster/EventFrame.cpp
+++ b/cpp/src/qpid/cluster/EventFrame.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include "EventFrame.h"
-#include "Connection.h"
+#include "qpid/cluster/EventFrame.h"
+#include "qpid/cluster/Connection.h"
namespace qpid {
namespace cluster {
diff --git a/cpp/src/qpid/cluster/EventFrame.h b/cpp/src/qpid/cluster/EventFrame.h
index e275aac7aa..61447c5525 100644
--- a/cpp/src/qpid/cluster/EventFrame.h
+++ b/cpp/src/qpid/cluster/EventFrame.h
@@ -22,8 +22,8 @@
*
*/
-#include "types.h"
-#include "Event.h"
+#include "qpid/cluster/types.h"
+#include "qpid/cluster/Event.h"
#include "qpid/framing/AMQFrame.h"
#include <boost/intrusive_ptr.hpp>
#include <iosfwd>
diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.cpp b/cpp/src/qpid/cluster/ExpiryPolicy.cpp
index 348963f901..717e1a47cd 100644
--- a/cpp/src/qpid/cluster/ExpiryPolicy.cpp
+++ b/cpp/src/qpid/cluster/ExpiryPolicy.cpp
@@ -19,8 +19,8 @@
*
*/
-#include "ExpiryPolicy.h"
-#include "Multicaster.h"
+#include "qpid/cluster/ExpiryPolicy.h"
+#include "qpid/cluster/Multicaster.h"
#include "qpid/framing/ClusterMessageExpiredBody.h"
#include "qpid/sys/Time.h"
#include "qpid/broker/Message.h"
diff --git a/cpp/src/qpid/cluster/ExpiryPolicy.h b/cpp/src/qpid/cluster/ExpiryPolicy.h
index c147e54796..4ec41c93bc 100644
--- a/cpp/src/qpid/cluster/ExpiryPolicy.h
+++ b/cpp/src/qpid/cluster/ExpiryPolicy.h
@@ -22,7 +22,7 @@
*
*/
-#include "types.h"
+#include "qpid/cluster/types.h"
#include "qpid/broker/ExpiryPolicy.h"
#include "qpid/sys/Mutex.h"
#include <boost/function.hpp>
diff --git a/cpp/src/qpid/cluster/FailoverExchange.cpp b/cpp/src/qpid/cluster/FailoverExchange.cpp
index e438d958ea..e01c41494b 100644
--- a/cpp/src/qpid/cluster/FailoverExchange.cpp
+++ b/cpp/src/qpid/cluster/FailoverExchange.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include "FailoverExchange.h"
+#include "qpid/cluster/FailoverExchange.h"
#include "qpid/broker/Message.h"
#include "qpid/broker/DeliverableMessage.h"
#include "qpid/broker/Queue.h"
diff --git a/cpp/src/qpid/cluster/LockedConnectionMap.h b/cpp/src/qpid/cluster/LockedConnectionMap.h
index f4f1d7e832..ac744d4f94 100644
--- a/cpp/src/qpid/cluster/LockedConnectionMap.h
+++ b/cpp/src/qpid/cluster/LockedConnectionMap.h
@@ -22,9 +22,9 @@
*
*/
-#include "types.h"
+#include "qpid/cluster/types.h"
#include "qpid/sys/Mutex.h"
-#include "Connection.h"
+#include "qpid/cluster/Connection.h"
namespace qpid {
namespace cluster {
diff --git a/cpp/src/qpid/cluster/McastFrameHandler.h b/cpp/src/qpid/cluster/McastFrameHandler.h
index 5127c31c84..17e4c2e9f0 100644
--- a/cpp/src/qpid/cluster/McastFrameHandler.h
+++ b/cpp/src/qpid/cluster/McastFrameHandler.h
@@ -22,8 +22,8 @@
*
*/
-#include "types.h"
-#include "Multicaster.h"
+#include "qpid/cluster/types.h"
+#include "qpid/cluster/Multicaster.h"
#include "qpid/framing/FrameHandler.h"
namespace qpid {
diff --git a/cpp/src/qpid/cluster/Multicaster.cpp b/cpp/src/qpid/cluster/Multicaster.cpp
index 4d02d58efe..7e97963318 100644
--- a/cpp/src/qpid/cluster/Multicaster.cpp
+++ b/cpp/src/qpid/cluster/Multicaster.cpp
@@ -19,8 +19,8 @@
*
*/
-#include "Multicaster.h"
-#include "Cpg.h"
+#include "qpid/cluster/Multicaster.h"
+#include "qpid/cluster/Cpg.h"
#include "qpid/log/Statement.h"
#include "qpid/framing/AMQBody.h"
#include "qpid/framing/AMQFrame.h"
diff --git a/cpp/src/qpid/cluster/Multicaster.h b/cpp/src/qpid/cluster/Multicaster.h
index 1566c66a75..f2ee5099bb 100644
--- a/cpp/src/qpid/cluster/Multicaster.h
+++ b/cpp/src/qpid/cluster/Multicaster.h
@@ -22,8 +22,8 @@
*
*/
-#include "types.h"
-#include "Event.h"
+#include "qpid/cluster/types.h"
+#include "qpid/cluster/Event.h"
#include "qpid/sys/PollableQueue.h"
#include "qpid/sys/Mutex.h"
#include "qpid/sys/LatencyTracker.h"
diff --git a/cpp/src/qpid/cluster/OutputInterceptor.cpp b/cpp/src/qpid/cluster/OutputInterceptor.cpp
index 3c3c330787..2025c664da 100644
--- a/cpp/src/qpid/cluster/OutputInterceptor.cpp
+++ b/cpp/src/qpid/cluster/OutputInterceptor.cpp
@@ -18,9 +18,9 @@
* under the License.
*
*/
-#include "OutputInterceptor.h"
-#include "Connection.h"
-#include "Cluster.h"
+#include "qpid/cluster/OutputInterceptor.h"
+#include "qpid/cluster/Connection.h"
+#include "qpid/cluster/Cluster.h"
#include "qpid/framing/ClusterConnectionDeliverDoOutputBody.h"
#include "qpid/framing/AMQFrame.h"
#include "qpid/log/Statement.h"
diff --git a/cpp/src/qpid/cluster/OutputInterceptor.h b/cpp/src/qpid/cluster/OutputInterceptor.h
index 62b7d6567f..65bd82a4fc 100644
--- a/cpp/src/qpid/cluster/OutputInterceptor.h
+++ b/cpp/src/qpid/cluster/OutputInterceptor.h
@@ -22,7 +22,7 @@
*
*/
-#include "NoOpConnectionOutputHandler.h"
+#include "qpid/cluster/NoOpConnectionOutputHandler.h"
#include "qpid/sys/ConnectionOutputHandler.h"
#include "qpid/sys/Mutex.h"
#include "qpid/broker/ConnectionFactory.h"
diff --git a/cpp/src/qpid/cluster/PollerDispatch.cpp b/cpp/src/qpid/cluster/PollerDispatch.cpp
index c8e28c0d51..47c1fd0c39 100644
--- a/cpp/src/qpid/cluster/PollerDispatch.cpp
+++ b/cpp/src/qpid/cluster/PollerDispatch.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include "PollerDispatch.h"
+#include "qpid/cluster/PollerDispatch.h"
#include "qpid/log/Statement.h"
#include <boost/bind.hpp>
diff --git a/cpp/src/qpid/cluster/PollerDispatch.h b/cpp/src/qpid/cluster/PollerDispatch.h
index 52137b72a8..1c9266aa3c 100644
--- a/cpp/src/qpid/cluster/PollerDispatch.h
+++ b/cpp/src/qpid/cluster/PollerDispatch.h
@@ -22,7 +22,7 @@
*
*/
-#include "Cpg.h"
+#include "qpid/cluster/Cpg.h"
#include "qpid/sys/Poller.h"
#include "qpid/sys/DispatchHandle.h"
#include <boost/function.hpp>
diff --git a/cpp/src/qpid/cluster/Quorum.h b/cpp/src/qpid/cluster/Quorum.h
index ea55c36730..bbfa473f94 100644
--- a/cpp/src/qpid/cluster/Quorum.h
+++ b/cpp/src/qpid/cluster/Quorum.h
@@ -24,9 +24,9 @@
#include "config.h"
#if HAVE_LIBCMAN_H
-#include "Quorum_cman.h"
+#include "qpid/cluster/Quorum_cman.h"
#else
-#include "Quorum_null.h"
+#include "qpid/cluster/Quorum_null.h"
#endif
#endif /*!QPID_CLUSTER_QUORUM_H*/
diff --git a/cpp/src/qpid/cluster/Quorum_cman.cpp b/cpp/src/qpid/cluster/Quorum_cman.cpp
index f301f4c877..0bf29f8042 100644
--- a/cpp/src/qpid/cluster/Quorum_cman.cpp
+++ b/cpp/src/qpid/cluster/Quorum_cman.cpp
@@ -18,7 +18,7 @@
* under the License.
*
*/
-#include "Quorum_cman.h"
+#include "qpid/cluster/Quorum_cman.h"
#include "qpid/log/Statement.h"
#include "qpid/Options.h"
#include "qpid/sys/Time.h"
diff --git a/cpp/src/qpid/cluster/RetractClient.cpp b/cpp/src/qpid/cluster/RetractClient.cpp
index dfca7fdef4..7d9f52fc39 100644
--- a/cpp/src/qpid/cluster/RetractClient.cpp
+++ b/cpp/src/qpid/cluster/RetractClient.cpp
@@ -18,8 +18,8 @@
* under the License.
*
*/
-#include "RetractClient.h"
-#include "UpdateClient.h"
+#include "qpid/cluster/RetractClient.h"
+#include "qpid/cluster/UpdateClient.h"
#include "qpid/framing/ClusterConnectionRetractOfferBody.h"
#include "qpid/client/ConnectionAccess.h"
#include "qpid/client/ConnectionImpl.h"
diff --git a/cpp/src/qpid/cluster/UpdateClient.cpp b/cpp/src/qpid/cluster/UpdateClient.cpp
index a8ab105395..1e9af4a589 100644
--- a/cpp/src/qpid/cluster/UpdateClient.cpp
+++ b/cpp/src/qpid/cluster/UpdateClient.cpp
@@ -18,12 +18,12 @@
* under the License.
*
*/
-#include "UpdateClient.h"
-#include "Cluster.h"
-#include "ClusterMap.h"
-#include "Connection.h"
-#include "Decoder.h"
-#include "ExpiryPolicy.h"
+#include "qpid/cluster/UpdateClient.h"
+#include "qpid/cluster/Cluster.h"
+#include "qpid/cluster/ClusterMap.h"
+#include "qpid/cluster/Connection.h"
+#include "qpid/cluster/Decoder.h"
+#include "qpid/cluster/ExpiryPolicy.h"
#include "qpid/client/SessionBase_0_10Access.h"
#include "qpid/client/ConnectionAccess.h"
#include "qpid/client/SessionImpl.h"
diff --git a/cpp/src/qpid/cluster/UpdateClient.h b/cpp/src/qpid/cluster/UpdateClient.h
index fd3d37ae5f..4970026547 100644
--- a/cpp/src/qpid/cluster/UpdateClient.h
+++ b/cpp/src/qpid/cluster/UpdateClient.h
@@ -22,7 +22,7 @@
*
*/
-#include "ClusterMap.h"
+#include "qpid/cluster/ClusterMap.h"
#include "qpid/client/Connection.h"
#include "qpid/client/ConnectionSettings.h"
#include "qpid/client/AsyncSession.h"
diff --git a/cpp/src/qpid/cluster/UpdateExchange.h b/cpp/src/qpid/cluster/UpdateExchange.h
index 7a4a484c8a..194a3d386d 100644
--- a/cpp/src/qpid/cluster/UpdateExchange.h
+++ b/cpp/src/qpid/cluster/UpdateExchange.h
@@ -22,7 +22,7 @@
*
*/
-#include "UpdateClient.h"
+#include "qpid/cluster/UpdateClient.h"
#include "qpid/broker/FanOutExchange.h"