QPID-3858: Cleanup, removed old comments and tidied up include statements

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

98 files changed, 214 insertions, 274 deletions

diff --git a/cpp/src/qpid/asyncStore/AsyncOperation.cpp b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
index 1a67a15d6f..1e3ab51165 100644
--- a/cpp/src/qpid/asyncStore/AsyncOperation.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncOperation.cpp
@@ -21,7 +21,7 @@
  * \file AsyncOperation.cpp
  */
 
-#include "AsyncOperation.h"
+#include "qpid/asyncStore/AsyncOperation.h"
 
 #include "qpid/broker/AsyncResultHandle.h"
 #include "qpid/broker/AsyncResultHandleImpl.h"
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp b/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
index 038f4b4238..9c1ff42fa2 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.cpp
@@ -21,16 +21,15 @@
  * \file AsyncStoreImpl.cpp
  */
 
-#include "AsyncStoreImpl.h"
-
-#include "AsyncOperation.h"
-#include "ConfigHandleImpl.h"
-#include "EnqueueHandleImpl.h"
-#include "EventHandleImpl.h"
-#include "MessageHandleImpl.h"
-#include "QueueHandleImpl.h"
-#include "TxnHandleImpl.h"
-
+#include "qpid/asyncStore/AsyncStoreImpl.h"
+
+#include "qpid/asyncStore/AsyncOperation.h"
+#include "qpid/asyncStore/ConfigHandleImpl.h"
+#include "qpid/asyncStore/EnqueueHandleImpl.h"
+#include "qpid/asyncStore/EventHandleImpl.h"
+#include "qpid/asyncStore/MessageHandleImpl.h"
+#include "qpid/asyncStore/QueueHandleImpl.h"
+#include "qpid/asyncStore/TxnHandleImpl.h"
 #include "qpid/broker/ConfigHandle.h"
 #include "qpid/broker/EnqueueHandle.h"
 #include "qpid/broker/EventHandle.h"
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
index 40a7552a68..12a7f62c09 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
+++ b/cpp/src/qpid/asyncStore/AsyncStoreImpl.h
@@ -24,11 +24,10 @@
 #ifndef qpid_asyncStore_AsyncStoreImpl_h_
 #define qpid_asyncStore_AsyncStoreImpl_h_
 
-#include "AsyncStoreOptions.h"
-#include "RunState.h"
-#include "OperationQueue.h"
-
+#include "qpid/asyncStore/AsyncStoreOptions.h"
 #include "qpid/asyncStore/jrnl2/RecordIdCounter.h"
+#include "qpid/asyncStore/RunState.h"
+#include "qpid/asyncStore/OperationQueue.h"
 #include "qpid/broker/AsyncStore.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp b/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
index ea953da0dc..6823ef3a66 100644
--- a/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
+++ b/cpp/src/qpid/asyncStore/AsyncStoreOptions.cpp
@@ -21,7 +21,7 @@
  * \file AsyncStoreOptions.cpp
  */
 
-#include "AsyncStoreOptions.h"
+#include "qpid/asyncStore/AsyncStoreOptions.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp b/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp
index 94984965e0..0dc3ba1f16 100644
--- a/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/ConfigHandleImpl.cpp
@@ -21,7 +21,7 @@
  * \file ConfigHandleImpl.cpp
  */
 
-#include "ConfigHandleImpl.h"
+#include "qpid/asyncStore/ConfigHandleImpl.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp b/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp
index 44ab5da26a..a8e4c938e7 100644
--- a/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/EnqueueHandleImpl.cpp
@@ -21,7 +21,7 @@
  * \file EnqueueHandleImpl.cpp
  */
 
-#include "EnqueueHandleImpl.h"
+#include "qpid/asyncStore/EnqueueHandleImpl.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/EventHandleImpl.cpp b/cpp/src/qpid/asyncStore/EventHandleImpl.cpp
index fec98dcfdf..e5f4954114 100644
--- a/cpp/src/qpid/asyncStore/EventHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/EventHandleImpl.cpp
@@ -21,7 +21,7 @@
  * \file EventHandleImpl.cpp
  */
 
-#include "EventHandleImpl.h"
+#include "qpid/asyncStore/EventHandleImpl.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp b/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp
index 3ea3333dd1..f8455cbeb2 100644
--- a/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/MessageHandleImpl.cpp
@@ -21,7 +21,7 @@
  * \file MessageHandleImpl.cpp
  */
 
-#include "MessageHandleImpl.h"
+#include "qpid/asyncStore/MessageHandleImpl.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/OperationQueue.cpp b/cpp/src/qpid/asyncStore/OperationQueue.cpp
index 51dcd7392a..4e05fad10d 100644
--- a/cpp/src/qpid/asyncStore/OperationQueue.cpp
+++ b/cpp/src/qpid/asyncStore/OperationQueue.cpp
@@ -21,7 +21,7 @@
  * \file OperationQueue.cpp
  */
 
-#include "OperationQueue.h"
+#include "qpid/asyncStore/OperationQueue.h"
 
 #include "qpid/broker/AsyncResultHandle.h"
 #include "qpid/broker/AsyncResultHandleImpl.h"
diff --git a/cpp/src/qpid/asyncStore/OperationQueue.h b/cpp/src/qpid/asyncStore/OperationQueue.h
index 473b5f1cfb..cbae2554ef 100644
--- a/cpp/src/qpid/asyncStore/OperationQueue.h
+++ b/cpp/src/qpid/asyncStore/OperationQueue.h
@@ -24,8 +24,7 @@
 #ifndef qpid_asyncStore_OperationQueue_h_
 #define qpid_asyncStore_OperationQueue_h_
 
-#include "AsyncOperation.h"
-
+#include "qpid/asyncStore/AsyncOperation.h"
 #include "qpid/sys/PollableQueue.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp b/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp
index fd449e1b9c..91283329ea 100644
--- a/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp
+++ b/cpp/src/qpid/asyncStore/PersistableMessageContext.cpp
@@ -1,4 +1,27 @@
-#include "PersistableMessageContext.h"
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * \file PersistableMessageContext.cpp
+ */
+
+#include "qpid/asyncStore/PersistableMessageContext.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/PersistableMessageContext.h b/cpp/src/qpid/asyncStore/PersistableMessageContext.h
index ec9eb377c2..d19d390883 100644
--- a/cpp/src/qpid/asyncStore/PersistableMessageContext.h
+++ b/cpp/src/qpid/asyncStore/PersistableMessageContext.h
@@ -1,3 +1,26 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you 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.
+ */
+
+/**
+ * \file PersistableMessageContext.h
+ */
+
 #ifndef qpid_asyncStore_PersistableMessageContext_h_
 #define qpid_asyncStore_PersistableMessageContext_h_
 
diff --git a/cpp/src/qpid/asyncStore/Plugin.cpp b/cpp/src/qpid/asyncStore/Plugin.cpp
index a577e6c040..f6930272a4 100644
--- a/cpp/src/qpid/asyncStore/Plugin.cpp
+++ b/cpp/src/qpid/asyncStore/Plugin.cpp
@@ -21,10 +21,9 @@
  * \file Plugin.cpp
  */
 
-#include "Plugin.h"
-
-#include "AsyncStoreImpl.h"
+#include "qpid/asyncStore/Plugin.h"
 
