Add hxx extension for headers

author: Karen Arutyunov <karen@codesynthesis.com> 2017-05-01 18:24:31 +0300
committer: Karen Arutyunov <karen@codesynthesis.com> 2017-05-01 19:30:26 +0300
commit: 70317569c6dcd9809ed4a8c425777e653ec6ca08 (patch)
tree: 07a538b296933e9e2a1f81088f8fcc8da3f749ad
parent: cbec9ea8841c8a58b2d50bb628b28aea7a6fe179 (diff)
download: build2-70317569c6dcd9809ed4a8c425777e653ec6ca08.tar.gz
build2-70317569c6dcd9809ed4a8c425777e653ec6ca08.tar.xz
build2-70317569c6dcd9809ed4a8c425777e653ec6ca08.zip
196 files changed, 1276 insertions, 1282 deletions
diff --git a/README-GIT b/README-GIT
index 3748aba6..0383ddd7 100644
--- a/README-GIT
+++ b/README-GIT
@@ -10,7 +10,7 @@ Alternatively, if you have already cloned without --recursive, run:
 
 git submodule update --init
 
-The checked out build2/version-impl will be overwritten during the build
-process but these changes should be ignored. To do this automatically, run:
+The checked out build2/version.hxx will be overwritten during the build process
+but these changes should be ignored. To do this automatically, run:
 
-git update-index --assume-unchanged build2/version-impl
+git update-index --assume-unchanged build2/version.hxx
diff --git a/build/root.build b/build/root.build
index a7b0df32..85f69a14 100644
--- a/build/root.build
+++ b/build/root.build
@@ -6,7 +6,7 @@ cxx.std = latest
 
 using cxx
 
-hxx{*}: extension =
+hxx{*}: extension = hxx
 ixx{*}: extension = ixx
 txx{*}: extension = txx
 cxx{*}: extension = cxx
diff --git a/build2/.gitignore b/build2/.gitignore
index a82a3383..eda023f6 100644
--- a/build2/.gitignore
+++ b/build2/.gitignore
@@ -2,4 +2,4 @@ b
 b-boot
 #*-options
 #*-options.?xx
-version-impl
+version.hxx
diff --git a/build2/algorithm.cxx b/build2/algorithm.cxx
index c6ff1b5f..8203b081 100644
--- a/build2/algorithm.cxx
+++ b/build2/algorithm.cxx
@@ -2,17 +2,17 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/algorithm>
-
-#include <build2/scope>
-#include <build2/target>
-#include <build2/rule>
-#include <build2/file> // import()
-#include <build2/search>
-#include <build2/context>
-#include <build2/filesystem>
-#include <build2/diagnostics>
-#include <build2/prerequisite>
+#include <build2/algorithm.hxx>
+
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/rule.hxx>
+#include <build2/file.hxx> // import()
+#include <build2/search.hxx>
+#include <build2/context.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
+#include <build2/prerequisite.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/algorithm b/build2/algorithm.hxx
index 601d2efa..36e5a92b 100644
--- a/build2/algorithm
+++ b/build2/algorithm.hxx
@@ -1,15 +1,15 @@
-// file      : build2/algorithm -*- C++ -*-
+// file      : build2/algorithm.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_ALGORITHM
-#define BUILD2_ALGORITHM
+#ifndef BUILD2_ALGORITHM_HXX
+#define BUILD2_ALGORITHM_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target>
-#include <build2/operation>
+#include <build2/target.hxx>
+#include <build2/operation.hxx>
 
 namespace build2
 {
@@ -434,4 +434,4 @@ namespace build2
 
 #include <build2/algorithm.ixx>
 
-#endif // BUILD2_ALGORITHM
+#endif // BUILD2_ALGORITHM_HXX
diff --git a/build2/algorithm.ixx b/build2/algorithm.ixx
index 46dece4a..0e721f59 100644
--- a/build2/algorithm.ixx
+++ b/build2/algorithm.ixx
@@ -2,8 +2,8 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/rule>
-#include <build2/context>
+#include <build2/rule.hxx>
+#include <build2/context.hxx>
 
 namespace build2
 {
diff --git a/build2/b-options.cxx b/build2/b-options.cxx
index d31868c5..50871f0a 100644
--- a/build2/b-options.cxx
+++ b/build2/b-options.cxx
@@ -6,11 +6,11 @@
 
 // Begin prologue.
 //
-#include <build2/types-parsers>
+#include <build2/types-parsers.hxx>
 //
 // End prologue.
 
-#include <build2/b-options>
+#include <build2/b-options.hxx>
 
 #include <map>
 #include <set>
diff --git a/build2/b-options b/build2/b-options.hxx
index e674798d..a280a79a 100644
--- a/build2/b-options
+++ b/build2/b-options.hxx
@@ -4,8 +4,8 @@
 // compiler for C++.
 //
 
-#ifndef BUILD2_B_OPTIONS
-#define BUILD2_B_OPTIONS
+#ifndef BUILD2_B_OPTIONS_HXX
+#define BUILD2_B_OPTIONS_HXX
 
 // Begin prologue.
 //
@@ -347,7 +347,7 @@ namespace build2
   }
 }
 
