QPID-1726 ASF licensed, Qpid hosted store module

Change included file references in #include to specify the full path
name relative to qpid/cpp/src.


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

68 files changed, 169 insertions, 169 deletions

diff --git a/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp b/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
index 52ae4f0a77..a48c156e71 100644
--- a/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/BindingDbt.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "BindingDbt.h"
+#include "qpid/legacystore/BindingDbt.h"
 
 namespace mrg {
 namespace msgstore {
diff --git a/qpid/cpp/src/qpid/legacystore/BufferValue.cpp b/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
index 65e89d1f9e..fb2c471cd7 100644
--- a/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
+++ b/qpid/cpp/src/qpid/legacystore/BufferValue.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "BufferValue.h"
+#include "qpid/legacystore/BufferValue.h"
 
 namespace mrg {
 namespace msgstore {
diff --git a/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
index 89aeb9218e..796d4c02f0 100644
--- a/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "DataTokenImpl.h"
+#include "qpid/legacystore/DataTokenImpl.h"
 
 using namespace mrg::msgstore;
 
diff --git a/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
index 853631bd34..e01d471e1b 100644
--- a/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/DataTokenImpl.h
@@ -22,7 +22,7 @@
 #ifndef QPID_LEGACYSTORE_DATATOKENIMPL_H
 #define QPID_LEGACYSTORE_DATATOKENIMPL_H
 
-#include "jrnl/data_tok.h"
+#include "qpid/legacystore/jrnl/data_tok.h"
 #include "qpid/broker/PersistableMessage.h"
 #include <boost/intrusive_ptr.hpp>
 
diff --git a/qpid/cpp/src/qpid/legacystore/IdDbt.cpp b/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
index 3d55cf0e10..d9edaf80e6 100644
--- a/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/IdDbt.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "IdDbt.h"
+#include "qpid/legacystore/IdDbt.h"
 
 using namespace mrg::msgstore;
 
diff --git a/qpid/cpp/src/qpid/legacystore/IdSequence.cpp b/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
index 8dcf389071..975b1107e7 100644
--- a/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
+++ b/qpid/cpp/src/qpid/legacystore/IdSequence.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "IdSequence.h"
+#include "qpid/legacystore/IdSequence.h"
 
 using namespace mrg::msgstore;
 using qpid::sys::Mutex;
diff --git a/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp b/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
index 256068608f..27894119c9 100644
--- a/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/JournalImpl.cpp
@@ -19,10 +19,10 @@
  *
  */
 
-#include "JournalImpl.h"
+#include "qpid/legacystore/JournalImpl.h"
 
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 #include "qpid/log/Statement.h"
 #include "qpid/management/ManagementAgent.h"
 #include "qmf/org/apache/qpid/legacystore/ArgsJournalExpand.h"
@@ -32,7 +32,7 @@
 #include "qmf/org/apache/qpid/legacystore/EventRecovered.h"
 #include "qpid/sys/Monitor.h"
 #include "qpid/sys/Timer.h"
-#include "StoreException.h"
+#include "qpid/legacystore/StoreException.h"
 
 using namespace mrg::msgstore;
 using namespace mrg::journal;
diff --git a/qpid/cpp/src/qpid/legacystore/JournalImpl.h b/qpid/cpp/src/qpid/legacystore/JournalImpl.h
index f549d341d3..d3b6b65667 100644
--- a/qpid/cpp/src/qpid/legacystore/JournalImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/JournalImpl.h
@@ -23,10 +23,10 @@
 #define QPID_LEGACYSTORE_JOURNALIMPL_H
 
 #include <set>
-#include "jrnl/enums.h"
-#include "jrnl/jcntl.h"
-#include "DataTokenImpl.h"
-#include "PreparedTransaction.h"
+#include "qpid/legacystore/jrnl/enums.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
+#include "qpid/legacystore/DataTokenImpl.h"
+#include "qpid/legacystore/PreparedTransaction.h"
 #include "qpid/broker/PersistableQueue.h"
 #include "qpid/sys/Timer.h"
 #include "qpid/sys/Time.h"
diff --git a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
index d4a03eff96..6a6f41cdf7 100644
--- a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
@@ -19,16 +19,16 @@
  *
  */
 
-#include "MessageStoreImpl.h"
+#include "qpid/legacystore/MessageStoreImpl.h"
 
-#include "BindingDbt.h"
-#include "BufferValue.h"
-#include "IdDbt.h"
-#include "jrnl/txn_map.h"
+#include "qpid/legacystore/BindingDbt.h"
+#include "qpid/legacystore/BufferValue.h"
+#include "qpid/legacystore/IdDbt.h"
+#include "qpid/legacystore/jrnl/txn_map.h"
 #include "qpid/framing/FieldValue.h"
 #include "qpid/log/Statement.h"
 #include "qmf/org/apache/qpid/legacystore/Package.h"
-#include "StoreException.h"
+#include "qpid/legacystore/StoreException.h"
 #include <dirent.h>
 #include <db.h>
 
diff --git a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
index 2c06f1587b..c21f540139 100644
--- a/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
+++ b/qpid/cpp/src/qpid/legacystore/MessageStoreImpl.h
@@ -25,17 +25,17 @@
 #include <string>
 
 #include "db-inc.h"
-#include "Cursor.h"
-#include "IdDbt.h"
-#include "IdSequence.h"
-#include "JournalImpl.h"
-#include "jrnl/jcfg.h"
-#include "PreparedTransaction.h"
+#include "qpid/legacystore/Cursor.h"
+#include "qpid/legacystore/IdDbt.h"
+#include "qpid/legacystore/IdSequence.h"
+#include "qpid/legacystore/JournalImpl.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
+#include "qpid/legacystore/PreparedTransaction.h"
 #include "qpid/broker/Broker.h"
 #include "qpid/broker/MessageStore.h"
 #include "qpid/management/Manageable.h"
 #include "qmf/org/apache/qpid/legacystore/Store.h"
-#include "TxnCtxt.h"
+#include "qpid/legacystore/TxnCtxt.h"
 
 // Assume DB_VERSION_MAJOR == 4
 #if (DB_VERSION_MINOR == 2)
diff --git a/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
index 26db59f1c8..50b81e2824 100644
--- a/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
+++ b/qpid/cpp/src/qpid/legacystore/PreparedTransaction.cpp
@@ -19,7 +19,7 @@
  *
  */
 
-#include "PreparedTransaction.h"
+#include "qpid/legacystore/PreparedTransaction.h"
 #include <algorithm>
 
 using namespace mrg::msgstore;
diff --git a/qpid/cpp/src/qpid/legacystore/StoreException.h b/qpid/cpp/src/qpid/legacystore/StoreException.h
index 50eef981dc..6624aafd5a 100644
--- a/qpid/cpp/src/qpid/legacystore/StoreException.h
+++ b/qpid/cpp/src/qpid/legacystore/StoreException.h
@@ -22,7 +22,7 @@
 #ifndef QPID_LEGACYSTORE_STOREEXCEPTION_H
 #define QPID_LEGACYSTORE_STOREEXCEPTION_H
 
-#include "IdDbt.h"
+#include "qpid/legacystore/IdDbt.h"
 #include <boost/format.hpp>
 
 namespace mrg{
diff --git a/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp b/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
index 6003c6a2f3..e8795c15e6 100644
--- a/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
+++ b/qpid/cpp/src/qpid/legacystore/StorePlugin.cpp
@@ -24,7 +24,7 @@
 #include "qpid/Options.h"
 #include "qpid/DataDir.h"
 #include "qpid/log/Statement.h"
-#include "MessageStoreImpl.h"
+#include "qpid/legacystore/MessageStoreImpl.h"
 
 using mrg::msgstore::MessageStoreImpl;
 
diff --git a/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp b/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp
index 108d85332b..1db41f4c70 100644
--- a/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp
+++ b/qpid/cpp/src/qpid/legacystore/TxnCtxt.cpp
@@ -19,12 +19,12 @@
  *
  */
 
-#include "TxnCtxt.h"
+#include "qpid/legacystore/TxnCtxt.h"
 
 #include <sstream>
 
-#include "jrnl/jexception.h"
-#include "StoreException.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/StoreException.h"
 
 namespace mrg {
 namespace msgstore {
diff --git a/qpid/cpp/src/qpid/legacystore/TxnCtxt.h b/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
index a4874eff39..77eaa27cd7 100644
--- a/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
+++ b/qpid/cpp/src/qpid/legacystore/TxnCtxt.h
@@ -22,14 +22,14 @@
 #ifndef QPID_LEGACYSTORE_TXNCTXT_H
 #define QPID_LEGACYSTORE_TXNCTXT_H
 
-#include <db-inc.h>
+#include "db-inc.h"
 #include <memory>
 #include <set>
 #include <string>
 
-#include "DataTokenImpl.h"
-#include "IdSequence.h"
-#include "JournalImpl.h"
+#include "qpid/legacystore/DataTokenImpl.h"
+#include "qpid/legacystore/IdSequence.h"
+#include "qpid/legacystore/JournalImpl.h"
 #include "qpid/broker/PersistableQueue.h"
 #include "qpid/broker/TransactionalStore.h"
 #include "qpid/sys/Mutex.h"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
index 8c43880d16..ffbddd887e 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/aio.cpp
@@ -30,7 +30,7 @@
  * \author Kim van der Riet
  */
 
-#include "aio.h"
+#include "qpid/legacystore/jrnl/aio.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
index 1d6e060a77..e4010bf91f 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.cpp
@@ -30,4 +30,4 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/cvar.h"
+#include "qpid/legacystore/jrnl/cvar.h"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h
index 27d5fdc3de..0498e743a2 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/cvar.h
@@ -33,10 +33,10 @@
 #define QPID_LEGACYSTORE_JRNL_CVAR_H
 
 #include <cstring>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
-#include "jrnl/smutex.h"
-#include "jrnl/time_ns.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/time_ns.h"
 #include <pthread.h>
 #include <sstream>
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
index 75b3d6bb5d..ce7206d80d 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
@@ -30,12 +30,12 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/data_tok.h"
+#include "qpid/legacystore/jrnl/data_tok.h"
 
 #include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
-#include "jrnl/slock.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/slock.h"
 #include <sstream>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h
index f4481c9c20..e35f069399 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/data_tok.h
@@ -43,7 +43,7 @@ class data_tok;
 
 #include <cassert>
 #include <cstddef>
-#include "jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/smutex.h"
 #include <pthread.h>
 #include <string>
 #include <sys/types.h>
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
index c1019aea4c..ae7081eac1 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
@@ -34,7 +34,7 @@
 #define QPID_LEGACYSTORE_JRNL_DEQ_HDR_H
 
 #include <cstddef>
-#include "jrnl/rec_hdr.h"
+#include "qpid/legacystore/jrnl/rec_hdr.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
index b792d98273..4de412c201 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
@@ -37,8 +37,8 @@
 #include <cstdlib>
 #include <cstring>
 #include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h
index 4c3cf9f9b8..d870b658da 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/deq_rec.h
@@ -42,8 +42,8 @@ class deq_rec;
 }
 
 #include <cstddef>
-#include "jrnl/deq_hdr.h"
-#include "jrnl/jrec.h"
+#include "qpid/legacystore/jrnl/deq_hdr.h"
+#include "qpid/legacystore/jrnl/jrec.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
index 2a6436df28..0d1e6116be 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
@@ -34,7 +34,7 @@
 #define QPID_LEGACYSTORE_JRNL_ENQ_HDR_H
 
 #include <cstddef>
-#include "jrnl/rec_hdr.h"
+#include "qpid/legacystore/jrnl/rec_hdr.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
index 14039dda4f..d024b704a7 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
@@ -30,11 +30,11 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/enq_map.h"
+#include "qpid/legacystore/jrnl/enq_map.h"
 
 #include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/slock.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/slock.h"
 #include <sstream>
 
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h
index b5e84557f4..75404afebe 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_map.h
@@ -41,8 +41,8 @@ class enq_map;
 }
 }
 
-#include "jrnl/jexception.h"
-#include "jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/smutex.h"
 #include <map>
 #include <pthread.h>
 #include <vector>
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
index e3cfb3d8e4..468599836b 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
@@ -30,15 +30,15 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/enq_rec.h"
+#include "qpid/legacystore/jrnl/enq_rec.h"
 
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
 #include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h
index 36a5de0b6a..805a96a1aa 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/enq_rec.h
@@ -40,8 +40,8 @@ class enq_rec;
 }
 
 #include <cstddef>
-#include "jrnl/enq_hdr.h"
-#include "jrnl/jrec.h"
+#include "qpid/legacystore/jrnl/enq_hdr.h"
+#include "qpid/legacystore/jrnl/jrec.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
index 46e9e071a2..fbb176667e 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
@@ -29,15 +29,15 @@
  * fcntl.h for details.
  */
 
-#include "jrnl/fcntl.h"
+#include "qpid/legacystore/jrnl/fcntl.h"
 
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
 #include <fcntl.h>
 #include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 #include <sstream>
 #include <unistd.h>
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h
index 4ccf39e491..a75e3bc84d 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/fcntl.h
@@ -44,7 +44,7 @@ class fcntl;
 
 #include <cstddef>
 #include <string>
-#include "jrnl/rcvdat.h"
+#include "qpid/legacystore/jrnl/rcvdat.h"
 #include <sys/types.h>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h
index e71ca06aa9..db20834cbb 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/file_hdr.h
@@ -36,9 +36,9 @@
 
 #include <cerrno>
 #include <ctime>
-#include "jrnl/rec_hdr.h"
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/rec_hdr.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
index 90dc43d65c..a03076dca5 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
@@ -31,7 +31,7 @@
  */
 
 
-#include "jrnl/jcntl.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
 
 #include <algorithm>
 #include <cassert>
@@ -41,9 +41,9 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include "jrnl/file_hdr.h"
-#include "jrnl/jerrno.h"
-#include "jrnl/jinf.h"
+#include "qpid/legacystore/jrnl/file_hdr.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jinf.h"
 #include <limits>
 #include <sstream>
 #include <unistd.h>
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h
index 456a3fe159..294e9ced05 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jcntl.h
@@ -43,15 +43,15 @@ namespace journal
 
 #include <cstddef>
 #include <deque>
-#include "jrnl/jdir.h"
-#include "jrnl/fcntl.h"
-#include "jrnl/lpmgr.h"
-#include "jrnl/rcvdat.h"
-#include "jrnl/slock.h"
-#include "jrnl/smutex.h"
-#include "jrnl/rmgr.h"
-#include "jrnl/wmgr.h"
-#include "jrnl/wrfc.h"
+#include "qpid/legacystore/jrnl/jdir.h"
+#include "qpid/legacystore/jrnl/fcntl.h"
+#include "qpid/legacystore/jrnl/lpmgr.h"
+#include "qpid/legacystore/jrnl/rcvdat.h"
+#include "qpid/legacystore/jrnl/slock.h"
+#include "qpid/legacystore/jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/rmgr.h"
+#include "qpid/legacystore/jrnl/wmgr.h"
+#include "qpid/legacystore/jrnl/wrfc.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
index 95ab3fafa4..a874c6c945 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.cpp
@@ -31,15 +31,15 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/jdir.h"
+#include "qpid/legacystore/jrnl/jdir.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <cerrno>
 #include <iomanip>
-#include "jrnl/jcfg.h"
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 #include <sstream>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h
index 5a21b7912c..e129b794d6 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jdir.h
@@ -42,7 +42,7 @@ class jdir;
 }
 }
 
-#include "jrnl/jinf.h"
+#include "qpid/legacystore/jrnl/jinf.h"
 #include <dirent.h>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
index 486fee02e5..4962ce63ab 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
@@ -32,7 +32,7 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
index fe4b4c198a..5c571020e4 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.cpp
@@ -30,11 +30,11 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 
 #include <iomanip>
 #include <sstream>
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
 
 #define CATLEN(p) MAX_MSG_SIZE - std::strlen(p) - 1
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h
index 6cdbed8820..34d8373235 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jexception.h
@@ -48,7 +48,7 @@ class jexception;
 #include <cstdlib>
 #include <cstring>
 #include <exception>
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
 #include <sstream>
 #include <string>
 #include <sys/types.h>
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
index 1cee4224aa..4117bd3581 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jinf.cpp
@@ -37,10 +37,10 @@
 #include <cstring>
 #include <ctime>
 #include <fstream>
-#include "jrnl/file_hdr.h"
-#include "jrnl/jcntl.h"
-#include "jrnl/jerrno.h"
-#include "jrnl/lp_map.h"
+#include "qpid/legacystore/jrnl/file_hdr.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/lp_map.h"
 #include <sstream>
 #include <sys/stat.h>
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
index 4af2f7359c..61b9b6cc9b 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.cpp
@@ -30,11 +30,11 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/jrec.h"
+#include "qpid/legacystore/jrnl/jrec.h"
 
 #include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h
index 5d504b539d..9d0771cabd 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/jrec.h
@@ -43,8 +43,8 @@ class jrec;
 
 #include <cstddef>
 #include <fstream>
-#include "jrnl/rec_hdr.h"
-#include "jrnl/rec_tail.h"
+#include "qpid/legacystore/jrnl/rec_hdr.h"
+#include "qpid/legacystore/jrnl/rec_tail.h"
 #include <string>
 #include <sys/types.h>
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
index 60bb7c018b..8024ddadd2 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
@@ -30,10 +30,10 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/lp_map.h"
+#include "qpid/legacystore/jrnl/lp_map.h"
 
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
index 8d522a2186..d7b0c9f516 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
@@ -31,11 +31,11 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/lpmgr.h"
+#include "qpid/legacystore/jrnl/lpmgr.h"
 
 #include <cassert>
-#include <jrnl/jerrno.h>
-#include <jrnl/jexception.h>
+#include <qpid/legacystore/jrnl/jerrno.h>
+#include <qpid/legacystore/jrnl/jexception.h>
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h
index 39c14ef946..be5c4494cc 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/lpmgr.h
@@ -41,7 +41,7 @@ namespace journal
 }
 }
 
