Add hxx extension for headers

27 files changed, 180 insertions, 180 deletions

diff --git a/build2/test/common.cxx b/build2/test/common.cxx
index be0e690..8197d5d 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 1a3117a..89b7581 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 a367206..93ca1e4 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 45aa547..2ba6ec6 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 49b3031..0000000
--- 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 0000000..3c9539f
--- /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 5d2a229..0000000
--- 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 1f59fc1..46b9366 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 0000000..d834edf
--- /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 64292fc..db4083e 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 7de2e24..819121c 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 a2f3107..d45b200 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 7d902ea..ae0681f 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 fab5cc2..4d139ce 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 4851e13..a262764 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 350ca44..ae6bdbc 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 e018548..21ea61a 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 b77f8a5..bf38a62 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 1170b99..d4f1cf5 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 105039a..ce32150 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 566b9de..7833692 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 d4945fe..25f72af 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 9a54c71..4f6fdab 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 3d3dc8e..42428c6 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 9d3e330..0e8a577 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 fd432fd..a85546c 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 4cbd832..9eec146 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