-#include <build2/types>
+#include <build2/types.hxx>
 
 namespace build2
 {
@@ -537,4 +537,4 @@ namespace build2
 //
 // End epilogue.
 
-#endif // BUILD2_B_OPTIONS
+#endif // BUILD2_B_OPTIONS_HXX
diff --git a/build2/b.cli b/build2/b.cli
index 3d988a86..a6e1abc2 100644
--- a/build2/b.cli
+++ b/build2/b.cli
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-include <build2/types>;
+include <build2/types.hxx>;
 
 "\section=1"
 "\name=b"
diff --git a/build2/b.cxx b/build2/b.cxx
index cafc18fd..dbd002bc 100644
--- a/build2/b.cxx
+++ b/build2/b.cxx
@@ -13,43 +13,43 @@
 #include <typeinfo>
 #include <iostream>    // cout
 
-#include <butl/pager>
+#include <libbutl/pager.hxx>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/spec>
-#include <build2/operation>
-#include <build2/scope>
-#include <build2/target>
-#include <build2/prerequisite>
-#include <build2/rule>
-#include <build2/file>
-#include <build2/module>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
-#include <build2/context>
-#include <build2/variable>
+#include <build2/spec.hxx>
+#include <build2/operation.hxx>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/prerequisite.hxx>
+#include <build2/rule.hxx>
+#include <build2/file.hxx>
+#include <build2/module.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
+#include <build2/context.hxx>
+#include <build2/variable.hxx>
 
-#include <build2/parser>
+#include <build2/parser.hxx>
 
-#include <build2/b-options>
+#include <build2/b-options.hxx>
 
 using namespace butl;
 using namespace std;
 
-#include <build2/config/init>
-#include <build2/dist/init>
-#include <build2/bin/init>
-#include <build2/c/init>
-#include <build2/cc/init>
-#include <build2/cxx/init>
-#include <build2/cli/init>
-#include <build2/test/init>
-#include <build2/install/init>
-#include <build2/pkgconfig/init>
-#include <build2/version/init>
+#include <build2/config/init.hxx>
+#include <build2/dist/init.hxx>
+#include <build2/bin/init.hxx>
+#include <build2/c/init.hxx>
+#include <build2/cc/init.hxx>
+#include <build2/cxx/init.hxx>
+#include <build2/cli/init.hxx>
+#include <build2/test/init.hxx>
+#include <build2/install/init.hxx>
+#include <build2/pkgconfig/init.hxx>
+#include <build2/version/init.hxx>
 
 namespace build2
 {
diff --git a/build2/bin/guess.cxx b/build2/bin/guess.cxx
index 90012d44..780ccf8c 100644
--- a/build2/bin/guess.cxx
+++ b/build2/bin/guess.cxx
@@ -2,9 +2,9 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/bin/guess>
+#include <build2/bin/guess.hxx>
 
-#include <build2/diagnostics>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/build2/bin/guess b/build2/bin/guess.hxx
index 659fcd02..803f299b 100644
--- a/build2/bin/guess
+++ b/build2/bin/guess.hxx
@@ -1,12 +1,12 @@
-// file      : build2/bin/guess -*- C++ -*-
+// file      : build2/bin/guess.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_BIN_GUESS
-#define BUILD2_BIN_GUESS
+#ifndef BUILD2_BIN_GUESS_HXX
+#define BUILD2_BIN_GUESS_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
 namespace build2
 {
@@ -104,4 +104,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_BIN_GUESS
+#endif // BUILD2_BIN_GUESS_HXX
diff --git a/build2/bin/init.cxx b/build2/bin/init.cxx
index 9d08b629..71c77b2e 100644
--- a/build2/bin/init.cxx
+++ b/build2/bin/init.cxx
@@ -2,20 +2,20 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/bin/init>
+#include <build2/bin/init.hxx>
 
 #include <map>
 
-#include <build2/scope>
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/config/utility>
-#include <build2/install/utility>
+#include <build2/config/utility.hxx>
+#include <build2/install/utility.hxx>
 
-#include <build2/bin/rule>
-#include <build2/bin/guess>
-#include <build2/bin/target>
+#include <build2/bin/rule.hxx>
+#include <build2/bin/guess.hxx>
+#include <build2/bin/target.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/bin/init b/build2/bin/init.hxx
index 430d7894..b629f945 100644
--- a/build2/bin/init
+++ b/build2/bin/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/bin/init -*- C++ -*-
+// file      : build2/bin/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_BIN_INIT
-#define BUILD2_BIN_INIT
+#ifndef BUILD2_BIN_INIT_HXX
+#define BUILD2_BIN_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -97,4 +97,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_BIN_INIT
+#endif // BUILD2_BIN_INIT_HXX
diff --git a/build2/bin/rule.cxx b/build2/bin/rule.cxx
index fd1526ea..3aa3c811 100644
--- a/build2/bin/rule.cxx
+++ b/build2/bin/rule.cxx
@@ -2,14 +2,14 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/bin/rule>
+#include <build2/bin/rule.hxx>
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/algorithm>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
 using namespace std;
 
diff --git a/build2/bin/rule b/build2/bin/rule.hxx
index 95747c24..7109473f 100644
--- a/build2/bin/rule
+++ b/build2/bin/rule.hxx
@@ -1,14 +1,14 @@
-// file      : build2/bin/rule -*- C++ -*-
+// file      : build2/bin/rule.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_BIN_RULE
-#define BUILD2_BIN_RULE
+#ifndef BUILD2_BIN_RULE_HXX
+#define BUILD2_BIN_RULE_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/rule>
+#include <build2/rule.hxx>
 
 namespace build2
 {
@@ -43,4 +43,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_BIN_RULE
+#endif // BUILD2_BIN_RULE_HXX
diff --git a/build2/bin/target.cxx b/build2/bin/target.cxx
index dc691d6b..962befa6 100644
--- a/build2/bin/target.cxx
+++ b/build2/bin/target.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
 using namespace std;
 
diff --git a/build2/bin/target b/build2/bin/target.hxx
index 35bde60f..d920cc1b 100644
--- a/build2/bin/target
+++ b/build2/bin/target.hxx
@@ -1,14 +1,14 @@
-// file      : build2/bin/target -*- C++ -*-
+// file      : build2/bin/target.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_BIN_TARGET
-#define BUILD2_BIN_TARGET
+#ifndef BUILD2_BIN_TARGET_HXX
+#define BUILD2_BIN_TARGET_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target>
+#include <build2/target.hxx>
 
 namespace build2
 {
@@ -117,4 +117,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_BIN_TARGET
+#endif // BUILD2_BIN_TARGET_HXX
diff --git a/build2/buildfile b/build2/buildfile
index 8f8d51cc..2d650010 100644
--- a/build2/buildfile
+++ b/build2/buildfile
@@ -41,7 +41,7 @@ exe{b}:                                                   \
             {hxx         cxx}{ types-parsers            } \
             {hxx ixx txx cxx}{ utility                  } \
             {hxx ixx txx cxx}{ variable                 } \
-            {hxx            }{ version-impl             } \
+            {hxx            }{ version                  } \
         bin/{hxx         cxx}{ guess                    } \
         bin/{hxx         cxx}{ init                     } \
         bin/{hxx         cxx}{ rule                     } \
@@ -107,8 +107,8 @@ exe{b}: {hxx ixx txx cxx}{** -b-options -dummy} \
         liba{b} $libs
 #\
 
-hxx{version-impl}: in{version-impl} $src_root/file{manifest}
-hxx{version-impl}: dist = true
+hxx{version}: in{version} $src_root/file{manifest}
+hxx{version}: dist = true
 
 # Fake utility library (without it code generation does not work).
 #
@@ -130,8 +130,8 @@ if $cli.configured
   cli.cxx{b-options}: cli{b}
 
   cli.options += -I $src_root --include-with-brackets --include-prefix build2 \
---guard-prefix BUILD2 --cxx-prologue "#include <build2/types-parsers>" \
---cli-namespace build2::cl --generate-file-scanner --generate-parse \
+--guard-prefix BUILD2 --cxx-prologue "#include <build2/types-parsers.hxx>"    \
+--cli-namespace build2::cl --generate-file-scanner --generate-parse           \
 --generate-specifier
 
   # Usage options.
diff --git a/build2/c/init.cxx b/build2/c/init.cxx
index c5b8ac8e..da57223e 100644
--- a/build2/c/init.cxx
+++ b/build2/c/init.cxx
@@ -2,16 +2,16 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/c/init>
+#include <build2/c/init.hxx>
 
-#include <build2/scope>
-#include <build2/context>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/cc/guess>
-#include <build2/cc/module>
+#include <build2/cc/guess.hxx>
+#include <build2/cc/module.hxx>
 
-#include <build2/c/target>
+#include <build2/c/target.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/c/init b/build2/c/init.hxx
index 3219cd37..e18a5df4 100644
--- a/build2/c/init
+++ b/build2/c/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/c/init -*- C++ -*-
+// file      : build2/c/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_C_INIT
-#define BUILD2_C_INIT
+#ifndef BUILD2_C_INIT_HXX
+#define BUILD2_C_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -34,4 +34,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_C_INIT
+#endif // BUILD2_C_INIT_HXX
diff --git a/build2/c/target b/build2/c/target
deleted file mode 100644
index 5d7566b1..00000000
--- a/build2/c/target
+++ /dev/null
@@ -1,22 +0,0 @@
-// file      : build2/c/target -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BUILD2_C_TARGET
-#define BUILD2_C_TARGET
-
-#include <build2/types>
-#include <build2/utility>
-
-#include <build2/cc/target>
-
-namespace build2
-{
-  namespace c
-  {
-    using cc::h;
-    using cc::c;
-  }
-}
-
-#endif // BUILD2_C_TARGET
diff --git a/build2/c/target.hxx b/build2/c/target.hxx
new file mode 100644
index 00000000..d92405d0
--- /dev/null
+++ b/build2/c/target.hxx
@@ -0,0 +1,22 @@
+// file      : build2/c/target.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BUILD2_C_TARGET_HXX
+#define BUILD2_C_TARGET_HXX
+
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
+
+#include <build2/cc/target.hxx>
+
+namespace build2
+{
+  namespace c
+  {
+    using cc::h;
+    using cc::c;
+  }
+}
+
+#endif // BUILD2_C_TARGET_HXX
diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx
index 88eb45d0..59feb9b0 100644
--- a/build2/cc/common.cxx
+++ b/build2/cc/common.cxx
@@ -2,17 +2,17 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cc/common>
+#include <build2/cc/common.hxx>
 
-#include <build2/file>        // import()
-#include <build2/scope>
-#include <build2/context>
-#include <build2/variable>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/file.hxx>        // import()
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
+#include <build2/variable.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/cc/utility>
+#include <build2/cc/utility.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cc/common b/build2/cc/common.hxx
index 5a459b85..0c8ff2bc 100644
--- a/build2/cc/common
+++ b/build2/cc/common.hxx
@@ -1,18 +1,18 @@
-// file      : build2/cc/common -*- C++ -*-
+// file      : build2/cc/common.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CC_COMMON
-#define BUILD2_CC_COMMON
+#ifndef BUILD2_CC_COMMON_HXX
+#define BUILD2_CC_COMMON_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/variable>
+#include <build2/variable.hxx>
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
-#include <build2/cc/types>
+#include <build2/cc/types.hxx>
 
 namespace build2
 {
@@ -286,4 +286,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CC_COMMON
+#endif // BUILD2_CC_COMMON_HXX
diff --git a/build2/cc/compile.cxx b/build2/cc/compile.cxx
index 7e37c44f..b8b362d3 100644
--- a/build2/cc/compile.cxx
+++ b/build2/cc/compile.cxx
@@ -2,22 +2,22 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cc/compile>
+#include <build2/cc/compile.hxx>
 
 #include <cstdlib>  // exit()
 #include <iostream> // cerr
 
-#include <build2/depdb>
-#include <build2/scope>
-#include <build2/context>
-#include <build2/variable>
-#include <build2/algorithm>
-#include <build2/diagnostics>
+#include <build2/depdb.hxx>
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
+#include <build2/variable.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
-#include <build2/cc/target>  // h
-#include <build2/cc/utility>
+#include <build2/cc/target.hxx>  // h
+#include <build2/cc/utility.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cc/compile b/build2/cc/compile.hxx
index 2986b7dc..bee13f24 100644
--- a/build2/cc/compile
+++ b/build2/cc/compile.hxx
@@ -1,19 +1,19 @@
-// file      : build2/cc/compile -*- C++ -*-
+// file      : build2/cc/compile.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CC_COMPILE
-#define BUILD2_CC_COMPILE
+#ifndef BUILD2_CC_COMPILE_HXX
+#define BUILD2_CC_COMPILE_HXX
 
-#include <butl/path-map>
+#include <libbutl/path-map.hxx>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/rule>
+#include <build2/rule.hxx>
 
-#include <build2/cc/types>
-#include <build2/cc/common>
+#include <build2/cc/types.hxx>
+#include <build2/cc/common.hxx>
 
 namespace build2
 {
@@ -91,4 +91,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CC_COMPILE
+#endif // BUILD2_CC_COMPILE_HXX
diff --git a/build2/cc/gcc.cxx b/build2/cc/gcc.cxx
index c16191af..b5dd2362 100644
--- a/build2/cc/gcc.cxx
+++ b/build2/cc/gcc.cxx
@@ -2,18 +2,18 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/variable>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/variable.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
-#include <build2/cc/types>
+#include <build2/cc/types.hxx>
 
-#include <build2/cc/module>
+#include <build2/cc/module.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cc/guess.cxx b/build2/cc/guess.cxx
index 8b45420d..0569bdc5 100644
--- a/build2/cc/guess.cxx
+++ b/build2/cc/guess.cxx
@@ -2,11 +2,11 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cc/guess>
+#include <build2/cc/guess.hxx>
 
 #include <cstring>  // strlen(), strchr()
 
-#include <build2/diagnostics>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 
@@ -946,8 +946,9 @@ namespace build2
 
       // Now we need to map x86, x64, and ARM to the target triplets. The
       // problem is, there aren't any established ones so we got to invent
-      // them ourselves. Based on the discussion in <butl/target-triplet>,
-      // we need something in the CPU-VENDOR-OS-ABI form.
+      // them ourselves. Based on the discussion in
+      // <libbutl/target-triplet.hxx>, we need something in the
+      // CPU-VENDOR-OS-ABI form.
       //
       // The CPU part is fairly straightforward with x86 mapped to 'i386' (or
       // maybe 'i686'), x64 to 'x86_64', and ARM to 'arm' (it could also
diff --git a/build2/cc/guess b/build2/cc/guess.hxx
index 593bd851..dbd06e32 100644
--- a/build2/cc/guess
+++ b/build2/cc/guess.hxx
@@ -1,14 +1,14 @@
-// file      : build2/cc/guess -*- C++ -*-
+// file      : build2/cc/guess.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CC_GUESS
-#define BUILD2_CC_GUESS
+#ifndef BUILD2_CC_GUESS_HXX
+#define BUILD2_CC_GUESS_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/cc/types>
+#include <build2/cc/types.hxx>
 
 namespace build2
 {
@@ -138,4 +138,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CC_GUESS
+#endif // BUILD2_CC_GUESS_HXX
diff --git a/build2/cc/init.cxx b/build2/cc/init.cxx
index bc598c33..8d205730 100644
--- a/build2/cc/init.cxx
+++ b/build2/cc/init.cxx
@@ -2,15 +2,15 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cc/init>
+#include <build2/cc/init.hxx>
 
-#include <build2/scope>
-#include <build2/context>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/config/utility>
+#include <build2/config/utility.hxx>
 
-#include <build2/cc/target>
+#include <build2/cc/target.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cc/init b/build2/cc/init.hxx
index c9695059..9eab4245 100644
--- a/build2/cc/init
+++ b/build2/cc/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/cc/init -*- C++ -*-
+// file      : build2/cc/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CC_INIT
-#define BUILD2_CC_INIT
+#ifndef BUILD2_CC_INIT_HXX
+#define BUILD2_CC_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -61,4 +61,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CC_INIT
+#endif // BUILD2_CC_INIT_HXX
diff --git a/build2/cc/install.cxx b/build2/cc/install.cxx
index e1e57198..e09a62f4 100644
--- a/build2/cc/install.cxx
+++ b/build2/cc/install.cxx
@@ -2,14 +2,14 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cc/install>
+#include <build2/cc/install.hxx>
 
-#include <build2/algorithm>
+#include <build2/algorithm.hxx>
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
-#include <build2/cc/link>    // match()
-#include <build2/cc/utility>
+#include <build2/cc/link.hxx>    // match()
+#include <build2/cc/utility.hxx>
 
 using namespace std;
 
diff --git a/build2/cc/install b/build2/cc/install.hxx
index e229e94f..b7d92fb0 100644
--- a/build2/cc/install
+++ b/build2/cc/install.hxx
@@ -1,17 +1,17 @@
-// file      : build2/cc/install -*- C++ -*-
+// file      : build2/cc/install.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CC_INSTALL
-#define BUILD2_CC_INSTALL
+#ifndef BUILD2_CC_INSTALL_HXX
+#define BUILD2_CC_INSTALL_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/install/rule>
+#include <build2/install/rule.hxx>
 
-#include <build2/cc/types>
-#include <build2/cc/common>
+#include <build2/cc/types.hxx>
+#include <build2/cc/common.hxx>
 
 namespace build2
 {
@@ -45,4 +45,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CC_INSTALL
+#endif // BUILD2_CC_INSTALL_HXX
diff --git a/build2/cc/link.cxx b/build2/cc/link.cxx
index 80281f7d..1b2f3063 100644
--- a/build2/cc/link.cxx
+++ b/build2/cc/link.cxx
@@ -2,27 +2,27 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cc/link>
+#include <build2/cc/link.hxx>
 
 #include <map>
 #include <cstdlib>  // exit()
 #include <iostream> // cerr
 
-#include <butl/path-map>
-#include <butl/filesystem> // file_exists()
+#include <libbutl/path-map.hxx>
+#include <libbutl/filesystem.hxx> // file_exists()
 
-#include <build2/depdb>
-#include <build2/scope>
-#include <build2/context>
-#include <build2/variable>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/depdb.hxx>
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
+#include <build2/variable.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
-#include <build2/cc/target>  // c
-#include <build2/cc/utility>
+#include <build2/cc/target.hxx>  // c
+#include <build2/cc/utility.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cc/link b/build2/cc/link.hxx
index 0dace7c1..4dc722aa 100644
--- a/build2/cc/link
+++ b/build2/cc/link.hxx
@@ -1,19 +1,19 @@
-// file      : build2/cc/link -*- C++ -*-
+// file      : build2/cc/link.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CC_LINK
-#define BUILD2_CC_LINK
+#ifndef BUILD2_CC_LINK_HXX
+#define BUILD2_CC_LINK_HXX
 
 #include <set>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/rule>
+#include <build2/rule.hxx>
 
-#include <build2/cc/types>
-#include <build2/cc/common>
+#include <build2/cc/types.hxx>
+#include <build2/cc/common.hxx>
 
 namespace build2
 {
@@ -127,4 +127,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CC_LINK
+#endif // BUILD2_CC_LINK_HXX
diff --git a/build2/cc/module.cxx b/build2/cc/module.cxx
index 7df71bac..6d8c7990 100644
--- a/build2/cc/module.cxx
+++ b/build2/cc/module.cxx
@@ -2,20 +2,20 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cc/module>
+#include <build2/cc/module.hxx>
 
 #include <iomanip> // left, setw()
 
-#include <build2/scope>
-#include <build2/context>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
-#include <build2/config/utility>
-#include <build2/install/utility>
+#include <build2/config/utility.hxx>
+#include <build2/install/utility.hxx>
 
-#include <build2/cc/guess>
+#include <build2/cc/guess.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cc/module b/build2/cc/module.hxx
index 3c5ec615..643cf895 100644
--- a/build2/cc/module
+++ b/build2/cc/module.hxx
@@ -1,21 +1,21 @@
-// file      : build2/cc/module -*- C++ -*-
+// file      : build2/cc/module.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CC_MODULE
-#define BUILD2_CC_MODULE
+#ifndef BUILD2_CC_MODULE_HXX
+#define BUILD2_CC_MODULE_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
-#include <build2/variable>
+#include <build2/module.hxx>
+#include <build2/variable.hxx>
 
-#include <build2/cc/common>
+#include <build2/cc/common.hxx>
 
-#include <build2/cc/compile>
-#include <build2/cc/link>
-#include <build2/cc/install>
+#include <build2/cc/compile.hxx>
+#include <build2/cc/link.hxx>
+#include <build2/cc/install.hxx>
 
 namespace build2
 {
@@ -65,4 +65,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CC_MODULE
+#endif // BUILD2_CC_MODULE_HXX
diff --git a/build2/cc/msvc.cxx b/build2/cc/msvc.cxx
index aa9389f4..e3765cda 100644
--- a/build2/cc/msvc.cxx
+++ b/build2/cc/msvc.cxx
@@ -4,19 +4,19 @@
 
 #include <iostream> // cerr
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/variable>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/variable.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
-#include <build2/cc/types>
+#include <build2/cc/types.hxx>
 
-#include <build2/cc/common>
-#include <build2/cc/module>
+#include <build2/cc/common.hxx>
+#include <build2/cc/module.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx
index 00ab5418..1b67f5fa 100644
--- a/build2/cc/pkgconfig.cxx
+++ b/build2/cc/pkgconfig.cxx
@@ -2,19 +2,19 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/variable>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/variable.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
-#include <build2/cc/types>
-#include <build2/cc/utility>
+#include <build2/cc/types.hxx>
+#include <build2/cc/utility.hxx>
 
-#include <build2/cc/common>
+#include <build2/cc/common.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cc/target.cxx b/build2/cc/target.cxx
index a7349530..5fbf67df 100644
--- a/build2/cc/target.cxx
+++ b/build2/cc/target.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cc/target>
+#include <build2/cc/target.hxx>
 
 using namespace std;
 
diff --git a/build2/cc/target b/build2/cc/target.hxx
index 69926090..4c9e4cbb 100644
--- a/build2/cc/target
+++ b/build2/cc/target.hxx
@@ -1,14 +1,14 @@
-// file      : build2/cc/target -*- C++ -*-
+// file      : build2/cc/target.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CC_TARGET
-#define BUILD2_CC_TARGET
+#ifndef BUILD2_CC_TARGET_HXX
+#define BUILD2_CC_TARGET_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target>
+#include <build2/target.hxx>
 
 namespace build2
 {
@@ -60,4 +60,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CC_TARGET
+#endif // BUILD2_CC_TARGET_HXX
diff --git a/build2/cc/types b/build2/cc/types.hxx
index 68d99496..59ea67fb 100644
--- a/build2/cc/types
+++ b/build2/cc/types.hxx
@@ -1,12 +1,12 @@
-// file      : build2/cc/types -*- C++ -*-
+// file      : build2/cc/types.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CC_TYPES
-#define BUILD2_CC_TYPES
+#ifndef BUILD2_CC_TYPES_HXX
+#define BUILD2_CC_TYPES_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
 namespace build2
 {
@@ -32,4 +32,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CC_TYPES
+#endif // BUILD2_CC_TYPES_HXX
diff --git a/build2/cc/utility.cxx b/build2/cc/utility.cxx
index 4a931af6..7a03b545 100644
--- a/build2/cc/utility.cxx
+++ b/build2/cc/utility.cxx
@@ -2,12 +2,12 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cc/utility>
+#include <build2/cc/utility.hxx>
 
-#include <build2/variable>
-#include <build2/algorithm> // search()
+#include <build2/variable.hxx>
+#include <build2/algorithm.hxx> // search()
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
 using namespace std;
 
diff --git a/build2/cc/utility b/build2/cc/utility.hxx
index ee3cb814..e0529aff 100644
--- a/build2/cc/utility
+++ b/build2/cc/utility.hxx
@@ -1,17 +1,17 @@
-// file      : build2/cc/utility -*- C++ -*-
+// file      : build2/cc/utility.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CC_UTILITY
-#define BUILD2_CC_UTILITY
+#ifndef BUILD2_CC_UTILITY_HXX
+#define BUILD2_CC_UTILITY_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target>
-#include <build2/bin/target>
+#include <build2/target.hxx>
+#include <build2/bin/target.hxx>
 
-#include <build2/cc/types>
+#include <build2/cc/types.hxx>
 
 namespace build2
 {
@@ -48,4 +48,4 @@ namespace build2
 
 #include <build2/cc/utility.ixx>
 
-#endif // BUILD2_CC_UTILITY
+#endif // BUILD2_CC_UTILITY_HXX
diff --git a/build2/cc/windows-manifest.cxx b/build2/cc/windows-manifest.cxx
index 3a62fcc7..d840f671 100644
--- a/build2/cc/windows-manifest.cxx
+++ b/build2/cc/windows-manifest.cxx
@@ -2,14 +2,14 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/variable>
-#include <build2/filesystem>
-#include <build2/diagnostics>
-
-#include <build2/cc/link>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/variable.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
+
+#include <build2/cc/link.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cc/windows-rpath.cxx b/build2/cc/windows-rpath.cxx
index 0b349633..0078944f 100644
--- a/build2/cc/windows-rpath.cxx
+++ b/build2/cc/windows-rpath.cxx
@@ -4,15 +4,15 @@
 
 #include <errno.h> // E*
 
-#include <build2/scope>
-#include <build2/context>
-#include <build2/variable>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
+#include <build2/variable.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/bin/target>
+#include <build2/bin/target.hxx>
 
-#include <build2/cc/link>
+#include <build2/cc/link.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cli/init.cxx b/build2/cli/init.cxx
index 3e4ba03b..d257efa5 100644
--- a/build2/cli/init.cxx
+++ b/build2/cli/init.cxx
@@ -2,19 +2,19 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cli/init>
+#include <build2/cli/init.hxx>
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/cxx/target>
+#include <build2/cxx/target.hxx>
 
-#include <build2/config/utility>
+#include <build2/config/utility.hxx>
 
-#include <build2/cli/target>
-#include <build2/cli/rule>
+#include <build2/cli/target.hxx>
+#include <build2/cli/rule.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cli/init b/build2/cli/init.hxx
index 149a436c..3edb24e6 100644
--- a/build2/cli/init
+++ b/build2/cli/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/cli/init -*- C++ -*-
+// file      : build2/cli/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CLI_INIT
-#define BUILD2_CLI_INIT
+#ifndef BUILD2_CLI_INIT_HXX
+#define BUILD2_CLI_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -34,4 +34,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CLI_INIT
+#endif // BUILD2_CLI_INIT_HXX
diff --git a/build2/cli/rule.cxx b/build2/cli/rule.cxx
index 2eb98c7c..9e925b3a 100644
--- a/build2/cli/rule.cxx
+++ b/build2/cli/rule.cxx
@@ -2,16 +2,16 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cli/rule>
+#include <build2/cli/rule.hxx>
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/cli/target>
+#include <build2/cli/target.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cli/rule b/build2/cli/rule.hxx
index d783c20c..6798a6bf 100644
--- a/build2/cli/rule
+++ b/build2/cli/rule.hxx
@@ -1,14 +1,14 @@
-// file      : build2/cli/rule -*- C++ -*-
+// file      : build2/cli/rule.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CLI_RULE
-#define BUILD2_CLI_RULE
+#ifndef BUILD2_CLI_RULE_HXX
+#define BUILD2_CLI_RULE_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/rule>
+#include <build2/rule.hxx>
 
 namespace build2
 {
@@ -36,4 +36,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CLI_RULE
+#endif // BUILD2_CLI_RULE_HXX
diff --git a/build2/cli/target.cxx b/build2/cli/target.cxx
index 2199f79e..0b858105 100644
--- a/build2/cli/target.cxx
+++ b/build2/cli/target.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cli/target>
+#include <build2/cli/target.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cli/target b/build2/cli/target.hxx
index 5e51bb42..1247172e 100644
--- a/build2/cli/target
+++ b/build2/cli/target.hxx
@@ -1,16 +1,16 @@
-// file      : build2/cli/target -*- C++ -*-
+// file      : build2/cli/target.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CLI_TARGET
-#define BUILD2_CLI_TARGET
+#ifndef BUILD2_CLI_TARGET_HXX
+#define BUILD2_CLI_TARGET_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target>
+#include <build2/target.hxx>
 
-#include <build2/cxx/target>
+#include <build2/cxx/target.hxx>
 
 namespace build2
 {
@@ -52,4 +52,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CLI_TARGET
+#endif // BUILD2_CLI_TARGET_HXX
diff --git a/build2/config/init.cxx b/build2/config/init.cxx
index 65aa7bb5..889285dd 100644
--- a/build2/config/init.cxx
+++ b/build2/config/init.cxx
@@ -2,18 +2,18 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/config/init>
-
-#include <build2/file>
-#include <build2/rule>
-#include <build2/scope>
-#include <build2/context>
-#include <build2/filesystem>  // exists()
-#include <build2/diagnostics>
-
-#include <build2/config/module>
-#include <build2/config/utility>
-#include <build2/config/operation>
+#include <build2/config/init.hxx>
+
+#include <build2/file.hxx>
+#include <build2/rule.hxx>
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
+#include <build2/filesystem.hxx>  // exists()
+#include <build2/diagnostics.hxx>
+
+#include <build2/config/module.hxx>
+#include <build2/config/utility.hxx>
+#include <build2/config/operation.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/config/init b/build2/config/init.hxx
index 7100ab2c..45c288ba 100644
--- a/build2/config/init
+++ b/build2/config/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/config/init -*- C++ -*-
+// file      : build2/config/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CONFIG_INIT
-#define BUILD2_CONFIG_INIT
+#ifndef BUILD2_CONFIG_INIT_HXX
+#define BUILD2_CONFIG_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -28,4 +28,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CONFIG_INIT
+#endif // BUILD2_CONFIG_INIT_HXX
diff --git a/build2/config/module.cxx b/build2/config/module.cxx
index 6d54e466..19b5125f 100644
--- a/build2/config/module.cxx
+++ b/build2/config/module.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/config/module>
+#include <build2/config/module.hxx>
 
 using namespace std;
 
diff --git a/build2/config/module b/build2/config/module.hxx
index 3b58aa0d..d9978021 100644
--- a/build2/config/module
+++ b/build2/config/module.hxx
@@ -1,20 +1,20 @@
-// file      : build2/config/module -*- C++ -*-
+// file      : build2/config/module.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CONFIG_MODULE
-#define BUILD2_CONFIG_MODULE
+#ifndef BUILD2_CONFIG_MODULE_HXX
+#define BUILD2_CONFIG_MODULE_HXX
 
 #include <map>
 #include <algorithm> // find_if()
 
-#include <butl/prefix-map>
+#include <libbutl/prefix-map.hxx>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
-#include <build2/variable>
+#include <build2/module.hxx>
+#include <build2/variable.hxx>
 
 namespace build2
 {
@@ -91,4 +91,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CONFIG_MODULE
+#endif // BUILD2_CONFIG_MODULE_HXX
diff --git a/build2/config/operation.cxx b/build2/config/operation.cxx
index cf532926..bffc45b8 100644
--- a/build2/config/operation.cxx
+++ b/build2/config/operation.cxx
@@ -2,21 +2,21 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/config/operation>
+#include <build2/config/operation.hxx>
 
 #include <set>
 
-#include <build2/file>
-#include <build2/spec>
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
-
-#include <build2/config/module>
-#include <build2/config/utility>
+#include <build2/file.hxx>
+#include <build2/spec.hxx>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
+
+#include <build2/config/module.hxx>
+#include <build2/config/utility.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/config/operation b/build2/config/operation.hxx
index 425869c3..bf9403ff 100644
--- a/build2/config/operation
+++ b/build2/config/operation.hxx
@@ -1,14 +1,14 @@
-// file      : build2/config/operation -*- C++ -*-
+// file      : build2/config/operation.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CONFIG_OPERATION
-#define BUILD2_CONFIG_OPERATION
+#ifndef BUILD2_CONFIG_OPERATION_HXX
+#define BUILD2_CONFIG_OPERATION_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/operation>
+#include <build2/operation.hxx>
 
 namespace build2
 {
@@ -26,4 +26,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CONFIG_OPERATION
+#endif // BUILD2_CONFIG_OPERATION_HXX
diff --git a/build2/config/utility.cxx b/build2/config/utility.cxx
index ea66e924..c195e0b8 100644
--- a/build2/config/utility.cxx
+++ b/build2/config/utility.cxx
@@ -2,11 +2,11 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/config/utility>
+#include <build2/config/utility.hxx>
 
-#include <build2/context>
+#include <build2/context.hxx>
 
-#include <build2/config/module>
+#include <build2/config/module.hxx>
 
 using namespace std;
 
diff --git a/build2/config/utility b/build2/config/utility.hxx
index 041277a4..33a39858 100644
--- a/build2/config/utility
+++ b/build2/config/utility.hxx
@@ -1,15 +1,15 @@
-// file      : build2/config/utility -*- C++ -*-
+// file      : build2/config/utility.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CONFIG_UTILITY
-#define BUILD2_CONFIG_UTILITY
+#ifndef BUILD2_CONFIG_UTILITY_HXX
+#define BUILD2_CONFIG_UTILITY_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
 namespace build2
 {
@@ -149,4 +149,4 @@ namespace build2
 
 #include <build2/config/utility.txx>
 
-#endif // BUILD2_CONFIG_UTILITY
+#endif // BUILD2_CONFIG_UTILITY_HXX
diff --git a/build2/config/utility.txx b/build2/config/utility.txx
index 14344060..fc217106 100644
--- a/build2/config/utility.txx
+++ b/build2/config/utility.txx
@@ -2,8 +2,8 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/scope>
-#include <build2/context>
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
 
 namespace build2
 {
diff --git a/build2/context.cxx b/build2/context.cxx
index 56db9d44..669fcaef 100644
--- a/build2/context.cxx
+++ b/build2/context.cxx
@@ -2,22 +2,22 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/context>
+#include <build2/context.hxx>
 
 #include <sstream>
 
-#include <build2/rule>
-#include <build2/scope>
-#include <build2/target>
-#include <build2/diagnostics>
+#include <build2/rule.hxx>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/diagnostics.hxx>
 
 // For command line variable parsing.
 //
-#include <build2/token>
-#include <build2/lexer>
-#include <build2/parser>
+#include <build2/token.hxx>
+#include <build2/lexer.hxx>
+#include <build2/parser.hxx>
 
-#include <build2/config/operation> // config::preprocess_create().
+#include <build2/config/operation.hxx> // config::preprocess_create().
 
 using namespace std;
 using namespace butl;
@@ -220,7 +220,7 @@ namespace build2
     vp.clear ();
 
     // Reset meta/operation tables. Note that the order should match the id
-    // constants in <build2/operation>.
+    // constants in <build2/operation.hxx>.
     //
     meta_operation_table.clear ();
     meta_operation_table.insert ("noop");
@@ -240,7 +240,7 @@ namespace build2
     operation_table.insert ("uninstall");
 
     // Create global scope. Note that the empty path is a prefix for any other
-    // path. See the comment in <butl/prefix-map> for details.
+    // path. See the comment in <libbutl/prefix-map.hxx> for details.
     //
     auto make_global_scope = [&sm] () -> scope&
     {
diff --git a/build2/context b/build2/context.hxx
index bc73d5b5..ff8b5b36 100644
--- a/build2/context
+++ b/build2/context.hxx
@@ -1,17 +1,17 @@
-// file      : build2/context -*- C++ -*-
+// file      : build2/context.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CONTEXT
-#define BUILD2_CONTEXT
+#ifndef BUILD2_CONTEXT_HXX
+#define BUILD2_CONTEXT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/scope>
-#include <build2/variable>
-#include <build2/operation>
-#include <build2/scheduler>
+#include <build2/scope.hxx>
+#include <build2/variable.hxx>
+#include <build2/operation.hxx>
+#include <build2/scheduler.hxx>
 
 namespace build2
 {
@@ -396,4 +396,4 @@ namespace build2
 
 #include <build2/context.ixx>
 
-#endif // BUILD2_CONTEXT
+#endif // BUILD2_CONTEXT_HXX
diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx
index f76779b0..c74a077d 100644
--- a/build2/cxx/init.cxx
+++ b/build2/cxx/init.cxx
@@ -2,16 +2,16 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cxx/init>
+#include <build2/cxx/init.hxx>
 
-#include <build2/scope>
-#include <build2/context>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/cc/guess>
-#include <build2/cc/module>
+#include <build2/cc/guess.hxx>
+#include <build2/cc/module.hxx>
 
-#include <build2/cxx/target>
+#include <build2/cxx/target.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/cxx/init b/build2/cxx/init.hxx
index 78798b9e..5ba40412 100644
--- a/build2/cxx/init
+++ b/build2/cxx/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/cxx/init -*- C++ -*-
+// file      : build2/cxx/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CXX_INIT
-#define BUILD2_CXX_INIT
+#ifndef BUILD2_CXX_INIT_HXX
+#define BUILD2_CXX_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -34,4 +34,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CXX_INIT
+#endif // BUILD2_CXX_INIT_HXX
diff --git a/build2/cxx/target.cxx b/build2/cxx/target.cxx
index 8955cb20..7fb99716 100644
--- a/build2/cxx/target.cxx
+++ b/build2/cxx/target.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/cxx/target>
+#include <build2/cxx/target.hxx>
 
 using namespace std;
 
diff --git a/build2/cxx/target b/build2/cxx/target.hxx
index 6a630608..4dd93e33 100644
--- a/build2/cxx/target
+++ b/build2/cxx/target.hxx
@@ -1,15 +1,15 @@
-// file      : build2/cxx/target -*- C++ -*-
+// file      : build2/cxx/target.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_CXX_TARGET
-#define BUILD2_CXX_TARGET
+#ifndef BUILD2_CXX_TARGET_HXX
+#define BUILD2_CXX_TARGET_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target>
-#include <build2/cc/target>
+#include <build2/target.hxx>
+#include <build2/cc/target.hxx>
 
 namespace build2
 {
@@ -60,4 +60,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_CXX_TARGET
+#endif // BUILD2_CXX_TARGET_HXX
diff --git a/build2/depdb.cxx b/build2/depdb.cxx
index 60425d57..5aa29700 100644
--- a/build2/depdb.cxx
+++ b/build2/depdb.cxx
@@ -2,9 +2,9 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/depdb>
+#include <build2/depdb.hxx>
 
-#include <butl/filesystem> // file_mtime()
+#include <libbutl/filesystem.hxx> // file_mtime()
 
 using namespace std;
 using namespace butl;
diff --git a/build2/depdb b/build2/depdb.hxx
index abd2e20a..9dffa286 100644
--- a/build2/depdb
+++ b/build2/depdb.hxx
@@ -1,15 +1,15 @@
-// file      : build2/depdb -*- C++ -*-
+// file      : build2/depdb.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_DEPDB
-#define BUILD2_DEPDB
+#ifndef BUILD2_DEPDB_HXX
+#define BUILD2_DEPDB_HXX
 
 #include <fstream>
 #include <cstring> // strlen()
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
 namespace build2
 {
@@ -198,4 +198,4 @@ namespace build2
   };
 }
 
-#endif // BUILD2_DEPDB
+#endif // BUILD2_DEPDB_HXX
diff --git a/build2/diagnostics.cxx b/build2/diagnostics.cxx
index 0c4e63ff..25339f71 100644
--- a/build2/diagnostics.cxx
+++ b/build2/diagnostics.cxx
@@ -2,11 +2,11 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/diagnostics>
+#include <build2/diagnostics.hxx>
 
 #include <cstring>  // strchr()
 
-#include <butl/process-io>
+#include <libbutl/process-io.hxx>
 
 using namespace std;
 
diff --git a/build2/diagnostics b/build2/diagnostics.hxx
index 2c2b4bbf..692115b5 100644
--- a/build2/diagnostics
+++ b/build2/diagnostics.hxx
@@ -1,14 +1,14 @@
-// file      : build2/diagnostics -*- C++ -*-
+// file      : build2/diagnostics.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_DIAGNOSTICS
-#define BUILD2_DIAGNOSTICS
+#ifndef BUILD2_DIAGNOSTICS_HXX
+#define BUILD2_DIAGNOSTICS_HXX
 
-#include <butl/diagnostics>
+#include <libbutl/diagnostics.hxx>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
 namespace build2
 {
@@ -348,4 +348,4 @@ namespace build2
   extern const fail_end  endf;
 }
 
-#endif // BUILD2_DIAGNOSTICS
+#endif // BUILD2_DIAGNOSTICS_HXX
diff --git a/build2/dist/init.cxx b/build2/dist/init.cxx
index 41927cd9..d002868e 100644
--- a/build2/dist/init.cxx
+++ b/build2/dist/init.cxx
@@ -2,17 +2,17 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/dist/init>
+#include <build2/dist/init.hxx>
 
-#include <build2/scope>
-#include <build2/file>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/file.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/config/utility>
+#include <build2/config/utility.hxx>
 
-#include <build2/dist/rule>
-#include <build2/dist/module>
-#include <build2/dist/operation>
+#include <build2/dist/rule.hxx>
+#include <build2/dist/module.hxx>
+#include <build2/dist/operation.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/dist/init b/build2/dist/init.hxx
index 67ec0a4c..45d47dfb 100644
--- a/build2/dist/init
+++ b/build2/dist/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/dist/init -*- C++ -*-
+// file      : build2/dist/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_DIST_INIT
-#define BUILD2_DIST_INIT
+#ifndef BUILD2_DIST_INIT_HXX
+#define BUILD2_DIST_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -28,4 +28,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_DIST_INIT
+#endif // BUILD2_DIST_INIT_HXX
diff --git a/build2/dist/module.cxx b/build2/dist/module.cxx
index 05ca1cb6..4f14ddbe 100644
--- a/build2/dist/module.cxx
+++ b/build2/dist/module.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/dist/module>
+#include <build2/dist/module.hxx>
 
 using namespace std;
 
diff --git a/build2/dist/module b/build2/dist/module.hxx
index 55104239..e6eb9757 100644
--- a/build2/dist/module
+++ b/build2/dist/module.hxx
@@ -1,15 +1,15 @@
-// file      : build2/dist/module -*- C++ -*-
+// file      : build2/dist/module.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_DIST_MODULE
-#define BUILD2_DIST_MODULE
+#ifndef BUILD2_DIST_MODULE_HXX
+#define BUILD2_DIST_MODULE_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
-#include <build2/variable>
+#include <build2/module.hxx>
+#include <build2/variable.hxx>
 
 namespace build2
 {
@@ -62,4 +62,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_DIST_MODULE
+#endif // BUILD2_DIST_MODULE_HXX
diff --git a/build2/dist/operation b/build2/dist/operation
deleted file mode 100644
index 845130f3..00000000
--- a/build2/dist/operation
+++ /dev/null
@@ -1,21 +0,0 @@
-// file      : build2/dist/operation -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BUILD2_DIST_OPERATION
-#define BUILD2_DIST_OPERATION
-
-#include <build2/types>
-#include <build2/utility>
-
-#include <build2/operation>
-
-namespace build2
-{
-  namespace dist
-  {
-    extern const meta_operation_info dist;
-  }
-}
-
-#endif // BUILD2_DIST_OPERATION
diff --git a/build2/dist/operation.cxx b/build2/dist/operation.cxx
index 859225d8..d4ca3c6a 100644
--- a/build2/dist/operation.cxx
+++ b/build2/dist/operation.cxx
@@ -2,20 +2,20 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/dist/operation>
+#include <build2/dist/operation.hxx>
 
-#include <butl/filesystem> // path_match()
+#include <libbutl/filesystem.hxx> // path_match()
 
-#include <build2/file>
-#include <build2/dump>
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/file.hxx>
+#include <build2/dump.hxx>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/dist/module>
+#include <build2/dist/module.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/dist/operation.hxx b/build2/dist/operation.hxx
new file mode 100644
index 00000000..c72e467d
--- /dev/null
+++ b/build2/dist/operation.hxx
@@ -0,0 +1,21 @@
+// file      : build2/dist/operation.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BUILD2_DIST_OPERATION_HXX
+#define BUILD2_DIST_OPERATION_HXX
+
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
+
+#include <build2/operation.hxx>
+
+namespace build2
+{
+  namespace dist
+  {
+    extern const meta_operation_info dist;
+  }
+}
+
+#endif // BUILD2_DIST_OPERATION_HXX
diff --git a/build2/dist/rule.cxx b/build2/dist/rule.cxx
index 338f7f97..ab00d41e 100644
--- a/build2/dist/rule.cxx
+++ b/build2/dist/rule.cxx
@@ -2,12 +2,12 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/dist/rule>
+#include <build2/dist/rule.hxx>
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/algorithm>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/build2/dist/rule b/build2/dist/rule.hxx
index 0a5cc3ad..05240297 100644
--- a/build2/dist/rule
+++ b/build2/dist/rule.hxx
@@ -1,16 +1,16 @@
-// file      : build2/dist/rule -*- C++ -*-
+// file      : build2/dist/rule.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_DIST_RULE
-#define BUILD2_DIST_RULE
+#ifndef BUILD2_DIST_RULE_HXX
+#define BUILD2_DIST_RULE_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/rule>
-#include <build2/target>
-#include <build2/operation>
+#include <build2/rule.hxx>
+#include <build2/target.hxx>
+#include <build2/operation.hxx>
 
 namespace build2
 {
@@ -37,4 +37,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_DIST_RULE
+#endif // BUILD2_DIST_RULE_HXX
diff --git a/build2/dump.cxx b/build2/dump.cxx
index 6d055ae2..ab2e73f2 100644
--- a/build2/dump.cxx
+++ b/build2/dump.cxx
@@ -2,13 +2,13 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/dump>
+#include <build2/dump.hxx>
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/variable>
-#include <build2/context>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/variable.hxx>
+#include <build2/context.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/build2/dump b/build2/dump.hxx
index a1d9b079..e4565409 100644
--- a/build2/dump
+++ b/build2/dump.hxx
@@ -1,14 +1,14 @@
-// file      : build2/dump -*- C++ -*-
+// file      : build2/dump.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_DUMP
-#define BUILD2_DUMP
+#ifndef BUILD2_DUMP_HXX
+#define BUILD2_DUMP_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/operation>
+#include <build2/operation.hxx>
 
 namespace build2
 {
@@ -18,4 +18,4 @@ namespace build2
   dump ();
 }
 
-#endif // BUILD2_DUMP
+#endif // BUILD2_DUMP_HXX
diff --git a/build2/file.cxx b/build2/file.cxx
index 3d7f1b82..ddcce825 100644
--- a/build2/file.cxx
+++ b/build2/file.cxx
@@ -2,22 +2,22 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/file>
+#include <build2/file.hxx>
 
 #include <iostream> // cin
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/filesystem>   // exists()
-#include <build2/prerequisite>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/filesystem.hxx>   // exists()
+#include <build2/prerequisite.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/token>
-#include <build2/lexer>
-#include <build2/parser>
+#include <build2/token.hxx>
+#include <build2/lexer.hxx>
+#include <build2/parser.hxx>
 
-#include <build2/config/utility>
+#include <build2/config/utility.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/file b/build2/file.hxx
index 2200c26c..7bfae14c 100644
--- a/build2/file
+++ b/build2/file.hxx
@@ -1,17 +1,17 @@
-// file      : build2/file -*- C++ -*-
+// file      : build2/file.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_FILE
-#define BUILD2_FILE
+#ifndef BUILD2_FILE_HXX
+#define BUILD2_FILE_HXX
 
 #include <map>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/scope>
-#include <build2/variable> // list_value
+#include <build2/scope.hxx>
+#include <build2/variable.hxx> // list_value
 
 namespace build2
 {
@@ -184,4 +184,4 @@ namespace build2
 
 #include <build2/file.ixx>
 
-#endif // BUILD2_FILE
+#endif // BUILD2_FILE_HXX
diff --git a/build2/filesystem.cxx b/build2/filesystem.cxx
index 86bdff89..9d9b3b67 100644
--- a/build2/filesystem.cxx
+++ b/build2/filesystem.cxx
@@ -2,9 +2,9 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/filesystem>
+#include <build2/filesystem.hxx>
 
-#include <build2/diagnostics>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/filesystem b/build2/filesystem.hxx
index bf0302e9..f211f359 100644
--- a/build2/filesystem
+++ b/build2/filesystem.hxx
@@ -1,22 +1,22 @@
-// file      : build2/filesystem -*- C++ -*-
+// file      : build2/filesystem.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_FILESYSTEM
-#define BUILD2_FILESYSTEM
+#ifndef BUILD2_FILESYSTEM_HXX
+#define BUILD2_FILESYSTEM_HXX
 
-#include <butl/filesystem>
+#include <libbutl/filesystem.hxx>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-// Higher-level filesystem utilities built on top of <butl/filesystem>.
+// Higher-level filesystem utilities built on top of <libbutl/filesystem.hxx>.
 //
 namespace build2
 {
   // The dual interface wrapper for the {mk,rm}{file,dir}() functions
   // below that allows you to use it as a true/false return or a more
-  // detailed enum from <butl/filesystem>
+  // detailed enum from <libbutl/filesystem.hxx>
   //
   template <typename T>
   struct fs_status
@@ -104,4 +104,4 @@ namespace build2
 
 #include <build2/filesystem.txx>
 
-#endif // BUILD2_FILESYSTEM
+#endif // BUILD2_FILESYSTEM_HXX
diff --git a/build2/filesystem.txx b/build2/filesystem.txx
index 708c75e2..83e36779 100644
--- a/build2/filesystem.txx
+++ b/build2/filesystem.txx
@@ -2,8 +2,8 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/context>     // work
-#include <build2/diagnostics>
+#include <build2/context.hxx>     // work
+#include <build2/diagnostics.hxx>
 
 namespace build2
 {
diff --git a/build2/function.cxx b/build2/function.cxx
index eeb332fe..9f2fb9cd 100644
--- a/build2/function.cxx
+++ b/build2/function.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/function>
+#include <build2/function.hxx>
 
 #include <cstring> // strchr()
 
diff --git a/build2/function b/build2/function.hxx
index ef5d6bf6..9abd4ef8 100644
--- a/build2/function
+++ b/build2/function.hxx
@@ -1,19 +1,19 @@
-// file      : build2/function -*- C++ -*-
+// file      : build2/function.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_FUNCTION
-#define BUILD2_FUNCTION
+#ifndef BUILD2_FUNCTION_HXX
+#define BUILD2_FUNCTION_HXX
 
 #include <utility>       // index_sequence
 #include <type_traits>   // aligned_storage
 #include <unordered_map>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
 namespace build2
 {
@@ -696,4 +696,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_FUNCTION
+#endif // BUILD2_FUNCTION_HXX
diff --git a/build2/functions-builtin.cxx b/build2/functions-builtin.cxx
index 17ea125b..81a190bc 100644
--- a/build2/functions-builtin.cxx
+++ b/build2/functions-builtin.cxx
@@ -2,8 +2,8 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/function>
-#include <build2/variable>
+#include <build2/function.hxx>
+#include <build2/variable.hxx>
 
 using namespace std;
 
diff --git a/build2/functions-path.cxx b/build2/functions-path.cxx
index 8b88ba07..6fff94df 100644
--- a/build2/functions-path.cxx
+++ b/build2/functions-path.cxx
@@ -2,8 +2,8 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/function>
-#include <build2/variable>
+#include <build2/function.hxx>
+#include <build2/variable.hxx>
 
 using namespace std;
 
diff --git a/build2/functions-process-path.cxx b/build2/functions-process-path.cxx
index 17b6da32..1b7459b4 100644
--- a/build2/functions-process-path.cxx
+++ b/build2/functions-process-path.cxx
@@ -2,8 +2,8 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/function>
-#include <build2/variable>
+#include <build2/function.hxx>
+#include <build2/variable.hxx>
 
 using namespace std;
 
diff --git a/build2/functions-string.cxx b/build2/functions-string.cxx
index 0f28526c..2faad06b 100644
--- a/build2/functions-string.cxx
+++ b/build2/functions-string.cxx
@@ -2,8 +2,8 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/function>
-#include <build2/variable>
+#include <build2/function.hxx>
+#include <build2/variable.hxx>
 
 using namespace std;
 
diff --git a/build2/functions-target-triplet.cxx b/build2/functions-target-triplet.cxx
index fb953311..0cb6846d 100644
--- a/build2/functions-target-triplet.cxx
+++ b/build2/functions-target-triplet.cxx
@@ -2,8 +2,8 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/function>
-#include <build2/variable>
+#include <build2/function.hxx>
+#include <build2/variable.hxx>
 
 using namespace std;
 
diff --git a/build2/install/init.cxx b/build2/install/init.cxx
index 0966d82c..6a5114d9 100644
--- a/build2/install/init.cxx
+++ b/build2/install/init.cxx
@@ -2,19 +2,19 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/install/init>
+#include <build2/install/init.hxx>
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/rule>
-#include <build2/operation>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/rule.hxx>
+#include <build2/operation.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/config/utility>
+#include <build2/config/utility.hxx>
 
-#include <build2/install/rule>
-#include <build2/install/utility>
-#include <build2/install/operation>
+#include <build2/install/rule.hxx>
+#include <build2/install/utility.hxx>
+#include <build2/install/operation.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/install/init b/build2/install/init.hxx
index 9a16111f..98b4205c 100644
--- a/build2/install/init
+++ b/build2/install/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/install/init -*- C++ -*-
+// file      : build2/install/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_INSTALL_INIT
-#define BUILD2_INSTALL_INIT
+#ifndef BUILD2_INSTALL_INIT_HXX
+#define BUILD2_INSTALL_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -28,4 +28,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_INSTALL_INIT
+#endif // BUILD2_INSTALL_INIT_HXX
diff --git a/build2/install/operation b/build2/install/operation
deleted file mode 100644
index 02d406e5..00000000
--- a/build2/install/operation
+++ /dev/null
@@ -1,22 +0,0 @@
-// file      : build2/install/operation -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BUILD2_INSTALL_OPERATION
-#define BUILD2_INSTALL_OPERATION
-
-#include <build2/types>
-#include <build2/utility>
-
-#include <build2/operation>
-
-namespace build2
-{
-  namespace install
-  {
-    extern const operation_info install;
-    extern const operation_info uninstall;
-  }
-}
-
-#endif // BUILD2_INSTALL_OPERATION
diff --git a/build2/install/operation.cxx b/build2/install/operation.cxx
index 44d257f3..5405c63b 100644
--- a/build2/install/operation.cxx
+++ b/build2/install/operation.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/install/operation>
+#include <build2/install/operation.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/install/operation.hxx b/build2/install/operation.hxx
new file mode 100644
index 00000000..15296212
--- /dev/null
+++ b/build2/install/operation.hxx
@@ -0,0 +1,22 @@
+// file      : build2/install/operation.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BUILD2_INSTALL_OPERATION_HXX
+#define BUILD2_INSTALL_OPERATION_HXX
+
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
+
+#include <build2/operation.hxx>
+
+namespace build2
+{
+  namespace install
+  {
+    extern const operation_info install;
+    extern const operation_info uninstall;
+  }
+}
+
+#endif // BUILD2_INSTALL_OPERATION_HXX
diff --git a/build2/install/rule.cxx b/build2/install/rule.cxx
index 9f668f9b..3a56480e 100644
--- a/build2/install/rule.cxx
+++ b/build2/install/rule.cxx
@@ -2,15 +2,15 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/install/rule>
+#include <build2/install/rule.hxx>
 
-#include <butl/filesystem> // dir_exists(), file_exists()
+#include <libbutl/filesystem.hxx> // dir_exists(), file_exists()
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/install/rule b/build2/install/rule.hxx
index c923db9a..76259c93 100644
--- a/build2/install/rule
+++ b/build2/install/rule.hxx
@@ -1,16 +1,16 @@
-// file      : build2/install/rule -*- C++ -*-
+// file      : build2/install/rule.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_INSTALL_RULE
-#define BUILD2_INSTALL_RULE
+#ifndef BUILD2_INSTALL_RULE_HXX
+#define BUILD2_INSTALL_RULE_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/rule>
-#include <build2/target>
-#include <build2/operation>
+#include <build2/rule.hxx>
+#include <build2/target.hxx>
+#include <build2/operation.hxx>
 
 namespace build2
 {
@@ -98,4 +98,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_INSTALL_RULE
+#endif // BUILD2_INSTALL_RULE_HXX
diff --git a/build2/install/utility b/build2/install/utility.hxx
index 239447e4..dfd19154 100644
--- a/build2/install/utility
+++ b/build2/install/utility.hxx
@@ -1,14 +1,14 @@
-// file      : build2/install/utility -*- C++ -*-
+// file      : build2/install/utility.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_INSTALL_UTILITY
-#define BUILD2_INSTALL_UTILITY
+#ifndef BUILD2_INSTALL_UTILITY_HXX
+#define BUILD2_INSTALL_UTILITY_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/scope>
+#include <build2/scope.hxx>
 
 namespace build2
 {
@@ -54,4 +54,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_INSTALL_UTILITY
+#endif // BUILD2_INSTALL_UTILITY_HXX
diff --git a/build2/lexer.cxx b/build2/lexer.cxx
index e117f283..09064d2c 100644
--- a/build2/lexer.cxx
+++ b/build2/lexer.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/lexer>
+#include <build2/lexer.hxx>
 
 #include <cstring> // strchr()
 
diff --git a/build2/lexer b/build2/lexer.hxx
index 76308e44..e91e7309 100644
--- a/build2/lexer
+++ b/build2/lexer.hxx
@@ -1,19 +1,19 @@
-// file      : build2/lexer -*- C++ -*-
+// file      : build2/lexer.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_LEXER
-#define BUILD2_LEXER
+#ifndef BUILD2_LEXER_HXX
+#define BUILD2_LEXER_HXX
 
 #include <stack>
 
-#include <butl/char-scanner>
+#include <libbutl/char-scanner.hxx>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/token>
-#include <build2/diagnostics>
+#include <build2/token.hxx>
+#include <build2/diagnostics.hxx>
 
 namespace build2
 {
@@ -192,4 +192,4 @@ namespace butl // ADL
   }
 }
 
-#endif // BUILD2_LEXER
+#endif // BUILD2_LEXER_HXX
diff --git a/build2/module.cxx b/build2/module.cxx
index 6fc33faa..f1e7dd34 100644
--- a/build2/module.cxx
+++ b/build2/module.cxx
@@ -2,11 +2,11 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/module>
+#include <build2/module.hxx>
 
-#include <build2/scope>
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/build2/module b/build2/module.hxx
index 7c4672f2..e3ab94ff 100644
--- a/build2/module
+++ b/build2/module.hxx
@@ -1,17 +1,17 @@
-// file      : build2/module -*- C++ -*-
+// file      : build2/module.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_MODULE
-#define BUILD2_MODULE
+#ifndef BUILD2_MODULE_HXX
+#define BUILD2_MODULE_HXX
 
 #include <map>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
 namespace build2
 {
@@ -111,4 +111,4 @@ namespace build2
   extern available_module_map builtin_modules;
 }
 
-#endif // BUILD2_MODULE
+#endif // BUILD2_MODULE_HXX
diff --git a/build2/name.cxx b/build2/name.cxx
index 0b3d00f7..27733af1 100644
--- a/build2/name.cxx
+++ b/build2/name.cxx
@@ -2,13 +2,13 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/types> // Note: not <build2/names>
+#include <build2/types.hxx> // Note: not <build2/names>
 
 #include <string.h> // strchr()
 
 #include <sstream>
 
-#include <build2/diagnostics>
+#include <build2/diagnostics.hxx>
 
 namespace build2
 {
diff --git a/build2/name b/build2/name.hxx
index ccceebe9..c341cc90 100644
--- a/build2/name
+++ b/build2/name.hxx
@@ -1,14 +1,14 @@
-// file      : build2/name -*- C++ -*-
+// file      : build2/name.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-// Note: include <build2/types> instead of this file directly.
+// Note: include <build2/types.hxx> instead of this file directly.
 //
 
-#ifndef BUILD2_NAME
-#define BUILD2_NAME
+#ifndef BUILD2_NAME_HXX
+#define BUILD2_NAME_HXX
 
-// We cannot include <build2/utility> since it includes <build2/types>.
+// We cannot include <build2/utility.hxx> since it includes <build2/types>.
 //
 #include <utility> // move()
 
@@ -155,4 +155,4 @@ namespace build2
 
 #include <build2/name.ixx>
 
-#endif // BUILD2_NAME
+#endif // BUILD2_NAME_HXX
diff --git a/build2/operation.cxx b/build2/operation.cxx
index 2099ec69..7dea25bd 100644
--- a/build2/operation.cxx
+++ b/build2/operation.cxx
@@ -2,14 +2,14 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/operation>
-
-#include <build2/file>
-#include <build2/dump>
-#include <build2/scope>
-#include <build2/target>
-#include <build2/algorithm>
-#include <build2/diagnostics>
+#include <build2/operation.hxx>
+
+#include <build2/file.hxx>
+#include <build2/dump.hxx>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/operation b/build2/operation.hxx
index 3558c0b1..08bcccfe 100644
--- a/build2/operation
+++ b/build2/operation.hxx
@@ -1,16 +1,16 @@
-// file      : build2/operation -*- C++ -*-
+// file      : build2/operation.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_OPERATION
-#define BUILD2_OPERATION
+#ifndef BUILD2_OPERATION_HXX
+#define BUILD2_OPERATION_HXX
 
-#include <butl/string-table>
+#include <libbutl/string-table.hxx>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/variable>
+#include <build2/variable.hxx>
 
 namespace build2
 {
@@ -432,4 +432,4 @@ namespace butl
   };
 }
 
-#endif // BUILD2_OPERATION
+#endif // BUILD2_OPERATION_HXX
diff --git a/build2/parser.cxx b/build2/parser.cxx
index 9dbce3b8..71e742cc 100644
--- a/build2/parser.cxx
+++ b/build2/parser.cxx
@@ -2,21 +2,21 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/parser>
+#include <build2/parser.hxx>
 
 #include <iostream> // cout
 
-#include <butl/filesystem> // path_search(), path_match()
-
-#include <build2/file>
-#include <build2/scope>
-#include <build2/module>
-#include <build2/target>
-#include <build2/context>
-#include <build2/function>
-#include <build2/variable>
-#include <build2/diagnostics>
-#include <build2/prerequisite>
+#include <libbutl/filesystem.hxx> // path_search(), path_match()
+
+#include <build2/file.hxx>
+#include <build2/scope.hxx>
+#include <build2/module.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/function.hxx>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
+#include <build2/prerequisite.hxx>
 
 using namespace std;
 
diff --git a/build2/parser b/build2/parser.hxx
index 16b77821..85da4e54 100644
--- a/build2/parser
+++ b/build2/parser.hxx
@@ -1,20 +1,20 @@
-// file      : build2/parser -*- C++ -*-
+// file      : build2/parser.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_PARSER
-#define BUILD2_PARSER
+#ifndef BUILD2_PARSER_HXX
+#define BUILD2_PARSER_HXX
 
 #include <stack>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/spec>
-#include <build2/lexer>
-#include <build2/token>
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/spec.hxx>
+#include <build2/lexer.hxx>
+#include <build2/token.hxx>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
 namespace build2
 {
@@ -590,4 +590,4 @@ namespace build2
   };
 }
 
-#endif // BUILD2_PARSER
+#endif // BUILD2_PARSER_HXX
diff --git a/build2/pkgconfig/init.cxx b/build2/pkgconfig/init.cxx
index 352e8450..fa224217 100644
--- a/build2/pkgconfig/init.cxx
+++ b/build2/pkgconfig/init.cxx
@@ -2,14 +2,14 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/pkgconfig/init>
+#include <build2/pkgconfig/init.hxx>
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/config/utility>
+#include <build2/config/utility.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/pkgconfig/init b/build2/pkgconfig/init.hxx
index 5dac923a..eed224fd 100644
--- a/build2/pkgconfig/init
+++ b/build2/pkgconfig/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/pkgconfig/init -*- C++ -*-
+// file      : build2/pkgconfig/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_PKGCONFIG_INIT
-#define BUILD2_PKGCONFIG_INIT
+#ifndef BUILD2_PKGCONFIG_INIT_HXX
+#define BUILD2_PKGCONFIG_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -34,4 +34,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_PKGCONFIG_INIT
+#endif // BUILD2_PKGCONFIG_INIT_HXX
diff --git a/build2/prerequisite.cxx b/build2/prerequisite.cxx
index b1f3cb20..7facbaa5 100644
--- a/build2/prerequisite.cxx
+++ b/build2/prerequisite.cxx
@@ -2,12 +2,12 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/prerequisite>
+#include <build2/prerequisite.hxx>
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/build2/prerequisite b/build2/prerequisite.hxx
index e3b78a25..77d96bf4 100644
--- a/build2/prerequisite
+++ b/build2/prerequisite.hxx
@@ -1,17 +1,17 @@
-// file      : build2/prerequisite -*- C++ -*-
+// file      : build2/prerequisite.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_PREREQUISITE
-#define BUILD2_PREREQUISITE
+#ifndef BUILD2_PREREQUISITE_HXX
+#define BUILD2_PREREQUISITE_HXX
 
 #include <unordered_set>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target-key>
-#include <build2/diagnostics>
+#include <build2/target-key.hxx>
+#include <build2/diagnostics.hxx>
 
 namespace build2
 {
@@ -163,4 +163,4 @@ namespace build2
   using prerequisites = vector<prerequisite>;
 }
 
-#endif // BUILD2_PREREQUISITE
+#endif // BUILD2_PREREQUISITE_HXX
diff --git a/build2/regex.cxx b/build2/regex.cxx
index 40347b5b..d96b8602 100644
--- a/build2/regex.cxx
+++ b/build2/regex.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/regex>
+#include <build2/regex.hxx>
 
 #if defined(_MSC_VER) && _MSC_VER <= 1910
 #  include <cstring> // strstr()
diff --git a/build2/regex b/build2/regex.hxx
index dc6dc967..1fa261ba 100644
--- a/build2/regex
+++ b/build2/regex.hxx
@@ -1,16 +1,16 @@
-// file      : build2/regex -*- C++ -*-
+// file      : build2/regex.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_REGEX
-#define BUILD2_REGEX
+#ifndef BUILD2_REGEX_HXX
+#define BUILD2_REGEX_HXX
 
 #include <regex>
 #include <iosfwd>
 #include <string> // basic_string
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
 namespace build2
 {
@@ -54,4 +54,4 @@ namespace std
 
 #include <build2/regex.txx>
 
-#endif // BUILD2_REGEX
+#endif // BUILD2_REGEX_HXX
diff --git a/build2/rule-map b/build2/rule-map.hxx
index 9fb4056d..4afe3d4e 100644
--- a/build2/rule-map
+++ b/build2/rule-map.hxx
@@ -1,18 +1,18 @@
-// file      : build2/rule-map -*- C++ -*-
+// file      : build2/rule-map.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_RULE_MAP
-#define BUILD2_RULE_MAP
+#ifndef BUILD2_RULE_MAP_HXX
+#define BUILD2_RULE_MAP_HXX
 
 #include <map>
 
-#include <butl/prefix-map>
+#include <libbutl/prefix-map.hxx>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/operation>
+#include <build2/operation.hxx>
 
 namespace build2
 {
@@ -118,4 +118,4 @@ namespace build2
   };
 }
 
-#endif // BUILD2_RULE_MAP
+#endif // BUILD2_RULE_MAP_HXX
diff --git a/build2/rule.cxx b/build2/rule.cxx
index 53f723b9..a462e589 100644
--- a/build2/rule.cxx
+++ b/build2/rule.cxx
@@ -2,14 +2,14 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/rule>
-
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/rule.hxx>
+
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/rule b/build2/rule.hxx
index d434d0d7..f6e23f63 100644
--- a/build2/rule
+++ b/build2/rule.hxx
@@ -1,15 +1,15 @@
-// file      : build2/rule -*- C++ -*-
+// file      : build2/rule.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_RULE
-#define BUILD2_RULE
+#ifndef BUILD2_RULE_HXX
+#define BUILD2_RULE_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target>
-#include <build2/operation>
+#include <build2/target.hxx>
+#include <build2/operation.hxx>
 
 namespace build2
 {
@@ -137,4 +137,4 @@ namespace build2
   };
 }
 
-#endif // BUILD2_RULE
+#endif // BUILD2_RULE_HXX
diff --git a/build2/scheduler.cxx b/build2/scheduler.cxx
index a453cb3a..fdf41216 100644
--- a/build2/scheduler.cxx
+++ b/build2/scheduler.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/scheduler>
+#include <build2/scheduler.hxx>
 
 #include <cerrno>
 
diff --git a/build2/scheduler b/build2/scheduler.hxx
index c6f4f7fe..ad14c56f 100644
--- a/build2/scheduler
+++ b/build2/scheduler.hxx
@@ -1,9 +1,9 @@
-// file      : build2/scheduler -*- C++ -*-
+// file      : build2/scheduler.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_SCHEDULER
-#define BUILD2_SCHEDULER
+#ifndef BUILD2_SCHEDULER_HXX
+#define BUILD2_SCHEDULER_HXX
 
 #include <list>
 #include <mutex>
@@ -12,8 +12,8 @@
 #include <type_traits>        // aligned_storage, etc
 #include <condition_variable>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
 namespace build2
 {
@@ -590,4 +590,4 @@ namespace build2
 
 #include <build2/scheduler.txx>
 
-#endif // BUILD2_SCHEDULER
+#endif // BUILD2_SCHEDULER_HXX
diff --git a/build2/scope.cxx b/build2/scope.cxx
index 59b2ee20..1cbb815c 100644
--- a/build2/scope.cxx
+++ b/build2/scope.cxx
@@ -2,10 +2,10 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/scope>
+#include <build2/scope.hxx>
 
-#include <build2/target>
-#include <build2/context>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
 
 using namespace std;
 
diff --git a/build2/scope b/build2/scope.hxx
index 1ce28fc6..2be2b3ab 100644
--- a/build2/scope
+++ b/build2/scope.hxx
@@ -1,24 +1,24 @@
-// file      : build2/scope -*- C++ -*-
+// file      : build2/scope.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_SCOPE
-#define BUILD2_SCOPE
+#ifndef BUILD2_SCOPE_HXX
+#define BUILD2_SCOPE_HXX
 
 #include <unordered_set>
 #include <unordered_map>
 
-#include <butl/path-map>
+#include <libbutl/path-map.hxx>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
-#include <build2/variable>
-#include <build2/target-key>
-#include <build2/target-type>
-#include <build2/rule-map>
-#include <build2/operation>
+#include <build2/module.hxx>
+#include <build2/variable.hxx>
+#include <build2/target-key.hxx>
+#include <build2/target-type.hxx>
+#include <build2/rule-map.hxx>
+#include <build2/operation.hxx>
 
 namespace build2
 {
@@ -268,7 +268,7 @@ namespace build2
     friend class scope_map;
     friend class temp_scope;
 
-    // These two from <build2/file> set strong_.
+    // These two from <build2/file.hxx> set strong_.
     //
     friend void create_bootstrap_outer (scope&);
     friend scope& create_bootstrap_inner (scope&, const dir_path&);
@@ -372,4 +372,4 @@ namespace build2
 
 #include <build2/scope.ixx>
 
-#endif // BUILD2_SCOPE
+#endif // BUILD2_SCOPE_HXX
diff --git a/build2/search.cxx b/build2/search.cxx
index f7864e90..6be62b20 100644
--- a/build2/search.cxx
+++ b/build2/search.cxx
@@ -2,15 +2,15 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/search>
+#include <build2/search.hxx>
 
-#include <butl/filesystem> // file_mtime()
+#include <libbutl/filesystem.hxx> // file_mtime()
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/prerequisite>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/prerequisite.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/search b/build2/search.hxx
index 92521bcb..043a2164 100644
--- a/build2/search
+++ b/build2/search.hxx
@@ -1,12 +1,12 @@
-// file      : build2/search -*- C++ -*-
+// file      : build2/search.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_SEARCH
-#define BUILD2_SEARCH
+#ifndef BUILD2_SEARCH_HXX
+#define BUILD2_SEARCH_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
 namespace build2
 {
@@ -33,4 +33,4 @@ namespace build2
   create_new_target (const prerequisite_key&);
 }
 
-#endif // BUILD2_SEARCH
+#endif // BUILD2_SEARCH_HXX
diff --git a/build2/spec.cxx b/build2/spec.cxx
index c6f386ca..da581c86 100644
--- a/build2/spec.cxx
+++ b/build2/spec.cxx
@@ -2,10 +2,10 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/spec>
+#include <build2/spec.hxx>
 
-#include <build2/context>
-#include <build2/diagnostics>
+#include <build2/context.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/build2/spec b/build2/spec.hxx
index 3ec4689e..2af74dbb 100644
--- a/build2/spec
+++ b/build2/spec.hxx
@@ -1,14 +1,14 @@
-// file      : build2/spec -*- C++ -*-
+// file      : build2/spec.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_SPEC
-#define BUILD2_SPEC
+#ifndef BUILD2_SPEC_HXX
+#define BUILD2_SPEC_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/variable>
+#include <build2/variable.hxx>
 
 namespace build2
 {
@@ -66,4 +66,4 @@ namespace build2
   operator<< (ostream&, const buildspec&);
 }
 
-#endif // BUILD2_SPEC
+#endif // BUILD2_SPEC_HXX
diff --git a/build2/target-key b/build2/target-key.hxx
index 084885f0..0c935809 100644
--- a/build2/target-key
+++ b/build2/target-key.hxx
@@ -1,18 +1,18 @@
-// file      : build2/target-key -*- C++ -*-
+// file      : build2/target-key.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TARGET_KEY
-#define BUILD2_TARGET_KEY
+#ifndef BUILD2_TARGET_KEY_HXX
+#define BUILD2_TARGET_KEY_HXX
 
 #include <map>
 
-#include <butl/utility> // compare_c_string
+#include <libbutl/utility.hxx> // compare_c_string
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target-type>
+#include <build2/target-type.hxx>
 
 namespace build2
 {
@@ -93,4 +93,4 @@ namespace std
   };
 }
 
-#endif // BUILD2_TARGET_KEY
+#endif // BUILD2_TARGET_KEY_HXX
diff --git a/build2/target-type b/build2/target-type.hxx
index aa2d7cb9..0b8ee54b 100644
--- a/build2/target-type
+++ b/build2/target-type.hxx
@@ -1,14 +1,14 @@
-// file      : build2/target-type -*- C++ -*-
+// file      : build2/target-type.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TARGET_TYPE
-#define BUILD2_TARGET_TYPE
+#ifndef BUILD2_TARGET_TYPE_HXX
+#define BUILD2_TARGET_TYPE_HXX
 
 #include <map>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
 namespace build2
 {
@@ -135,4 +135,4 @@ namespace build2
   };
 }
 
-#endif // BUILD2_TARGET_TYPE
+#endif // BUILD2_TARGET_TYPE_HXX
diff --git a/build2/target.cxx b/build2/target.cxx
index f7500f7e..1b6757c8 100644
--- a/build2/target.cxx
+++ b/build2/target.cxx
@@ -2,16 +2,16 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/target>
+#include <build2/target.hxx>
 
-#include <butl/filesystem> // file_mtime()
+#include <libbutl/filesystem.hxx> // file_mtime()
 
-#include <build2/file>
-#include <build2/scope>
-#include <build2/search>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/file.hxx>
+#include <build2/scope.hxx>
+#include <build2/search.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/target b/build2/target.hxx
index 4838dfbc..884b1858 100644
--- a/build2/target
+++ b/build2/target.hxx
@@ -1,25 +1,25 @@
-// file      : build2/target -*- C++ -*-
+// file      : build2/target.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TARGET
-#define BUILD2_TARGET
+#ifndef BUILD2_TARGET_HXX
+#define BUILD2_TARGET_HXX
 
 #include <iterator>     // tags, etc.
 #include <type_traits>  // aligned_storage
 #include <unordered_map>
 
-#include <butl/multi-index> // map_iterator_adapter
+#include <libbutl/multi-index.hxx> // map_iterator_adapter
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/scope>
-#include <build2/variable>
-#include <build2/operation>
-#include <build2/target-type>
-#include <build2/target-key>
-#include <build2/prerequisite>
+#include <build2/scope.hxx>
+#include <build2/variable.hxx>
+#include <build2/operation.hxx>
+#include <build2/target-type.hxx>
+#include <build2/target-key.hxx>
+#include <build2/prerequisite.hxx>
 
 namespace build2
 {
@@ -30,7 +30,7 @@ namespace build2
   extern size_t current_on; // From <build/context>.
 
   const target&
-  search (const target&, const prerequisite&); // From <build2/algorithm>.
+  search (const target&, const prerequisite&); // From <build2/algorithm.hxx>.
 
   // Target state.
   //
@@ -90,8 +90,8 @@ namespace build2
   // all the prerequisites in a loop, skipping ignored. Specifically,
   // for actions with the "first" execution mode, it calls
   // execute_prerequisites() while for those with the "last" mode --
-  // reverse_execute_prerequisites(); see <build2/operation>,
-  // <build2/algorithm> for details. The group recipe call's the group's
+  // reverse_execute_prerequisites(); see <build2/operation.hxx>,
+  // <build2/algorithm.hxx> for details. The group recipe call's the group's
   // recipe.
   //
   extern const recipe empty_recipe;
@@ -100,10 +100,10 @@ namespace build2
   extern const recipe group_recipe;
 
   target_state
-  noop_action (action, const target&); // Defined in <build2/algorithm>.
+  noop_action (action, const target&); // Defined in <build2/algorithm.hxx>.
 
   target_state
-  group_action (action, const target&); // Defined in <build2/algorithm>.
+  group_action (action, const target&); // Defined in <build2/algorithm.hxx>.
 
   // A view of target group members.
   //
@@ -249,7 +249,7 @@ namespace build2
     using action_type = build2::action;
 
     // You should not call this function directly; rather use
-    // resolve_group_members() from <build2/algorithm>.
+    // resolve_group_members() from <build2/algorithm.hxx>.
     //
     virtual group_view
     group_members (action_type) const;
@@ -1716,4 +1716,4 @@ namespace build2
 #include <build2/target.ixx>
 #include <build2/target.txx>
 
-#endif // BUILD2_TARGET
+#endif // BUILD2_TARGET_HXX
diff --git a/build2/target.ixx b/build2/target.ixx
index eb7dbaa1..6a754d67 100644
--- a/build2/target.ixx
+++ b/build2/target.ixx
@@ -197,7 +197,7 @@ namespace build2
   // prerequisite_members
   //
   group_view
-  resolve_group_members (action, const target&); // <build2/algorithm>
+  resolve_group_members (action, const target&); // <build2/algorithm.hxx>
 
   template <typename T>
   inline auto prerequisite_members_range<T>::iterator::
diff --git a/build2/target.txx b/build2/target.txx
index 5abdfc57..d2afd597 100644
--- a/build2/target.txx
+++ b/build2/target.txx
@@ -2,11 +2,11 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <butl/filesystem> // dir_iterator
+#include <libbutl/filesystem.hxx> // dir_iterator
 
-#include <build2/scope>
-#include <build2/diagnostics>
-#include <build2/prerequisite>
+#include <build2/scope.hxx>
+#include <build2/diagnostics.hxx>
+#include <build2/prerequisite.hxx>
 
 namespace build2
 {
diff --git a/build2/test/common.cxx b/build2/test/common.cxx
index be0e690d..8197d5d5 100644
--- a/build2/test/common.cxx
+++ b/build2/test/common.cxx
@@ -2,10 +2,10 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/common>
+#include <build2/test/common.hxx>
 
-#include <build2/target>
-#include <build2/algorithm>
+#include <build2/target.hxx>
+#include <build2/algorithm.hxx>
 
 using namespace std;
 
diff --git a/build2/test/common b/build2/test/common.hxx
index 1a3117ab..89b75817 100644
--- a/build2/test/common
+++ b/build2/test/common.hxx
@@ -1,14 +1,14 @@
-// file      : build2/test/common -*- C++ -*-
+// file      : build2/test/common.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_COMMON
-#define BUILD2_TEST_COMMON
+#ifndef BUILD2_TEST_COMMON_HXX
+#define BUILD2_TEST_COMMON_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target>
+#include <build2/target.hxx>
 
 namespace build2
 {
@@ -49,4 +49,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TEST_COMMON
+#endif // BUILD2_TEST_COMMON_HXX
diff --git a/build2/test/init.cxx b/build2/test/init.cxx
index a367206d..93ca1e4b 100644
--- a/build2/test/init.cxx
+++ b/build2/test/init.cxx
@@ -2,18 +2,18 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/init>
+#include <build2/test/init.hxx>
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/rule>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/rule.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/config/utility>
+#include <build2/config/utility.hxx>
 
-#include <build2/test/module>
-#include <build2/test/target>
-#include <build2/test/operation>
+#include <build2/test/module.hxx>
+#include <build2/test/target.hxx>
+#include <build2/test/operation.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/test/init b/build2/test/init.hxx
index 45aa5474..2ba6ec68 100644
--- a/build2/test/init
+++ b/build2/test/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/test/init -*- C++ -*-
+// file      : build2/test/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_INIT
-#define BUILD2_TEST_INIT
+#ifndef BUILD2_TEST_INIT_HXX
+#define BUILD2_TEST_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -28,4 +28,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TEST_INIT
+#endif // BUILD2_TEST_INIT_HXX
diff --git a/build2/test/module b/build2/test/module
deleted file mode 100644
index 49b3031c..00000000
--- a/build2/test/module
+++ /dev/null
@@ -1,26 +0,0 @@
-// file      : build2/test/module -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BUILD2_TEST_MODULE
-#define BUILD2_TEST_MODULE
-
-#include <build2/types>
-#include <build2/utility>
-
-#include <build2/module>
-
-#include <build2/test/rule>
-#include <build2/test/common>
-
-namespace build2
-{
-  namespace test
-  {
-    struct module: module_base, virtual common, rule, alias_rule
-    {
-    };
-  }
-}
-
-#endif // BUILD2_TEST_MODULE
diff --git a/build2/test/module.hxx b/build2/test/module.hxx
new file mode 100644
index 00000000..3c9539f1
--- /dev/null
+++ b/build2/test/module.hxx
@@ -0,0 +1,26 @@
+// file      : build2/test/module.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BUILD2_TEST_MODULE_HXX
+#define BUILD2_TEST_MODULE_HXX
+
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
+
+#include <build2/module.hxx>
+
+#include <build2/test/rule.hxx>
+#include <build2/test/common.hxx>
+
+namespace build2
+{
+  namespace test
+  {
+    struct module: module_base, virtual common, rule, alias_rule
+    {
+    };
+  }
+}
+
+#endif // BUILD2_TEST_MODULE_HXX
diff --git a/build2/test/operation b/build2/test/operation
deleted file mode 100644
index 5d2a2291..00000000
--- a/build2/test/operation
+++ /dev/null
@@ -1,21 +0,0 @@
-// file      : build2/test/operation -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BUILD2_TEST_OPERATION
-#define BUILD2_TEST_OPERATION
-
-#include <build2/types>
-#include <build2/utility>
-
-#include <build2/operation>
-
-namespace build2
-{
-  namespace test
-  {
-    extern const operation_info test;
-  }
-}
-
-#endif // BUILD2_TEST_OPERATION
diff --git a/build2/test/operation.cxx b/build2/test/operation.cxx
index 1f59fc1b..46b9366f 100644
--- a/build2/test/operation.cxx
+++ b/build2/test/operation.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/operation>
+#include <build2/test/operation.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/test/operation.hxx b/build2/test/operation.hxx
new file mode 100644
index 00000000..d834edf8
--- /dev/null
+++ b/build2/test/operation.hxx
@@ -0,0 +1,21 @@
+// file      : build2/test/operation.hxx -*- C++ -*-
+// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
+// license   : MIT; see accompanying LICENSE file
+
+#ifndef BUILD2_TEST_OPERATION_HXX
+#define BUILD2_TEST_OPERATION_HXX
+
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
+
+#include <build2/operation.hxx>
+
+namespace build2
+{
+  namespace test
+  {
+    extern const operation_info test;
+  }
+}
+
+#endif // BUILD2_TEST_OPERATION_HXX
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx
index 64292fc4..db4083e1 100644
--- a/build2/test/rule.cxx
+++ b/build2/test/rule.cxx
@@ -2,19 +2,19 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/rule>
+#include <build2/test/rule.hxx>
 
-#include <build2/scope>
-#include <build2/target>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/test/target>
+#include <build2/test/target.hxx>
 
-#include <build2/test/script/parser>
-#include <build2/test/script/runner>
-#include <build2/test/script/script>
+#include <build2/test/script/parser.hxx>
+#include <build2/test/script/runner.hxx>
+#include <build2/test/script/script.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/test/rule b/build2/test/rule.hxx
index 7de2e241..819121cd 100644
--- a/build2/test/rule
+++ b/build2/test/rule.hxx
@@ -1,17 +1,17 @@
-// file      : build2/test/rule -*- C++ -*-
+// file      : build2/test/rule.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_RULE
-#define BUILD2_TEST_RULE
+#ifndef BUILD2_TEST_RULE_HXX
+#define BUILD2_TEST_RULE_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/rule>
-#include <build2/operation>
+#include <build2/rule.hxx>
+#include <build2/operation.hxx>
 
-#include <build2/test/common>
+#include <build2/test/common.hxx>
 
 namespace build2
 {
@@ -49,4 +49,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TEST_RULE
+#endif // BUILD2_TEST_RULE_HXX
diff --git a/build2/test/script/builtin.cxx b/build2/test/script/builtin.cxx
index a2f3107d..d45b200a 100644
--- a/build2/test/script/builtin.cxx
+++ b/build2/test/script/builtin.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/script/builtin>
+#include <build2/test/script/builtin.hxx>
 
 #ifndef _WIN32
 #  include <utime.h>
@@ -14,13 +14,13 @@
 #include <ostream>
 #include <sstream>
 
-#include <butl/path-io>    // use default operator<< implementation
-#include <butl/fdstream>   // fdopen_mode, fdstream_mode
-#include <butl/filesystem> // mkdir_status
+#include <libbutl/path-io.hxx>    // use default operator<< implementation
+#include <libbutl/fdstream.hxx>   // fdopen_mode, fdstream_mode
+#include <libbutl/filesystem.hxx> // mkdir_status
 
-#include <build2/regex>
+#include <build2/regex.hxx>
 
-#include <build2/test/script/script>
+#include <build2/test/script/script.hxx>
 
 // Strictly speaking a builtin which reads/writes from/to standard streams
 // must be asynchronous so that the caller can communicate with it through
diff --git a/build2/test/script/builtin b/build2/test/script/builtin.hxx
index 7d902ea4..ae0681f0 100644
--- a/build2/test/script/builtin
+++ b/build2/test/script/builtin.hxx
@@ -1,14 +1,14 @@
-// file      : build2/test/script/builtin -*- C++ -*-
+// file      : build2/test/script/builtin.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_SCRIPT_BUILTIN
-#define BUILD2_TEST_SCRIPT_BUILTIN
+#ifndef BUILD2_TEST_SCRIPT_BUILTIN_HXX
+#define BUILD2_TEST_SCRIPT_BUILTIN_HXX
 
 #include <map>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
 namespace build2
 {
@@ -72,4 +72,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TEST_SCRIPT_BUILTIN
+#endif // BUILD2_TEST_SCRIPT_BUILTIN_HXX
diff --git a/build2/test/script/lexer.cxx b/build2/test/script/lexer.cxx
index fab5cc26..4d139cee 100644
--- a/build2/test/script/lexer.cxx
+++ b/build2/test/script/lexer.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/script/lexer>
+#include <build2/test/script/lexer.hxx>
 
 #include <cstring> // strchr()
 
diff --git a/build2/test/script/lexer b/build2/test/script/lexer.hxx
index 4851e13b..a2627648 100644
--- a/build2/test/script/lexer
+++ b/build2/test/script/lexer.hxx
@@ -1,16 +1,16 @@
-// file      : build2/test/script/lexer -*- C++ -*-
+// file      : build2/test/script/lexer.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_SCRIPT_LEXER
-#define BUILD2_TEST_SCRIPT_LEXER
+#ifndef BUILD2_TEST_SCRIPT_LEXER_HXX
+#define BUILD2_TEST_SCRIPT_LEXER_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/lexer>
+#include <build2/lexer.hxx>
 
-#include <build2/test/script/token>
+#include <build2/test/script/token.hxx>
 
 namespace build2
 {
@@ -87,4 +87,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TEST_SCRIPT_LEXER
+#endif // BUILD2_TEST_SCRIPT_LEXER_HXX
diff --git a/build2/test/script/parser.cxx b/build2/test/script/parser.cxx
index 350ca443..ae6bdbc7 100644
--- a/build2/test/script/parser.cxx
+++ b/build2/test/script/parser.cxx
@@ -2,14 +2,14 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/script/parser>
+#include <build2/test/script/parser.hxx>
 
 #include <sstream>
 
-#include <build2/context> // sched, keep_going
+#include <build2/context.hxx> // sched, keep_going
 
-#include <build2/test/script/lexer>
-#include <build2/test/script/runner>
+#include <build2/test/script/lexer.hxx>
+#include <build2/test/script/runner.hxx>
 
 using namespace std;
 
diff --git a/build2/test/script/parser b/build2/test/script/parser.hxx
index e018548a..21ea61a1 100644
--- a/build2/test/script/parser
+++ b/build2/test/script/parser.hxx
@@ -1,18 +1,18 @@
-// file      : build2/test/script/parser -*- C++ -*-
+// file      : build2/test/script/parser.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_SCRIPT_PARSER
-#define BUILD2_TEST_SCRIPT_PARSER
+#ifndef BUILD2_TEST_SCRIPT_PARSER_HXX
+#define BUILD2_TEST_SCRIPT_PARSER_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/parser>
-#include <build2/diagnostics>
+#include <build2/parser.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/test/script/token>
-#include <build2/test/script/script>
+#include <build2/test/script/token.hxx>
+#include <build2/test/script/script.hxx>
 
 namespace build2
 {
@@ -242,4 +242,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TEST_SCRIPT_PARSER
+#endif // BUILD2_TEST_SCRIPT_PARSER_HXX
diff --git a/build2/test/script/regex.cxx b/build2/test/script/regex.cxx
index b77f8a5e..bf38a620 100644
--- a/build2/test/script/regex.cxx
+++ b/build2/test/script/regex.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/script/regex>
+#include <build2/test/script/regex.hxx>
 
 #include <algorithm> // copy(), copy_backward()
 
diff --git a/build2/test/script/regex b/build2/test/script/regex.hxx
index 1170b99e..d4f1cf50 100644
--- a/build2/test/script/regex
+++ b/build2/test/script/regex.hxx
@@ -1,9 +1,9 @@
-// file      : build2/test/script/regex -*- C++ -*-
+// file      : build2/test/script/regex.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_SCRIPT_REGEX
-#define BUILD2_TEST_SCRIPT_REGEX
+#ifndef BUILD2_TEST_SCRIPT_REGEX_HXX
+#define BUILD2_TEST_SCRIPT_REGEX_HXX
 
 #include <list>
 #include <regex>
@@ -13,8 +13,8 @@
 #include <type_traits>   // make_unsigned, enable_if, is_*
 #include <unordered_set>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
 namespace build2
 {
@@ -681,4 +681,4 @@ namespace build2
 
 #include <build2/test/script/regex.ixx>
 
-#endif // BUILD2_TEST_SCRIPT_REGEX
+#endif // BUILD2_TEST_SCRIPT_REGEX_HXX
diff --git a/build2/test/script/runner.cxx b/build2/test/script/runner.cxx
index 105039ac..ce32150d 100644
--- a/build2/test/script/runner.cxx
+++ b/build2/test/script/runner.cxx
@@ -2,22 +2,22 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/script/runner>
+#include <build2/test/script/runner.hxx>
 
 #include <set>
 #include <ios> // streamsize
 
-#include <butl/fdstream> // fdopen_mode, fdnull(), fddup()
+#include <libbutl/fdstream.hxx> // fdopen_mode, fdnull(), fddup()
 
-#include <build2/regex>
-#include <build2/variable>
-#include <build2/filesystem>
+#include <build2/regex.hxx>
+#include <build2/variable.hxx>
+#include <build2/filesystem.hxx>
 
-#include <build2/test/common>
+#include <build2/test/common.hxx>
 
-#include <build2/test/script/regex>
-#include <build2/test/script/parser>
-#include <build2/test/script/builtin>
+#include <build2/test/script/regex.hxx>
+#include <build2/test/script/parser.hxx>
+#include <build2/test/script/builtin.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/test/script/runner b/build2/test/script/runner.hxx
index 566b9dea..7833692a 100644
--- a/build2/test/script/runner
+++ b/build2/test/script/runner.hxx
@@ -1,16 +1,16 @@
-// file      : build2/test/script/runner -*- C++ -*-
+// file      : build2/test/script/runner.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_SCRIPT_RUNNER
-#define BUILD2_TEST_SCRIPT_RUNNER
+#ifndef BUILD2_TEST_SCRIPT_RUNNER_HXX
+#define BUILD2_TEST_SCRIPT_RUNNER_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/diagnostics> // location
+#include <build2/diagnostics.hxx> // location
 
-#include <build2/test/script/script>
+#include <build2/test/script/script.hxx>
 
 namespace build2
 {
@@ -87,4 +87,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TEST_SCRIPT_RUNNER
+#endif // BUILD2_TEST_SCRIPT_RUNNER_HXX
diff --git a/build2/test/script/script.cxx b/build2/test/script/script.cxx
index d4945fee..25f72afa 100644
--- a/build2/test/script/script.cxx
+++ b/build2/test/script/script.cxx
@@ -2,13 +2,13 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/script/script>
+#include <build2/test/script/script.hxx>
 
 #include <sstream>
 #include <algorithm> // find()
 
-#include <build2/target>
-#include <build2/algorithm>
+#include <build2/target.hxx>
+#include <build2/algorithm.hxx>
 
 using namespace std;
 
diff --git a/build2/test/script/script b/build2/test/script/script.hxx
index 9a54c71b..4f6fdabc 100644
--- a/build2/test/script/script
+++ b/build2/test/script/script.hxx
@@ -1,20 +1,20 @@
-// file      : build2/test/script/script -*- C++ -*-
+// file      : build2/test/script/script.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_SCRIPT_SCRIPT
-#define BUILD2_TEST_SCRIPT_SCRIPT
+#ifndef BUILD2_TEST_SCRIPT_SCRIPT_HXX
+#define BUILD2_TEST_SCRIPT_SCRIPT_HXX
 
 #include <set>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/variable>
+#include <build2/variable.hxx>
 
-#include <build2/test/target>
+#include <build2/test/target.hxx>
 
-#include <build2/test/script/token> // replay_tokens
+#include <build2/test/script/token.hxx> // replay_tokens
 
 namespace build2
 {
@@ -549,4 +549,4 @@ namespace build2
 
 #include <build2/test/script/script.ixx>
 
-#endif // BUILD2_TEST_SCRIPT_SCRIPT
+#endif // BUILD2_TEST_SCRIPT_SCRIPT_HXX
diff --git a/build2/test/script/token.cxx b/build2/test/script/token.cxx
index 3d3dc8ef..42428c6d 100644
--- a/build2/test/script/token.cxx
+++ b/build2/test/script/token.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/script/token>
+#include <build2/test/script/token.hxx>
 
 using namespace std;
 
diff --git a/build2/test/script/token b/build2/test/script/token.hxx
index 9d3e3303..0e8a5774 100644
--- a/build2/test/script/token
+++ b/build2/test/script/token.hxx
@@ -1,14 +1,14 @@
-// file      : build2/test/script/token -*- C++ -*-
+// file      : build2/test/script/token.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_SCRIPT_TOKEN
-#define BUILD2_TEST_SCRIPT_TOKEN
+#ifndef BUILD2_TEST_SCRIPT_TOKEN_HXX
+#define BUILD2_TEST_SCRIPT_TOKEN_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/token>
+#include <build2/token.hxx>
 
 namespace build2
 {
@@ -62,4 +62,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TEST_SCRIPT_TOKEN
+#endif // BUILD2_TEST_SCRIPT_TOKEN_HXX
diff --git a/build2/test/target.cxx b/build2/test/target.cxx
index fd432fd1..a85546c1 100644
--- a/build2/test/target.cxx
+++ b/build2/test/target.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/test/target>
+#include <build2/test/target.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/test/target b/build2/test/target.hxx
index 4cbd832b..9eec1462 100644
--- a/build2/test/target
+++ b/build2/test/target.hxx
@@ -1,14 +1,14 @@
-// file      : build2/test/target -*- C++ -*-
+// file      : build2/test/target.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TEST_TARGET
-#define BUILD2_TEST_TARGET
+#ifndef BUILD2_TEST_TARGET_HXX
+#define BUILD2_TEST_TARGET_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target>
+#include <build2/target.hxx>
 
 namespace build2
 {
@@ -26,4 +26,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TEST_TARGET
+#endif // BUILD2_TEST_TARGET_HXX
diff --git a/build2/token.cxx b/build2/token.cxx
index 6f2eae59..ec789019 100644
--- a/build2/token.cxx
+++ b/build2/token.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/token>
+#include <build2/token.hxx>
 
 using namespace std;
 
diff --git a/build2/token b/build2/token.hxx
index d58aebd9..2a590d7d 100644
--- a/build2/token
+++ b/build2/token.hxx
@@ -1,14 +1,14 @@
-// file      : build2/token -*- C++ -*-
+// file      : build2/token.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TOKEN
-#define BUILD2_TOKEN
+#ifndef BUILD2_TOKEN_HXX
+#define BUILD2_TOKEN_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/diagnostics>
+#include <build2/diagnostics.hxx>
 
 namespace build2
 {
@@ -183,4 +183,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TOKEN
+#endif // BUILD2_TOKEN_HXX
diff --git a/build2/types-parsers.cxx b/build2/types-parsers.cxx
index bcbea635..4cc723c0 100644
--- a/build2/types-parsers.cxx
+++ b/build2/types-parsers.cxx
@@ -2,9 +2,9 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/types-parsers>
+#include <build2/types-parsers.hxx>
 
-#include <build2/b-options> // build2::cl namespace
+#include <build2/b-options.hxx> // build2::cl namespace
 
 namespace build2
 {
diff --git a/build2/types-parsers b/build2/types-parsers.hxx
index a34c2ba6..adbc5c3a 100644
--- a/build2/types-parsers
+++ b/build2/types-parsers.hxx
@@ -1,14 +1,14 @@
-// file      : build2/types-parsers -*- C++ -*-
+// file      : build2/types-parsers.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
 // CLI parsers, included into the generated source files.
 //
 
-#ifndef BUILD2_TYPES_PARSERS
-#define BUILD2_TYPES_PARSERS
+#ifndef BUILD2_TYPES_PARSERS_HXX
+#define BUILD2_TYPES_PARSERS_HXX
 
-#include <build2/types>
+#include <build2/types.hxx>
 
 namespace build2
 {
@@ -35,4 +35,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_TYPES_PARSERS
+#endif // BUILD2_TYPES_PARSERS_HXX
diff --git a/build2/types b/build2/types.hxx
index c189f4d1..8657ee67 100644
--- a/build2/types
+++ b/build2/types.hxx
@@ -1,9 +1,9 @@
-// file      : build2/types -*- C++ -*-
+// file      : build2/types.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_TYPES
-#define BUILD2_TYPES
+#ifndef BUILD2_TYPES_HXX
+#define BUILD2_TYPES_HXX
 
 #include <array>
 #include <tuple>
@@ -23,7 +23,7 @@
 #include <thread>
 #include <condition_variable>
 
-#include <butl/ft/shared_mutex>
+#include <libbutl/ft/shared_mutex.hxx>
 #if defined(__cpp_lib_shared_mutex) || defined(__cpp_lib_shared_timed_mutex)
 #  include <shared_mutex>
 #endif
@@ -33,17 +33,17 @@
 #include <stdexcept>     // logic_error, invalid_argument, runtime_error
 #include <system_error>
 
-#include <butl/path>
-#include <butl/sha256>
-#include <butl/process>
-#include <butl/fdstream>
-#include <butl/optional>
-#include <butl/const-ptr>
-#include <butl/timestamp>
-#include <butl/vector-view>
-#include <butl/small-vector>
-#include <butl/target-triplet>
-#include <butl/standard-version>
+#include <libbutl/path.hxx>
+#include <libbutl/sha256.hxx>
+#include <libbutl/process.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/const-ptr.hxx>
+#include <libbutl/timestamp.hxx>
+#include <libbutl/vector-view.hxx>
+#include <libbutl/small-vector.hxx>
+#include <libbutl/target-triplet.hxx>
+#include <libbutl/standard-version.hxx>
 
 namespace build2
 {
@@ -73,8 +73,8 @@ namespace build2
 
   using std::array;
   using std::vector;
-  using butl::vector_view;  // <butl/vector-view>
-  using butl::small_vector; // <butl/small-vector>
+  using butl::vector_view;  // <libbutl/vector-view.hxx>
+  using butl::small_vector; // <libbutl/small-vector.hxx>
 
   using strings = vector<string>;
   using cstrings = vector<const char*>;
@@ -142,16 +142,16 @@ namespace build2
   using std::system_error;
   using io_error = std::ios_base::failure;
 
-  // <butl/optional>
+  // <libbutl/optional.hxx>
   //
   using butl::optional;
   using butl::nullopt;
 
-  // <butl/const-ptr>
+  // <libbutl/const-ptr.hxx>
   //
   using butl::const_ptr;
 
-  // <butl/path>
+  // <libbutl/path.hxx>
   //
   using butl::path;
   using butl::dir_path;
@@ -181,7 +181,7 @@ namespace build2
   using paths = std::vector<path>;
   using dir_paths = std::vector<dir_path>;
 
-  // <butl/timestamp>
+  // <libbutl/timestamp.hxx>
   //
   using butl::system_clock;
   using butl::timestamp;
@@ -191,12 +191,12 @@ namespace build2
   using butl::timestamp_nonexistent;
   using butl::operator<<;
 
-  // <butl/sha256>
+  // <libbutl/sha256.hxx>
   //
   using butl::sha256;
 
-  // <butl/process>
-  // <butl/fdstream>
+  // <libbutl/process.hxx>
+  // <libbutl/fdstream.hxx>
   //
   using butl::process;
   using butl::process_path;
@@ -206,11 +206,11 @@ namespace build2
   using butl::ifdstream;
   using butl::ofdstream;
 
-  // <butl/target-triplet>
+  // <libbutl/target-triplet.hxx>
   //
   using butl::target_triplet;
 
-  // <butl/standard-version>
+  // <libbutl/standard-version.hxx>
   //
   using butl::standard_version;
   using butl::standard_version_constraint;
@@ -242,8 +242,8 @@ namespace std
   operator<< (ostream&, const ::butl::process_path&);
 }
 
-// <build2/name>
+// <build2/name.hxx>
 //
-#include <build2/name>
+#include <build2/name.hxx>
 
-#endif // BUILD2_TYPES
+#endif // BUILD2_TYPES_HXX
diff --git a/build2/utility.cxx b/build2/utility.cxx
index 11c50243..5cd01be5 100644
--- a/build2/utility.cxx
+++ b/build2/utility.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/utility>
+#include <build2/utility.hxx>
 
 #include <time.h>   // tzset()
 
@@ -10,14 +10,14 @@
 #include <cstdlib>  // strtol()
 #include <iostream> // cerr
 
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 using namespace butl;
 
 //
-// <build2/types>
+// <build2/types.hxx>
 //
 namespace build2
 {
@@ -67,7 +67,7 @@ namespace std
 namespace build2
 {
   //
-  // <build2/utility>
+  // <build2/utility.hxx>
   //
 
   string&
diff --git a/build2/utility b/build2/utility.hxx
index ca290267..5f5aa1d7 100644
--- a/build2/utility
+++ b/build2/utility.hxx
@@ -1,9 +1,9 @@
-// file      : build2/utility -*- C++ -*-
+// file      : build2/utility.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_UTILITY
-#define BUILD2_UTILITY
+#ifndef BUILD2_UTILITY_HXX
+#define BUILD2_UTILITY_HXX
 
 #include <tuple>      // make_tuple()
 #include <memory>     // make_shared()
@@ -14,15 +14,16 @@
 #include <algorithm>  // *
 #include <functional> // ref(), cref()
 
-#include <butl/ft/lang>
+#include <libbutl/ft/lang.hxx>
 
-#include <butl/utility> // combine_hash(), reverse_iterate(), case*(), etc
+#include <libbutl/utility.hxx> // combine_hash(), reverse_iterate(), case*(),
+                               // etc
 
 #include <unordered_set>
 
-#include <build2/types>
-#include <build2/b-options>
-#include <build2/version-impl>
+#include <build2/types.hxx>
+#include <build2/b-options.hxx>
+#include <build2/version.hxx>
 
 namespace build2
 {
@@ -41,7 +42,7 @@ namespace build2
   using std::stoul;
   using std::stoull;
 
-  // <butl/utility>
+  // <libbutl/utility.hxx>
   //
   using butl::reverse_iterate;
   using butl::compare_c_string;
@@ -432,4 +433,4 @@ namespace build2
 #include <build2/utility.ixx>
 #include <build2/utility.txx>
 
-#endif // BUILD2_UTILITY
+#endif // BUILD2_UTILITY_HXX
diff --git a/build2/variable.cxx b/build2/variable.cxx
index f282dc52..bcf9d628 100644
--- a/build2/variable.cxx
+++ b/build2/variable.cxx
@@ -2,12 +2,12 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/variable>
+#include <build2/variable.hxx>
 
 #include <cstring> // memcmp()
 
-#include <build2/context>
-#include <build2/diagnostics>
+#include <build2/context.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/build2/variable b/build2/variable.hxx
index be3b478f..19a6c695 100644
--- a/build2/variable
+++ b/build2/variable.hxx
@@ -1,22 +1,22 @@
-// file      : build2/variable -*- C++ -*-
+// file      : build2/variable.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_VARIABLE
-#define BUILD2_VARIABLE
+#ifndef BUILD2_VARIABLE_HXX
+#define BUILD2_VARIABLE_HXX
 
 #include <map>
 #include <set>
 #include <type_traits>   // aligned_storage
 #include <unordered_map>
 
-#include <butl/prefix-map>
-#include <butl/multi-index> // map_key
+#include <libbutl/prefix-map.hxx>
+#include <libbutl/multi-index.hxx> // map_key
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target-type>
+#include <build2/target-type.hxx>
 
 namespace build2
 {
@@ -1325,4 +1325,4 @@ namespace build2
 #include <build2/variable.ixx>
 #include <build2/variable.txx>
 
-#endif // BUILD2_VARIABLE
+#endif // BUILD2_VARIABLE_HXX
diff --git a/build2/variable.txx b/build2/variable.txx
index c7d3e5a9..1373948e 100644
--- a/build2/variable.txx
+++ b/build2/variable.txx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/diagnostics>
+#include <build2/diagnostics.hxx>
 
 namespace build2
 {
diff --git a/build2/version-impl b/build2/version-impl
deleted file mode 100644
index f4c132d5..00000000
--- a/build2/version-impl
+++ /dev/null
@@ -1,18 +0,0 @@
-// file      : build2/version-impl -*- C++ -*-
-// copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
-// license   : MIT; see accompanying LICENSE file
-
-#ifndef BUILD2_VERSION // Note: using the version macro itself.
-
-// This is a "fake" version used to bootstrap from the repository (we include
-// a pre-generated version in distributions).
-//
-#define BUILD2_VERSION      9999999990000ULL
-
-#define BUILD2_VERSION_STR  "999.999.999"
-#define BUILD2_VERSION_ID   "999.999.999"
-
-#define LIBBUTL_VERSION_STR "999.999.999"
-#define LIBBUTL_VERSION_ID  "999.999.999"
-
-#endif // BUILD2_VERSION
diff --git a/build2/version-impl.in b/build2/version.hxx.in
index a5142405..c05a2077 100644
--- a/build2/version-impl.in
+++ b/build2/version.hxx.in
@@ -1,4 +1,4 @@
-// file      : build2/version-impl.in -*- C++ -*-
+// file      : build2/version.hxx.in -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
@@ -37,7 +37,7 @@
 #define BUILD2_SNAPSHOT      $build2.version.snapshot_sn$ULL
 #define BUILD2_SNAPSHOT_ID   "$build2.version.snapshot_id$"
 
-#include <butl/version>
+#include <libbutl/version.hxx>
 
 $libbutl.check(LIBBUTL_VERSION, LIBBUTL_SNAPSHOT)$
 
diff --git a/build2/version/init.cxx b/build2/version/init.cxx
index cce8de90..699495a1 100644
--- a/build2/version/init.cxx
+++ b/build2/version/init.cxx
@@ -2,21 +2,21 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/version/init>
+#include <build2/version/init.hxx>
 
-#include <butl/manifest-parser>
-#include <butl/manifest-serializer>
+#include <libbutl/manifest-parser.hxx>
+#include <libbutl/manifest-serializer.hxx>
 
-#include <build2/scope>
-#include <build2/context>
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/scope.hxx>
+#include <build2/context.hxx>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
-#include <build2/dist/module>
+#include <build2/dist/module.hxx>
 
-#include <build2/version/rule>
-#include <build2/version/module>
-#include <build2/version/snapshot>
+#include <build2/version/rule.hxx>
+#include <build2/version/module.hxx>
+#include <build2/version/snapshot.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/version/init b/build2/version/init.hxx
index 8ffb9990..54beae10 100644
--- a/build2/version/init
+++ b/build2/version/init.hxx
@@ -1,14 +1,14 @@
-// file      : build2/version/init -*- C++ -*-
+// file      : build2/version/init.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_VERSION_INIT
-#define BUILD2_VERSION_INIT
+#ifndef BUILD2_VERSION_INIT_HXX
+#define BUILD2_VERSION_INIT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -28,4 +28,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_VERSION_INIT
+#endif // BUILD2_VERSION_INIT_HXX
diff --git a/build2/version/module.cxx b/build2/version/module.cxx
index 98652711..acc629a4 100644
--- a/build2/version/module.cxx
+++ b/build2/version/module.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/version/module>
+#include <build2/version/module.hxx>
 
 using namespace std;
 
diff --git a/build2/version/module b/build2/version/module.hxx
index 1e6fb7a1..45b1a473 100644
--- a/build2/version/module
+++ b/build2/version/module.hxx
@@ -1,16 +1,16 @@
-// file      : build2/version/module -*- C++ -*-
+// file      : build2/version/module.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_VERSION_MODULE
-#define BUILD2_VERSION_MODULE
+#ifndef BUILD2_VERSION_MODULE_HXX
+#define BUILD2_VERSION_MODULE_HXX
 
 #include <map>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/module>
+#include <build2/module.hxx>
 
 namespace build2
 {
@@ -33,4 +33,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_VERSION_MODULE
+#endif // BUILD2_VERSION_MODULE_HXX
diff --git a/build2/version/rule.cxx b/build2/version/rule.cxx
index 3e143c15..d9669dac 100644
--- a/build2/version/rule.cxx
+++ b/build2/version/rule.cxx
@@ -2,18 +2,18 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/version/rule>
-
-#include <build2/depdb>
-#include <build2/scope>
-#include <build2/target>
-#include <build2/context>
-#include <build2/function>
-#include <build2/algorithm>
-#include <build2/filesystem>
-#include <build2/diagnostics>
-
-#include <build2/version/module>
+#include <build2/version/rule.hxx>
+
+#include <build2/depdb.hxx>
+#include <build2/scope.hxx>
+#include <build2/target.hxx>
+#include <build2/context.hxx>
+#include <build2/function.hxx>
+#include <build2/algorithm.hxx>
+#include <build2/filesystem.hxx>
+#include <build2/diagnostics.hxx>
+
+#include <build2/version/module.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/build2/version/rule b/build2/version/rule.hxx
index 186df591..e6866945 100644
--- a/build2/version/rule
+++ b/build2/version/rule.hxx
@@ -1,14 +1,14 @@
-// file      : build2/version/rule -*- C++ -*-
+// file      : build2/version/rule.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_VERSION_RULE
-#define BUILD2_VERSION_RULE
+#ifndef BUILD2_VERSION_RULE_HXX
+#define BUILD2_VERSION_RULE_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/rule>
+#include <build2/rule.hxx>
 
 namespace build2
 {
@@ -50,4 +50,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_VERSION_RULE
+#endif // BUILD2_VERSION_RULE_HXX
diff --git a/build2/version/snapshot-git.cxx b/build2/version/snapshot-git.cxx
index b5db470b..d91eb626 100644
--- a/build2/version/snapshot-git.cxx
+++ b/build2/version/snapshot-git.cxx
@@ -2,7 +2,7 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/version/snapshot>
+#include <build2/version/snapshot.hxx>
 
 using namespace std;
 
diff --git a/build2/version/snapshot.cxx b/build2/version/snapshot.cxx
index be6c147b..00528c7d 100644
--- a/build2/version/snapshot.cxx
+++ b/build2/version/snapshot.cxx
@@ -2,9 +2,9 @@
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/version/snapshot>
+#include <build2/version/snapshot.hxx>
 
-#include <build2/filesystem>
+#include <build2/filesystem.hxx>
 
 using namespace std;
 
diff --git a/build2/version/snapshot b/build2/version/snapshot.hxx
index a2797291..b7e6dd79 100644
--- a/build2/version/snapshot
+++ b/build2/version/snapshot.hxx
@@ -1,14 +1,14 @@
-// file      : build2/version/snapshot -*- C++ -*-
+// file      : build2/version/snapshot.hxx -*- C++ -*-
 // copyright : Copyright (c) 2014-2017 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#ifndef BUILD2_VERSION_SNAPSHOT
-#define BUILD2_VERSION_SNAPSHOT
+#ifndef BUILD2_VERSION_SNAPSHOT_HXX
+#define BUILD2_VERSION_SNAPSHOT_HXX
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/scope>
+#include <build2/scope.hxx>
 
 namespace build2
 {
@@ -30,4 +30,4 @@ namespace build2
   }
 }
 
-#endif // BUILD2_VERSION_SNAPSHOT
+#endif // BUILD2_VERSION_SNAPSHOT_HXX
diff --git a/old-tests/depdb/driver.cxx b/old-tests/depdb/driver.cxx
index b64b97ee..2439b60e 100644
--- a/old-tests/depdb/driver.cxx
+++ b/old-tests/depdb/driver.cxx
@@ -4,12 +4,12 @@
 
 #include <iostream>
 
-#include <butl/filesystem>
+#include <libbutl/filesystem.hxx>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/depdb>
+#include <build2/depdb.hxx>
 
 using namespace std;
 using namespace build2;
diff --git a/tests/.gitignore b/tests/.gitignore
index e54525b1..eac2bb81 100644
--- a/tests/.gitignore
+++ b/tests/.gitignore
@@ -1 +1,6 @@
 driver
+
+# The immediate test/ sub-directory shouldn't be ignored.
+#
+*/test/
+test-*/
diff --git a/tests/build/root.build b/tests/build/root.build
index 1903c414..7d483feb 100644
--- a/tests/build/root.build
+++ b/tests/build/root.build
@@ -6,7 +6,7 @@ cxx.std = latest
 
 using cxx
 
-hxx{*}: extension =
+hxx{*}: extension = hxx
 cxx{*}: extension = cxx
 
 # Setup the build system driver that we are testing (which may not be the same
diff --git a/tests/test/script/runner/driver.cxx b/tests/test/script/runner/driver.cxx
index ff91926c..b31acb77 100644
--- a/tests/test/script/runner/driver.cxx
+++ b/tests/test/script/runner/driver.cxx
@@ -11,10 +11,10 @@
 #include <iostream>
 #include <exception>
 
-#include <butl/path>
-#include <butl/optional>
-#include <butl/fdstream>
-#include <butl/filesystem>
+#include <libbutl/path.hxx>
+#include <libbutl/optional.hxx>
+#include <libbutl/fdstream.hxx>
+#include <libbutl/filesystem.hxx>
 
 using namespace std;
 using namespace butl;
diff --git a/unit-tests/.gitignore b/unit-tests/.gitignore
index e54525b1..eac2bb81 100644
--- a/unit-tests/.gitignore
+++ b/unit-tests/.gitignore
@@ -1 +1,6 @@
 driver
+
+# The immediate test/ sub-directory shouldn't be ignored.
+#
+*/test/
+test-*/
diff --git a/unit-tests/function/driver.cxx b/unit-tests/function/driver.cxx
index 70fd69e0..4650a189 100644
--- a/unit-tests/function/driver.cxx
+++ b/unit-tests/function/driver.cxx
@@ -4,14 +4,14 @@
 
 #include <iostream>
 
-#include <build2/types>
-#include <build2/utility>
-
-#include <build2/parser>
-#include <build2/context>
-#include <build2/function>
-#include <build2/variable>
-#include <build2/diagnostics>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
+
+#include <build2/parser.hxx>
+#include <build2/context.hxx>
+#include <build2/function.hxx>
+#include <build2/variable.hxx>
+#include <build2/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/unit-tests/lexer/driver.cxx b/unit-tests/lexer/driver.cxx
index 41366ecd..5bbefb90 100644
--- a/unit-tests/lexer/driver.cxx
+++ b/unit-tests/lexer/driver.cxx
@@ -5,11 +5,11 @@
 #include <cassert>
 #include <iostream>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/token>
-#include <build2/lexer>
+#include <build2/token.hxx>
+#include <build2/lexer.hxx>
 
 using namespace std;
 
diff --git a/unit-tests/scheduler/driver.cxx b/unit-tests/scheduler/driver.cxx
index 2e209372..31551f23 100644
--- a/unit-tests/scheduler/driver.cxx
+++ b/unit-tests/scheduler/driver.cxx
@@ -8,10 +8,10 @@
 #include <cassert>
 #include <iostream>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/scheduler>
+#include <build2/scheduler.hxx>
 
 using namespace std;
 
diff --git a/unit-tests/test/script/lexer/driver.cxx b/unit-tests/test/script/lexer/driver.cxx
index 229c3b69..9ff393b1 100644
--- a/unit-tests/test/script/lexer/driver.cxx
+++ b/unit-tests/test/script/lexer/driver.cxx
@@ -5,11 +5,11 @@
 #include <cassert>
 #include <iostream>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/test/script/token>
-#include <build2/test/script/lexer>
+#include <build2/test/script/token.hxx>
+#include <build2/test/script/lexer.hxx>
 
 using namespace std;
 
diff --git a/unit-tests/test/script/parser/directive.test b/unit-tests/test/script/parser/directive.test
index d735fb4d..39bd6662 100644
--- a/unit-tests/test/script/parser/directive.test
+++ b/unit-tests/test/script/parser/directive.test
@@ -46,11 +46,11 @@ EOI
 
 : var-expansion
 :
-cat <<EOI >="foo-$(build.version).test";
+cat <<EOI >="foo-$(build.verson.project).test";
 cmd
 EOI
 $* <<EOI >>EOO
-.include "foo-$(build.version).test"
+.include "foo-$(build.verson.project).test"
 EOI
 cmd
 EOO
diff --git a/unit-tests/test/script/parser/driver.cxx b/unit-tests/test/script/parser/driver.cxx
index 772bc10f..fceb4778 100644
--- a/unit-tests/test/script/parser/driver.cxx
+++ b/unit-tests/test/script/parser/driver.cxx
@@ -5,18 +5,18 @@
 #include <cassert>
 #include <iostream>
 
-#include <build2/types>
-#include <build2/utility>
+#include <build2/types.hxx>
+#include <build2/utility.hxx>
 
-#include <build2/target>
-#include <build2/context>   // reset()
-#include <build2/scheduler>
+#include <build2/target.hxx>
+#include <build2/context.hxx>   // reset()
+#include <build2/scheduler.hxx>
 
-#include <build2/test/target>
+#include <build2/test/target.hxx>
 
-#include <build2/test/script/token>
-#include <build2/test/script/parser>
-#include <build2/test/script/runner>
+#include <build2/test/script/token.hxx>
+#include <build2/test/script/parser.hxx>
+#include <build2/test/script/runner.hxx>
 
 using namespace std;
 
diff --git a/unit-tests/test/script/regex/driver.cxx b/unit-tests/test/script/regex/driver.cxx
index 2680672c..fd35f2a0 100644
--- a/unit-tests/test/script/regex/driver.cxx
+++ b/unit-tests/test/script/regex/driver.cxx
@@ -5,7 +5,7 @@
 #include <regex>
 #include <type_traits> // is_pod, is_array
 
-#include <build2/test/script/regex>
+#include <build2/test/script/regex.hxx>
 
 using namespace std;
 using namespace build2::test::script::regex;
author	Karen Arutyunov <karen@codesynthesis.com>	2017-05-01 18:24:31 +0300
committer	Karen Arutyunov <karen@codesynthesis.com>	2017-05-01 19:30:26 +0300
commit	70317569c6dcd9809ed4a8c425777e653ec6ca08 (patch)
tree	07a538b296933e9e2a1f81088f8fcc8da3f749ad
parent	cbec9ea8841c8a58b2d50bb628b28aea7a6fe179 (diff)
download	build2-70317569c6dcd9809ed4a8c425777e653ec6ca08.tar.gz build2-70317569c6dcd9809ed4a8c425777e653ec6ca08.tar.xz build2-70317569c6dcd9809ed4a8c425777e653ec6ca08.zip