-#include "jrnl/fcntl.h"
+#include "qpid/legacystore/jrnl/fcntl.h"
 #include <vector>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
index 687cc4eb36..3dc61e2661 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
@@ -30,14 +30,14 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/pmgr.h"
+#include "qpid/legacystore/jrnl/pmgr.h"
 
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
-#include "jrnl/jcfg.h"
-#include "jrnl/jcntl.h"
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
 #include <sstream>
 
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h
index f608b4c5f0..64115e225e 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/pmgr.h
@@ -43,15 +43,15 @@ namespace journal
 }
 
 #include <deque>
-#include "jrnl/aio.h"
-#include "jrnl/aio_callback.h"
-#include "jrnl/data_tok.h"
-#include "jrnl/deq_rec.h"
-#include "jrnl/enq_map.h"
-#include "jrnl/enq_rec.h"
-#include "jrnl/fcntl.h"
-#include "jrnl/txn_map.h"
-#include "jrnl/txn_rec.h"
+#include "qpid/legacystore/jrnl/aio.h"
+#include "qpid/legacystore/jrnl/aio_callback.h"
+#include "qpid/legacystore/jrnl/data_tok.h"
+#include "qpid/legacystore/jrnl/deq_rec.h"
+#include "qpid/legacystore/jrnl/enq_map.h"
+#include "qpid/legacystore/jrnl/enq_rec.h"
+#include "qpid/legacystore/jrnl/fcntl.h"
+#include "qpid/legacystore/jrnl/txn_map.h"
+#include "qpid/legacystore/jrnl/txn_rec.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h b/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h
index 1fd7479fe0..a7ef2341f0 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rcvdat.h
@@ -35,7 +35,7 @@
 #include <cstddef>
 #include <iomanip>
 #include <map>