+#include "qpid/asyncStore/AsyncStoreImpl.h"
 #include "qpid/broker/Broker.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/asyncStore/Plugin.h b/cpp/src/qpid/asyncStore/Plugin.h
index 7d2b67bdad..3005a9b57d 100644
--- a/cpp/src/qpid/asyncStore/Plugin.h
+++ b/cpp/src/qpid/asyncStore/Plugin.h
@@ -24,7 +24,7 @@
 #ifndef qpid_broker_Plugin_h_
 #define qpid_broker_Plugin_h_
 
-#include "AsyncStoreOptions.h"
+#include "qpid/asyncStore/AsyncStoreOptions.h"
 
 #include "qpid/Plugin.h"
 
diff --git a/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp b/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp
index ddb10be7b3..74f92bfc51 100644
--- a/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/QueueHandleImpl.cpp
@@ -21,7 +21,7 @@
  * \file QueueHandleImpl.cpp
  */
 
-#include "QueueHandleImpl.h"
+#include "qpid/asyncStore/QueueHandleImpl.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/RunState.cpp b/cpp/src/qpid/asyncStore/RunState.cpp
index 9ad05655ed..fdf8e5b602 100644
--- a/cpp/src/qpid/asyncStore/RunState.cpp
+++ b/cpp/src/qpid/asyncStore/RunState.cpp
@@ -21,7 +21,7 @@
  * \file RunState.cpp
  */
 
-#include "RunState.h"
+#include "qpid/asyncStore/RunState.h"
 
 #include "qpid/Exception.h"
 
diff --git a/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp b/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
index 8f41d4ce81..2ef7fa58ff 100644
--- a/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
+++ b/cpp/src/qpid/asyncStore/TxnHandleImpl.cpp
@@ -21,7 +21,7 @@
  * \file TxnHandleImpl.cpp
  */
 
-#include "TxnHandleImpl.h"
+#include "qpid/asyncStore/TxnHandleImpl.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h b/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h
index 0cb1a5ed00..6f22b2fe87 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/AsyncJournal.h
@@ -24,9 +24,9 @@
 #ifndef qpid_asyncStore_jrnl2_AsyncJournal_h_
 #define qpid_asyncStore_jrnl2_AsyncJournal_h_
 
-#include "JournalDirectory.h"
-#include "JournalRunState.h"
-#include "ScopedLock.h"
+#include "qpid/asyncStore/jrnl2/JournalDirectory.h"
+#include "qpid/asyncStore/jrnl2/JournalRunState.h"
+#include "qpid/asyncStore/jrnl2/ScopedLock.h"
 
 #include <string>
 #include <stdint.h> // uint64_t, uint32_t, etc.
diff --git a/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h b/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h
index 3177b7ea36..55d435c589 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/AtomicCounter.h
@@ -24,7 +24,7 @@
 #ifndef qpid_asyncStore_jrnl2_AtomicCounter_h_
 #define qpid_asyncStore_jrnl2_AtomicCounter_h_
 
-#include "ScopedLock.h"
+#include "qpid/asyncStore/jrnl2/ScopedLock.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
index 5123077d67..2560149150 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.cpp
@@ -21,9 +21,9 @@
  * \file DataOpState.cpp
  */
 
-#include "DataOpState.h"
+#include "qpid/asyncStore/jrnl2/DataOpState.h"
 
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
 
 #include <sstream> // std::ostringstream
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h
index 5316c90d69..75ea0b5f77 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataOpState.h
@@ -24,7 +24,7 @@
 #ifndef qpid_asyncStore_jrnl2_DataOpState_h_
 #define qpid_asyncStore_jrnl2_DataOpState_h_
 
-#include "State.h"
+#include "qpid/asyncStore/jrnl2/State.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp b/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp
index c129a1dd37..5ffa7c43f9 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataToken.cpp
@@ -21,7 +21,7 @@
  * \file DataToken.cpp
  */
 
-#include "DataToken.h"
+#include "qpid/asyncStore/jrnl2/DataToken.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataToken.h b/cpp/src/qpid/asyncStore/jrnl2/DataToken.h
index 3aed38bc42..341286adae 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataToken.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataToken.h
@@ -24,9 +24,9 @@
 #ifndef qpid_jrnl2_asyncStore_DataToken_h_
 #define qpid_jrnl2_asyncStore_DataToken_h_
 
-#include "DataOpState.h"
-#include "DataWrComplState.h"
-#include "RecordIdCounter.h"
+#include "qpid/asyncStore/jrnl2/DataOpState.h"
+#include "qpid/asyncStore/jrnl2/DataWrComplState.h"
+#include "qpid/asyncStore/jrnl2/RecordIdCounter.h"
 
 #include <string>
 #include <stdint.h> // uint64_t
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp
index f4d06360bd..70f7e07f8c 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.cpp
@@ -21,9 +21,9 @@
  * \file DataWrComplState.cpp
  */
 
-#include "DataWrComplState.h"
+#include "qpid/asyncStore/jrnl2/DataWrComplState.h"
 
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
 
 #include <sstream> // std::ostringstream
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h
index 355180ec87..6123b4f0fe 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/DataWrComplState.h
@@ -24,7 +24,7 @@
 #ifndef qpid_asyncStore_jrnl2_DataWrComplState_h_
 #define qpid_asyncStore_jrnl2_DataWrComplState_h_
 
-#include "State.h"
+#include "qpid/asyncStore/jrnl2/State.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp
index 402f48c24e..b7fb4fa074 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.cpp
@@ -21,9 +21,9 @@
  * \file DequeueHeader.cpp
  */
 
-#include "DequeueHeader.h"
+#include "qpid/asyncStore/jrnl2/DequeueHeader.h"
 
-#include "RecordTail.h"
+#include "qpid/asyncStore/jrnl2/RecordTail.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h b/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h
index deb23915f7..d6da730e87 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/DequeueHeader.h
@@ -54,7 +54,7 @@
 #ifndef qpid_asyncStore_jrnl2_DequeueHeader_h_
 #define qpid_asyncStore_jrnl2_DequeueHeader_h_
 
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp
index b2ebe95c43..f825632884 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.cpp
@@ -21,7 +21,7 @@
  * \file EnqueueHeader.cpp
  */
 
-#include "EnqueueHeader.h"
+#include "qpid/asyncStore/jrnl2/EnqueueHeader.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h b/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h
index 4d6dc9cfed..d62f3dcd87 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/EnqueueHeader.h
@@ -54,7 +54,7 @@
 #ifndef qpid_asyncStore_jrnl2_EnqueueHeader_h_
 #define qpid_asyncStore_jrnl2_EnqueueHeader_h_
 
-#include "EventHeader.h"
+#include "qpid/asyncStore/jrnl2/EventHeader.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp
index 0b9c2e14d4..e3a6c16445 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/EventHeader.cpp
@@ -21,9 +21,9 @@
  * \file EventHeader.cpp
  */
 
-#include "EventHeader.h"
+#include "qpid/asyncStore/jrnl2/EventHeader.h"
 
-#include "RecordTail.h"
+#include "qpid/asyncStore/jrnl2/RecordTail.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h b/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h
index c4f48c1022..435fc5cbb2 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/EventHeader.h
@@ -54,7 +54,7 @@
 #ifndef qpid_asyncStore_jrnl2_EventHeader_h_
 #define qpid_asyncStore_jrnl2_EventHeader_h_
 
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp
index 169e3b4ab4..ed269b8dc9 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/FileHeader.cpp
@@ -21,9 +21,9 @@
  * \file FileHeader.cpp
  */
 
