8 files changed, 20 insertions, 20 deletions
diff --git a/build2/bin/guess.cxx b/build2/bin/guess.cxx
index c5effd7..d1b1545 100644
--- a/build2/bin/guess.cxx
+++ b/build2/bin/guess.cxx
@@ -4,7 +4,7 @@
 
 #include <build2/bin/guess.hxx>
 
-#include <build2/diagnostics.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 using namespace std;
 
diff --git a/build2/bin/guess.hxx b/build2/bin/guess.hxx
index a9c7246..a3b2b34 100644
--- a/build2/bin/guess.hxx
+++ b/build2/bin/guess.hxx
@@ -5,8 +5,8 @@
 #ifndef BUILD2_BIN_GUESS_HXX
 #define BUILD2_BIN_GUESS_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
 namespace build2
 {
diff --git a/build2/bin/init.cxx b/build2/bin/init.cxx
index cf47fbe..37fad6b 100644
--- a/build2/bin/init.cxx
+++ b/build2/bin/init.cxx
@@ -6,9 +6,9 @@
 
 #include <map>
 
-#include <build2/scope.hxx>
-#include <build2/variable.hxx>
-#include <build2/diagnostics.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/variable.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/config/utility.hxx>
 
diff --git a/build2/bin/init.hxx b/build2/bin/init.hxx
index c58dbfd..989dcaf 100644
--- a/build2/bin/init.hxx
+++ b/build2/bin/init.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_BIN_INIT_HXX
 #define BUILD2_BIN_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/bin/rule.cxx b/build2/bin/rule.cxx
index 7eaa308..42ba86a 100644
--- a/build2/bin/rule.cxx
+++ b/build2/bin/rule.cxx
@@ -4,10 +4,10 @@
 
 #include <build2/bin/rule.hxx>
 
-#include <build2/scope.hxx>
-#include <build2/target.hxx>
-#include <build2/algorithm.hxx>
-#include <build2/diagnostics.hxx>
+#include <libbuild2/scope.hxx>
+#include <libbuild2/target.hxx>
+#include <libbuild2/algorithm.hxx>
+#include <libbuild2/diagnostics.hxx>
 
 #include <build2/bin/target.hxx>
 
diff --git a/build2/bin/rule.hxx b/build2/bin/rule.hxx
index 19902c9..4230933 100644
--- a/build2/bin/rule.hxx
+++ b/build2/bin/rule.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_BIN_RULE_HXX
 #define BUILD2_BIN_RULE_HXX
 
-#include <build2/types.hxx>
-#include <build2/utility.hxx>
+#include <libbuild2/types.hxx>
+#include <libbuild2/utility.hxx>
 
-#include <build2/rule.hxx>
+#include <libbuild2/rule.hxx>
 
 namespace build2
 {
diff --git a/build2/bin/target.cxx b/build2/bin/target.cxx
index c602f3b..46f19bd 100644
--- a/build2/bin/target.cxx
+++ b/build2/bin/target.cxx
@@ -4,7 +4,7 @@
 
 #include <build2/bin/target.hxx>
 
-#include <build2/context.hxx>
+#include <libbuild2/context.hxx>
 
 using namespace std;
 
diff --git a/build2/bin/target.hxx b/build2/bin/target.hxx
index 1430477..a56c636 100644
--- a/build2/bin/target.hxx
+++ b/build2/bin/target.hxx
@@ -5,10 +5,10 @@
 #ifndef BUILD2_BIN_TARGET_HXX
 #define BUILD2_BIN_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
 {