Moved src/ source code to src/qpid directory:

 - allows rhm package to build consistently against checked-out or installed qpid. 
 - consistent correspondence between source paths and C++ namespaces.
 - consistent use of #include <qpid/foo> in source and by users.
 - allows header files to split over multiple directories,
   e.g. separating generated code, separating public API from private files.


git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk/qpid@528668 13f79535-47bb-0310-9956-ffa450edef68

35 files changed, 141 insertions, 141 deletions

diff --git a/cpp/src/tests/APRBaseTest.cpp b/cpp/src/tests/APRBaseTest.cpp
index 5ed8bf1918..3ec18d658e 100644
--- a/cpp/src/tests/APRBaseTest.cpp
+++ b/cpp/src/tests/APRBaseTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../sys/apr/APRBase.h"
+#include "qpid/sys/apr/APRBase.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 
diff --git a/cpp/src/tests/AccumulatedAckTest.cpp b/cpp/src/tests/AccumulatedAckTest.cpp
index 56870209fe..aa90de5b42 100644
--- a/cpp/src/tests/AccumulatedAckTest.cpp
+++ b/cpp/src/tests/AccumulatedAckTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../broker/AccumulatedAck.h"
+#include "qpid/broker/AccumulatedAck.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <list>
diff --git a/cpp/src/tests/BrokerChannelTest.cpp b/cpp/src/tests/BrokerChannelTest.cpp
index 7d8bbf5e49..3b2119be13 100644
--- a/cpp/src/tests/BrokerChannelTest.cpp
+++ b/cpp/src/tests/BrokerChannelTest.cpp
@@ -18,19 +18,19 @@
  * under the License.
  *
  */
-#include "../broker/BrokerChannel.h"
-#include "../broker/BrokerMessage.h"
-#include "../broker/BrokerQueue.h"
-#include "../broker/FanOutExchange.h"
-#include "../broker/NullMessageStore.h"
+#include "qpid/broker/BrokerChannel.h"
+#include "qpid/broker/BrokerMessage.h"
+#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/FanOutExchange.h"
+#include "qpid/broker/NullMessageStore.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <memory>
-#include "../gen/AMQP_HighestVersion.h"
-#include "../framing/AMQFrame.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQFrame.h"
 #include "MockChannel.h"
-#include "../broker/Connection.h"
-#include "../framing/ProtocolInitiation.h"
+#include "qpid/broker/Connection.h"
+#include "qpid/framing/ProtocolInitiation.h"
 #include <boost/ptr_container/ptr_vector.hpp>
 
 using namespace boost;
diff --git a/cpp/src/tests/ClientChannelTest.cpp b/cpp/src/tests/ClientChannelTest.cpp
index 18c71527b6..252b419299 100644
--- a/cpp/src/tests/ClientChannelTest.cpp
+++ b/cpp/src/tests/ClientChannelTest.cpp
@@ -21,13 +21,13 @@
 #include <vector>
 #include "qpid_test_plugin.h"
 #include "InProcessBroker.h"
-#include "../client/ClientChannel.h"
-#include "../client/ClientMessage.h"
-#include "../client/ClientQueue.h"
-#include "../client/ClientExchange.h"
-#include "../client/MessageListener.h"
-#include "../client/BasicMessageChannel.h"
-#include "../client/MessageMessageChannel.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/ClientMessage.h"
+#include "qpid/client/ClientQueue.h"
+#include "qpid/client/ClientExchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/BasicMessageChannel.h"
+#include "qpid/client/MessageMessageChannel.h"
 
 using namespace std;
 using namespace boost;
diff --git a/cpp/src/tests/ConfigurationTest.cpp b/cpp/src/tests/ConfigurationTest.cpp
index ecaa2865ce..1f133b6d75 100644
--- a/cpp/src/tests/ConfigurationTest.cpp
+++ b/cpp/src/tests/ConfigurationTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../broker/Configuration.h"
+#include "qpid/broker/Configuration.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 
diff --git a/cpp/src/tests/EventChannelConnectionTest.cpp b/cpp/src/tests/EventChannelConnectionTest.cpp
index 24cd492441..28eea2fd20 100644
--- a/cpp/src/tests/EventChannelConnectionTest.cpp
+++ b/cpp/src/tests/EventChannelConnectionTest.cpp
@@ -21,12 +21,12 @@
 
 #include <iostream>
 #include <boost/bind.hpp>
