Change header guard names to use `INCLUDED_` prefix

Fixes #2049

59 files changed, 177 insertions, 177 deletions

diff --git a/src/account.h b/src/account.h
index 2db36cea..5068fd1c 100644
--- a/src/account.h
+++ b/src/account.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _ACCOUNT_H
-#define _ACCOUNT_H
+#ifndef INCLUDED_ACCOUNT_H
+#define INCLUDED_ACCOUNT_H
 
 #include "scope.h"
 
@@ -305,4 +305,4 @@ struct account_compare {
 
 } // namespace ledger
 
-#endif // _ACCOUNT_H
+#endif // INCLUDED_ACCOUNT_H
diff --git a/src/amount.h b/src/amount.h
index fed9a467..d00e4667 100644
--- a/src/amount.h
+++ b/src/amount.h
@@ -50,8 +50,8 @@
  * automatically expanded to include as many extra digits as necessary
  * to avoid losing information.
  */
-#ifndef _AMOUNT_H
-#define _AMOUNT_H
+#ifndef INCLUDED_AMOUNT_H
+#define INCLUDED_AMOUNT_H
 
 #include "utils.h"
 #include "times.h"
@@ -787,4 +787,4 @@ void put_amount(property_tree::ptree& pt, const amount_t& amt,
 
 } // namespace ledger
 
-#endif // _AMOUNT_H
+#endif // INCLUDED_AMOUNT_H
diff --git a/src/annotate.h b/src/annotate.h
index 75d42589..0be00fe3 100644
--- a/src/annotate.h
+++ b/src/annotate.h
@@ -43,8 +43,8 @@
  *
  * Long.
  */
-#ifndef _ANNOTATE_H
-#define _ANNOTATE_H
+#ifndef INCLUDED_ANNOTATE_H
+#define INCLUDED_ANNOTATE_H
 
 #include "expr.h"
 
@@ -233,4 +233,4 @@ as_annotated_commodity(const commodity_t& commodity) {
 
 } // namespace ledger
 
-#endif // _ANNOTATE_H
+#endif // INCLUDED_ANNOTATE_H
diff --git a/src/balance.h b/src/balance.h
index 6c1475ac..c269a854 100644
--- a/src/balance.h
+++ b/src/balance.h
@@ -46,8 +46,8 @@
  * is designed to allow this, tracking the amounts of each component
  * commodity separately.
  */
-#ifndef _BALANCE_H
-#define _BALANCE_H
+#ifndef INCLUDED_BALANCE_H
+#define INCLUDED_BALANCE_H
 
 #include "amount.h"
 
@@ -610,4 +610,4 @@ balance_t average_lot_prices(const balance_t& bal);
 
 } // namespace ledger
 
-#endif // _BALANCE_H
+#endif // INCLUDED_BALANCE_H
diff --git a/src/chain.h b/src/chain.h
index ff891238..c5d243dc 100644
--- a/src/chain.h
+++ b/src/chain.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _CHAIN_H
-#define _CHAIN_H
+#ifndef INCLUDED_CHAIN_H
+#define INCLUDED_CHAIN_H
 
 #include "utils.h"
 
@@ -113,4 +113,4 @@ chain_handlers(post_handler_ptr handler,
 
 } // namespace ledger
 
-#endif // _CHAIN_H
+#endif // INCLUDED_CHAIN_H
diff --git a/src/commodity.h b/src/commodity.h
index 5060102d..ee73a31a 100644
--- a/src/commodity.h
+++ b/src/commodity.h
@@ -44,8 +44,8 @@
  * This file contains one of the most basic types in Ledger:
  * commodity_t, and its annotated cousin, annotated_commodity_t.
  */
-#ifndef _COMMODITY_H
-#define _COMMODITY_H
+#ifndef INCLUDED_COMMODITY_H
+#define INCLUDED_COMMODITY_H
 
 #include "expr.h"
 
@@ -300,4 +300,4 @@ struct commodity_compare {
 
 } // namespace ledger
 
-#endif // _COMMODITY_H
+#endif // INCLUDED_COMMODITY_H
diff --git a/src/compare.h b/src/compare.h
index f1b6b9b3..2da73b26 100644
--- a/src/compare.h
+++ b/src/compare.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _COMPARE_H
-#define _COMPARE_H
+#ifndef INCLUDED_COMPARE_H
+#define INCLUDED_COMPARE_H
 
 #include "expr.h"
 
@@ -97,4 +97,4 @@ bool compare_items<account_t>::operator()(account_t * left,
 
 } // namespace ledger
 
