4 files changed, 23 insertions, 23 deletions
diff --git a/build2/cxx/init.cxx b/build2/cxx/init.cxx
index f76779b..c74a077 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 78798b9..5ba4041 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 8955cb2..7fb9971 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 6a63060..4dd93e3 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