Build system reorg, see README and Makefile comments for details.

git-svn-id: https://svn.apache.org/repos/asf/incubator/qpid/trunk@464494 13f79535-47bb-0310-9956-ffa450edef68
author: Alan Conway <aconway@apache.org> 2006-10-16 13:50:26 +0000
committer: Alan Conway <aconway@apache.org> 2006-10-16 13:50:26 +0000
commit: c0e2b3586a64acbd2f2a46e3b79384cab76e6ddd (patch)
tree: 8d92c6051648f0ed8f1e1f528d97a3c02da4855e /qpid
parent: 39cad9398e213a4ec5678d21edcca17dba39871f (diff)
download: qpid-python-c0e2b3586a64acbd2f2a46e3b79384cab76e6ddd.tar.gz
192 files changed, 602 insertions, 935 deletions
diff --git a/qpid/cpp/DESIGN b/qpid/cpp/DESIGN
index 476fd42bfa..7e9ba6755c 100644
--- a/qpid/cpp/DESIGN
+++ b/qpid/cpp/DESIGN
@@ -1,37 +1,27 @@
 Qpid C++ AMQP implementation
 =============================
 
-The following is a brief description of the logical design of the
-Qpid C++ code. 
+= Project layout =
 
-Layout
+For Build system design see comment at start of Makefile.
 
-There are three top level modules. The first two, client and broker,
-containi the code required for an AMQP client and an AMQP broker
-respectively.  The third, common, contains code that is common to both
-client and broker implementations. [Note that at present only the
-client has been started].
+Project contains:
+ * Client library (lib/libqpid_client): src/qpid/client
+ * Broker library (lib/libqpid_broker): src/qpid/broker
+ * Common classes
+  * src/qpid/concurrent: concurrecy 
+  * src/qpid/framing: wire encoding/decoding
+  * src/qpid/io: reading/writing 
+  * src/qpid/Exception.cpp, QpidError.cpp: Exception classes.
+ * Qpid Daemon (bin/qpidd): src/qpidd.cpp
 
-Within the common module there are currently four sub-modules.  The
-largest of these is framing, containing the definitions of classes
-corresponding to key AMQP concepts such as frames, content & header
-bodies, particular method bodies etc as well as some interfaces and
-utilities used in the encoding and decoding of the wire protocol.
+Unit tests in test/unit: each *Test.cpp builds a CppUnit plugin.
 
-Two of the other sub-modules in common, io and concurrent, provide
-abstractions of core io and concurrency constructs used in the client
-and broker code.  The intention is to allow these to be implemented in
-different ways.interaction with the wire protocol. At present the
-implementation of the io and concurrency abstractions is based on APR
-(Apache Portable Runtime).  [Note: the io module currently only
-contains the abstractions as seen from the client - the Connector. It
-will in due time likely have the analogous broker-side abstraction -
-the Acceptor].
+Client tests in test/client: each *.cpp builds a test executable.
 
-The final common sub-module is error, containing a simple exception
-definition used in all the error handling.
+Test utilities: test/include
 
-Client Design
+= Client Design =
 
 The client module is primarily concerned with presenting the
 functionality offered by AMQP to users through a simple API that
diff --git a/qpid/cpp/Makefile b/qpid/cpp/Makefile
index 529ac1568f..586a934cce 100644
--- a/qpid/cpp/Makefile
+++ b/qpid/cpp/Makefile
@@ -13,37 +13,125 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+# ----------------------------------------------------------------
 #
-# Master make file for c++ Qpid project (AMQP)
+# Makefile for Qpid C++ project.
+# 
+# Build system principles
+#  * Single Makefile (see http://www.apache.org/licenses/LICENSE-2.0)
+#  * Build from directories, no explicit source lists in Makefile.
+#  * Corresponding .cpp and .h files in same directory for easy editing.
+#  * Source directory structure mirrors C++ namespaces.
 #
-# Calls the makefiles in the various subdirectories in order to
-# build them in the correct sequence.
+# Source directories:
+#  * src/ -  .h and .cpp source files, directories mirror namespaces.
+#  * test/ 
+#   * unit/ - unit tests (cppunit plugins), directories mirror namespaces.
+#   * include/ - .h files used by tests
+#   * client/ - sources for client test executables.
+#  * etc/ - Non-c++ resources, e.g. stylesheets.
+#  * gen/ - generated code
 #