-#include "jrnl/jcfg.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
 #include <sstream>
 #include <sys/types.h>
 #include <vector>
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
index 8da27fb325..ff6325a760 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
@@ -35,7 +35,7 @@
 #define QPID_LEGACYSTORE_JRNL_REC_HDR_H
 
 #include <cstddef>
-#include "jrnl/jcfg.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
 #include <sys/types.h>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h b/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h
index 10a99166ea..0c36151927 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rec_tail.h
@@ -35,7 +35,7 @@
 #define QPID_LEGACYSTORE_JRNL_REC_TAIL_H
 
 #include <cstddef>
-#include "jrnl/jcfg.h"
+#include "qpid/legacystore/jrnl/jcfg.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
index bc169b0aee..9b5ed95e81 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.cpp
@@ -30,7 +30,7 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/rfc.h"
+#include "qpid/legacystore/jrnl/rfc.h"
 
 #include <cassert>
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h
index 8d3b6e932d..faa5d566ba 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rfc.h
@@ -41,8 +41,8 @@ class rfc;
 }
 }
 
-#include "jrnl/lpmgr.h"
-#include "jrnl/enums.h"
+#include "qpid/legacystore/jrnl/lpmgr.h"
+#include "qpid/legacystore/jrnl/enums.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
index b829d8144b..3a11817d1e 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
@@ -30,13 +30,13 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/rmgr.h"
+#include "qpid/legacystore/jrnl/rmgr.h"
 
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
-#include "jrnl/jcntl.h"
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
 #include <sstream>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
