diff --git a/command.cc b/cubescript.cc
similarity index 99%
rename from command.cc
rename to cubescript.cc
index f14fe1ac..9bd4d1e2 100644
--- a/command.cc
+++ b/cubescript.cc
@@ -1,4 +1,11 @@
-#include "command.hh"
+#include "cubescript.hh"
+
+#include <limits.h>
+#include <ctype.h>
+#include <math.h>
+
+#include <ostd/algorithm.hh>
+#include <ostd/format.hh>
 
 namespace cscript {
 
diff --git a/command.hh b/cubescript.hh
similarity index 98%
rename from command.hh
rename to cubescript.hh
index d9f40b19..89c62ffa 100644
--- a/command.hh
+++ b/cubescript.hh
@@ -1,22 +1,16 @@
 #include <stdio.h>
 #include <stdlib.h>
-#include <stddef.h>
-#include <stdarg.h>
-#include <string.h>
-#include <ctype.h>
-#include <limits.h>
-#include <math.h>
 
-#include <ostd/algorithm.hh>
-#include <ostd/array.hh>
-#include <ostd/vector.hh>
+#include <ostd/types.hh>
 #include <ostd/string.hh>
+#include <ostd/vector.hh>
+#include <ostd/array.hh>
 #include <ostd/keyset.hh>
-#include <ostd/format.hh>
-#include <ostd/functional.hh>
-#include <ostd/map.hh>
-#include <ostd/io.hh>
+#include <ostd/range.hh>
+#include <ostd/utility.hh>
 #include <ostd/maybe.hh>
+#include <ostd/io.hh>
+#include <ostd/functional.hh>
 
 namespace cscript {