-#endif // _COMPARE_H
+#endif // INCLUDED_COMPARE_H
diff --git a/src/context.h b/src/context.h
index bf97feb5..876fce29 100644
--- a/src/context.h
+++ b/src/context.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _CONTEXT_H
-#define _CONTEXT_H
+#ifndef INCLUDED_CONTEXT_H
+#define INCLUDED_CONTEXT_H
 
 #include "utils.h"
 #include "times.h"
@@ -167,4 +167,4 @@ public:
 
 } // namespace ledger
 
-#endif // _CONTEXT_H
+#endif // INCLUDED_CONTEXT_H
diff --git a/src/convert.h b/src/convert.h
index e27b5872..3904d84b 100644
--- a/src/convert.h
+++ b/src/convert.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _CONVERT_H
-#define _CONVERT_H
+#ifndef INCLUDED_CONVERT_H
+#define INCLUDED_CONVERT_H
 
 #include "value.h"
 
@@ -52,4 +52,4 @@ value_t convert_command(call_scope_t& scope);
 
 } // namespace ledger
 
-#endif // _CONVERT_H
+#endif // INCLUDED_CONVERT_H
diff --git a/src/csv.h b/src/csv.h
index d7083211..aefdfd70 100644
--- a/src/csv.h
+++ b/src/csv.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _CSV_H
-#define _CSV_H
+#ifndef INCLUDED_CSV_H
+#define INCLUDED_CSV_H
 
 #include "value.h"
 #include "context.h"
@@ -115,4 +115,4 @@ public:
 
 } // namespace ledger
 
-#endif // _CSV_H
+#endif // INCLUDED_CSV_H
diff --git a/src/draft.h b/src/draft.h
index 44c3bf3d..7b04ee39 100644
--- a/src/draft.h
+++ b/src/draft.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _DRAFT_H
-#define _DRAFT_H
+#ifndef INCLUDED_DRAFT_H
+#define INCLUDED_DRAFT_H
 
 #include "exprbase.h"
 #include "value.h"
@@ -129,4 +129,4 @@ value_t template_command(call_scope_t& args);
 
 } // namespace ledger
 
-#endif // _DRAFT_H
+#endif // INCLUDED_DRAFT_H
diff --git a/src/emacs.h b/src/emacs.h
index 6e428613..a263f498 100644
--- a/src/emacs.h
+++ b/src/emacs.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _EMACS_H
-#define _EMACS_H
+#ifndef INCLUDED_EMACS_H
+#define INCLUDED_EMACS_H
 
 #include "chain.h"
 
@@ -77,4 +77,4 @@ public:
 
 } // namespace ledger
 
-#endif // _REPORT_H
+#endif // INCLUDED_EMACS_H
diff --git a/src/error.h b/src/error.h
index 3bdcde98..a8378295 100644
--- a/src/error.h
+++ b/src/error.h
@@ -39,8 +39,8 @@
  *
  * @ingroup util
  */
-#ifndef _ERROR_H
-#define _ERROR_H
+#ifndef INCLUDED_ERROR_H
+#define INCLUDED_ERROR_H
 
 namespace ledger {
 
@@ -102,4 +102,4 @@ struct error_count {
 
 } // namespace ledger
 
-#endif // _ERROR_H
+#endif // INCLUDED_ERROR_H
diff --git a/src/expr.h b/src/expr.h
index b3806bc1..dfbeefa1 100644
--- a/src/expr.h
+++ b/src/expr.h
@@ -39,8 +39,8 @@
  *
  * @ingroup expr
  */
-#ifndef _EXPR_H
-#define _EXPR_H
+#ifndef INCLUDED_EXPR_H
+#define INCLUDED_EXPR_H
 
 #include "exprbase.h"
 #include "value.h"
@@ -185,4 +185,4 @@ value_t source_command(call_scope_t& scope);
 
 } // namespace ledger
 
-#endif // _EXPR_H
+#endif // INCLUDED_EXPR_H
diff --git a/src/exprbase.h b/src/exprbase.h
index 9c28dca3..8c83c992 100644
--- a/src/exprbase.h
+++ b/src/exprbase.h
@@ -51,8 +51,8 @@
  * | draft_t     | Partially filled xacts     | xact_t *        |             |
  * | format_t    | Format strings             | string          |             |
  */
-#ifndef _EXPRBASE_H
-#define _EXPRBASE_H
+#ifndef INCLUDED_EXPRBASE_H
+#define INCLUDED_EXPRBASE_H
 
 #include "utils.h"
 #include "amount.h"