-#include "../framing/AMQHeartbeatBody.h"
-#include "../framing/AMQFrame.h"
-#include "../sys/posix/EventChannelConnection.h"
-#include "../sys/ConnectionInputHandler.h"
-#include "../sys/ConnectionInputHandlerFactory.h"
-#include "../sys/Socket.h"
+#include "qpid/framing/AMQHeartbeatBody.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/sys/posix/EventChannelConnection.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/Socket.h"
 #include "qpid_test_plugin.h"
 #include "MockConnectionInputHandler.h"
 
diff --git a/cpp/src/tests/EventChannelTest.cpp b/cpp/src/tests/EventChannelTest.cpp
index 45229ce20f..3ba54def86 100644
--- a/cpp/src/tests/EventChannelTest.cpp
+++ b/cpp/src/tests/EventChannelTest.cpp
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include "../sys/posix/EventChannel.h"
-#include "../sys/posix/check.h"
-#include "../sys/Runnable.h"
-#include "../sys/Socket.h"
-#include "../sys/Thread.h"
+#include "qpid/sys/posix/EventChannel.h"
+#include "qpid/sys/posix/check.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/Thread.h"
 #include "qpid_test_plugin.h"
 
 #include <sys/socket.h>
diff --git a/cpp/src/tests/EventChannelThreadsTest.cpp b/cpp/src/tests/EventChannelThreadsTest.cpp
index ee1e2859c4..22ea57d675 100644
--- a/cpp/src/tests/EventChannelThreadsTest.cpp
+++ b/cpp/src/tests/EventChannelThreadsTest.cpp
@@ -21,8 +21,8 @@
 #include <iostream>
 #include <boost/bind.hpp>
 
-#include "../sys/Socket.h"
-#include "../sys/posix/EventChannelThreads.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/sys/posix/EventChannelThreads.h"
 #include "qpid_test_plugin.h"
 
 
diff --git a/cpp/src/tests/ExchangeTest.cpp b/cpp/src/tests/ExchangeTest.cpp
index ff0e6b4ae2..16a0da0746 100644
--- a/cpp/src/tests/ExchangeTest.cpp
+++ b/cpp/src/tests/ExchangeTest.cpp
@@ -19,14 +19,14 @@
  *
  */
 
-#include "../broker/DeliverableMessage.h"
-#include "../broker/DirectExchange.h"
-#include "../broker/BrokerExchange.h"
-#include "../broker/BrokerQueue.h"
-#include "../broker/TopicExchange.h"
+#include "qpid/broker/DeliverableMessage.h"
+#include "qpid/broker/DirectExchange.h"
+#include "qpid/broker/BrokerExchange.h"
+#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/TopicExchange.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
-#include "../gen/BasicGetBody.h"
+#include "qpid/framing/BasicGetBody.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;
diff --git a/cpp/src/tests/FieldTableTest.cpp b/cpp/src/tests/FieldTableTest.cpp
index a7a03cc574..dcab96fb08 100644
--- a/cpp/src/tests/FieldTableTest.cpp
+++ b/cpp/src/tests/FieldTableTest.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include "../framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::framing;
diff --git a/cpp/src/tests/FramingTest.cpp b/cpp/src/tests/FramingTest.cpp
index 24e609e9b9..528919de48 100644
--- a/cpp/src/tests/FramingTest.cpp
+++ b/cpp/src/tests/FramingTest.cpp
@@ -18,25 +18,25 @@
  * under the License.
  *
  */
-#include "../gen/ConnectionRedirectBody.h"
-#include "../framing/ProtocolVersion.h"
-#include "../framing/amqp_framing.h"
+#include "qpid/framing/ConnectionRedirectBody.h"
+#include "qpid/framing/ProtocolVersion.h"
+#include "qpid/framing/amqp_framing.h"
 #include <iostream>
 #include "qpid_test_plugin.h"
 #include <sstream>
 #include <typeinfo>