-#include "FileHeader.h"
+#include "qpid/asyncStore/jrnl2/FileHeader.h"
 
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
 
 #include <cerrno>
 #include <cstring>
diff --git a/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h b/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h
index 2d7a17a90c..4d164fc695 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/FileHeader.h
@@ -54,7 +54,7 @@
 #ifndef qpid_asyncStore_jrnl2_FileHeader_h_
 #define qpid_asyncStore_jrnl2_FileHeader_h_
 
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
 
 struct timespec;
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp
index 98fe84c87d..714543232e 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalDirectory.cpp
@@ -20,9 +20,9 @@
 /**
  * \file JournalDirectory.cpp
  */
-#include "JournalDirectory.h"
+#include "qpid/asyncStore/jrnl2/JournalDirectory.h"
 
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
 
 #include <cstring>
 #include <dirent.h>
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp
index 24d840ea2b..864072c3d4 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalError.cpp
@@ -21,7 +21,7 @@
  * \file JournalError.cpp
  */
 
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
 
 #include <iomanip> // std::setfill(), std::setw()
 #include <sstream> // std::ostringstream
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalError.h b/cpp/src/qpid/asyncStore/jrnl2/JournalError.h
index 44e289df43..c3d9834a65 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalError.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalError.h
@@ -24,7 +24,7 @@
 #ifndef qpid_asyncStore_jrnl2_JournalError_hpp_
 #define qpid_asyncStore_jrnl2_JournalError_hpp_
 
-#include "Streamable.h"
+#include "qpid/asyncStore/jrnl2/Streamable.h"
 
 #include <map>
 #include <stdexcept> // std::runtime_error
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp
index 63417582bc..413d68c69c 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalParameters.cpp
@@ -21,7 +21,7 @@
  * \file JournalParameters.cpp
  */
 
-#include "JournalParameters.h"
+#include "qpid/asyncStore/jrnl2/JournalParameters.h"
 
 #include <sstream>
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
index 4a0d2cfd7f..a371183aeb 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.cpp
@@ -21,9 +21,9 @@
  * \file JournalRunState.cpp
  */
 
-#include "JournalRunState.h"
+#include "qpid/asyncStore/jrnl2/JournalRunState.h"
 
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
 
 #include <sstream>
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h
index 4f3a64a009..7983b9411e 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/JournalRunState.h
@@ -24,7 +24,7 @@
 #ifndef qpid_asyncStore_jrnl2_JournalRunState_h_
 #define qpid_asyncStore_jrnl2_JournalRunState_h_
 
-#include "State.h"
+#include "qpid/asyncStore/jrnl2/State.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
index e12a0c96d8..2d4a487791 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/RecordHeader.cpp
@@ -21,9 +21,9 @@
  * \file RecordHeader.cpp
  */
 
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
 
-#include "Configuration.h"
+#include "qpid/asyncStore/jrnl2/Configuration.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h b/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h
index 5fe2c01429..83cfa74242 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/RecordIdCounter.h
@@ -24,7 +24,7 @@
 #ifndef qpid_asyncStore_jrnl2_RecordCounter_h_
 #define qpid_asyncStore_jrnl2_RecordCounter_h_
 
-#include "AtomicCounter.h"
+#include "qpid/asyncStore/jrnl2/AtomicCounter.h"
 
 #include <stdint.h> // uint64_t
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp b/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp
index 39e8ba5dcf..0342a4f497 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/RecordTail.cpp
@@ -22,9 +22,9 @@
  */
 
 
-#include "RecordTail.h"
+#include "qpid/asyncStore/jrnl2/RecordTail.h"
 
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp b/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp
index 90509f1754..b1d73194c6 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/ScopedLock.cpp
@@ -21,9 +21,9 @@
  * \file ScopedLock.cpp
  */
 
-#include "ScopedLock.h"
+#include "qpid/asyncStore/jrnl2/ScopedLock.h"
 
-#include "JournalError.h"
+#include "qpid/asyncStore/jrnl2/JournalError.h"
 
 #include <cerrno> // EBUSY
 #include <cstring> // std::strerror
diff --git a/cpp/src/qpid/asyncStore/jrnl2/State.h b/cpp/src/qpid/asyncStore/jrnl2/State.h
index 5d7c8d6fe9..01b25511b1 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/State.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/State.h
@@ -24,7 +24,7 @@
 #ifndef qpid_asyncStore_jrnl2_State_h_
 #define qpid_asyncStore_jrnl2_State_h_
 
-#include "Streamable.h"
+#include "qpid/asyncStore/jrnl2/Streamable.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp b/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp
index a153797c96..0dfdf0a191 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/Streamable.cpp
@@ -21,7 +21,7 @@
  * \file Streamable.cpp
  */
 
-#include "Streamable.h"
+#include "qpid/asyncStore/jrnl2/Streamable.h"
 
 #include <sstream>
 
diff --git a/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp b/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp
index 6becbeea9c..1ab288f0cd 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp
+++ b/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.cpp
@@ -21,8 +21,9 @@
  * \file TransactionHeader.cpp
  */
 
-#include "RecordTail.h"
-#include "TransactionHeader.h"
+#include "qpid/asyncStore/jrnl2/TransactionHeader.h"
+
+#include "qpid/asyncStore/jrnl2/RecordTail.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h b/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h
index 9bc0ee9e9b..48131fb066 100644
--- a/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h
+++ b/cpp/src/qpid/asyncStore/jrnl2/TransactionHeader.h
@@ -54,7 +54,7 @@
 #ifndef qpid_asyncStore_jrnl2_TransactionHeader_h_
 #define qpid_asyncStore_jrnl2_TransactionHeader_h_
 
-#include "RecordHeader.h"
+#include "qpid/asyncStore/jrnl2/RecordHeader.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/broker/AsyncResultHandle.cpp b/cpp/src/qpid/broker/AsyncResultHandle.cpp
index 1d42b6096f..b95c50b423 100644
--- a/cpp/src/qpid/broker/AsyncResultHandle.cpp
+++ b/cpp/src/qpid/broker/AsyncResultHandle.cpp
@@ -21,10 +21,10 @@
  * \file AsyncResultHandle.cpp
  */
 
-#include "AsyncResultHandle.h"
+#include "qpid/broker/AsyncResultHandle.h"
 
-#include "AsyncResultHandleImpl.h"
-#include "PrivateImplRef.h"
+#include "qpid/broker/AsyncResultHandleImpl.h"
+#include "qpid/broker/PrivateImplRef.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/AsyncResultHandle.h b/cpp/src/qpid/broker/AsyncResultHandle.h
index cf0fea5a06..39a9ccc6ff 100644
--- a/cpp/src/qpid/broker/AsyncResultHandle.h
+++ b/cpp/src/qpid/broker/AsyncResultHandle.h
@@ -24,7 +24,7 @@
 #ifndef qpid_broker_AsyncResultHandle_h_
 #define qpid_broker_AsyncResultHandle_h_
 
-#include "Handle.h"
+#include "qpid/broker/Handle.h"
 
 #include <boost/shared_ptr.hpp>
 #include <string>
