Add directory to #include

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

72 files changed, 102 insertions, 102 deletions

diff --git a/cpp/src/qpid/sys/AggregateOutput.h b/cpp/src/qpid/sys/AggregateOutput.h
index 4e3190a093..71ad713eb7 100644
--- a/cpp/src/qpid/sys/AggregateOutput.h
+++ b/cpp/src/qpid/sys/AggregateOutput.h
@@ -21,9 +21,9 @@
 #ifndef _AggregateOutput_
 #define _AggregateOutput_
 
-#include "Monitor.h"
-#include "OutputControl.h"
-#include "OutputTask.h"
+#include "qpid/sys/Monitor.h"
+#include "qpid/sys/OutputControl.h"
+#include "qpid/sys/OutputTask.h"
 #include "qpid/CommonImportExport.h"
 
 #include <algorithm>
diff --git a/cpp/src/qpid/sys/AsynchIOHandler.cpp b/cpp/src/qpid/sys/AsynchIOHandler.cpp
index 3b85a63d19..8094abd43d 100644
--- a/cpp/src/qpid/sys/AsynchIOHandler.cpp
+++ b/cpp/src/qpid/sys/AsynchIOHandler.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "AsynchIOHandler.h"
+#include "qpid/sys/AsynchIOHandler.h"
 #include "qpid/sys/AsynchIO.h"
 #include "qpid/sys/Socket.h"
 #include "qpid/framing/AMQP_HighestVersion.h"
diff --git a/cpp/src/qpid/sys/AsynchIOHandler.h b/cpp/src/qpid/sys/AsynchIOHandler.h
index 059b22a935..9785f445a4 100644
--- a/cpp/src/qpid/sys/AsynchIOHandler.h
+++ b/cpp/src/qpid/sys/AsynchIOHandler.h
@@ -21,10 +21,10 @@
  *
  */
 
-#include "OutputControl.h"
-#include "ConnectionCodec.h"
-#include "AtomicValue.h"
-#include "Mutex.h"
+#include "qpid/sys/OutputControl.h"
+#include "qpid/sys/ConnectionCodec.h"
+#include "qpid/sys/AtomicValue.h"
+#include "qpid/sys/Mutex.h"
 #include "qpid/CommonImportExport.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/sys/AtomicCount.h b/cpp/src/qpid/sys/AtomicCount.h
index d598b49427..94580c61f3 100644
--- a/cpp/src/qpid/sys/AtomicCount.h
+++ b/cpp/src/qpid/sys/AtomicCount.h
@@ -20,7 +20,7 @@
  */
 
 #include <boost/detail/atomic_count.hpp>
-#include "ScopedIncrement.h"
+#include "qpid/sys/ScopedIncrement.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/BlockingQueue.h b/cpp/src/qpid/sys/BlockingQueue.h
index a05a10d811..210cb4ad82 100644
--- a/cpp/src/qpid/sys/BlockingQueue.h
+++ b/cpp/src/qpid/sys/BlockingQueue.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "Waitable.h"
+#include "qpid/sys/Waitable.h"
 
 #include <queue>
 
diff --git a/cpp/src/qpid/sys/ConnectionCodec.h b/cpp/src/qpid/sys/ConnectionCodec.h
index 7f5e2f831c..880d4f0013 100644
--- a/cpp/src/qpid/sys/ConnectionCodec.h
+++ b/cpp/src/qpid/sys/ConnectionCodec.h
@@ -21,7 +21,7 @@
  * under the License.
  *
  */
-#include "Codec.h"
+#include "qpid/sys/Codec.h"
 #include "qpid/framing/ProtocolVersion.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/sys/ConnectionInputHandler.h b/cpp/src/qpid/sys/ConnectionInputHandler.h
index 9a5b9f75a5..9e85c66924 100644
--- a/cpp/src/qpid/sys/ConnectionInputHandler.h
+++ b/cpp/src/qpid/sys/ConnectionInputHandler.h
@@ -22,8 +22,8 @@
 #define _ConnectionInputHandler_
 
 #include "qpid/framing/InputHandler.h"
-#include "OutputTask.h"
-#include "TimeoutHandler.h"
+#include "qpid/sys/OutputTask.h"
+#include "qpid/sys/TimeoutHandler.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandler.h b/cpp/src/qpid/sys/ConnectionOutputHandler.h
index de0bef3630..421dd7c269 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandler.h
+++ b/cpp/src/qpid/sys/ConnectionOutputHandler.h
@@ -22,7 +22,7 @@
 #define _ConnectionOutputHandler_
 
 #include "qpid/framing/OutputHandler.h"
