diff --git a/include/cubescript/cubescript.hh b/include/cubescript/cubescript.hh
index b77d8d56..8e796273 100644
--- a/include/cubescript/cubescript.hh
+++ b/include/cubescript/cubescript.hh
@@ -12,7 +12,6 @@
 #include "cubescript_conf.hh"
 
 #include <ostd/platform.hh>
-#include <ostd/types.hh>
 #include <ostd/string.hh>
 #include <ostd/vector.hh>
 #include <ostd/range.hh>
diff --git a/src/cs_vm.hh b/src/cs_vm.hh
index f3947918..a0b87af1 100644
--- a/src/cs_vm.hh
+++ b/src/cs_vm.hh
@@ -181,7 +181,9 @@ struct cs_gen_state {
         if (word.size() <= 3 && !macro) {
             uint32_t op = CsCodeValInt | CsRetString;
             for (size_t i = 0; i < word.size(); ++i) {
-                op |= uint32_t(ostd::byte(word[i])) << ((i + 1) * 8);
+                op |= uint32_t(
+                    static_cast<unsigned char>(word[i])
+                ) << ((i + 1) * 8);
             }
             code.push_back(op);
             return;
diff --git a/src/lib_str.cc b/src/lib_str.cc
index cbd08436..8e7cd225 100644
--- a/src/lib_str.cc
+++ b/src/lib_str.cc
@@ -45,7 +45,7 @@ void cs_init_lib_string(cs_state &cs) {
         if (i >= cs_int(str.size())) {
             res.set_int(0);
         } else {
-            res.set_int(ostd::byte(str[i]));
+            res.set_int(static_cast<unsigned char>(str[i]));
         }
     });