@@ -242,4 +242,4 @@ std::ostream& operator<<(std::ostream& out,
 
 } // namespace ledger
 
-#endif // _EXPRBASE_H
+#endif // INCLUDED_EXPRBASE_H
diff --git a/src/filters.h b/src/filters.h
index 5409a97d..4972b710 100644
--- a/src/filters.h
+++ b/src/filters.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _FILTERS_H
-#define _FILTERS_H
+#ifndef INCLUDED_FILTERS_H
+#define INCLUDED_FILTERS_H
 
 #include "chain.h"
 #include "xact.h"
@@ -1083,4 +1083,4 @@ public:
 
 } // namespace ledger
 
-#endif // _FILTERS_H
+#endif // INCLUDED_FILTERS_H
diff --git a/src/flags.h b/src/flags.h
index 42e2719a..17da4c45 100644
--- a/src/flags.h
+++ b/src/flags.h
@@ -39,8 +39,8 @@
  *
  * @ingroup util
  */
-#ifndef _FLAGS_H
-#define _FLAGS_H
+#ifndef INCLUDED_FLAGS_H
+#define INCLUDED_FLAGS_H
 
 
 template <typename T = boost::uint_least8_t, typename U = T>
@@ -184,4 +184,4 @@ public:
   }
 };
 
-#endif // _FLAGS_H
+#endif // INCLUDED_FLAGS_H
diff --git a/src/format.h b/src/format.h
index 48c690be..824be56c 100644
--- a/src/format.h
+++ b/src/format.h
@@ -39,8 +39,8 @@
  *
  * @ingroup expr
  */
-#ifndef _FORMAT_H
-#define _FORMAT_H
+#ifndef INCLUDED_FORMAT_H
+#define INCLUDED_FORMAT_H
 
 #include "expr.h"
 #include "unistring.h"
@@ -166,4 +166,4 @@ public:
 
 } // namespace ledger
 
-#endif // _FORMAT_H
+#endif // INCLUDED_FORMAT_H
diff --git a/src/generate.h b/src/generate.h
index 5272c7db..ef00cfc9 100644
--- a/src/generate.h
+++ b/src/generate.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _GENERATE_H
-#define _GENERATE_H
+#ifndef INCLUDED_GENERATE_H
+#define INCLUDED_GENERATE_H
 
 #include "iterators.h"
 
@@ -127,4 +127,4 @@ protected:
 
 } // namespace ledger
 
-#endif // _GENERATE_H
+#endif // INCLUDED_GENERATE_H
diff --git a/src/global.h b/src/global.h
index 4eb02571..123f3a9f 100644
--- a/src/global.h
+++ b/src/global.h
@@ -35,8 +35,8 @@
  *
  * @brief Contains the top-level functions used by main.cc
  */
-#ifndef _GLOBAL_H
-#define _GLOBAL_H
+#ifndef INCLUDED_GLOBAL_H
+#define INCLUDED_GLOBAL_H
 
 #include "option.h"
 #include "report.h"
@@ -174,4 +174,4 @@ void handle_debug_options(int argc, char * argv[]);
 
 } // namespace ledger
 
-#endif // _GLOBAL_H
+#endif // INCLUDED_GLOBAL_H
diff --git a/src/history.h b/src/history.h
index 11e29bd7..ad2b1652 100644
--- a/src/history.h
+++ b/src/history.h
@@ -43,8 +43,8 @@
  *
  * Long.
  */
-#ifndef _HISTORY_H
-#define _HISTORY_H
+#ifndef INCLUDED_HISTORY_H
+#define INCLUDED_HISTORY_H
 
 #include "amount.h"
 #include "commodity.h"
@@ -93,4 +93,4 @@ public:
 
 } // namespace ledger
 
-#endif // _HISTORY_H
+#endif // INCLUDED_HISTORY_H
diff --git a/src/item.h b/src/item.h
index 51539eff..e053abf0 100644
--- a/src/item.h
+++ b/src/item.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _ITEM_H
-#define _ITEM_H
+#ifndef INCLUDED_ITEM_H
+#define INCLUDED_ITEM_H
 
 #include "scope.h"
 
@@ -215,4 +215,4 @@ void    put_metadata(property_tree::ptree& pt, const item_t::string_map& metadat
 
 } // namespace ledger
 
