28 files changed, 108 insertions, 108 deletions

diff --git a/build2/cc/common.cxx b/build2/cc/common.cxx
index fa774d7..84ebbd5 100644
--- a/build2/cc/common.cxx
+++ b/build2/cc/common.cxx
@@ -4,13 +4,13 @@
 
 #include <build2/cc/common.hxx>
 
-#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 <libbuild2/file.hxx>        // import()
+#include <libbuild2/scope.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/algorithm.hxx>
+#include <libbuild2/filesystem.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/cc/utility.hxx>
 
diff --git a/build2/cc/common.hxx b/build2/cc/common.hxx
index 6eccf23..c58a7f3 100644
--- a/build2/cc/common.hxx
+++ b/build2/cc/common.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_CC_COMMON_HXX
 #define BUILD2_CC_COMMON_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/variable.hxx>
+#include <libbuild2/variable.hxx>
 
 #include <build2/bin/target.hxx>
 
diff --git a/build2/cc/compile-rule.cxx b/build2/cc/compile-rule.cxx
index a1796eb..c0c7eb3 100644
--- a/build2/cc/compile-rule.cxx
+++ b/build2/cc/compile-rule.cxx
@@ -7,14 +7,14 @@
 #include <cstdlib>  // exit()
 #include <cstring>  // strlen(), strchr()
 
-#include <build2/file.hxx>
-#include <build2/depdb.hxx>
-#include <build2/scope.hxx>
-#include <build2/context.hxx>
-#include <build2/variable.hxx>
-#include <build2/algorithm.hxx>
-#include <build2/filesystem.hxx>  // mtime()
-#include <build2/diagnostics.hxx>
+#include <libbuild2/file.hxx>
+#include <libbuild2/depdb.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/algorithm.hxx>
+#include <libbuild2/filesystem.hxx>  // mtime()
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/bin/target.hxx>
 #include <build2/config/utility.hxx> // create_project()
diff --git a/build2/cc/compile-rule.hxx b/build2/cc/compile-rule.hxx
index ab19e1c..62127a7 100644
--- a/build2/cc/compile-rule.hxx
+++ b/build2/cc/compile-rule.hxx
@@ -5,11 +5,11 @@
 #ifndef BUILD2_CC_COMPILE_RULE_HXX
 #define BUILD2_CC_COMPILE_RULE_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/rule.hxx>
-#include <build2/filesystem.hxx> // auto_rmfile
+#include <libbuild2/rule.hxx>
+#include <libbuild2/filesystem.hxx> // auto_rmfile
 
 #include <build2/cc/types.hxx>
 #include <build2/cc/common.hxx>
diff --git a/build2/cc/gcc.cxx b/build2/cc/gcc.cxx
index 724c555..52cc386 100644
--- a/build2/cc/gcc.cxx
+++ b/build2/cc/gcc.cxx
@@ -2,12 +2,12 @@
 // copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#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 <libbuild2/scope.hxx>
+#include <libbuild2/target.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/filesystem.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/bin/target.hxx>
 
diff --git a/build2/cc/guess.cxx b/build2/cc/guess.cxx
index f5db253..c74ccaf 100644
--- a/build2/cc/guess.cxx
+++ b/build2/cc/guess.cxx
@@ -7,7 +7,7 @@
 #include <map>
 #include <cstring>  // strlen(), strchr()
 
-#include <build2/diagnostics.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/build2/cc/guess.hxx b/build2/cc/guess.hxx
index b807446..1ab6e49 100644
--- a/build2/cc/guess.hxx
+++ b/build2/cc/guess.hxx
@@ -5,8 +5,8 @@
 #ifndef BUILD2_CC_GUESS_HXX
 #define BUILD2_CC_GUESS_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
 #include <build2/cc/types.hxx>
 
diff --git a/build2/cc/init.cxx b/build2/cc/init.cxx
index 882b205..18fba20 100644
--- a/build2/cc/init.cxx
+++ b/build2/cc/init.cxx
@@ -4,11 +4,11 @@
 
 #include <build2/cc/init.hxx>
 
-#include <build2/file.hxx>
-#include <build2/scope.hxx>
-#include <build2/context.hxx>
-#include <build2/filesystem.hxx>
-#include <build2/diagnostics.hxx>
+#include <libbuild2/file.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/filesystem.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/config/utility.hxx>
 
diff --git a/build2/cc/init.hxx b/build2/cc/init.hxx
index e62da3e..98defde 100644
--- a/build2/cc/init.hxx
+++ b/build2/cc/init.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_CC_INIT_HXX
 #define BUILD2_CC_INIT_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/module.hxx>
