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

260 files changed, 411 insertions, 407 deletions

diff --git a/cpp/src/Makefile.am b/cpp/src/Makefile.am
index 6937db2e1b..0d81a01dcd 100644
--- a/cpp/src/Makefile.am
+++ b/cpp/src/Makefile.am
@@ -6,8 +6,16 @@ SUBDIRS = . tests
 
 AM_CXXFLAGS = $(WARNING_CFLAGS) $(APR_CXXFLAGS)
 
+gen    = gen/qpid/framing
+framing= qpid/framing
+broker = qpid/broker
+client = qpid/client
+apr = qpid/sys/apr
+posix = qpid/sys/posix
+
+
 # -I top_builddir for config.h
-INCLUDES = -I$(top_builddir)  -I$(srcdir)
+INCLUDES = -I$(top_builddir)  -I$(srcdir)/qpid -Igen
 
 qpidd_LDADD = \
   libqpidbroker.la \
@@ -16,7 +24,6 @@ qpidd_LDADD = \
 sbin_PROGRAMS = qpidd
 qpidd_SOURCES = qpidd.cpp
 
-apr = sys/apr
 apr_src = \
   $(apr)/APRAcceptor.cpp \
   $(apr)/APRBase.cpp \
@@ -34,7 +41,6 @@ apr_hdr = \
   $(apr)/LFProcessor.h \
   $(apr)/LFSessionContext.h	
 
-posix = sys/posix
 posix_src = \
   $(posix)/PosixAcceptor.cpp \
   $(posix)/Socket.cpp \
@@ -52,11 +58,6 @@ EXTRA_DIST=$(posix_src) $(posix_hdr)
 platform_src = $(apr_src)
 platform_hdr = $(apr_hdr)
 
-framing = framing
-gen     = gen
-broker = broker
-client = client
-
 lib_LTLIBRARIES = libqpidcommon.la libqpidbroker.la libqpidclient.la
 
 libqpidcommon_la_LIBADD = \
@@ -98,13 +99,14 @@ libqpidcommon_la_SOURCES = \
   $(gen)/AMQP_HighestVersion.h \
   $(gen)/AMQP_MethodVersionMap.cpp \
   $(gen)/AMQP_ServerProxy.cpp \
-  Exception.cpp \
-  ExceptionHolder.cpp \
-  QpidError.cpp \
-  sys/Runnable.cpp \
-  sys/Time.cpp \
-  sys/ProducerConsumer.cpp
+  qpid/Exception.cpp \
+  qpid/ExceptionHolder.cpp \
+  qpid/QpidError.cpp \
+  qpid/sys/Runnable.cpp \
+  qpid/sys/Time.cpp \
+  qpid/sys/ProducerConsumer.cpp
 
+libqpidbroker_la_LIBADD = libqpidcommon.la
 libqpidbroker_la_LDFLAGS = -version-info $(LIBTOOL_VERSION_INFO_ARG)
 libqpidbroker_la_SOURCES = \
   $(broker)/AccumulatedAck.cpp \
@@ -260,29 +262,29 @@ nobase_qpidinclude_HEADERS = \
   $(framing)/amqp_framing.h \
   $(framing)/amqp_types.h \
   $(framing)/amqp_types_full.h \
-  sys/Acceptor.h \
-  sys/AtomicCount.h \
-  sys/Condition.h \
-  sys/ConnectionInputHandler.h \
-  sys/ConnectionInputHandlerFactory.h \
-  sys/ConnectionOutputHandler.h \
-  sys/Module.h \
-  sys/Monitor.h \
-  sys/Mutex.h \
-  sys/ProducerConsumer.h \
-  sys/Runnable.h \
-  sys/ScopedIncrement.h \
-  sys/ShutdownHandler.h \
-  sys/Socket.h \
-  sys/Thread.h \
-  sys/ThreadSafeQueue.h \
-  sys/Time.h \
-  sys/TimeoutHandler.h \
-  Exception.h \
-  ExceptionHolder.h \
-  QpidError.h \
-  SharedObject.h \
-  shared_ptr.h 
+  qpid/sys/Acceptor.h \
+  qpid/sys/AtomicCount.h \
+  qpid/sys/Condition.h \
+  qpid/sys/ConnectionInputHandler.h \
+  qpid/sys/ConnectionInputHandlerFactory.h \
+  qpid/sys/ConnectionOutputHandler.h \
+  qpid/sys/Module.h \
+  qpid/sys/Monitor.h \
+  qpid/sys/Mutex.h \
+  qpid/sys/ProducerConsumer.h \
+  qpid/sys/Runnable.h \
+  qpid/sys/ScopedIncrement.h \
+  qpid/sys/ShutdownHandler.h \
+  qpid/sys/Socket.h \
+  qpid/sys/Thread.h \
+  qpid/sys/ThreadSafeQueue.h \
+  qpid/sys/Time.h \
+  qpid/sys/TimeoutHandler.h \
+  qpid/Exception.h \
+  qpid/ExceptionHolder.h \
+  qpid/QpidError.h \
+  qpid/SharedObject.h \
+  qpid/shared_ptr.h 
 
 # Distribute the generated sources, at least for now, since
 # the generator code is in java.
@@ -299,22 +301,23 @@ spec_dir = $(srcdir)/../../specs
 spec = $(spec_dir)/amqp.0-9.xml $(spec_dir)/amqp-errata.0-9.xml
 gentools_srcdir = $(gentools_dir)/src/org/apache/qpid/gentools
 
-$(BUILT_SOURCES) $(gen)/timestamp: $(spec) $(java_sources) $(cxx_templates) Makefile.am
-	rm -f $(BUILT_SOURCES)
+$(BUILT_SOURCES) $(gen): $(spec) $(java_sources) $(cxx_templates) Makefile.am
+	rm -rf $(gen)
+	mkdir -p $(gen)
 	cd $(gentools_srcdir) && rm -f *.class && $(JAVAC) *.java
 	$(JAVA) -cp $(gentools_dir)/src org.apache.qpid.gentools.Main \
 	        -c -o $(gen) -t $(gentools_dir)/templ.cpp $(spec)
-	touch $(gen)/timestamp
+	touch $(gen)
 
-$(gen)/gen-src.mk: $(gen)/timestamp
-	mkdir -p $(gen)
-	./make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) > $@-t
+gen/gen-src.mk: $(gen)
+	./make-gen-src-mk.sh $(gentools_dir) $(gentools_srcdir) $(gen) > $@-t
 	mv $@-t $@
+
 endif
 
 maintainer-clean:
 	rm -f  $(gentools_srcdir)/*.class
-	rm -f $(BUILT_SOURCES)
+	rm -f $(gen)
 
 # Force build during dist phase so help2man will work.
 dist-hook: $(lib_LTLIBRARIES) $(sbin_PROGRAMS)
diff --git a/cpp/src/make-gen-src-mk.sh b/cpp/src/make-gen-src-mk.sh
index 0a6dd3e326..21655e5512 100755
--- a/cpp/src/make-gen-src-mk.sh
+++ b/cpp/src/make-gen-src-mk.sh
@@ -4,13 +4,14 @@
 
 gentools_dir=$1
 gentools_srcdir=$2
+gen=$3
 
 wildcard() { echo `ls $* 2>/dev/null` ; }
 
 cat <<EOF
-generated_sources = `wildcard gen/*.cpp`
+generated_sources = `wildcard $gen/*.cpp`
 
-generated_headers = `wildcard gen/*.h`
+generated_headers = `wildcard $gen/*.h`
 
 if CAN_GENERATE_CODE
 
diff --git a/cpp/src/Exception.cpp b/cpp/src/qpid/Exception.cpp
index 1bbf89e99f..1bbf89e99f 100644
--- a/cpp/src/Exception.cpp
+++ b/cpp/src/qpid/Exception.cpp
diff --git a/cpp/src/Exception.h b/cpp/src/qpid/Exception.h
index 4fbad7efaa..4fbad7efaa 100644
--- a/cpp/src/Exception.h
+++ b/cpp/src/qpid/Exception.h
diff --git a/cpp/src/ExceptionHolder.cpp b/cpp/src/qpid/ExceptionHolder.cpp
index de8d7b2487..de8d7b2487 100644
--- a/cpp/src/ExceptionHolder.cpp
+++ b/cpp/src/qpid/ExceptionHolder.cpp
diff --git a/cpp/src/ExceptionHolder.h b/cpp/src/qpid/ExceptionHolder.h
index 723dac4b2d..723dac4b2d 100644
--- a/cpp/src/ExceptionHolder.h
+++ b/cpp/src/qpid/ExceptionHolder.h
diff --git a/cpp/src/QpidError.cpp b/cpp/src/qpid/QpidError.cpp
index 365c84ea1d..365c84ea1d 100644
--- a/cpp/src/QpidError.cpp
+++ b/cpp/src/qpid/QpidError.cpp
diff --git a/cpp/src/QpidError.h b/cpp/src/qpid/QpidError.h
index 12e80c9bd9..12e80c9bd9 100644
--- a/cpp/src/QpidError.h
+++ b/cpp/src/qpid/QpidError.h
diff --git a/cpp/src/SharedObject.h b/cpp/src/qpid/SharedObject.h
index 852a036ab9..852a036ab9 100644
--- a/cpp/src/SharedObject.h
+++ b/cpp/src/qpid/SharedObject.h
diff --git a/cpp/src/broker/AccumulatedAck.cpp b/cpp/src/qpid/broker/AccumulatedAck.cpp
index ff471b0287..ff471b0287 100644
--- a/cpp/src/broker/AccumulatedAck.cpp
+++ b/cpp/src/qpid/broker/AccumulatedAck.cpp
diff --git a/cpp/src/broker/AccumulatedAck.h b/cpp/src/qpid/broker/AccumulatedAck.h
index c4a6e3b79b..c4a6e3b79b 100644
--- a/cpp/src/broker/AccumulatedAck.h
+++ b/cpp/src/qpid/broker/AccumulatedAck.h
diff --git a/cpp/src/broker/AutoDelete.cpp b/cpp/src/qpid/broker/AutoDelete.cpp
index dee8a0ec78..bfdb8decd2 100644
--- a/cpp/src/broker/AutoDelete.cpp
+++ b/cpp/src/qpid/broker/AutoDelete.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include "AutoDelete.h"
-#include "../sys/Time.h"
+#include "qpid/sys/Time.h"
 
 using namespace qpid::broker;
 using namespace qpid::sys;
diff --git a/cpp/src/broker/AutoDelete.h b/cpp/src/qpid/broker/AutoDelete.h
index 8cfd37325f..24e9c18a68 100644
--- a/cpp/src/broker/AutoDelete.h
+++ b/cpp/src/qpid/broker/AutoDelete.h
@@ -22,10 +22,10 @@
  */
 #include <iostream>
 #include <queue>
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "BrokerQueue.h"
 #include "QueueRegistry.h"