-#endif // _ITEM_H
+#endif // INCLUDED_ITEM_H
diff --git a/src/iterators.h b/src/iterators.h
index 0eaa3cc2..733ec36e 100644
--- a/src/iterators.h
+++ b/src/iterators.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _ITERATORS_H
-#define _ITERATORS_H
+#ifndef INCLUDED_ITERATORS_H
+#define INCLUDED_ITERATORS_H
 
 #include "xact.h"
 #include "post.h"
@@ -326,4 +326,4 @@ private:
 
 } // namespace ledger
 
-#endif // _ITERATORS_H
+#endif // INCLUDED_ITERATORS_H
diff --git a/src/journal.h b/src/journal.h
index ac5fe45b..09f87340 100644
--- a/src/journal.h
+++ b/src/journal.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _JOURNAL_H
-#define _JOURNAL_H
+#ifndef INCLUDED_JOURNAL_H
+#define INCLUDED_JOURNAL_H
 
 #include "utils.h"
 #include "times.h"
@@ -203,4 +203,4 @@ private:
 
 } // namespace ledger
 
-#endif // _JOURNAL_H
+#endif // INCLUDED_JOURNAL_H
diff --git a/src/lookup.h b/src/lookup.h
index a357cafe..aa85d97a 100644
--- a/src/lookup.h
+++ b/src/lookup.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _LOOKUP_H
-#define _LOOKUP_H
+#ifndef INCLUDED_LOOKUP_H
+#define INCLUDED_LOOKUP_H
 
 #include "iterators.h"
 
@@ -54,4 +54,4 @@ lookup_probable_account(const string& ident,
 
 } // namespace ledger
 
-#endif // _LOOKUP_H
+#endif // INCLUDED_LOOKUP_H
diff --git a/src/mask.h b/src/mask.h
index 4e44b76b..4bf60bfe 100644
--- a/src/mask.h
+++ b/src/mask.h
@@ -41,8 +41,8 @@
  *
  * @brief Regular expression masking.
  */
-#ifndef _MASK_H
-#define _MASK_H
+#ifndef INCLUDED_MASK_H
+#define INCLUDED_MASK_H
 
 #include "utils.h"
 #if HAVE_BOOST_REGEX_UNICODE
@@ -137,4 +137,4 @@ inline void put_mask(property_tree::ptree& pt, const mask_t& mask) {
 
 } // namespace ledger
 
-#endif // _MASK_H
+#endif // INCLUDED_MASK_H
diff --git a/src/op.h b/src/op.h
index aab362c7..80fae934 100644
--- a/src/op.h
+++ b/src/op.h
@@ -39,8 +39,8 @@
  *
  * @ingroup expr
  */
-#ifndef _OP_H
-#define _OP_H
+#ifndef INCLUDED_OP_H
+#define INCLUDED_OP_H
 
 #include "expr.h"
 
@@ -348,4 +348,4 @@ value_t split_cons_expr(expr_t::ptr_op_t op);
 
 } // namespace ledger
 
-#endif // _OP_H
+#endif // INCLUDED_OP_H
diff --git a/src/option.h b/src/option.h
index c9759924..31524d70 100644
--- a/src/option.h
+++ b/src/option.h
@@ -39,8 +39,8 @@
  *
  * @ingroup expr
  */
-#ifndef _OPTION_H
-#define _OPTION_H
+#ifndef INCLUDED_OPTION_H
+#define INCLUDED_OPTION_H
 
 #include "scope.h"
 
@@ -298,4 +298,4 @@ DECLARE_EXCEPTION(option_error, std::runtime_error);
 
 } // namespace ledger
 
-#endif // _OPTION_H
+#endif // INCLUDED_OPTION_H
diff --git a/src/output.h b/src/output.h
index f7dd98b8..3b820918 100644
--- a/src/output.h
+++ b/src/output.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _OUTPUT_H
-#define _OUTPUT_H
+#ifndef INCLUDED_OUTPUT_H
+#define INCLUDED_OUTPUT_H
 
 #include "chain.h"
 #include "predicate.h"
@@ -248,4 +248,4 @@ public:
 
 } // namespace ledger
 
-#endif // _OUTPUT_H
+#endif // INCLUDED_OUTPUT_H
diff --git a/src/parser.h b/src/parser.h
index 5f5bfd2c..8a754d53 100644
--- a/src/parser.h
+++ b/src/parser.h
@@ -39,8 +39,8 @@
  *
  * @ingroup expr
  */
-#ifndef _PARSER_H
-#define _PARSER_H
+#ifndef INCLUDED_PARSER_H
+#define INCLUDED_PARSER_H
 
 #include "token.h"
 #include "op.h"
