5 files changed, 8 insertions, 5 deletions
diff --git a/libbuild2/adhoc-rule-cxx.cxx b/libbuild2/adhoc-rule-cxx.cxx
index df6467f..0cd2ca1 100644
--- a/libbuild2/adhoc-rule-cxx.cxx
+++ b/libbuild2/adhoc-rule-cxx.cxx
@@ -10,6 +10,7 @@
 #include <libbuild2/target.hxx>
 #include <libbuild2/context.hxx>
 #include <libbuild2/algorithm.hxx>
+#include <libbuild2/filesystem.hxx>
 #include <libbuild2/diagnostics.hxx>
 
 using namespace butl;
diff --git a/libbuild2/bin/def-rule.cxx b/libbuild2/bin/def-rule.cxx
index 032d521..63508c5 100644
--- a/libbuild2/bin/def-rule.cxx
+++ b/libbuild2/bin/def-rule.cxx
@@ -7,6 +7,7 @@
 #include <libbuild2/scope.hxx>
 #include <libbuild2/target.hxx>
 #include <libbuild2/algorithm.hxx>
+#include <libbuild2/filesystem.hxx>
 #include <libbuild2/diagnostics.hxx>
 
 #include <libbuild2/bin/target.hxx>
diff --git a/libbuild2/target.ixx b/libbuild2/target.ixx
index fddf1b2..b1e21ae 100644
--- a/libbuild2/target.ixx
+++ b/libbuild2/target.ixx
@@ -3,12 +3,13 @@
 
 #include <cstring> // memcpy()
 
-#include <libbuild2/filesystem.hxx> // mtime()
-
 #include <libbuild2/export.hxx>
 
 namespace build2
 {
+  LIBBUILD2_SYMEXPORT timestamp
+  mtime (const char*); // filesystem.cxx
+
   // target_key
   //
   inline const string& target_key::
@@ -614,7 +615,7 @@ namespace build2
     {
       assert (!p.empty ());
 
-      r = build2::mtime (p).time_since_epoch ().count ();
+      r = build2::mtime (p.string ().c_str ()).time_since_epoch ().count ();
       mtime_.store (r, memory_order_release);
     }
 
diff --git a/libbuild2/target.txx b/libbuild2/target.txx
index 1363935..976d204 100644
--- a/libbuild2/target.txx
+++ b/libbuild2/target.txx
@@ -1,8 +1,6 @@
 // file      : libbuild2/target.txx -*- C++ -*-
 // license   : MIT; see accompanying LICENSE file
 
-#include <libbutl/filesystem.hxx> // dir_iterator
-
 #include <libbuild2/scope.hxx>
 #include <libbuild2/diagnostics.hxx>
 
diff --git a/libbuild2/test/script/runner.cxx b/libbuild2/test/script/runner.cxx
index af5f30a..8054c61 100644
--- a/libbuild2/test/script/runner.cxx
+++ b/libbuild2/test/script/runner.cxx
@@ -3,6 +3,8 @@
 
 #include <libbuild2/test/script/runner.hxx>
 
+#include <libbuild2/filesystem.hxx>
+
 #include <libbuild2/script/run.hxx>
 
 #include <libbuild2/test/common.hxx>