-#include "../sys/Thread.h"
+#include "qpid/sys/Thread.h"
 
 namespace qpid {
     namespace broker{
diff --git a/cpp/src/broker/Broker.cpp b/cpp/src/qpid/broker/Broker.cpp
index e0ab5e2a37..5ab65bf573 100644
--- a/cpp/src/broker/Broker.cpp
+++ b/cpp/src/qpid/broker/Broker.cpp
@@ -21,19 +21,19 @@
 #include <iostream>
 #include <memory>
 
-#include "../framing/AMQFrame.h"
+#include "qpid/framing/AMQFrame.h"
 #include "DirectExchange.h"
 #include "TopicExchange.h"
 #include "FanOutExchange.h"
 #include "HeadersExchange.h"
 #include "MessageStoreModule.h"
 #include "NullMessageStore.h"
-#include "../framing/ProtocolInitiation.h"
+#include "qpid/framing/ProtocolInitiation.h"
 #include "RecoveryManagerImpl.h"
 #include "Connection.h"
-#include "../sys/ConnectionInputHandler.h"
-#include "../sys/ConnectionInputHandlerFactory.h"
-#include "../sys/TimeoutHandler.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/TimeoutHandler.h"
 
 #include "Broker.h"
 
diff --git a/cpp/src/broker/Broker.h b/cpp/src/qpid/broker/Broker.h
index f713f0955b..57bd86f72e 100644
--- a/cpp/src/broker/Broker.h
+++ b/cpp/src/qpid/broker/Broker.h
@@ -24,16 +24,16 @@
 
 #include "Configuration.h"
 #include "ConnectionFactory.h"
-#include "../sys/Runnable.h"
-#include "../sys/Acceptor.h"
-#include "../SharedObject.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Acceptor.h"
+#include "qpid/SharedObject.h"
 #include "MessageStore.h"
 #include "AutoDelete.h"
 #include "ExchangeRegistry.h"
 #include "ConnectionToken.h"
 #include "DirectExchange.h"
-#include "../framing/OutputHandler.h"
-#include "../framing/ProtocolInitiation.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
 #include "QueueRegistry.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/BrokerAdapter.cpp b/cpp/src/qpid/broker/BrokerAdapter.cpp
index d04610c877..240973b060 100644
--- a/cpp/src/broker/BrokerAdapter.cpp
+++ b/cpp/src/qpid/broker/BrokerAdapter.cpp
@@ -20,8 +20,8 @@
 #include "BrokerAdapter.h"
 #include "BrokerChannel.h"
 #include "Connection.h"
-#include "../framing/AMQMethodBody.h"
-#include "../Exception.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/Exception.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/broker/BrokerAdapter.h b/cpp/src/qpid/broker/BrokerAdapter.h
index 0323cbad20..0c7c9edba8 100644
--- a/cpp/src/broker/BrokerAdapter.h
+++ b/cpp/src/qpid/broker/BrokerAdapter.h
@@ -18,10 +18,10 @@
  * limitations under the License.
  *
  */
-#include "../gen/AMQP_ServerOperations.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
 #include "HandlerImpl.h"
 #include "MessageHandlerImpl.h"
-#include "../Exception.h"
+#include "qpid/Exception.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/broker/BrokerChannel.cpp b/cpp/src/qpid/broker/BrokerChannel.cpp
index bd97c6f021..afbbed5c29 100644
--- a/cpp/src/broker/BrokerChannel.cpp
+++ b/cpp/src/qpid/broker/BrokerChannel.cpp
@@ -28,8 +28,8 @@
 #include <boost/bind.hpp>
 
 #include "BrokerChannel.h"
-#include "../framing/ChannelAdapter.h"
-#include "../QpidError.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/QpidError.h"
 #include "DeliverableMessage.h"
 #include "BrokerQueue.h"
 #include "BrokerMessage.h"
diff --git a/cpp/src/broker/BrokerChannel.h b/cpp/src/qpid/broker/BrokerChannel.h
index fb090196c2..9515485d37 100644
--- a/cpp/src/broker/BrokerChannel.h
+++ b/cpp/src/qpid/broker/BrokerChannel.h
@@ -35,8 +35,8 @@
 #include "NameGenerator.h"
 #include "Prefetch.h"
 #include "TxBuffer.h"
-#include "../framing/ChannelAdapter.h"
-#include "../gen/ChannelOpenBody.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/framing/ChannelOpenBody.h"
 #include "CompletionHandler.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/BrokerExchange.h b/cpp/src/qpid/broker/BrokerExchange.h
index 07a411335a..d4877a5110 100644
--- a/cpp/src/broker/BrokerExchange.h
+++ b/cpp/src/qpid/broker/BrokerExchange.h
@@ -25,7 +25,7 @@
 #include <boost/shared_ptr.hpp>
 #include "Deliverable.h"
 #include "BrokerQueue.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/broker/BrokerMessage.cpp b/cpp/src/qpid/broker/BrokerMessage.cpp
index 96a90ef608..ce21a2cca4 100644
--- a/cpp/src/broker/BrokerMessage.cpp
+++ b/cpp/src/qpid/broker/BrokerMessage.cpp
@@ -26,13 +26,13 @@
 #include "InMemoryContent.h"
 #include "LazyLoadedContent.h"
 #include "MessageStore.h"
-#include "../gen/BasicDeliverBody.h"
-#include "../gen/BasicGetOkBody.h"
-#include "../framing/AMQContentBody.h"
-#include "../framing/AMQHeaderBody.h"
-#include "../framing/AMQMethodBody.h"
-#include "../framing/AMQFrame.h"
-#include "../framing/ChannelAdapter.h"
+#include "qpid/framing/BasicDeliverBody.h"
+#include "qpid/framing/BasicGetOkBody.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/ChannelAdapter.h"
 #include "RecoveryManagerImpl.h"
 
 using namespace boost;
diff --git a/cpp/src/broker/BrokerMessage.h b/cpp/src/qpid/broker/BrokerMessage.h
index 1d13183f43..aee5092dab 100644
--- a/cpp/src/broker/BrokerMessage.h
+++ b/cpp/src/qpid/broker/BrokerMessage.h
@@ -26,10 +26,10 @@
 #include <boost/shared_ptr.hpp>
 
 #include "BrokerMessageBase.h"
-#include "../framing/BasicHeaderProperties.h"
+#include "qpid/framing/BasicHeaderProperties.h"
 #include "ConnectionToken.h"
 #include "Content.h"
-#include "../sys/Mutex.h"
+#include "qpid/sys/Mutex.h"
 #include "TxBuffer.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/BrokerMessageBase.h b/cpp/src/qpid/broker/BrokerMessageBase.h
index 41f54bc8bb..a254986fd9 100644
--- a/cpp/src/broker/BrokerMessageBase.h
+++ b/cpp/src/qpid/broker/BrokerMessageBase.h
@@ -26,7 +26,7 @@
 #include <boost/shared_ptr.hpp>
 #include "Content.h"
 #include "PersistableMessage.h"
-#include "../framing/amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 
 namespace qpid {
 	
diff --git a/cpp/src/broker/BrokerMessageMessage.cpp b/cpp/src/qpid/broker/BrokerMessageMessage.cpp
index 7a2fa31343..17ccdc03b8 100644
--- a/cpp/src/broker/BrokerMessageMessage.cpp
+++ b/cpp/src/qpid/broker/BrokerMessageMessage.cpp
@@ -18,17 +18,17 @@
  * under the License.
  *
  */
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include "BrokerMessageMessage.h"
-#include "../framing/ChannelAdapter.h"
-#include "../gen/MessageTransferBody.h"
-#include "../gen/MessageOpenBody.h"
-#include "../gen/MessageCloseBody.h"
-#include "../gen/MessageAppendBody.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/framing/MessageTransferBody.h"
+#include "qpid/framing/MessageOpenBody.h"
+#include "qpid/framing/MessageCloseBody.h"
+#include "qpid/framing/MessageAppendBody.h"
 #include "Reference.h"
-#include "../framing/AMQFrame.h"
-#include "../framing/FieldTable.h"
-#include "../framing/BasicHeaderProperties.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/BasicHeaderProperties.h"
 #include "RecoveryManagerImpl.h"
 
 #include <algorithm>
diff --git a/cpp/src/broker/BrokerMessageMessage.h b/cpp/src/qpid/broker/BrokerMessageMessage.h
index ae9fc9c2c0..e64e08fcef 100644
--- a/cpp/src/broker/BrokerMessageMessage.h
+++ b/cpp/src/qpid/broker/BrokerMessageMessage.h
@@ -22,8 +22,8 @@
  *
  */
 #include "BrokerMessageBase.h"
-#include "../gen/MessageTransferBody.h"
-#include "../framing/amqp_types.h"
+#include "qpid/framing/MessageTransferBody.h"
+#include "qpid/framing/amqp_types.h"
 #include <boost/weak_ptr.hpp>
 #include <vector>
 
diff --git a/cpp/src/broker/BrokerQueue.cpp b/cpp/src/qpid/broker/BrokerQueue.cpp
index 5d34a52fcc..34c8d79e76 100644
--- a/cpp/src/broker/BrokerQueue.cpp
+++ b/cpp/src/qpid/broker/BrokerQueue.cpp
@@ -23,8 +23,8 @@
 
 #include "BrokerQueue.h"
 #include "MessageStore.h"
-#include "../sys/Monitor.h"
-#include "../sys/Time.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Time.h"
 #include <iostream>
 #include "QueueRegistry.h"
 
diff --git a/cpp/src/broker/BrokerQueue.h b/cpp/src/qpid/broker/BrokerQueue.h
index 808a523869..28f6cfce8f 100644
--- a/cpp/src/broker/BrokerQueue.h
+++ b/cpp/src/qpid/broker/BrokerQueue.h
@@ -25,12 +25,12 @@
 #include <memory>
 #include <queue>
 #include <boost/shared_ptr.hpp>
-#include "../framing/amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 #include "ConnectionToken.h"
 #include "Consumer.h"
 #include "BrokerMessage.h"
-#include "../framing/FieldTable.h"
-#include "../sys/Monitor.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/sys/Monitor.h"
 #include "PersistableQueue.h"
 #include "QueuePolicy.h"
 
diff --git a/cpp/src/broker/BrokerSingleton.cpp b/cpp/src/qpid/broker/BrokerSingleton.cpp
index 4571764850..4571764850 100644
--- a/cpp/src/broker/BrokerSingleton.cpp
+++ b/cpp/src/qpid/broker/BrokerSingleton.cpp
diff --git a/cpp/src/broker/BrokerSingleton.h b/cpp/src/qpid/broker/BrokerSingleton.h
index 139e02a5fd..139e02a5fd 100644
--- a/cpp/src/broker/BrokerSingleton.h
+++ b/cpp/src/qpid/broker/BrokerSingleton.h
diff --git a/cpp/src/broker/CompletionHandler.h b/cpp/src/qpid/broker/CompletionHandler.h
index 9d51656282..9d51656282 100644
--- a/cpp/src/broker/CompletionHandler.h
+++ b/cpp/src/qpid/broker/CompletionHandler.h
diff --git a/cpp/src/broker/Configuration.cpp b/cpp/src/qpid/broker/Configuration.cpp
index 3449f6f179..3449f6f179 100644
--- a/cpp/src/broker/Configuration.cpp
+++ b/cpp/src/qpid/broker/Configuration.cpp
diff --git a/cpp/src/broker/Configuration.h b/cpp/src/qpid/broker/Configuration.h
index d93bf5c45b..174a061637 100644
--- a/cpp/src/broker/Configuration.h
+++ b/cpp/src/qpid/broker/Configuration.h
@@ -24,7 +24,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <vector>
-#include "../Exception.h"
+#include "qpid/Exception.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/broker/Connection.cpp b/cpp/src/qpid/broker/Connection.cpp
index ab1c2ac128..b2174de44f 100644
--- a/cpp/src/broker/Connection.cpp
+++ b/cpp/src/qpid/broker/Connection.cpp
@@ -23,7 +23,7 @@
 
 #include "Connection.h"
 #include "BrokerChannel.h"
-#include "../gen/AMQP_ClientProxy.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
 #include "BrokerAdapter.h"
 
 using namespace boost;
diff --git a/cpp/src/broker/Connection.h b/cpp/src/qpid/broker/Connection.h
index ffda0425cc..3fc575280a 100644
--- a/cpp/src/broker/Connection.h
+++ b/cpp/src/qpid/broker/Connection.h
@@ -26,15 +26,15 @@
 
 #include <boost/ptr_container/ptr_map.hpp>
 
-#include "../framing/AMQFrame.h"
-#include "../gen/AMQP_ServerOperations.h"
-#include "../gen/AMQP_ClientProxy.h"
-#include "../sys/ConnectionOutputHandler.h"
-#include "../sys/ConnectionInputHandler.h"
-#include "../sys/TimeoutHandler.h"
-#include "../framing/ProtocolVersion.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
+#include "qpid/framing/ProtocolVersion.h"
 #include "Broker.h"
-#include "../Exception.h"
+#include "qpid/Exception.h"
 #include "BrokerChannel.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/ConnectionFactory.cpp b/cpp/src/qpid/broker/ConnectionFactory.cpp
index 5372bfe377..5372bfe377 100644
--- a/cpp/src/broker/ConnectionFactory.cpp
+++ b/cpp/src/qpid/broker/ConnectionFactory.cpp
diff --git a/cpp/src/broker/ConnectionFactory.h b/cpp/src/qpid/broker/ConnectionFactory.h
index 54fabb8089..6af3dda7a6 100644
--- a/cpp/src/broker/ConnectionFactory.h
+++ b/cpp/src/qpid/broker/ConnectionFactory.h
@@ -21,7 +21,7 @@
 #ifndef _ConnectionFactory_
 #define _ConnectionFactory_
 
-#include "../sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/broker/ConnectionToken.h b/cpp/src/qpid/broker/ConnectionToken.h
index 7e7f813d0e..7e7f813d0e 100644
--- a/cpp/src/broker/ConnectionToken.h
+++ b/cpp/src/qpid/broker/ConnectionToken.h
diff --git a/cpp/src/broker/Consumer.h b/cpp/src/qpid/broker/Consumer.h
index d0c397d184..d0c397d184 100644
--- a/cpp/src/broker/Consumer.h
+++ b/cpp/src/qpid/broker/Consumer.h
diff --git a/cpp/src/broker/Content.h b/cpp/src/qpid/broker/Content.h
index dd895e2eb3..df9e7a1132 100644
--- a/cpp/src/broker/Content.h
+++ b/cpp/src/qpid/broker/Content.h
@@ -23,9 +23,9 @@
 
 #include <boost/function.hpp>
 
-#include "../framing/AMQContentBody.h"
-#include "../framing/Buffer.h"
-#include "../framing/OutputHandler.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/OutputHandler.h"
 
 namespace qpid {
 
diff --git a/cpp/src/broker/Deliverable.h b/cpp/src/qpid/broker/Deliverable.h
index 1570917849..1570917849 100644
--- a/cpp/src/broker/Deliverable.h
+++ b/cpp/src/qpid/broker/Deliverable.h
diff --git a/cpp/src/broker/DeliverableMessage.cpp b/cpp/src/qpid/broker/DeliverableMessage.cpp
index 0c2e46ccce..0c2e46ccce 100644
--- a/cpp/src/broker/DeliverableMessage.cpp
+++ b/cpp/src/qpid/broker/DeliverableMessage.cpp
diff --git a/cpp/src/broker/DeliverableMessage.h b/cpp/src/qpid/broker/DeliverableMessage.h
index 43e738a96a..43e738a96a 100644
--- a/cpp/src/broker/DeliverableMessage.h
+++ b/cpp/src/qpid/broker/DeliverableMessage.h
diff --git a/cpp/src/broker/DeliveryRecord.cpp b/cpp/src/qpid/broker/DeliveryRecord.cpp
index 95650b7b23..95650b7b23 100644
--- a/cpp/src/broker/DeliveryRecord.cpp
+++ b/cpp/src/qpid/broker/DeliveryRecord.cpp
diff --git a/cpp/src/broker/DeliveryRecord.h b/cpp/src/qpid/broker/DeliveryRecord.h
index 15c207ce44..15c207ce44 100644
--- a/cpp/src/broker/DeliveryRecord.h
+++ b/cpp/src/qpid/broker/DeliveryRecord.h
diff --git a/cpp/src/broker/DirectExchange.cpp b/cpp/src/qpid/broker/DirectExchange.cpp
index 7d15410374..7d15410374 100644
--- a/cpp/src/broker/DirectExchange.cpp
+++ b/cpp/src/qpid/broker/DirectExchange.cpp
diff --git a/cpp/src/broker/DirectExchange.h b/cpp/src/qpid/broker/DirectExchange.h
index 94b064327d..886b59be30 100644
--- a/cpp/src/broker/DirectExchange.h
+++ b/cpp/src/qpid/broker/DirectExchange.h
@@ -24,9 +24,9 @@
 #include <map>
 #include <vector>
 #include "BrokerExchange.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 #include "BrokerMessage.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "BrokerQueue.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/ExchangeRegistry.cpp b/cpp/src/qpid/broker/ExchangeRegistry.cpp
index 03863673df..03863673df 100644
--- a/cpp/src/broker/ExchangeRegistry.cpp
+++ b/cpp/src/qpid/broker/ExchangeRegistry.cpp
diff --git a/cpp/src/broker/ExchangeRegistry.h b/cpp/src/qpid/broker/ExchangeRegistry.h
index 1c81cb6021..ff7399ba22 100644
--- a/cpp/src/broker/ExchangeRegistry.h
+++ b/cpp/src/qpid/broker/ExchangeRegistry.h
@@ -24,7 +24,7 @@
 
 #include <map>
 #include "BrokerExchange.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/broker/FanOutExchange.cpp b/cpp/src/qpid/broker/FanOutExchange.cpp
index 1ac92c89e2..1ac92c89e2 100644
--- a/cpp/src/broker/FanOutExchange.cpp
+++ b/cpp/src/qpid/broker/FanOutExchange.cpp
diff --git a/cpp/src/broker/FanOutExchange.h b/cpp/src/qpid/broker/FanOutExchange.h
index 147383ba1a..b6a803673f 100644
--- a/cpp/src/broker/FanOutExchange.h
+++ b/cpp/src/qpid/broker/FanOutExchange.h
@@ -24,9 +24,9 @@
 #include <map>
 #include <vector>
 #include "BrokerExchange.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 #include "BrokerMessage.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "BrokerQueue.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/HandlerImpl.h b/cpp/src/qpid/broker/HandlerImpl.h
index 51175f868a..338ebca4b7 100644
--- a/cpp/src/broker/HandlerImpl.h
+++ b/cpp/src/qpid/broker/HandlerImpl.h
@@ -20,7 +20,7 @@
  */
 
 #include "BrokerChannel.h"
-#include "../gen/AMQP_ClientProxy.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
 
 namespace qpid {
 
diff --git a/cpp/src/broker/HeadersExchange.cpp b/cpp/src/qpid/broker/HeadersExchange.cpp
index 21f23af00d..fef1f3fa4b 100644
--- a/cpp/src/broker/HeadersExchange.cpp
+++ b/cpp/src/qpid/broker/HeadersExchange.cpp
@@ -19,8 +19,8 @@
  *
  */
 #include "HeadersExchange.h"
-#include "../framing/Value.h"
-#include "../QpidError.h"
+#include "qpid/framing/Value.h"
+#include "qpid/QpidError.h"
 #include <algorithm>
 
 
diff --git a/cpp/src/broker/HeadersExchange.h b/cpp/src/qpid/broker/HeadersExchange.h
index 4d26b95f50..e92b6f19cf 100644
--- a/cpp/src/broker/HeadersExchange.h
+++ b/cpp/src/qpid/broker/HeadersExchange.h
@@ -23,9 +23,9 @@
 
 #include <vector>
 #include "BrokerExchange.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 #include "BrokerMessage.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "BrokerQueue.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/InMemoryContent.cpp b/cpp/src/qpid/broker/InMemoryContent.cpp
index d5f3479894..96563b0329 100644
--- a/cpp/src/broker/InMemoryContent.cpp
+++ b/cpp/src/qpid/broker/InMemoryContent.cpp
@@ -19,8 +19,8 @@
  *
  */
 #include "InMemoryContent.h"
-#include "../framing/AMQFrame.h"
-#include "../framing/ChannelAdapter.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/ChannelAdapter.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;
diff --git a/cpp/src/broker/InMemoryContent.h b/cpp/src/qpid/broker/InMemoryContent.h
index 425f0e4e26..425f0e4e26 100644
--- a/cpp/src/broker/InMemoryContent.h
+++ b/cpp/src/qpid/broker/InMemoryContent.h
diff --git a/cpp/src/broker/LazyLoadedContent.cpp b/cpp/src/qpid/broker/LazyLoadedContent.cpp
index b5bead11a5..c11d049317 100644
--- a/cpp/src/broker/LazyLoadedContent.cpp
+++ b/cpp/src/qpid/broker/LazyLoadedContent.cpp
@@ -19,8 +19,8 @@
  *
  */
 #include "LazyLoadedContent.h"
-#include "../framing/AMQFrame.h"
-#include "../framing/ChannelAdapter.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/ChannelAdapter.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;
diff --git a/cpp/src/broker/LazyLoadedContent.h b/cpp/src/qpid/broker/LazyLoadedContent.h
index 9dff6158a5..9dff6158a5 100644
--- a/cpp/src/broker/LazyLoadedContent.h
+++ b/cpp/src/qpid/broker/LazyLoadedContent.h
diff --git a/cpp/src/broker/MessageBuilder.cpp b/cpp/src/qpid/broker/MessageBuilder.cpp
index 6c33b38e72..6c33b38e72 100644
--- a/cpp/src/broker/MessageBuilder.cpp
+++ b/cpp/src/qpid/broker/MessageBuilder.cpp
diff --git a/cpp/src/broker/MessageBuilder.h b/cpp/src/qpid/broker/MessageBuilder.h
index 85de2e47bc..7c4a529a64 100644
--- a/cpp/src/broker/MessageBuilder.h
+++ b/cpp/src/qpid/broker/MessageBuilder.h
@@ -22,13 +22,13 @@
 #define _MessageBuilder_
 
 #include <memory>
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include "BrokerExchange.h"
 #include "BrokerMessage.h"
 #include "MessageStore.h"
-#include "../framing/AMQContentBody.h"
-#include "../framing/AMQHeaderBody.h"
-#include "../gen/BasicPublishBody.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/BasicPublishBody.h"
 #include "CompletionHandler.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/MessageHandlerImpl.cpp b/cpp/src/qpid/broker/MessageHandlerImpl.cpp
index e5e5581ac4..22011169a2 100644
--- a/cpp/src/broker/MessageHandlerImpl.cpp
+++ b/cpp/src/qpid/broker/MessageHandlerImpl.cpp
@@ -16,15 +16,15 @@
  *
  */
 
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include "MessageHandlerImpl.h"
 #include "BrokerChannel.h"
-#include "../framing/FramingContent.h"
+#include "qpid/framing/FramingContent.h"
 #include "Connection.h"
 #include "Broker.h"
 #include "BrokerMessageMessage.h"
-#include "../gen/MessageAppendBody.h"
-#include "../gen/MessageTransferBody.h"
+#include "qpid/framing/MessageAppendBody.h"
+#include "qpid/framing/MessageTransferBody.h"
 #include "BrokerAdapter.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/MessageHandlerImpl.h b/cpp/src/qpid/broker/MessageHandlerImpl.h
index a5647200d3..47c8cf0ce0 100644
--- a/cpp/src/broker/MessageHandlerImpl.h
+++ b/cpp/src/qpid/broker/MessageHandlerImpl.h
@@ -21,8 +21,8 @@
 
 #include <memory>
 
-#include "../gen/AMQP_ServerOperations.h"
-#include "../gen/AMQP_ClientProxy.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
 #include "Reference.h"
 #include "HandlerImpl.h"
 
diff --git a/cpp/src/broker/MessageStore.h b/cpp/src/qpid/broker/MessageStore.h
index 1d9ee86e48..1d9ee86e48 100644
--- a/cpp/src/broker/MessageStore.h
+++ b/cpp/src/qpid/broker/MessageStore.h
diff --git a/cpp/src/broker/MessageStoreModule.cpp b/cpp/src/qpid/broker/MessageStoreModule.cpp
index 17e5d3cca8..17e5d3cca8 100644
--- a/cpp/src/broker/MessageStoreModule.cpp
+++ b/cpp/src/qpid/broker/MessageStoreModule.cpp
diff --git a/cpp/src/broker/MessageStoreModule.h b/cpp/src/qpid/broker/MessageStoreModule.h
index 02c87a1bf6..59c45f68f6 100644
--- a/cpp/src/broker/MessageStoreModule.h
+++ b/cpp/src/qpid/broker/MessageStoreModule.h
@@ -25,7 +25,7 @@
 #include "MessageStore.h"
 #include "BrokerQueue.h"
 #include "RecoveryManager.h"
-#include "../sys/Module.h"
+#include "qpid/sys/Module.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/broker/NameGenerator.cpp b/cpp/src/qpid/broker/NameGenerator.cpp
index 8484f921e9..8484f921e9 100644
--- a/cpp/src/broker/NameGenerator.cpp
+++ b/cpp/src/qpid/broker/NameGenerator.cpp
diff --git a/cpp/src/broker/NameGenerator.h b/cpp/src/qpid/broker/NameGenerator.h
index affcedba41..affcedba41 100644
--- a/cpp/src/broker/NameGenerator.h
+++ b/cpp/src/qpid/broker/NameGenerator.h
diff --git a/cpp/src/broker/NullMessageStore.cpp b/cpp/src/qpid/broker/NullMessageStore.cpp
index 393bbb8f02..393bbb8f02 100644
--- a/cpp/src/broker/NullMessageStore.cpp
+++ b/cpp/src/qpid/broker/NullMessageStore.cpp
diff --git a/cpp/src/broker/NullMessageStore.h b/cpp/src/qpid/broker/NullMessageStore.h
index e0b215bb39..e0b215bb39 100644
--- a/cpp/src/broker/NullMessageStore.h
+++ b/cpp/src/qpid/broker/NullMessageStore.h
diff --git a/cpp/src/broker/Persistable.h b/cpp/src/qpid/broker/Persistable.h
index 58ea1a7322..3fb96d8568 100644
--- a/cpp/src/broker/Persistable.h
+++ b/cpp/src/qpid/broker/Persistable.h
@@ -22,8 +22,8 @@
  *
  */
 
-#include "../framing/amqp_types.h"
-#include "../framing/Buffer.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/Buffer.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/broker/PersistableExchange.h b/cpp/src/qpid/broker/PersistableExchange.h
index 9badf5f609..9badf5f609 100644
--- a/cpp/src/broker/PersistableExchange.h
+++ b/cpp/src/qpid/broker/PersistableExchange.h
diff --git a/cpp/src/broker/PersistableMessage.h b/cpp/src/qpid/broker/PersistableMessage.h
index c10d16bc65..11a12d68e1 100644
--- a/cpp/src/broker/PersistableMessage.h
+++ b/cpp/src/qpid/broker/PersistableMessage.h
@@ -25,7 +25,7 @@
 #include <string>
 #include <boost/shared_ptr.hpp>
 #include "Persistable.h"
-#include "../framing/amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/broker/PersistableQueue.h b/cpp/src/qpid/broker/PersistableQueue.h
index 5dd91dde9b..5dd91dde9b 100644
--- a/cpp/src/broker/PersistableQueue.h
+++ b/cpp/src/qpid/broker/PersistableQueue.h
diff --git a/cpp/src/broker/Prefetch.h b/cpp/src/qpid/broker/Prefetch.h
index 448156c187..8eb27a3e21 100644
--- a/cpp/src/broker/Prefetch.h
+++ b/cpp/src/qpid/broker/Prefetch.h
@@ -21,7 +21,7 @@
 #ifndef _Prefetch_
 #define _Prefetch_
 
-#include "../framing/amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/broker/QueuePolicy.cpp b/cpp/src/qpid/broker/QueuePolicy.cpp
index 620822cddc..620822cddc 100644
--- a/cpp/src/broker/QueuePolicy.cpp
+++ b/cpp/src/qpid/broker/QueuePolicy.cpp
diff --git a/cpp/src/broker/QueuePolicy.h b/cpp/src/qpid/broker/QueuePolicy.h
index 28c3f81516..0cc7070e09 100644
--- a/cpp/src/broker/QueuePolicy.h
+++ b/cpp/src/qpid/broker/QueuePolicy.h
@@ -21,7 +21,7 @@
 #ifndef _QueuePolicy_
 #define _QueuePolicy_
 
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 
 namespace qpid {
     namespace broker {
diff --git a/cpp/src/broker/QueueRegistry.cpp b/cpp/src/qpid/broker/QueueRegistry.cpp
index dcaf7ec0f6..dcaf7ec0f6 100644
--- a/cpp/src/broker/QueueRegistry.cpp
+++ b/cpp/src/qpid/broker/QueueRegistry.cpp
diff --git a/cpp/src/broker/QueueRegistry.h b/cpp/src/qpid/broker/QueueRegistry.h
index 5798226c48..bd53cba817 100644
--- a/cpp/src/broker/QueueRegistry.h
+++ b/cpp/src/qpid/broker/QueueRegistry.h
@@ -22,7 +22,7 @@
 #define _QueueRegistry_
 
 #include <map>
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "BrokerQueue.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/RecoverableMessage.h b/cpp/src/qpid/broker/RecoverableMessage.h
index 3dd892d577..f755fdf727 100644
--- a/cpp/src/broker/RecoverableMessage.h
+++ b/cpp/src/qpid/broker/RecoverableMessage.h
@@ -23,8 +23,8 @@
  */
 
 #include <boost/shared_ptr.hpp>
-#include "../framing/amqp_types.h"
-#include "../framing/Buffer.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/Buffer.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/broker/RecoverableQueue.h b/cpp/src/qpid/broker/RecoverableQueue.h
index 656a5f0149..656a5f0149 100644
--- a/cpp/src/broker/RecoverableQueue.h
+++ b/cpp/src/qpid/broker/RecoverableQueue.h
diff --git a/cpp/src/broker/RecoveryManager.h b/cpp/src/qpid/broker/RecoveryManager.h
index 3f351f6a2e..27f3d9355c 100644
--- a/cpp/src/broker/RecoveryManager.h
+++ b/cpp/src/qpid/broker/RecoveryManager.h
@@ -23,7 +23,7 @@
 
 #include "RecoverableQueue.h"
 #include "RecoverableMessage.h"
-#include "../framing/Buffer.h"
+#include "qpid/framing/Buffer.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/broker/RecoveryManagerImpl.cpp b/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
index f82399f95c..f82399f95c 100644
--- a/cpp/src/broker/RecoveryManagerImpl.cpp
+++ b/cpp/src/qpid/broker/RecoveryManagerImpl.cpp
diff --git a/cpp/src/broker/RecoveryManagerImpl.h b/cpp/src/qpid/broker/RecoveryManagerImpl.h
index c40de7895f..c40de7895f 100644
--- a/cpp/src/broker/RecoveryManagerImpl.h
+++ b/cpp/src/qpid/broker/RecoveryManagerImpl.h
diff --git a/cpp/src/broker/Reference.cpp b/cpp/src/qpid/broker/Reference.cpp
index b0b2d8a3c1..c2060f8fee 100644
--- a/cpp/src/broker/Reference.cpp
+++ b/cpp/src/qpid/broker/Reference.cpp
@@ -19,8 +19,8 @@
 #include <boost/bind.hpp>
 #include "Reference.h"
 #include "BrokerMessageMessage.h"
-#include "../QpidError.h"
-#include "../gen/MessageAppendBody.h"
+#include "qpid/QpidError.h"
+#include "qpid/framing/MessageAppendBody.h"
 #include "CompletionHandler.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/Reference.h b/cpp/src/qpid/broker/Reference.h
index 277eb7b917..277eb7b917 100644
--- a/cpp/src/broker/Reference.h
+++ b/cpp/src/qpid/broker/Reference.h
diff --git a/cpp/src/broker/TopicExchange.cpp b/cpp/src/qpid/broker/TopicExchange.cpp
index f29dfc38ba..f29dfc38ba 100644
--- a/cpp/src/broker/TopicExchange.cpp
+++ b/cpp/src/qpid/broker/TopicExchange.cpp
diff --git a/cpp/src/broker/TopicExchange.h b/cpp/src/qpid/broker/TopicExchange.h
index 8aba0911c0..e00731af3a 100644
--- a/cpp/src/broker/TopicExchange.h
+++ b/cpp/src/qpid/broker/TopicExchange.h
@@ -24,9 +24,9 @@
 #include <map>
 #include <vector>
 #include "BrokerExchange.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 #include "BrokerMessage.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "BrokerQueue.h"
 
 namespace qpid {
diff --git a/cpp/src/broker/TransactionalStore.h b/cpp/src/qpid/broker/TransactionalStore.h
index 2a2bac0c51..2a2bac0c51 100644
--- a/cpp/src/broker/TransactionalStore.h
+++ b/cpp/src/qpid/broker/TransactionalStore.h
diff --git a/cpp/src/broker/TxAck.cpp b/cpp/src/qpid/broker/TxAck.cpp
index 60d8049102..60d8049102 100644
--- a/cpp/src/broker/TxAck.cpp
+++ b/cpp/src/qpid/broker/TxAck.cpp
diff --git a/cpp/src/broker/TxAck.h b/cpp/src/qpid/broker/TxAck.h
index 5e6d0a370c..5e6d0a370c 100644
--- a/cpp/src/broker/TxAck.h
+++ b/cpp/src/qpid/broker/TxAck.h
diff --git a/cpp/src/broker/TxBuffer.cpp b/cpp/src/qpid/broker/TxBuffer.cpp
index c526c88c25..c526c88c25 100644
--- a/cpp/src/broker/TxBuffer.cpp
+++ b/cpp/src/qpid/broker/TxBuffer.cpp
diff --git a/cpp/src/broker/TxBuffer.h b/cpp/src/qpid/broker/TxBuffer.h
index 86ee8945b5..86ee8945b5 100644
--- a/cpp/src/broker/TxBuffer.h
+++ b/cpp/src/qpid/broker/TxBuffer.h
diff --git a/cpp/src/broker/TxOp.h b/cpp/src/qpid/broker/TxOp.h
index e687c437cc..e687c437cc 100644
--- a/cpp/src/broker/TxOp.h
+++ b/cpp/src/qpid/broker/TxOp.h
diff --git a/cpp/src/broker/TxPublish.cpp b/cpp/src/qpid/broker/TxPublish.cpp
index 687505909c..687505909c 100644
--- a/cpp/src/broker/TxPublish.cpp
+++ b/cpp/src/qpid/broker/TxPublish.cpp
diff --git a/cpp/src/broker/TxPublish.h b/cpp/src/qpid/broker/TxPublish.h
index 29b1dc38af..29b1dc38af 100644
--- a/cpp/src/broker/TxPublish.h
+++ b/cpp/src/qpid/broker/TxPublish.h
diff --git a/cpp/src/client/AckMode.h b/cpp/src/qpid/client/AckMode.h
index 9ad5ef925c..9ad5ef925c 100644
--- a/cpp/src/client/AckMode.h
+++ b/cpp/src/qpid/client/AckMode.h
diff --git a/cpp/src/client/BasicMessageChannel.cpp b/cpp/src/qpid/client/BasicMessageChannel.cpp
index c577c0a305..96aaad05dc 100644
--- a/cpp/src/client/BasicMessageChannel.cpp
+++ b/cpp/src/qpid/client/BasicMessageChannel.cpp
@@ -16,11 +16,11 @@
  *
  */
 #include "BasicMessageChannel.h"
-#include "../framing/AMQMethodBody.h"
+#include "qpid/framing/AMQMethodBody.h"
 #include "ClientChannel.h"
 #include "ReturnedMessageHandler.h"
 #include "MessageListener.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 #include "Connection.h"
 #include <queue>
 #include <iostream>
diff --git a/cpp/src/client/BasicMessageChannel.h b/cpp/src/qpid/client/BasicMessageChannel.h
index 13e1cf1e00..13e1cf1e00 100644
--- a/cpp/src/client/BasicMessageChannel.h
+++ b/cpp/src/qpid/client/BasicMessageChannel.h
diff --git a/cpp/src/client/ClientAdapter.cpp b/cpp/src/qpid/client/ClientAdapter.cpp
index f5eb2f4536..ceabe344c9 100644
--- a/cpp/src/client/ClientAdapter.cpp
+++ b/cpp/src/qpid/client/ClientAdapter.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "../gen/AMQP_ClientOperations.h"
+#include "qpid/framing/AMQP_ClientOperations.h"
 #include "ClientAdapter.h"
 #include "Connection.h"
-#include "../Exception.h"
-#include "../framing/AMQMethodBody.h"
+#include "qpid/Exception.h"
+#include "qpid/framing/AMQMethodBody.h"
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/client/ClientAdapter.h b/cpp/src/qpid/client/ClientAdapter.h
index ca029a793f..4a6b76077f 100644
--- a/cpp/src/client/ClientAdapter.h
+++ b/cpp/src/qpid/client/ClientAdapter.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "../framing/ChannelAdapter.h"
+#include "qpid/framing/ChannelAdapter.h"
 #include "ClientChannel.h"
 
 namespace qpid {
diff --git a/cpp/src/client/ClientChannel.cpp b/cpp/src/qpid/client/ClientChannel.cpp
index 533b590010..05f01227f6 100644
--- a/cpp/src/client/ClientChannel.cpp
+++ b/cpp/src/qpid/client/ClientChannel.cpp
@@ -20,9 +20,9 @@
  */
 #include <iostream>
 #include "ClientChannel.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include "ClientMessage.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include "MethodBodyInstances.h"
 #include "Connection.h"
 #include "BasicMessageChannel.h"
diff --git a/cpp/src/client/ClientChannel.h b/cpp/src/qpid/client/ClientChannel.h
index 328fc23f68..7f3074ea1b 100644
--- a/cpp/src/client/ClientChannel.h
+++ b/cpp/src/qpid/client/ClientChannel.h
@@ -22,13 +22,13 @@
  *
  */
 #include <boost/scoped_ptr.hpp>
-#include "../framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 #include "ClientExchange.h"
 #include "ClientMessage.h"
 #include "ClientQueue.h"
 #include "ResponseHandler.h"
-#include "../framing/ChannelAdapter.h"
-#include "../sys/Thread.h"
+#include "qpid/framing/ChannelAdapter.h"
+#include "qpid/sys/Thread.h"
 #include "AckMode.h"
 
 namespace qpid {
diff --git a/cpp/src/client/ClientConnection.cpp b/cpp/src/qpid/client/ClientConnection.cpp
index b053a45b0f..48616cf3d9 100644
--- a/cpp/src/client/ClientConnection.cpp
+++ b/cpp/src/qpid/client/ClientConnection.cpp
@@ -25,7 +25,7 @@
 #include "Connection.h"
 #include "ClientChannel.h"
 #include "ClientMessage.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include <iostream>
 #include <sstream>
 #include "MethodBodyInstances.h"
diff --git a/cpp/src/client/ClientExchange.cpp b/cpp/src/qpid/client/ClientExchange.cpp
index d5914beea2..d5914beea2 100644
--- a/cpp/src/client/ClientExchange.cpp
+++ b/cpp/src/qpid/client/ClientExchange.cpp
diff --git a/cpp/src/client/ClientExchange.h b/cpp/src/qpid/client/ClientExchange.h
index a8ac21fa9b..a8ac21fa9b 100644
--- a/cpp/src/client/ClientExchange.h
+++ b/cpp/src/qpid/client/ClientExchange.h
diff --git a/cpp/src/client/ClientMessage.h b/cpp/src/qpid/client/ClientMessage.h
index 35aed6c734..3de3a693b9 100644
--- a/cpp/src/client/ClientMessage.h
+++ b/cpp/src/qpid/client/ClientMessage.h
@@ -22,7 +22,7 @@
  *
  */
 #include <string>
-#include "../framing/BasicHeaderProperties.h"
+#include "qpid/framing/BasicHeaderProperties.h"
 
 namespace qpid {
 namespace client {
diff --git a/cpp/src/client/ClientQueue.cpp b/cpp/src/qpid/client/ClientQueue.cpp
index 613cf8d288..613cf8d288 100644
--- a/cpp/src/client/ClientQueue.cpp
+++ b/cpp/src/qpid/client/ClientQueue.cpp
diff --git a/cpp/src/client/ClientQueue.h b/cpp/src/qpid/client/ClientQueue.h
index b37a44b004..b37a44b004 100644
--- a/cpp/src/client/ClientQueue.h
+++ b/cpp/src/qpid/client/ClientQueue.h
diff --git a/cpp/src/client/Connection.h b/cpp/src/qpid/client/Connection.h
index 5e0b413dac..071a1d9446 100644
--- a/cpp/src/client/Connection.h
+++ b/cpp/src/qpid/client/Connection.h
@@ -23,11 +23,11 @@
  */
 #include <map>
 #include <string>
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include "ClientChannel.h"
 #include "Connector.h"
-#include "../sys/ShutdownHandler.h"
-#include "../sys/TimeoutHandler.h"
+#include "qpid/sys/ShutdownHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
 
 
 namespace qpid {
diff --git a/cpp/src/client/Connector.cpp b/cpp/src/qpid/client/Connector.cpp
index 566e58ec13..9230050ff7 100644
--- a/cpp/src/client/Connector.cpp
+++ b/cpp/src/qpid/client/Connector.cpp
@@ -19,8 +19,8 @@
  *
  */
 #include <iostream>
-#include "../QpidError.h"
-#include "../sys/Time.h"
+#include "qpid/QpidError.h"
+#include "qpid/sys/Time.h"
 #include "Connector.h"
 
 namespace qpid {
diff --git a/cpp/src/client/Connector.h b/cpp/src/qpid/client/Connector.h
index 928bfa2d14..c63a1ce8ac 100644
--- a/cpp/src/client/Connector.h
+++ b/cpp/src/qpid/client/Connector.h
@@ -22,16 +22,16 @@
 #define _Connector_
 
 
-#include "../framing/InputHandler.h"
-#include "../framing/OutputHandler.h"
-#include "../framing/InitiationHandler.h"
-#include "../framing/ProtocolInitiation.h"
-#include "../framing/ProtocolVersion.h"
-#include "../sys/ShutdownHandler.h"
-#include "../sys/TimeoutHandler.h"
-#include "../sys/Thread.h"
-#include "../sys/Monitor.h"
-#include "../sys/Socket.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/framing/ProtocolVersion.h"
+#include "qpid/sys/ShutdownHandler.h"
+#include "qpid/sys/TimeoutHandler.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Socket.h"
 
 namespace qpid {
 
diff --git a/cpp/src/client/IncomingMessage.cpp b/cpp/src/qpid/client/IncomingMessage.cpp
index eb5f2b6fae..059e644464 100644
--- a/cpp/src/client/IncomingMessage.cpp
+++ b/cpp/src/qpid/client/IncomingMessage.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "IncomingMessage.h"
-#include "../Exception.h"
+#include "qpid/Exception.h"
 #include "ClientMessage.h"
 #include <boost/format.hpp>
 
diff --git a/cpp/src/client/IncomingMessage.h b/cpp/src/qpid/client/IncomingMessage.h
index bc650dfbe1..7aa8e33df2 100644
--- a/cpp/src/client/IncomingMessage.h
+++ b/cpp/src/qpid/client/IncomingMessage.h
@@ -21,7 +21,7 @@
  * under the License.
  *
  */
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include <map>
 #include <queue>
 #include <vector>
diff --git a/cpp/src/client/MessageChannel.h b/cpp/src/qpid/client/MessageChannel.h
index 2fa387b7f7..a830a47986 100644
--- a/cpp/src/client/MessageChannel.h
+++ b/cpp/src/qpid/client/MessageChannel.h
@@ -19,8 +19,8 @@
  *
  */
 
-#include "../shared_ptr.h"
-#include "../sys/Runnable.h"
+#include "qpid/shared_ptr.h"
+#include "qpid/sys/Runnable.h"
 #include "AckMode.h"
 
 namespace qpid {
diff --git a/cpp/src/client/MessageListener.cpp b/cpp/src/qpid/client/MessageListener.cpp
index 68ebedeb0d..68ebedeb0d 100644
--- a/cpp/src/client/MessageListener.cpp
+++ b/cpp/src/qpid/client/MessageListener.cpp
diff --git a/cpp/src/client/MessageListener.h b/cpp/src/qpid/client/MessageListener.h
index 501862a3ef..501862a3ef 100644
--- a/cpp/src/client/MessageListener.h
+++ b/cpp/src/qpid/client/MessageListener.h
diff --git a/cpp/src/client/MessageMessageChannel.cpp b/cpp/src/qpid/client/MessageMessageChannel.cpp
index 8d0fdc3189..6ba5e00153 100644
--- a/cpp/src/client/MessageMessageChannel.cpp
+++ b/cpp/src/qpid/client/MessageMessageChannel.cpp
@@ -18,13 +18,13 @@
 #include <iostream>
 #include <boost/format.hpp>
 #include "MessageMessageChannel.h"
-#include "../framing/AMQMethodBody.h"
+#include "qpid/framing/AMQMethodBody.h"
 #include "ClientChannel.h"
 #include "ReturnedMessageHandler.h"
 #include "MessageListener.h"
-#include "../framing/FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 #include "Connection.h"
-#include "../shared_ptr.h"
+#include "qpid/shared_ptr.h"
 #include <boost/bind.hpp>
 
 namespace qpid {
diff --git a/cpp/src/client/MessageMessageChannel.h b/cpp/src/qpid/client/MessageMessageChannel.h
index 4c4721ce90..12c4786b81 100644
--- a/cpp/src/client/MessageMessageChannel.h
+++ b/cpp/src/qpid/client/MessageMessageChannel.h
@@ -21,7 +21,7 @@
 
 #include "MessageChannel.h"
 #include "IncomingMessage.h"
-#include "../sys/Monitor.h"
+#include "qpid/sys/Monitor.h"
 #include <boost/ptr_container/ptr_map.hpp>
 
 namespace qpid {
diff --git a/cpp/src/client/MethodBodyInstances.h b/cpp/src/qpid/client/MethodBodyInstances.h
index 57b9bf73ce..516ba6e4e3 100644
--- a/cpp/src/client/MethodBodyInstances.h
+++ b/cpp/src/qpid/client/MethodBodyInstances.h
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../framing/amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 
 #ifndef _MethodBodyInstances_h_
 #define _MethodBodyInstances_h_
diff --git a/cpp/src/client/ResponseHandler.cpp b/cpp/src/qpid/client/ResponseHandler.cpp
index ca0129d587..10ad5c6fa2 100644
--- a/cpp/src/client/ResponseHandler.cpp
+++ b/cpp/src/qpid/client/ResponseHandler.cpp
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include <boost/format.hpp>
 #include "ResponseHandler.h"
-#include "../framing/AMQMethodBody.h"
+#include "qpid/framing/AMQMethodBody.h"
 
 using namespace qpid::sys;
 using namespace qpid::framing;
diff --git a/cpp/src/client/ResponseHandler.h b/cpp/src/qpid/client/ResponseHandler.h
index 289a5dd994..e599e4c8d1 100644
--- a/cpp/src/client/ResponseHandler.h
+++ b/cpp/src/qpid/client/ResponseHandler.h
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "../shared_ptr.h"
-#include "../sys/Monitor.h"
+#include "qpid/shared_ptr.h"
+#include "qpid/sys/Monitor.h"
 
 #ifndef _ResponseHandler_
 #define _ResponseHandler_
diff --git a/cpp/src/client/ReturnedMessageHandler.cpp b/cpp/src/qpid/client/ReturnedMessageHandler.cpp
index 35d0b5c0a8..35d0b5c0a8 100644
--- a/cpp/src/client/ReturnedMessageHandler.cpp
+++ b/cpp/src/qpid/client/ReturnedMessageHandler.cpp
diff --git a/cpp/src/client/ReturnedMessageHandler.h b/cpp/src/qpid/client/ReturnedMessageHandler.h
index 8b42fc0764..8b42fc0764 100644
--- a/cpp/src/client/ReturnedMessageHandler.h
+++ b/cpp/src/qpid/client/ReturnedMessageHandler.h
diff --git a/cpp/src/doxygen_mainpage.h b/cpp/src/qpid/doxygen_mainpage.h
index b354238cd0..b354238cd0 100644
--- a/cpp/src/doxygen_mainpage.h
+++ b/cpp/src/qpid/doxygen_mainpage.h
diff --git a/cpp/src/framing/AMQBody.cpp b/cpp/src/qpid/framing/AMQBody.cpp
index a64d224a86..a64d224a86 100644
--- a/cpp/src/framing/AMQBody.cpp
+++ b/cpp/src/qpid/framing/AMQBody.cpp
diff --git a/cpp/src/framing/AMQBody.h b/cpp/src/qpid/framing/AMQBody.h
index eaa568c06a..eaa568c06a 100644
--- a/cpp/src/framing/AMQBody.h
+++ b/cpp/src/qpid/framing/AMQBody.h
diff --git a/cpp/src/framing/AMQContentBody.cpp b/cpp/src/qpid/framing/AMQContentBody.cpp
index 19d2e5714a..19d2e5714a 100644
--- a/cpp/src/framing/AMQContentBody.cpp
+++ b/cpp/src/qpid/framing/AMQContentBody.cpp
diff --git a/cpp/src/framing/AMQContentBody.h b/cpp/src/qpid/framing/AMQContentBody.h
index 6d4c1ef4b6..6d4c1ef4b6 100644
--- a/cpp/src/framing/AMQContentBody.h
+++ b/cpp/src/qpid/framing/AMQContentBody.h
diff --git a/cpp/src/framing/AMQDataBlock.h b/cpp/src/qpid/framing/AMQDataBlock.h
index 6ff61b185e..6ff61b185e 100644
--- a/cpp/src/framing/AMQDataBlock.h
+++ b/cpp/src/qpid/framing/AMQDataBlock.h
diff --git a/cpp/src/framing/AMQFrame.cpp b/cpp/src/qpid/framing/AMQFrame.cpp
index 8b79286107..6541a0e788 100644
--- a/cpp/src/framing/AMQFrame.cpp
+++ b/cpp/src/qpid/framing/AMQFrame.cpp
@@ -22,7 +22,7 @@
 #include <boost/format.hpp>
 
 #include "AMQFrame.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include "AMQRequestBody.h"
 #include "AMQResponseBody.h"
 
diff --git a/cpp/src/framing/AMQFrame.h b/cpp/src/qpid/framing/AMQFrame.h
index d31df4cc41..bef1b01df4 100644
--- a/cpp/src/framing/AMQFrame.h
+++ b/cpp/src/qpid/framing/AMQFrame.h
@@ -30,8 +30,8 @@
 #include "AMQHeaderBody.h"
 #include "AMQContentBody.h"
 #include "AMQHeartbeatBody.h"
-#include "../gen/AMQP_MethodVersionMap.h"
-#include "../gen/AMQP_HighestVersion.h"
+#include "qpid/framing/AMQP_MethodVersionMap.h"
+#include "qpid/framing/AMQP_HighestVersion.h"
 #include "Buffer.h"
 
 namespace qpid {
diff --git a/cpp/src/framing/AMQHeaderBody.cpp b/cpp/src/qpid/framing/AMQHeaderBody.cpp
index fccffd006c..4d3611eb40 100644
--- a/cpp/src/framing/AMQHeaderBody.cpp
+++ b/cpp/src/qpid/framing/AMQHeaderBody.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include "AMQHeaderBody.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include "BasicHeaderProperties.h"
 
 qpid::framing::AMQHeaderBody::AMQHeaderBody(int classId) : weight(0), contentSize(0){
diff --git a/cpp/src/framing/AMQHeaderBody.h b/cpp/src/qpid/framing/AMQHeaderBody.h
index 691ceeff73..691ceeff73 100644
--- a/cpp/src/framing/AMQHeaderBody.h
+++ b/cpp/src/qpid/framing/AMQHeaderBody.h
diff --git a/cpp/src/framing/AMQHeartbeatBody.cpp b/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
index 140ce2e794..140ce2e794 100644
--- a/cpp/src/framing/AMQHeartbeatBody.cpp
+++ b/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
diff --git a/cpp/src/framing/AMQHeartbeatBody.h b/cpp/src/qpid/framing/AMQHeartbeatBody.h
index 4c046b81a7..4c046b81a7 100644
--- a/cpp/src/framing/AMQHeartbeatBody.h
+++ b/cpp/src/qpid/framing/AMQHeartbeatBody.h
diff --git a/cpp/src/framing/AMQMethodBody.cpp b/cpp/src/qpid/framing/AMQMethodBody.cpp
index 0180d6c372..a7df0578c2 100644
--- a/cpp/src/framing/AMQMethodBody.cpp
+++ b/cpp/src/qpid/framing/AMQMethodBody.cpp
@@ -20,8 +20,8 @@
  */
 #include "AMQFrame.h"
 #include "AMQMethodBody.h"
-#include "../QpidError.h"
-#include "../gen/AMQP_MethodVersionMap.h"
+#include "qpid/QpidError.h"
+#include "qpid/framing/AMQP_MethodVersionMap.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/framing/AMQMethodBody.h b/cpp/src/qpid/framing/AMQMethodBody.h
index 2fb952ddbb..306c26cd27 100644
--- a/cpp/src/framing/AMQMethodBody.h
+++ b/cpp/src/qpid/framing/AMQMethodBody.h
@@ -25,7 +25,7 @@
 #include "amqp_types.h"
 #include "AMQBody.h"
 #include "Buffer.h"
-#include "../gen/AMQP_ServerOperations.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
 #include "MethodContext.h"
 
 namespace qpid {
diff --git a/cpp/src/framing/AMQRequestBody.cpp b/cpp/src/qpid/framing/AMQRequestBody.cpp
index bb5a448dc3..9e7b307a47 100644
--- a/cpp/src/framing/AMQRequestBody.cpp
+++ b/cpp/src/qpid/framing/AMQRequestBody.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "AMQRequestBody.h"
-#include "../gen/AMQP_MethodVersionMap.h"
+#include "qpid/framing/AMQP_MethodVersionMap.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/framing/AMQRequestBody.h b/cpp/src/qpid/framing/AMQRequestBody.h
index f21659a57a..691a4c8768 100644
--- a/cpp/src/framing/AMQRequestBody.h
+++ b/cpp/src/qpid/framing/AMQRequestBody.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "AMQMethodBody.h"
+#include "qpid/framing/AMQMethodBody.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/framing/AMQResponseBody.cpp b/cpp/src/qpid/framing/AMQResponseBody.cpp
index ad99ab32e0..4354a9c564 100644
--- a/cpp/src/framing/AMQResponseBody.cpp
+++ b/cpp/src/qpid/framing/AMQResponseBody.cpp
@@ -18,7 +18,7 @@
 
 #include "AMQFrame.h"
 #include "AMQResponseBody.h"
-#include "../gen/AMQP_MethodVersionMap.h"
+#include "qpid/framing/AMQP_MethodVersionMap.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/framing/AMQResponseBody.h b/cpp/src/qpid/framing/AMQResponseBody.h
index fa381baddd..fa381baddd 100644
--- a/cpp/src/framing/AMQResponseBody.h
+++ b/cpp/src/qpid/framing/AMQResponseBody.h
diff --git a/cpp/src/framing/BasicHeaderProperties.cpp b/cpp/src/qpid/framing/BasicHeaderProperties.cpp
index dfa5e1bc3f..dfa5e1bc3f 100644
--- a/cpp/src/framing/BasicHeaderProperties.cpp
+++ b/cpp/src/qpid/framing/BasicHeaderProperties.cpp
diff --git a/cpp/src/framing/BasicHeaderProperties.h b/cpp/src/qpid/framing/BasicHeaderProperties.h
index a6347b37fd..a6347b37fd 100644
--- a/cpp/src/framing/BasicHeaderProperties.h
+++ b/cpp/src/qpid/framing/BasicHeaderProperties.h
diff --git a/cpp/src/framing/BodyHandler.cpp b/cpp/src/qpid/framing/BodyHandler.cpp
index 3b389fb5ec..0405b39e5d 100644
--- a/cpp/src/framing/BodyHandler.cpp
+++ b/cpp/src/qpid/framing/BodyHandler.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include "BodyHandler.h"
 #include "AMQRequestBody.h"
 #include "AMQResponseBody.h"
diff --git a/cpp/src/framing/BodyHandler.h b/cpp/src/qpid/framing/BodyHandler.h
index cb3f0997b0..cb3f0997b0 100644
--- a/cpp/src/framing/BodyHandler.h
+++ b/cpp/src/qpid/framing/BodyHandler.h
diff --git a/cpp/src/framing/Buffer.cpp b/cpp/src/qpid/framing/Buffer.cpp
index 2a14e854d0..2a14e854d0 100644
--- a/cpp/src/framing/Buffer.cpp
+++ b/cpp/src/qpid/framing/Buffer.cpp
diff --git a/cpp/src/framing/Buffer.h b/cpp/src/qpid/framing/Buffer.h
index e1a3fb065a..e1a3fb065a 100644
--- a/cpp/src/framing/Buffer.h
+++ b/cpp/src/qpid/framing/Buffer.h
diff --git a/cpp/src/framing/ChannelAdapter.cpp b/cpp/src/qpid/framing/ChannelAdapter.cpp
index d16934a857..48a200c4e1 100644
--- a/cpp/src/framing/ChannelAdapter.cpp
+++ b/cpp/src/qpid/framing/ChannelAdapter.cpp
@@ -19,7 +19,7 @@
 
 #include "ChannelAdapter.h"
 #include "AMQFrame.h"
-#include "../Exception.h"
+#include "qpid/Exception.h"
 
 using boost::format;
 
diff --git a/cpp/src/framing/ChannelAdapter.h b/cpp/src/qpid/framing/ChannelAdapter.h
index 1b325495ff..75e4d26ab3 100644
--- a/cpp/src/framing/ChannelAdapter.h
+++ b/cpp/src/qpid/framing/ChannelAdapter.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "../shared_ptr.h"
+#include "qpid/shared_ptr.h"
 #include "BodyHandler.h"
 #include "Requester.h"
 #include "Responder.h"
diff --git a/cpp/src/framing/Correlator.cpp b/cpp/src/qpid/framing/Correlator.cpp
index 1c18f6b414..1c18f6b414 100644
--- a/cpp/src/framing/Correlator.cpp
+++ b/cpp/src/qpid/framing/Correlator.cpp
diff --git a/cpp/src/framing/Correlator.h b/cpp/src/qpid/framing/Correlator.h
index b3eb998149..35dd7514ae 100644
--- a/cpp/src/framing/Correlator.h
+++ b/cpp/src/qpid/framing/Correlator.h
@@ -19,8 +19,8 @@
  *
  */
 
-#include "../shared_ptr.h"
-#include "../framing/AMQResponseBody.h"
+#include "qpid/shared_ptr.h"
+#include "qpid/framing/AMQResponseBody.h"
 #include <boost/function.hpp>
 #include <map>
 
diff --git a/cpp/src/framing/FieldTable.cpp b/cpp/src/qpid/framing/FieldTable.cpp
index c4881a7c94..3eb4e849bc 100644
--- a/cpp/src/framing/FieldTable.cpp
+++ b/cpp/src/qpid/framing/FieldTable.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include "FieldTable.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include "Buffer.h"
 #include "Value.h"
 #include <assert.h>
diff --git a/cpp/src/framing/FieldTable.h b/cpp/src/qpid/framing/FieldTable.h
index 2be3e6d3ff..2be3e6d3ff 100644
--- a/cpp/src/framing/FieldTable.h
+++ b/cpp/src/qpid/framing/FieldTable.h
diff --git a/cpp/src/framing/FramingContent.cpp b/cpp/src/qpid/framing/FramingContent.cpp
index 1f8f77d129..813e6fb49b 100644
--- a/cpp/src/framing/FramingContent.cpp
+++ b/cpp/src/qpid/framing/FramingContent.cpp
@@ -22,7 +22,7 @@
 
 #include "Buffer.h"
 #include "FramingContent.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include <sstream>
 
 namespace qpid {
diff --git a/cpp/src/framing/FramingContent.h b/cpp/src/qpid/framing/FramingContent.h
index 876e90c905..876e90c905 100644
--- a/cpp/src/framing/FramingContent.h
+++ b/cpp/src/qpid/framing/FramingContent.h
diff --git a/cpp/src/framing/HeaderProperties.h b/cpp/src/qpid/framing/HeaderProperties.h
index ae8b796aa9..ae8b796aa9 100644
--- a/cpp/src/framing/HeaderProperties.h
+++ b/cpp/src/qpid/framing/HeaderProperties.h
diff --git a/cpp/src/framing/InitiationHandler.cpp b/cpp/src/qpid/framing/InitiationHandler.cpp
index eceeaf4abc..eceeaf4abc 100644
--- a/cpp/src/framing/InitiationHandler.cpp
+++ b/cpp/src/qpid/framing/InitiationHandler.cpp
diff --git a/cpp/src/framing/InitiationHandler.h b/cpp/src/qpid/framing/InitiationHandler.h
index 16a6b502e8..16a6b502e8 100644
--- a/cpp/src/framing/InitiationHandler.h
+++ b/cpp/src/qpid/framing/InitiationHandler.h
diff --git a/cpp/src/framing/InputHandler.h b/cpp/src/qpid/framing/InputHandler.h
index dc6814b849..dc6814b849 100644
--- a/cpp/src/framing/InputHandler.h
+++ b/cpp/src/qpid/framing/InputHandler.h
diff --git a/cpp/src/framing/MethodContext.cpp b/cpp/src/qpid/framing/MethodContext.cpp
index 73af73f8e5..73af73f8e5 100644
--- a/cpp/src/framing/MethodContext.cpp
+++ b/cpp/src/qpid/framing/MethodContext.cpp
diff --git a/cpp/src/framing/MethodContext.h b/cpp/src/qpid/framing/MethodContext.h
index 80e4c55d7e..80e4c55d7e 100644
--- a/cpp/src/framing/MethodContext.h
+++ b/cpp/src/qpid/framing/MethodContext.h
diff --git a/cpp/src/framing/OutputHandler.h b/cpp/src/qpid/framing/OutputHandler.h
index 9ffd4227d8..9ffd4227d8 100644
--- a/cpp/src/framing/OutputHandler.h
+++ b/cpp/src/qpid/framing/OutputHandler.h
diff --git a/cpp/src/framing/ProtocolInitiation.cpp b/cpp/src/qpid/framing/ProtocolInitiation.cpp
index a6d1b17f6e..a6d1b17f6e 100644
--- a/cpp/src/framing/ProtocolInitiation.cpp
+++ b/cpp/src/qpid/framing/ProtocolInitiation.cpp
diff --git a/cpp/src/framing/ProtocolInitiation.h b/cpp/src/qpid/framing/ProtocolInitiation.h
index adfdc8215d..adfdc8215d 100644
--- a/cpp/src/framing/ProtocolInitiation.h
+++ b/cpp/src/qpid/framing/ProtocolInitiation.h
diff --git a/cpp/src/framing/ProtocolVersion.cpp b/cpp/src/qpid/framing/ProtocolVersion.cpp
index 7a96bfa925..7a96bfa925 100644
--- a/cpp/src/framing/ProtocolVersion.cpp
+++ b/cpp/src/qpid/framing/ProtocolVersion.cpp
diff --git a/cpp/src/framing/ProtocolVersion.h b/cpp/src/qpid/framing/ProtocolVersion.h
index a2a755397b..a2a755397b 100644
--- a/cpp/src/framing/ProtocolVersion.h
+++ b/cpp/src/qpid/framing/ProtocolVersion.h
diff --git a/cpp/src/framing/ProtocolVersionException.cpp b/cpp/src/qpid/framing/ProtocolVersionException.cpp
index b68b3af1f9..b68b3af1f9 100644
--- a/cpp/src/framing/ProtocolVersionException.cpp
+++ b/cpp/src/qpid/framing/ProtocolVersionException.cpp
diff --git a/cpp/src/framing/ProtocolVersionException.h b/cpp/src/qpid/framing/ProtocolVersionException.h
index 0186ed7441..bd16804470 100644
--- a/cpp/src/framing/ProtocolVersionException.h
+++ b/cpp/src/qpid/framing/ProtocolVersionException.h
@@ -22,7 +22,7 @@
 #ifndef _ProtocolVersionException_
 #define _ProtocolVersionException_
 
-#include "../Exception.h"
+#include "qpid/Exception.h"
 #include "ProtocolVersion.h"
 #include <string>
 #include <vector>
diff --git a/cpp/src/framing/Proxy.cpp b/cpp/src/qpid/framing/Proxy.cpp
index 0b2a882a49..0b2a882a49 100644
--- a/cpp/src/framing/Proxy.cpp
+++ b/cpp/src/qpid/framing/Proxy.cpp
diff --git a/cpp/src/framing/Proxy.h b/cpp/src/qpid/framing/Proxy.h
index 8ed46ed748..8ed46ed748 100644
--- a/cpp/src/framing/Proxy.h
+++ b/cpp/src/qpid/framing/Proxy.h
diff --git a/cpp/src/framing/Requester.cpp b/cpp/src/qpid/framing/Requester.cpp
index 42cf4c392f..a675f0a61b 100644
--- a/cpp/src/framing/Requester.cpp
+++ b/cpp/src/qpid/framing/Requester.cpp
@@ -19,7 +19,7 @@
 #include <boost/format.hpp>
 
 #include "Requester.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/framing/Requester.h b/cpp/src/qpid/framing/Requester.h
index 65bdc9a5a1..65bdc9a5a1 100644
--- a/cpp/src/framing/Requester.h
+++ b/cpp/src/qpid/framing/Requester.h
diff --git a/cpp/src/framing/Responder.cpp b/cpp/src/qpid/framing/Responder.cpp
index e8c8135387..1b9c8a6c59 100644
--- a/cpp/src/framing/Responder.cpp
+++ b/cpp/src/qpid/framing/Responder.cpp
@@ -18,7 +18,7 @@
 #include <boost/format.hpp>
 
 #include "Responder.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 
 namespace qpid {
 namespace framing {
diff --git a/cpp/src/framing/Responder.h b/cpp/src/qpid/framing/Responder.h
index 0e1785256b..0e1785256b 100644
--- a/cpp/src/framing/Responder.h
+++ b/cpp/src/qpid/framing/Responder.h
diff --git a/cpp/src/framing/Value.cpp b/cpp/src/qpid/framing/Value.cpp
index b5016f3dd0..3e3cc4cbd5 100644
--- a/cpp/src/framing/Value.cpp
+++ b/cpp/src/qpid/framing/Value.cpp
@@ -21,7 +21,7 @@
 #include "Value.h"
 #include "Buffer.h"
 #include "FieldTable.h"
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include <sstream>
 
 namespace qpid {
diff --git a/cpp/src/framing/Value.h b/cpp/src/qpid/framing/Value.h
index a6cff8ec88..a6cff8ec88 100644
--- a/cpp/src/framing/Value.h
+++ b/cpp/src/qpid/framing/Value.h
diff --git a/cpp/src/framing/amqp_framing.h b/cpp/src/qpid/framing/amqp_framing.h
index c99dd2bb64..888c6a7382 100644
--- a/cpp/src/framing/amqp_framing.h
+++ b/cpp/src/qpid/framing/amqp_framing.h
@@ -26,7 +26,7 @@
 #include "AMQHeaderBody.h"
 #include "AMQContentBody.h"
 #include "AMQHeartbeatBody.h"
-#include "../gen/AMQP_MethodVersionMap.h"
+#include "qpid/framing/AMQP_MethodVersionMap.h"
 #include "InputHandler.h"
 #include "OutputHandler.h"
 #include "InitiationHandler.h"
diff --git a/cpp/src/framing/amqp_types.h b/cpp/src/qpid/framing/amqp_types.h
index f0bd0ce427..f0bd0ce427 100644
--- a/cpp/src/framing/amqp_types.h
+++ b/cpp/src/qpid/framing/amqp_types.h
diff --git a/cpp/src/framing/amqp_types_full.h b/cpp/src/qpid/framing/amqp_types_full.h
index 6a24a99d38..6a24a99d38 100644
--- a/cpp/src/framing/amqp_types_full.h
+++ b/cpp/src/qpid/framing/amqp_types_full.h
diff --git a/cpp/src/shared_ptr.h b/cpp/src/qpid/shared_ptr.h
index eb5f3f906a..eb5f3f906a 100644
--- a/cpp/src/shared_ptr.h
+++ b/cpp/src/qpid/shared_ptr.h
diff --git a/cpp/src/sys/Acceptor.h b/cpp/src/qpid/sys/Acceptor.h
index f8edb3cef7..5e624a956e 100644
--- a/cpp/src/sys/Acceptor.h
+++ b/cpp/src/qpid/sys/Acceptor.h
@@ -23,7 +23,7 @@
  */
 
 #include <stdint.h>
-#include "../SharedObject.h"
+#include "qpid/SharedObject.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/sys/AtomicCount.h b/cpp/src/qpid/sys/AtomicCount.h
index 63670cbf00..63670cbf00 100644
--- a/cpp/src/sys/AtomicCount.h
+++ b/cpp/src/qpid/sys/AtomicCount.h
diff --git a/cpp/src/sys/Condition.h b/cpp/src/qpid/sys/Condition.h
index 455b179683..455b179683 100644
--- a/cpp/src/sys/Condition.h
+++ b/cpp/src/qpid/sys/Condition.h
diff --git a/cpp/src/sys/ConnectionInputHandler.h b/cpp/src/qpid/sys/ConnectionInputHandler.h
index df9bf55f89..2bf3f66ec2 100644
--- a/cpp/src/sys/ConnectionInputHandler.h
+++ b/cpp/src/qpid/sys/ConnectionInputHandler.h
@@ -21,9 +21,9 @@
 #ifndef _ConnectionInputHandler_
 #define _ConnectionInputHandler_
 
-#include "../framing/InputHandler.h"
-#include "../framing/InitiationHandler.h"
-#include "../framing/ProtocolInitiation.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
 #include "TimeoutHandler.h"
 
 namespace qpid {
diff --git a/cpp/src/sys/ConnectionInputHandlerFactory.h b/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
index af7d411928..af7d411928 100644
--- a/cpp/src/sys/ConnectionInputHandlerFactory.h
+++ b/cpp/src/qpid/sys/ConnectionInputHandlerFactory.h
diff --git a/cpp/src/sys/ConnectionOutputHandler.h b/cpp/src/qpid/sys/ConnectionOutputHandler.h
index 81bbbd1a17..8436bea599 100644
--- a/cpp/src/sys/ConnectionOutputHandler.h
+++ b/cpp/src/qpid/sys/ConnectionOutputHandler.h
@@ -21,7 +21,7 @@
 #ifndef _ConnectionOutputHandler_
 #define _ConnectionOutputHandler_
 
-#include "../framing/OutputHandler.h"
+#include "qpid/framing/OutputHandler.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/sys/Module.h b/cpp/src/qpid/sys/Module.h
index 224e1b9c1b..cb31018fdc 100644
--- a/cpp/src/sys/Module.h
+++ b/cpp/src/qpid/sys/Module.h
@@ -23,7 +23,7 @@
  */
 #include <boost/noncopyable.hpp>
 #include <iostream>
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/sys/Monitor.h b/cpp/src/qpid/sys/Monitor.h
index 1b8ae1a527..1b8ae1a527 100644
--- a/cpp/src/sys/Monitor.h
+++ b/cpp/src/qpid/sys/Monitor.h
diff --git a/cpp/src/sys/Mutex.h b/cpp/src/qpid/sys/Mutex.h
index 825b519039..825b519039 100644
--- a/cpp/src/sys/Mutex.h
+++ b/cpp/src/qpid/sys/Mutex.h
diff --git a/cpp/src/sys/ProducerConsumer.cpp b/cpp/src/qpid/sys/ProducerConsumer.cpp
index 1cf2a79784..56b4c0cdb9 100644
--- a/cpp/src/sys/ProducerConsumer.cpp
+++ b/cpp/src/qpid/sys/ProducerConsumer.cpp
@@ -17,7 +17,7 @@
  */
 
 
-#include "../QpidError.h"
+#include "qpid/QpidError.h"
 #include "ScopedIncrement.h"
 #include "ProducerConsumer.h"
 
diff --git a/cpp/src/sys/ProducerConsumer.h b/cpp/src/qpid/sys/ProducerConsumer.h
index 144f4ed600..fc6434ef48 100644
--- a/cpp/src/sys/ProducerConsumer.h
+++ b/cpp/src/qpid/sys/ProducerConsumer.h
@@ -19,7 +19,7 @@
  *
  */
 #include <boost/noncopyable.hpp>
-#include "../Exception.h"
+#include "qpid/Exception.h"
 #include "Monitor.h"
 
 namespace qpid {
diff --git a/cpp/src/sys/Runnable.cpp b/cpp/src/qpid/sys/Runnable.cpp
index 30122c682f..30122c682f 100644
--- a/cpp/src/sys/Runnable.cpp
+++ b/cpp/src/qpid/sys/Runnable.cpp
diff --git a/cpp/src/sys/Runnable.h b/cpp/src/qpid/sys/Runnable.h
index fb3927c612..fb3927c612 100644
--- a/cpp/src/sys/Runnable.h
+++ b/cpp/src/qpid/sys/Runnable.h
diff --git a/cpp/src/sys/ScopedIncrement.h b/cpp/src/qpid/sys/ScopedIncrement.h
index f14461ddaf..f14461ddaf 100644
--- a/cpp/src/sys/ScopedIncrement.h
+++ b/cpp/src/qpid/sys/ScopedIncrement.h
diff --git a/cpp/src/sys/ShutdownHandler.h b/cpp/src/qpid/sys/ShutdownHandler.h
index 88baecb5b6..88baecb5b6 100644
--- a/cpp/src/sys/ShutdownHandler.h
+++ b/cpp/src/qpid/sys/ShutdownHandler.h
diff --git a/cpp/src/sys/Socket.h b/cpp/src/qpid/sys/Socket.h
index ea03222aed..ea03222aed 100644
--- a/cpp/src/sys/Socket.h
+++ b/cpp/src/qpid/sys/Socket.h
diff --git a/cpp/src/sys/Thread.h b/cpp/src/qpid/sys/Thread.h
index e52f2a1b3e..e52f2a1b3e 100644
--- a/cpp/src/sys/Thread.h
+++ b/cpp/src/qpid/sys/Thread.h
diff --git a/cpp/src/sys/ThreadSafeQueue.h b/cpp/src/qpid/sys/ThreadSafeQueue.h
index ce8b0b1bd9..8f11c42051 100644
--- a/cpp/src/sys/ThreadSafeQueue.h
+++ b/cpp/src/qpid/sys/ThreadSafeQueue.h
@@ -21,7 +21,7 @@
 
 #include <deque>
 #include "ProducerConsumer.h"
-#include "../Exception.h"
+#include "qpid/Exception.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/sys/Time.cpp b/cpp/src/qpid/sys/Time.cpp
index ad6185b966..ad6185b966 100644
--- a/cpp/src/sys/Time.cpp
+++ b/cpp/src/qpid/sys/Time.cpp
diff --git a/cpp/src/sys/Time.h b/cpp/src/qpid/sys/Time.h
index 47609d51df..47609d51df 100644
--- a/cpp/src/sys/Time.h
+++ b/cpp/src/qpid/sys/Time.h
diff --git a/cpp/src/sys/TimeoutHandler.h b/cpp/src/qpid/sys/TimeoutHandler.h
index 0c10709bbf..0c10709bbf 100644
--- a/cpp/src/sys/TimeoutHandler.h
+++ b/cpp/src/qpid/sys/TimeoutHandler.h
diff --git a/cpp/src/sys/apr/APRAcceptor.cpp b/cpp/src/qpid/sys/apr/APRAcceptor.cpp
index b2535d9e30..dc021d2a3f 100644
--- a/cpp/src/sys/apr/APRAcceptor.cpp
+++ b/cpp/src/qpid/sys/apr/APRAcceptor.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "../Acceptor.h"
-#include "../ConnectionInputHandlerFactory.h"
+#include "qpid/sys/Acceptor.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
 #include "LFProcessor.h"
 #include "LFSessionContext.h"
 #include "APRBase.h"
diff --git a/cpp/src/sys/apr/APRBase.cpp b/cpp/src/qpid/sys/apr/APRBase.cpp
index 01c8246c91..ba7dfc08d4 100644
--- a/cpp/src/sys/apr/APRBase.cpp
+++ b/cpp/src/qpid/sys/apr/APRBase.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <iostream>
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 #include "APRBase.h"
 
 using namespace qpid::sys;
diff --git a/cpp/src/sys/apr/APRBase.h b/cpp/src/qpid/sys/apr/APRBase.h
index e9dc085c3b..c6b1854fb1 100644
--- a/cpp/src/sys/apr/APRBase.h
+++ b/cpp/src/qpid/sys/apr/APRBase.h
@@ -24,7 +24,7 @@
 #include <string>
 #include <apr_thread_mutex.h>
 #include <apr_errno.h>
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/sys/apr/APRPool.cpp b/cpp/src/qpid/sys/apr/APRPool.cpp
index e8b71f6e8a..e8b71f6e8a 100644
--- a/cpp/src/sys/apr/APRPool.cpp
+++ b/cpp/src/qpid/sys/apr/APRPool.cpp
diff --git a/cpp/src/sys/apr/APRPool.h b/cpp/src/qpid/sys/apr/APRPool.h
index da7661fcfa..da7661fcfa 100644
--- a/cpp/src/sys/apr/APRPool.h
+++ b/cpp/src/qpid/sys/apr/APRPool.h
diff --git a/cpp/src/sys/apr/APRSocket.cpp b/cpp/src/qpid/sys/apr/APRSocket.cpp
index 96dbd132a1..96dbd132a1 100644
--- a/cpp/src/sys/apr/APRSocket.cpp
+++ b/cpp/src/qpid/sys/apr/APRSocket.cpp
diff --git a/cpp/src/sys/apr/APRSocket.h b/cpp/src/qpid/sys/apr/APRSocket.h
index 323500e61a..30a3be2746 100644
--- a/cpp/src/sys/apr/APRSocket.h
+++ b/cpp/src/qpid/sys/apr/APRSocket.h
@@ -22,7 +22,7 @@
 #define _APRSocket_
 
 #include <apr_network_io.h>
-#include "../../framing/Buffer.h"
+#include "qpid/framing/Buffer.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/sys/apr/LFProcessor.cpp b/cpp/src/qpid/sys/apr/LFProcessor.cpp
index 691af97c70..0d8ac425fe 100644
--- a/cpp/src/sys/apr/LFProcessor.cpp
+++ b/cpp/src/qpid/sys/apr/LFProcessor.cpp
@@ -19,7 +19,7 @@
  *
  */
 #include <sstream>
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 #include "LFProcessor.h"
 #include "APRBase.h"
 #include "LFSessionContext.h"
diff --git a/cpp/src/sys/apr/LFProcessor.h b/cpp/src/qpid/sys/apr/LFProcessor.h
index 62f6536bde..38d0b2787f 100644
--- a/cpp/src/sys/apr/LFProcessor.h
+++ b/cpp/src/qpid/sys/apr/LFProcessor.h
@@ -24,9 +24,9 @@
 #include <apr_poll.h>
 #include <iostream>
 #include <vector>
-#include "../Monitor.h"
-#include "../Runnable.h"
-#include "../Thread.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Runnable.h"
+#include "qpid/sys/Thread.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/sys/apr/LFSessionContext.cpp b/cpp/src/qpid/sys/apr/LFSessionContext.cpp
index a3616d80a4..4f5fcb269e 100644
--- a/cpp/src/sys/apr/LFSessionContext.cpp
+++ b/cpp/src/qpid/sys/apr/LFSessionContext.cpp
@@ -20,7 +20,7 @@
  */
 #include "LFSessionContext.h"
 #include "APRBase.h"
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 #include <assert.h>
 
 using namespace qpid::sys;
diff --git a/cpp/src/sys/apr/LFSessionContext.h b/cpp/src/qpid/sys/apr/LFSessionContext.h
index 99aa39bd6e..ed97b23645 100644
--- a/cpp/src/sys/apr/LFSessionContext.h
+++ b/cpp/src/qpid/sys/apr/LFSessionContext.h
@@ -27,11 +27,11 @@
 #include <apr_poll.h>
 #include <apr_time.h>
 
-#include "../../framing/AMQFrame.h"
-#include "../../framing/Buffer.h"
-#include "../Monitor.h"
-#include "../ConnectionOutputHandler.h"
-#include "../ConnectionInputHandler.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
+#include "qpid/sys/ConnectionInputHandler.h"
 
 #include "APRSocket.h"
 #include "LFProcessor.h"
diff --git a/cpp/src/sys/apr/Socket.cpp b/cpp/src/qpid/sys/apr/Socket.cpp
index 1b9c980441..8cd98161d2 100644
--- a/cpp/src/sys/apr/Socket.cpp
+++ b/cpp/src/qpid/sys/apr/Socket.cpp
@@ -20,7 +20,7 @@
  */
 
 
-#include "../Socket.h"
+#include "qpid/sys/Socket.h"
 #include "APRBase.h"
 #include "APRPool.h"
 
diff --git a/cpp/src/sys/apr/Thread.cpp b/cpp/src/qpid/sys/apr/Thread.cpp
index 67d2853d9f..0f9aeca186 100644
--- a/cpp/src/sys/apr/Thread.cpp
+++ b/cpp/src/qpid/sys/apr/Thread.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "../Thread.h"
+#include "qpid/sys/Thread.h"
 
 using namespace qpid::sys;
 using qpid::sys::Runnable;
diff --git a/cpp/src/sys/posix/EventChannel.cpp b/cpp/src/qpid/sys/posix/EventChannel.cpp
index 1d584d6318..8dc736ed0b 100644
--- a/cpp/src/sys/posix/EventChannel.cpp
+++ b/cpp/src/qpid/sys/posix/EventChannel.cpp
@@ -31,8 +31,8 @@
 #include <boost/ptr_container/ptr_map.hpp>
 #include <boost/current_function.hpp>
 
-#include "../../QpidError.h"
-#include "../Monitor.h"
+#include "qpid/QpidError.h"
+#include "qpid/sys/Monitor.h"
 
 #include "check.h"
 #include "EventChannel.h"
diff --git a/cpp/src/sys/posix/EventChannel.h b/cpp/src/qpid/sys/posix/EventChannel.h
index 4177839d00..f465580996 100644
--- a/cpp/src/sys/posix/EventChannel.h
+++ b/cpp/src/qpid/sys/posix/EventChannel.h
@@ -19,8 +19,8 @@
  *
  */
 
-#include "../../SharedObject.h"
-#include "../../ExceptionHolder.h"
+#include "qpid/SharedObject.h"
+#include "qpid/ExceptionHolder.h"
 #include <boost/function.hpp>
 #include <memory>
 
diff --git a/cpp/src/sys/posix/EventChannelAcceptor.cpp b/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp
index 94dda99d78..2676985cc6 100644
--- a/cpp/src/sys/posix/EventChannelAcceptor.cpp
+++ b/cpp/src/qpid/sys/posix/EventChannelAcceptor.cpp
@@ -26,14 +26,14 @@
 #include <boost/bind.hpp>
 #include <boost/scoped_ptr.hpp>
 
-#include "../ConnectionOutputHandler.h"
-#include "../ConnectionInputHandler.h"
-#include "../ConnectionInputHandlerFactory.h"
-#include "../Acceptor.h"
-#include "../Socket.h"
-#include "../../framing/Buffer.h"
-#include "../../framing/AMQFrame.h"
-#include "../../Exception.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/sys/Acceptor.h"
+#include "qpid/sys/Socket.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/Exception.h"
 
 #include "EventChannelConnection.h"
 
diff --git a/cpp/src/sys/posix/EventChannelConnection.cpp b/cpp/src/qpid/sys/posix/EventChannelConnection.cpp
index cb6506bdde..9a7d53fa8a 100644
--- a/cpp/src/sys/posix/EventChannelConnection.cpp
+++ b/cpp/src/qpid/sys/posix/EventChannelConnection.cpp
@@ -22,8 +22,8 @@
 #include <boost/assert.hpp>
 
 #include "EventChannelConnection.h"
-#include "../ConnectionInputHandlerFactory.h"
-#include "../../QpidError.h"
+#include "qpid/sys/ConnectionInputHandlerFactory.h"
+#include "qpid/QpidError.h"
 
 using namespace std;
 using namespace qpid;
diff --git a/cpp/src/sys/posix/EventChannelConnection.h b/cpp/src/qpid/sys/posix/EventChannelConnection.h
index 0c1eeff087..bd010a4240 100644
--- a/cpp/src/sys/posix/EventChannelConnection.h
+++ b/cpp/src/qpid/sys/posix/EventChannelConnection.h
@@ -22,11 +22,11 @@
 #include <boost/ptr_container/ptr_deque.hpp>
 
 #include "EventChannelThreads.h"
-#include "../Monitor.h"
-#include "../ConnectionOutputHandler.h"
-#include "../ConnectionInputHandler.h"
-#include "../AtomicCount.h"
-#include "../../framing/AMQFrame.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
+#include "qpid/sys/ConnectionInputHandler.h"
+#include "qpid/sys/AtomicCount.h"
+#include "qpid/framing/AMQFrame.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/sys/posix/EventChannelThreads.cpp b/cpp/src/qpid/sys/posix/EventChannelThreads.cpp
index 90caf901b1..ec58a03671 100644
--- a/cpp/src/sys/posix/EventChannelThreads.cpp
+++ b/cpp/src/qpid/sys/posix/EventChannelThreads.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "EventChannelThreads.h"
-#include "../Runnable.h"
+#include "qpid/sys/Runnable.h"
 #include <iostream>
 using namespace std;
 #include <boost/bind.hpp>
diff --git a/cpp/src/sys/posix/EventChannelThreads.h b/cpp/src/qpid/sys/posix/EventChannelThreads.h
index eb8b7cf287..245cefe585 100644
--- a/cpp/src/sys/posix/EventChannelThreads.h
+++ b/cpp/src/qpid/sys/posix/EventChannelThreads.h
@@ -20,11 +20,11 @@
  */
 #include <vector>
 
-#include "../../Exception.h"
-#include "../Time.h"
-#include "../Monitor.h"
-#include "../Thread.h"
-#include "../AtomicCount.h"
+#include "qpid/Exception.h"
+#include "qpid/sys/Time.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/Thread.h"
+#include "qpid/sys/AtomicCount.h"
 #include "EventChannel.h"
 
 namespace qpid {
diff --git a/cpp/src/sys/posix/PosixAcceptor.cpp b/cpp/src/qpid/sys/posix/PosixAcceptor.cpp
index 6ac0c2b11b..b5f6c6ee83 100644
--- a/cpp/src/sys/posix/PosixAcceptor.cpp
+++ b/cpp/src/qpid/sys/posix/PosixAcceptor.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include "../Acceptor.h"
-#include "../../Exception.h"
+#include "qpid/sys/Acceptor.h"
+#include "qpid/Exception.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/sys/posix/Socket.cpp b/cpp/src/qpid/sys/posix/Socket.cpp
index 6d6ac7f49c..e9bd2eeb6b 100644
--- a/cpp/src/sys/posix/Socket.cpp
+++ b/cpp/src/qpid/sys/posix/Socket.cpp
@@ -26,9 +26,9 @@
 
 #include <boost/format.hpp>
 
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 #include "check.h"
-#include "../Socket.h"
+#include "qpid/sys/Socket.h"
 
 using namespace qpid::sys;
 
diff --git a/cpp/src/sys/posix/Thread.cpp b/cpp/src/qpid/sys/posix/Thread.cpp
index 5b8d9e2180..fc85e35028 100644
--- a/cpp/src/sys/posix/Thread.cpp
+++ b/cpp/src/qpid/sys/posix/Thread.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "../Thread.h"
+#include "qpid/sys/Thread.h"
 
 void* qpid::sys::Thread::runRunnable(void* p)
 {
diff --git a/cpp/src/sys/posix/check.cpp b/cpp/src/qpid/sys/posix/check.cpp
index 408679caa8..408679caa8 100644
--- a/cpp/src/sys/posix/check.cpp
+++ b/cpp/src/qpid/sys/posix/check.cpp
diff --git a/cpp/src/sys/posix/check.h b/cpp/src/qpid/sys/posix/check.h
index 099044afa3..fe53321e27 100644
--- a/cpp/src/sys/posix/check.h
+++ b/cpp/src/qpid/sys/posix/check.h
@@ -24,7 +24,7 @@
 
 #include <cerrno>
 #include <string>
-#include "../../QpidError.h"
+#include "qpid/QpidError.h"
 
 namespace qpid {
 namespace sys {
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>