QPID-1726: ASF licensed, Qpid hosted store module

Incorporating post-commit review comments:

* Rename *.hpp to *.h; repair include references and comments
* Promote include guards to be unambiguous filename-related tokens
* #include uses double quote not angle brackets when refering to
  files in qpid source code tree



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

76 files changed, 360 insertions, 358 deletions

diff --git a/cpp/src/qpid/legacystore/BindingDbt.h b/cpp/src/qpid/legacystore/BindingDbt.h
index 9a58ae2561..63c7cd144e 100644
--- a/cpp/src/qpid/legacystore/BindingDbt.h
+++ b/cpp/src/qpid/legacystore/BindingDbt.h
@@ -19,14 +19,14 @@
  *
  */
 
-#ifndef _BindingDbt_
-#define _BindingDbt_
+#ifndef QPID_LEGACYSTORE_BINDINGDBT_H
+#define QPID_LEGACYSTORE_BINDINGDBT_H
 
 #include "db-inc.h"
-#include <qpid/broker/PersistableExchange.h>
-#include <qpid/broker/PersistableQueue.h>
-#include <qpid/framing/Buffer.h>
-#include <qpid/framing/FieldTable.h>
+#include "qpid/broker/PersistableExchange.h"
+#include "qpid/broker/PersistableQueue.h"
+#include "qpid/framing/Buffer.h"
+#include "qpid/framing/FieldTable.h"
 
 namespace mrg{
 namespace msgstore{
@@ -53,4 +53,4 @@ public:
 
 }}
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_BINDINGDBT_H
diff --git a/cpp/src/qpid/legacystore/BufferValue.h b/cpp/src/qpid/legacystore/BufferValue.h
index 2f02833b70..527fbcf577 100644
--- a/cpp/src/qpid/legacystore/BufferValue.h
+++ b/cpp/src/qpid/legacystore/BufferValue.h
@@ -19,12 +19,12 @@
  *
  */
 
-#ifndef _BufferValue_
-#define _BufferValue_
+#ifndef QPID_LEGACYSTORE_BUFFERVALUE_H
+#define QPID_LEGACYSTORE_BUFFERVALUE_H
 
 #include "db-inc.h"
-#include <qpid/broker/Persistable.h>
-#include <qpid/framing/Buffer.h>
+#include "qpid/broker/Persistable.h"
+#include "qpid/framing/Buffer.h"
 
 namespace mrg{
 namespace msgstore{
@@ -43,4 +43,4 @@ public:
 
 }}
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_BUFFERVALUE_H
diff --git a/cpp/src/qpid/legacystore/Cursor.h b/cpp/src/qpid/legacystore/Cursor.h
index bd7157f15b..0c869c29a0 100644
--- a/cpp/src/qpid/legacystore/Cursor.h
+++ b/cpp/src/qpid/legacystore/Cursor.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _Cursor_
-#define _Cursor_
+#ifndef QPID_LEGACYSTORE_CURSOR_H
+#define QPID_LEGACYSTORE_CURSOR_H
 
 #include <boost/shared_ptr.hpp>
 #include "db-inc.h"
@@ -47,4 +47,4 @@ public:
 
 }}
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_CURSOR_H
diff --git a/cpp/src/qpid/legacystore/DataTokenImpl.h b/cpp/src/qpid/legacystore/DataTokenImpl.h
index 6de0f9e00f..853631bd34 100644
--- a/cpp/src/qpid/legacystore/DataTokenImpl.h
+++ b/cpp/src/qpid/legacystore/DataTokenImpl.h
@@ -19,11 +19,11 @@
  *
  */
 
-#ifndef _DataTokenImpl_
-#define _DataTokenImpl_
+#ifndef QPID_LEGACYSTORE_DATATOKENIMPL_H
+#define QPID_LEGACYSTORE_DATATOKENIMPL_H
 
-#include "jrnl/data_tok.hpp"
-#include <qpid/broker/PersistableMessage.h>
+#include "jrnl/data_tok.h"
+#include "qpid/broker/PersistableMessage.h"
 #include <boost/intrusive_ptr.hpp>
 
 namespace mrg {
@@ -44,4 +44,4 @@ class DataTokenImpl : public journal::data_tok, public qpid::RefCounted
 } // namespace msgstore
 } // namespace mrg
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_DATATOKENIMPL_H
diff --git a/cpp/src/qpid/legacystore/IdDbt.h b/cpp/src/qpid/legacystore/IdDbt.h
index 6d8610c027..ecf5922963 100644
--- a/cpp/src/qpid/legacystore/IdDbt.h
+++ b/cpp/src/qpid/legacystore/IdDbt.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _IdDbt_
-#define _IdDbt_
+#ifndef QPID_LEGACYSTORE_IDDBT_H
+#define QPID_LEGACYSTORE_IDDBT_H
 
 #include "db-inc.h"
 
@@ -39,4 +39,4 @@ public:
 
 }}
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_IDDBT_H
diff --git a/cpp/src/qpid/legacystore/IdSequence.h b/cpp/src/qpid/legacystore/IdSequence.h
index 3865ddbdfc..11d7ff61ca 100644
--- a/cpp/src/qpid/legacystore/IdSequence.h
+++ b/cpp/src/qpid/legacystore/IdSequence.h
@@ -19,11 +19,11 @@
  *
  */
 
-#ifndef _IdSequence_
-#define _IdSequence_
+#ifndef QPID_LEGACYSTORE_IDSEQUENCE_H
+#define QPID_LEGACYSTORE_IDSEQUENCE_H
 
-#include <qpid/framing/amqp_types.h>
-#include <qpid/sys/Mutex.h>
+#include "qpid/framing/amqp_types.h"
+#include "qpid/sys/Mutex.h"
 #include <sys/types.h>
 
 namespace mrg{
@@ -41,4 +41,4 @@ public:
 
 }}
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_IDSEQUENCE_H
diff --git a/cpp/src/qpid/legacystore/JournalImpl.cpp b/cpp/src/qpid/legacystore/JournalImpl.cpp
index e50959760b..256068608f 100644
--- a/cpp/src/qpid/legacystore/JournalImpl.cpp
+++ b/cpp/src/qpid/legacystore/JournalImpl.cpp
@@ -21,8 +21,8 @@
 
 #include "JournalImpl.h"
 
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 #include "qpid/log/Statement.h"
 #include "qpid/management/ManagementAgent.h"
 #include "qmf/org/apache/qpid/legacystore/ArgsJournalExpand.h"
diff --git a/cpp/src/qpid/legacystore/JournalImpl.h b/cpp/src/qpid/legacystore/JournalImpl.h
index 2b7b44b4ad..f549d341d3 100644
--- a/cpp/src/qpid/legacystore/JournalImpl.h
+++ b/cpp/src/qpid/legacystore/JournalImpl.h
@@ -19,17 +19,17 @@
  *
  */
 
-#ifndef _JournalImpl_
-#define _JournalImpl_
+#ifndef QPID_LEGACYSTORE_JOURNALIMPL_H
+#define QPID_LEGACYSTORE_JOURNALIMPL_H
 
 #include <set>
-#include "jrnl/enums.hpp"
-#include "jrnl/jcntl.hpp"
+#include "jrnl/enums.h"
+#include "jrnl/jcntl.h"
 #include "DataTokenImpl.h"
 #include "PreparedTransaction.h"
-#include <qpid/broker/PersistableQueue.h>
-#include <qpid/sys/Timer.h>
-#include <qpid/sys/Time.h>
+#include "qpid/broker/PersistableQueue.h"
+#include "qpid/sys/Timer.h"
+#include "qpid/sys/Time.h"
 #include <boost/ptr_container/ptr_list.hpp>
 #include <boost/intrusive_ptr.hpp>
 #include "qpid/management/Manageable.h"