-#include "../QpidError.h"
-#include "../gen/AMQP_HighestVersion.h"
-#include "../framing/AMQRequestBody.h"
-#include "../framing/AMQResponseBody.h"
-#include "../framing/Requester.h"
-#include "../framing/Responder.h"
+#include "qpid/QpidError.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQRequestBody.h"
+#include "qpid/framing/AMQResponseBody.h"
+#include "qpid/framing/Requester.h"
+#include "qpid/framing/Responder.h"
 #include "InProcessBroker.h"
-#include "../client/Connection.h"
-#include "../client/ClientExchange.h"
-#include "../client/ClientQueue.h"
-#include "../framing/Correlator.h"
-#include "../gen/BasicGetOkBody.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientExchange.h"
+#include "qpid/client/ClientQueue.h"
+#include "qpid/framing/Correlator.h"
+#include "qpid/framing/BasicGetOkBody.h"
 #include <memory>
 #include <boost/lexical_cast.hpp>
 #include <boost/bind.hpp>
diff --git a/cpp/src/tests/HeaderTest.cpp b/cpp/src/tests/HeaderTest.cpp
index 29e2ddee3d..17381cc868 100644
--- a/cpp/src/tests/HeaderTest.cpp
+++ b/cpp/src/tests/HeaderTest.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include "../framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::framing;
diff --git a/cpp/src/tests/HeadersExchangeTest.cpp b/cpp/src/tests/HeadersExchangeTest.cpp
index 64125f4a0a..a7a1001198 100644
--- a/cpp/src/tests/HeadersExchangeTest.cpp
+++ b/cpp/src/tests/HeadersExchangeTest.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include "../broker/HeadersExchange.h"
-#include "../framing/FieldTable.h"
-#include "../framing/Value.h"
+#include "qpid/broker/HeadersExchange.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/Value.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::broker;
diff --git a/cpp/src/tests/InMemoryContentTest.cpp b/cpp/src/tests/InMemoryContentTest.cpp
index 3dbe31e072..cb729f9930 100644
--- a/cpp/src/tests/InMemoryContentTest.cpp
+++ b/cpp/src/tests/InMemoryContentTest.cpp
@@ -18,12 +18,12 @@
  * under the License.
  *
  */
-#include "../broker/InMemoryContent.h"
+#include "qpid/broker/InMemoryContent.h"
 #include "qpid_test_plugin.h"
-#include "../gen/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
 #include <iostream>
 #include <list>
-#include "../framing/AMQFrame.h"
+#include "qpid/framing/AMQFrame.h"
 #include "MockChannel.h"
 
 using std::list;
diff --git a/cpp/src/tests/InProcessBroker.h b/cpp/src/tests/InProcessBroker.h
index 22af62879a..96f8ce72cf 100644
--- a/cpp/src/tests/InProcessBroker.h
+++ b/cpp/src/tests/InProcessBroker.h
@@ -18,12 +18,12 @@
  * limitations under the License.
  *
  */
-#include "../gen/AMQP_HighestVersion.h"
-#include "../framing/AMQFrame.h"
-#include "../broker/Broker.h"
-#include "../broker/Connection.h"
-#include "../client/Connector.h"
-#include "../client/Connection.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/broker/Connection.h"
+#include "qpid/client/Connector.h"
+#include "qpid/client/Connection.h"
 
 #include <vector>
 #include <iostream>
diff --git a/cpp/src/tests/LazyLoadedContentTest.cpp b/cpp/src/tests/LazyLoadedContentTest.cpp
index f366a25cf9..7bac3613ad 100644
--- a/cpp/src/tests/LazyLoadedContentTest.cpp
+++ b/cpp/src/tests/LazyLoadedContentTest.cpp
@@ -18,14 +18,14 @@
  * under the License.
  *
  */
-#include "../broker/LazyLoadedContent.h"
-#include "../gen/AMQP_HighestVersion.h"
-#include "../broker/NullMessageStore.h"
+#include "qpid/broker/LazyLoadedContent.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/broker/NullMessageStore.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <list>
 #include <sstream>
-#include "../framing/AMQFrame.h"
+#include "qpid/framing/AMQFrame.h"
 #include "MockChannel.h"
 using std::list;
 using std::string;
