<types>/<utility> scheme cleanup

4 files changed, 10 insertions, 2 deletions

diff --git a/build2/test/module b/build2/test/module
index ba83c5b..8736851 100644
--- a/build2/test/module
+++ b/build2/test/module
@@ -6,6 +6,8 @@
 #define BUILD2_TEST_MODULE
 
 #include <build2/types>
+#include <build2/utility>
+
 #include <build2/module>
 
 namespace build2
diff --git a/build2/test/operation b/build2/test/operation
index 5dca166..9a7370e 100644
--- a/build2/test/operation
+++ b/build2/test/operation
@@ -5,6 +5,9 @@
 #ifndef BUILD2_TEST_OPERATION
 #define BUILD2_TEST_OPERATION
 
+#include <build2/types>
+#include <build2/utility>
+
 #include <build2/operation>
 
 namespace build2
diff --git a/build2/test/rule b/build2/test/rule
index 7364bf6..8d18a35 100644
--- a/build2/test/rule
+++ b/build2/test/rule
@@ -5,6 +5,9 @@
 #ifndef BUILD2_TEST_RULE
 #define BUILD2_TEST_RULE
 
+#include <build2/types>
+#include <build2/utility>
+
 #include <build2/rule>
 #include <build2/operation>
 
@@ -16,7 +19,7 @@ namespace build2
     {
     public:
       virtual match_result
-      match (action, target&, const std::string&) const;
+      match (action, target&, const string&) const;
 
       virtual recipe
       apply (action, target&, const match_result&) const;
diff --git a/build2/test/rule.cxx b/build2/test/rule.cxx
index e5b8eb2..c7de054 100644
--- a/build2/test/rule.cxx
+++ b/build2/test/rule.cxx
@@ -21,7 +21,7 @@ namespace build2
   namespace test
   {
     match_result rule::
-    match (action a, target& t, const std::string&) const
+    match (action a, target& t, const string&) const
     {
       // First determine if this is a test. This is controlled by
       // the test target variable and text.<tt> scope variables.