+#include <libbuild2/module.hxx>
 
 namespace build2
 {
diff --git a/build2/cc/install-rule.cxx b/build2/cc/install-rule.cxx
index 5f8722b..ce2424c 100644
--- a/build2/cc/install-rule.cxx
+++ b/build2/cc/install-rule.cxx
@@ -4,7 +4,7 @@
 
 #include <build2/cc/install-rule.hxx>
 
-#include <build2/algorithm.hxx>
+#include <libbuild2/algorithm.hxx>
 
 #include <build2/bin/target.hxx>
 
diff --git a/build2/cc/install-rule.hxx b/build2/cc/install-rule.hxx
index 7616b61..ea966b8 100644
--- a/build2/cc/install-rule.hxx
+++ b/build2/cc/install-rule.hxx
@@ -5,8 +5,8 @@
 #ifndef BUILD2_CC_INSTALL_RULE_HXX
 #define BUILD2_CC_INSTALL_RULE_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
 #include <build2/install/rule.hxx>
 
diff --git a/build2/cc/lexer.hxx b/build2/cc/lexer.hxx
index c8b1042..5d5fa60 100644
--- a/build2/cc/lexer.hxx
+++ b/build2/cc/lexer.hxx
@@ -8,10 +8,10 @@
 #include <libbutl/sha256.mxx>
 #include <libbutl/char-scanner.mxx>
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/diagnostics.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 namespace build2
 {
diff --git a/build2/cc/lexer.test.cxx b/build2/cc/lexer.test.cxx
index a2e33b7..4acc304 100644
--- a/build2/cc/lexer.test.cxx
+++ b/build2/cc/lexer.test.cxx
@@ -5,8 +5,8 @@
 #include <cassert>
 #include <iostream>
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
 #include <build2/cc/lexer.hxx>
 
diff --git a/build2/cc/link-rule.cxx b/build2/cc/link-rule.cxx
index 9942f48..6dfcfa9 100644
--- a/build2/cc/link-rule.cxx
+++ b/build2/cc/link-rule.cxx
@@ -10,13 +10,13 @@
 
 #include <libbutl/filesystem.mxx> // file_exists()
 
-#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 <libbuild2/depdb.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/algorithm.hxx>
+#include <libbuild2/filesystem.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/bin/target.hxx>
 
diff --git a/build2/cc/link-rule.hxx b/build2/cc/link-rule.hxx
index 14a8570..487b1cd 100644
--- a/build2/cc/link-rule.hxx
+++ b/build2/cc/link-rule.hxx
@@ -7,10 +7,10 @@
 
 #include <set>
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/rule.hxx>
+#include <libbuild2/rule.hxx>
 
 #include <build2/cc/types.hxx>
 #include <build2/cc/common.hxx>
diff --git a/build2/cc/module.cxx b/build2/cc/module.cxx
index 7ea790b..ec35444 100644
--- a/build2/cc/module.cxx
+++ b/build2/cc/module.cxx
@@ -6,9 +6,9 @@
 
 #include <iomanip> // left, setw()
 
-#include <build2/scope.hxx>
-#include <build2/context.hxx>
-#include <build2/diagnostics.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/bin/target.hxx>
 
diff --git a/build2/cc/module.hxx b/build2/cc/module.hxx
index f277f95..a7f787f 100644
--- a/build2/cc/module.hxx
+++ b/build2/cc/module.hxx
@@ -5,11 +5,11 @@
 #ifndef BUILD2_CC_MODULE_HXX
 #define BUILD2_CC_MODULE_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/module.hxx>
-#include <build2/variable.hxx>
+#include <libbuild2/module.hxx>
+#include <libbuild2/variable.hxx>
 
 #include <build2/cc/common.hxx>
 
diff --git a/build2/cc/msvc.cxx b/build2/cc/msvc.cxx
index 08cd43c..e978f6a 100644
--- a/build2/cc/msvc.cxx
+++ b/build2/cc/msvc.cxx
@@ -4,13 +4,13 @@
 
 #include <cstring> // strcmp()
 
-#include <build2/scope.hxx>
-#include <build2/target.hxx>
-#include <build2/context.hxx>
-#include <build2/variable.hxx>
-#include <build2/algorithm.hxx>
-#include <build2/filesystem.hxx>
-#include <build2/diagnostics.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/target.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/algorithm.hxx>
+#include <libbuild2/filesystem.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/bin/target.hxx>
 
diff --git a/build2/cc/parser.hxx b/build2/cc/parser.hxx
index 2050dd1..3a588e9 100644
--- a/build2/cc/parser.hxx
+++ b/build2/cc/parser.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_CC_PARSER_HXX
 #define BUILD2_CC_PARSER_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/diagnostics.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/cc/types.hxx>
 
diff --git a/build2/cc/parser.test.cxx b/build2/cc/parser.test.cxx
index 2269a28..3b2da57 100644
--- a/build2/cc/parser.test.cxx
+++ b/build2/cc/parser.test.cxx
@@ -5,8 +5,8 @@
 #include <cassert>
 #include <iostream>
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
 #include <build2/cc/parser.hxx>
 
diff --git a/build2/cc/pkgconfig.cxx b/build2/cc/pkgconfig.cxx
index dcf3cff..99715be 100644
--- a/build2/cc/pkgconfig.cxx
+++ b/build2/cc/pkgconfig.cxx
@@ -9,13 +9,13 @@
 #  include <libpkgconf/libpkgconf.h>
 #endif
 
-#include <build2/scope.hxx>
-#include <build2/target.hxx>
-#include <build2/context.hxx>
-#include <build2/variable.hxx>
-#include <build2/algorithm.hxx>
-#include <build2/filesystem.hxx>
-#include <build2/diagnostics.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/target.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/algorithm.hxx>
+#include <libbuild2/filesystem.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/install/utility.hxx>
 
diff --git a/build2/cc/target.cxx b/build2/cc/target.cxx
index d31a38c..c637e60 100644
--- a/build2/cc/target.cxx
+++ b/build2/cc/target.cxx
@@ -4,7 +4,7 @@
 
 #include <build2/cc/target.hxx>
 
-#include <build2/context.hxx>
+#include <libbuild2/context.hxx>
 
 using namespace std;
 
diff --git a/build2/cc/target.hxx b/build2/cc/target.hxx
index 6764fe5..fd6f6d5 100644
--- a/build2/cc/target.hxx
+++ b/build2/cc/target.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_CC_TARGET_HXX
 #define BUILD2_CC_TARGET_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/target.hxx>
+#include <libbuild2/target.hxx>
 
 namespace build2
 {
diff --git a/build2/cc/types.hxx b/build2/cc/types.hxx
index 60c9a34..481c3c6 100644
--- a/build2/cc/types.hxx
+++ b/build2/cc/types.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_CC_TYPES_HXX
 #define BUILD2_CC_TYPES_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/target-type.hxx>
+#include <libbuild2/target-type.hxx>
 
 namespace build2
 {
diff --git a/build2/cc/utility.cxx b/build2/cc/utility.cxx
index 2751032..2179c14 100644
--- a/build2/cc/utility.cxx
+++ b/build2/cc/utility.cxx
@@ -4,9 +4,9 @@
 
 #include <build2/cc/utility.hxx>
 
-#include <build2/file.hxx>
-#include <build2/variable.hxx>
-#include <build2/algorithm.hxx> // search()
+#include <libbuild2/file.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/algorithm.hxx> // search()
 
 #include <build2/bin/rule.hxx>
 #include <build2/bin/target.hxx>
diff --git a/build2/cc/utility.hxx b/build2/cc/utility.hxx
index bc6c3fb..80ca741 100644
--- a/build2/cc/utility.hxx
+++ b/build2/cc/utility.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_CC_UTILITY_HXX
 #define BUILD2_CC_UTILITY_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/target.hxx>
+#include <libbuild2/target.hxx>
 #include <build2/bin/target.hxx>
 
 #include <build2/cc/types.hxx>
diff --git a/build2/cc/windows-manifest.cxx b/build2/cc/windows-manifest.cxx
index f890ad5..da12f0f 100644
--- a/build2/cc/windows-manifest.cxx
+++ b/build2/cc/windows-manifest.cxx
@@ -2,12 +2,12 @@
 // copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#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 <libbuild2/scope.hxx>
+#include <libbuild2/target.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/filesystem.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/cc/link-rule.hxx>
 
diff --git a/build2/cc/windows-rpath.cxx b/build2/cc/windows-rpath.cxx
index 9ad2602..d18e36d 100644
--- a/build2/cc/windows-rpath.cxx
+++ b/build2/cc/windows-rpath.cxx
@@ -4,12 +4,12 @@
 
 #include <errno.h> // E*
 
-#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 <libbuild2/scope.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/algorithm.hxx>
+#include <libbuild2/filesystem.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/bin/target.hxx>