diff --git a/src/DynamicModel.cc b/src/DynamicModel.cc
index 75a798273fe78611fd07601f61ea54f30b017b41..096537a94a2395184cc7ae281855673ad784c517 100644
--- a/src/DynamicModel.cc
+++ b/src/DynamicModel.cc
@@ -3471,8 +3471,8 @@ DynamicModel::writeDynamicFile(const string &basename, bool block, bool use_dll,
   filesystem::path model_dir{basename};
   model_dir /= "model";
   if (use_dll)
-    filesystem::create_directories(model_dir / "src");
-  filesystem::create_directories(model_dir / "bytecode");
+    create_directories(model_dir / "src");
+  create_directories(model_dir / "bytecode");
 
   if (block)
     {
diff --git a/src/ModFile.cc b/src/ModFile.cc
index a3a4b2269ce04450d00f1e786214fe53da455253..6e989c090f5c0ec5e6bdd278956339f6beed8406 100644
--- a/src/ModFile.cc
+++ b/src/ModFile.cc
@@ -793,19 +793,19 @@ ModFile::writeMOutput(const string &basename, bool clear_all, bool clear_global,
          it before deleting it (the renaming must occur in the same directory,
          otherwise it may file if the destination is not on the same
          filesystem). */
-      if (filesystem::path plusfolder{"+" + basename}; filesystem::exists(plusfolder))
+      if (filesystem::path plusfolder{"+" + basename}; exists(plusfolder))
         {
-          if (filesystem::exists(plusfolder / "+objective"))
+          if (exists(plusfolder / "+objective"))
             {
               // Do it recursively for the +objective folder, created by ramsey_policy
               auto tmp2 = unique_path();
-              filesystem::rename(plusfolder / "+objective", tmp2);
-              filesystem::remove_all(tmp2);
+              rename(plusfolder / "+objective", tmp2);
+              remove_all(tmp2);
             }
 
           auto tmp = unique_path();
-          filesystem::rename(plusfolder, tmp);
-          filesystem::remove_all(tmp);
+          rename(plusfolder, tmp);
+          remove_all(tmp);
         }
       filesystem::remove_all(basename + "/model/src");
       filesystem::remove_all(basename + "/model/bytecode");
@@ -1408,7 +1408,7 @@ ModFile::unique_path()
         dis = possible_characters[distribution(generator)];
       path = rand_str;
     }
-  while (filesystem::exists(path));
+  while (exists(path));
 
   return path;
 }
diff --git a/src/StaticModel.cc b/src/StaticModel.cc
index b01230b5ebf69a3b32c415515a8a151b18d2e9df..f4d24f70692ce934e689e9d4c5036fdbf533e9c8 100644
--- a/src/StaticModel.cc
+++ b/src/StaticModel.cc
@@ -844,8 +844,8 @@ StaticModel::writeStaticFile(const string &basename, bool block, bool use_dll, c
   filesystem::path model_dir{basename};
   model_dir /= "model";
   if (use_dll)
-    filesystem::create_directories(model_dir / "src");
-  filesystem::create_directories(model_dir / "bytecode");
+    create_directories(model_dir / "src");
+  create_directories(model_dir / "bytecode");
 
   if (block)
     {