@@ -262,4 +262,4 @@ class TplJournalImpl : public JournalImpl
 } // namespace msgstore
 } // namespace mrg
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_JOURNALIMPL_H
diff --git a/cpp/src/qpid/legacystore/MessageStoreImpl.cpp b/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
index bab292899e..d4a03eff96 100644
--- a/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
+++ b/cpp/src/qpid/legacystore/MessageStoreImpl.cpp
@@ -24,7 +24,7 @@
 #include "BindingDbt.h"
 #include "BufferValue.h"
 #include "IdDbt.h"
-#include "jrnl/txn_map.hpp"
+#include "jrnl/txn_map.h"
 #include "qpid/framing/FieldValue.h"
 #include "qpid/log/Statement.h"
 #include "qmf/org/apache/qpid/legacystore/Package.h"
diff --git a/cpp/src/qpid/legacystore/MessageStoreImpl.h b/cpp/src/qpid/legacystore/MessageStoreImpl.h
index 568d59578e..2c06f1587b 100644
--- a/cpp/src/qpid/legacystore/MessageStoreImpl.h
+++ b/cpp/src/qpid/legacystore/MessageStoreImpl.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _MessageStoreImpl_
-#define _MessageStoreImpl_
+#ifndef QPID_LEGACYSTORE_MESSAGESTOREIMPL_H
+#define QPID_LEGACYSTORE_MESSAGESTOREIMPL_H
 
 #include <string>
 
@@ -29,7 +29,7 @@
 #include "IdDbt.h"
 #include "IdSequence.h"
 #include "JournalImpl.h"
-#include "jrnl/jcfg.hpp"
+#include "jrnl/jcfg.h"
 #include "PreparedTransaction.h"
 #include "qpid/broker/Broker.h"
 #include "qpid/broker/MessageStore.h"
@@ -379,4 +379,4 @@ class MessageStoreImpl : public qpid::broker::MessageStore, public qpid::managem
 } // namespace msgstore
 } // namespace mrg
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_MESSAGESTOREIMPL_H
diff --git a/cpp/src/qpid/legacystore/PreparedTransaction.h b/cpp/src/qpid/legacystore/PreparedTransaction.h
index a58a841935..c5f7b9458a 100644
--- a/cpp/src/qpid/legacystore/PreparedTransaction.h
+++ b/cpp/src/qpid/legacystore/PreparedTransaction.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _PreparedTransaction_
-#define _PreparedTransaction_
+#ifndef QPID_LEGACYSTORE_PREPAREDTRANSACTION_H
+#define QPID_LEGACYSTORE_PREPAREDTRANSACTION_H
 
 #include <list>
 #include <map>
@@ -71,4 +71,4 @@ struct PreparedTransaction
 
 }}
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_PREPAREDTRANSACTION_H
diff --git a/cpp/src/qpid/legacystore/StoreException.h b/cpp/src/qpid/legacystore/StoreException.h
index 2bc7e8d32e..50eef981dc 100644
--- a/cpp/src/qpid/legacystore/StoreException.h
+++ b/cpp/src/qpid/legacystore/StoreException.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _StoreException_
-#define _StoreException_
+#ifndef QPID_LEGACYSTORE_STOREEXCEPTION_H
+#define QPID_LEGACYSTORE_STOREEXCEPTION_H
 
 #include "IdDbt.h"
 #include <boost/format.hpp>
@@ -53,4 +53,4 @@ public:
 
 }}
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_STOREEXCEPTION_H
diff --git a/cpp/src/qpid/legacystore/TxnCtxt.cpp b/cpp/src/qpid/legacystore/TxnCtxt.cpp
index f99a578a57..108d85332b 100644
--- a/cpp/src/qpid/legacystore/TxnCtxt.cpp
+++ b/cpp/src/qpid/legacystore/TxnCtxt.cpp
@@ -23,7 +23,7 @@
 
 #include <sstream>
 
-#include "jrnl/jexception.hpp"
+#include "jrnl/jexception.h"
 #include "StoreException.h"
 
 namespace mrg {
diff --git a/cpp/src/qpid/legacystore/TxnCtxt.h b/cpp/src/qpid/legacystore/TxnCtxt.h
index 0fd49d6104..a4874eff39 100644
--- a/cpp/src/qpid/legacystore/TxnCtxt.h
+++ b/cpp/src/qpid/legacystore/TxnCtxt.h
@@ -19,8 +19,8 @@
  *
  */
 
-#ifndef _TxnCtxt_
-#define _TxnCtxt_
+#ifndef QPID_LEGACYSTORE_TXNCTXT_H
+#define QPID_LEGACYSTORE_TXNCTXT_H
 
 #include <db-inc.h>
 #include <memory>
@@ -112,4 +112,6 @@ class TPCTxnCtxt : public TxnCtxt, public qpid::broker::TPCTransactionContext
 
 }}
 