-#include "OutputControl.h"
+#include "qpid/sys/OutputControl.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
index 909631a8c4..95a08d15ae 100644
--- a/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
+++ b/cpp/src/qpid/sys/ConnectionOutputHandlerPtr.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "ConnectionOutputHandler.h"
+#include "qpid/sys/ConnectionOutputHandler.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/CopyOnWriteArray.h b/cpp/src/qpid/sys/CopyOnWriteArray.h
index 577a475afd..e4ae3a6094 100644
--- a/cpp/src/qpid/sys/CopyOnWriteArray.h
+++ b/cpp/src/qpid/sys/CopyOnWriteArray.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "Mutex.h"
+#include "qpid/sys/Mutex.h"
 #include <algorithm>
 #include <vector>
 #include <boost/shared_ptr.hpp>
diff --git a/cpp/src/qpid/sys/DispatchHandle.cpp b/cpp/src/qpid/sys/DispatchHandle.cpp
index 7bf305d275..0a237d837b 100644
--- a/cpp/src/qpid/sys/DispatchHandle.cpp
+++ b/cpp/src/qpid/sys/DispatchHandle.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "DispatchHandle.h"
+#include "qpid/sys/DispatchHandle.h"
 
 #include <algorithm>
 
diff --git a/cpp/src/qpid/sys/DispatchHandle.h b/cpp/src/qpid/sys/DispatchHandle.h
index 860665877c..37db776a09 100644
--- a/cpp/src/qpid/sys/DispatchHandle.h
+++ b/cpp/src/qpid/sys/DispatchHandle.h
@@ -22,8 +22,8 @@
  *
  */
 
-#include "Poller.h"
-#include "Mutex.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/sys/Mutex.h"
 #include "qpid/CommonImportExport.h"
 #include <boost/function.hpp>
 
diff --git a/cpp/src/qpid/sys/Dispatcher.cpp b/cpp/src/qpid/sys/Dispatcher.cpp
index e8ae6bc2fe..5f52dcd990 100644
--- a/cpp/src/qpid/sys/Dispatcher.cpp
+++ b/cpp/src/qpid/sys/Dispatcher.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "Dispatcher.h"
+#include "qpid/sys/Dispatcher.h"
 
 #include <assert.h>
 
diff --git a/cpp/src/qpid/sys/Dispatcher.h b/cpp/src/qpid/sys/Dispatcher.h
index 2f3ed10901..e8213d0579 100644
--- a/cpp/src/qpid/sys/Dispatcher.h
+++ b/cpp/src/qpid/sys/Dispatcher.h
@@ -22,8 +22,8 @@
  *
  */
 
-#include "Poller.h"
-#include "Runnable.h"
+#include "qpid/sys/Poller.h"
+#include "qpid/sys/Runnable.h"
 #include "qpid/CommonImportExport.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/sys/LatencyTracker.h b/cpp/src/qpid/sys/LatencyTracker.h
index fe423ec228..3294528ff6 100644
--- a/cpp/src/qpid/sys/LatencyTracker.h
+++ b/cpp/src/qpid/sys/LatencyTracker.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "Time.h"
+#include "qpid/sys/Time.h"
 #include <string>
 #include <limits>
 #include <map>
diff --git a/cpp/src/qpid/sys/LockFile.h b/cpp/src/qpid/sys/LockFile.h
index 71cb5e2f10..1f0a9e13b3 100644
--- a/cpp/src/qpid/sys/LockFile.h
+++ b/cpp/src/qpid/sys/LockFile.h
@@ -24,7 +24,7 @@
 #include <string>
 
 #include "qpid/CommonImportExport.h"
-#include "IntegerTypes.h"
+#include "qpid/sys/IntegerTypes.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/Monitor.h b/cpp/src/qpid/sys/Monitor.h
index 2dd405efaf..76c7118928 100644
--- a/cpp/src/qpid/sys/Monitor.h
+++ b/cpp/src/qpid/sys/Monitor.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "Condition.h"
+#include "qpid/sys/Condition.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/OutputControl.h b/cpp/src/qpid/sys/OutputControl.h
index d813428b67..eae99beb0f 100644
--- a/cpp/src/qpid/sys/OutputControl.h
+++ b/cpp/src/qpid/sys/OutputControl.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "IntegerTypes.h"
+#include "qpid/sys/IntegerTypes.h"
 
 #ifndef _OutputControl_
 #define _OutputControl_
diff --git a/cpp/src/qpid/sys/Poller.h b/cpp/src/qpid/sys/Poller.h
index fd45848b79..413d4242b8 100644
--- a/cpp/src/qpid/sys/Poller.h
+++ b/cpp/src/qpid/sys/Poller.h
@@ -22,8 +22,8 @@
  *
  */
 
-#include "Time.h"
-#include "Runnable.h"
+#include "qpid/sys/Time.h"
+#include "qpid/sys/Runnable.h"
 #include "qpid/CommonImportExport.h"
 #include <boost/shared_ptr.hpp>
 
diff --git a/cpp/src/qpid/sys/ProtocolFactory.h b/cpp/src/qpid/sys/ProtocolFactory.h
index 56ab404d82..b233b2da1a 100644
--- a/cpp/src/qpid/sys/ProtocolFactory.h
+++ b/cpp/src/qpid/sys/ProtocolFactory.h
@@ -24,7 +24,7 @@
 
 #include "qpid/sys/IntegerTypes.h"
 #include "qpid/SharedObject.h"