index 313191af80..fc6f5d427f 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
@@ -31,13 +31,13 @@
  */
 
 
-#include "jrnl/rrfc.h"
+#include "qpid/legacystore/jrnl/rrfc.h"
 
 #include <cerrno>
 #include <fcntl.h>
 #include <unistd.h>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h
index c7a29170da..5066d6048a 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/rrfc.h
@@ -41,8 +41,8 @@ class rrfc;
 }
 }
 
-#include "jrnl/fcntl.h"
-#include "jrnl/rfc.h"
+#include "qpid/legacystore/jrnl/fcntl.h"
+#include "qpid/legacystore/jrnl/rfc.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
index 23ab99f63e..8f26d349ef 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/slock.cpp
@@ -30,4 +30,4 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/slock.h"
+#include "qpid/legacystore/jrnl/slock.h"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/slock.h b/qpid/cpp/src/qpid/legacystore/jrnl/slock.h
index eabcde34c3..c05b5cf336 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/slock.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/slock.h
@@ -33,8 +33,8 @@
 #ifndef QPID_LEGACYSTORE_JRNL_SLOCK_H
 #define QPID_LEGACYSTORE_JRNL_SLOCK_H
 
-#include "jrnl/jexception.h"
-#include "jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/smutex.h"
 #include <pthread.h>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
