2 files changed, 11 insertions, 6 deletions
diff --git a/cli/semantics/elements.hxx b/cli/semantics/elements.hxx
index f9b08fc..da9e031 100644
--- a/cli/semantics/elements.hxx
+++ b/cli/semantics/elements.hxx
@@ -15,6 +15,8 @@
 #include <utility> // std::pair
 #include <cassert>
 
+#include <cutl/fs/path.hxx>
+
 #include <cutl/container/graph.hxx>
 #include <cutl/container/pointer-iterator.hxx>
 
@@ -35,9 +37,11 @@ namespace semantics
 
   //
   //
-  typedef string path;
   typedef string name;
 
+  using fs::path;
+  using fs::invalid_path;
+
 
   //
   //
@@ -141,6 +145,7 @@ namespace semantics
     // For virtual inheritance. Should never be actually called.
     //
     node ()
+        : file_ ("")
     {
       std::abort ();
     }
diff --git a/cli/semantics/unit.hxx b/cli/semantics/unit.hxx
index c15d172..a67e1ff 100644
--- a/cli/semantics/unit.hxx
+++ b/cli/semantics/unit.hxx
@@ -30,7 +30,7 @@ namespace semantics
       return *includer_;
     }
 
-    path
+    string const&
     file () const
     {
       return file_;
@@ -39,7 +39,7 @@ namespace semantics
   protected:
     friend class graph<node, edge>;
 
-    includes (path const& file)
+    includes (string const& file)
         : file_ (file)
     {
     }
@@ -51,7 +51,7 @@ namespace semantics
     }
 
   protected:
-    path file_;
+    string file_;
     cli_unit* includer_;
   };
 
@@ -69,7 +69,7 @@ namespace semantics
   protected:
     friend class graph<node, edge>;
 
-    cli_includes (path const& file)
+    cli_includes (string const& file)
         : includes (file)
     {
     }
@@ -98,7 +98,7 @@ namespace semantics
   protected:
     friend class graph<node, edge>;
 
-    cxx_includes (path const& file)
+    cxx_includes (string const& file)
         : includes (file)
     {
     }