diff --git a/core/encoding/cbor/cbor.odin b/core/encoding/cbor/cbor.odin
index 7e0f4ea1a..f879a11aa 100644
--- a/core/encoding/cbor/cbor.odin
+++ b/core/encoding/cbor/cbor.odin
@@ -1,7 +1,8 @@
 package cbor
 
+import "base:intrinsics"
+
 import "core:encoding/json"
-import "core:intrinsics"
 import "core:io"
 import "core:mem"
 import "core:strconv"
diff --git a/core/encoding/cbor/coding.odin b/core/encoding/cbor/coding.odin
index a5f21af1f..5719078c7 100644
--- a/core/encoding/cbor/coding.odin
+++ b/core/encoding/cbor/coding.odin
@@ -1,10 +1,11 @@
 package cbor
 
+import "base:intrinsics"
+import "base:runtime"
+
 import "core:bytes"
 import "core:encoding/endian"
-import "core:intrinsics"
 import "core:io"
-import "core:runtime"
 import "core:slice"
 import "core:strings"
 
diff --git a/core/encoding/cbor/marshal.odin b/core/encoding/cbor/marshal.odin
index 4a0619c04..7d93088cb 100644
--- a/core/encoding/cbor/marshal.odin
+++ b/core/encoding/cbor/marshal.odin
@@ -1,11 +1,12 @@
 package cbor
 
+import "base:intrinsics"
+import "base:runtime"
+
 import "core:bytes"
-import "core:intrinsics"
 import "core:io"
 import "core:mem"
 import "core:reflect"
-import "core:runtime"
 import "core:slice"
 import "core:strconv"
 import "core:strings"
diff --git a/core/encoding/cbor/tags.odin b/core/encoding/cbor/tags.odin
index efe724f8c..c9ddaed56 100644
--- a/core/encoding/cbor/tags.odin
+++ b/core/encoding/cbor/tags.odin
@@ -1,12 +1,13 @@
 package cbor
 
+import "base:runtime"
+
 import "core:encoding/base64"
 import "core:io"
 import "core:math"
 import "core:math/big"
 import "core:mem"
 import "core:reflect"
-import "core:runtime"
 import "core:strings"
 import "core:time"
 
diff --git a/core/encoding/cbor/unmarshal.odin b/core/encoding/cbor/unmarshal.odin
index eec999c12..eef5d3d99 100644
--- a/core/encoding/cbor/unmarshal.odin
+++ b/core/encoding/cbor/unmarshal.odin
@@ -1,10 +1,11 @@
 package cbor
 
-import "core:intrinsics"
+import "base:intrinsics"
+import "base:runtime"
+
 import "core:io"
 import "core:mem"
 import "core:reflect"
-import "core:runtime"
 import "core:strings"
 import "core:unicode/utf8"
 
diff --git a/tests/core/encoding/base64/base64.odin b/tests/core/encoding/base64/base64.odin
index 41dbba683..e48eea020 100644
--- a/tests/core/encoding/base64/base64.odin
+++ b/tests/core/encoding/base64/base64.odin
@@ -1,8 +1,9 @@
 package test_encoding_base64
 
+import "base:intrinsics"
+
 import "core:encoding/base64"
 import "core:fmt"
-import "core:intrinsics"
 import "core:os"
 import "core:reflect"
 import "core:testing"
diff --git a/tests/core/encoding/cbor/test_core_cbor.odin b/tests/core/encoding/cbor/test_core_cbor.odin
index e7a3ef419..8262e5da4 100644
--- a/tests/core/encoding/cbor/test_core_cbor.odin
+++ b/tests/core/encoding/cbor/test_core_cbor.odin
@@ -1,9 +1,10 @@
 package test_encoding_cbor
 
+import "base:intrinsics"
+
 import "core:bytes"
 import "core:encoding/cbor"
 import "core:fmt"
-import "core:intrinsics"
 import "core:io"
 import "core:math/big"
 import "core:mem"