@@ -123,4 +123,4 @@ public:
 
 } // namespace ledger
 
-#endif // _PARSER_H
+#endif // INCLUDED_PARSER_H
diff --git a/src/pool.h b/src/pool.h
index b89789f4..2c90c29f 100644
--- a/src/pool.h
+++ b/src/pool.h
@@ -43,8 +43,8 @@
  *
  * Long.
  */
-#ifndef _POOL_H
-#define _POOL_H
+#ifndef INCLUDED_POOL_H
+#define INCLUDED_POOL_H
 
 #include "history.h"
 #include "annotate.h"
@@ -136,4 +136,4 @@ public:
 
 } // namespace ledger
 
-#endif // _POOL_H
+#endif // INCLUDED_POOL_H
diff --git a/src/post.h b/src/post.h
index a724f903..065769a4 100644
--- a/src/post.h
+++ b/src/post.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _POST_H
-#define _POST_H
+#ifndef INCLUDED_POST_H
+#define INCLUDED_POST_H
 
 #include "item.h"
 
@@ -269,4 +269,4 @@ void put_post(property_tree::ptree& pt, const post_t& post);
 
 } // namespace ledger
 
-#endif // _POST_H
+#endif // INCLUDED_POST_H
diff --git a/src/precmd.h b/src/precmd.h
index 41fab617..b0cd3bcc 100644
--- a/src/precmd.h
+++ b/src/precmd.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _PRECMD_H
-#define _PRECMD_H
+#ifndef INCLUDED_PRECMD_H
+#define INCLUDED_PRECMD_H
 
 #include "value.h"
 
@@ -56,4 +56,4 @@ value_t query_command(call_scope_t& args);
 
 } // namespace ledger
 
-#endif // _PRECMD_H
+#endif // INCLUDED_PRECMD_H
diff --git a/src/predicate.h b/src/predicate.h
index cf41ffe6..24664c82 100644
--- a/src/predicate.h
+++ b/src/predicate.h
@@ -39,8 +39,8 @@
  *
  * @ingroup expr
  */
-#ifndef _PREDICATE_H
-#define _PREDICATE_H
+#ifndef INCLUDED_PREDICATE_H
+#define INCLUDED_PREDICATE_H
 
 #include "expr.h"
 #include "commodity.h"
@@ -94,4 +94,4 @@ public:
 
 } // namespace ledger
 
-#endif // _PREDICATE_H
+#endif // INCLUDED_PREDICATE_H
diff --git a/src/print.h b/src/print.h
index 902fcd9a..1da74493 100644
--- a/src/print.h
+++ b/src/print.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _PRINT_H
-#define _PRINT_H
+#ifndef INCLUDED_PRINT_H
+#define INCLUDED_PRINT_H
 
 #include "chain.h"
 #include "predicate.h"
@@ -88,4 +88,4 @@ public:
 
 } // namespace ledger
 
-#endif // _PRINT_H
+#endif // INCLUDED_PRINT_H
diff --git a/src/pstream.h b/src/pstream.h
index 16b16ce8..92b03ce4 100644
--- a/src/pstream.h
+++ b/src/pstream.h
@@ -39,8 +39,8 @@
  *
  * @ingroup util
  */
-#ifndef _PSTREAM_H
-#define _PSTREAM_H
+#ifndef INCLUDED_PSTREAM_H
+#define INCLUDED_PSTREAM_H
 
 //#include <istream>
 //#include <streambuf>
@@ -111,4 +111,4 @@ public:
   }
 };
 
-#endif // _PSTREAM_H
+#endif // INCLUDED_PSTREAM_H
diff --git a/src/ptree.h b/src/ptree.h
index 9044f13b..9a870627 100644
--- a/src/ptree.h
+++ b/src/ptree.h
@@ -43,8 +43,8 @@
  *
  * Long.
  */
-#ifndef _PTREE_H
-#define _PTREE_H
+#ifndef INCLUDED_PTREE_H
+#define INCLUDED_PTREE_H
 
 #include "chain.h"
 
@@ -100,4 +100,4 @@ public:
 
 } // namespace ledger
 
-#endif // _PTREE_H
+#endif // INCLUDED_PTREE_H
diff --git a/src/pyfstream.h b/src/pyfstream.h
index 5be3a1c4..c315b903 100644
--- a/src/pyfstream.h
+++ b/src/pyfstream.h
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _PYFSTREAM_H
-#define _PYFSTREAM_H
+#ifndef INCLUDED_PYFSTREAM_H
+#define INCLUDED_PYFSTREAM_H
 
 // pyofstream
 // - a stream that writes on a Python file object
