8 files changed, 35 insertions, 35 deletions
diff --git a/build2/config/init.cxx b/build2/config/init.cxx
index 7b518ab..bd2d573 100644
--- a/build2/config/init.cxx
+++ b/build2/config/init.cxx
@@ -4,12 +4,12 @@
 
 #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 <libbuild2/file.hxx>
+#include <libbuild2/rule.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/filesystem.hxx>  // exists()
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/config/module.hxx>
 #include <build2/config/utility.hxx>
diff --git a/build2/config/init.hxx b/build2/config/init.hxx
index 2ac0f96..5a9b66d 100644
--- a/build2/config/init.hxx
+++ b/build2/config/init.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_CONFIG_INIT_HXX
 #define BUILD2_CONFIG_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/config/module.hxx b/build2/config/module.hxx
index 10dac40..0c78b18 100644
--- a/build2/config/module.hxx
+++ b/build2/config/module.hxx
@@ -9,11 +9,11 @@
 
 #include <libbutl/prefix-map.mxx>
 
-#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>
 
 namespace build2
 {
diff --git a/build2/config/operation.cxx b/build2/config/operation.cxx
index f857330..ff5b44a 100644
--- a/build2/config/operation.cxx
+++ b/build2/config/operation.cxx
@@ -6,14 +6,14 @@
 
 #include <set>
 
-#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 <libbuild2/file.hxx>
+#include <libbuild2/spec.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/target.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/algorithm.hxx>
+#include <libbuild2/filesystem.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/config/module.hxx>
 #include <build2/config/utility.hxx>
diff --git a/build2/config/operation.hxx b/build2/config/operation.hxx
index 2892885..9f426ca 100644
--- a/build2/config/operation.hxx
+++ b/build2/config/operation.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_CONFIG_OPERATION_HXX
 #define BUILD2_CONFIG_OPERATION_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/operation.hxx>
+#include <libbuild2/operation.hxx>
 
 namespace build2
 {
diff --git a/build2/config/utility.cxx b/build2/config/utility.cxx
index e15c689..1ce07f7 100644
--- a/build2/config/utility.cxx
+++ b/build2/config/utility.cxx
@@ -4,10 +4,10 @@
 
 #include <build2/config/utility.hxx>
 
-#include <build2/file.hxx>
-#include <build2/context.hxx>
-#include <build2/filesystem.hxx>
-#include <build2/diagnostics.hxx>
+#include <libbuild2/file.hxx>
+#include <libbuild2/context.hxx>
+#include <libbuild2/filesystem.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/config/module.hxx>
 
diff --git a/build2/config/utility.hxx b/build2/config/utility.hxx
index eff1a02..5e4eac2 100644
--- a/build2/config/utility.hxx
+++ b/build2/config/utility.hxx
@@ -5,12 +5,12 @@
 #ifndef BUILD2_CONFIG_UTILITY_HXX
 #define BUILD2_CONFIG_UTILITY_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/scope.hxx>
-#include <build2/variable.hxx>
-#include <build2/diagnostics.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 namespace build2
 {
diff --git a/build2/config/utility.txx b/build2/config/utility.txx
index b8e0acc..84650d9 100644
--- a/build2/config/utility.txx
+++ b/build2/config/utility.txx
@@ -2,8 +2,8 @@
 // copyright : Copyright (c) 2014-2019 Code Synthesis Ltd
 // license   : MIT; see accompanying LICENSE file
 
-#include <build2/scope.hxx>
-#include <build2/context.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/context.hxx>
 
 namespace build2
 {