+# Output directories: 
+#  * gen/ - (created by make) generated code 
+#  * bin/ lib/ - exes & libraries.
+#
+# NOTE: always use := rather than = unless you have a specific need
+# for delayed evaluation. See the link for details.
+#
+
+include options.mk
+
+.PHONY: test all unittest pythontest
+
+test: all unittest pythontest
+
+## Generaged code
+
+SPEC        := $(CURDIR)/../specs/amqp-8.0.xml
+XSL         := code_gen.xsl framing.xsl
+STYLESHEETS := $(XSL:%=$(CURDIR)/etc/stylesheets/%)
+TRANSFORM   := java -jar $(CURDIR)/tools/saxon8.jar -o results.out $(SPEC)
+
+.PHONY: generate 
+
+generate: gen/timestamp
+
+# Restart make if code is re-generated to get proper dependencies.
+# Remove "clean" to avoid infinite loop.
+REMAKE := exec $(MAKE) $(MAKECMDGOALS:clean=)
+gen/timestamp: $(wildcard etc/stylesheets/*.xsl) $(SPEC)
+	mkdir -p gen/qpid/framing
+	echo > gen/timestamp
+	cd gen/qpid/framing && for s in $(STYLESHEETS) ; do $(TRANSFORM) $$s ;	done
+	@echo "*** Re-generated code, re-starting make ***"
+	$(REMAKE)
+
+gen $(wildcard gen/qpid/framing/*.cpp): gen/timestamp
+
+## Libraries
+
+# Library command, late evaluated for $@
+LIB_CMD = $(CXX) -shared -o $@ $(LDFLAGS) $(CXXFLAGS) -lapr-1 
+
+# Common library.
+COMMON_LIB  := lib/libqpid_common.so.1.0
+COMMON_DIRS := qpid/concurrent qpid/framing qpid/io qpid
+COMMON_SRC  := $(wildcard gen/qpid/framing/*.cpp $(COMMON_DIRS:%=src/%/*.cpp))
+$(COMMON_LIB): generate $(COMMON_SRC:.cpp=.o)
+	$(LIB_CMD) $(COMMON_SRC:.cpp=.o)
+all: $(COMMON_LIB)
+UNITTESTS := $(UNITTESTS) $(wildcard $(COMMON_DIRS:%=test/unit/%/*Test.cpp))
+
+# Client library.
+CLIENT_LIB  := lib/libqpid_client.so.1.0
+CLIENT_SRC  := $(wildcard src/qpid/client/*.cpp)
+$(CLIENT_LIB): $(CLIENT_SRC:.cpp=.o) $(COMMON_LIB)
+	$(LIB_CMD) $^
+all: $(CLIENT_LIB) 
+UNITTESTS := $(UNITTESTS) $(wildcard $(COMMON_DIRS:%=test/unit/%/*Test.cpp))
+
+# Broker library.
+BROKER_LIB  := lib/libqpid_broker.so.1.0
+BROKER_SRC  := $(wildcard src/qpid/broker/*.cpp)
+$(BROKER_LIB): $(BROKER_SRC:.cpp=.o)  $(COMMON_LIB)
+	$(LIB_CMD) $^
+all: $(BROKER_LIB)
+UNITTESTS := $(UNITTESTS) $(wildcard test/unit/qpid/broker/*Test.cpp)
+
+# Implicit rule for unit test plugin libraries.
+%Test.so: %Test.cpp 
+	$(CXX) -shared -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 -lcppunit $(COMMON_LIB) $(BROKER_LIB)
+
+## Client tests
 
-UNITTESTS=$(wildcard common/*/test/*.so broker/test/*.so)
-SUBDIRS=common broker qpidd client
+all: $(wildcard test/client/*.cpp:.cpp=)
+test/client/%: test/client/%.cpp
+	$(CXX) -o $@ $< $($(LIB)_FLAGS) -Itest/include $(CXXFLAGS) $(LDFLAGS) -lapr-1 $(LINK_WITH_$(LIB)) $(LINK_WITH_$(LIB)_DEPS)
 
-.PHONY: all test unittest pythontest runtests clean doxygen
+## Daemon executable
 
-test:   all runtests
+bin/qpidd: src/qpidd.o $(COMMON_LIB) $(BROKER_LIB)
+	$(CXX) -o $@ $(LDFLAGS) -lapr-1 $^ 
+all: bin/qpidd
 
-unittest: 
-	DllPlugInTester -c -b $(UNITTESTS)
+## Run unit tests.
+unittest: $(UNITTESTS:.cpp=.so)
+	DllPlugInTester -c -b $(UNITTESTS:.cpp=.so)
 
-pythontest:
-	bin/qpidd >> qpidd.log &
+## Run python tests
+pythontest: bin/qpidd
+	bin/qpidd > qpidd.log &
 	cd ../python ; ./run-tests -v -I cpp_failing.txt	
 
-runtests:
-	$(MAKE) -k unittest pythontest
+## Doxygen documentation.
+doxygen: doxygen/doxygen.cfg $(SOURCES)
+	cd doxygen && doxygen doxygen.cfg
 
-all:
-	@for DIR in $(SUBDIRS) ; do $(MAKE) -C $$DIR all ; done
+## Cleanup
+clean::
+	rm -f bin/* lib/* qpidd.log
+	rm -rf gen
+	rm -f `find src test -name '*.o' -o -name '*.d' -o -name '*.so'` 
 
-clean:
-	@for DIR in $(SUBDIRS) ; do $(MAKE) -C $$DIR clean ; done
-	@$(MAKE) -C doxygen clean
-	-@rm qpidd.log 
 
-doxygen:
-	@$(MAKE) -C doxygen all
diff --git a/qpid/cpp/README b/qpid/cpp/README
index edd80a1fbc..47f1590c7a 100644
--- a/qpid/cpp/README
+++ b/qpid/cpp/README
@@ -1,5 +1,7 @@
 = Developer guide to C++ codebase =
 
+See DESIGN for design notes, Makefile comment for build system notes.
+
 == Prerequisites ==
 
 Apache Portable Runtime 1.2.7:  http://apr.apache.org/
diff --git a/qpid/cpp/broker/Makefile b/qpid/cpp/broker/Makefile
deleted file mode 100644
index 5c96589d95..0000000000
--- a/qpid/cpp/broker/Makefile
+++ /dev/null
@@ -1,39 +0,0 @@
-#
-# Copyright (c) 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# Build broker library.
-#
-
-QPID_HOME = ../..
-include ${QPID_HOME}/cpp/options.mk
-TARGET=$(BROKER_LIB)
-SOURCES= $(wildcard src/*.cpp)
-OBJECTS= $(subst .cpp,.o,$(SOURCES))
-
-.PHONY: all clean 
-
-all: $(TARGET)
-	@$(MAKE) -C test all
-
-clean:
-	-@rm -f $(TARGET) ${OBJECTS} src/*.d 
-	@$(MAKE) -C test clean
-
-$(TARGET): $(OBJECTS)
-	$(CXX) -shared -o $@ $(LDFLAGS) $(OBJECTS)  -lapr-1 $(COMMON_LIB) $(LIBDIR)
-
--include $(SOURCES:.cpp=.d)
diff --git a/qpid/cpp/client/Makefile b/qpid/cpp/client/Makefile
deleted file mode 100644
index f3c8b11a7a..0000000000
--- a/qpid/cpp/client/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# Build client library.
-# 
-
-QPID_HOME = ../..
-include ${QPID_HOME}/cpp/options.mk
-
-SOURCES := $(wildcard src/*.cpp)
-OBJECTS := $(subst .cpp,.o,$(SOURCES))
-CLIENT_LIB=$(LIB_DIR)/libqpid_client.so.1.0
-
-.PHONY: all clean 
-
-all: $(CLIENT_LIB)
-	@$(MAKE) -C test all
-
-clean:
-	-@rm -f $(CLIENT_LIB) $(OBJECTS)  src/*.d
-	$(MAKE) -C test clean
-
-$(CLIENT_LIB): $(OBJECTS)
-	$(CXX) -shared -o $@ $^ $(LDFLAGS)  $(COMMON_LIB) 
-
-# Dependencies
--include $(SOURCES:.cpp=.d)
diff --git a/qpid/cpp/client/test/Makefile b/qpid/cpp/client/test/Makefile
deleted file mode 100644
index f35aab3e17..0000000000
--- a/qpid/cpp/client/test/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-QPID_HOME = ../../..
-include ${QPID_HOME}/cpp/options.mk
-
-# TODO aconway 2006-09-12: These are system tests, not unit tests.
-# We need client side unit tests.
-# We should separate them from the system tets.
-# We need an approach to automate the C++ client/server system tests.
-# 
-
-SOURCES=$(wildcard *.cpp)
-TESTS=$(SOURCES:.cpp=)
-DEPS= $(SOURCES:.cpp=.d)
-
-INCLUDES = $(TEST_INCLUDES)
-LDLIBS= -lapr-1  $(COMMON_LIB) $(CLIENT_LIB)
-
-.PHONY: all clean
-
-all: $(TESTS) 
-
-clean:
-	-@rm -f $(TESTS) $(DEPS)
-
-# Rule to build test programs.
-%: %.cpp
-	$(CXX) -o $@ $< $(CXXFLAGS) $(LDFLAGS) $(LDLIBS)
-
-# Dependencies
--include $(DEPS)
diff --git a/qpid/cpp/common/Makefile b/qpid/cpp/common/Makefile
deleted file mode 100644
index 766d5fbcde..0000000000
--- a/qpid/cpp/common/Makefile
+++ /dev/null
@@ -1,45 +0,0 @@
-#
-# Copyright (c) 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# Make file to build qpid_common library.
-# 
-
-QPID_HOME=../..
-include $(QPID_HOME)/cpp/options.mk
-TARGET = $(LIB_DIR)/libqpid_common.so.1.0
-SOURCES = $(wildcard */src/*.cpp framing/generated/*.cpp error/*.cpp)
-OBJECTS = $(SOURCES:.cpp=.o)
-DEPS = $(SOURCES:.cpp=.d)
-
-GENERATED_OBJECTS = framing/generated/amqp_methods.o
-
-.PHONY: all clean
-
-# We have to do two separate makes to ensure we pick up all generated files.
-all:
-	@$(MAKE) -C framing all
-	@$(MAKE) $(TARGET)
-	@$(MAKE) -C framing test
-
-clean:
-	@$(MAKE) -C framing clean
-	-@rm -f $(TARGET) $(OBJECTS) $(DEPS)
-
-$(TARGET): $(OBJECTS) 
-	$(CXX)  -shared -o $@ $(OBJECTS) $(LDFLAGS)   -lapr-1
-
--include $(DEPS)
diff --git a/qpid/cpp/common/framing/Makefile b/qpid/cpp/common/framing/Makefile
deleted file mode 100644
index 1dfc286050..0000000000
--- a/qpid/cpp/common/framing/Makefile
+++ /dev/null
@@ -1,28 +0,0 @@
-#
-# Copyright (c) 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-.PHONY: all clean test
-
-all:
-	@$(MAKE) -C generated all
-
-test:
-	@$(MAKE) -C test all
-
-clean :
-	@$(MAKE) -C generated clean
-	@$(MAKE) -C test clean
-
diff --git a/qpid/cpp/common/framing/generated/Makefile b/qpid/cpp/common/framing/generated/Makefile
deleted file mode 100644
index 12ec402760..0000000000
--- a/qpid/cpp/common/framing/generated/Makefile
+++ /dev/null
@@ -1,41 +0,0 @@
-#
-# Copyright (c) 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-QPID_HOME = ../../../..
-include ${QPID_HOME}/cpp/options.mk
-
-STYLESHEET_DIR = stylesheets
-JAVA = java
-XSLTP = ${TOOLS_DIR}/saxon8.jar
-
-SPEC = ${SPEC_DIR}/amqp-8.0.xml
-STYLESHEETS = $(wildcard stylesheets/*.xsl)
-
-GENERATED_SOURCES=amqp_methods.cpp # Seed generation
-
-.PHONY: all clean 
-
-all: ${GENERATED_SOURCES}
-
-clean :
-	-@rm -f  *.cpp *.h
-
-${GENERATED_SOURCES}: ${STYLESHEETS} ${SPEC}
-	${JAVA} -jar ${XSLTP} -o results.out ${SPEC} ${STYLESHEET_DIR}/code_gen.xsl
-	${JAVA} -jar ${XSLTP} -o results.out ${SPEC} ${STYLESHEET_DIR}/framing.xsl
-
--include $(GENERATED_SOURCES:.cpp=.d)
-
diff --git a/qpid/cpp/common/io/Makefile b/qpid/cpp/common/io/Makefile
deleted file mode 100644
index 617b91448a..0000000000
--- a/qpid/cpp/common/io/Makefile
+++ /dev/null
@@ -1,31 +0,0 @@
- #
- # Copyright (c) 2006 The Apache Software Foundation
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
- # You may obtain a copy of the License at
- #
- #    http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
- #
-
-QPID_HOME = ../../..
-include ${QPID_HOME}/cpp/options.mk
-SOURCES := $(wildcard src/*.cpp)
-OBJECTS := $(subst .cpp,.o,$(SOURCES))
-DEPS := $(subst .cpp,.d,$(SOURCES))
-
-.PHONY: all clean
-
-all: ${OBJECTS}
-
--include $(DEPS)
-
-clean :
-	-@rm -f ${OBJECTS} src/*.d
-
diff --git a/qpid/cpp/common/utils/src/Makefile b/qpid/cpp/common/utils/src/Makefile
deleted file mode 100644
index b0ab76973c..0000000000
--- a/qpid/cpp/common/utils/src/Makefile
+++ /dev/null
@@ -1,37 +0,0 @@
- #
- # Copyright (c) 2006 The Apache Software Foundation
- #
- # Licensed under the Apache License, Version 2.0 (the "License");
- # you may not use this file except in compliance with the License.
- # You may obtain a copy of the License at
- #
- #    http://www.apache.org/licenses/LICENSE-2.0
- #
- # Unless required by applicable law or agreed to in writing, software
- # distributed under the License is distributed on an "AS IS" BASIS,
- # WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- # See the License for the specific language governing permissions and
- # limitations under the License.
- #
-
-QPID_HOME = ../../../..
-include $(QPID_HOME)/cpp/options.mk
-INCLUDES=$(TEST_INCLUDES)
-
-##### Targets #####
-# Add additional source files to SOURCE LIST to include them in the build.
-COMMON_SOURCE_LIST = logger.cpp
-
-COMMON_OBJ_LIST = $(COMMON_SOURCE_LIST:.cpp=.o)
-LOGGER_TEST_EXE = logger_test
-
-
-.PHONY: all clean
-
-all: $(LOGGER_TEST_EXE)
-
-$(LOGGER_TEST_EXE) : $(COMMON_OBJ_LIST) $(LOGGER_TEST_EXE).o
-	$(CXX) -o $@ $^ -l apr-1 -L /usr/local/apr/lib/
-
-clean:
-	-@rm -f $(LOGGER_TEST_EXE) $(LOGGER_TEST_EXE).o $(COMMON_OBJ_LIST) test_log.txt *~ ../inc/*~
diff --git a/qpid/cpp/common/framing/generated/stylesheets/amqp_client.xsl b/qpid/cpp/etc/stylesheets/amqp_client.xsl
index 13a912a926..4673d44316 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/amqp_client.xsl
+++ b/qpid/cpp/etc/stylesheets/amqp_client.xsl
@@ -18,8 +18,8 @@
 #define _AMQP_ServerProxy_
 
 #include "AMQP_ServerOperations.h"
-#include "FieldTable.h"
-#include "OutputHandler.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/OutputHandler.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/generated/stylesheets/amqp_client_handler_impl.xsl b/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl
index 0cc34e0ecf..cc636ea846 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/amqp_client_handler_impl.xsl
+++ b/qpid/cpp/etc/stylesheets/amqp_client_handler_impl.xsl
@@ -18,7 +18,7 @@
 #define _AMQP_ClientHandlerImpl_
 
 #include "AMQP_ClientOperations.h"
-#include "FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/generated/stylesheets/amqp_client_operations.xsl b/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl
index 234b7080ba..ee87cac56a 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/amqp_client_operations.xsl
+++ b/qpid/cpp/etc/stylesheets/amqp_client_operations.xsl
@@ -20,7 +20,7 @@
 #define _AMQP_ClientOperations_
 
 #include "AMQP_Constants.h"
-#include "FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/generated/stylesheets/amqp_consts.xsl b/qpid/cpp/etc/stylesheets/amqp_consts.xsl
index c1c927f941..783f9f5271 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/amqp_consts.xsl
+++ b/qpid/cpp/etc/stylesheets/amqp_consts.xsl
@@ -51,7 +51,7 @@
 #ifndef _AMQP_Constants_
 #define _AMQP_Constants_
 
-#include "amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/generated/stylesheets/amqp_server.xsl b/qpid/cpp/etc/stylesheets/amqp_server.xsl
index 5ff8994888..ee50d7f331 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/amqp_server.xsl
+++ b/qpid/cpp/etc/stylesheets/amqp_server.xsl
@@ -17,8 +17,8 @@
 #define _AMQP_ClientProxy_
 
 #include "AMQP_ClientOperations.h"
-#include "FieldTable.h"
-#include "OutputHandler.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/framing/OutputHandler.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/generated/stylesheets/amqp_server_handler_impl.xsl b/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl
index 6450d3fd0c..c55e3f7cd1 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/amqp_server_handler_impl.xsl
+++ b/qpid/cpp/etc/stylesheets/amqp_server_handler_impl.xsl
@@ -18,7 +18,7 @@
 #define _AMQP_ServerHandlerImpl_
 
 #include "AMQP_ServerOperations.h"
-#include "FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/generated/stylesheets/amqp_server_operations.xsl b/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl
index 4b97700f04..aad474295c 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/amqp_server_operations.xsl
+++ b/qpid/cpp/etc/stylesheets/amqp_server_operations.xsl
@@ -20,7 +20,7 @@
 #define _AMQP_ServerOperations_
 
 #include "AMQP_Constants.h"
-#include "FieldTable.h"
+#include "qpid/framing/FieldTable.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/generated/stylesheets/code_gen.xsl b/qpid/cpp/etc/stylesheets/code_gen.xsl
index 5e9f4ef8f0..5e9f4ef8f0 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/code_gen.xsl
+++ b/qpid/cpp/etc/stylesheets/code_gen.xsl
diff --git a/qpid/cpp/common/framing/generated/stylesheets/code_utils.xsl b/qpid/cpp/etc/stylesheets/code_utils.xsl
index f4a0f6e5ce..f4a0f6e5ce 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/code_utils.xsl
+++ b/qpid/cpp/etc/stylesheets/code_utils.xsl
diff --git a/qpid/cpp/common/framing/generated/stylesheets/convert_0.81.xsl b/qpid/cpp/etc/stylesheets/convert_0.81.xsl
index 9924f165da..9924f165da 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/convert_0.81.xsl
+++ b/qpid/cpp/etc/stylesheets/convert_0.81.xsl
diff --git a/qpid/cpp/common/framing/generated/stylesheets/cpp.xsl b/qpid/cpp/etc/stylesheets/cpp.xsl
index f9e5ba4141..51facee294 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/cpp.xsl
+++ b/qpid/cpp/etc/stylesheets/cpp.xsl
@@ -16,7 +16,7 @@
 <!-- processes all frames outputting the classes in a single stream -->
 <xsl:template match="frames" mode="generate-single"> 
     <xsl:result-document href="amqp_methods.h" format="textFormat">
-#include "amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
         <xsl:for-each select="frame">      
            <xsl:call-template name="generate-class">
                 <xsl:with-param name="f" select="."/>
@@ -29,11 +29,11 @@
 <xsl:template match="frame" mode="generate-multi"> 
     <xsl:variable name="uri" select="concat(@name, '.h')"/> 
     <xsl:result-document href="{$uri}" format="textFormat"> 
-#include "amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 #include "AMQP_ServerOperations.h"
-#include "AMQMethodBody.h"
-#include "Buffer.h"
-#include "FieldTable.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/FieldTable.h"
 
 #ifndef _<xsl:value-of select="@name"/>_
 #define _<xsl:value-of select="@name"/>_
@@ -201,7 +201,7 @@ AMQMethodBody* createAMQMethodBody(u_int16_t classId, u_int16_t methodId);
 <xsl:template match="frames" mode="method-list-source">	
     <xsl:result-document href="amqp_methods.cpp" format="textFormat">
 #include "amqp_methods.h"
-#include "QpidError.h"
+#include "qpid/QpidError.h"
 
 namespace qpid {
 namespace framing {
@@ -230,8 +230,8 @@ AMQMethodBody* createAMQMethodBody(u_int16_t classId, u_int16_t methodId){
 
 <xsl:template match="frames" mode="generate-interface">	
     <xsl:result-document href="AMQPServer.h" format="textFormat">
-#include "amqp_types.h"
-#include "FieldTable.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/FieldTable.h"
 
 #ifndef _AMQPServer_
 #define _AMQPServer_
@@ -270,8 +270,8 @@ class AMQPServer
 </xsl:result-document>
 
     <xsl:result-document href="AMQPClient.h" format="textFormat">
-#include "amqp_types.h"
-#include "FieldTable.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/FieldTable.h"
 
 #ifndef _AMQPClient_
 #define _AMQPClient_
diff --git a/qpid/cpp/common/framing/generated/stylesheets/framing.xsl b/qpid/cpp/etc/stylesheets/framing.xsl
index c63e719a77..c63e719a77 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/framing.xsl
+++ b/qpid/cpp/etc/stylesheets/framing.xsl
diff --git a/qpid/cpp/common/framing/generated/stylesheets/prepare1.xsl b/qpid/cpp/etc/stylesheets/prepare1.xsl
index 2aeda89677..2aeda89677 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/prepare1.xsl
+++ b/qpid/cpp/etc/stylesheets/prepare1.xsl
diff --git a/qpid/cpp/common/framing/generated/stylesheets/prepare2.xsl b/qpid/cpp/etc/stylesheets/prepare2.xsl
index 331319de57..331319de57 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/prepare2.xsl
+++ b/qpid/cpp/etc/stylesheets/prepare2.xsl
diff --git a/qpid/cpp/common/framing/generated/stylesheets/prepare3.xsl b/qpid/cpp/etc/stylesheets/prepare3.xsl
index 27a4764e4f..27a4764e4f 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/prepare3.xsl
+++ b/qpid/cpp/etc/stylesheets/prepare3.xsl
diff --git a/qpid/cpp/common/framing/generated/stylesheets/registry.xsl b/qpid/cpp/etc/stylesheets/registry.xsl
index a818a0a871..a818a0a871 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/registry.xsl
+++ b/qpid/cpp/etc/stylesheets/registry.xsl
diff --git a/qpid/cpp/common/framing/generated/stylesheets/utils.xsl b/qpid/cpp/etc/stylesheets/utils.xsl
index 70743112a9..70743112a9 100644
--- a/qpid/cpp/common/framing/generated/stylesheets/utils.xsl
+++ b/qpid/cpp/etc/stylesheets/utils.xsl
diff --git a/qpid/cpp/options.mk b/qpid/cpp/options.mk
index 093017a1ed..d8214f36d5 100644
--- a/qpid/cpp/options.mk
+++ b/qpid/cpp/options.mk
@@ -14,25 +14,19 @@
  # limitations under the License.
  #
 
-# Directories
-SPEC_DIR = ${QPID_HOME}/specs
-QPID_CPP_HOME = ${QPID_HOME}/cpp
-COMMON_HOME = ${QPID_CPP_HOME}/common
-TOOLS_DIR = ${QPID_CPP_HOME}/tools
-LIB_DIR = ${QPID_CPP_HOME}/lib
-BIN_DIR = ${QPID_CPP_HOME}/bin
-APR_HOME = /usr/local/apr
 
-# Compile flags
-DEBUG = -ggdb3 -O0
-OPTIMIZE =
+## External dependencies:
+
+# Add location for headers and libraries of any external dependencies here
+EXTRA_INCLUDES := -I/usr/local/apr/include/apr-1
+EXTRA_LIBDIRS := -L/usr/local/apr/lib
+
+## Compile flags
+
+DEBUG := -ggdb3
+
 # _USE_APR_IO_ set when APR IO build is desired.
-DEFINES   = -D _USE_APR_IO_
-APR_INCLUDES=-I ${APR_HOME}/include/apr-1/ 
-COMMON_INCLUDES = -I ${COMMON_HOME}/framing/inc -I ${COMMON_HOME}/framing/generated -I ${COMMON_HOME}/concurrent/inc -I ${COMMON_HOME}/io/inc -I ${COMMON_HOME}/error/inc -I $(COMMON_HOME)/utils/inc ${APR_INCLUDES}
-SRC_INCLUDES = $(COMMON_INCLUDES) -I inc 
-TEST_INCLUDES = $(COMMON_INCLUDES) -I ../inc -I $(QPID_CPP_HOME)/test/include
-INCLUDES=$(SRC_INCLUDES)	# Default to src
+DEFINES := -D _USE_APR_IO_
 
 # Warnings: Enable as many as possible, keep the code clean. Please
 # do not disable warnings or remove -Werror without discussing on
@@ -41,21 +35,9 @@ INCLUDES=$(SRC_INCLUDES)	# Default to src
 # The following warnings deliberately omitted, they warn on valid code.
 # -Wno-unreachable-code -Wpadded
 # 
-WARN  = -Werror -pedantic -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Winline 
-
-CXXFLAGS = $(DEBUG) $(OPTIMIZE) $(DEFINES) $(WARN) -MMD -fpic $(INCLUDES) 
-
-# General link flags
-LDFLAGS= -L $(LIB_DIR) -L ${APR_HOME}/lib $(RPATH)
-
-# TODO aconway 2006-09-12: This is not something we want in a release
-# but it's useful for development.
-RPATH= -Wl,-rpath,$(CURDIR)/$(LIB_DIR)
-
-# Libraries and executables. Use absolute paths so exes can find
-# libs wherever they are run. TODO: Proper library management.
-BROKER=$(BIN_DIR)/qpidd
-BROKER_LIB=$(CURDIR)/$(LIB_DIR)/libqpid_broker.so.1.0
-COMMON_LIB=$(CURDIR)/$(LIB_DIR)/libqpid_common.so.1.0
-CLIENT_LIB=$(CURDIR)/$(LIB_DIR)/libqpid_client.so.1.0
-
+WARN := -Werror -pedantic -Wall -Wextra -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wno-long-long -Wvolatile-register-var -Winvalid-pch -Winline 
+INCLUDES :=  -Isrc -Igen $(EXTRA_INCLUDES) 
+CXXFLAGS := $(DEBUG) $(DEFINES) $(WARN) -MMD -fpic $(INCLUDES)
+## Link flags
+# Allow exes to find libs without env changes. Remove for release builds.
+LDFLAGS := -Llib $(EXTRA_LIBDIRS) 
diff --git a/qpid/cpp/qpidd/Makefile b/qpid/cpp/qpidd/Makefile
deleted file mode 100644
index f2dca4df3b..0000000000
--- a/qpid/cpp/qpidd/Makefile
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-#
-# Build qpidd broker daemon executable.
-#
-
-QPID_HOME = ../..
-include $(QPID_HOME)/cpp/options.mk
-TARGET=$(BROKER)
-SOURCES= $(wildcard src/*.cpp)
-OBJECTS= $(subst .cpp,.o,$(SOURCES))
-
-
-.PHONY: all clean test
-
-all: $(TARGET)
-
-test:
-	@$(MAKE) -C test all
-
-clean:
-	-@rm -f $(OBJECTS) src/*.d $(TARGET) 
-	@$(MAKE) -C test clean
-
-$(TARGET): $(OBJECTS)
-	$(CXX) -o $@ $(OBJECTS) $(LDFLAGS) -lapr-1 $(COMMON_LIB) $(BROKER_LIB)
-
--include $(SOURCES:.cpp=.d)
diff --git a/qpid/cpp/common/utils/inc/memory.h b/qpid/cpp/src/memory.h
index 2d65877adb..2d65877adb 100644
--- a/qpid/cpp/common/utils/inc/memory.h
+++ b/qpid/cpp/src/memory.h
diff --git a/qpid/cpp/common/error/src/Exception.cpp b/qpid/cpp/src/qpid/Exception.cpp
index 69e5f135f2..f89972f02b 100644
--- a/qpid/cpp/common/error/src/Exception.cpp
+++ b/qpid/cpp/src/qpid/Exception.cpp
@@ -16,6 +16,6 @@
  *
  */
 
-#include "Exception.h"
+#include "qpid/Exception.h"
 
 qpid::Exception::~Exception() throw() {}
diff --git a/qpid/cpp/common/error/inc/Exception.h b/qpid/cpp/src/qpid/Exception.h
index 709538c851..709538c851 100644
--- a/qpid/cpp/common/error/inc/Exception.h
+++ b/qpid/cpp/src/qpid/Exception.h
diff --git a/qpid/cpp/common/error/src/QpidError.cpp b/qpid/cpp/src/qpid/QpidError.cpp
index c8049ab3cb..c1d33c9583 100644
--- a/qpid/cpp/common/error/src/QpidError.cpp
+++ b/qpid/cpp/src/qpid/QpidError.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "QpidError.h"
+#include "qpid/QpidError.h"
 #include <sstream>
 
 using namespace qpid;
diff --git a/qpid/cpp/common/error/inc/QpidError.h b/qpid/cpp/src/qpid/QpidError.h
index 3310c71a88..98a2efff15 100644
--- a/qpid/cpp/common/error/inc/QpidError.h
+++ b/qpid/cpp/src/qpid/QpidError.h
@@ -18,7 +18,7 @@
  *
  */
 #include <string>
-#include "Exception.h"
+#include "qpid/Exception.h"
 
 namespace qpid {
 
diff --git a/qpid/cpp/broker/src/AutoDelete.cpp b/qpid/cpp/src/qpid/broker/AutoDelete.cpp
index 6793ec449d..22076e9e0c 100644
--- a/qpid/cpp/broker/src/AutoDelete.cpp
+++ b/qpid/cpp/src/qpid/broker/AutoDelete.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "AutoDelete.h"
+#include "./qpid/broker/AutoDelete.h"
 
 using namespace qpid::broker;
 
diff --git a/qpid/cpp/broker/inc/AutoDelete.h b/qpid/cpp/src/qpid/broker/AutoDelete.h
index 864d68358f..77a5a338e3 100644
--- a/qpid/cpp/broker/inc/AutoDelete.h
+++ b/qpid/cpp/src/qpid/broker/AutoDelete.h
@@ -20,10 +20,10 @@
 
 #include <iostream>
 #include <queue>
-#include "MonitorImpl.h"
-#include "Queue.h"
-#include "QueueRegistry.h"
-#include "ThreadFactoryImpl.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
+#include "./qpid/broker/QueueRegistry.h"
+#include "./qpid/concurrent/ThreadFactoryImpl.h"
 
 namespace qpid {
     namespace broker{
diff --git a/qpid/cpp/broker/inc/Binding.h b/qpid/cpp/src/qpid/broker/Binding.h
index b11419e92c..4202d390c3 100644
--- a/qpid/cpp/broker/inc/Binding.h
+++ b/qpid/cpp/src/qpid/broker/Binding.h
@@ -18,7 +18,7 @@
 #ifndef _Binding_
 #define _Binding_
 
-#include "FieldTable.h"
+#include "./qpid/framing/FieldTable.h"
 
 namespace qpid {
     namespace broker {
diff --git a/qpid/cpp/broker/src/Broker.cpp b/qpid/cpp/src/qpid/broker/Broker.cpp
index b6472d1729..27ce840d01 100644
--- a/qpid/cpp/broker/src/Broker.cpp
+++ b/qpid/cpp/src/qpid/broker/Broker.cpp
@@ -17,13 +17,13 @@
  */
 #include <iostream>
 #include <memory>
-#include "Broker.h"
-#include "Acceptor.h"
-#include "Configuration.h"
-#include "QpidError.h"
-#include "SessionHandlerFactoryImpl.h"
-#include "BlockingAPRAcceptor.h"
-#include "LFAcceptor.h"
+#include "./qpid/broker/Broker.h"
+#include "./qpid/io/Acceptor.h"
+#include "./qpid/broker/Configuration.h"
+#include "./qpid/QpidError.h"
+#include "./qpid/broker/SessionHandlerFactoryImpl.h"
+#include "./qpid/io/BlockingAPRAcceptor.h"
+#include "./qpid/io/LFAcceptor.h"
 
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/broker/inc/Broker.h b/qpid/cpp/src/qpid/broker/Broker.h
index 0cd2bd749e..3423dc0910 100644
--- a/qpid/cpp/broker/inc/Broker.h
+++ b/qpid/cpp/src/qpid/broker/Broker.h
@@ -19,10 +19,10 @@
  *
  */
 
-#include "Acceptor.h"
-#include "Configuration.h"
-#include "Runnable.h"
-#include "SessionHandlerFactoryImpl.h"
+#include "./qpid/io/Acceptor.h"
+#include "./qpid/broker/Configuration.h"
+#include "./qpid/concurrent/Runnable.h"
+#include "./qpid/broker/SessionHandlerFactoryImpl.h"
 #include <boost/noncopyable.hpp>
 #include <tr1/memory>
 
diff --git a/qpid/cpp/broker/src/Channel.cpp b/qpid/cpp/src/qpid/broker/Channel.cpp
index 34d69716c4..8d1cce9f1b 100644
--- a/qpid/cpp/broker/src/Channel.cpp
+++ b/qpid/cpp/src/qpid/broker/Channel.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "Channel.h"
-#include "QpidError.h"
+#include "./qpid/broker/Channel.h"
+#include "./qpid/QpidError.h"
 #include <iostream>
 #include <sstream>
 #include <assert.h>
diff --git a/qpid/cpp/broker/inc/Channel.h b/qpid/cpp/src/qpid/broker/Channel.h
index 862d249ce1..a20f4d9599 100644
--- a/qpid/cpp/broker/inc/Channel.h
+++ b/qpid/cpp/src/qpid/broker/Channel.h
@@ -20,16 +20,16 @@
 
 #include <algorithm>
 #include <map>
-#include "AMQContentBody.h"
-#include "AMQHeaderBody.h"
-#include "BasicPublishBody.h"
-#include "Binding.h"
-#include "Consumer.h"
-#include "Message.h"
-#include "MonitorImpl.h"
-#include "NameGenerator.h"
-#include "OutputHandler.h"
-#include "Queue.h"
+#include "./qpid/framing/AMQContentBody.h"
+#include "./qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/BasicPublishBody.h"
+#include "./qpid/broker/Binding.h"
+#include "./qpid/broker/Consumer.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/NameGenerator.h"
+#include "./qpid/framing/OutputHandler.h"
+#include "./qpid/broker/Queue.h"
 
 namespace qpid {
     namespace broker {
diff --git a/qpid/cpp/broker/src/Configuration.cpp b/qpid/cpp/src/qpid/broker/Configuration.cpp
index 6e7df7889e..d4b27e4dd2 100644
--- a/qpid/cpp/broker/src/Configuration.cpp
+++ b/qpid/cpp/src/qpid/broker/Configuration.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "Configuration.h"
+#include "./qpid/broker/Configuration.h"
 #include <string.h>
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/broker/inc/Configuration.h b/qpid/cpp/src/qpid/broker/Configuration.h
index aaabdd23a0..3785e1bac0 100644
--- a/qpid/cpp/broker/inc/Configuration.h
+++ b/qpid/cpp/src/qpid/broker/Configuration.h
@@ -21,7 +21,7 @@
 #include <cstdlib>
 #include <iostream>
 #include <vector>
-#include "Exception.h"
+#include "./qpid/Exception.h"
 
 namespace qpid {
     namespace broker {
diff --git a/qpid/cpp/broker/inc/ConnectionToken.h b/qpid/cpp/src/qpid/broker/ConnectionToken.h
index 1faefec2cc..1faefec2cc 100644
--- a/qpid/cpp/broker/inc/ConnectionToken.h
+++ b/qpid/cpp/src/qpid/broker/ConnectionToken.h
diff --git a/qpid/cpp/broker/inc/Consumer.h b/qpid/cpp/src/qpid/broker/Consumer.h
index af2d5d7812..7d346a4a0a 100644
--- a/qpid/cpp/broker/inc/Consumer.h
+++ b/qpid/cpp/src/qpid/broker/Consumer.h
@@ -18,7 +18,7 @@
 #ifndef _Consumer_
 #define _Consumer_
 
-#include "Message.h"
+#include "./qpid/broker/Message.h"
 
 namespace qpid {
     namespace broker {
diff --git a/qpid/cpp/broker/src/DirectExchange.cpp b/qpid/cpp/src/qpid/broker/DirectExchange.cpp
index 94cfbc766d..aa90d8dd81 100644
--- a/qpid/cpp/broker/src/DirectExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/DirectExchange.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "DirectExchange.h"
-#include "ExchangeBinding.h"
+#include "./qpid/broker/DirectExchange.h"
+#include "./qpid/broker/ExchangeBinding.h"
 #include <iostream>
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/broker/inc/DirectExchange.h b/qpid/cpp/src/qpid/broker/DirectExchange.h
index faf5a0b949..ce58a174c6 100644
--- a/qpid/cpp/broker/inc/DirectExchange.h
+++ b/qpid/cpp/src/qpid/broker/DirectExchange.h
@@ -20,11 +20,11 @@
 
 #include <map>
 #include <vector>
-#include "Exchange.h"
-#include "FieldTable.h"
-#include "Message.h"
-#include "MonitorImpl.h"
-#include "Queue.h"
+#include "./qpid/broker/Exchange.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/broker/inc/Exchange.h b/qpid/cpp/src/qpid/broker/Exchange.h
index 1fdc00fae5..7b8bb1c034 100644
--- a/qpid/cpp/broker/inc/Exchange.h
+++ b/qpid/cpp/src/qpid/broker/Exchange.h
@@ -18,9 +18,9 @@
 #ifndef _Exchange_
 #define _Exchange_
 
-#include "FieldTable.h"
-#include "Message.h"
-#include "Queue.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/broker/Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/broker/src/ExchangeBinding.cpp b/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp
index 6160a67fd3..61f44f634c 100644
--- a/qpid/cpp/broker/src/ExchangeBinding.cpp
+++ b/qpid/cpp/src/qpid/broker/ExchangeBinding.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "ExchangeBinding.h"
-#include "Exchange.h"
+#include "./qpid/broker/ExchangeBinding.h"
+#include "./qpid/broker/Exchange.h"
 
 using namespace qpid::broker;
 using namespace qpid::framing;
diff --git a/qpid/cpp/broker/inc/ExchangeBinding.h b/qpid/cpp/src/qpid/broker/ExchangeBinding.h
index 4cbb73acbf..fda5fab153 100644
--- a/qpid/cpp/broker/inc/ExchangeBinding.h
+++ b/qpid/cpp/src/qpid/broker/ExchangeBinding.h
@@ -18,9 +18,9 @@
 #ifndef _ExchangeBinding_
 #define _ExchangeBinding_
 
-#include "Binding.h"
-#include "FieldTable.h"
-#include "Queue.h"
+#include "./qpid/broker/Binding.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Queue.h"
 
 namespace qpid {
     namespace broker {
diff --git a/qpid/cpp/broker/src/ExchangeRegistry.cpp b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
index 05396382a7..0755393e68 100644
--- a/qpid/cpp/broker/src/ExchangeRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/ExchangeRegistry.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "ExchangeRegistry.h"
-#include "MonitorImpl.h"
+#include "./qpid/broker/ExchangeRegistry.h"
+#include "./qpid/concurrent/MonitorImpl.h"
 
 using namespace qpid::broker;
 using namespace qpid::concurrent;
diff --git a/qpid/cpp/broker/inc/ExchangeRegistry.h b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
index a4a778482c..7728ed0eff 100644
--- a/qpid/cpp/broker/inc/ExchangeRegistry.h
+++ b/qpid/cpp/src/qpid/broker/ExchangeRegistry.h
@@ -19,8 +19,8 @@
 #define _ExchangeRegistry_
 
 #include <map>
-#include "Exchange.h"
-#include "Monitor.h"
+#include "./qpid/broker/Exchange.h"
+#include "./qpid/concurrent/Monitor.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/broker/src/FanOutExchange.cpp b/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
index e8cb8f6315..1b4e3643d0 100644
--- a/qpid/cpp/broker/src/FanOutExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/FanOutExchange.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "FanOutExchange.h"
-#include "ExchangeBinding.h"
+#include "./qpid/broker/FanOutExchange.h"
+#include "./qpid/broker/ExchangeBinding.h"
 #include <algorithm>
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/broker/inc/FanOutExchange.h b/qpid/cpp/src/qpid/broker/FanOutExchange.h
index 1932e8429c..f79dd28ec5 100644
--- a/qpid/cpp/broker/inc/FanOutExchange.h
+++ b/qpid/cpp/src/qpid/broker/FanOutExchange.h
@@ -20,11 +20,11 @@
 
 #include <map>
 #include <vector>
-#include "Exchange.h"
-#include "FieldTable.h"
-#include "Message.h"
-#include "MonitorImpl.h"
-#include "Queue.h"
+#include "./qpid/broker/Exchange.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/broker/src/HeadersExchange.cpp b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
index 65204cdb85..35feef22dd 100644
--- a/qpid/cpp/broker/src/HeadersExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/HeadersExchange.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "HeadersExchange.h"
-#include "ExchangeBinding.h"
-#include "Value.h"
-#include "QpidError.h"
+#include "./qpid/broker/HeadersExchange.h"
+#include "./qpid/broker/ExchangeBinding.h"
+#include "./qpid/framing/Value.h"
+#include "./qpid/QpidError.h"
 #include <algorithm>
 
 
diff --git a/qpid/cpp/broker/inc/HeadersExchange.h b/qpid/cpp/src/qpid/broker/HeadersExchange.h
index 08bf0bb735..a330e050f5 100644
--- a/qpid/cpp/broker/inc/HeadersExchange.h
+++ b/qpid/cpp/src/qpid/broker/HeadersExchange.h
@@ -19,11 +19,11 @@
 #define _HeadersExchange_
 
 #include <vector>
-#include "Exchange.h"
-#include "FieldTable.h"
-#include "Message.h"
-#include "MonitorImpl.h"
-#include "Queue.h"
+#include "./qpid/broker/Exchange.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/broker/src/Message.cpp b/qpid/cpp/src/qpid/broker/Message.cpp
index 0a8a5f7a4d..7210ecc2f2 100644
--- a/qpid/cpp/broker/src/Message.cpp
+++ b/qpid/cpp/src/qpid/broker/Message.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "MonitorImpl.h"
-#include "Message.h"
-#include "ExchangeRegistry.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/broker/ExchangeRegistry.h"
 #include <iostream>
 
 using namespace std::tr1;//for *_pointer_cast methods
diff --git a/qpid/cpp/broker/inc/Message.h b/qpid/cpp/src/qpid/broker/Message.h
index 94b9aa5bdd..7ba8767baf 100644
--- a/qpid/cpp/broker/inc/Message.h
+++ b/qpid/cpp/src/qpid/broker/Message.h
@@ -18,13 +18,13 @@
 #ifndef _Message_
 #define _Message_
 
-#include "memory.h"
-#include "AMQContentBody.h"
-#include "AMQHeaderBody.h"
-#include "BasicHeaderProperties.h"
-#include "BasicPublishBody.h"
-#include "ConnectionToken.h"
-#include "OutputHandler.h"
+#include "./memory.h"
+#include "./qpid/framing/AMQContentBody.h"
+#include "./qpid/framing/AMQHeaderBody.h"
+#include "./qpid/framing/BasicHeaderProperties.h"
+#include "./qpid/framing/BasicPublishBody.h"
+#include "./qpid/broker/ConnectionToken.h"
+#include "./qpid/framing/OutputHandler.h"
 
 namespace qpid {
     namespace broker {
diff --git a/qpid/cpp/broker/src/NameGenerator.cpp b/qpid/cpp/src/qpid/broker/NameGenerator.cpp
index 46aa385a7e..d9b758c5a0 100644
--- a/qpid/cpp/broker/src/NameGenerator.cpp
+++ b/qpid/cpp/src/qpid/broker/NameGenerator.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "NameGenerator.h"
+#include "./qpid/broker/NameGenerator.h"
 #include <sstream>
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/broker/inc/NameGenerator.h b/qpid/cpp/src/qpid/broker/NameGenerator.h
index 6e6e0acf28..38f3c0a4c1 100644
--- a/qpid/cpp/broker/inc/NameGenerator.h
+++ b/qpid/cpp/src/qpid/broker/NameGenerator.h
@@ -18,7 +18,7 @@
 #ifndef _NameGenerator_
 #define _NameGenerator_
 
-#include "Message.h"
+#include "./qpid/broker/Message.h"
 
 namespace qpid {
     namespace broker {
diff --git a/qpid/cpp/broker/src/Queue.cpp b/qpid/cpp/src/qpid/broker/Queue.cpp
index eaaa3ffa31..d672074555 100644
--- a/qpid/cpp/broker/src/Queue.cpp
+++ b/qpid/cpp/src/qpid/broker/Queue.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "Queue.h"
-#include "MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
+#include "./qpid/concurrent/MonitorImpl.h"
 #include <iostream>
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/broker/inc/Queue.h b/qpid/cpp/src/qpid/broker/Queue.h
index 2229ba6235..6cf9088633 100644
--- a/qpid/cpp/broker/inc/Queue.h
+++ b/qpid/cpp/src/qpid/broker/Queue.h
@@ -20,14 +20,14 @@
 
 #include <vector>
 #include <queue>
-#include "memory.h"
+#include "./memory.h"
 #include "apr_time.h"
-#include "amqp_types.h"
-#include "Binding.h"
-#include "ConnectionToken.h"
-#include "Consumer.h"
-#include "Message.h"
-#include "MonitorImpl.h"
+#include "./qpid/framing/amqp_types.h"
+#include "./qpid/broker/Binding.h"
+#include "./qpid/broker/ConnectionToken.h"
+#include "./qpid/broker/Consumer.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
 
 namespace qpid {
     namespace broker {
diff --git a/qpid/cpp/broker/src/QueueRegistry.cpp b/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
index f807415314..f2cb46648e 100644
--- a/qpid/cpp/broker/src/QueueRegistry.cpp
+++ b/qpid/cpp/src/qpid/broker/QueueRegistry.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "QueueRegistry.h"
-#include "MonitorImpl.h"
-#include "SessionHandlerImpl.h"
+#include "./qpid/broker/QueueRegistry.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/SessionHandlerImpl.h"
 #include <sstream>
 #include <assert.h>
 
diff --git a/qpid/cpp/broker/inc/QueueRegistry.h b/qpid/cpp/src/qpid/broker/QueueRegistry.h
index ac12aa8f88..9e6778153e 100644
--- a/qpid/cpp/broker/inc/QueueRegistry.h
+++ b/qpid/cpp/src/qpid/broker/QueueRegistry.h
@@ -19,8 +19,8 @@
 #define _QueueRegistry_
 
 #include <map>
-#include "MonitorImpl.h"
-#include "Queue.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/broker/src/Router.cpp b/qpid/cpp/src/qpid/broker/Router.cpp
index c2dd74bf7d..6a81816aea 100644
--- a/qpid/cpp/broker/src/Router.cpp
+++ b/qpid/cpp/src/qpid/broker/Router.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "Router.h"
+#include "./qpid/broker/Router.h"
 
 using namespace qpid::broker;
 
diff --git a/qpid/cpp/broker/inc/Router.h b/qpid/cpp/src/qpid/broker/Router.h
index d462b69832..23739e6527 100644
--- a/qpid/cpp/broker/inc/Router.h
+++ b/qpid/cpp/src/qpid/broker/Router.h
@@ -18,8 +18,8 @@
 #ifndef _Router_
 #define _Router_
 
-#include "ExchangeRegistry.h"
-#include "Message.h"
+#include "./qpid/broker/ExchangeRegistry.h"
+#include "./qpid/broker/Message.h"
 
 /**
  * A routing functor
diff --git a/qpid/cpp/broker/src/SessionHandlerFactoryImpl.cpp b/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
index 39c627afef..8afff976e1 100644
--- a/qpid/cpp/broker/src/SessionHandlerFactoryImpl.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "SessionHandlerFactoryImpl.h"
-#include "SessionHandlerImpl.h"
-#include "FanOutExchange.h"
-#include "HeadersExchange.h"
+#include "./qpid/broker/SessionHandlerFactoryImpl.h"
+#include "./qpid/broker/SessionHandlerImpl.h"
+#include "./qpid/broker/FanOutExchange.h"
+#include "./qpid/broker/HeadersExchange.h"
 
 using namespace qpid::broker;
 using namespace qpid::io;
diff --git a/qpid/cpp/broker/inc/SessionHandlerFactoryImpl.h b/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
index 2317a6667b..2875cf63e6 100644
--- a/qpid/cpp/broker/inc/SessionHandlerFactoryImpl.h
+++ b/qpid/cpp/src/qpid/broker/SessionHandlerFactoryImpl.h
@@ -18,14 +18,14 @@
 #ifndef _SessionHandlerFactoryImpl_
 #define _SessionHandlerFactoryImpl_
 
-#include "AMQFrame.h"
-#include "AutoDelete.h"
-#include "DirectExchange.h"
-#include "ExchangeRegistry.h"
-#include "ProtocolInitiation.h"
-#include "QueueRegistry.h"
-#include "SessionHandlerFactory.h"
-#include "TimeoutHandler.h"
+#include "./qpid/framing/AMQFrame.h"
+#include "./qpid/broker/AutoDelete.h"
+#include "./qpid/broker/DirectExchange.h"
+#include "./qpid/broker/ExchangeRegistry.h"
+#include "./qpid/framing/ProtocolInitiation.h"
+#include "./qpid/broker/QueueRegistry.h"
+#include "./qpid/io/SessionHandlerFactory.h"
+#include "./qpid/io/TimeoutHandler.h"
 
 namespace qpid {
     namespace broker {
diff --git a/qpid/cpp/broker/src/SessionHandlerImpl.cpp b/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp
index 0d8539332c..49d43d8f8b 100644
--- a/qpid/cpp/broker/src/SessionHandlerImpl.cpp
+++ b/qpid/cpp/src/qpid/broker/SessionHandlerImpl.cpp
@@ -16,11 +16,11 @@
  *
  */
 #include <iostream>
-#include "SessionHandlerImpl.h"
-#include "FanOutExchange.h"
-#include "HeadersExchange.h"
-#include "Router.h"
-#include "TopicExchange.h"
+#include "./qpid/broker/SessionHandlerImpl.h"
+#include "./qpid/broker/FanOutExchange.h"
+#include "./qpid/broker/HeadersExchange.h"
+#include "./qpid/broker/Router.h"
+#include "./qpid/broker/TopicExchange.h"
 #include "assert.h"
 
 using namespace std::tr1;
diff --git a/qpid/cpp/broker/inc/SessionHandlerImpl.h b/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h
index 549f51f5a1..09a4a67e66 100644
--- a/qpid/cpp/broker/inc/SessionHandlerImpl.h
+++ b/qpid/cpp/src/qpid/broker/SessionHandlerImpl.h
@@ -22,21 +22,21 @@
 #include <sstream>
 #include <vector>
 #include <exception>
-#include "AMQFrame.h"
-#include "AMQP_ClientProxy.h"
-#include "AMQP_ServerOperations.h"
-#include "AutoDelete.h"
-#include "ExchangeRegistry.h"
-#include "Channel.h"
-#include "ConnectionToken.h"
-#include "DirectExchange.h"
-#include "OutputHandler.h"
-#include "ProtocolInitiation.h"
-#include "QueueRegistry.h"
-#include "SessionContext.h"
-#include "SessionHandler.h"
-#include "TimeoutHandler.h"
-#include "TopicExchange.h"
+#include "./qpid/framing/AMQFrame.h"
+#include "qpid/framing/AMQP_ClientProxy.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
+#include "./qpid/broker/AutoDelete.h"
+#include "./qpid/broker/ExchangeRegistry.h"
+#include "./qpid/broker/Channel.h"
+#include "./qpid/broker/ConnectionToken.h"
+#include "./qpid/broker/DirectExchange.h"
+#include "./qpid/framing/OutputHandler.h"
+#include "./qpid/framing/ProtocolInitiation.h"
+#include "./qpid/broker/QueueRegistry.h"
+#include "./qpid/io/SessionContext.h"
+#include "./qpid/io/SessionHandler.h"
+#include "./qpid/io/TimeoutHandler.h"
+#include "./qpid/broker/TopicExchange.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/broker/src/TopicExchange.cpp b/qpid/cpp/src/qpid/broker/TopicExchange.cpp
index 53977747c4..2affa6057d 100644
--- a/qpid/cpp/broker/src/TopicExchange.cpp
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "TopicExchange.h"
-#include "ExchangeBinding.h"
+#include "./qpid/broker/TopicExchange.h"
+#include "./qpid/broker/ExchangeBinding.h"
 #include <algorithm>
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/broker/inc/TopicExchange.h b/qpid/cpp/src/qpid/broker/TopicExchange.h
index 227280103f..8bad7aab4c 100644
--- a/qpid/cpp/broker/inc/TopicExchange.h
+++ b/qpid/cpp/src/qpid/broker/TopicExchange.h
@@ -20,11 +20,11 @@
 
 #include <tr1/unordered_map>
 #include <vector>
-#include "Exchange.h"
-#include "FieldTable.h"
-#include "Message.h"
-#include "MonitorImpl.h"
-#include "Queue.h"
+#include "./qpid/broker/Exchange.h"
+#include "./qpid/framing/FieldTable.h"
+#include "./qpid/broker/Message.h"
+#include "./qpid/concurrent/MonitorImpl.h"
+#include "./qpid/broker/Queue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/qpid/cpp/client/src/Channel.cpp b/qpid/cpp/src/qpid/client/Channel.cpp
index cf2f5bc081..0563dbaaba 100644
--- a/qpid/cpp/client/src/Channel.cpp
+++ b/qpid/cpp/src/qpid/client/Channel.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "Channel.h"
-#include "MonitorImpl.h"
-#include "ThreadFactoryImpl.h"
-#include "Message.h"
-#include "QpidError.h"
+#include "qpid/client/Channel.h"
+#include "qpid/concurrent/MonitorImpl.h"
+#include "qpid/concurrent/ThreadFactoryImpl.h"
+#include "qpid/client/Message.h"
+#include "qpid/QpidError.h"
 
 using namespace std::tr1;//to use dynamic_pointer_cast
 using namespace qpid::client;
diff --git a/qpid/cpp/client/inc/Channel.h b/qpid/cpp/src/qpid/client/Channel.h
index debecf922e..0b60a827b7 100644
--- a/qpid/cpp/client/inc/Channel.h
+++ b/qpid/cpp/src/qpid/client/Channel.h
@@ -23,18 +23,18 @@
 #ifndef _Channel_
 #define _Channel_
 
-#include "amqp_framing.h"
-
-#include "ThreadFactory.h"
-
-#include "Connection.h"
-#include "Exchange.h"
-#include "IncomingMessage.h"
-#include "Message.h"
-#include "MessageListener.h"
-#include "Queue.h"
-#include "ResponseHandler.h"
-#include "ReturnedMessageHandler.h"
+#include "qpid/framing/amqp_framing.h"
+
+#include "qpid/concurrent/ThreadFactory.h"
+
+#include "qpid/client/Connection.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/IncomingMessage.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/Queue.h"
+#include "qpid/client/ResponseHandler.h"
+#include "qpid/client/ReturnedMessageHandler.h"
 
 namespace qpid {
 namespace client {
diff --git a/qpid/cpp/client/src/Connection.cpp b/qpid/cpp/src/qpid/client/Connection.cpp
index f332d2242c..779480eae9 100644
--- a/qpid/cpp/client/src/Connection.cpp
+++ b/qpid/cpp/src/qpid/client/Connection.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "Connection.h"
-#include "Channel.h"
-#include "ConnectorImpl.h"
-#include "Message.h"
-#include "QpidError.h"
+#include "qpid/client/Connection.h"
+#include "qpid/client/Channel.h"
+#include "qpid/io/ConnectorImpl.h"
+#include "qpid/client/Message.h"
+#include "qpid/QpidError.h"
 #include <iostream>
 
 using namespace qpid::client;
diff --git a/qpid/cpp/client/inc/Connection.h b/qpid/cpp/src/qpid/client/Connection.h
index 89169e92b1..0e8f52e88a 100644
--- a/qpid/cpp/client/inc/Connection.h
+++ b/qpid/cpp/src/qpid/client/Connection.h
@@ -21,18 +21,18 @@
 #ifndef _Connection_
 #define _Connection_
 
-#include "QpidError.h"
-#include "Connector.h"
-#include "ShutdownHandler.h"
-#include "TimeoutHandler.h"
-
-#include "amqp_framing.h"
-#include "Exchange.h"
-#include "IncomingMessage.h"
-#include "Message.h"
-#include "MessageListener.h"
-#include "Queue.h"
-#include "ResponseHandler.h"
+#include "qpid/QpidError.h"
+#include "qpid/io/Connector.h"
+#include "qpid/io/ShutdownHandler.h"
+#include "qpid/io/TimeoutHandler.h"
+
+#include "qpid/framing/amqp_framing.h"
+#include "qpid/client/Exchange.h"
+#include "qpid/client/IncomingMessage.h"
+#include "qpid/client/Message.h"
+#include "qpid/client/MessageListener.h"
+#include "qpid/client/Queue.h"
+#include "qpid/client/ResponseHandler.h"
 
 namespace qpid {
 namespace client {
diff --git a/qpid/cpp/client/src/Exchange.cpp b/qpid/cpp/src/qpid/client/Exchange.cpp
index 681068dc4c..078f15c3a7 100644
--- a/qpid/cpp/client/src/Exchange.cpp
+++ b/qpid/cpp/src/qpid/client/Exchange.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "Exchange.h"
+#include "qpid/client/Exchange.h"
 
 qpid::client::Exchange::Exchange(std::string _name, std::string _type) : name(_name), type(_type){}
 const std::string& qpid::client::Exchange::getName() const { return name; }
diff --git a/qpid/cpp/client/inc/Exchange.h b/qpid/cpp/src/qpid/client/Exchange.h
index 66593a41cc..66593a41cc 100644
--- a/qpid/cpp/client/inc/Exchange.h
+++ b/qpid/cpp/src/qpid/client/Exchange.h
diff --git a/qpid/cpp/client/src/IncomingMessage.cpp b/qpid/cpp/src/qpid/client/IncomingMessage.cpp
index 9576051302..c385430a27 100644
--- a/qpid/cpp/client/src/IncomingMessage.cpp
+++ b/qpid/cpp/src/qpid/client/IncomingMessage.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "IncomingMessage.h"
-#include "QpidError.h"
+#include "qpid/client/IncomingMessage.h"
+#include "qpid/QpidError.h"
 #include <iostream>
 
 using namespace qpid::client;
diff --git a/qpid/cpp/client/inc/IncomingMessage.h b/qpid/cpp/src/qpid/client/IncomingMessage.h
index 90fed17ee0..fec620066b 100644
--- a/qpid/cpp/client/inc/IncomingMessage.h
+++ b/qpid/cpp/src/qpid/client/IncomingMessage.h
@@ -17,12 +17,12 @@
  */
 #include <string>
 #include <vector>
-#include "amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 
 #ifndef _IncomingMessage_
 #define _IncomingMessage_
 
-#include "Message.h"
+#include "qpid/client/Message.h"
 
 namespace qpid {
 namespace client {
diff --git a/qpid/cpp/client/src/Message.cpp b/qpid/cpp/src/qpid/client/Message.cpp
index 71befe57b1..34220b595d 100644
--- a/qpid/cpp/client/src/Message.cpp
+++ b/qpid/cpp/src/qpid/client/Message.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "Message.h"
+#include "qpid/client/Message.h"
 
 using namespace qpid::client;
 using namespace qpid::framing;
diff --git a/qpid/cpp/client/inc/Message.h b/qpid/cpp/src/qpid/client/Message.h
index fc3ec34bcf..5b1c1d5de7 100644
--- a/qpid/cpp/client/inc/Message.h
+++ b/qpid/cpp/src/qpid/client/Message.h
@@ -16,7 +16,7 @@
  *
  */
 #include <string>
-#include "amqp_framing.h"
+#include "qpid/framing/amqp_framing.h"
 
 #ifndef _Message_
 #define _Message_
diff --git a/qpid/cpp/client/src/MessageListener.cpp b/qpid/cpp/src/qpid/client/MessageListener.cpp
index cf55db8edf..f3bcb24c1a 100644
--- a/qpid/cpp/client/src/MessageListener.cpp
+++ b/qpid/cpp/src/qpid/client/MessageListener.cpp
@@ -16,6 +16,6 @@
  *
  */
 
-#include "MessageListener.h"
+#include "qpid/client/MessageListener.h"
 
 qpid::client::MessageListener::~MessageListener() {}
diff --git a/qpid/cpp/client/inc/MessageListener.h b/qpid/cpp/src/qpid/client/MessageListener.h
index 81b80ff5cb..a28e26a8d2 100644
--- a/qpid/cpp/client/inc/MessageListener.h
+++ b/qpid/cpp/src/qpid/client/MessageListener.h
@@ -20,7 +20,7 @@
 #ifndef _MessageListener_
 #define _MessageListener_
 
-#include "Message.h"
+#include "qpid/client/Message.h"
 
 namespace qpid {
 namespace client {
diff --git a/qpid/cpp/client/src/Queue.cpp b/qpid/cpp/src/qpid/client/Queue.cpp
index 5b2881f7ff..dc752c9fb2 100644
--- a/qpid/cpp/client/src/Queue.cpp
+++ b/qpid/cpp/src/qpid/client/Queue.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "Queue.h"
+#include "qpid/client/Queue.h"
 
 qpid::client::Queue::Queue() : name(""), autodelete(true), exclusive(true){}
 
diff --git a/qpid/cpp/client/inc/Queue.h b/qpid/cpp/src/qpid/client/Queue.h
index e0964af774..e0964af774 100644
--- a/qpid/cpp/client/inc/Queue.h
+++ b/qpid/cpp/src/qpid/client/Queue.h
diff --git a/qpid/cpp/client/src/ResponseHandler.cpp b/qpid/cpp/src/qpid/client/ResponseHandler.cpp
index 6938539469..ec20dd1a10 100644
--- a/qpid/cpp/client/src/ResponseHandler.cpp
+++ b/qpid/cpp/src/qpid/client/ResponseHandler.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "ResponseHandler.h"
-#include "MonitorImpl.h"
-#include "QpidError.h"
+#include "qpid/client/ResponseHandler.h"
+#include "qpid/concurrent/MonitorImpl.h"
+#include "qpid/QpidError.h"
 
 qpid::client::ResponseHandler::ResponseHandler() : waiting(false){
     monitor = new qpid::concurrent::MonitorImpl();
diff --git a/qpid/cpp/client/inc/ResponseHandler.h b/qpid/cpp/src/qpid/client/ResponseHandler.h
index f5392c954d..179daa1f1f 100644
--- a/qpid/cpp/client/inc/ResponseHandler.h
+++ b/qpid/cpp/src/qpid/client/ResponseHandler.h
@@ -16,8 +16,8 @@
  *
  */
 #include <string>
-#include "amqp_framing.h"
-#include "Monitor.h"
+#include "qpid/framing/amqp_framing.h"
+#include "qpid/concurrent/Monitor.h"
 
 #ifndef _ResponseHandler_
 #define _ResponseHandler_
diff --git a/qpid/cpp/client/src/ReturnedMessageHandler.cpp b/qpid/cpp/src/qpid/client/ReturnedMessageHandler.cpp
index cfa91fee97..ca6fba2408 100644
--- a/qpid/cpp/client/src/ReturnedMessageHandler.cpp
+++ b/qpid/cpp/src/qpid/client/ReturnedMessageHandler.cpp
@@ -16,6 +16,6 @@
  *
  */
 
-#include "ReturnedMessageHandler.h"
+#include "qpid/client/ReturnedMessageHandler.h"
 
 qpid::client::ReturnedMessageHandler::~ReturnedMessageHandler() {}
diff --git a/qpid/cpp/client/inc/ReturnedMessageHandler.h b/qpid/cpp/src/qpid/client/ReturnedMessageHandler.h
index 0d30d0ab32..5a4c4d5d1b 100644
--- a/qpid/cpp/client/inc/ReturnedMessageHandler.h
+++ b/qpid/cpp/src/qpid/client/ReturnedMessageHandler.h
@@ -20,7 +20,7 @@
 #ifndef _ReturnedMessageHandler_
 #define _ReturnedMessageHandler_
 
-#include "Message.h"
+#include "qpid/client/Message.h"
 
 namespace qpid {
 namespace client {
diff --git a/qpid/cpp/common/concurrent/src/APRBase.cpp b/qpid/cpp/src/qpid/concurrent/APRBase.cpp
index f9b34b9333..514c4d1048 100644
--- a/qpid/cpp/common/concurrent/src/APRBase.cpp
+++ b/qpid/cpp/src/qpid/concurrent/APRBase.cpp
@@ -16,8 +16,8 @@
  *
  */
 #include <iostream>
-#include "APRBase.h"
-#include "QpidError.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/QpidError.h"
 
 using namespace qpid::concurrent;
 
diff --git a/qpid/cpp/common/concurrent/inc/APRBase.h b/qpid/cpp/src/qpid/concurrent/APRBase.h
index e0b526faa1..e0b526faa1 100644
--- a/qpid/cpp/common/concurrent/inc/APRBase.h
+++ b/qpid/cpp/src/qpid/concurrent/APRBase.h
diff --git a/qpid/cpp/common/concurrent/src/APRMonitor.cpp b/qpid/cpp/src/qpid/concurrent/APRMonitor.cpp
index 428d76dff9..cc5eda800f 100644
--- a/qpid/cpp/common/concurrent/src/APRMonitor.cpp
+++ b/qpid/cpp/src/qpid/concurrent/APRMonitor.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "APRBase.h"
-#include "APRMonitor.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/concurrent/APRMonitor.h"
 #include <iostream>
 
 qpid::concurrent::APRMonitor::APRMonitor(){
diff --git a/qpid/cpp/common/concurrent/inc/APRMonitor.h b/qpid/cpp/src/qpid/concurrent/APRMonitor.h
index bf72596564..e62612b31b 100644
--- a/qpid/cpp/common/concurrent/inc/APRMonitor.h
+++ b/qpid/cpp/src/qpid/concurrent/APRMonitor.h
@@ -20,7 +20,7 @@
 
 #include "apr_thread_mutex.h"
 #include "apr_thread_cond.h"
-#include "Monitor.h"
+#include "qpid/concurrent/Monitor.h"
 
 namespace qpid {
 namespace concurrent {
diff --git a/qpid/cpp/common/concurrent/src/APRThread.cpp b/qpid/cpp/src/qpid/concurrent/APRThread.cpp
index 4167fb76ff..6b8ceb720a 100644
--- a/qpid/cpp/common/concurrent/src/APRThread.cpp
+++ b/qpid/cpp/src/qpid/concurrent/APRThread.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "APRBase.h"
-#include "APRThread.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/concurrent/APRThread.h"
 #include "apr_portable.h"
 
 using namespace qpid::concurrent;
diff --git a/qpid/cpp/common/concurrent/inc/APRThread.h b/qpid/cpp/src/qpid/concurrent/APRThread.h
index d5034ce3b7..2ea88da49c 100644
--- a/qpid/cpp/common/concurrent/inc/APRThread.h
+++ b/qpid/cpp/src/qpid/concurrent/APRThread.h
@@ -19,9 +19,9 @@
 #define _APRThread_
 
 #include "apr_thread_proc.h"
-#include "APRThread.h"
-#include "Runnable.h"
-#include "Thread.h"
+#include "qpid/concurrent/APRThread.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/concurrent/Thread.h"
 
 namespace qpid {
 namespace concurrent {
diff --git a/qpid/cpp/common/concurrent/src/APRThreadFactory.cpp b/qpid/cpp/src/qpid/concurrent/APRThreadFactory.cpp
index 9ba68e9e56..1c99a3da33 100644
--- a/qpid/cpp/common/concurrent/src/APRThreadFactory.cpp
+++ b/qpid/cpp/src/qpid/concurrent/APRThreadFactory.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "APRBase.h"
-#include "APRThreadFactory.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/concurrent/APRThreadFactory.h"
 
 using namespace qpid::concurrent;
 
diff --git a/qpid/cpp/common/concurrent/inc/APRThreadFactory.h b/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h
index 87b240025d..3585fab126 100644
--- a/qpid/cpp/common/concurrent/inc/APRThreadFactory.h
+++ b/qpid/cpp/src/qpid/concurrent/APRThreadFactory.h
@@ -20,10 +20,10 @@
 
 #include "apr_thread_proc.h"
 
-#include "APRThread.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
-#include "Runnable.h"
+#include "qpid/concurrent/APRThread.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/concurrent/Runnable.h"
 
 namespace qpid {
 namespace concurrent {
diff --git a/qpid/cpp/common/concurrent/src/APRThreadPool.cpp b/qpid/cpp/src/qpid/concurrent/APRThreadPool.cpp
index 8518d98b67..3222c71b0c 100644
--- a/qpid/cpp/common/concurrent/src/APRThreadPool.cpp
+++ b/qpid/cpp/src/qpid/concurrent/APRThreadPool.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "APRThreadFactory.h"
-#include "APRThreadPool.h"
-#include "QpidError.h"
+#include "qpid/concurrent/APRThreadFactory.h"
+#include "qpid/concurrent/APRThreadPool.h"
+#include "qpid/QpidError.h"
 #include <iostream>
 
 using namespace qpid::concurrent;
diff --git a/qpid/cpp/common/concurrent/inc/APRThreadPool.h b/qpid/cpp/src/qpid/concurrent/APRThreadPool.h
index cf6d30774c..cab5bcc9ce 100644
--- a/qpid/cpp/common/concurrent/inc/APRThreadPool.h
+++ b/qpid/cpp/src/qpid/concurrent/APRThreadPool.h
@@ -20,11 +20,11 @@
 
 #include <queue>
 #include <vector>
-#include "APRMonitor.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
-#include "ThreadPool.h"
-#include "Runnable.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/concurrent/ThreadPool.h"
+#include "qpid/concurrent/Runnable.h"
 
 namespace qpid {
 namespace concurrent {
diff --git a/qpid/cpp/common/concurrent/inc/LMonitor.h b/qpid/cpp/src/qpid/concurrent/LMonitor.h
index 8e2569921d..70e99b9807 100644
--- a/qpid/cpp/common/concurrent/inc/LMonitor.h
+++ b/qpid/cpp/src/qpid/concurrent/LMonitor.h
@@ -20,7 +20,7 @@
 
 /* Native Linux Monitor - Based of Kernel patch 19/20 */
 
-#include "Monitor.h"
+#include "qpid/concurrent/Monitor.h"
 
 namespace qpid {
 namespace concurrent {
diff --git a/qpid/cpp/common/concurrent/inc/LThreadFactory.h b/qpid/cpp/src/qpid/concurrent/LThreadFactory.h
index 4a573d1bd1..4a573d1bd1 100644
--- a/qpid/cpp/common/concurrent/inc/LThreadFactory.h
+++ b/qpid/cpp/src/qpid/concurrent/LThreadFactory.h
diff --git a/qpid/cpp/common/concurrent/inc/LockedQueue.h b/qpid/cpp/src/qpid/concurrent/LockedQueue.h
index ef3f0b8381..e55bd9f25a 100644
--- a/qpid/cpp/common/concurrent/inc/LockedQueue.h
+++ b/qpid/cpp/src/qpid/concurrent/LockedQueue.h
@@ -19,7 +19,7 @@
 #define _LockedQueue_
 
 #include <queue>
-#include "Monitor.h"
+#include "qpid/concurrent/Monitor.h"
 
 /**
  * A threadsafe queue abstraction
diff --git a/qpid/cpp/common/concurrent/inc/Monitor.h b/qpid/cpp/src/qpid/concurrent/Monitor.h
index 7f1a299c6a..42e88c0a48 100644
--- a/qpid/cpp/common/concurrent/inc/Monitor.h
+++ b/qpid/cpp/src/qpid/concurrent/Monitor.h
@@ -18,7 +18,7 @@
 #ifndef _Monitor_
 #define _Monitor_
 
-#include "amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 
 namespace qpid {
 namespace concurrent {
diff --git a/qpid/cpp/common/concurrent/inc/MonitorImpl.h b/qpid/cpp/src/qpid/concurrent/MonitorImpl.h
index e96e81d795..258ad140b3 100644
--- a/qpid/cpp/common/concurrent/inc/MonitorImpl.h
+++ b/qpid/cpp/src/qpid/concurrent/MonitorImpl.h
@@ -21,9 +21,9 @@
 #define _MonitorImpl_
 
 #ifdef _USE_APR_IO_
-#include "APRMonitor.h"
+#include "qpid/concurrent/APRMonitor.h"
 #else /* use POSIX Monitor */
-#include "LMonitor.h"  
+#include "qpid/concurrent/LMonitor.h"  
 #endif
 
 
diff --git a/qpid/cpp/common/concurrent/src/Runnable.cpp b/qpid/cpp/src/qpid/concurrent/Runnable.cpp
index cf9b8d586f..5b18ccfab6 100644
--- a/qpid/cpp/common/concurrent/src/Runnable.cpp
+++ b/qpid/cpp/src/qpid/concurrent/Runnable.cpp
@@ -15,5 +15,5 @@
  *
  */
 
-#include "Runnable.h"
+#include "qpid/concurrent/Runnable.h"
 qpid::concurrent::Runnable::~Runnable() {}
diff --git a/qpid/cpp/common/concurrent/inc/Runnable.h b/qpid/cpp/src/qpid/concurrent/Runnable.h
index 9753a1ad0a..9753a1ad0a 100644
--- a/qpid/cpp/common/concurrent/inc/Runnable.h
+++ b/qpid/cpp/src/qpid/concurrent/Runnable.h
diff --git a/qpid/cpp/common/concurrent/inc/TaskQueue.h b/qpid/cpp/src/qpid/concurrent/TaskQueue.h
index e06a3ce069..4abadd7dc5 100644
--- a/qpid/cpp/common/concurrent/inc/TaskQueue.h
+++ b/qpid/cpp/src/qpid/concurrent/TaskQueue.h
@@ -21,9 +21,9 @@
 #include <iostream>
 #include <memory>
 #include <queue>
-#include "LockedQueue.h"
-#include "Runnable.h"
-#include "ThreadPool.h"
+#include "qpid/concurrent/LockedQueue.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/concurrent/ThreadPool.h"
 
 namespace qpid {
 namespace concurrent {
diff --git a/qpid/cpp/common/concurrent/inc/Thread.h b/qpid/cpp/src/qpid/concurrent/Thread.h
index 6bd2a379ce..6bd2a379ce 100644
--- a/qpid/cpp/common/concurrent/inc/Thread.h
+++ b/qpid/cpp/src/qpid/concurrent/Thread.h
diff --git a/qpid/cpp/common/concurrent/inc/ThreadFactory.h b/qpid/cpp/src/qpid/concurrent/ThreadFactory.h
index 53be000ff3..60c8ad2556 100644
--- a/qpid/cpp/common/concurrent/inc/ThreadFactory.h
+++ b/qpid/cpp/src/qpid/concurrent/ThreadFactory.h
@@ -18,8 +18,8 @@
 #ifndef _ThreadFactory_
 #define _ThreadFactory_
 
-#include "Thread.h"
-#include "Runnable.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/Runnable.h"
 
 namespace qpid {
 namespace concurrent {
diff --git a/qpid/cpp/common/concurrent/inc/ThreadFactoryImpl.h b/qpid/cpp/src/qpid/concurrent/ThreadFactoryImpl.h
index a534b3c1e2..352b77ac21 100644
--- a/qpid/cpp/common/concurrent/inc/ThreadFactoryImpl.h
+++ b/qpid/cpp/src/qpid/concurrent/ThreadFactoryImpl.h
@@ -20,9 +20,9 @@
 
 
 #ifdef _USE_APR_IO_
-#include "APRThreadFactory.h"
+#include "qpid/concurrent/APRThreadFactory.h"
 #else
-#include "LThreadFactory.h"
+#include "qpid/concurrent/LThreadFactory.h"
 #endif
 
 
diff --git a/qpid/cpp/common/concurrent/inc/ThreadPool.h b/qpid/cpp/src/qpid/concurrent/ThreadPool.h
index 679c889ff3..925faa76de 100644
--- a/qpid/cpp/common/concurrent/inc/ThreadPool.h
+++ b/qpid/cpp/src/qpid/concurrent/ThreadPool.h
@@ -18,8 +18,8 @@
 #ifndef _ThreadPool_
 #define _ThreadPool_
 
-#include "Thread.h"
-#include "Runnable.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/Runnable.h"
 
 namespace qpid {
 namespace concurrent {
diff --git a/qpid/cpp/common/framing/src/AMQBody.cpp b/qpid/cpp/src/qpid/framing/AMQBody.cpp
index 08f0b1d7ca..850635af15 100644
--- a/qpid/cpp/common/framing/src/AMQBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQBody.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "AMQBody.h"
+#include "qpid/framing/AMQBody.h"
 #include <iostream>
 
 std::ostream& qpid::framing::operator<<(std::ostream& out, const qpid::framing::AMQBody& body) 
diff --git a/qpid/cpp/common/framing/inc/AMQBody.h b/qpid/cpp/src/qpid/framing/AMQBody.h
index a1770820a9..1c7f9419ed 100644
--- a/qpid/cpp/common/framing/inc/AMQBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQBody.h
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "memory.h"
-#include "amqp_types.h"
-#include "Buffer.h"
+#include "./memory.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _AMQBody_
 #define _AMQBody_
diff --git a/qpid/cpp/common/framing/src/AMQContentBody.cpp b/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
index 1be8867d53..16a9e492ab 100644
--- a/qpid/cpp/common/framing/src/AMQContentBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQContentBody.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "AMQContentBody.h"
+#include "qpid/framing/AMQContentBody.h"
 #include <iostream>
 
 qpid::framing::AMQContentBody::AMQContentBody(){
diff --git a/qpid/cpp/common/framing/inc/AMQContentBody.h b/qpid/cpp/src/qpid/framing/AMQContentBody.h
index daf7d6cd44..40dd8f159c 100644
--- a/qpid/cpp/common/framing/inc/AMQContentBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQContentBody.h
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "AMQBody.h"
-#include "Buffer.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _AMQContentBody_
 #define _AMQContentBody_
diff --git a/qpid/cpp/common/framing/inc/AMQDataBlock.h b/qpid/cpp/src/qpid/framing/AMQDataBlock.h
index 6c47c78864..bdb4f55796 100644
--- a/qpid/cpp/common/framing/inc/AMQDataBlock.h
+++ b/qpid/cpp/src/qpid/framing/AMQDataBlock.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "Buffer.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _AMQDataBlock_
 #define _AMQDataBlock_
diff --git a/qpid/cpp/common/framing/src/AMQFrame.cpp b/qpid/cpp/src/qpid/framing/AMQFrame.cpp
index 487ab1a443..2d89a8a797 100644
--- a/qpid/cpp/common/framing/src/AMQFrame.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQFrame.cpp
@@ -16,8 +16,8 @@
  * limitations under the License.
  *
  */
-#include "AMQFrame.h"
-#include "QpidError.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/QpidError.h"
 
 using namespace qpid::framing;
 
diff --git a/qpid/cpp/common/framing/inc/AMQFrame.h b/qpid/cpp/src/qpid/framing/AMQFrame.h
index 5656d20377..6f05aef584 100644
--- a/qpid/cpp/common/framing/inc/AMQFrame.h
+++ b/qpid/cpp/src/qpid/framing/AMQFrame.h
@@ -15,15 +15,15 @@
  * limitations under the License.
  *
  */
-#include "amqp_methods.h"
-#include "amqp_types.h"
-#include "AMQBody.h"
-#include "AMQDataBlock.h"
-#include "AMQMethodBody.h"
-#include "AMQHeaderBody.h"
-#include "AMQContentBody.h"
-#include "AMQHeartbeatBody.h"
-#include "Buffer.h"
+#include "qpid/framing/amqp_methods.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/AMQDataBlock.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeartbeatBody.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _AMQFrame_
 #define _AMQFrame_
diff --git a/qpid/cpp/common/framing/src/AMQHeaderBody.cpp b/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
index dce5f1fd54..eb360d8bc8 100644
--- a/qpid/cpp/common/framing/src/AMQHeaderBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQHeaderBody.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "AMQHeaderBody.h"
-#include "QpidError.h"
-#include "BasicHeaderProperties.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/QpidError.h"
+#include "qpid/framing/BasicHeaderProperties.h"
 
 qpid::framing::AMQHeaderBody::AMQHeaderBody(int classId) : weight(0), contentSize(0){
     createProperties(classId);
diff --git a/qpid/cpp/common/framing/inc/AMQHeaderBody.h b/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
index 4f9cdb571a..4f3804ed75 100644
--- a/qpid/cpp/common/framing/inc/AMQHeaderBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQHeaderBody.h
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "AMQBody.h"
-#include "Buffer.h"
-#include "HeaderProperties.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/HeaderProperties.h"
 
 #ifndef _AMQHeaderBody_
 #define _AMQHeaderBody_
diff --git a/qpid/cpp/common/framing/src/AMQHeartbeatBody.cpp b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
index 15cbfeda48..bcac68412b 100644
--- a/qpid/cpp/common/framing/src/AMQHeartbeatBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "AMQHeartbeatBody.h"
+#include "qpid/framing/AMQHeartbeatBody.h"
 #include <iostream>
 
 qpid::framing::AMQHeartbeatBody::~AMQHeartbeatBody() {}
diff --git a/qpid/cpp/common/framing/inc/AMQHeartbeatBody.h b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
index da612a2a44..9d4c7d5b1a 100644
--- a/qpid/cpp/common/framing/inc/AMQHeartbeatBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQHeartbeatBody.h
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "AMQBody.h"
-#include "Buffer.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _AMQHeartbeatBody_
 #define _AMQHeartbeatBody_
diff --git a/qpid/cpp/common/framing/src/AMQMethodBody.cpp b/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
index 7455050377..803bab3517 100644
--- a/qpid/cpp/common/framing/src/AMQMethodBody.cpp
+++ b/qpid/cpp/src/qpid/framing/AMQMethodBody.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "AMQMethodBody.h"
-#include "QpidError.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/QpidError.h"
 
 void qpid::framing::AMQMethodBody::encode(Buffer& buffer) const{
     buffer.putShort(amqpClassId());
diff --git a/qpid/cpp/common/framing/inc/AMQMethodBody.h b/qpid/cpp/src/qpid/framing/AMQMethodBody.h
index 59d5dd5212..d22c86918c 100644
--- a/qpid/cpp/common/framing/inc/AMQMethodBody.h
+++ b/qpid/cpp/src/qpid/framing/AMQMethodBody.h
@@ -16,10 +16,10 @@
  *
  */
 #include <iostream>
-#include "amqp_types.h"
-#include "AMQBody.h"
-#include "Buffer.h"
-#include "AMQP_ServerOperations.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/AMQP_ServerOperations.h"
 
 #ifndef _AMQMethodBody_
 #define _AMQMethodBody_
diff --git a/qpid/cpp/common/framing/src/BasicHeaderProperties.cpp b/qpid/cpp/src/qpid/framing/BasicHeaderProperties.cpp
index c9153665d5..94e2ff3914 100644
--- a/qpid/cpp/common/framing/src/BasicHeaderProperties.cpp
+++ b/qpid/cpp/src/qpid/framing/BasicHeaderProperties.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "BasicHeaderProperties.h"
+#include "qpid/framing/BasicHeaderProperties.h"
 
 //TODO: This could be easily generated from the spec
 
diff --git a/qpid/cpp/common/framing/inc/BasicHeaderProperties.h b/qpid/cpp/src/qpid/framing/BasicHeaderProperties.h
index c32612221b..e82699753b 100644
--- a/qpid/cpp/common/framing/inc/BasicHeaderProperties.h
+++ b/qpid/cpp/src/qpid/framing/BasicHeaderProperties.h
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "amqp_methods.h"
-#include "Buffer.h"
-#include "HeaderProperties.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/amqp_methods.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/HeaderProperties.h"
 
 #ifndef _BasicHeaderProperties_
 #define _BasicHeaderProperties_
diff --git a/qpid/cpp/common/framing/src/BodyHandler.cpp b/qpid/cpp/src/qpid/framing/BodyHandler.cpp
index b428c62637..f9079c27ea 100644
--- a/qpid/cpp/common/framing/src/BodyHandler.cpp
+++ b/qpid/cpp/src/qpid/framing/BodyHandler.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "memory.h"
-#include "BodyHandler.h"
+#include "./memory.h"
+#include "qpid/framing/BodyHandler.h"
 
 using namespace qpid::framing;
 using namespace std::tr1;
diff --git a/qpid/cpp/common/framing/inc/BodyHandler.h b/qpid/cpp/src/qpid/framing/BodyHandler.h
index a4aee2709e..0cd7f7fa11 100644
--- a/qpid/cpp/common/framing/inc/BodyHandler.h
+++ b/qpid/cpp/src/qpid/framing/BodyHandler.h
@@ -20,10 +20,10 @@
 #ifndef _BodyHandler_
 #define _BodyHandler_
 
-#include "AMQMethodBody.h"
-#include "AMQHeaderBody.h"
-#include "AMQContentBody.h"
-#include "AMQHeartbeatBody.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeartbeatBody.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/src/Buffer.cpp b/qpid/cpp/src/qpid/framing/Buffer.cpp
index 87aa1df7e9..b7c17fa86f 100644
--- a/qpid/cpp/common/framing/src/Buffer.cpp
+++ b/qpid/cpp/src/qpid/framing/Buffer.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "Buffer.h"
-#include "FieldTable.h" 
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/FieldTable.h" 
 
 qpid::framing::Buffer::Buffer(u_int32_t _size) : size(_size), position(0), limit(_size){
     data = new char[size];
diff --git a/qpid/cpp/common/framing/inc/Buffer.h b/qpid/cpp/src/qpid/framing/Buffer.h
index 4d3d503b00..1698144908 100644
--- a/qpid/cpp/common/framing/inc/Buffer.h
+++ b/qpid/cpp/src/qpid/framing/Buffer.h
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 
 #ifndef _Buffer_
 #define _Buffer_
diff --git a/qpid/cpp/common/framing/src/FieldTable.cpp b/qpid/cpp/src/qpid/framing/FieldTable.cpp
index 088c8fb500..b4b245292f 100644
--- a/qpid/cpp/common/framing/src/FieldTable.cpp
+++ b/qpid/cpp/src/qpid/framing/FieldTable.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "FieldTable.h"
-#include "QpidError.h"
-#include "Buffer.h"
-#include "Value.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/QpidError.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/Value.h"
 #include <assert.h>
 
 namespace qpid {
diff --git a/qpid/cpp/common/framing/inc/FieldTable.h b/qpid/cpp/src/qpid/framing/FieldTable.h
index 7da914968e..b48b270895 100644
--- a/qpid/cpp/common/framing/inc/FieldTable.h
+++ b/qpid/cpp/src/qpid/framing/FieldTable.h
@@ -19,7 +19,7 @@
 #include <vector>
 #include <tr1/memory>
 #include <tr1/unordered_map>
-#include "amqp_types.h"
+#include "qpid/framing/amqp_types.h"
 
 #ifndef _FieldTable_
 #define _FieldTable_
diff --git a/qpid/cpp/common/framing/inc/HeaderProperties.h b/qpid/cpp/src/qpid/framing/HeaderProperties.h
index f84345c203..a699c37163 100644
--- a/qpid/cpp/common/framing/inc/HeaderProperties.h
+++ b/qpid/cpp/src/qpid/framing/HeaderProperties.h
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "Buffer.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/Buffer.h"
 
 #ifndef _HeaderProperties_
 #define _HeaderProperties_
diff --git a/qpid/cpp/common/framing/src/InitiationHandler.cpp b/qpid/cpp/src/qpid/framing/InitiationHandler.cpp
index 9c18facf44..7a15864216 100644
--- a/qpid/cpp/common/framing/src/InitiationHandler.cpp
+++ b/qpid/cpp/src/qpid/framing/InitiationHandler.cpp
@@ -16,6 +16,6 @@
  *
  */
 
-#include "InitiationHandler.h"
+#include "qpid/framing/InitiationHandler.h"
 
 qpid::framing::InitiationHandler::~InitiationHandler() {}
diff --git a/qpid/cpp/common/framing/inc/InitiationHandler.h b/qpid/cpp/src/qpid/framing/InitiationHandler.h
index 7b1fb36e2d..da902f0dff 100644
--- a/qpid/cpp/common/framing/inc/InitiationHandler.h
+++ b/qpid/cpp/src/qpid/framing/InitiationHandler.h
@@ -20,7 +20,7 @@
 #ifndef _InitiationHandler_
 #define _InitiationHandler_
 
-#include "ProtocolInitiation.h"
+#include "qpid/framing/ProtocolInitiation.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/src/InputHandler.cpp b/qpid/cpp/src/qpid/framing/InputHandler.cpp
index 7116caa24a..accf68421a 100644
--- a/qpid/cpp/common/framing/src/InputHandler.cpp
+++ b/qpid/cpp/src/qpid/framing/InputHandler.cpp
@@ -16,6 +16,6 @@
  *
  */
 
-#include "InputHandler.h"
+#include "qpid/framing/InputHandler.h"
 
 qpid::framing::InputHandler::~InputHandler() {}
diff --git a/qpid/cpp/common/framing/inc/InputHandler.h b/qpid/cpp/src/qpid/framing/InputHandler.h
index 927bd97ab4..e2ad545993 100644
--- a/qpid/cpp/common/framing/inc/InputHandler.h
+++ b/qpid/cpp/src/qpid/framing/InputHandler.h
@@ -20,7 +20,7 @@
 #ifndef _InputHandler_
 #define _InputHandler_
 
-#include "AMQFrame.h"
+#include "qpid/framing/AMQFrame.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/src/OutputHandler.cpp b/qpid/cpp/src/qpid/framing/OutputHandler.cpp
index 8d99b4ef92..22de39b82a 100644
--- a/qpid/cpp/common/framing/src/OutputHandler.cpp
+++ b/qpid/cpp/src/qpid/framing/OutputHandler.cpp
@@ -16,6 +16,6 @@
  *
  */
 
-#include "OutputHandler.h"
+#include "qpid/framing/OutputHandler.h"
 
 qpid::framing::OutputHandler::~OutputHandler() {}
diff --git a/qpid/cpp/common/framing/inc/OutputHandler.h b/qpid/cpp/src/qpid/framing/OutputHandler.h
index afc8d7f257..ed38a321e5 100644
--- a/qpid/cpp/common/framing/inc/OutputHandler.h
+++ b/qpid/cpp/src/qpid/framing/OutputHandler.h
@@ -20,7 +20,7 @@
 #ifndef _OutputHandler_
 #define _OutputHandler_
 
-#include "AMQFrame.h"
+#include "qpid/framing/AMQFrame.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/src/ProtocolInitiation.cpp b/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
index 6806d73b55..aebdf6709e 100644
--- a/qpid/cpp/common/framing/src/ProtocolInitiation.cpp
+++ b/qpid/cpp/src/qpid/framing/ProtocolInitiation.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "ProtocolInitiation.h"
+#include "qpid/framing/ProtocolInitiation.h"
 
 qpid::framing::ProtocolInitiation::ProtocolInitiation(){}
 
diff --git a/qpid/cpp/common/framing/inc/ProtocolInitiation.h b/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
index ab9734e6b3..b0c1338cbf 100644
--- a/qpid/cpp/common/framing/inc/ProtocolInitiation.h
+++ b/qpid/cpp/src/qpid/framing/ProtocolInitiation.h
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "Buffer.h"
-#include "AMQDataBlock.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/AMQDataBlock.h"
 
 #ifndef _ProtocolInitiation_
 #define _ProtocolInitiation_
diff --git a/qpid/cpp/common/framing/src/Value.cpp b/qpid/cpp/src/qpid/framing/Value.cpp
index 1c210fdb12..4a24ab4147 100644
--- a/qpid/cpp/common/framing/src/Value.cpp
+++ b/qpid/cpp/src/qpid/framing/Value.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "Value.h"
-#include "Buffer.h"
-#include "FieldTable.h"
-#include "QpidError.h"
+#include "qpid/framing/Value.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/FieldTable.h"
+#include "qpid/QpidError.h"
 
 namespace qpid {
 namespace framing {
diff --git a/qpid/cpp/common/framing/inc/Value.h b/qpid/cpp/src/qpid/framing/Value.h
index fe939e8758..3c538719db 100644
--- a/qpid/cpp/common/framing/inc/Value.h
+++ b/qpid/cpp/src/qpid/framing/Value.h
@@ -17,8 +17,8 @@
  */
 #include <iostream>
 #include <vector>
-#include "amqp_types.h"
-#include "FieldTable.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/FieldTable.h"
 
 #ifndef _Value_
 #define _Value_
diff --git a/qpid/cpp/common/framing/inc/amqp_framing.h b/qpid/cpp/src/qpid/framing/amqp_framing.h
index adb0045ee5..34ebf665e7 100644
--- a/qpid/cpp/common/framing/inc/amqp_framing.h
+++ b/qpid/cpp/src/qpid/framing/amqp_framing.h
@@ -15,17 +15,17 @@
  * limitations under the License.
  *
  */
-#include "amqp_types.h"
-#include "AMQFrame.h"
-#include "AMQBody.h"
-#include "BodyHandler.h"
-#include "AMQMethodBody.h"
-#include "AMQHeaderBody.h"
-#include "AMQContentBody.h"
-#include "AMQHeartbeatBody.h"
-#include "amqp_methods.h"
-#include "InputHandler.h"
-#include "OutputHandler.h"
-#include "InitiationHandler.h"
-#include "ProtocolInitiation.h"
-#include "BasicHeaderProperties.h"
+#include "qpid/framing/amqp_types.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/framing/AMQBody.h"
+#include "qpid/framing/BodyHandler.h"
+#include "qpid/framing/AMQMethodBody.h"
+#include "qpid/framing/AMQHeaderBody.h"
+#include "qpid/framing/AMQContentBody.h"
+#include "qpid/framing/AMQHeartbeatBody.h"
+#include "qpid/framing/amqp_methods.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/framing/BasicHeaderProperties.h"
diff --git a/qpid/cpp/common/framing/inc/amqp_types.h b/qpid/cpp/src/qpid/framing/amqp_types.h
index 6f8ef0862a..6f8ef0862a 100644
--- a/qpid/cpp/common/framing/inc/amqp_types.h
+++ b/qpid/cpp/src/qpid/framing/amqp_types.h
diff --git a/qpid/cpp/common/io/src/APRConnector.cpp b/qpid/cpp/src/qpid/io/APRConnector.cpp
index 5f3bfd6957..91cf01c842 100644
--- a/qpid/cpp/common/io/src/APRConnector.cpp
+++ b/qpid/cpp/src/qpid/io/APRConnector.cpp
@@ -16,10 +16,10 @@
  *
  */
 #include <iostream>
-#include "APRBase.h"
-#include "APRConnector.h"
-#include "APRThreadFactory.h"
-#include "QpidError.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/io/APRConnector.h"
+#include "qpid/concurrent/APRThreadFactory.h"
+#include "qpid/QpidError.h"
 
 using namespace qpid::io;
 using namespace qpid::concurrent;
diff --git a/qpid/cpp/common/io/inc/APRConnector.h b/qpid/cpp/src/qpid/io/APRConnector.h
index c6ed887f78..e097fc27eb 100644
--- a/qpid/cpp/common/io/inc/APRConnector.h
+++ b/qpid/cpp/src/qpid/io/APRConnector.h
@@ -21,15 +21,15 @@
 #include "apr_network_io.h"
 #include "apr_time.h"
 
-#include "InputHandler.h"
-#include "OutputHandler.h"
-#include "InitiationHandler.h"
-#include "ProtocolInitiation.h"
-#include "ShutdownHandler.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
-#include "Connector.h"
-#include "APRMonitor.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/io/ShutdownHandler.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/io/Connector.h"
+#include "qpid/concurrent/APRMonitor.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/src/APRSocket.cpp b/qpid/cpp/src/qpid/io/APRSocket.cpp
index 1ef7e270a3..c142b04df3 100644
--- a/qpid/cpp/common/io/src/APRSocket.cpp
+++ b/qpid/cpp/src/qpid/io/APRSocket.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "APRBase.h"
-#include "APRSocket.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/io/APRSocket.h"
 #include <assert.h>
 #include <iostream>
 
diff --git a/qpid/cpp/common/io/inc/APRSocket.h b/qpid/cpp/src/qpid/io/APRSocket.h
index 610cf0e175..742f958b8a 100644
--- a/qpid/cpp/common/io/inc/APRSocket.h
+++ b/qpid/cpp/src/qpid/io/APRSocket.h
@@ -19,7 +19,7 @@
 #define _APRSocket_
 
 #include "apr_network_io.h"
-#include "Buffer.h"
+#include "qpid/framing/Buffer.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/src/Acceptor.cpp b/qpid/cpp/src/qpid/io/Acceptor.cpp
index d1825c78fa..6b76bd4da2 100644
--- a/qpid/cpp/common/io/src/Acceptor.cpp
+++ b/qpid/cpp/src/qpid/io/Acceptor.cpp
@@ -16,6 +16,6 @@
  *
  */
 
-#include "Acceptor.h"
+#include "qpid/io/Acceptor.h"
 
 qpid::io::Acceptor::~Acceptor() {}
diff --git a/qpid/cpp/common/io/inc/Acceptor.h b/qpid/cpp/src/qpid/io/Acceptor.h
index d7313b84db..a7f7ad66f0 100644
--- a/qpid/cpp/common/io/inc/Acceptor.h
+++ b/qpid/cpp/src/qpid/io/Acceptor.h
@@ -18,7 +18,7 @@
 #ifndef _Acceptor_
 #define _Acceptor_
 
-#include "SessionHandlerFactory.h"
+#include "qpid/io/SessionHandlerFactory.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/src/BlockingAPRAcceptor.cpp b/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.cpp
index 4c55b9e2c8..0e1fc535a2 100644
--- a/qpid/cpp/common/io/src/BlockingAPRAcceptor.cpp
+++ b/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.cpp
@@ -16,9 +16,9 @@
  *
  */
 #include <iostream>
-#include "BlockingAPRAcceptor.h"
-#include "APRBase.h"
-#include "APRThreadFactory.h"
+#include "qpid/io/BlockingAPRAcceptor.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/concurrent/APRThreadFactory.h"
 
 using namespace qpid::concurrent;
 using namespace qpid::framing;
diff --git a/qpid/cpp/common/io/inc/BlockingAPRAcceptor.h b/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h
index bd069ed8db..8c83c726c9 100644
--- a/qpid/cpp/common/io/inc/BlockingAPRAcceptor.h
+++ b/qpid/cpp/src/qpid/io/BlockingAPRAcceptor.h
@@ -23,15 +23,15 @@
 #include "apr_poll.h"
 #include "apr_time.h"
 
-#include "Acceptor.h"
-#include "APRMonitor.h"
-#include "BlockingAPRSessionContext.h"
-#include "Runnable.h"
-#include "SessionContext.h"
-#include "SessionHandlerFactory.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
-#include "ThreadPool.h"
+#include "qpid/io/Acceptor.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/io/BlockingAPRSessionContext.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandlerFactory.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/concurrent/ThreadPool.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/src/BlockingAPRSessionContext.cpp b/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.cpp
index 6d1dc3470c..aee223ca3b 100644
--- a/qpid/cpp/common/io/src/BlockingAPRSessionContext.cpp
+++ b/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.cpp
@@ -17,10 +17,10 @@
  */
 #include <assert.h>
 #include <iostream>
-#include "BlockingAPRSessionContext.h"
-#include "BlockingAPRAcceptor.h"
-#include "APRBase.h"
-#include "QpidError.h"
+#include "qpid/io/BlockingAPRSessionContext.h"
+#include "qpid/io/BlockingAPRAcceptor.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/QpidError.h"
 
 using namespace qpid::concurrent;
 using namespace qpid::framing;
diff --git a/qpid/cpp/common/io/inc/BlockingAPRSessionContext.h b/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h
index 038ebd6662..006b73b55c 100644
--- a/qpid/cpp/common/io/inc/BlockingAPRSessionContext.h
+++ b/qpid/cpp/src/qpid/io/BlockingAPRSessionContext.h
@@ -24,16 +24,16 @@
 #include "apr_network_io.h"
 #include "apr_time.h"
 
-#include "AMQFrame.h"
-#include "APRMonitor.h"
-#include "Buffer.h"
-#include "Runnable.h"
-#include "SessionContext.h"
-#include "SessionHandler.h"
-#include "SessionHandlerFactory.h"
-#include "ShutdownHandler.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandler.h"
+#include "qpid/io/SessionHandlerFactory.h"
+#include "qpid/io/ShutdownHandler.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/inc/Connector.h b/qpid/cpp/src/qpid/io/Connector.h
index 52684329f1..d0a2f470a8 100644
--- a/qpid/cpp/common/io/inc/Connector.h
+++ b/qpid/cpp/src/qpid/io/Connector.h
@@ -18,12 +18,12 @@
 #ifndef _Connector_
 #define _Connector_
 
-#include "InputHandler.h"
-#include "OutputHandler.h"
-#include "InitiationHandler.h"
-#include "ProtocolInitiation.h"
-#include "ShutdownHandler.h"
-#include "TimeoutHandler.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/io/ShutdownHandler.h"
+#include "qpid/io/TimeoutHandler.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/inc/ConnectorImpl.h b/qpid/cpp/src/qpid/io/ConnectorImpl.h
index 1abb72f32a..55dcf7a2d4 100644
--- a/qpid/cpp/common/io/inc/ConnectorImpl.h
+++ b/qpid/cpp/src/qpid/io/ConnectorImpl.h
@@ -19,9 +19,9 @@
 #define _APRConnectorImpl_
 
 #ifdef _USE_APR_IO_
-#include "APRConnector.h"
+#include "qpid/io/APRConnector.h"
 #else
-#include "LConnector.h"
+#include "qpid/io/LConnector.h"
 #endif
 
 namespace qpid {
diff --git a/qpid/cpp/common/io/inc/LConnector.h b/qpid/cpp/src/qpid/io/LConnector.h
index 59d95a6b57..5fc86597bd 100644
--- a/qpid/cpp/common/io/inc/LConnector.h
+++ b/qpid/cpp/src/qpid/io/LConnector.h
@@ -19,13 +19,13 @@
 #define _LConnector_
 
 
-#include "InputHandler.h"
-#include "OutputHandler.h"
-#include "InitiationHandler.h"
-#include "ProtocolInitiation.h"
-#include "Thread.h"
-#include "ThreadFactory.h"
-#include "Connector.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/OutputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/concurrent/Thread.h"
+#include "qpid/concurrent/ThreadFactory.h"
+#include "qpid/io/Connector.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/src/LFAcceptor.cpp b/qpid/cpp/src/qpid/io/LFAcceptor.cpp
index 86f382afac..7e51a550af 100644
--- a/qpid/cpp/common/io/src/LFAcceptor.cpp
+++ b/qpid/cpp/src/qpid/io/LFAcceptor.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "LFAcceptor.h"
-#include "APRBase.h"
+#include "qpid/io/LFAcceptor.h"
+#include "qpid/concurrent/APRBase.h"
 
 using namespace qpid::concurrent;
 using namespace qpid::io;
diff --git a/qpid/cpp/common/io/inc/LFAcceptor.h b/qpid/cpp/src/qpid/io/LFAcceptor.h
index 9a40eed222..f31b544143 100644
--- a/qpid/cpp/common/io/inc/LFAcceptor.h
+++ b/qpid/cpp/src/qpid/io/LFAcceptor.h
@@ -23,16 +23,16 @@
 #include "apr_poll.h"
 #include "apr_time.h"
 
-#include "Acceptor.h"
-#include "APRMonitor.h"
-#include "APRThreadFactory.h"
-#include "APRThreadPool.h"
-#include "LFProcessor.h"
-#include "LFSessionContext.h"
-#include "Runnable.h"
-#include "SessionContext.h"
-#include "SessionHandlerFactory.h"
-#include "Thread.h"
+#include "qpid/io/Acceptor.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/concurrent/APRThreadFactory.h"
+#include "qpid/concurrent/APRThreadPool.h"
+#include "qpid/io/LFProcessor.h"
+#include "qpid/io/LFSessionContext.h"
+#include "qpid/concurrent/Runnable.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandlerFactory.h"
+#include "qpid/concurrent/Thread.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/src/LFProcessor.cpp b/qpid/cpp/src/qpid/io/LFProcessor.cpp
index 65d7451767..dba5d6c962 100644
--- a/qpid/cpp/common/io/src/LFProcessor.cpp
+++ b/qpid/cpp/src/qpid/io/LFProcessor.cpp
@@ -15,10 +15,10 @@
  * limitations under the License.
  *
  */
-#include "LFProcessor.h"
-#include "APRBase.h"
-#include "LFSessionContext.h"
-#include "QpidError.h"
+#include "qpid/io/LFProcessor.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/io/LFSessionContext.h"
+#include "qpid/QpidError.h"
 #include <sstream>
 
 using namespace qpid::io;
diff --git a/qpid/cpp/common/io/inc/LFProcessor.h b/qpid/cpp/src/qpid/io/LFProcessor.h
index 25a3c8626c..e3f533d597 100644
--- a/qpid/cpp/common/io/inc/LFProcessor.h
+++ b/qpid/cpp/src/qpid/io/LFProcessor.h
@@ -21,9 +21,9 @@
 #include "apr_poll.h"
 #include <iostream>
 #include <vector>
-#include "APRMonitor.h"
-#include "APRThreadFactory.h"
-#include "Runnable.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/concurrent/APRThreadFactory.h"
+#include "qpid/concurrent/Runnable.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/src/LFSessionContext.cpp b/qpid/cpp/src/qpid/io/LFSessionContext.cpp
index 7b8208f704..6d6d786841 100644
--- a/qpid/cpp/common/io/src/LFSessionContext.cpp
+++ b/qpid/cpp/src/qpid/io/LFSessionContext.cpp
@@ -15,9 +15,9 @@
  * limitations under the License.
  *
  */
-#include "LFSessionContext.h"
-#include "APRBase.h"
-#include "QpidError.h"
+#include "qpid/io/LFSessionContext.h"
+#include "qpid/concurrent/APRBase.h"
+#include "qpid/QpidError.h"
 #include <assert.h>
 
 using namespace qpid::concurrent;
diff --git a/qpid/cpp/common/io/inc/LFSessionContext.h b/qpid/cpp/src/qpid/io/LFSessionContext.h
index d07c8910d3..fad8736796 100644
--- a/qpid/cpp/common/io/inc/LFSessionContext.h
+++ b/qpid/cpp/src/qpid/io/LFSessionContext.h
@@ -24,13 +24,13 @@
 #include "apr_poll.h"
 #include "apr_time.h"
 
-#include "AMQFrame.h"
-#include "APRMonitor.h"
-#include "APRSocket.h"
-#include "Buffer.h"
-#include "LFProcessor.h"
-#include "SessionContext.h"
-#include "SessionHandler.h"
+#include "qpid/framing/AMQFrame.h"
+#include "qpid/concurrent/APRMonitor.h"
+#include "qpid/io/APRSocket.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/io/LFProcessor.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandler.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/inc/SessionContext.h b/qpid/cpp/src/qpid/io/SessionContext.h
index f223a70daa..b8fa8de62e 100644
--- a/qpid/cpp/common/io/inc/SessionContext.h
+++ b/qpid/cpp/src/qpid/io/SessionContext.h
@@ -18,7 +18,7 @@
 #ifndef _SessionContext_
 #define _SessionContext_
 
-#include "OutputHandler.h"
+#include "qpid/framing/OutputHandler.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/inc/SessionHandler.h b/qpid/cpp/src/qpid/io/SessionHandler.h
index 21a992ab65..5b4e60213b 100644
--- a/qpid/cpp/common/io/inc/SessionHandler.h
+++ b/qpid/cpp/src/qpid/io/SessionHandler.h
@@ -18,10 +18,10 @@
 #ifndef _SessionHandler_
 #define _SessionHandler_
 
-#include "InputHandler.h"
-#include "InitiationHandler.h"
-#include "ProtocolInitiation.h"
-#include "TimeoutHandler.h"
+#include "qpid/framing/InputHandler.h"
+#include "qpid/framing/InitiationHandler.h"
+#include "qpid/framing/ProtocolInitiation.h"
+#include "qpid/io/TimeoutHandler.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/inc/SessionHandlerFactory.h b/qpid/cpp/src/qpid/io/SessionHandlerFactory.h
index 67d968b72e..8ed2dffe57 100644
--- a/qpid/cpp/common/io/inc/SessionHandlerFactory.h
+++ b/qpid/cpp/src/qpid/io/SessionHandlerFactory.h
@@ -18,8 +18,8 @@
 #ifndef _SessionHandlerFactory_
 #define _SessionHandlerFactory_
 
-#include "SessionContext.h"
-#include "SessionHandler.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandler.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/inc/SessionManager.h b/qpid/cpp/src/qpid/io/SessionManager.h
index 30c5208532..e6b17451e4 100644
--- a/qpid/cpp/common/io/inc/SessionManager.h
+++ b/qpid/cpp/src/qpid/io/SessionManager.h
@@ -18,8 +18,8 @@
 #ifndef _SessionManager_
 #define _SessionManager_
 
-#include "SessionContext.h"
-#include "SessionHandler.h"
+#include "qpid/io/SessionContext.h"
+#include "qpid/io/SessionHandler.h"
 
 namespace qpid {
 namespace io {
diff --git a/qpid/cpp/common/io/inc/ShutdownHandler.h b/qpid/cpp/src/qpid/io/ShutdownHandler.h
index 186d9eeca4..186d9eeca4 100644
--- a/qpid/cpp/common/io/inc/ShutdownHandler.h
+++ b/qpid/cpp/src/qpid/io/ShutdownHandler.h
diff --git a/qpid/cpp/common/io/inc/TimeoutHandler.h b/qpid/cpp/src/qpid/io/TimeoutHandler.h
index c92220fd6e..c92220fd6e 100644
--- a/qpid/cpp/common/io/inc/TimeoutHandler.h
+++ b/qpid/cpp/src/qpid/io/TimeoutHandler.h
diff --git a/qpid/cpp/qpidd/src/qpidd.cpp b/qpid/cpp/src/qpidd.cpp
index 51be80d51d..85d337dd93 100644
--- a/qpid/cpp/qpidd/src/qpidd.cpp
+++ b/qpid/cpp/src/qpidd.cpp
@@ -15,12 +15,8 @@
  * limitations under the License.
  *
  */
-#include "../../broker/inc/../../broker/inc/Broker.h"
-#include "../../broker/inc/Broker.h"
-#include "../../broker/inc/Configuration.h"
-#include "../../broker/inc/SessionHandlerFactoryImpl.h"
-#include "Acceptor.h"
-#include "QpidError.h"
+#include "qpid/broker/Broker.h"
+#include "qpid/broker/Configuration.h"
 #include "apr_signal.h"
 #include <iostream>
 #include <memory>
diff --git a/qpid/cpp/client/test/client_test.cpp b/qpid/cpp/test/client/client_test.cpp
index b899d494d7..b899d494d7 100644
--- a/qpid/cpp/client/test/client_test.cpp
+++ b/qpid/cpp/test/client/client_test.cpp
diff --git a/qpid/cpp/client/test/topic_listener.cpp b/qpid/cpp/test/client/topic_listener.cpp
index a1b8e383a0..a1b8e383a0 100644
--- a/qpid/cpp/client/test/topic_listener.cpp
+++ b/qpid/cpp/test/client/topic_listener.cpp
diff --git a/qpid/cpp/client/test/topic_publisher.cpp b/qpid/cpp/test/client/topic_publisher.cpp
index fc6b7f3b30..fc6b7f3b30 100644
--- a/qpid/cpp/client/test/topic_publisher.cpp
+++ b/qpid/cpp/test/client/topic_publisher.cpp
diff --git a/qpid/cpp/broker/test/ChannelTest.cpp b/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp
index 001a0d9c00..8d54208f77 100644
--- a/qpid/cpp/broker/test/ChannelTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/ChannelTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "Channel.h"
-#include "Message.h"
+#include "../../src/qpid/broker/Channel.h"
+#include "../../src/qpid/broker/Message.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <memory>
diff --git a/qpid/cpp/broker/test/ExchangeTest.cpp b/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp
index 8c702ff836..3d21cb66f0 100644
--- a/qpid/cpp/broker/test/ExchangeTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/ExchangeTest.cpp
@@ -16,10 +16,10 @@
  *
  */
 
-#include "DirectExchange.h"
-#include "Exchange.h"
-#include "Queue.h"
-#include "TopicExchange.h"
+#include "../../src/qpid/broker/DirectExchange.h"
+#include "../../src/qpid/broker/Exchange.h"
+#include "../../src/qpid/broker/Queue.h"
+#include "../../src/qpid/broker/TopicExchange.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/qpid/cpp/broker/test/HeadersExchangeTest.cpp b/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
index d56e00543d..d8fe71350e 100644
--- a/qpid/cpp/broker/test/HeadersExchangeTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/HeadersExchangeTest.cpp
@@ -16,9 +16,9 @@
  *
  */
 
-#include "HeadersExchange.h"
-#include "FieldTable.h"
-#include "Value.h"
+#include "../../src/qpid/broker/HeadersExchange.h"
+#include "../../src/qpid/framing/FieldTable.h"
+#include "../../src/qpid/framing/Value.h"
 #include <qpid_test_plugin.h>
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/broker/test/Makefile b/qpid/cpp/test/unit/qpid/broker/Makefile
index 172ce564bf..172ce564bf 100644
--- a/qpid/cpp/broker/test/Makefile
+++ b/qpid/cpp/test/unit/qpid/broker/Makefile
diff --git a/qpid/cpp/broker/test/MessageTest.cpp b/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp
index fc2c6e01bb..f6586f721a 100644
--- a/qpid/cpp/broker/test/MessageTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/MessageTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "APRBase.h"
-#include "Message.h"
+#include "../../src/qpid/concurrent/APRBase.h"
+#include "../../src/qpid/broker/Message.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/qpid/cpp/broker/test/QueueRegistryTest.cpp b/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
index bd739aaad5..96fbc88069 100644
--- a/qpid/cpp/broker/test/QueueRegistryTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/QueueRegistryTest.cpp
@@ -1,4 +1,4 @@
-#include "QueueRegistry.h"
+#include "../../src/qpid/broker/QueueRegistry.h"
 #include <qpid_test_plugin.h>
 #include <string>
 
diff --git a/qpid/cpp/broker/test/QueueTest.cpp b/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp
index 1b4eb814cb..fa6344c265 100644
--- a/qpid/cpp/broker/test/QueueTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/QueueTest.cpp
@@ -15,8 +15,8 @@
  * limitations under the License.
  *
  */
-#include "Queue.h"
-#include "QueueRegistry.h"
+#include "../../src/qpid/broker/Queue.h"
+#include "../../src/qpid/broker/QueueRegistry.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 
diff --git a/qpid/cpp/broker/test/RouterTest.cpp b/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp
index b1d4b9739f..7b77162905 100644
--- a/qpid/cpp/broker/test/RouterTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/RouterTest.cpp
@@ -15,11 +15,11 @@
  * limitations under the License.
  *
  */
-#include "Channel.h"
-#include "Exchange.h"
-#include "ExchangeRegistry.h"
-#include "Message.h"
-#include "Router.h"
+#include "../../src/qpid/broker/Channel.h"
+#include "../../src/qpid/broker/Exchange.h"
+#include "../../src/qpid/broker/ExchangeRegistry.h"
+#include "../../src/qpid/broker/Message.h"
+#include "../../src/qpid/broker/Router.h"
 #include <qpid_test_plugin.h>
 #include <iostream>
 #include <memory>
diff --git a/qpid/cpp/broker/test/TopicExchangeTest.cpp b/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
index d9b49fc603..4066a4709f 100644
--- a/qpid/cpp/broker/test/TopicExchangeTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/TopicExchangeTest.cpp
@@ -1,4 +1,4 @@
-#include "TopicExchange.h"
+#include "../../src/qpid/broker/TopicExchange.h"
 #include <qpid_test_plugin.h>
 
 using namespace qpid::broker;
diff --git a/qpid/cpp/broker/test/ValueTest.cpp b/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp
index ec9659e603..89444c38cf 100644
--- a/qpid/cpp/broker/test/ValueTest.cpp
+++ b/qpid/cpp/test/unit/qpid/broker/ValueTest.cpp
@@ -1,4 +1,4 @@
-#include "Value.h"
+#include "../../src/qpid/framing/Value.h"
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
diff --git a/qpid/cpp/common/framing/test/BodyHandlerTest.cpp b/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
index 1cad6afe02..6b011743c0 100644
--- a/qpid/cpp/common/framing/test/BodyHandlerTest.cpp
+++ b/qpid/cpp/test/unit/qpid/framing/BodyHandlerTest.cpp
@@ -16,7 +16,7 @@
  *
  */
 #include <iostream>
-#include "amqp_framing.h"
+#include "../../src/qpid/framing/amqp_framing.h"
 #include "qpid_test_plugin.h"
 using namespace qpid::framing;
 
diff --git a/qpid/cpp/common/framing/test/Makefile b/qpid/cpp/test/unit/qpid/framing/Makefile
index 487b8d537b..487b8d537b 100644
--- a/qpid/cpp/common/framing/test/Makefile
+++ b/qpid/cpp/test/unit/qpid/framing/Makefile
diff --git a/qpid/cpp/common/framing/test/field_table_test.cpp b/qpid/cpp/test/unit/qpid/framing/field_table_test.cpp
index 535f7f4a08..8f2fe61611 100644
--- a/qpid/cpp/common/framing/test/field_table_test.cpp
+++ b/qpid/cpp/test/unit/qpid/framing/field_table_test.cpp
@@ -16,7 +16,7 @@
  *
  */
 #include <iostream>
-#include "amqp_framing.h"
+#include "../../src/qpid/framing/amqp_framing.h"
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
diff --git a/qpid/cpp/common/framing/test/framing_test.cpp b/qpid/cpp/test/unit/qpid/framing/framing_test.cpp
index 8c69f8718a..40ce3d97ed 100644
--- a/qpid/cpp/common/framing/test/framing_test.cpp
+++ b/qpid/cpp/test/unit/qpid/framing/framing_test.cpp
@@ -15,7 +15,7 @@
  * limitations under the License.
  *
  */
-#include "amqp_framing.h"
+#include "../../src/qpid/framing/amqp_framing.h"
 #include "ConnectionRedirectBody.h"
 #include <iostream>
 #include <sstream>
diff --git a/qpid/cpp/common/framing/test/header_test.cpp b/qpid/cpp/test/unit/qpid/framing/header_test.cpp
index f98dd5d108..9268c54272 100644
--- a/qpid/cpp/common/framing/test/header_test.cpp
+++ b/qpid/cpp/test/unit/qpid/framing/header_test.cpp
@@ -16,7 +16,7 @@
  *
  */
 #include <iostream>
-#include "amqp_framing.h"
+#include "../../src/qpid/framing/amqp_framing.h"
 #include <qpid_test_plugin.h>
 
 using namespace qpid::framing;
diff --git a/qpid/cpp/test_plugins.mk b/qpid/cpp/test_plugins.mk
deleted file mode 100644
index abac186954..0000000000
--- a/qpid/cpp/test_plugins.mk
+++ /dev/null
@@ -1,42 +0,0 @@
-#
-# Copyright (c) 2006 The Apache Software Foundation
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#    http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-
-#
-# Standard make fragment for building test plugins in a directory.
-#
-
-include ${QPID_HOME}/cpp/options.mk
-
-SOURCES := $(wildcard *.cpp)
-TESTS := $(SOURCES:.cpp=.so)
-DEPS= $(SOURCES:.cpp=.d)
-
-INCLUDES = $(TEST_INCLUDES)
-
-.PHONY: all clean
-
-all: $(TESTS)
-
-clean:
-	-@rm -f $(TESTS) $(DEPS)
-
-# Rule to build test plugins from .cpp files.
-%.so: %.cpp
-	$(CXX)  -shared -o $@ $< $(CXXFLAGS) $(LDFLAGS) $(LDLIBS)
-
-# Dependencies
--include $(DEPS)
author	Alan Conway <aconway@apache.org>	2006-10-16 13:50:26 +0000
committer	Alan Conway <aconway@apache.org>	2006-10-16 13:50:26 +0000
commit	c0e2b3586a64acbd2f2a46e3b79384cab76e6ddd (patch)
tree	8d92c6051648f0ed8f1e1f528d97a3c02da4855e /qpid
parent	39cad9398e213a4ec5678d21edcca17dba39871f (diff)
download	qpid-python-c0e2b3586a64acbd2f2a46e3b79384cab76e6ddd.tar.gz