@@ -199,4 +199,4 @@ public:
   }
 };
 
-#endif // _PYFSTREAM_H
+#endif // INCLUDED_PYFSTREAM_H
diff --git a/src/pyinterp.h b/src/pyinterp.h
index 51d6c8ec..53a38e37 100644
--- a/src/pyinterp.h
+++ b/src/pyinterp.h
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _PYINTERP_H
-#define _PYINTERP_H
+#ifndef INCLUDED_PYINTERP_H
+#define INCLUDED_PYINTERP_H
 
 #include "session.h"
 
@@ -147,4 +147,4 @@ extern shared_ptr<python_interpreter_t> python_session;
 
 #endif // HAVE_BOOST_PYTHON
 
-#endif // _PYINTERP_H
+#endif // INCLUDED_PYINTERP_H
diff --git a/src/pyutils.h b/src/pyutils.h
index 323ffe02..ec925ba3 100644
--- a/src/pyutils.h
+++ b/src/pyutils.h
@@ -29,8 +29,8 @@
  * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#ifndef _PY_UTILS_H
-#define _PY_UTILS_H
+#ifndef INCLUDED_PYUTILS_H
+#define INCLUDED_PYUTILS_H
 
 template <typename T, typename TfromPy>
 struct object_from_python
@@ -188,4 +188,4 @@ namespace boost { namespace python {
 
 //boost::python::register_ptr_to_python< boost::shared_ptr<Base> >();
 
-#endif // _PY_UTILS_H
+#endif // INCLUDED_PYUTILS_H
diff --git a/src/query.h b/src/query.h
index 3297cbd6..fc324af8 100644
--- a/src/query.h
+++ b/src/query.h
@@ -39,8 +39,8 @@
  *
  * @ingroup expr
  */
-#ifndef _QUERY_H
-#define _QUERY_H
+#ifndef INCLUDED_QUERY_H
+#define INCLUDED_QUERY_H
 
 #include "predicate.h"
 
@@ -349,4 +349,4 @@ public:
 
 } // namespace ledger
 
-#endif // _QUERY_H
+#endif // INCLUDED_QUERY_H
diff --git a/src/quotes.h b/src/quotes.h
index f1b347de..fc662bef 100644
--- a/src/quotes.h
+++ b/src/quotes.h
@@ -39,8 +39,8 @@
  *
  * @ingroup extra
  */
-#ifndef _QUOTES_H
-#define _QUOTES_H
+#ifndef INCLUDED_QUOTES_H
+#define INCLUDED_QUOTES_H
 
 namespace ledger {
 
@@ -50,4 +50,4 @@ commodity_quote_from_script(commodity_t& commodity,
 
 } // namespace ledger
 
-#endif // _QUOTES_H
+#endif // INCLUDED_QUOTES_H
diff --git a/src/report.h b/src/report.h
index 95d87e1e..eea0f8c8 100644
--- a/src/report.h
+++ b/src/report.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _REPORT_H
-#define _REPORT_H
+#ifndef INCLUDED_REPORT_H
+#define INCLUDED_REPORT_H
 
 #include "expr.h"
 #include "query.h"
@@ -1111,4 +1111,4 @@ public:
 
 } // namespace ledger
 
-#endif // _REPORT_H
+#endif // INCLUDED_REPORT_H
diff --git a/src/scope.h b/src/scope.h
index 8ec1a44f..d9a0b238 100644
--- a/src/scope.h
+++ b/src/scope.h
@@ -39,8 +39,8 @@
  *
  * @ingroup expr
  */
-#ifndef _SCOPE_H
-#define _SCOPE_H
+#ifndef INCLUDED_SCOPE_H
+#define INCLUDED_SCOPE_H
 
 #include "op.h"
 
@@ -617,4 +617,4 @@ public:
 
 } // namespace ledger
 
-#endif // _SCOPE_H
+#endif // INCLUDED_SCOPE_H
diff --git a/src/select.h b/src/select.h
index ea2e3708..2e5b806a 100644
--- a/src/select.h
+++ b/src/select.h
@@ -39,8 +39,8 @@
  *
  * @ingroup select
  */
-#ifndef _SELECT_H
-#define _SELECT_H
+#ifndef INCLUDED_SELECT_H
+#define INCLUDED_SELECT_H
 
 #include "utils.h"
 #include "value.h"
@@ -52,4 +52,4 @@ value_t select_command(call_scope_t& args);
 
 } // namespace ledger
 