diff --git a/cpp/src/tests/MessageBuilderTest.cpp b/cpp/src/tests/MessageBuilderTest.cpp
index b660987708..526db85c31 100644
--- a/cpp/src/tests/MessageBuilderTest.cpp
+++ b/cpp/src/tests/MessageBuilderTest.cpp
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include "../Exception.h"
-#include "../broker/BrokerMessage.h"
-#include "../broker/MessageBuilder.h"
-#include "../broker/NullMessageStore.h"
-#include "../framing/Buffer.h"
+#include "qpid/Exception.h"
+#include "qpid/broker/BrokerMessage.h"
+#include "qpid/broker/MessageBuilder.h"
+#include "qpid/broker/NullMessageStore.h"
+#include "qpid/framing/Buffer.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <memory>
diff --git a/cpp/src/tests/MessageHandlerTest.cpp b/cpp/src/tests/MessageHandlerTest.cpp
index 4c4321d19d..2650475f79 100644
--- a/cpp/src/tests/MessageHandlerTest.cpp
+++ b/cpp/src/tests/MessageHandlerTest.cpp
@@ -19,11 +19,11 @@
  *
  */
 //#include <iostream>
-//#include "../gen/AMQP_HighestVersion.h>
-#include "../framing/amqp_framing.h"
+//#include "qpid/framing/AMQP_HighestVersion.h>
+#include "qpid/framing/amqp_framing.h"
 #include "qpid_test_plugin.h"
 
-#include "../broker/BrokerAdapter.h"
+#include "qpid/broker/BrokerAdapter.h"
 
 using namespace qpid::framing;
 using namespace qpid::broker;
diff --git a/cpp/src/tests/MessageTest.cpp b/cpp/src/tests/MessageTest.cpp
index dd6d66c3cd..d3869b552e 100644
--- a/cpp/src/tests/MessageTest.cpp
+++ b/cpp/src/tests/MessageTest.cpp
@@ -18,11 +18,11 @@
  * under the License.
  *
  */
-#include "../broker/BrokerMessage.h"
+#include "qpid/broker/BrokerMessage.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
-#include "../gen/AMQP_HighestVersion.h"
-#include "../framing/AMQFrame.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQFrame.h"
 #include "MockChannel.h"
 
 using namespace boost;
diff --git a/cpp/src/tests/MockChannel.h b/cpp/src/tests/MockChannel.h
index dfadb3a3cc..cadfa83b56 100644
--- a/cpp/src/tests/MockChannel.h
+++ b/cpp/src/tests/MockChannel.h
@@ -19,11 +19,11 @@
  *
  */
 
-#include "../framing/MethodContext.h"
-#include "../framing/ChannelAdapter.h"
-#include "../framing/OutputHandler.h"
-#include "../framing/AMQFrame.h"
-#include "../gen/BasicGetBody.h"
+#include "qpid/framing/MethodContext.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/BasicGetBody.h"
 #include <boost/shared_ptr.hpp>
 #include <boost/ptr_container/ptr_vector.hpp>
 
diff --git a/cpp/src/tests/MockConnectionInputHandler.h b/cpp/src/tests/MockConnectionInputHandler.h
index 4503ac33a5..d104e7d934 100644
--- a/cpp/src/tests/MockConnectionInputHandler.h
+++ b/cpp/src/tests/MockConnectionInputHandler.h
@@ -19,10 +19,10 @@
  *
  */
 