-#endif
+#endif // ifndef QPID_LEGACYSTORE_TXNCTXT_H
+
+
diff --git a/cpp/src/qpid/legacystore/jrnl/aio.cpp b/cpp/src/qpid/legacystore/jrnl/aio.cpp
index 7d3a26434e..8c43880d16 100644
--- a/cpp/src/qpid/legacystore/jrnl/aio.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/aio.cpp
@@ -25,12 +25,12 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::aio (libaio interface
- * encapsulation). See comments in file aio.hpp for details.
+ * encapsulation). See comments in file aio.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "aio.hpp"
+#include "aio.h"
 
 namespace mrg
 {
diff --git a/cpp/src/qpid/legacystore/jrnl/aio.h b/cpp/src/qpid/legacystore/jrnl/aio.h
index 082535c8c1..b1de5f79f7 100644
--- a/cpp/src/qpid/legacystore/jrnl/aio.h
+++ b/cpp/src/qpid/legacystore/jrnl/aio.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file aio.hpp
+ * \file aio.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_aio_hpp
-#define mrg_journal_aio_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_AIO_H
+#define QPID_LEGACYSTORE_JRNL_AIO_H
 
 #include <libaio.h>
 #include <cstring>
@@ -150,4 +150,4 @@ public:
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_aio_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_AIO_H
diff --git a/cpp/src/qpid/legacystore/jrnl/aio_callback.h b/cpp/src/qpid/legacystore/jrnl/aio_callback.h
index a65e9a784b..90249278a5 100644
--- a/cpp/src/qpid/legacystore/jrnl/aio_callback.h
+++ b/cpp/src/qpid/legacystore/jrnl/aio_callback.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file aio_callback.hpp
+ * \file aio_callback.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_aio_callback_hpp
-#define mrg_journal_aio_callback_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_AIO_CALLBACK_H
+#define QPID_LEGACYSTORE_JRNL_AIO_CALLBACK_H
 
 #include <vector>
 #include <sys/types.h>
@@ -54,4 +54,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_aio_callback_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_AIO_CALLBACK_H
diff --git a/cpp/src/qpid/legacystore/jrnl/cvar.cpp b/cpp/src/qpid/legacystore/jrnl/cvar.cpp
index 3248254313..1d6e060a77 100644
--- a/cpp/src/qpid/legacystore/jrnl/cvar.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/cvar.cpp
@@ -25,9 +25,9 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::cvar (condition variable). See
- * comments in file cvar.hpp for details.
+ * comments in file cvar.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/cvar.hpp"
+#include "jrnl/cvar.h"
diff --git a/cpp/src/qpid/legacystore/jrnl/cvar.h b/cpp/src/qpid/legacystore/jrnl/cvar.h
index bbc2e8e9fc..27d5fdc3de 100644
--- a/cpp/src/qpid/legacystore/jrnl/cvar.h
+++ b/cpp/src/qpid/legacystore/jrnl/cvar.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file cvar.hpp
+ * \file cvar.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -29,14 +29,14 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_cvar_hpp
-#define mrg_journal_cvar_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_CVAR_H
+#define QPID_LEGACYSTORE_JRNL_CVAR_H
 
 #include <cstring>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
-#include "jrnl/smutex.hpp"
-#include "jrnl/time_ns.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
+#include "jrnl/smutex.h"
+#include "jrnl/time_ns.h"
 #include <pthread.h>
 #include <sstream>
 
@@ -84,4 +84,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_cvar_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_CVAR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/data_tok.cpp b/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
index 73484d5d6d..75b3d6bb5d 100644
--- a/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/data_tok.cpp
@@ -25,17 +25,17 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::data_tok (data block token).
- * See comments in file data_tok.hpp for details.
+ * See comments in file data_tok.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/data_tok.hpp"
+#include "jrnl/data_tok.h"
 
 #include <iomanip>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
-#include "jrnl/slock.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
+#include "jrnl/slock.h"
 #include <sstream>
 
 namespace mrg
diff --git a/cpp/src/qpid/legacystore/jrnl/data_tok.h b/cpp/src/qpid/legacystore/jrnl/data_tok.h
index 16537f59cc..f4481c9c20 100644
--- a/cpp/src/qpid/legacystore/jrnl/data_tok.h
+++ b/cpp/src/qpid/legacystore/jrnl/data_tok.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file data_tok.hpp
+ * \file data_tok.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_data_tok_hpp
-#define mrg_journal_data_tok_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_DATA_TOK_H
+#define QPID_LEGACYSTORE_JRNL_DATA_TOK_H
 
 namespace mrg
 {
@@ -43,7 +43,7 @@ class data_tok;
 
 #include <cassert>
 #include <cstddef>
-#include "jrnl/smutex.hpp"
+#include "jrnl/smutex.h"
 #include <pthread.h>
 #include <string>
 #include <sys/types.h>
@@ -169,4 +169,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_data_tok_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_DATA_TOK_H
diff --git a/cpp/src/qpid/legacystore/jrnl/deq_hdr.h b/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
index 48b8673dc3..c1019aea4c 100644
--- a/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
+++ b/cpp/src/qpid/legacystore/jrnl/deq_hdr.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file deq_hdr.hpp
+ * \file deq_hdr.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,11 +30,11 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_deq_hdr_hpp
-#define mrg_journal_deq_hdr_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_DEQ_HDR_H
+#define QPID_LEGACYSTORE_JRNL_DEQ_HDR_H
 
 #include <cstddef>
-#include "jrnl/rec_hdr.hpp"
+#include "jrnl/rec_hdr.h"
 
 namespace mrg
 {
@@ -138,4 +138,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_deq_hdr_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_DEQ_HDR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp b/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
index ec6ba9ecf1..b792d98273 100644
--- a/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/deq_rec.cpp
@@ -25,20 +25,20 @@
  * Qpid asynchronous store plugin library
  *
  * This file contains the code for the mrg::journal::deq_rec (journal dequeue
- * record) class. See comments in file deq_rec.hpp for details.
+ * record) class. See comments in file deq_rec.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/deq_rec.hpp"
+#include "jrnl/deq_rec.h"
 
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
 #include <iomanip>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/cpp/src/qpid/legacystore/jrnl/deq_rec.h b/cpp/src/qpid/legacystore/jrnl/deq_rec.h
index a3059035e3..4c3cf9f9b8 100644
--- a/cpp/src/qpid/legacystore/jrnl/deq_rec.h
+++ b/cpp/src/qpid/legacystore/jrnl/deq_rec.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file deq_rec.hpp
+ * \file deq_rec.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_deq_rec_hpp
-#define mrg_journal_deq_rec_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_DEQ_REQ_H
+#define QPID_LEGACYSTORE_JRNL_DEQ_REQ_H
 
 namespace mrg
 {
@@ -42,8 +42,8 @@ class deq_rec;
 }
 
 #include <cstddef>
-#include "jrnl/deq_hdr.hpp"
-#include "jrnl/jrec.hpp"
+#include "jrnl/deq_hdr.h"
+#include "jrnl/jrec.h"
 
 namespace mrg
 {
@@ -100,4 +100,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_deq_rec_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_DEQ_REQ_H
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_hdr.h b/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
index a593db59c0..2a6436df28 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
+++ b/cpp/src/qpid/legacystore/jrnl/enq_hdr.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file enq_hdr.hpp
+ * \file enq_hdr.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,11 +30,11 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_enq_hdr_hpp
-#define mrg_journal_enq_hdr_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_ENQ_HDR_H
+#define QPID_LEGACYSTORE_JRNL_ENQ_HDR_H
 
 #include <cstddef>
-#include "jrnl/rec_hdr.hpp"
+#include "jrnl/rec_hdr.h"
 
 namespace mrg
 {
@@ -162,4 +162,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_enq_hdr_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_ENQ_HDR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_map.cpp b/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
index 3da8900366..14039dda4f 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/enq_map.cpp
@@ -25,16 +25,16 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::enq_map (enqueue map). See
- * comments in file enq_map.hpp for details.
+ * comments in file enq_map.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/enq_map.hpp"
+#include "jrnl/enq_map.h"
 
 #include <iomanip>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/slock.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/slock.h"
 #include <sstream>
 
 
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_map.h b/cpp/src/qpid/legacystore/jrnl/enq_map.h
index 34a802cfda..b5e84557f4 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_map.h
+++ b/cpp/src/qpid/legacystore/jrnl/enq_map.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file enq_map.hpp
+ * \file enq_map.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_enq_map_hpp
-#define mrg_journal_enq_map_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_ENQ_MAP_H
+#define QPID_LEGACYSTORE_JRNL_ENQ_MAP_H
 
 namespace mrg
 {
@@ -41,8 +41,8 @@ class enq_map;
 }
 }
 
-#include "jrnl/jexception.hpp"
-#include "jrnl/smutex.hpp"
+#include "jrnl/jexception.h"
+#include "jrnl/smutex.h"
 #include <map>
 #include <pthread.h>
 #include <vector>
@@ -124,4 +124,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_enq_map_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_ENQ_MAP_H
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp b/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
index d736ee54b3..e3cfb3d8e4 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/enq_rec.cpp
@@ -25,20 +25,20 @@
  * Qpid asynchronous store plugin library
  *
  * This file contains the code for the mrg::journal::enq_rec (journal enqueue
- * record) class. See comments in file enq_rec.hpp for details.
+ * record) class. See comments in file enq_rec.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/enq_rec.hpp"
+#include "jrnl/enq_rec.h"
 
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
 #include <iomanip>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/cpp/src/qpid/legacystore/jrnl/enq_rec.h b/cpp/src/qpid/legacystore/jrnl/enq_rec.h
index ce3d881d4e..36a5de0b6a 100644
--- a/cpp/src/qpid/legacystore/jrnl/enq_rec.h
+++ b/cpp/src/qpid/legacystore/jrnl/enq_rec.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file enq_rec.hpp
+ * \file enq_rec.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -28,8 +28,8 @@
  * record) class. See class documentation for details.
  */
 
-#ifndef mrg_journal_enq_rec_hpp
-#define mrg_journal_enq_rec_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_ENQ_REC_H
+#define QPID_LEGACYSTORE_JRNL_ENQ_REC_H
 
 namespace mrg
 {
@@ -40,8 +40,8 @@ class enq_rec;
 }
 
 #include <cstddef>
-#include "jrnl/enq_hdr.hpp"
-#include "jrnl/jrec.hpp"
+#include "jrnl/enq_hdr.h"
+#include "jrnl/jrec.h"
 
 namespace mrg
 {
@@ -113,4 +113,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_enq_rec_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_ENQ_REC_H
diff --git a/cpp/src/qpid/legacystore/jrnl/enums.h b/cpp/src/qpid/legacystore/jrnl/enums.h
index 8dade01aa3..169a13fa4d 100644
--- a/cpp/src/qpid/legacystore/jrnl/enums.h
+++ b/cpp/src/qpid/legacystore/jrnl/enums.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file enums.hpp
+ * \file enums.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -29,8 +29,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_enums_hpp
-#define mrg_journal_enums_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_ENUMS_H
+#define QPID_LEGACYSTORE_JRNL_ENUMS_H
 
 namespace mrg
 {
@@ -105,4 +105,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_enums_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_ENUMS_H
diff --git a/cpp/src/qpid/legacystore/jrnl/fcntl.cpp b/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
index ef4b1a079d..46e9e071a2 100644
--- a/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/fcntl.cpp
@@ -26,18 +26,18 @@
  *
  * File containing code for class mrg::journal::fcntl (non-logging file
  * handle), used for controlling journal log files. See comments in file
- * fcntl.hpp for details.
+ * fcntl.h for details.
  */
 
-#include "jrnl/fcntl.hpp"
+#include "jrnl/fcntl.h"
 
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
 #include <fcntl.h>
 #include <iomanip>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 #include <sstream>
 #include <unistd.h>
 
diff --git a/cpp/src/qpid/legacystore/jrnl/fcntl.h b/cpp/src/qpid/legacystore/jrnl/fcntl.h
index a7b28b2fe9..4ccf39e491 100644
--- a/cpp/src/qpid/legacystore/jrnl/fcntl.h
+++ b/cpp/src/qpid/legacystore/jrnl/fcntl.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file fcntl.hpp
+ * \file fcntl.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -31,8 +31,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_fcntl_hpp
-#define mrg_journal_fcntl_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_FCNTL_H
+#define QPID_LEGACYSTORE_JRNL_FCNTL_H
 
 namespace mrg
 {
@@ -44,7 +44,7 @@ class fcntl;
 
 #include <cstddef>
 #include <string>
-#include "jrnl/rcvdat.hpp"
+#include "jrnl/rcvdat.h"
 #include <sys/types.h>
 
 namespace mrg
@@ -153,4 +153,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_fcntl_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_FCNTL_H
diff --git a/cpp/src/qpid/legacystore/jrnl/file_hdr.h b/cpp/src/qpid/legacystore/jrnl/file_hdr.h
index 4466ef5617..e71ca06aa9 100644
--- a/cpp/src/qpid/legacystore/jrnl/file_hdr.h
+++ b/cpp/src/qpid/legacystore/jrnl/file_hdr.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file file_hdr.hpp
+ * \file file_hdr.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -31,14 +31,14 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_file_hdr_hpp
-#define mrg_journal_file_hdr_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_FILE_HDR_H
+#define QPID_LEGACYSTORE_JRNL_FILE_HDR_H
 
 #include <cerrno>
 #include <ctime>
-#include "jrnl/rec_hdr.hpp"
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/rec_hdr.h"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
@@ -208,4 +208,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_file_hdr_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_FILE_HDR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/jcfg.h b/cpp/src/qpid/legacystore/jrnl/jcfg.h
index 183223fe7f..0a0d0df28d 100644
--- a/cpp/src/qpid/legacystore/jrnl/jcfg.h
+++ b/cpp/src/qpid/legacystore/jrnl/jcfg.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file jcfg.hpp
+ * \file jcfg.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_jcfg_hpp
-#define mrg_journal_jcfg_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_JCFG_H
+#define QPID_LEGACYSTORE_JRNL_JCFG_H
 
 #if defined(__i386__) /* little endian, 32 bits */
 #define JRNL_LITTLE_ENDIAN
@@ -88,4 +88,4 @@
 #define RHM_LENDIAN_FLAG 0      ///< Value of little endian flag on disk
 #define RHM_BENDIAN_FLAG 1      ///< Value of big endian flag on disk
 
-#endif // ifndef mrg_journal_jcfg_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_JCFG_H
diff --git a/cpp/src/qpid/legacystore/jrnl/jcntl.cpp b/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
index a96be022ae..90dc43d65c 100644
--- a/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/jcntl.cpp
@@ -25,13 +25,13 @@
  * Qpid asynchronous store plugin library
  *
  * Messaging journal top-level control and interface class
- * mrg::journal::jcntl.  See comments in file jcntl.hpp for details.
+ * mrg::journal::jcntl.  See comments in file jcntl.h for details.
  *
  * \author Kim van der Riet
  */
 
 
-#include "jrnl/jcntl.hpp"
+#include "jrnl/jcntl.h"
 
 #include <algorithm>
 #include <cassert>
@@ -41,9 +41,9 @@
 #include <fstream>
 #include <iomanip>
 #include <iostream>
-#include "jrnl/file_hdr.hpp"
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jinf.hpp"
+#include "jrnl/file_hdr.h"
+#include "jrnl/jerrno.h"
+#include "jrnl/jinf.h"
 #include <limits>
 #include <sstream>
 #include <unistd.h>
diff --git a/cpp/src/qpid/legacystore/jrnl/jcntl.h b/cpp/src/qpid/legacystore/jrnl/jcntl.h
index b7d4cc7ca7..456a3fe159 100644
--- a/cpp/src/qpid/legacystore/jrnl/jcntl.h
+++ b/cpp/src/qpid/legacystore/jrnl/jcntl.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file jcntl.hpp
+ * \file jcntl.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_jcntl_hpp
-#define mrg_journal_jcntl_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_JCNTL_H
+#define QPID_LEGACYSTORE_JRNL_JCNTL_H
 
 namespace mrg
 {
@@ -43,15 +43,15 @@ namespace journal
 
 #include <cstddef>
 #include <deque>
-#include "jrnl/jdir.hpp"
-#include "jrnl/fcntl.hpp"
-#include "jrnl/lpmgr.hpp"
-#include "jrnl/rcvdat.hpp"
-#include "jrnl/slock.hpp"
-#include "jrnl/smutex.hpp"
-#include "jrnl/rmgr.hpp"
-#include "jrnl/wmgr.hpp"
-#include "jrnl/wrfc.hpp"
+#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"
 
 namespace mrg
 {
@@ -719,4 +719,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_jcntl_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_JCNTL_H
diff --git a/cpp/src/qpid/legacystore/jrnl/jdir.cpp b/cpp/src/qpid/legacystore/jrnl/jdir.cpp
index 9eedbb9a68..95ab3fafa4 100644
--- a/cpp/src/qpid/legacystore/jrnl/jdir.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/jdir.cpp
@@ -26,20 +26,20 @@
  *
  * File containing code for class mrg::journal::jdir (journal data
  * directory), used for controlling and manipulating journal data
- * direcories and files. See comments in file jdir.hpp for details.
+ * direcories and files. See comments in file jdir.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/jdir.hpp"
+#include "jrnl/jdir.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <cerrno>
 #include <iomanip>
-#include "jrnl/jcfg.hpp"
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/jcfg.h"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 #include <sstream>
 #include <sys/stat.h>
 #include <unistd.h>
diff --git a/cpp/src/qpid/legacystore/jrnl/jdir.h b/cpp/src/qpid/legacystore/jrnl/jdir.h
index 364be32e56..5a21b7912c 100644
--- a/cpp/src/qpid/legacystore/jrnl/jdir.h
+++ b/cpp/src/qpid/legacystore/jrnl/jdir.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file jdir.hpp
+ * \file jdir.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -31,8 +31,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_jdir_hpp
-#define mrg_journal_jdir_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_JDIR_H
+#define QPID_LEGACYSTORE_JRNL_JDIR_H
 
 namespace mrg
 {
@@ -42,7 +42,7 @@ class jdir;
 }
 }
 
-#include "jrnl/jinf.hpp"
+#include "jrnl/jinf.h"
 #include <dirent.h>
 
 namespace mrg
@@ -376,4 +376,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_jdir_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_JDIR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/jerrno.cpp b/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
index b2ecefdfb2..486fee02e5 100644
--- a/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/jerrno.cpp
@@ -25,14 +25,14 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::jerrno (journal error
- * codes). See comments in file jerrno.hpp for details.
+ * codes). See comments in file jerrno.h for details.
  *
- * See file jerrno.hpp for class details.
+ * See file jerrno.h for class details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/jerrno.hpp"
+#include "jrnl/jerrno.h"
 
 namespace mrg
 {
diff --git a/cpp/src/qpid/legacystore/jrnl/jerrno.h b/cpp/src/qpid/legacystore/jrnl/jerrno.h
index 3709e3a651..4c8b71c423 100644
--- a/cpp/src/qpid/legacystore/jrnl/jerrno.h
+++ b/cpp/src/qpid/legacystore/jrnl/jerrno.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file jerrno.hpp
+ * \file jerrno.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_jerrno_hpp
-#define mrg_journal_jerrno_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_JERRNO_H
+#define QPID_LEGACYSTORE_JRNL_JERRNO_H
 
 namespace mrg
 {
@@ -170,4 +170,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_jerrno_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_JERRNO_H
diff --git a/cpp/src/qpid/legacystore/jrnl/jexception.cpp b/cpp/src/qpid/legacystore/jrnl/jexception.cpp
index 965a239753..fe4b4c198a 100644
--- a/cpp/src/qpid/legacystore/jrnl/jexception.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/jexception.cpp
@@ -25,16 +25,16 @@
  * Qpid asynchronous store plugin library
  *
  * Generic journal exception class mrg::journal::jexception. See comments
- * in file jexception.hpp for details.
+ * in file jexception.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/jexception.hpp"
+#include "jrnl/jexception.h"
 
 #include <iomanip>
 #include <sstream>
-#include "jrnl/jerrno.hpp"
+#include "jrnl/jerrno.h"
 
 #define CATLEN(p) MAX_MSG_SIZE - std::strlen(p) - 1
 
diff --git a/cpp/src/qpid/legacystore/jrnl/jexception.h b/cpp/src/qpid/legacystore/jrnl/jexception.h
index 33e9563642..6cdbed8820 100644
--- a/cpp/src/qpid/legacystore/jrnl/jexception.h
+++ b/cpp/src/qpid/legacystore/jrnl/jexception.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file jexception.hpp
+ * \file jexception.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -32,8 +32,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_jrnl_exception_hpp
-#define mrg_journal_jrnl_exception_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_JEXCEPTION_H
+#define QPID_LEGACYSTORE_JRNL_JEXCEPTION_H
 
 namespace mrg
 {
@@ -48,7 +48,7 @@ class jexception;
 #include <cstdlib>
 #include <cstring>
 #include <exception>
-#include "jrnl/jerrno.hpp"
+#include "jrnl/jerrno.h"
 #include <sstream>
 #include <string>
 #include <sys/types.h>
@@ -139,4 +139,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_jrnl_exception_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_JEXCEPTION_H
diff --git a/cpp/src/qpid/legacystore/jrnl/jinf.cpp b/cpp/src/qpid/legacystore/jrnl/jinf.cpp
index 9d5ef1db84..1cee4224aa 100644
--- a/cpp/src/qpid/legacystore/jrnl/jinf.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/jinf.cpp
@@ -26,21 +26,21 @@
  *
  * This file contains the code for the mrg::journal::jinf class.
  *
- * See jinf.hpp comments for details of this class.
+ * See jinf.h comments for details of this class.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/jinf.hpp"
+#include "jrnl/jinf.h"
 
 #include <cstdlib>
 #include <cstring>
 #include <ctime>
 #include <fstream>
-#include "jrnl/file_hdr.hpp"
-#include "jrnl/jcntl.hpp"
-#include "jrnl/jerrno.hpp"
-#include "jrnl/lp_map.hpp"
+#include "jrnl/file_hdr.h"
+#include "jrnl/jcntl.h"
+#include "jrnl/jerrno.h"
+#include "jrnl/lp_map.h"
 #include <sstream>
 #include <sys/stat.h>
 
diff --git a/cpp/src/qpid/legacystore/jrnl/jinf.h b/cpp/src/qpid/legacystore/jrnl/jinf.h
index 0d3c9aa552..73f5386a19 100644
--- a/cpp/src/qpid/legacystore/jrnl/jinf.h
+++ b/cpp/src/qpid/legacystore/jrnl/jinf.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file jinf.hpp
+ * \file jinf.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -29,8 +29,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_jinf_hpp
-#define mrg_journal_jinf_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_JINF_H
+#define QPID_LEGACYSTORE_JRNL_JINF_H
 
 #include <ctime>
 #include <string>
@@ -130,4 +130,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_jinf_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_JINF_H
diff --git a/cpp/src/qpid/legacystore/jrnl/jrec.cpp b/cpp/src/qpid/legacystore/jrnl/jrec.cpp
index 49299a126c..4af2f7359c 100644
--- a/cpp/src/qpid/legacystore/jrnl/jrec.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/jrec.cpp
@@ -25,16 +25,16 @@
  * Qpid asynchronous store plugin library
  *
  * File containing source code for class mrg::journal::jrec (abstract journal
- * jrecord). See comments in file jrec.hpp for details.
+ * jrecord). See comments in file jrec.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/jrec.hpp"
+#include "jrnl/jrec.h"
 
 #include <iomanip>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/cpp/src/qpid/legacystore/jrnl/jrec.h b/cpp/src/qpid/legacystore/jrnl/jrec.h
index abb77bbd2d..5d504b539d 100644
--- a/cpp/src/qpid/legacystore/jrnl/jrec.h
+++ b/cpp/src/qpid/legacystore/jrnl/jrec.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file jrec.hpp
+ * \file jrec.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_jrec_hpp
-#define mrg_journal_jrec_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_JREC_H
+#define QPID_LEGACYSTORE_JRNL_JREC_H
 
 namespace mrg
 {
@@ -43,8 +43,8 @@ class jrec;
 
 #include <cstddef>
 #include <fstream>
-#include "jrnl/rec_hdr.hpp"
-#include "jrnl/rec_tail.hpp"
+#include "jrnl/rec_hdr.h"
+#include "jrnl/rec_tail.h"
 #include <string>
 #include <sys/types.h>
 
@@ -180,4 +180,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_jrec_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_JREC_H
diff --git a/cpp/src/qpid/legacystore/jrnl/lp_map.cpp b/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
index bbfe9794d8..60bb7c018b 100644
--- a/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/lp_map.cpp
@@ -25,15 +25,15 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::lp_map (logical file map). See
- * comments in file lp_map.hpp for details.
+ * comments in file lp_map.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/lp_map.hpp"
+#include "jrnl/lp_map.h"
 
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/cpp/src/qpid/legacystore/jrnl/lp_map.h b/cpp/src/qpid/legacystore/jrnl/lp_map.h
index 6ac39695d2..c43cbc0173 100644
--- a/cpp/src/qpid/legacystore/jrnl/lp_map.h
+++ b/cpp/src/qpid/legacystore/jrnl/lp_map.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file lp_map.hpp
+ * \file lp_map.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_lp_map_hpp
-#define mrg_journal_lp_map_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_LP_MAP_H
+#define QPID_LEGACYSTORE_JRNL_LP_MAP_H
 
 #include <map>
 #include <string>
@@ -80,4 +80,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_lp_map_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_LP_MAP_H
diff --git a/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp b/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
index f7e9176172..8d522a2186 100644
--- a/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/lpmgr.cpp
@@ -26,16 +26,16 @@
  *
  * File containing code for class mrg::journal::lpmgr (non-logging file
  * handle), used for controlling journal log files. See comments in file
- * lpmgr.hpp for details.
+ * lpmgr.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/lpmgr.hpp"
+#include "jrnl/lpmgr.h"
 
 #include <cassert>
-#include <jrnl/jerrno.hpp>
-#include <jrnl/jexception.hpp>
+#include <jrnl/jerrno.h>
+#include <jrnl/jexception.h>
 
 namespace mrg
 {
diff --git a/cpp/src/qpid/legacystore/jrnl/lpmgr.h b/cpp/src/qpid/legacystore/jrnl/lpmgr.h
index 3528db6f72..39c14ef946 100644
--- a/cpp/src/qpid/legacystore/jrnl/lpmgr.h
+++ b/cpp/src/qpid/legacystore/jrnl/lpmgr.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file lpmgr.hpp
+ * \file lpmgr.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -29,8 +29,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_lpmgr_hpp
-#define mrg_journal_lpmgr_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_LPMGR_H
+#define QPID_LEGACYSTORE_JRNL_LPMGR_H
 
 namespace mrg
 {
@@ -41,7 +41,7 @@ namespace journal
 }
 }
 
-#include "jrnl/fcntl.hpp"
+#include "jrnl/fcntl.h"
 #include <vector>
 
 namespace mrg
@@ -300,4 +300,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_lpmgr_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_LPMGR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/pmgr.cpp b/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
index f5e26231e9..687cc4eb36 100644
--- a/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/pmgr.cpp
@@ -25,19 +25,19 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::pmgr (page manager). See
- * comments in file pmgr.hpp for details.
+ * comments in file pmgr.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/pmgr.hpp"
+#include "jrnl/pmgr.h"
 
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
-#include "jrnl/jcfg.hpp"
-#include "jrnl/jcntl.hpp"
-#include "jrnl/jerrno.hpp"
+#include "jrnl/jcfg.h"
+#include "jrnl/jcntl.h"
+#include "jrnl/jerrno.h"
 #include <sstream>
 
 
diff --git a/cpp/src/qpid/legacystore/jrnl/pmgr.h b/cpp/src/qpid/legacystore/jrnl/pmgr.h
index 3ce8851d70..f608b4c5f0 100644
--- a/cpp/src/qpid/legacystore/jrnl/pmgr.h
+++ b/cpp/src/qpid/legacystore/jrnl/pmgr.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file pmgr.hpp
+ * \file pmgr.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_pmgr_hpp
-#define mrg_journal_pmgr_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_PMGR_H
+#define QPID_LEGACYSTORE_JRNL_PMGR_H
 
 namespace mrg
 {
@@ -43,15 +43,15 @@ namespace journal
 }
 
 #include <deque>
-#include "jrnl/aio.hpp"
-#include "jrnl/aio_callback.hpp"
-#include "jrnl/data_tok.hpp"
-#include "jrnl/deq_rec.hpp"
-#include "jrnl/enq_map.hpp"
-#include "jrnl/enq_rec.hpp"
-#include "jrnl/fcntl.hpp"
-#include "jrnl/txn_map.hpp"
-#include "jrnl/txn_rec.hpp"
+#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"
 
 namespace mrg
 {
@@ -139,4 +139,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_pmgr_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_PMGR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/rcvdat.h b/cpp/src/qpid/legacystore/jrnl/rcvdat.h
index 90f5a5ad58..1fd7479fe0 100644
--- a/cpp/src/qpid/legacystore/jrnl/rcvdat.h
+++ b/cpp/src/qpid/legacystore/jrnl/rcvdat.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file rcvdat.hpp
+ * \file rcvdat.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -29,13 +29,13 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_rcvdat_hpp
-#define mrg_journal_rcvdat_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_RCVDAT_H
+#define QPID_LEGACYSTORE_JRNL_RCVDAT_H
 
 #include <cstddef>
 #include <iomanip>
 #include <map>
-#include "jrnl/jcfg.hpp"
+#include "jrnl/jcfg.h"
 #include <sstream>
 #include <sys/types.h>
 #include <vector>
@@ -178,4 +178,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_rcvdat_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_RCVDAT_H
diff --git a/cpp/src/qpid/legacystore/jrnl/rec_hdr.h b/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
index 852aabd7b6..8da27fb325 100644
--- a/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
+++ b/cpp/src/qpid/legacystore/jrnl/rec_hdr.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file rec_hdr.hpp
+ * \file rec_hdr.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -31,11 +31,11 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_rec_hdr_hpp
-#define mrg_journal_rec_hdr_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_REC_HDR_H
+#define QPID_LEGACYSTORE_JRNL_REC_HDR_H
 
 #include <cstddef>
-#include "jrnl/jcfg.hpp"
+#include "jrnl/jcfg.h"
 #include <sys/types.h>
 
 namespace mrg
@@ -140,4 +140,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_rec_hdr_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_REC_HDR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/rec_tail.h b/cpp/src/qpid/legacystore/jrnl/rec_tail.h
index 914e21d5c9..10a99166ea 100644
--- a/cpp/src/qpid/legacystore/jrnl/rec_tail.h
+++ b/cpp/src/qpid/legacystore/jrnl/rec_tail.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file rec_tail.hpp
+ * \file rec_tail.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -31,11 +31,11 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_rec_tail_hpp
-#define mrg_journal_rec_tail_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_REC_TAIL_H
+#define QPID_LEGACYSTORE_JRNL_REC_TAIL_H
 
 #include <cstddef>
-#include "jrnl/jcfg.hpp"
+#include "jrnl/jcfg.h"
 
 namespace mrg
 {
@@ -95,4 +95,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_rec_tail_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_REC_TAIL_H
diff --git a/cpp/src/qpid/legacystore/jrnl/rfc.cpp b/cpp/src/qpid/legacystore/jrnl/rfc.cpp
index 95b55696dc..bc169b0aee 100644
--- a/cpp/src/qpid/legacystore/jrnl/rfc.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/rfc.cpp
@@ -25,12 +25,12 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::rfc (rotating
- * file controller). See comments in file rfc.hpp for details.
+ * file controller). See comments in file rfc.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/rfc.hpp"
+#include "jrnl/rfc.h"
 
 #include <cassert>
 
diff --git a/cpp/src/qpid/legacystore/jrnl/rfc.h b/cpp/src/qpid/legacystore/jrnl/rfc.h
index 6b0483da5a..8d3b6e932d 100644
--- a/cpp/src/qpid/legacystore/jrnl/rfc.h
+++ b/cpp/src/qpid/legacystore/jrnl/rfc.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file rfc.hpp
+ * \file rfc.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_rfc_hpp
-#define mrg_journal_rfc_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_RFC_H
+#define QPID_LEGACYSTORE_JRNL_RFC_H
 
 namespace mrg
 {
@@ -41,8 +41,8 @@ class rfc;
 }
 }
 
-#include "jrnl/lpmgr.hpp"
-#include "jrnl/enums.hpp"
+#include "jrnl/lpmgr.h"
+#include "jrnl/enums.h"
 
 namespace mrg
 {
@@ -190,4 +190,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_rfc_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_RFC_H
diff --git a/cpp/src/qpid/legacystore/jrnl/rmgr.cpp b/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
index 4485019b75..b829d8144b 100644
--- a/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/rmgr.cpp
@@ -25,18 +25,18 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::rmgr (read manager). See
- * comments in file rmgr.hpp for details.
+ * comments in file rmgr.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/rmgr.hpp"
+#include "jrnl/rmgr.h"
 
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
-#include "jrnl/jcntl.hpp"
-#include "jrnl/jerrno.hpp"
+#include "jrnl/jcntl.h"
+#include "jrnl/jerrno.h"
 #include <sstream>
 
 namespace mrg
diff --git a/cpp/src/qpid/legacystore/jrnl/rmgr.h b/cpp/src/qpid/legacystore/jrnl/rmgr.h
index 8f053b9dfc..ae4b5f56c8 100644
--- a/cpp/src/qpid/legacystore/jrnl/rmgr.h
+++ b/cpp/src/qpid/legacystore/jrnl/rmgr.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file rmgr.hpp
+ * \file rmgr.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_rmgr_hpp
-#define mrg_journal_rmgr_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_RMGR_H
+#define QPID_LEGACYSTORE_JRNL_RMGR_H
 
 namespace mrg
 {
@@ -42,11 +42,11 @@ class rmgr;
 }
 
 #include <cstring>
-#include "jrnl/enums.hpp"
-#include "jrnl/file_hdr.hpp"
-#include "jrnl/pmgr.hpp"
-#include "jrnl/rec_hdr.hpp"
-#include "jrnl/rrfc.hpp"
+#include "jrnl/enums.h"
+#include "jrnl/file_hdr.h"
+#include "jrnl/pmgr.h"
+#include "jrnl/rec_hdr.h"
+#include "jrnl/rrfc.h"
 
 namespace mrg
 {
@@ -111,4 +111,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_rmgr_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_RMGR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/rrfc.cpp b/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
index 9dd061838a..313191af80 100644
--- a/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/rrfc.cpp
@@ -25,19 +25,19 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::rrfc (rotating
- * file controller). See comments in file rrfc.hpp for details.
+ * file controller). See comments in file rrfc.h for details.
  *
  * \author Kim van der Riet
  */
 
 
-#include "jrnl/rrfc.hpp"
+#include "jrnl/rrfc.h"
 
 #include <cerrno>
 #include <fcntl.h>
 #include <unistd.h>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 
 namespace mrg
 {
diff --git a/cpp/src/qpid/legacystore/jrnl/rrfc.h b/cpp/src/qpid/legacystore/jrnl/rrfc.h
index afd5f71f3c..c7a29170da 100644
--- a/cpp/src/qpid/legacystore/jrnl/rrfc.h
+++ b/cpp/src/qpid/legacystore/jrnl/rrfc.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file rrfc.hpp
+ * \file rrfc.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_rrfc_hpp
-#define mrg_journal_rrfc_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_RRFC_H
+#define QPID_LEGACYSTORE_JRNL_RRFC_H
 
 namespace mrg
 {
@@ -41,8 +41,8 @@ class rrfc;
 }
 }
 
-#include "jrnl/fcntl.hpp"
-#include "jrnl/rfc.hpp"
+#include "jrnl/fcntl.h"
+#include "jrnl/rfc.h"
 
 namespace mrg
 {
@@ -176,4 +176,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_rrfc_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_RRFC_H
diff --git a/cpp/src/qpid/legacystore/jrnl/slock.cpp b/cpp/src/qpid/legacystore/jrnl/slock.cpp
index f5047b7598..23ab99f63e 100644
--- a/cpp/src/qpid/legacystore/jrnl/slock.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/slock.cpp
@@ -25,9 +25,9 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::slock (scoped lock). See
- * comments in file slock.hpp for details.
+ * comments in file slock.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/slock.hpp"
+#include "jrnl/slock.h"
diff --git a/cpp/src/qpid/legacystore/jrnl/slock.h b/cpp/src/qpid/legacystore/jrnl/slock.h
index 2e8fc68c25..eabcde34c3 100644
--- a/cpp/src/qpid/legacystore/jrnl/slock.h
+++ b/cpp/src/qpid/legacystore/jrnl/slock.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file slock.hpp
+ * \file slock.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,11 +30,11 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_slock_hpp
-#define mrg_journal_slock_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_SLOCK_H
+#define QPID_LEGACYSTORE_JRNL_SLOCK_H
 
-#include "jrnl/jexception.hpp"
-#include "jrnl/smutex.hpp"
+#include "jrnl/jexception.h"
+#include "jrnl/smutex.h"
 #include <pthread.h>
 
 namespace mrg
@@ -82,4 +82,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_slock_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_SLOCK_H
diff --git a/cpp/src/qpid/legacystore/jrnl/smutex.cpp b/cpp/src/qpid/legacystore/jrnl/smutex.cpp
index d00bade5f4..7941b57d2d 100644
--- a/cpp/src/qpid/legacystore/jrnl/smutex.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/smutex.cpp
@@ -25,9 +25,9 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::smutex (scoped mutex). See
- * comments in file smutex.hpp for details.
+ * comments in file smutex.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/smutex.hpp"
+#include "jrnl/smutex.h"
diff --git a/cpp/src/qpid/legacystore/jrnl/smutex.h b/cpp/src/qpid/legacystore/jrnl/smutex.h
index a0c21cbb4d..1987405d73 100644
--- a/cpp/src/qpid/legacystore/jrnl/smutex.h
+++ b/cpp/src/qpid/legacystore/jrnl/smutex.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file smutex.hpp
+ * \file smutex.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,10 +30,10 @@
  */
 
 
-#ifndef mrg_journal_smutex_hpp
-#define mrg_journal_smutex_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_SMUTEX_H
+#define QPID_LEGACYSTORE_JRNL_SMUTEX_H
 
-#include "jrnl/jexception.hpp"
+#include "jrnl/jexception.h"
 #include <pthread.h>
 
 namespace mrg
@@ -61,4 +61,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_smutex_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_SMUTEX_H
diff --git a/cpp/src/qpid/legacystore/jrnl/time_ns.cpp b/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
index 8205e3bc2e..95cb35c626 100644
--- a/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/time_ns.cpp
@@ -30,7 +30,7 @@
  * \author Kim van der Riet
  */
 
-#include "time_ns.hpp"
+#include "time_ns.h"
 
 #include <sstream>
 
diff --git a/cpp/src/qpid/legacystore/jrnl/time_ns.h b/cpp/src/qpid/legacystore/jrnl/time_ns.h
index fd910f8e4c..a9f69e2631 100644
--- a/cpp/src/qpid/legacystore/jrnl/time_ns.h
+++ b/cpp/src/qpid/legacystore/jrnl/time_ns.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file time_ns.hpp
+ * \file time_ns.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_jtt_time_ns_hpp
-#define mrg_jtt_time_ns_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_TIME_NS_H
+#define QPID_LEGACYSTORE_JRNL_TIME_NS_H
 
 #include <cerrno>
 #include <ctime>
@@ -102,4 +102,4 @@ struct time_ns : public timespec
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_jtt_time_ns_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_TIME_NS_H
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_hdr.h b/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
index e9a9b3137c..2713012828 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
+++ b/cpp/src/qpid/legacystore/jrnl/txn_hdr.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file txn_hdr.hpp
+ * \file txn_hdr.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,11 +30,11 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_txn_hdr_hpp
-#define mrg_journal_txn_hdr_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_TXN_HDR_H
+#define QPID_LEGACYSTORE_JRNL_TXN_HDR_H
 
 #include <cstddef>
-#include "jrnl/rec_hdr.hpp"
+#include "jrnl/rec_hdr.h"
 
 namespace mrg
 {
@@ -122,4 +122,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_txn_hdr_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_TXN_HDR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_map.cpp b/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
index ce8bdcaee3..e62f74e231 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/txn_map.cpp
@@ -25,17 +25,17 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::txn_map (transaction map). See
- * comments in file txn_map.hpp for details.
+ * comments in file txn_map.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/txn_map.hpp"
+#include "jrnl/txn_map.h"
 
 #include <iomanip>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
-#include "jrnl/slock.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
+#include "jrnl/slock.h"
 #include <sstream>
 
 namespace mrg
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_map.h b/cpp/src/qpid/legacystore/jrnl/txn_map.h
index dab7aa76d1..b539a88459 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_map.h
+++ b/cpp/src/qpid/legacystore/jrnl/txn_map.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file txn_map.hpp
+ * \file txn_map.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_txn_map_hpp
-#define mrg_journal_txn_map_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_TXN_MAP_H
+#define QPID_LEGACYSTORE_JRNL_TXN_MAP_H
 
 namespace mrg
 {
@@ -41,7 +41,7 @@ namespace journal
 }
 }
 
-#include "jrnl/smutex.hpp"
+#include "jrnl/smutex.h"
 #include <map>
 #include <pthread.h>
 #include <string>
@@ -156,4 +156,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_txn_map_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_TXN_MAP_H
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp b/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
index f4d6f67971..8f3c5164a6 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/txn_rec.cpp
@@ -25,20 +25,20 @@
  * Qpid asynchronous store plugin library
  *
  * This file contains the code for the mrg::journal::txn_rec (journal dequeue
- * record) class. See comments in file txn_rec.hpp for details.
+ * record) class. See comments in file txn_rec.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/txn_rec.hpp"
+#include "jrnl/txn_rec.h"
 
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
 #include <iomanip>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 #include <sstream>
 
 namespace mrg
diff --git a/cpp/src/qpid/legacystore/jrnl/txn_rec.h b/cpp/src/qpid/legacystore/jrnl/txn_rec.h
index a295f56612..23b87fecb4 100644
--- a/cpp/src/qpid/legacystore/jrnl/txn_rec.h
+++ b/cpp/src/qpid/legacystore/jrnl/txn_rec.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file txn_rec.hpp
+ * \file txn_rec.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_txn_rec_hpp
-#define mrg_journal_txn_rec_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_TXN_REC_H
+#define QPID_LEGACYSTORE_JRNL_TXN_REC_H
 
 namespace mrg
 {
@@ -42,8 +42,8 @@ class txn_rec;
 }
 
 #include <cstddef>
-#include "jrnl/jrec.hpp"
-#include "jrnl/txn_hdr.hpp"
+#include "jrnl/jrec.h"
+#include "jrnl/txn_hdr.h"
 
 namespace mrg
 {
@@ -98,4 +98,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_txn_rec_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_TXN_REC_H
diff --git a/cpp/src/qpid/legacystore/jrnl/wmgr.cpp b/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
index 6d264c0a0d..e375208a11 100644
--- a/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/wmgr.cpp
@@ -25,20 +25,20 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::wmgr (read manager). See
- * comments in file wmgr.hpp for details.
+ * comments in file wmgr.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/wmgr.hpp"
+#include "jrnl/wmgr.h"
 
 #include <cassert>
 #include <cerrno>
 #include <cstdlib>
 #include <cstring>
-#include "jrnl/file_hdr.hpp"
-#include "jrnl/jcntl.hpp"
-#include "jrnl/jerrno.hpp"
+#include "jrnl/file_hdr.h"
+#include "jrnl/jcntl.h"
+#include "jrnl/jerrno.h"
 #include <sstream>
 
 namespace mrg
diff --git a/cpp/src/qpid/legacystore/jrnl/wmgr.h b/cpp/src/qpid/legacystore/jrnl/wmgr.h
index 8496f091e6..bbfdc0f73f 100644
--- a/cpp/src/qpid/legacystore/jrnl/wmgr.h
+++ b/cpp/src/qpid/legacystore/jrnl/wmgr.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file wmgr.hpp
+ * \file wmgr.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_wmgr_hpp
-#define mrg_journal_wmgr_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_WMGR_H
+#define QPID_LEGACYSTORE_JRNL_WMGR_H
 
 namespace mrg
 {
@@ -42,9 +42,9 @@ class wmgr;
 }
 
 #include <cstring>
-#include "jrnl/enums.hpp"
-#include "jrnl/pmgr.hpp"
-#include "jrnl/wrfc.hpp"
+#include "jrnl/enums.h"
+#include "jrnl/pmgr.h"
+#include "jrnl/wrfc.h"
 #include <set>
 
 namespace mrg
@@ -144,4 +144,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_wmgr_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_WMGR_H
diff --git a/cpp/src/qpid/legacystore/jrnl/wrfc.cpp b/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
index ede6de62e8..13d3e3022e 100644
--- a/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
+++ b/cpp/src/qpid/legacystore/jrnl/wrfc.cpp
@@ -25,16 +25,16 @@
  * Qpid asynchronous store plugin library
  *
  * File containing code for class mrg::journal::rrfc (rotating
- * file controller). See comments in file rrfc.hpp for details.
+ * file controller). See comments in file rrfc.h for details.
  *
  * \author Kim van der Riet
  */
 
-#include "jrnl/wrfc.hpp"
+#include "jrnl/wrfc.h"
 
 #include <cmath>
-#include "jrnl/jerrno.hpp"
-#include "jrnl/jexception.hpp"
+#include "jrnl/jerrno.h"
+#include "jrnl/jexception.h"
 
 namespace mrg
 {
diff --git a/cpp/src/qpid/legacystore/jrnl/wrfc.h b/cpp/src/qpid/legacystore/jrnl/wrfc.h
index f71eb4f317..fb818cd633 100644
--- a/cpp/src/qpid/legacystore/jrnl/wrfc.h
+++ b/cpp/src/qpid/legacystore/jrnl/wrfc.h
@@ -20,7 +20,7 @@
  */
 
 /**
- * \file wrfc.hpp
+ * \file wrfc.h
  *
  * Qpid asynchronous store plugin library
  *
@@ -30,8 +30,8 @@
  * \author Kim van der Riet
  */
 
-#ifndef mrg_journal_wrfc_hpp
-#define mrg_journal_wrfc_hpp
+#ifndef QPID_LEGACYSTORE_JRNL_WRFC_H
+#define QPID_LEGACYSTORE_JRNL_WRFC_H
 
 namespace mrg
 {
@@ -42,8 +42,8 @@ class wrfc;
 }
 
 #include <cstddef>
-#include "jrnl/enums.hpp"
-#include "jrnl/rrfc.hpp"
+#include "jrnl/enums.h"
+#include "jrnl/rrfc.h"
 
 namespace mrg
 {
@@ -151,4 +151,4 @@ namespace journal
 } // namespace journal
 } // namespace mrg
 
-#endif // ifndef mrg_journal_wrfc_hpp
+#endif // ifndef QPID_LEGACYSTORE_JRNL_WRFC_H