-#include "ConnectionCodec.h"
+#include "qpid/sys/ConnectionCodec.h"
 #include <boost/function.hpp>
 
 namespace qpid {
diff --git a/cpp/src/qpid/sys/RdmaIOPlugin.cpp b/cpp/src/qpid/sys/RdmaIOPlugin.cpp
index f931aeb5ea..6eafb6cf0b 100644
--- a/cpp/src/qpid/sys/RdmaIOPlugin.cpp
+++ b/cpp/src/qpid/sys/RdmaIOPlugin.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "ProtocolFactory.h"
+#include "qpid/sys/ProtocolFactory.h"
 
 #include "qpid/Plugin.h"
 #include "qpid/broker/Broker.h"
diff --git a/cpp/src/qpid/sys/Runnable.cpp b/cpp/src/qpid/sys/Runnable.cpp
index 30122c682f..325d87c91b 100644
--- a/cpp/src/qpid/sys/Runnable.cpp
+++ b/cpp/src/qpid/sys/Runnable.cpp
@@ -16,7 +16,7 @@
  *
  */
 
-#include "Runnable.h"
+#include "qpid/sys/Runnable.h"
 #include <boost/bind.hpp>
 
 namespace qpid {
diff --git a/cpp/src/qpid/sys/SecurityLayer.h b/cpp/src/qpid/sys/SecurityLayer.h
index 6ad29eea80..52bc40e352 100644
--- a/cpp/src/qpid/sys/SecurityLayer.h
+++ b/cpp/src/qpid/sys/SecurityLayer.h
@@ -21,7 +21,7 @@
  * under the License.
  *
  */
-#include "Codec.h"
+#include "qpid/sys/Codec.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/Semaphore.h b/cpp/src/qpid/sys/Semaphore.h
index af937b60b8..9d70f89aeb 100644
--- a/cpp/src/qpid/sys/Semaphore.h
+++ b/cpp/src/qpid/sys/Semaphore.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "Monitor.h"
+#include "qpid/sys/Monitor.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/Shlib.cpp b/cpp/src/qpid/sys/Shlib.cpp
index 8fd3f42cc6..342d726876 100644
--- a/cpp/src/qpid/sys/Shlib.cpp
+++ b/cpp/src/qpid/sys/Shlib.cpp
@@ -18,7 +18,7 @@
  *
  */
 
-#include "Shlib.h"
+#include "qpid/sys/Shlib.h"
 
 #include "qpid/log/Statement.h"
 
diff --git a/cpp/src/qpid/sys/Socket.h b/cpp/src/qpid/sys/Socket.h
index e6555f5774..f389e99cb8 100644
--- a/cpp/src/qpid/sys/Socket.h
+++ b/cpp/src/qpid/sys/Socket.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "IOHandle.h"
+#include "qpid/sys/IOHandle.h"
 #include "qpid/sys/IntegerTypes.h"
 #include "qpid/CommonImportExport.h"
 #include <string>
diff --git a/cpp/src/qpid/sys/SslPlugin.cpp b/cpp/src/qpid/sys/SslPlugin.cpp
index 203aa9a1d7..a0d032906b 100644
--- a/cpp/src/qpid/sys/SslPlugin.cpp
+++ b/cpp/src/qpid/sys/SslPlugin.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "ProtocolFactory.h"
+#include "qpid/sys/ProtocolFactory.h"
 
 #include "qpid/Plugin.h"
 #include "qpid/sys/ssl/check.h"
diff --git a/cpp/src/qpid/sys/TCPIOPlugin.cpp b/cpp/src/qpid/sys/TCPIOPlugin.cpp
index 636b903e29..b456beb098 100644
--- a/cpp/src/qpid/sys/TCPIOPlugin.cpp
+++ b/cpp/src/qpid/sys/TCPIOPlugin.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include "ProtocolFactory.h"
-#include "AsynchIOHandler.h"
-#include "AsynchIO.h"
+#include "qpid/sys/ProtocolFactory.h"
+#include "qpid/sys/AsynchIOHandler.h"
+#include "qpid/sys/AsynchIO.h"
 
 #include "qpid/Plugin.h"
 #include "qpid/sys/Socket.h"
diff --git a/cpp/src/qpid/sys/Timer.cpp b/cpp/src/qpid/sys/Timer.cpp
index fd42d7d62e..d77f4a0b1e 100644
--- a/cpp/src/qpid/sys/Timer.cpp
+++ b/cpp/src/qpid/sys/Timer.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "Timer.h"
-#include "Mutex.h"
+#include "qpid/sys/Timer.h"
+#include "qpid/sys/Mutex.h"
 #include <iostream>
 #include <numeric>
 
diff --git a/cpp/src/qpid/sys/apr/APRBase.cpp b/cpp/src/qpid/sys/apr/APRBase.cpp
index 724c489303..8bdba66bdc 100644
--- a/cpp/src/qpid/sys/apr/APRBase.cpp
+++ b/cpp/src/qpid/sys/apr/APRBase.cpp
@@ -20,7 +20,7 @@
  */
 #include <iostream>
 #include "qpid/log/Statement.h"
-#include "APRBase.h"
+#include "qpid/sys/apr/APRBase.h"
 
 using namespace qpid::sys;
 
diff --git a/cpp/src/qpid/sys/apr/APRPool.cpp b/cpp/src/qpid/sys/apr/APRPool.cpp
index e8b71f6e8a..e221bfc2f1 100644
--- a/cpp/src/qpid/sys/apr/APRPool.cpp
+++ b/cpp/src/qpid/sys/apr/APRPool.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include "APRPool.h"
-#include "APRBase.h"
+#include "qpid/sys/apr/APRPool.h"
+#include "qpid/sys/apr/APRBase.h"
 #include <boost/pool/detail/singleton.hpp>
 
 using namespace qpid::sys;
diff --git a/cpp/src/qpid/sys/apr/Condition.h b/cpp/src/qpid/sys/apr/Condition.h
index 5e544219ab..66d465ca75 100644
--- a/cpp/src/qpid/sys/apr/Condition.h
+++ b/cpp/src/qpid/sys/apr/Condition.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "APRPool.h"
+#include "qpid/sys/apr/APRPool.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Time.h"
 
diff --git a/cpp/src/qpid/sys/apr/Mutex.h b/cpp/src/qpid/sys/apr/Mutex.h
index 51089c98ff..cb75f5b339 100644
--- a/cpp/src/qpid/sys/apr/Mutex.h
+++ b/cpp/src/qpid/sys/apr/Mutex.h
@@ -19,8 +19,8 @@
  *
  */
 
-#include "APRBase.h"
-#include "APRPool.h"
+#include "qpid/sys/apr/APRBase.h"
+#include "qpid/sys/apr/APRPool.h"
 
 #include <boost/noncopyable.hpp>
 #include <apr_thread_mutex.h>
diff --git a/cpp/src/qpid/sys/apr/Shlib.cpp b/cpp/src/qpid/sys/apr/Shlib.cpp
index b0ba706713..b7ee13a03b 100644
--- a/cpp/src/qpid/sys/apr/Shlib.cpp
+++ b/cpp/src/qpid/sys/apr/Shlib.cpp
@@ -19,8 +19,8 @@
  */
 
 #include "qpid/sys/Shlib.h"
-#include "APRBase.h"
-#include "APRPool.h"
+#include "qpid/sys/apr/APRBase.h"
+#include "qpid/sys/apr/APRPool.h"
 #include <apr_dso.h>
 
 namespace qpid {
diff --git a/cpp/src/qpid/sys/apr/Socket.cpp b/cpp/src/qpid/sys/apr/Socket.cpp
index 577268844a..d9024d11c1 100644
--- a/cpp/src/qpid/sys/apr/Socket.cpp
+++ b/cpp/src/qpid/sys/apr/Socket.cpp
@@ -22,8 +22,8 @@
 
 #include "qpid/sys/Socket.h"
 
-#include "APRBase.h"
-#include "APRPool.h"
+#include "qpid/sys/apr/APRBase.h"
+#include "qpid/sys/apr/APRPool.h"
 
 #include <apr_network_io.h>
 
diff --git a/cpp/src/qpid/sys/apr/Thread.cpp b/cpp/src/qpid/sys/apr/Thread.cpp
index 3369ef7eb1..b52d0e6ace 100644
--- a/cpp/src/qpid/sys/apr/Thread.cpp
+++ b/cpp/src/qpid/sys/apr/Thread.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "Thread.h"
+#include "qpid/sys/apr/Thread.h"
 #include "qpid/sys/Runnable.h"
 
 using namespace qpid::sys;
diff --git a/cpp/src/qpid/sys/apr/Thread.h b/cpp/src/qpid/sys/apr/Thread.h
index 8cbbc0456e..6cc63db5c9 100644
--- a/cpp/src/qpid/sys/apr/Thread.h
+++ b/cpp/src/qpid/sys/apr/Thread.h
@@ -22,8 +22,8 @@
  *
  */
 
-#include "APRPool.h"
-#include "APRBase.h"
+#include "qpid/sys/apr/APRPool.h"
+#include "qpid/sys/apr/APRBase.h"
 
 #include <apr_thread_proc.h>
 #include <apr_portable.h>
diff --git a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp b/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
index a7a6e1d02a..454ce62495 100644
--- a/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
+++ b/cpp/src/qpid/sys/cyrus/CyrusSecurityLayer.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "CyrusSecurityLayer.h"
+#include "qpid/sys/cyrus/CyrusSecurityLayer.h"
 #include <algorithm>
 #include "qpid/framing/reply_exceptions.h"
 #include "qpid/log/Statement.h"
diff --git a/cpp/src/qpid/sys/posix/AsynchIO.cpp b/cpp/src/qpid/sys/posix/AsynchIO.cpp
index 306516de17..5d1ac6d034 100644
--- a/cpp/src/qpid/sys/posix/AsynchIO.cpp
+++ b/cpp/src/qpid/sys/posix/AsynchIO.cpp
@@ -26,7 +26,7 @@
 #include "qpid/sys/Time.h"
 #include "qpid/log/Statement.h"
 
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 
 // TODO The basic algorithm here is not really POSIX specific and with a
 // bit more abstraction could (should) be promoted to be platform portable
diff --git a/cpp/src/qpid/sys/posix/Condition.h b/cpp/src/qpid/sys/posix/Condition.h
index 62e42c01e9..93aae3ffce 100644
--- a/cpp/src/qpid/sys/posix/Condition.h
+++ b/cpp/src/qpid/sys/posix/Condition.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "PrivatePosix.h"
+#include "qpid/sys/posix/PrivatePosix.h"
 
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Time.h"
diff --git a/cpp/src/qpid/sys/posix/IOHandle.cpp b/cpp/src/qpid/sys/posix/IOHandle.cpp
index 075eb4c335..9c049ee1de 100644
--- a/cpp/src/qpid/sys/posix/IOHandle.cpp
+++ b/cpp/src/qpid/sys/posix/IOHandle.cpp
@@ -21,7 +21,7 @@
 
 #include "qpid/sys/IOHandle.h"
 
-#include "PrivatePosix.h"
+#include "qpid/sys/posix/PrivatePosix.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/posix/LockFile.cpp b/cpp/src/qpid/sys/posix/LockFile.cpp
index af9ecd7d66..9ef9a205b7 100755
--- a/cpp/src/qpid/sys/posix/LockFile.cpp
+++ b/cpp/src/qpid/sys/posix/LockFile.cpp
@@ -24,7 +24,7 @@
 #include <sys/stat.h>
 #include <fcntl.h>
 
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 
 namespace qpid {
 namespace sys {
diff --git a/cpp/src/qpid/sys/posix/Mutex.h b/cpp/src/qpid/sys/posix/Mutex.h
index 564cb72c56..fb8491dec0 100644
--- a/cpp/src/qpid/sys/posix/Mutex.h
+++ b/cpp/src/qpid/sys/posix/Mutex.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 
 #include <pthread.h>
 #include <boost/noncopyable.hpp>
diff --git a/cpp/src/qpid/sys/posix/PipeHandle.cpp b/cpp/src/qpid/sys/posix/PipeHandle.cpp
index 10e2cdc755..4b19783338 100755
--- a/cpp/src/qpid/sys/posix/PipeHandle.cpp
+++ b/cpp/src/qpid/sys/posix/PipeHandle.cpp
@@ -18,7 +18,7 @@
 //
 
 #include "qpid/sys/PipeHandle.h"
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/socket.h>
diff --git a/cpp/src/qpid/sys/posix/Socket.cpp b/cpp/src/qpid/sys/posix/Socket.cpp
index ab0c28c48c..31044be9ca 100644
--- a/cpp/src/qpid/sys/posix/Socket.cpp
+++ b/cpp/src/qpid/sys/posix/Socket.cpp
@@ -21,8 +21,8 @@
 
 #include "qpid/sys/Socket.h"
 
-#include "check.h"
-#include "PrivatePosix.h"
+#include "qpid/sys/posix/check.h"
+#include "qpid/sys/posix/PrivatePosix.h"
 
 #include <fcntl.h>
 #include <sys/types.h>
diff --git a/cpp/src/qpid/sys/posix/SystemInfo.cpp b/cpp/src/qpid/sys/posix/SystemInfo.cpp
index f7d16c12c8..55737fcfcc 100755
--- a/cpp/src/qpid/sys/posix/SystemInfo.cpp
+++ b/cpp/src/qpid/sys/posix/SystemInfo.cpp
@@ -20,7 +20,7 @@
 
 #include "qpid/sys/SystemInfo.h"
 
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 
 #include <sys/ioctl.h>
 #include <sys/utsname.h>
diff --git a/cpp/src/qpid/sys/posix/Thread.cpp b/cpp/src/qpid/sys/posix/Thread.cpp
index bb5641bc53..a784e63195 100644
--- a/cpp/src/qpid/sys/posix/Thread.cpp
+++ b/cpp/src/qpid/sys/posix/Thread.cpp
@@ -22,7 +22,7 @@
 #include "qpid/sys/Thread.h"
 
 #include "qpid/sys/Runnable.h"
-#include "check.h"
+#include "qpid/sys/posix/check.h"
 
 #include <pthread.h>
 
diff --git a/cpp/src/qpid/sys/posix/Time.cpp b/cpp/src/qpid/sys/posix/Time.cpp
index bd1863f860..0734abd1df 100644
--- a/cpp/src/qpid/sys/posix/Time.cpp
+++ b/cpp/src/qpid/sys/posix/Time.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "PrivatePosix.h"
+#include "qpid/sys/posix/PrivatePosix.h"
 
 #include "qpid/sys/Time.h"
 #include <ostream>
diff --git a/cpp/src/qpid/sys/rdma/RdmaClient.cpp b/cpp/src/qpid/sys/rdma/RdmaClient.cpp
index 0d3dd83131..52208d0519 100644
--- a/cpp/src/qpid/sys/rdma/RdmaClient.cpp
+++ b/cpp/src/qpid/sys/rdma/RdmaClient.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "RdmaIO.h"
+#include "qpid/sys/rdma/RdmaIO.h"
 #include "qpid/sys/Time.h"
 
 #include <netdb.h>
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.cpp b/cpp/src/qpid/sys/rdma/RdmaIO.cpp
index 316b6b99e3..491c1612fd 100644
--- a/cpp/src/qpid/sys/rdma/RdmaIO.cpp
+++ b/cpp/src/qpid/sys/rdma/RdmaIO.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "RdmaIO.h"
+#include "qpid/sys/rdma/RdmaIO.h"
 
 #include "qpid/log/Statement.h"
 
diff --git a/cpp/src/qpid/sys/rdma/RdmaIO.h b/cpp/src/qpid/sys/rdma/RdmaIO.h
index 9f916ba7e2..697d9387ce 100644
--- a/cpp/src/qpid/sys/rdma/RdmaIO.h
+++ b/cpp/src/qpid/sys/rdma/RdmaIO.h
@@ -21,7 +21,7 @@
 #ifndef Rdma_Acceptor_h
 #define Rdma_Acceptor_h
 
-#include "rdma_wrap.h"
+#include "qpid/sys/rdma/rdma_wrap.h"
 
 #include "qpid/sys/AtomicValue.h"
 #include "qpid/sys/Dispatcher.h"
diff --git a/cpp/src/qpid/sys/rdma/RdmaServer.cpp b/cpp/src/qpid/sys/rdma/RdmaServer.cpp
index 594578a265..1ab5268596 100644
--- a/cpp/src/qpid/sys/rdma/RdmaServer.cpp
+++ b/cpp/src/qpid/sys/rdma/RdmaServer.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "RdmaIO.h"
+#include "qpid/sys/rdma/RdmaIO.h"
 
 #include <arpa/inet.h>
 
diff --git a/cpp/src/qpid/sys/rdma/rdma_factories.cpp b/cpp/src/qpid/sys/rdma/rdma_factories.cpp
index c6e8df814b..a5e9ebd23c 100644
--- a/cpp/src/qpid/sys/rdma/rdma_factories.cpp
+++ b/cpp/src/qpid/sys/rdma/rdma_factories.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "rdma_factories.h"
+#include "qpid/sys/rdma/rdma_factories.h"
 
 namespace Rdma {
     void acker(::rdma_cm_event* e) throw () {
diff --git a/cpp/src/qpid/sys/rdma/rdma_factories.h b/cpp/src/qpid/sys/rdma/rdma_factories.h
index 8d024f37aa..783181cf1b 100644
--- a/cpp/src/qpid/sys/rdma/rdma_factories.h
+++ b/cpp/src/qpid/sys/rdma/rdma_factories.h
@@ -21,7 +21,7 @@
 #ifndef RDMA_FACTORIES_H
 #define RDMA_FACTORIES_H
 
-#include "rdma_exception.h"
+#include "qpid/sys/rdma/rdma_exception.h"
 
 #include <rdma/rdma_cma.h>
 
diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp b/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
index 4fcb8ca2fa..53e31ca766 100644
--- a/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
+++ b/cpp/src/qpid/sys/rdma/rdma_wrap.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "rdma_wrap.h"
+#include "qpid/sys/rdma/rdma_wrap.h"
 
 namespace Rdma {
     const ::rdma_conn_param DEFAULT_CONNECT_PARAM = {
diff --git a/cpp/src/qpid/sys/rdma/rdma_wrap.h b/cpp/src/qpid/sys/rdma/rdma_wrap.h
index 7812a02532..aa2e516e6b 100644
--- a/cpp/src/qpid/sys/rdma/rdma_wrap.h
+++ b/cpp/src/qpid/sys/rdma/rdma_wrap.h
@@ -21,7 +21,7 @@
 #ifndef RDMA_WRAP_H
 #define RDMA_WRAP_H
 
-#include "rdma_factories.h"
+#include "qpid/sys/rdma/rdma_factories.h"
 
 #include <rdma/rdma_cma.h>
 
diff --git a/cpp/src/qpid/sys/ssl/SslHandler.cpp b/cpp/src/qpid/sys/ssl/SslHandler.cpp
index 282c3ce8c8..9cf74e4b6d 100644
--- a/cpp/src/qpid/sys/ssl/SslHandler.cpp
+++ b/cpp/src/qpid/sys/ssl/SslHandler.cpp
@@ -18,10 +18,10 @@
  * under the License.
  *
  */
-#include "SslHandler.h"
+#include "qpid/sys/ssl/SslHandler.h"
 
-#include "SslIo.h"
-#include "SslSocket.h"
+#include "qpid/sys/ssl/SslIo.h"
+#include "qpid/sys/ssl/SslSocket.h"
 #include "qpid/framing/AMQP_HighestVersion.h"
 #include "qpid/framing/ProtocolInitiation.h"
 #include "qpid/log/Statement.h"
diff --git a/cpp/src/qpid/sys/ssl/SslIo.cpp b/cpp/src/qpid/sys/ssl/SslIo.cpp
index caf190a5ac..282d77258f 100644
--- a/cpp/src/qpid/sys/ssl/SslIo.cpp
+++ b/cpp/src/qpid/sys/ssl/SslIo.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include "SslIo.h"
-#include "SslSocket.h"
+#include "qpid/sys/ssl/SslIo.h"
+#include "qpid/sys/ssl/SslSocket.h"
 
 #include "qpid/sys/Time.h"
 #include "qpid/sys/posix/check.h"
diff --git a/cpp/src/qpid/sys/ssl/SslSocket.cpp b/cpp/src/qpid/sys/ssl/SslSocket.cpp
index 21ec8f7216..9181f56b94 100644
--- a/cpp/src/qpid/sys/ssl/SslSocket.cpp
+++ b/cpp/src/qpid/sys/ssl/SslSocket.cpp
@@ -19,9 +19,9 @@
  *
  */
 
-#include "SslSocket.h"
-#include "check.h"
-#include "util.h"
+#include "qpid/sys/ssl/SslSocket.h"
+#include "qpid/sys/ssl/check.h"
+#include "qpid/sys/ssl/util.h"
 #include "qpid/Exception.h"
 #include "qpid/sys/posix/check.h"
 #include "qpid/sys/posix/PrivatePosix.h"
diff --git a/cpp/src/qpid/sys/ssl/check.cpp b/cpp/src/qpid/sys/ssl/check.cpp
index b580e9bcf5..06d225cf44 100644
--- a/cpp/src/qpid/sys/ssl/check.cpp
+++ b/cpp/src/qpid/sys/ssl/check.cpp
@@ -18,7 +18,7 @@
  * under the License.
  *
  */
-#include "check.h"
+#include "qpid/sys/ssl/check.h"
 #include <nss3/secerr.h>
 #include <nss3/sslerr.h>
 #include <boost/format.hpp>
diff --git a/cpp/src/qpid/sys/ssl/util.cpp b/cpp/src/qpid/sys/ssl/util.cpp
index 263f596aeb..53326e2f55 100644
--- a/cpp/src/qpid/sys/ssl/util.cpp
+++ b/cpp/src/qpid/sys/ssl/util.cpp
@@ -18,8 +18,8 @@
  * under the License.
  *
  */
-#include "util.h"
-#include "check.h"
+#include "qpid/sys/ssl/util.h"
+#include "qpid/sys/ssl/check.h"
 #include "qpid/Exception.h"
 #include "qpid/sys/SystemInfo.h"
 
diff --git a/cpp/src/qpid/sys/windows/AsynchIO.cpp b/cpp/src/qpid/sys/windows/AsynchIO.cpp
index 8de2eccc84..dcd2f71a65 100644
--- a/cpp/src/qpid/sys/windows/AsynchIO.cpp
+++ b/cpp/src/qpid/sys/windows/AsynchIO.cpp
@@ -19,8 +19,8 @@
  *
  */
 
-#include "AsynchIoResult.h"
-#include "IoHandlePrivate.h"
+#include "qpid/sys/windows/AsynchIoResult.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
 #include "qpid/sys/AsynchIO.h"
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Socket.h"
@@ -29,7 +29,7 @@
 #include "qpid/sys/Time.h"
 #include "qpid/log/Statement.h"
 
-#include "check.h"
+#include "qpid/sys/windows/check.h"
 
 #include <boost/thread/once.hpp>
 
diff --git a/cpp/src/qpid/sys/windows/IOHandle.cpp b/cpp/src/qpid/sys/windows/IOHandle.cpp
index ba544c8c90..250737cb99 100755
--- a/cpp/src/qpid/sys/windows/IOHandle.cpp
+++ b/cpp/src/qpid/sys/windows/IOHandle.cpp
@@ -20,7 +20,7 @@
  */
 
 #include "qpid/sys/IOHandle.h"
-#include "IoHandlePrivate.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
 #include <windows.h>
 
 namespace qpid {
diff --git a/cpp/src/qpid/sys/windows/IoHandlePrivate.h b/cpp/src/qpid/sys/windows/IoHandlePrivate.h
index cd89f39292..1bb0f7aa2e 100755
--- a/cpp/src/qpid/sys/windows/IoHandlePrivate.h
+++ b/cpp/src/qpid/sys/windows/IoHandlePrivate.h
@@ -22,7 +22,7 @@
  *
  */
 
-#include "AsynchIoResult.h"
+#include "qpid/sys/windows/AsynchIoResult.h"
 #include "qpid/CommonImportExport.h"
 
 #include <winsock2.h>
diff --git a/cpp/src/qpid/sys/windows/IocpPoller.cpp b/cpp/src/qpid/sys/windows/IocpPoller.cpp
index 467ef8facb..3943fd82cd 100755
--- a/cpp/src/qpid/sys/windows/IocpPoller.cpp
+++ b/cpp/src/qpid/sys/windows/IocpPoller.cpp
@@ -23,9 +23,9 @@
 #include "qpid/sys/Mutex.h"
 #include "qpid/sys/Dispatcher.h"
 
-#include "AsynchIoResult.h"
-#include "IoHandlePrivate.h"
-#include "check.h"
+#include "qpid/sys/windows/AsynchIoResult.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
+#include "qpid/sys/windows/check.h"
 
 #include <winsock2.h>
 #include <windows.h>
diff --git a/cpp/src/qpid/sys/windows/LockFile.cpp b/cpp/src/qpid/sys/windows/LockFile.cpp
index 766fa6466a..6cc710a3df 100755
--- a/cpp/src/qpid/sys/windows/LockFile.cpp
+++ b/cpp/src/qpid/sys/windows/LockFile.cpp
@@ -17,7 +17,7 @@
  */
 
 #include "qpid/sys/LockFile.h"
-#include "check.h"
+#include "qpid/sys/windows/check.h"
 
 #include <windows.h>
 
diff --git a/cpp/src/qpid/sys/windows/Mutex.h b/cpp/src/qpid/sys/windows/Mutex.h
index b8d34de6d1..12768640d5 100755
--- a/cpp/src/qpid/sys/windows/Mutex.h
+++ b/cpp/src/qpid/sys/windows/Mutex.h
@@ -19,7 +19,7 @@
  *
  */
 
-#include "check.h"
+#include "qpid/sys/windows/check.h"
 
 #include <boost/version.hpp>
 #if (BOOST_VERSION < 103500)
diff --git a/cpp/src/qpid/sys/windows/PipeHandle.cpp b/cpp/src/qpid/sys/windows/PipeHandle.cpp
index b023d77cc0..e2cbff3908 100755
--- a/cpp/src/qpid/sys/windows/PipeHandle.cpp
+++ b/cpp/src/qpid/sys/windows/PipeHandle.cpp
@@ -18,7 +18,7 @@
 //
 
 #include "qpid/sys/PipeHandle.h"
-#include "check.h"
+#include "qpid/sys/windows/check.h"
 #include <io.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/cpp/src/qpid/sys/windows/PollableCondition.cpp b/cpp/src/qpid/sys/windows/PollableCondition.cpp
index 2ba9067094..e49b6ceb0c 100644
--- a/cpp/src/qpid/sys/windows/PollableCondition.cpp
+++ b/cpp/src/qpid/sys/windows/PollableCondition.cpp
@@ -24,8 +24,8 @@
 
 #include "qpid/sys/PollableCondition.h"
 #include "qpid/sys/IOHandle.h"
-#include "AsynchIoResult.h"
-#include "IoHandlePrivate.h"
+#include "qpid/sys/windows/AsynchIoResult.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
 
 #include <boost/bind.hpp>
 #include <windows.h>
diff --git a/cpp/src/qpid/sys/windows/Socket.cpp b/cpp/src/qpid/sys/windows/Socket.cpp
index 93059d03ef..18fa7c3b1c 100755
--- a/cpp/src/qpid/sys/windows/Socket.cpp
+++ b/cpp/src/qpid/sys/windows/Socket.cpp
@@ -20,8 +20,8 @@
  */
 
 #include "qpid/sys/Socket.h"
-#include "IoHandlePrivate.h"
-#include "check.h"
+#include "qpid/sys/windows/IoHandlePrivate.h"
+#include "qpid/sys/windows/check.h"
 #include "qpid/sys/Time.h"
 
 #include <cstdlib>
diff --git a/cpp/src/qpid/sys/windows/Thread.cpp b/cpp/src/qpid/sys/windows/Thread.cpp
index 6d5d78393e..fed82e4d54 100755
--- a/cpp/src/qpid/sys/windows/Thread.cpp
+++ b/cpp/src/qpid/sys/windows/Thread.cpp
@@ -21,7 +21,7 @@
 
 #include "qpid/sys/Thread.h"
 #include "qpid/sys/Runnable.h"
-#include "check.h"
+#include "qpid/sys/windows/check.h"
 
 #include <process.h>
 #include <windows.h>
diff --git a/cpp/src/qpid/sys/windows/uuid.cpp b/cpp/src/qpid/sys/windows/uuid.cpp
index 4d8184c703..6ff3a3cb8a 100644
--- a/cpp/src/qpid/sys/windows/uuid.cpp
+++ b/cpp/src/qpid/sys/windows/uuid.cpp
@@ -24,7 +24,7 @@
 #  undef uuid_t
 #endif
 
-#include "uuid.h"
+#include "qpid/sys/windows/uuid.h"
 
 #include <string.h>