index 7941b57d2d..6f8991ca5b 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.cpp
@@ -30,4 +30,4 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/smutex.h"
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h
index 1987405d73..def0fb70f6 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/smutex.h
@@ -33,7 +33,7 @@
 #ifndef QPID_LEGACYSTORE_JRNL_SMUTEX_H
 #define QPID_LEGACYSTORE_JRNL_SMUTEX_H
 
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 #include <pthread.h>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
index 95cb35c626..976068ef68 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
@@ -30,7 +30,7 @@
  * \author Kim van der Riet
  */
 
-#include "time_ns.h"
+#include "qpid/legacystore/jrnl/time_ns.h"
 
 #include <sstream>
 
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h b/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
index 2713012828..94b812ccec 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
@@ -34,7 +34,7 @@
 #define QPID_LEGACYSTORE_JRNL_TXN_HDR_H
 
 #include <cstddef>
-#include "jrnl/rec_hdr.h"
+#include "qpid/legacystore/jrnl/rec_hdr.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
index e62f74e231..c514670601 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
@@ -30,12 +30,12 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/txn_map.h"
+#include "qpid/legacystore/jrnl/txn_map.h"
 
 #include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
-#include "jrnl/slock.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/slock.h"
 #include <sstream>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h
index b539a88459..6b38564e53 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_map.h
@@ -41,7 +41,7 @@ namespace journal
 }
 }
 