-#endif // _SELECT_H
+#endif // INCLUDED_SELECT_H
diff --git a/src/session.h b/src/session.h
index 4dce3816..533f0fc1 100644
--- a/src/session.h
+++ b/src/session.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _SESSION_H
-#define _SESSION_H
+#ifndef INCLUDED_SESSION_H
+#define INCLUDED_SESSION_H
 
 #include "account.h"
 #include "journal.h"
@@ -192,4 +192,4 @@ void set_session_context(session_t * session);
 
 } // namespace ledger
 
-#endif // _SESSION_H
+#endif // INCLUDED_SESSION_H
diff --git a/src/stats.h b/src/stats.h
index c8d7ee4c..7b2bb347 100644
--- a/src/stats.h
+++ b/src/stats.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _STATS_H
-#define _STATS_H
+#ifndef INCLUDED_STATS_H
+#define INCLUDED_STATS_H
 
 #include "value.h"
 
@@ -52,4 +52,4 @@ value_t report_statistics(call_scope_t& scope);
 
 } // namespace ledger
 
-#endif // _STATS_H
+#endif // INCLUDED_STATS_H
diff --git a/src/stream.h b/src/stream.h
index dd171284..69c5cd45 100644
--- a/src/stream.h
+++ b/src/stream.h
@@ -45,8 +45,8 @@
  * child process, different cleanup is needed for each scenario.  This
  * file abstracts those various needs.
  */
-#ifndef _STREAM_H
-#define _STREAM_H
+#ifndef INCLUDED_STREAM_H
+#define INCLUDED_STREAM_H
 
 #include "utils.h"
 
@@ -139,4 +139,4 @@ public:
 
 } // namespace ledger
 
-#endif // _STREAM_H
+#endif // INCLUDED_STREAM_H
diff --git a/src/strptime.h b/src/strptime.h
index f5482201..8c4d9de3 100644
--- a/src/strptime.h
+++ b/src/strptime.h
@@ -1,6 +1,6 @@
-#ifndef STRPTIME_H
-#define STRPTIME_H
+#ifndef INCLUDED_STRPTIME_H
+#define INCLUDED_STRPTIME_H
 
 char* strptime(const char *buf, const char *fmt, struct tm *tm);
 
-#endif
\ No newline at end of file
+#endif // INCLUDED_STRPTIME_H
diff --git a/src/system.hh.in b/src/system.hh.in
index 0cfcf9ed..ab4de8b9 100644
--- a/src/system.hh.in
+++ b/src/system.hh.in
@@ -42,8 +42,8 @@
  * configure is re-run) are expected to change.
  */
 
-#ifndef _SYSTEM_HH
-#define _SYSTEM_HH
+#ifndef INCLUDED_SYSTEM_HH
+#define INCLUDED_SYSTEM_HH
 
 //#warning("Loading system.hh.  This should occur only once!")
 
@@ -228,4 +228,4 @@ inline object make_setter(D const& x)
 
 #endif // HAVE_BOOST_PYTHON
 
-#endif // _SYSTEM_HH
+#endif // INCLUDED_SYSTEM_HH
diff --git a/src/temps.h b/src/temps.h
index a28966fe..3a5b1987 100644
--- a/src/temps.h
+++ b/src/temps.h
@@ -39,8 +39,8 @@
  *
  * @ingroup report
  */
-#ifndef _TEMPS_H
-#define _TEMPS_H
+#ifndef INCLUDED_TEMPS_H
+#define INCLUDED_TEMPS_H
 
 namespace ledger {
 
@@ -82,4 +82,4 @@ public:
 
 } // namespace ledger
 
-#endif // _TEMPS_H
+#endif // INCLUDED_TEMPS_H
diff --git a/src/timelog.h b/src/timelog.h
index 4e7d2bb4..cf07b2af 100644
--- a/src/timelog.h
+++ b/src/timelog.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _TIMELOG_H
-#define _TIMELOG_H
+#ifndef INCLUDED_TIMELOG_H
+#define INCLUDED_TIMELOG_H
 
 #include "utils.h"
 #include "times.h"
@@ -108,4 +108,4 @@ public:
 
 } // namespace ledger
 
-#endif // _TIMELOG_H
+#endif // INCLUDED_TIMELOG_H
diff --git a/src/times.h b/src/times.h
index 71ad6e3e..02cb10c1 100644
--- a/src/times.h
+++ b/src/times.h
@@ -41,8 +41,8 @@
  *
  * @brief datetime_t and date_t objects
  */
