1 files changed, 16 insertions, 5 deletions
diff --git a/libbuild2/types.hxx b/libbuild2/types.hxx
index c260aeb..ea84701 100644
--- a/libbuild2/types.hxx
+++ b/libbuild2/types.hxx
@@ -15,6 +15,7 @@
 
 #include <map>
 #include <set>
+#include <list>
 #include <array>
 #include <tuple>
 #include <regex>
@@ -114,6 +115,7 @@ namespace build2
   using std::multiset;
   using std::array;
   using std::vector;
+  using std::list;
   using butl::vector_view;  // <libbutl/vector-view.hxx>
   using butl::small_vector; // <libbutl/small-vector.hxx>
 
@@ -349,10 +351,16 @@ namespace build2
   // Path printing potentially relative with trailing slash for directories.
   //
   LIBBUILD2_SYMEXPORT ostream&
-  operator<< (ostream&, const ::butl::path&); // utility.cxx
+  operator<< (ostream&, const path&); // utility.cxx
+
+  inline ostream&
+  operator<< (ostream& os, const dir_path& d) // For overload resolution.
+  {
+    return build2::operator<< (os, static_cast<const path&> (d));
+  }
 
   LIBBUILD2_SYMEXPORT ostream&
-  operator<< (ostream&, const ::butl::path_name_view&); // utility.cxx
+  operator<< (ostream&, const path_name_view&); // utility.cxx
 
   // <libbutl/timestamp.hxx>
   //
@@ -371,8 +379,10 @@ namespace build2
   using butl::sha256;
 
   // <libbutl/process.hxx>
+  //
   using butl::process;
   using butl::process_env;
+  using butl::process_exit;
   using butl::process_path;
   using butl::process_error;
 
@@ -421,10 +431,11 @@ namespace build2
   // Print as recall[@effect].
   //
   LIBBUILD2_SYMEXPORT ostream&
-  operator<< (ostream&, const ::butl::process_path&); // utility.cxx
+  operator<< (ostream&, const process_path&); // utility.cxx
 
   // <libbutl/fdstream.hxx>
   //
+  using butl::nullfd;
   using butl::auto_fd;
   using butl::fdpipe;
   using butl::ifdstream;
@@ -506,9 +517,9 @@ namespace build2
 
     location_value (const location&);
 
-    location_value (location_value&&);
+    location_value (location_value&&) noexcept;
     location_value (const location_value&);
-    location_value& operator= (location_value&&);
+    location_value& operator= (location_value&&) noexcept;
     location_value& operator= (const location_value&);
   };