diff --git a/include/cubescript/cubescript.hh b/include/cubescript/cubescript.hh
index 007436d1..f38c4b0e 100644
--- a/include/cubescript/cubescript.hh
+++ b/include/cubescript/cubescript.hh
@@ -7,6 +7,7 @@
 #include <optional>
 #include <functional>
 #include <type_traits>
+#include <utility>
 
 #include "cubescript_conf.hh"
 
@@ -15,7 +16,6 @@
 #include <ostd/string.hh>
 #include <ostd/vector.hh>
 #include <ostd/range.hh>
-#include <ostd/utility.hh>
 #include <ostd/io.hh>
 #include <ostd/format.hh>
 
diff --git a/src/cs_util.hh b/src/cs_util.hh
index f81eea33..0a57dc30 100644
--- a/src/cs_util.hh
+++ b/src/cs_util.hh
@@ -4,7 +4,6 @@
 #include <type_traits>
 
 #include <ostd/string.hh>
-#include <ostd/utility.hh>
 #include <ostd/unordered_map.hh>
 
 namespace cscript {
diff --git a/src/cs_vm.cc b/src/cs_vm.cc
index 3e7bc003..e1f40b2a 100644
--- a/src/cs_vm.cc
+++ b/src/cs_vm.cc
@@ -1817,7 +1817,7 @@ static bool cs_run_file(
     std::unique_ptr<char[]> buf;
     size_t len;
 
-    ostd::FileStream f(fname, ostd::StreamMode::read);
+    ostd::file_stream f(fname, ostd::stream_mode::READ);
     if (!f.is_open()) {
         return false;
     }