-#include "../sys/ConnectionInputHandler.h"
-#include "../sys/ConnectionInputHandlerFactory.h"
-#include "../sys/Monitor.h"
-#include "../framing/ProtocolInitiation.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/framing/ProtocolInitiation.h"
 
 struct MockConnectionInputHandler : public qpid::sys::ConnectionInputHandler {
 
diff --git a/cpp/src/tests/ProducerConsumerTest.cpp b/cpp/src/tests/ProducerConsumerTest.cpp
index 0aa812e33e..410a846b8b 100644
--- a/cpp/src/tests/ProducerConsumerTest.cpp
+++ b/cpp/src/tests/ProducerConsumerTest.cpp
@@ -25,10 +25,10 @@
 
 #include "qpid_test_plugin.h"
 #include "InProcessBroker.h"
-#include "../sys/ProducerConsumer.h"
-#include "../sys/Thread.h"
-#include "../gen/AMQP_HighestVersion.h"
-#include "../sys/AtomicCount.h"
+#include "qpid/sys/ProducerConsumer.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
+#include "qpid/sys/AtomicCount.h"
 
 using namespace qpid;
 using namespace sys;
diff --git a/cpp/src/tests/QueuePolicyTest.cpp b/cpp/src/tests/QueuePolicyTest.cpp
index 5ccc9417cd..467f43638f 100644
--- a/cpp/src/tests/QueuePolicyTest.cpp
+++ b/cpp/src/tests/QueuePolicyTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../broker/QueuePolicy.h"
+#include "qpid/broker/QueuePolicy.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::broker;
diff --git a/cpp/src/tests/QueueRegistryTest.cpp b/cpp/src/tests/QueueRegistryTest.cpp
index d01fbd0ad4..5fd861d6be 100644
--- a/cpp/src/tests/QueueRegistryTest.cpp
+++ b/cpp/src/tests/QueueRegistryTest.cpp
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-#include "../broker/QueueRegistry.h"
+#include "qpid/broker/QueueRegistry.h"
 #include "qpid_test_plugin.h"
 #include <string>
 
diff --git a/cpp/src/tests/QueueTest.cpp b/cpp/src/tests/QueueTest.cpp
index bb2b424375..dd63cbaa05 100644
--- a/cpp/src/tests/QueueTest.cpp
+++ b/cpp/src/tests/QueueTest.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "../broker/BrokerQueue.h"
-#include "../broker/QueueRegistry.h"
+#include "qpid/broker/BrokerQueue.h"
+#include "qpid/broker/QueueRegistry.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include "MockChannel.h"
diff --git a/cpp/src/tests/ReferenceTest.cpp b/cpp/src/tests/ReferenceTest.cpp
index 3f23d1072f..e8b759264b 100644
--- a/cpp/src/tests/ReferenceTest.cpp
+++ b/cpp/src/tests/ReferenceTest.cpp
@@ -21,11 +21,11 @@
 #include <iostream>
 #include <memory>
 #include "qpid_test_plugin.h"
-#include "../broker/Reference.h"
-#include "../broker/BrokerMessageMessage.h"
-#include "../gen/MessageTransferBody.h"
-#include "../gen/MessageAppendBody.h"
-#include "../broker/CompletionHandler.h"
+#include "qpid/broker/Reference.h"
+#include "qpid/broker/BrokerMessageMessage.h"
+#include "qpid/framing/MessageTransferBody.h"
+#include "qpid/framing/MessageAppendBody.h"
+#include "qpid/broker/CompletionHandler.h"
 
 using namespace boost;
 using namespace qpid;
diff --git a/cpp/src/tests/TopicExchangeTest.cpp b/cpp/src/tests/TopicExchangeTest.cpp
index 39035c776f..9e320b76f9 100644
--- a/cpp/src/tests/TopicExchangeTest.cpp
+++ b/cpp/src/tests/TopicExchangeTest.cpp
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#include "../broker/TopicExchange.h"
+#include "qpid/broker/TopicExchange.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::broker;
diff --git a/cpp/src/tests/TxAckTest.cpp b/cpp/src/tests/TxAckTest.cpp
index 91e07a3faa..3b9b1db308 100644
--- a/cpp/src/tests/TxAckTest.cpp
+++ b/cpp/src/tests/TxAckTest.cpp
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include "../broker/NullMessageStore.h"
-#include "../broker/RecoveryManager.h"
-#include "../broker/TxAck.h"
+#include "qpid/broker/NullMessageStore.h"
+#include "qpid/broker/RecoveryManager.h"
+#include "qpid/broker/TxAck.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <list>
diff --git a/cpp/src/tests/TxBufferTest.cpp b/cpp/src/tests/TxBufferTest.cpp
index f87c33d817..bd43691235 100644
--- a/cpp/src/tests/TxBufferTest.cpp
+++ b/cpp/src/tests/TxBufferTest.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../broker/TxBuffer.h"
+#include "qpid/broker/TxBuffer.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <vector>
diff --git a/cpp/src/tests/TxPublishTest.cpp b/cpp/src/tests/TxPublishTest.cpp
index 84d2666b6c..8c3c7afe31 100644
--- a/cpp/src/tests/TxPublishTest.cpp
+++ b/cpp/src/tests/TxPublishTest.cpp
@@ -18,9 +18,9 @@
  * under the License.
  *
  */
-#include "../broker/NullMessageStore.h"
-#include "../broker/RecoveryManager.h"
-#include "../broker/TxPublish.h"
+#include "qpid/broker/NullMessageStore.h"
+#include "qpid/broker/RecoveryManager.h"
+#include "qpid/broker/TxPublish.h"
 #include "qpid_test_plugin.h"
 #include <iostream>
 #include <list>
diff --git a/cpp/src/tests/ValueTest.cpp b/cpp/src/tests/ValueTest.cpp
index 2d1fc45461..7e767b8559 100644
--- a/cpp/src/tests/ValueTest.cpp
+++ b/cpp/src/tests/ValueTest.cpp
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-#include "../framing/Value.h"
+#include "qpid/framing/Value.h"
 #include "qpid_test_plugin.h"
 
 using namespace qpid::framing;
diff --git a/cpp/src/tests/client_test.cpp b/cpp/src/tests/client_test.cpp
index 5c084302d8..d1fc261931 100644
--- a/cpp/src/tests/client_test.cpp
+++ b/cpp/src/tests/client_test.cpp
@@ -28,13 +28,13 @@
 
 #include <iostream>
 
-#include "../QpidError.h"
-#include "../client/ClientChannel.h"
-#include "../client/Connection.h"
-#include "../client/ClientMessage.h"
-#include "../client/MessageListener.h"
-#include "../sys/Monitor.h"
-#include "../framing/FieldTable.h"
+#include "qpid/QpidError.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientMessage.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/framing/FieldTable.h"
 
 using namespace qpid::client;
 using namespace qpid::sys;
diff --git a/cpp/src/tests/echo_service.cpp b/cpp/src/tests/echo_service.cpp
index 14224eeee5..09cf1e01bb 100644
--- a/cpp/src/tests/echo_service.cpp
+++ b/cpp/src/tests/echo_service.cpp
@@ -27,13 +27,13 @@
  * sender-specified private queue.
  */
 
-#include "../QpidError.h"
-#include "../client/ClientChannel.h"
-#include "../client/Connection.h"
-#include "../client/ClientExchange.h"
-#include "../client/MessageListener.h"
-#include "../client/ClientQueue.h"
-#include "../sys/Time.h"
+#include "qpid/QpidError.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientExchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/ClientQueue.h"
+#include "qpid/sys/Time.h"
 #include <iostream>
 #include <sstream>
 
diff --git a/cpp/src/tests/topic_listener.cpp b/cpp/src/tests/topic_listener.cpp
index 0b7d6c4e86..aa51dd27d4 100644
--- a/cpp/src/tests/topic_listener.cpp
+++ b/cpp/src/tests/topic_listener.cpp
@@ -32,13 +32,13 @@
  * listening).
  */
 