-#ifndef _TIMES_H
-#define _TIMES_H
+#ifndef INCLUDED_TIMES_H
+#define INCLUDED_TIMES_H
 
 #include "utils.h"
 
@@ -533,4 +533,4 @@ std::ostream& operator<<(std::ostream& out, const date_duration_t& duration);
 
 } // namespace ledger
 
-#endif // _TIMES_H
+#endif // INCLUDED_TIMES_H
diff --git a/src/token.h b/src/token.h
index db592475..f27c0f68 100644
--- a/src/token.h
+++ b/src/token.h
@@ -39,8 +39,8 @@
  *
  * @ingroup expr
  */
-#ifndef _TOKEN_H
-#define _TOKEN_H
+#ifndef INCLUDED_TOKEN_H
+#define INCLUDED_TOKEN_H
 
 #include "expr.h"
 
@@ -135,4 +135,4 @@ std::ostream& operator<<(std::ostream& out, const expr_t::token_t& token);
 
 } // namespace ledger
 
-#endif // _TOKEN_H
+#endif // INCLUDED_TOKEN_H
diff --git a/src/unistring.h b/src/unistring.h
index 87b2f904..0e018191 100644
--- a/src/unistring.h
+++ b/src/unistring.h
@@ -39,8 +39,8 @@
  *
  * @ingroup utils
  */
-#ifndef _UNISTRING_H
-#define _UNISTRING_H
+#ifndef INCLUDED_UNISTRING_H
+#define INCLUDED_UNISTRING_H
 
 namespace ledger {
 
@@ -204,4 +204,4 @@ inline void justify(std::ostream&      out,
 
 } // namespace ledger
 
-#endif // _UNISTRING_H
+#endif // INCLUDED_UNISTRING_H
diff --git a/src/utils.h b/src/utils.h
index 9af1251a..3da5b2d4 100644
--- a/src/utils.h
+++ b/src/utils.h
@@ -41,8 +41,8 @@
  *
  * @brief General utility facilities used by Ledger
  */
-#ifndef _UTILS_H
-#define _UTILS_H
+#ifndef INCLUDED_UTILS_H
+#define INCLUDED_UTILS_H
 
 #if (BOOST_VERSION >= 106600)
 #include <boost/uuid/detail/sha1.hpp>
@@ -638,4 +638,4 @@ extern const string version;
 
 /*@}*/
 
-#endif // _UTILS_H
+#endif // INCLUDED_UTILS_H
diff --git a/src/value.h b/src/value.h
index e44f9354..cd05c874 100644
--- a/src/value.h
+++ b/src/value.h
@@ -46,8 +46,8 @@
  * the number 10 to a value object, it's internal type will be
  * INTEGER.
  */
-#ifndef _VALUE_H
-#define _VALUE_H
+#ifndef INCLUDED_VALUE_H
+#define INCLUDED_VALUE_H
 
 #include "balance.h"            // includes amount.h
 #include "mask.h"
@@ -998,4 +998,4 @@ void put_value(property_tree::ptree& pt, const value_t& value);
 
 } // namespace ledger
 
-#endif // _VALUE_H
+#endif // INCLUDED_VALUE_H
diff --git a/src/views.h b/src/views.h
index 61929dcf..3146362a 100644
--- a/src/views.h
+++ b/src/views.h
@@ -39,8 +39,8 @@
  *
  * @ingroup views
  */
-#ifndef _VIEWS_H
-#define _VIEWS_H
+#ifndef INCLUDED_VIEWS_H
+#define INCLUDED_VIEWS_H
 
 #include "utils.h"
 
@@ -454,4 +454,4 @@ void populate_journal(r_journal_ptr journal, report_t& report,
 
 #endif /* DOCUMENT_MODEL */
 
-#endif // _VIEWS_H
+#endif // INCLUDED_VIEWS_H
diff --git a/src/xact.h b/src/xact.h
index 26e263fc..1f814815 100644
--- a/src/xact.h
+++ b/src/xact.h
@@ -39,8 +39,8 @@
  *
  * @ingroup data
  */
-#ifndef _XACT_H
-#define _XACT_H
+#ifndef INCLUDED_XACT_H
+#define INCLUDED_XACT_H
 
 #include "item.h"
 #include "predicate.h"
@@ -236,4 +236,4 @@ void put_xact(property_tree::ptree& pt, const xact_t& xact);
 
 } // namespace ledger
 
-#endif // _XACT_H
+#endif // INCLUDED_XACT_H