diff --git a/src/ox/model/desctypes.hpp b/src/ox/model/desctypes.hpp
index 0432f9449..83f24020f 100644
--- a/src/ox/model/desctypes.hpp
+++ b/src/ox/model/desctypes.hpp
@@ -10,7 +10,7 @@
 
 #include <ox/std/error.hpp>
 #include <ox/std/hashmap.hpp>
-#include <ox/std/string.hpp>
+#include <ox/std/bstring.hpp>
 #include <ox/std/vector.hpp>
 
 namespace ox {
diff --git a/src/ox/model/descwrite.hpp b/src/ox/model/descwrite.hpp
index a1cb3577c..75f672685 100644
--- a/src/ox/model/descwrite.hpp
+++ b/src/ox/model/descwrite.hpp
@@ -10,7 +10,7 @@
 
 #include <ox/std/byteswap.hpp>
 #include <ox/std/hashmap.hpp>
-#include <ox/std/string.hpp>
+#include <ox/std/bstring.hpp>
 #include <ox/std/trace.hpp>
 #include <ox/std/types.hpp>
 #include <ox/std/vector.hpp>
diff --git a/src/ox/model/types.hpp b/src/ox/model/types.hpp
index 8d131a068..3cf52db48 100644
--- a/src/ox/model/types.hpp
+++ b/src/ox/model/types.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include <ox/std/string.hpp>
+#include <ox/std/bstring.hpp>
 #include <ox/std/strops.hpp>
 #include <ox/std/types.hpp>
 
diff --git a/src/ox/std/hashmap.hpp b/src/ox/std/hashmap.hpp
index 76e85f598..97c35a19d 100644
--- a/src/ox/std/hashmap.hpp
+++ b/src/ox/std/hashmap.hpp
@@ -8,7 +8,7 @@
 
 #pragma once
 
-#include "string.hpp"
+#include "strops.hpp"
 #include "vector.hpp"
 
 namespace ox {
diff --git a/src/ox/std/std.hpp b/src/ox/std/std.hpp
index c19dbc192..dfc49797a 100644
--- a/src/ox/std/std.hpp
+++ b/src/ox/std/std.hpp
@@ -10,6 +10,7 @@
 
 #include "assert.hpp"
 #include "bit.hpp"
+#include "bstring.hpp"
 #include "byteswap.hpp"
 #include "error.hpp"
 #include "hardware.hpp"
diff --git a/src/ox/std/string.hpp b/src/ox/std/string.hpp
index 43f791d0b..3a3199490 100644
--- a/src/ox/std/string.hpp
+++ b/src/ox/std/string.hpp
@@ -8,7 +8,6 @@
 
 #pragma once
 
-#include "bstring.hpp"
 #include "memops.hpp"
 #include "strops.hpp"
 #include "typetraits.hpp"