-#include "../QpidError.h"
-#include "../client/ClientChannel.h"
-#include "../client/Connection.h"
-#include "../client/ClientExchange.h"
-#include "../client/MessageListener.h"
-#include "../client/ClientQueue.h"
-#include "../sys/Time.h"
+#include "qpid/QpidError.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientExchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/ClientQueue.h"
+#include "qpid/sys/Time.h"
 #include <iostream>
 #include <sstream>
 
diff --git a/cpp/src/tests/topic_publisher.cpp b/cpp/src/tests/topic_publisher.cpp
index e4b39a2966..1c92f75cc8 100644
--- a/cpp/src/tests/topic_publisher.cpp
+++ b/cpp/src/tests/topic_publisher.cpp
@@ -34,15 +34,15 @@
  * subscriber shutdown.
  */
 
-#include "../QpidError.h"
-#include "../client/ClientChannel.h"
-#include "../client/Connection.h"
-#include "../client/ClientExchange.h"
-#include "../client/MessageListener.h"
-#include "../client/ClientQueue.h"
-#include "../sys/Monitor.h"
+#include "qpid/QpidError.h"
+#include "qpid/client/ClientChannel.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/ClientExchange.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/ClientQueue.h"
+#include "qpid/sys/Monitor.h"
 #include <unistd.h>
-#include "../sys/Time.h"
+#include "qpid/sys/Time.h"
 #include <cstdlib>
 #include <iostream>