-#include "jrnl/smutex.h"
+#include "qpid/legacystore/jrnl/smutex.h"
 #include <map>
 #include <pthread.h>
 #include <string>
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
index 8f3c5164a6..918a6ce902 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
@@ -30,15 +30,15 @@
  * \author Kim van der Riet
  */
 
-#include "jrnl/txn_rec.h"
+#include "qpid/legacystore/jrnl/txn_rec.h"
 
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
 #include <iomanip>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h
index 23b87fecb4..1a49df1c96 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/txn_rec.h
@@ -42,8 +42,8 @@ class txn_rec;
 }
 
 #include <cstddef>
-#include "jrnl/jrec.h"
-#include "jrnl/txn_hdr.h"
+#include "qpid/legacystore/jrnl/jrec.h"
+#include "qpid/legacystore/jrnl/txn_hdr.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
index e375208a11..4353fcfbca 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
@@ -24,21 +24,21 @@
  *
  * Qpid asynchronous store plugin library
  *
- * File containing code for class mrg::journal::wmgr (read manager). See
+ * File containing code for class mrg::journal::wmgr (write manager). See
  * comments in file wmgr.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/wmgr.h"
+#include "qpid/legacystore/jrnl/wmgr.h"
 
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
-#include "jrnl/file_hdr.h"
-#include "jrnl/jcntl.h"
-#include "jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/file_hdr.h"
+#include "qpid/legacystore/jrnl/jcntl.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
 #include <sstream>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h
