aboutsummaryrefslogtreecommitdiff
path: root/build2/cc
diff options
context:
space:
mode:
authorKaren Arutyunov <karen@codesynthesis.com>2017-05-01 18:24:31 +0300
committerKaren Arutyunov <karen@codesynthesis.com>2017-05-01 19:30:26 +0300
commit70317569c6dcd9809ed4a8c425777e653ec6ca08 (patch)
tree07a538b296933e9e2a1f81088f8fcc8da3f749ad /build2/cc
parentcbec9ea8841c8a58b2d50bb628b28aea7a6fe179 (diff)
Add hxx extension for headers
Diffstat (limited to 'build2/cc')
-rw-r--r--build2/cc/common.cxx18
-rw-r--r--build2/cc/common.hxx (renamed from build2/cc/common)18
-rw-r--r--build2/cc/compile.cxx20
-rw-r--r--build2/cc/compile.hxx (renamed from build2/cc/compile)20
-rw-r--r--build2/cc/gcc.cxx18
-rw-r--r--build2/cc/guess.cxx9
-rw-r--r--build2/cc/guess.hxx (renamed from build2/cc/guess)14
-rw-r--r--build2/cc/init.cxx12
-rw-r--r--build2/cc/init.hxx (renamed from build2/cc/init)14
-rw-r--r--build2/cc/install.cxx10
-rw-r--r--build2/cc/install.hxx (renamed from build2/cc/install)18
-rw-r--r--build2/cc/link.cxx26
-rw-r--r--build2/cc/link.hxx (renamed from build2/cc/link)18
-rw-r--r--build2/cc/module.cxx16
-rw-r--r--build2/cc/module.hxx (renamed from build2/cc/module)24
-rw-r--r--build2/cc/msvc.cxx20
-rw-r--r--build2/cc/pkgconfig.cxx20
-rw-r--r--build2/cc/target.cxx2
-rw-r--r--build2/cc/target.hxx (renamed from build2/cc/target)14
-rw-r--r--build2/cc/types.hxx (renamed from build2/cc/types)12
-rw-r--r--build2/cc/utility.cxx8
-rw-r--r--build2/cc/utility.hxx (renamed from build2/cc/utility)18
-rw-r--r--build2/cc/windows-manifest.cxx16
-rw-r--r--build2/cc/windows-rpath.cxx14
24 files changed, 190 insertions, 189 deletions
diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx
index 88eb45d..59feb9b 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 5a459b8..0c8ff2b 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 7e37c44..b8b362d 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 2986b7d..bee13f2 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 c16191a..b5dd236 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 8b45420..0569bdc 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 593bd85..dbd06e3 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 bc598c3..8d20573 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 c969505..9eab424 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 e1e5719..e09a62f 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 e229e94..b7d92fb 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 80281f7..1b2f306 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 0dace7c..4dc722a 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 7df71ba..6d8c799 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 3c5ec61..643cf89 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 aa9389f..e3765cd 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 00ab541..1b67f5f 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 a734953..5fbf67d 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 6992609..4c9e4cb 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 68d9949..59ea67f 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 4a931af..7a03b54 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 ee3cb81..e0529af 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 3a62fcc..d840f67 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 0b34963..0078944 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;