diff --git a/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp b/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
index 2239902566..c81430b19c 100644
--- a/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
+++ b/cpp/src/qpid/broker/AsyncResultHandleImpl.cpp
@@ -21,7 +21,7 @@
  * \file AsyncResultHandleImpl.cpp
  */
 
-#include "AsyncResultHandleImpl.h"
+#include "qpid/broker/AsyncResultHandleImpl.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/AsyncResultHandleImpl.h b/cpp/src/qpid/broker/AsyncResultHandleImpl.h
index 4fe6d1248c..a53f75c9b4 100644
--- a/cpp/src/qpid/broker/AsyncResultHandleImpl.h
+++ b/cpp/src/qpid/broker/AsyncResultHandleImpl.h
@@ -24,8 +24,7 @@
 #ifndef qpid_broker_AsyncResultHandleImpl_h_
 #define qpid_broker_AsyncResultHandleImpl_h_
 
-#include "AsyncStore.h"
-
+#include "qpid/broker/AsyncStore.h"
 #include "qpid/RefCounted.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp b/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
index 9f8188f8c7..6f20a6816c 100644
--- a/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
+++ b/cpp/src/qpid/broker/AsyncResultQueueImpl.cpp
@@ -21,10 +21,9 @@
  * \file AsyncResultQueueImpl.cpp
  */
 
-#include "AsyncResultQueueImpl.h"
-
-#include "AsyncResultHandle.h"
+#include "qpid/broker/AsyncResultQueueImpl.h"
 
+#include "qpid/broker/AsyncResultHandle.h"
 #include "qpid/log/Statement.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/AsyncResultQueueImpl.h b/cpp/src/qpid/broker/AsyncResultQueueImpl.h
index 805057400f..2e7eab1590 100644
--- a/cpp/src/qpid/broker/AsyncResultQueueImpl.h
+++ b/cpp/src/qpid/broker/AsyncResultQueueImpl.h
@@ -24,8 +24,7 @@
 #ifndef qpid_broker_AsyncResultQueueImpl_h_
 #define qpid_broker_AsyncResultQueueImpl_h_
 
-#include "AsyncStore.h"
-
+#include "qpid/broker/AsyncStore.h"
 #include "qpid/sys/PollableQueue.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/ConfigHandle.cpp b/cpp/src/qpid/broker/ConfigHandle.cpp
index 17dfbd7369..7b520e4234 100644
--- a/cpp/src/qpid/broker/ConfigHandle.cpp
+++ b/cpp/src/qpid/broker/ConfigHandle.cpp
@@ -21,10 +21,9 @@
  * \file ConfigHandle.cpp
  */
 
-#include "ConfigHandle.h"
-
-#include "PrivateImplRef.h"
+#include "qpid/broker/ConfigHandle.h"
 
+#include "qpid/broker/PrivateImplRef.h"
 #include "qpid/asyncStore/ConfigHandleImpl.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/ConfigHandle.h b/cpp/src/qpid/broker/ConfigHandle.h
index 3010018421..a12fb4ac85 100644
--- a/cpp/src/qpid/broker/ConfigHandle.h
+++ b/cpp/src/qpid/broker/ConfigHandle.h
@@ -24,9 +24,8 @@
 #ifndef qpid_broker_ConfigHandle_h_
 #define qpid_broker_ConfigHandle_h_
 
-#include "Handle.h"
-
 #include "qpid/asyncStore/AsyncStoreHandle.h"
+#include "qpid/broker/Handle.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/broker/EnqueueHandle.cpp b/cpp/src/qpid/broker/EnqueueHandle.cpp
index b305da4105..daaba8a0a9 100644
--- a/cpp/src/qpid/broker/EnqueueHandle.cpp
+++ b/cpp/src/qpid/broker/EnqueueHandle.cpp
@@ -21,11 +21,10 @@
  * \file EnqueueHandle.cpp
  */
 
-#include "EnqueueHandle.h"
-
-#include "PrivateImplRef.h"
+#include "qpid/broker/EnqueueHandle.h"
 
 #include "qpid/asyncStore/EnqueueHandleImpl.h"
+#include "qpid/broker/PrivateImplRef.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/EnqueueHandle.h b/cpp/src/qpid/broker/EnqueueHandle.h
index 63872bb3b3..5f87581eb1 100644
--- a/cpp/src/qpid/broker/EnqueueHandle.h
+++ b/cpp/src/qpid/broker/EnqueueHandle.h
@@ -24,9 +24,8 @@
 #ifndef qpid_broker_EnqueueHandle_h_
 #define qpid_broker_EnqueueHandle_h_
 
-#include "Handle.h"
-
 #include "qpid/asyncStore/AsyncStoreHandle.h"