index bbfdc0f73f..8347221b1d 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wmgr.h
@@ -24,7 +24,7 @@
  *
  * Qpid asynchronous store plugin library
  *
- * File containing code for class mrg::journal::wmgr (read manager). See
+ * File containing code for class mrg::journal::wmgr (write manager). See
  * class documentation for details.
  *
  * \author Kim van der Riet
@@ -42,9 +42,9 @@ class wmgr;
 }
 
 #include <cstring>
-#include "jrnl/enums.h"
-#include "jrnl/pmgr.h"
-#include "jrnl/wrfc.h"
+#include "qpid/legacystore/jrnl/enums.h"
+#include "qpid/legacystore/jrnl/pmgr.h"
+#include "qpid/legacystore/jrnl/wrfc.h"
 #include <set>
 
 namespace mrg
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
index 13d3e3022e..43461b66a3 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
@@ -24,17 +24,17 @@
  *
  * Qpid asynchronous store plugin library
  *
- * File containing code for class mrg::journal::rrfc (rotating
- * file controller). See comments in file rrfc.h for details.
+ * File containing code for class mrg::journal::wrfc (rotating
+ * file controller). See comments in file wrfc.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/wrfc.h"
+#include "qpid/legacystore/jrnl/wrfc.h"
 
 #include <cmath>
-#include "jrnl/jerrno.h"
-#include "jrnl/jexception.h"
+#include "qpid/legacystore/jrnl/jerrno.h"
+#include "qpid/legacystore/jrnl/jexception.h"
 
 namespace mrg
 {
diff --git a/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h
index fb818cd633..f0e4e73151 100644
--- a/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h
+++ b/qpid/cpp/src/qpid/legacystore/jrnl/wrfc.h
@@ -42,8 +42,8 @@ class wrfc;
 }
 
 #include <cstddef>
-#include "jrnl/enums.h"
-#include "jrnl/rrfc.h"
+#include "qpid/legacystore/jrnl/enums.h"
+#include "qpid/legacystore/jrnl/rrfc.h"
 
 namespace mrg
 {