diff --git a/globs.cc b/globs.cc
index 473140c..6940dcb 100644
--- a/globs.cc
+++ b/globs.cc
@@ -2,8 +2,9 @@
 #include <ostd/string.hh>
 #include <ostd/vector.hh>
 #include <ostd/filesystem.hh>
+#include <ostd/io.hh>
 
-#include "globs.hh"
+#include <cubescript.hh>
 
 using ostd::ConstCharRange;
 using ostd::Vector;
diff --git a/main.cc b/main.cc
index be89731..56a3906 100644
--- a/main.cc
+++ b/main.cc
@@ -5,6 +5,7 @@
 #include <ostd/map.hh>
 #include <ostd/atomic.hh>
 #include <ostd/filesystem.hh>
+#include <ostd/io.hh>
 #include <ostd/platform.hh>
 #include <ostd/utility.hh>
 #include <ostd/thread.hh>
@@ -458,11 +459,7 @@ int main(int argc, char **argv) {
     ConstCharRange lslash = ostd::find_last(pn, '/');
     os.progname = lslash.empty() ? pn : (lslash + 1);
 
-    cscript::init_lib_base(os);
-    cscript::init_lib_io(os);
-    cscript::init_lib_math(os);
-    cscript::init_lib_string(os);
-    cscript::init_lib_list(os);
+    cscript::init_libs(os);
 
     int ncpus = ostd::Thread::hardware_concurrency();
     os.add_ident(cscript::ID_VAR, "numcpus", 4096, 1, &ncpus);