+#include "qpid/broker/Handle.h"
 
 namespace qpid {
 namespace asyncStore {
diff --git a/cpp/src/qpid/broker/EventHandle.cpp b/cpp/src/qpid/broker/EventHandle.cpp
index 84934415b5..eaf599eac5 100644
--- a/cpp/src/qpid/broker/EventHandle.cpp
+++ b/cpp/src/qpid/broker/EventHandle.cpp
@@ -21,11 +21,10 @@
  * \file EventHandle.cpp
  */
 
-#include "EventHandle.h"
-
-#include "PrivateImplRef.h"
+#include "qpid/broker/EventHandle.h"
 
 #include "qpid/asyncStore/EventHandleImpl.h"
+#include "qpid/broker/PrivateImplRef.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/EventHandle.h b/cpp/src/qpid/broker/EventHandle.h
index d73cf1e689..10e45310aa 100644
--- a/cpp/src/qpid/broker/EventHandle.h
+++ b/cpp/src/qpid/broker/EventHandle.h
@@ -24,9 +24,8 @@
 #ifndef qpid_broker_EventHandle_h_
 #define qpid_broker_EventHandle_h_
 
-#include "Handle.h"
-
 #include "qpid/asyncStore/AsyncStoreHandle.h"
+#include "qpid/broker/Handle.h"
 
 #include <string>
 
diff --git a/cpp/src/qpid/broker/SimpleDeliverable.cpp b/cpp/src/qpid/broker/SimpleDeliverable.cpp
index 7037a377c5..9e2d47b73d 100644
--- a/cpp/src/qpid/broker/SimpleDeliverable.cpp
+++ b/cpp/src/qpid/broker/SimpleDeliverable.cpp
@@ -21,7 +21,7 @@
  * \file SimpleDeliverable.cpp
  */
 
-#include "SimpleDeliverable.h"
+#include "qpid/broker/SimpleDeliverable.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp b/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp
index b71df6975b..62ca681344 100644
--- a/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp
+++ b/cpp/src/qpid/broker/SimpleDeliveryRecord.cpp
@@ -21,12 +21,12 @@
  * \file SimpleDeliveryRecord.cpp
  */
 
-#include "SimpleDeliveryRecord.h"
+#include "qpid/broker/SimpleDeliveryRecord.h"
 
-#include "SimpleConsumer.h"
-#include "SimpleMessage.h"
-#include "SimpleQueue.h"
-#include "SimpleQueuedMessage.h"
+#include "qpid/broker/SimpleConsumer.h"
+#include "qpid/broker/SimpleMessage.h"
+#include "qpid/broker/SimpleQueue.h"
+#include "qpid/broker/SimpleQueuedMessage.h"
 
 namespace qpid  {
 namespace broker {
diff --git a/cpp/src/qpid/broker/SimpleMessage.cpp b/cpp/src/qpid/broker/SimpleMessage.cpp
index 3a85ca9ae4..2e81957a2a 100644
--- a/cpp/src/qpid/broker/SimpleMessage.cpp
+++ b/cpp/src/qpid/broker/SimpleMessage.cpp
@@ -21,7 +21,7 @@
  * \file SimpleMessage.cpp
  */
 
-#include "SimpleMessage.h"
+#include "qpid/broker/SimpleMessage.h"
 
 #include <string.h> // memcpy()
 
@@ -37,74 +37,13 @@ SimpleMessage::SimpleMessage(const char* msgData,
         m_persistentContext(persistentContext)
 {}
 
-
-/*
-SimpleMessage::SimpleMessage(const char* msgData,
-                             const uint32_t msgSize) :
-        m_persistenceId(0ULL),
-        m_msg(msgData, static_cast<size_t>(msgSize)),
-        m_store(0),
-        m_msgHandle(MessageHandle())
-{}
-
-SimpleMessage::SimpleMessage(const char* msgData,
-                             const uint32_t msgSize,
-                             AsyncStore* store) :
-        m_persistenceId(0ULL),
-        m_msg(msgData, static_cast<size_t>(msgSize)),
-        m_store(store),
-        m_msgHandle(store ? store->createMessageHandle(this) : MessageHandle())
-{}
-*/
-
 SimpleMessage::~SimpleMessage() {}
 
-/*
-const MessageHandle&
-SimpleMessage::getHandle() const {
-    return m_persistentContext.getHandle();
-}
-
-MessageHandle&
-SimpleMessage::getHandle() {
-    return m_persistentContext.getHandle();
-}
-*/
-
 uint64_t
 SimpleMessage::contentSize() const {
     return  static_cast<uint64_t>(m_msg.size());
 }
 
-/*
-void
-SimpleMessage::setPersistenceId(uint64_t id) const {
-    m_persistenceId = id;
-}
-
-uint64_t
-SimpleMessage::getPersistenceId() const {
-    return m_persistenceId;
-}
-
-void
-SimpleMessage::encode(qpid::framing::Buffer& buffer) const {
-    buffer.putRawData(m_msg);
-}
-
-uint32_t
-SimpleMessage::encodedSize() const {
-    return static_cast<uint32_t>(m_msg.size());
-}
-
-void
-SimpleMessage::allDequeuesComplete() {}
-
-uint32_t
-SimpleMessage::encodedHeaderSize() const {
-    return 0;
-}
-*/
 bool
 SimpleMessage::isPersistent() const {
     return m_persistentContext.get() != 0;
diff --git a/cpp/src/qpid/broker/SimpleMessage.h b/cpp/src/qpid/broker/SimpleMessage.h
index 72ede431e0..ceff6f0b85 100644
--- a/cpp/src/qpid/broker/SimpleMessage.h
+++ b/cpp/src/qpid/broker/SimpleMessage.h
@@ -24,15 +24,13 @@
 #ifndef qpid_broker_SimpleMessage_h_
 #define qpid_broker_SimpleMessage_h_
 
-#include "AsyncStore.h" // DataSource
-//#include "MessageHandle.h"
-#include "PersistableMessage.h"
+#include "qpid/broker/AsyncStore.h" // DataSource
+#include "qpid/broker/PersistableMessage.h"
 
 namespace qpid  {
 namespace broker {
 
-class SimpleMessage: /*public PersistableMessage,*/
-                     public DataSource,
+class SimpleMessage: public DataSource,
                      public RefCounted
 {
 public:
@@ -41,20 +39,8 @@ public:
                   const uint32_t msgSize,
                   boost::intrusive_ptr<PersistableMessage> persistentContext);
     virtual ~SimpleMessage();
-//    const MessageHandle& getHandle() const;
-//    MessageHandle& getHandle();
     uint64_t contentSize() const;
 
-//    // --- Interface Persistable ---
-//    virtual void setPersistenceId(uint64_t id) const;
-//    virtual uint64_t getPersistenceId() const;
-//    virtual void encode(qpid::framing::Buffer& buffer) const;
-//    virtual uint32_t encodedSize() const;
-//
-//    // --- Interface PersistableMessage ---
-//    virtual void allDequeuesComplete();
-//    virtual uint32_t encodedHeaderSize() const;
-
     // Persistent operations
     bool isPersistent() const;
     boost::intrusive_ptr<PersistableMessage> getPersistentContext() const;
@@ -64,12 +50,8 @@ public:
     virtual void write(char* target);
 
 private:
-//    mutable uint64_t m_persistenceId;
     const std::string m_msg;
     boost::intrusive_ptr<PersistableMessage> m_persistentContext;
-//    AsyncStore* m_store;
-
-//    MessageHandle m_msgHandle;
 };
 
 }} // namespace qpid::broker
diff --git a/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp b/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp
index a88258f5bc..e19ac154d0 100644
--- a/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp
+++ b/cpp/src/qpid/broker/SimpleMessageAsyncContext.cpp
@@ -21,9 +21,9 @@
  * \file SimpleMessageAsyncContext.cpp
  */
 
-#include "SimpleMessageAsyncContext.h"
+#include "qpid/broker/SimpleMessageAsyncContext.h"
 
-#include "SimpleMessage.h"
+#include "qpid/broker/SimpleMessage.h"
 
 #include <cassert>
 
diff --git a/cpp/src/qpid/broker/SimpleMessageAsyncContext.h b/cpp/src/qpid/broker/SimpleMessageAsyncContext.h
index e3975e790e..b9ab48f0dd 100644
--- a/cpp/src/qpid/broker/SimpleMessageAsyncContext.h
+++ b/cpp/src/qpid/broker/SimpleMessageAsyncContext.h
@@ -24,7 +24,7 @@
 #ifndef qpid_broker_SimpleMessageAsyncContext_h_
 #define qpid_broker_SimpleMessageAsyncContext_h_
 
-#include "AsyncStore.h" // BrokerAsyncContext
+#include "qpid/broker/AsyncStore.h" // BrokerAsyncContext
 
 #include <boost/intrusive_ptr.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/cpp/src/qpid/broker/SimpleMessageDeque.cpp b/cpp/src/qpid/broker/SimpleMessageDeque.cpp
index 0aadcfd94a..69cf7dd09c 100644
--- a/cpp/src/qpid/broker/SimpleMessageDeque.cpp
+++ b/cpp/src/qpid/broker/SimpleMessageDeque.cpp
@@ -21,9 +21,9 @@
  * \file SimpleMessageDeque.cpp
  */
 
-#include "SimpleMessageDeque.h"
+#include "qpid/broker/SimpleMessageDeque.h"
 
-#include "SimpleQueuedMessage.h"
+#include "qpid/broker/SimpleQueuedMessage.h"
 
 namespace qpid  {
 namespace broker {
diff --git a/cpp/src/qpid/broker/SimpleMessageDeque.h b/cpp/src/qpid/broker/SimpleMessageDeque.h
index 5db0755a43..ce2cb475fd 100644
--- a/cpp/src/qpid/broker/SimpleMessageDeque.h
+++ b/cpp/src/qpid/broker/SimpleMessageDeque.h
@@ -29,7 +29,7 @@
 #ifndef qpid_broker_SimpleMessageDeque_h_
 #define qpid_broker_SimpleMessageDeque_h_
 
-#include "SimpleMessages.h"
+#include "qpid/broker/SimpleMessages.h"
 
 #include "qpid/sys/Mutex.h"
 
diff --git a/cpp/src/qpid/broker/SimpleQueue.cpp b/cpp/src/qpid/broker/SimpleQueue.cpp
index e20edc1f92..9669f060d3 100644
--- a/cpp/src/qpid/broker/SimpleQueue.cpp
+++ b/cpp/src/qpid/broker/SimpleQueue.cpp
@@ -21,16 +21,16 @@
  * \file SimpleQueue.cpp
  */
 
-#include "SimpleQueue.h"
-
-#include "AsyncResultHandle.h"
-#include "QueueAsyncContext.h"
-#include "SimpleConsumer.h"
-#include "SimpleDeliveryRecord.h"
-#include "SimpleMessage.h"
-#include "SimpleMessageDeque.h"
-#include "SimpleQueuedMessage.h"
-#include "SimpleTxnBuffer.h"
+#include "qpid/broker/SimpleQueue.h"
+
+#include "qpid/broker/AsyncResultHandle.h"
+#include "qpid/broker/QueueAsyncContext.h"
+#include "qpid/broker/SimpleConsumer.h"
+#include "qpid/broker/SimpleDeliveryRecord.h"
+#include "qpid/broker/SimpleMessage.h"
+#include "qpid/broker/SimpleMessageDeque.h"
+#include "qpid/broker/SimpleQueuedMessage.h"
+#include "qpid/broker/SimpleTxnBuffer.h"
 
 #include <string.h> // memcpy()
 
diff --git a/cpp/src/qpid/broker/SimpleQueuedMessage.cpp b/cpp/src/qpid/broker/SimpleQueuedMessage.cpp
index f5135902a4..fe9e211aa3 100644
--- a/cpp/src/qpid/broker/SimpleQueuedMessage.cpp
+++ b/cpp/src/qpid/broker/SimpleQueuedMessage.cpp
@@ -21,10 +21,10 @@
  * \file SimpleQueuedMessage.cpp
  */
 
-#include "SimpleQueuedMessage.h"
+#include "qpid/broker/SimpleQueuedMessage.h"
 
-#include "SimpleMessage.h"
-#include "SimpleQueue.h"
+#include "qpid/broker/SimpleMessage.h"
+#include "qpid/broker/SimpleQueue.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/SimpleQueuedMessage.h b/cpp/src/qpid/broker/SimpleQueuedMessage.h
index 1172eb73f3..267f2efea9 100644
--- a/cpp/src/qpid/broker/SimpleQueuedMessage.h
+++ b/cpp/src/qpid/broker/SimpleQueuedMessage.h
@@ -24,8 +24,8 @@
 #ifndef qpid_broker_SimpleQueuedMessage_h_
 #define qpid_broker_SimpleQueuedMessage_h_
 
-#include "AsyncStore.h"
-#include "EnqueueHandle.h"
+#include "qpid/broker/AsyncStore.h"
+#include "qpid/broker/EnqueueHandle.h"
 
 #include <boost/enable_shared_from_this.hpp>
 #include <boost/intrusive_ptr.hpp>
diff --git a/cpp/src/qpid/broker/SimpleTxnAccept.cpp b/cpp/src/qpid/broker/SimpleTxnAccept.cpp
index 343bbb54c7..d01624c5f4 100644
--- a/cpp/src/qpid/broker/SimpleTxnAccept.cpp
+++ b/cpp/src/qpid/broker/SimpleTxnAccept.cpp
@@ -21,10 +21,9 @@
  * \file SimpleTxnAccept.cpp
  */
 
-#include "SimpleTxnAccept.h"
-
-#include "SimpleDeliveryRecord.h"
+#include "qpid/broker/SimpleTxnAccept.h"
 
+#include "qpid/broker/SimpleDeliveryRecord.h"
 #include "qpid/log/Statement.h"
 
 namespace qpid {
diff --git a/cpp/src/qpid/broker/SimpleTxnAccept.h b/cpp/src/qpid/broker/SimpleTxnAccept.h
index eb6963bc88..11b987588b 100644
--- a/cpp/src/qpid/broker/SimpleTxnAccept.h
+++ b/cpp/src/qpid/broker/SimpleTxnAccept.h
@@ -24,7 +24,7 @@
 #ifndef tests_storePerftools_asyncPerf_SimpleTxnAccept_h_
 #define tests_storePerftools_asyncPerf_SimpleTxnAccept_h_
 
-#include "SimpleTxnOp.h"
+#include "qpid/broker/SimpleTxnOp.h"
 
 #include "boost/shared_ptr.hpp"
 #include <deque>
diff --git a/cpp/src/qpid/broker/SimpleTxnBuffer.cpp b/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
index 7995eae874..c49c08fd06 100644
--- a/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
+++ b/cpp/src/qpid/broker/SimpleTxnBuffer.cpp
@@ -21,12 +21,11 @@
  * \file SimpleTxnBuffer.cpp
  */
 
-#include "SimpleTxnBuffer.h"
-
-#include "AsyncResultHandle.h"
-#include "SimpleTxnOp.h"
-#include "TxnAsyncContext.h"
+#include "qpid/broker/SimpleTxnBuffer.h"
 
+#include "qpid/broker/AsyncResultHandle.h"
+#include "qpid/broker/SimpleTxnOp.h"
+#include "qpid/broker/TxnAsyncContext.h"
 #include "qpid/log/Statement.h"
 
 #include <uuid/uuid.h>
diff --git a/cpp/src/qpid/broker/SimpleTxnBuffer.h b/cpp/src/qpid/broker/SimpleTxnBuffer.h
index b2164cfeed..c5309cad27 100644
--- a/cpp/src/qpid/broker/SimpleTxnBuffer.h
+++ b/cpp/src/qpid/broker/SimpleTxnBuffer.h
@@ -24,8 +24,7 @@
 #ifndef qpid_broker_SimpleTxnBuffer_h_
 #define qpid_broker_SimpleTxnBuffer_h_
 
-#include "TxnHandle.h"
-
+#include "qpid/broker/TxnHandle.h"
 #include "qpid/sys/Mutex.h"
 
 #include <boost/shared_ptr.hpp>
diff --git a/cpp/src/qpid/broker/SimpleTxnPublish.cpp b/cpp/src/qpid/broker/SimpleTxnPublish.cpp
index 6ad6a108ea..0da3e0c650 100644
--- a/cpp/src/qpid/broker/SimpleTxnPublish.cpp
+++ b/cpp/src/qpid/broker/SimpleTxnPublish.cpp
@@ -21,14 +21,12 @@
  * \file SimpleTxnPublish.cpp
  */
 
-#include "SimpleTxnPublish.h"
-
-#include "SimpleMessage.h"
-#include "SimpleQueue.h"
-#include "SimpleQueuedMessage.h"
+#include "qpid/broker/SimpleTxnPublish.h"
 
+#include "qpid/broker/SimpleMessage.h"
+#include "qpid/broker/SimpleQueue.h"
+#include "qpid/broker/SimpleQueuedMessage.h"
 #include "qpid/log/Statement.h"
-#include <boost/make_shared.hpp>
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/SimpleTxnPublish.h b/cpp/src/qpid/broker/SimpleTxnPublish.h
index 0aaf8e4ba0..4bc69d94c7 100644
--- a/cpp/src/qpid/broker/SimpleTxnPublish.h
+++ b/cpp/src/qpid/broker/SimpleTxnPublish.h
@@ -24,8 +24,8 @@
 #ifndef qpid_broker_SimpleTxnPublish_h_
 #define qpid_broker_SimpleTxnPublish_h_
 
-#include "SimpleDeliverable.h"
-#include "SimpleTxnOp.h"
+#include "qpid/broker/SimpleDeliverable.h"
+#include "qpid/broker/SimpleTxnOp.h"
 
 #include <boost/intrusive_ptr.hpp>
 #include <boost/shared_ptr.hpp>
diff --git a/cpp/src/qpid/broker/TxnAsyncContext.cpp b/cpp/src/qpid/broker/TxnAsyncContext.cpp
index 720f191b64..3feb3dbaa2 100644
--- a/cpp/src/qpid/broker/TxnAsyncContext.cpp
+++ b/cpp/src/qpid/broker/TxnAsyncContext.cpp
@@ -21,7 +21,7 @@
  * \file TransactionAsyncContext.cpp
  */
 
-#include "TxnAsyncContext.h"
+#include "qpid/broker/TxnAsyncContext.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/TxnAsyncContext.h b/cpp/src/qpid/broker/TxnAsyncContext.h
index 04f6ef76f5..39bdcdae0b 100644
--- a/cpp/src/qpid/broker/TxnAsyncContext.h
+++ b/cpp/src/qpid/broker/TxnAsyncContext.h
@@ -24,9 +24,8 @@
 #ifndef qpid_broker_TxnAsyncContext_h_
 #define qpid_broker_TxnAsyncContext_h_
 
-#include "AsyncStore.h" // qpid::broker::BrokerAsyncContext
-
 #include "qpid/asyncStore/AsyncOperation.h"
+#include "qpid/broker/AsyncStore.h" // qpid::broker::BrokerAsyncContext
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/TxnHandle.cpp b/cpp/src/qpid/broker/TxnHandle.cpp
index a13718b750..a96490aaba 100644
--- a/cpp/src/qpid/broker/TxnHandle.cpp
+++ b/cpp/src/qpid/broker/TxnHandle.cpp
@@ -21,11 +21,10 @@
  * \file TxnHandle.cpp
  */
 
-#include "TxnHandle.h"
-
-#include "PrivateImplRef.h"
+#include "qpid/broker/TxnHandle.h"
 
 #include "qpid/asyncStore/TxnHandleImpl.h"
+#include "qpid/broker/PrivateImplRef.h"
 
 namespace qpid {
 namespace broker {
diff --git a/cpp/src/qpid/broker/TxnHandle.h b/cpp/src/qpid/broker/TxnHandle.h
index f55d5b01d8..49e37a5871 100644
--- a/cpp/src/qpid/broker/TxnHandle.h
+++ b/cpp/src/qpid/broker/TxnHandle.h
@@ -24,9 +24,8 @@
 #ifndef qpid_broker_TxnHandle_h_
 #define qpid_broker_TxnHandle_h_
 
-#include "Handle.h"
-
 #include "qpid/asyncStore/AsyncStoreHandle.h"
+#include "qpid/broker/Handle.h"
 
 #include <string>
 
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp b/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp
index cc24500800..75a0223eaa 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/MessageConsumer.cpp
@@ -21,14 +21,13 @@
  * \file MessageConsumer.cpp
  */
 
-#include "MessageConsumer.h"
-
-#include "TestOptions.h"
+#include "tests/storePerftools/asyncPerf/MessageConsumer.h"
 
 #include "qpid/broker/SimpleDeliveryRecord.h"
 #include "qpid/broker/SimpleQueue.h"
 #include "qpid/broker/SimpleTxnAccept.h"
 #include "qpid/broker/SimpleTxnBuffer.h"
+#include "tests/storePerftools/asyncPerf/TestOptions.h"
 
 #include <stdint.h> // uint32_t
 
diff --git a/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp b/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp
index f5c47c796d..a5204432ec 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/MessageProducer.cpp
@@ -21,15 +21,14 @@
  * \file MessageProducer.cpp
  */
 
-#include "MessageProducer.h"
-
-#include "TestOptions.h"
+#include "tests/storePerftools/asyncPerf/MessageProducer.h"
 
 #include "qpid/asyncStore/PersistableMessageContext.h"
 #include "qpid/broker/SimpleMessage.h"
 #include "qpid/broker/SimpleQueue.h"
 #include "qpid/broker/SimpleTxnBuffer.h"
 #include "qpid/broker/SimpleTxnPublish.h"
+#include "tests/storePerftools/asyncPerf/TestOptions.h"
 
 #include <stdint.h> // uint32_t
 
diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
index 3cd4eefbd9..fadc531150 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.cpp
@@ -21,14 +21,12 @@
  * \file PerfTest.cpp
  */
 
-#include "PerfTest.h"
-
-#include "MessageConsumer.h"
-#include "MessageProducer.h"
-
-#include "tests/storePerftools/version.h"
+#include "tests/storePerftools/asyncPerf/MessageConsumer.h"
+#include "tests/storePerftools/asyncPerf/MessageProducer.h"
+#include "tests/storePerftools/asyncPerf/PerfTest.h"
 #include "tests/storePerftools/common/ScopedTimer.h"
 #include "tests/storePerftools/common/Thread.h"
+#include "tests/storePerftools/version.h"
 
 #include "qpid/Modules.h" // Use with loading store as module
 #include "qpid/asyncStore/AsyncStoreImpl.h"
diff --git a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
index 27d8d08faf..0e45bae4aa 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/PerfTest.h
@@ -24,13 +24,11 @@
 #ifndef tests_storePerftools_asyncPerf_PerfTest_h_
 #define tests_storePerftools_asyncPerf_PerfTest_h_
 
-#include "TestResult.h"
-
-#include "tests/storePerftools/common/Streamable.h"
-
 #include "qpid/broker/AsyncResultQueueImpl.h"
 #include "qpid/framing/FieldTable.h"
 #include "qpid/sys/Thread.h"
+#include "tests/storePerftools/asyncPerf/TestResult.h"
+#include "tests/storePerftools/common/Streamable.h"
 
 #include <boost/shared_ptr.hpp>
 #include <deque>
diff --git a/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp
index 20e9c39f1b..3487f8531f 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/TestOptions.cpp
@@ -21,7 +21,7 @@
  * \file TestOptions.cpp
  */
 
-#include "TestOptions.h"
+#include "tests/storePerftools/asyncPerf/TestOptions.h"
 
 namespace tests {
 namespace storePerftools {
diff --git a/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp b/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp
index 312fa187b8..2433394a0d 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp
+++ b/cpp/src/tests/storePerftools/asyncPerf/TestResult.cpp
@@ -21,7 +21,7 @@
  * \file TestResult.cpp
  */
 
-#include "TestResult.h"
+#include "tests/storePerftools/asyncPerf/TestResult.h"
 
 namespace tests {
 namespace storePerftools {
diff --git a/cpp/src/tests/storePerftools/asyncPerf/TestResult.h b/cpp/src/tests/storePerftools/asyncPerf/TestResult.h
index b2ad49daf7..d1ab5ce929 100644
--- a/cpp/src/tests/storePerftools/asyncPerf/TestResult.h
+++ b/cpp/src/tests/storePerftools/asyncPerf/TestResult.h
@@ -24,8 +24,7 @@
 #ifndef tests_storePerftools_asyncPerf_TestResult_h_
 #define tests_storePerftools_asyncPerf_TestResult_h_
 
-#include "TestOptions.h"
-
+#include "tests/storePerftools/asyncPerf/TestOptions.h"
 #include "tests/storePerftools/common/TestResult.h"
 
 namespace tests {
diff --git a/cpp/src/tests/storePerftools/common/Parameters.h b/cpp/src/tests/storePerftools/common/Parameters.h
index cc3bf5d0f6..a844e10344 100644
--- a/cpp/src/tests/storePerftools/common/Parameters.h
+++ b/cpp/src/tests/storePerftools/common/Parameters.h
@@ -24,7 +24,7 @@
 #ifndef tests_storePerftools_common_Parameters_h_
 #define tests_storePerftools_common_Parameters_h_
 
-#include "Streamable.h"
+#include "tests/storePerftools/common/Streamable.h"
 
 namespace tests {
 namespace storePerftools {
diff --git a/cpp/src/tests/storePerftools/common/PerftoolError.cpp b/cpp/src/tests/storePerftools/common/PerftoolError.cpp
index 8830447062..499dde070a 100644
--- a/cpp/src/tests/storePerftools/common/PerftoolError.cpp
+++ b/cpp/src/tests/storePerftools/common/PerftoolError.cpp
@@ -21,7 +21,7 @@
  * \file PerftoolError.cpp
  */
 
-#include "PerftoolError.h"
+#include "tests/storePerftools/common/PerftoolError.h"
 
 #include <iomanip> // std::setfill(), std::setw()
 
diff --git a/cpp/src/tests/storePerftools/common/PerftoolError.h b/cpp/src/tests/storePerftools/common/PerftoolError.h
index 268835b58d..6e5473ad3b 100644
--- a/cpp/src/tests/storePerftools/common/PerftoolError.h
+++ b/cpp/src/tests/storePerftools/common/PerftoolError.h
@@ -24,7 +24,7 @@
 #ifndef tests_storePerftools_common_PerftoolError_h_
 #define tests_storePerftools_common_PerftoolError_h_
 
-#include "Streamable.h"
+#include "tests/storePerftools/common/Streamable.h"
 
 #include <map>
 #include <stdexcept> // std::runtime_error
diff --git a/cpp/src/tests/storePerftools/common/ScopedTimable.cpp b/cpp/src/tests/storePerftools/common/ScopedTimable.cpp
index 924879411f..e5cf80cba3 100644
--- a/cpp/src/tests/storePerftools/common/ScopedTimable.cpp
+++ b/cpp/src/tests/storePerftools/common/ScopedTimable.cpp
@@ -21,7 +21,7 @@
  * \file ScopedTimable.cpp
  */
 
-#include "ScopedTimable.h"
+#include "tests/storePerftools/common/ScopedTimable.h"
 
 namespace tests {
 namespace storePerftools {
diff --git a/cpp/src/tests/storePerftools/common/ScopedTimer.cpp b/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
index b919ea21ce..50c02d6ef9 100644
--- a/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
+++ b/cpp/src/tests/storePerftools/common/ScopedTimer.cpp
@@ -21,9 +21,9 @@
  * \file ScopedTimer.cpp
  */
 
-#include "ScopedTimer.h"
+#include "tests/storePerftools/common/ScopedTimer.h"
 
-#include "ScopedTimable.h"
+#include "tests/storePerftools/common/ScopedTimable.h"
 
 namespace tests {
 namespace storePerftools {
diff --git a/cpp/src/tests/storePerftools/common/Streamable.cpp b/cpp/src/tests/storePerftools/common/Streamable.cpp
index 8b5427c508..c409cfbf9c 100644
--- a/cpp/src/tests/storePerftools/common/Streamable.cpp
+++ b/cpp/src/tests/storePerftools/common/Streamable.cpp
@@ -21,7 +21,7 @@
  * \file Streamable.cpp
  */
 
-#include "Streamable.h"
+#include "tests/storePerftools/common/Streamable.h"
 
 #include <sstream>
 
diff --git a/cpp/src/tests/storePerftools/common/TestOptions.cpp b/cpp/src/tests/storePerftools/common/TestOptions.cpp
index c0c8b284d3..cb1895ecd1 100644
--- a/cpp/src/tests/storePerftools/common/TestOptions.cpp
+++ b/cpp/src/tests/storePerftools/common/TestOptions.cpp
@@ -21,7 +21,7 @@
  * \file TestOptions.cpp
  */
 
-#include "TestOptions.h"
+#include "tests/storePerftools/common/TestOptions.h"
 
 namespace tests {
 namespace storePerftools {
diff --git a/cpp/src/tests/storePerftools/common/TestParameters.cpp b/cpp/src/tests/storePerftools/common/TestParameters.cpp
index e418eedefb..dee8cff80b 100644
--- a/cpp/src/tests/storePerftools/common/TestParameters.cpp
+++ b/cpp/src/tests/storePerftools/common/TestParameters.cpp
@@ -21,7 +21,7 @@
  * \file TestParameters.cpp
  */
 
-#include "TestParameters.h"
+#include "tests/storePerftools/common/TestParameters.h"
 
 #include <cstdlib> // std::atoi, std::atol
 
diff --git a/cpp/src/tests/storePerftools/common/TestParameters.h b/cpp/src/tests/storePerftools/common/TestParameters.h
index c9ebc8cefa..f950d27487 100644
--- a/cpp/src/tests/storePerftools/common/TestParameters.h
+++ b/cpp/src/tests/storePerftools/common/TestParameters.h
@@ -24,7 +24,7 @@
 #ifndef tests_storePerftools_common_TestParameters_h_
 #define tests_storePerftools_common_TestParameters_h_
 
-#include "Parameters.h"
+#include "tests/storePerftools/common/Parameters.h"
 
 #include <stdint.h>  // uint16_t, uint32_t
 
diff --git a/cpp/src/tests/storePerftools/common/TestResult.h b/cpp/src/tests/storePerftools/common/TestResult.h
index 5092477397..7ee70a7ebe 100644
--- a/cpp/src/tests/storePerftools/common/TestResult.h
+++ b/cpp/src/tests/storePerftools/common/TestResult.h
@@ -24,8 +24,8 @@
 #ifndef tests_storePerftools_common_TestResult_h_
 #define tests_storePerftools_common_TestResult_h_
 
-#include "ScopedTimable.h"
-#include "Streamable.h"
+#include "tests/storePerftools/common/ScopedTimable.h"
+#include "tests/storePerftools/common/Streamable.h"
 
 namespace tests {
 namespace storePerftools {
diff --git a/cpp/src/tests/storePerftools/common/Thread.cpp b/cpp/src/tests/storePerftools/common/Thread.cpp
index cab7d77297..9bc0777c47 100644
--- a/cpp/src/tests/storePerftools/common/Thread.cpp
+++ b/cpp/src/tests/storePerftools/common/Thread.cpp
@@ -21,9 +21,9 @@
  * \file Thread.cpp
  */
 
-#include "Thread.h"
+#include "tests/storePerftools/common/Thread.h"
 
-#include "PerftoolError.h"
+#include "tests/storePerftools/common/PerftoolError.h"
 
 namespace tests {
 namespace storePerftools {