Replace `core:*` to `base:*` where appropriate

180 files changed, 225 insertions, 225 deletions

diff --git a/core/bufio/scanner.odin b/core/bufio/scanner.odin
index b9e620250..ee2d5d1f6 100644
--- a/core/bufio/scanner.odin
+++ b/core/bufio/scanner.odin
@@ -4,7 +4,7 @@ import "core:bytes"
 import "core:io"
 import "core:mem"
 import "core:unicode/utf8"
-import "core:intrinsics"
+import "base:intrinsics"
 
 // Extra errors returns by scanning procedures
 Scanner_Extra_Error :: enum i32 {
diff --git a/core/c/c.odin b/core/c/c.odin
index 05732476f..edd88d228 100644
--- a/core/c/c.odin
+++ b/core/c/c.odin
@@ -1,6 +1,6 @@
 package c
 
-import builtin "core:builtin"
+import builtin "base:builtin"
 
 char           :: builtin.u8  // assuming -funsigned-char
 
diff --git a/core/c/libc/complex.odin b/core/c/libc/complex.odin
index 7f2ca37ae..81d2b75be 100644
--- a/core/c/libc/complex.odin
+++ b/core/c/libc/complex.odin
@@ -67,7 +67,7 @@ foreign libc {
 	crealf  :: proc(z: complex_float) -> float ---
 }
 
-import builtin "core:builtin"
+import builtin "base:builtin"
 
 complex_float  :: distinct builtin.complex64
 complex_double :: distinct builtin.complex128
diff --git a/core/c/libc/math.odin b/core/c/libc/math.odin
index 0a6ecc0c3..81d51728d 100644
--- a/core/c/libc/math.odin
+++ b/core/c/libc/math.odin
@@ -2,7 +2,7 @@ package libc
 
 // 7.12 Mathematics
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 when ODIN_OS == .Windows {
 	foreign import libc "system:libucrt.lib"
diff --git a/core/c/libc/stdarg.odin b/core/c/libc/stdarg.odin
index b79b22b5a..faae6a6c6 100644
--- a/core/c/libc/stdarg.odin
+++ b/core/c/libc/stdarg.odin
@@ -2,7 +2,7 @@ package libc
 
 // 7.16 Variable arguments
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 @(private="file")
 @(default_calling_convention="none")
diff --git a/core/c/libc/stdatomic.odin b/core/c/libc/stdatomic.odin
index 6e1581c58..8dc243b78 100644
--- a/core/c/libc/stdatomic.odin
+++ b/core/c/libc/stdatomic.odin
@@ -2,7 +2,7 @@ package libc
 
 // 7.17 Atomics
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 ATOMIC_BOOL_LOCK_FREE     :: true
 ATOMIC_CHAR_LOCK_FREE     :: true
diff --git a/core/c/libc/string.odin b/core/c/libc/string.odin
index 8f83ee1b9..e6a959f7b 100644
--- a/core/c/libc/string.odin
+++ b/core/c/libc/string.odin
@@ -1,6 +1,6 @@
 package libc
 
-import "core:runtime"
+import "base:runtime"
 
 // 7.24 String handling
 
diff --git a/core/compress/common.odin b/core/compress/common.odin
index b343ce493..b22172e61 100644
--- a/core/compress/common.odin
+++ b/core/compress/common.odin
@@ -12,7 +12,7 @@ package compress
 
 import "core:io"
 import "core:bytes"
-import "core:runtime"
+import "base:runtime"
 
 /*
 	These settings bound how much compression algorithms will allocate for their output buffer.
diff --git a/core/compress/shoco/shoco.odin b/core/compress/shoco/shoco.odin
index 04b0bfdc2..e65acb0bc 100644
--- a/core/compress/shoco/shoco.odin
+++ b/core/compress/shoco/shoco.odin
@@ -11,7 +11,7 @@
 // package shoco is an implementation of the shoco short string compressor
 package shoco
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:compress"
 
 Shoco_Pack :: struct {
diff --git a/core/container/bit_array/bit_array.odin b/core/container/bit_array/bit_array.odin
index d649d039f..dbd2e0d3a 100644
--- a/core/container/bit_array/bit_array.odin
+++ b/core/container/bit_array/bit_array.odin
@@ -1,6 +1,6 @@
 package dynamic_bit_array
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:mem"
 
 /*
diff --git a/core/container/intrusive/list/intrusive_list.odin b/core/container/intrusive/list/intrusive_list.odin
index 7302f24f5..1a3175002 100644
--- a/core/container/intrusive/list/intrusive_list.odin
+++ b/core/container/intrusive/list/intrusive_list.odin
@@ -1,6 +1,6 @@
 package container_intrusive_list
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 // An intrusive doubly-linked list
 //
diff --git a/core/container/lru/lru_cache.odin b/core/container/lru/lru_cache.odin
index b59f29f0c..23f01fac3 100644
--- a/core/container/lru/lru_cache.odin
+++ b/core/container/lru/lru_cache.odin
@@ -1,7 +1,7 @@
 package container_lru
 
-import "core:runtime"
-import "core:intrinsics"
+import "base:runtime"
+import "base:intrinsics"
 _ :: runtime
 _ :: intrinsics
 
diff --git a/core/container/priority_queue/priority_queue.odin b/core/container/priority_queue/priority_queue.odin
index 0c43816e1..8a6d77288 100644
--- a/core/container/priority_queue/priority_queue.odin
+++ b/core/container/priority_queue/priority_queue.odin
@@ -1,6 +1,6 @@
 package container_priority_queue
 
-import "core:builtin"
+import "base:builtin"
 
 Priority_Queue :: struct($T: typeid) {
 	queue: [dynamic]T,
diff --git a/core/container/queue/queue.odin b/core/container/queue/queue.odin
index bdc61c2a6..e46dccb33 100644
--- a/core/container/queue/queue.odin
+++ b/core/container/queue/queue.odin
@@ -1,7 +1,7 @@
 package container_queue
 
-import "core:builtin"
-import "core:runtime"
+import "base:builtin"
+import "base:runtime"
 _ :: runtime
 
 // Dynamically resizable double-ended queue/ring-buffer
diff --git a/core/container/small_array/small_array.odin b/core/container/small_array/small_array.odin
index b471d1706..ecec7b80c 100644
--- a/core/container/small_array/small_array.odin
+++ b/core/container/small_array/small_array.odin
@@ -1,7 +1,7 @@
 package container_small_array
 
-import "core:builtin"
-import "core:runtime"
+import "base:builtin"
+import "base:runtime"
 _ :: runtime
 
 Small_Array :: struct($N: int, $T: typeid) where N >= 0 {
diff --git a/core/container/topological_sort/topological_sort.odin b/core/container/topological_sort/topological_sort.odin
index f1e9bf57b..0d34e8d02 100644
--- a/core/container/topological_sort/topological_sort.odin
+++ b/core/container/topological_sort/topological_sort.odin
@@ -3,8 +3,8 @@
 // map type is being used to accelerate lookups.
 package container_topological_sort
 
-import "core:intrinsics"
-import "core:runtime"
+import "base:intrinsics"
+import "base:runtime"
 _ :: intrinsics
 _ :: runtime
 
diff --git a/core/dynlib/lib.odin b/core/dynlib/lib.odin
index e9ee77d2c..8d603f2e4 100644
--- a/core/dynlib/lib.odin
+++ b/core/dynlib/lib.odin
@@ -1,8 +1,8 @@
 package dynlib
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:reflect"
-import "core:runtime"
+import "base:runtime"
 _ :: intrinsics
 _ :: reflect
 _ :: runtime
diff --git a/core/dynlib/lib_windows.odin b/core/dynlib/lib_windows.odin
index 9a1b5f998..c7bfe1537 100644
--- a/core/dynlib/lib_windows.odin
+++ b/core/dynlib/lib_windows.odin
@@ -4,7 +4,7 @@ package dynlib
 
 import win32 "core:sys/windows"
 import "core:strings"
-import "core:runtime"
+import "base:runtime"
 import "core:reflect"
 
 _load_library :: proc(path: string, global_symbols := false) -> (Library, bool) {
diff --git a/core/encoding/endian/endian.odin b/core/encoding/endian/endian.odin
index d70d873be..708b919fb 100644
--- a/core/encoding/endian/endian.odin
+++ b/core/encoding/endian/endian.odin
@@ -1,6 +1,6 @@
 package encoding_endian
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:math/bits"
 
 Byte_Order :: enum u8 {
diff --git a/core/encoding/json/marshal.odin b/core/encoding/json/marshal.odin
index ab2af9561..e9285364b 100644
--- a/core/encoding/json/marshal.odin
+++ b/core/encoding/json/marshal.odin
@@ -2,7 +2,7 @@ package json
 
 import "core:mem"
 import "core:math/bits"
-import "core:runtime"
+import "base:runtime"
 import "core:strconv"
 import "core:strings"
 import "core:reflect"
diff --git a/core/encoding/json/unmarshal.odin b/core/encoding/json/unmarshal.odin
index c1905f6b0..0a55bb553 100644
--- a/core/encoding/json/unmarshal.odin
+++ b/core/encoding/json/unmarshal.odin
@@ -5,7 +5,7 @@ import "core:math"
 import "core:reflect"
 import "core:strconv"
 import "core:strings"
-import "core:runtime"
+import "base:runtime"
 
 Unmarshal_Data_Error :: enum {
 	Invalid_Data,
diff --git a/core/encoding/xml/xml_reader.odin b/core/encoding/xml/xml_reader.odin
index 562d519d5..bf8646bc3 100644
--- a/core/encoding/xml/xml_reader.odin
+++ b/core/encoding/xml/xml_reader.odin
@@ -29,11 +29,11 @@ package xml
 
 import "core:bytes"
 import "core:encoding/entity"
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:mem"
 import "core:os"
 import "core:strings"
-import "core:runtime"
+import "base:runtime"
 
 likely :: intrinsics.expect
 
diff --git a/core/fmt/fmt.odin b/core/fmt/fmt.odin
index 25012eb65..a3e5d943c 100644
--- a/core/fmt/fmt.odin
+++ b/core/fmt/fmt.odin
@@ -4,12 +4,12 @@ import "core:math/bits"
 import "core:mem"
 import "core:io"
 import "core:reflect"
-import "core:runtime"
+import "base:runtime"
 import "core:strconv"
 import "core:strings"
 import "core:time"
 import "core:unicode/utf8"
-import "core:intrinsics"
+import "base:intrinsics"
 
 // Internal data structure that stores the required information for formatted printing
 Info :: struct {
diff --git a/core/fmt/fmt_os.odin b/core/fmt/fmt_os.odin
index 3d1b0847b..afc28ffff 100644
--- a/core/fmt/fmt_os.odin
+++ b/core/fmt/fmt_os.odin
@@ -2,7 +2,7 @@
 //+build !js
 package fmt
 
-import "core:runtime"
+import "base:runtime"
 import "core:os"
 import "core:io"
 import "core:bufio"
diff --git a/core/hash/crc32.odin b/core/hash/crc32.odin
index fead4d74f..761444676 100644
--- a/core/hash/crc32.odin
+++ b/core/hash/crc32.odin
@@ -1,6 +1,6 @@
 package hash
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 @(optimization_mode="speed")
 crc32 :: proc(data: []byte, seed := u32(0)) -> u32 #no_bounds_check {
diff --git a/core/hash/hash.odin b/core/hash/hash.odin
index 176d17141..ea99b630c 100644
--- a/core/hash/hash.odin
+++ b/core/hash/hash.odin
@@ -1,7 +1,7 @@
 package hash
 
 import "core:mem"
-import "core:intrinsics"
+import "base:intrinsics"
 
 @(optimization_mode="speed")
 adler32 :: proc(data: []byte, seed := u32(1)) -> u32 #no_bounds_check {
diff --git a/core/hash/xxhash/common.odin b/core/hash/xxhash/common.odin
index 8b34c1e8f..faf88e0d4 100644
--- a/core/hash/xxhash/common.odin
+++ b/core/hash/xxhash/common.odin
@@ -9,8 +9,8 @@
 */
 package xxhash
 
-import "core:intrinsics"
-import "core:runtime"
+import "base:intrinsics"
+import "base:runtime"
 
 mem_copy  :: runtime.mem_copy
 byte_swap :: intrinsics.byte_swap
diff --git a/core/hash/xxhash/streaming.odin b/core/hash/xxhash/streaming.odin
index 6f630b042..07744a12b 100644
--- a/core/hash/xxhash/streaming.odin
+++ b/core/hash/xxhash/streaming.odin
@@ -10,7 +10,7 @@
 package xxhash
 
 import "core:mem"
-import "core:intrinsics"
+import "base:intrinsics"
 
 /*
 	===   XXH3 128-bit streaming   ===
diff --git a/core/hash/xxhash/xxhash_3.odin b/core/hash/xxhash/xxhash_3.odin
index fa50075f9..611f4dc9f 100644
--- a/core/hash/xxhash/xxhash_3.odin
+++ b/core/hash/xxhash/xxhash_3.odin
@@ -9,7 +9,7 @@
 */
 package xxhash
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 /*
 *************************************************************************
diff --git a/core/hash/xxhash/xxhash_32.odin b/core/hash/xxhash/xxhash_32.odin
index 5bc87c2c0..2f27118f2 100644
--- a/core/hash/xxhash/xxhash_32.odin
+++ b/core/hash/xxhash/xxhash_32.odin
@@ -9,7 +9,7 @@
 */
 package xxhash
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 /*
 	32-bit hash functions
diff --git a/core/hash/xxhash/xxhash_64.odin b/core/hash/xxhash/xxhash_64.odin
index 9280e9c59..b274da374 100644
--- a/core/hash/xxhash/xxhash_64.odin
+++ b/core/hash/xxhash/xxhash_64.odin
@@ -9,7 +9,7 @@
 */
 package xxhash
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 /*
 	64-bit hash functions
diff --git a/core/image/common.odin b/core/image/common.odin
index ad01f7e6b..c7507a85f 100644
--- a/core/image/common.odin
+++ b/core/image/common.odin
@@ -13,7 +13,7 @@ package image
 import "core:bytes"
 import "core:mem"
 import "core:compress"
-import "core:runtime"
+import "base:runtime"
 
 /*
 	67_108_864 pixels max by default.
diff --git a/core/image/netpbm/netpbm.odin b/core/image/netpbm/netpbm.odin
index 24df76c8e..079c5b4be 100644
--- a/core/image/netpbm/netpbm.odin
+++ b/core/image/netpbm/netpbm.odin
@@ -8,7 +8,7 @@ import "core:mem"
 import "core:strconv"
 import "core:strings"
 import "core:unicode"
-import "core:runtime"
+import "base:runtime"
 
 Image        :: image.Image
 Format       :: image.Netpbm_Format
diff --git a/core/image/png/helpers.odin b/core/image/png/helpers.odin
index f0209d4d7..ac61378da 100644
--- a/core/image/png/helpers.odin
+++ b/core/image/png/helpers.odin
@@ -16,7 +16,7 @@ import coretime "core:time"
 import "core:strings"
 import "core:bytes"
 import "core:mem"
-import "core:runtime"
+import "base:runtime"
 
 /*
 	Cleanup of image-specific data.
diff --git a/core/image/png/png.odin b/core/image/png/png.odin
index 1821e55cd..4bb070da8 100644
--- a/core/image/png/png.odin
+++ b/core/image/png/png.odin
@@ -22,8 +22,8 @@ import "core:hash"
 import "core:bytes"
 import "core:io"
 import "core:mem"
-import "core:intrinsics"
-import "core:runtime"
+import "base:intrinsics"
+import "base:runtime"
 
 // Limit chunk sizes.
 // By default: IDAT = 8k x 8k x 16-bits + 8k filter bytes.
diff --git a/core/io/io.odin b/core/io/io.odin
index d3cae7bce..ea8e240b0 100644
--- a/core/io/io.odin
+++ b/core/io/io.odin
@@ -3,7 +3,7 @@
 // operations into an abstracted stream interface.
 package io
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:unicode/utf8"
 
 // Seek whence values
diff --git a/core/log/log.odin b/core/log/log.odin
index b4039caa0..0d89fdb74 100644
--- a/core/log/log.odin
+++ b/core/log/log.odin
@@ -1,6 +1,6 @@
 package log
 
-import "core:runtime"
+import "base:runtime"
 import "core:fmt"
 
 
diff --git a/core/log/log_allocator.odin b/core/log/log_allocator.odin
index 322c2e717..16f1abe31 100644
--- a/core/log/log_allocator.odin
+++ b/core/log/log_allocator.odin
@@ -1,6 +1,6 @@
 package log
 
-import "core:runtime"
+import "base:runtime"
 import "core:fmt"
 
 Log_Allocator_Format :: enum {
diff --git a/core/math/big/common.odin b/core/math/big/common.odin
index 74a641d83..fabf39520 100644
--- a/core/math/big/common.odin
+++ b/core/math/big/common.odin
@@ -6,7 +6,7 @@
 
 package math_big
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 /*
 	TODO: Make the tunables runtime adjustable where practical.
diff --git a/core/math/big/helpers.odin b/core/math/big/helpers.odin
index a4313a244..8ab19e3e7 100644
--- a/core/math/big/helpers.odin
+++ b/core/math/big/helpers.odin
@@ -6,7 +6,7 @@
 
 package math_big
 
-import "core:intrinsics"
+import "base:intrinsics"
 import rnd "core:math/rand"
 
 /*
diff --git a/core/math/big/internal.odin b/core/math/big/internal.odin
index ca8dbf4c5..829cbf0e2 100644
--- a/core/math/big/internal.odin
+++ b/core/math/big/internal.odin
@@ -28,9 +28,9 @@
 package math_big
 
 import "core:mem"
-import "core:intrinsics"
+import "base:intrinsics"
 import rnd "core:math/rand"
-import "core:builtin"
+import "base:builtin"
 
 /*
 	Low-level addition, unsigned. Handbook of Applied Cryptography, algorithm 14.7.
diff --git a/core/math/big/private.odin b/core/math/big/private.odin
index d41e66343..d045b4239 100644
--- a/core/math/big/private.odin
+++ b/core/math/big/private.odin
@@ -19,7 +19,7 @@
 

 package math_big

 

-import "core:intrinsics"

+import "base:intrinsics"

 import "core:mem"

 

 /*

diff --git a/core/math/big/public.odin b/core/math/big/public.odin
index 3227d7bc4..070c45283 100644
--- a/core/math/big/public.odin
+++ b/core/math/big/public.odin
@@ -12,7 +12,7 @@
 

 package math_big

 

-import "core:intrinsics"

+import "base:intrinsics"

 

 /*

 	===========================

diff --git a/core/math/big/radix.odin b/core/math/big/radix.odin
index d15ce0e98..8d8ea734e 100644
--- a/core/math/big/radix.odin
+++ b/core/math/big/radix.odin
@@ -16,7 +16,7 @@
 
 package math_big
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:mem"
 import "core:os"
 
diff --git a/core/math/big/rat.odin b/core/math/big/rat.odin
index 35618affb..e0e58b80f 100644
--- a/core/math/big/rat.odin
+++ b/core/math/big/rat.odin
@@ -1,7 +1,7 @@
 package math_big
 
-import "core:builtin"
-import "core:intrinsics"
+import "base:builtin"
+import "base:intrinsics"
 import "core:math"
 
 Rat :: struct {
diff --git a/core/math/big/tune.odin b/core/math/big/tune.odin
index ec1ef9a5b..5938dafde 100644
--- a/core/math/big/tune.odin
+++ b/core/math/big/tune.odin
@@ -11,7 +11,7 @@
 package math_big
 
 import "core:time"
-import "core:runtime"
+import "base:runtime"
 
 print_value :: proc(name: string, value: i64) {
 	runtime.print_string("\t")
diff --git a/core/math/bits/bits.odin b/core/math/bits/bits.odin
index 959b5536f..154b5a142 100644
--- a/core/math/bits/bits.odin
+++ b/core/math/bits/bits.odin
@@ -1,6 +1,6 @@
 package math_bits
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 U8_MIN  :: 0
 U16_MIN :: 0
diff --git a/core/math/cmplx/cmplx.odin b/core/math/cmplx/cmplx.odin
index c029be30c..4625f83c6 100644
--- a/core/math/cmplx/cmplx.odin
+++ b/core/math/cmplx/cmplx.odin
@@ -1,6 +1,6 @@
 package math_cmplx
 
-import "core:builtin"
+import "base:builtin"
 import "core:math"
 
 // The original C code, the long comment, and the constants
diff --git a/core/math/cmplx/cmplx_invtrig.odin b/core/math/cmplx/cmplx_invtrig.odin
index a746a370f..b84f0ac9c 100644
--- a/core/math/cmplx/cmplx_invtrig.odin
+++ b/core/math/cmplx/cmplx_invtrig.odin
@@ -1,6 +1,6 @@
 package math_cmplx
 
-import "core:builtin"
+import "base:builtin"
 import "core:math"
 
 // The original C code, the long comment, and the constants
diff --git a/core/math/ease/ease.odin b/core/math/ease/ease.odin
index 0e6569bca..5ed0dd56a 100644
--- a/core/math/ease/ease.odin
+++ b/core/math/ease/ease.odin
@@ -2,7 +2,7 @@
 package ease
 
 import "core:math"
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:time"
 
 @(private) PI_2 :: math.PI / 2
diff --git a/core/math/fixed/fixed.odin b/core/math/fixed/fixed.odin
index d347e9c11..b8000a5c6 100644
--- a/core/math/fixed/fixed.odin
+++ b/core/math/fixed/fixed.odin
@@ -2,7 +2,7 @@ package math_fixed
 
 import "core:math"
 import "core:strconv"
-import "core:intrinsics"
+import "base:intrinsics"
 _, _, _ :: intrinsics, strconv, math
 
 Fixed :: struct($Backing: typeid, $Fraction_Width: uint)
diff --git a/core/math/linalg/extended.odin b/core/math/linalg/extended.odin
index b6e05a2c2..eee339245 100644
--- a/core/math/linalg/extended.odin
+++ b/core/math/linalg/extended.odin
@@ -1,6 +1,6 @@
 package linalg
 
-import "core:builtin"
+import "base:builtin"
 import "core:math"
 
 @(require_results)
diff --git a/core/math/linalg/general.odin b/core/math/linalg/general.odin
index 8743cb2f0..24bc4c7b3 100644
--- a/core/math/linalg/general.odin
+++ b/core/math/linalg/general.odin
@@ -1,8 +1,8 @@
 package linalg
 
 import "core:math"
-import "core:builtin"
-import "core:intrinsics"
+import "base:builtin"
+import "base:intrinsics"
 
 // Generic
 
diff --git a/core/math/linalg/glsl/linalg_glsl.odin b/core/math/linalg/glsl/linalg_glsl.odin
index 68a05be53..bda1f1723 100644
--- a/core/math/linalg/glsl/linalg_glsl.odin
+++ b/core/math/linalg/glsl/linalg_glsl.odin
@@ -1,8 +1,8 @@
 // core:math/linalg/glsl implements a GLSL-like mathematics library plus numerous other utility procedures
 package math_linalg_glsl
 
-import "core:builtin"
-import "core:intrinsics"
+import "base:builtin"
+import "base:intrinsics"
 
 TAU :: 6.28318530717958647692528676655900576
 PI  :: 3.14159265358979323846264338327950288
diff --git a/core/math/linalg/hlsl/linalg_hlsl.odin b/core/math/linalg/hlsl/linalg_hlsl.odin
index 66278345e..f5e8bf147 100644
--- a/core/math/linalg/hlsl/linalg_hlsl.odin
+++ b/core/math/linalg/hlsl/linalg_hlsl.odin
@@ -1,8 +1,8 @@
 // core:math/linalg/hlsl implements a HLSL-like mathematics library plus numerous other utility procedures
 package math_linalg_hlsl
 
-import "core:builtin"
-import "core:intrinsics"
+import "base:builtin"
+import "base:intrinsics"
 
 TAU :: 6.28318530717958647692528676655900576
 PI  :: 3.14159265358979323846264338327950288
diff --git a/core/math/linalg/specific.odin b/core/math/linalg/specific.odin
index 656def1cc..36783e1e2 100644
--- a/core/math/linalg/specific.odin
+++ b/core/math/linalg/specific.odin
@@ -1,6 +1,6 @@
 package linalg
 
-import "core:builtin"
+import "base:builtin"
 import "core:math"
 
 F16_EPSILON :: 1e-3
diff --git a/core/math/math.odin b/core/math/math.odin
index 696293f70..7fdbcba04 100644
--- a/core/math/math.odin
+++ b/core/math/math.odin
@@ -1,7 +1,7 @@
 package math
 
-import "core:intrinsics"
-import "core:builtin"
+import "base:intrinsics"
+import "base:builtin"
 _ :: intrinsics
 
 Float_Class :: enum {
diff --git a/core/math/math_basic.odin b/core/math/math_basic.odin
index 95e0a93ec..041efd272 100644
--- a/core/math/math_basic.odin
+++ b/core/math/math_basic.odin
@@ -1,7 +1,7 @@
 //+build !js
 package math
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 @(default_calling_convention="none", private="file")
 foreign _ {
diff --git a/core/math/math_basic_js.odin b/core/math/math_basic_js.odin
index acd3c2b39..5b9adabcd 100644
--- a/core/math/math_basic_js.odin
+++ b/core/math/math_basic_js.odin
@@ -1,7 +1,7 @@
 //+build js
 package math
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 foreign import "odin_env"
 
diff --git a/core/math/rand/rand.odin b/core/math/rand/rand.odin
index 7e6d58ee2..14894e82c 100644
--- a/core/math/rand/rand.odin
+++ b/core/math/rand/rand.odin
@@ -4,7 +4,7 @@ Package core:math/rand implements various random number generators
 */
 package rand
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:math"
 import "core:mem"
 
diff --git a/core/mem/alloc.odin b/core/mem/alloc.odin
index 4cea20f30..e25fc2bc1 100644
--- a/core/mem/alloc.odin
+++ b/core/mem/alloc.odin
@@ -1,6 +1,6 @@
 package mem
 
-import "core:runtime"
+import "base:runtime"
 
 // NOTE(bill, 2019-12-31): These are defined in `package runtime` as they are used in the `context`. This is to prevent an import definition cycle.
 Allocator_Mode :: runtime.Allocator_Mode
diff --git a/core/mem/allocators.odin b/core/mem/allocators.odin
index 76f87a450..13d5536b7 100644
--- a/core/mem/allocators.odin
+++ b/core/mem/allocators.odin
@@ -1,7 +1,7 @@
 package mem
 
-import "core:intrinsics"
-import "core:runtime"
+import "base:intrinsics"
+import "base:runtime"
 import "core:sync"
 
 nil_allocator_proc :: proc(allocator_data: rawptr, mode: Allocator_Mode,
diff --git a/core/mem/mem.odin b/core/mem/mem.odin
index dd985d5dd..0ea9d5b79 100644
--- a/core/mem/mem.odin
+++ b/core/mem/mem.odin
@@ -1,7 +1,7 @@
 package mem
 
-import "core:runtime"
-import "core:intrinsics"
+import "base:runtime"
+import "base:intrinsics"
 
 Byte     :: runtime.Byte
 Kilobyte :: runtime.Kilobyte
diff --git a/core/mem/raw.odin b/core/mem/raw.odin
index 9a521598e..56790e959 100644
--- a/core/mem/raw.odin
+++ b/core/mem/raw.odin
@@ -1,7 +1,7 @@
 package mem
 
-import "core:builtin"
-import "core:runtime"
+import "base:builtin"
+import "base:runtime"
 
 Raw_Any           :: runtime.Raw_Any
 Raw_String        :: runtime.Raw_String
diff --git a/core/mem/virtual/virtual.odin b/core/mem/virtual/virtual.odin
index 00a9e6a5d..efbdefcf6 100644
--- a/core/mem/virtual/virtual.odin
+++ b/core/mem/virtual/virtual.odin
@@ -1,8 +1,8 @@
 package mem_virtual
 
 import "core:mem"
-import "core:intrinsics"
-import "core:runtime"
+import "base:intrinsics"
+import "base:runtime"
 _ :: runtime
 
 DEFAULT_PAGE_SIZE := uint(4096)
diff --git a/core/net/common.odin b/core/net/common.odin
index 70a027138..2a6f44602 100644
--- a/core/net/common.odin
+++ b/core/net/common.odin
@@ -21,7 +21,7 @@ package net
 		Jeroen van Rijn: Cross platform unification, code style, documentation
 */
 
-import "core:runtime"
+import "base:runtime"
 
 /*
 	TUNEABLES - See also top of `dns.odin` for DNS configuration.
diff --git a/core/odin/ast/clone.odin b/core/odin/ast/clone.odin
index 4e7f14580..d105f6035 100644
--- a/core/odin/ast/clone.odin
+++ b/core/odin/ast/clone.odin
@@ -1,6 +1,6 @@
 package odin_ast
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:mem"
 import "core:fmt"
 import "core:reflect"
diff --git a/core/os/dir_linux.odin b/core/os/dir_linux.odin
index 4971fa9d5..3a51d7c70 100644
--- a/core/os/dir_linux.odin
+++ b/core/os/dir_linux.odin
@@ -2,7 +2,7 @@ package os
 
 import "core:strings"
 import "core:mem"
-import "core:runtime"
+import "base:runtime"
 
 read_dir :: proc(fd: Handle, n: int, allocator := context.allocator) -> (fi: []File_Info, err: Errno) {
 	dirp: Dir
diff --git a/core/os/dir_windows.odin b/core/os/dir_windows.odin
index 531a5cd82..491507313 100644
--- a/core/os/dir_windows.odin
+++ b/core/os/dir_windows.odin
@@ -2,7 +2,7 @@ package os
 
 import win32 "core:sys/windows"
 import "core:strings"
-import "core:runtime"
+import "base:runtime"
 
 read_dir :: proc(fd: Handle, n: int, allocator := context.allocator) -> (fi: []File_Info, err: Errno) {
 	find_data_to_file_info :: proc(base_path: string, d: ^win32.WIN32_FIND_DATAW) -> (fi: File_Info) {
diff --git a/core/os/env_windows.odin b/core/os/env_windows.odin
index ff20f126a..0e3c7f04a 100644
--- a/core/os/env_windows.odin
+++ b/core/os/env_windows.odin
@@ -1,7 +1,7 @@
 package os
 
 import win32 "core:sys/windows"
-import "core:runtime"
+import "base:runtime"
 
 // lookup_env gets the value of the environment variable named by the key
 // If the variable is found in the environment the value (which can be empty) is returned and the boolean is true
diff --git a/core/os/file_windows.odin b/core/os/file_windows.odin
index 96f6d8e8f..831e9c38c 100644
--- a/core/os/file_windows.odin
+++ b/core/os/file_windows.odin
@@ -1,8 +1,8 @@
 package os
 
 import win32 "core:sys/windows"
-import "core:intrinsics"
-import "core:runtime"
+import "base:intrinsics"
+import "base:runtime"
 import "core:unicode/utf16"
 
 is_path_separator :: proc(c: byte) -> bool {
diff --git a/core/os/os2/env.odin b/core/os/os2/env.odin
index 54c26981b..bed4bebd9 100644
--- a/core/os/os2/env.odin
+++ b/core/os/os2/env.odin
@@ -1,6 +1,6 @@
 package os2
 
-import "core:runtime"
+import "base:runtime"
 
 // get_env retrieves the value of the environment variable named by the key
 // It returns the value, which will be empty if the variable is not present
diff --git a/core/os/os2/env_linux.odin b/core/os/os2/env_linux.odin
index e7165b583..eb463f22c 100644
--- a/core/os/os2/env_linux.odin
+++ b/core/os/os2/env_linux.odin
@@ -1,7 +1,7 @@
 //+private
 package os2
 
-import "core:runtime"
+import "base:runtime"
 
 _lookup_env :: proc(key: string, allocator: runtime.Allocator) -> (value: string, found: bool) {
 	//TODO
diff --git a/core/os/os2/env_windows.odin b/core/os/os2/env_windows.odin
index 105063343..9829b7de1 100644
--- a/core/os/os2/env_windows.odin
+++ b/core/os/os2/env_windows.odin
@@ -2,7 +2,7 @@
 package os2
 
 import win32 "core:sys/windows"
-import "core:runtime"
+import "base:runtime"
 
 _lookup_env :: proc(key: string, allocator: runtime.Allocator) -> (value: string, found: bool) {
 	if key == "" {
diff --git a/core/os/os2/errors.odin b/core/os/os2/errors.odin
index 2cff73ebd..426375a5a 100644
--- a/core/os/os2/errors.odin
+++ b/core/os/os2/errors.odin
@@ -1,7 +1,7 @@
 package os2
 
 import "core:io"
-import "core:runtime"
+import "base:runtime"
 
 General_Error :: enum u32 {
 	None,
diff --git a/core/os/os2/file.odin b/core/os/os2/file.odin
index da822374a..d59a2bb34 100644
--- a/core/os/os2/file.odin
+++ b/core/os/os2/file.odin
@@ -2,7 +2,7 @@ package os2
 
 import "core:io"
 import "core:time"
-import "core:runtime"
+import "base:runtime"
 
 File :: struct {
 	impl: _File,
diff --git a/core/os/os2/file_linux.odin b/core/os/os2/file_linux.odin
index ddd827bce..d5626791f 100644
--- a/core/os/os2/file_linux.odin
+++ b/core/os/os2/file_linux.odin
@@ -4,7 +4,7 @@ package os2
 import "core:io"
 import "core:time"
 import "core:strings"
-import "core:runtime"
+import "base:runtime"
 import "core:sys/unix"
 
 INVALID_HANDLE :: -1
diff --git a/core/os/os2/file_util.odin b/core/os/os2/file_util.odin
index 60c3efe44..8ab91d138 100644
--- a/core/os/os2/file_util.odin
+++ b/core/os/os2/file_util.odin
@@ -1,7 +1,7 @@
 package os2
 
 import "core:mem"
-import "core:runtime"
+import "base:runtime"
 import "core:strconv"
 import "core:unicode/utf8"
 
diff --git a/core/os/os2/file_windows.odin b/core/os/os2/file_windows.odin
index 7c31defe9..ba8e8cdac 100644
--- a/core/os/os2/file_windows.odin
+++ b/core/os/os2/file_windows.odin
@@ -4,7 +4,7 @@ package os2
 import "core:io"
 import "core:mem"
 import "core:sync"
-import "core:runtime"
+import "base:runtime"
 import "core:strings"
 import "core:time"
 import "core:unicode/utf16"
diff --git a/core/os/os2/heap.odin b/core/os/os2/heap.odin
index 92b5a9928..a07a0d618 100644
--- a/core/os/os2/heap.odin
+++ b/core/os/os2/heap.odin
@@ -1,6 +1,6 @@
 package os2
 
-import "core:runtime"
+import "base:runtime"
 
 heap_allocator :: proc() -> runtime.Allocator {
 	return runtime.Allocator{
diff --git a/core/os/os2/path.odin b/core/os/os2/path.odin
index c27015862..19e44f6b7 100644
--- a/core/os/os2/path.odin
+++ b/core/os/os2/path.odin
@@ -1,6 +1,6 @@
 package os2
 
-import "core:runtime"
+import "base:runtime"
 
 Path_Separator      :: _Path_Separator      // OS-Specific
 Path_List_Separator :: _Path_List_Separator // OS-Specific
diff --git a/core/os/os2/path_linux.odin b/core/os/os2/path_linux.odin
index 2a0ef29d8..93de749b8 100644
--- a/core/os/os2/path_linux.odin
+++ b/core/os/os2/path_linux.odin
@@ -3,7 +3,7 @@ package os2
 
 import "core:strings"
 import "core:strconv"
-import "core:runtime"
+import "base:runtime"
 import "core:sys/unix"
 
 _Path_Separator      :: '/'
diff --git a/core/os/os2/path_windows.odin b/core/os/os2/path_windows.odin
index a2306784e..038a60ac1 100644
--- a/core/os/os2/path_windows.odin
+++ b/core/os/os2/path_windows.odin
@@ -2,7 +2,7 @@
 package os2
 
 import win32 "core:sys/windows"
-import "core:runtime"
+import "base:runtime"
 import "core:strings"
 
 _Path_Separator      :: '\\'
diff --git a/core/os/os2/process.odin b/core/os/os2/process.odin
index db47e2f5b..862434b7b 100644
--- a/core/os/os2/process.odin
+++ b/core/os/os2/process.odin
@@ -2,7 +2,7 @@ package os2
 
 import "core:sync"
 import "core:time"
-import "core:runtime"
+import "base:runtime"
 
 args: []string
 
diff --git a/core/os/os2/stat.odin b/core/os/os2/stat.odin
index 24a01fb0a..511a8adfd 100644
--- a/core/os/os2/stat.odin
+++ b/core/os/os2/stat.odin
@@ -1,7 +1,7 @@
 package os2
 
 import "core:time"
-import "core:runtime"
+import "base:runtime"
 
 File_Info :: struct {
 	fullpath: string,
diff --git a/core/os/os2/stat_linux.odin b/core/os/os2/stat_linux.odin
index 530e0e7d0..6a6b196f5 100644
--- a/core/os/os2/stat_linux.odin
+++ b/core/os/os2/stat_linux.odin
@@ -2,7 +2,7 @@
 package os2
 
 import "core:time"
-import "core:runtime"
+import "base:runtime"
 import "core:strings"
 import "core:sys/unix"
 import "core:path/filepath"
diff --git a/core/os/os2/stat_windows.odin b/core/os/os2/stat_windows.odin
index 5de5269d7..03b93d0cf 100644
--- a/core/os/os2/stat_windows.odin
+++ b/core/os/os2/stat_windows.odin
@@ -1,7 +1,7 @@
 //+private
 package os2
 
-import "core:runtime"
+import "base:runtime"
 import "core:time"
 import "core:strings"
 import win32 "core:sys/windows"
diff --git a/core/os/os2/temp_file.odin b/core/os/os2/temp_file.odin
index b05c186a0..8427779b6 100644
--- a/core/os/os2/temp_file.odin
+++ b/core/os/os2/temp_file.odin
@@ -1,6 +1,6 @@
 package os2
 
-import "core:runtime"
+import "base:runtime"
 
 create_temp :: proc(dir, pattern: string) -> (^File, Error) {
 	return _create_temp(dir, pattern)
diff --git a/core/os/os2/temp_file_linux.odin b/core/os/os2/temp_file_linux.odin
index 201fb0e93..dd7ac5c97 100644
--- a/core/os/os2/temp_file_linux.odin
+++ b/core/os/os2/temp_file_linux.odin
@@ -1,7 +1,7 @@
 //+private
 package os2
 
-import "core:runtime"
+import "base:runtime"
 
 
 _create_temp :: proc(dir, pattern: string) -> (^File, Error) {
diff --git a/core/os/os2/temp_file_windows.odin b/core/os/os2/temp_file_windows.odin
index 08837f7f0..27d6a3d77 100644
--- a/core/os/os2/temp_file_windows.odin
+++ b/core/os/os2/temp_file_windows.odin
@@ -1,7 +1,7 @@
 //+private
 package os2
 
-import "core:runtime"
+import "base:runtime"
 import win32 "core:sys/windows"
 
 _create_temp :: proc(dir, pattern: string) -> (^File, Error) {
diff --git a/core/os/os2/user.odin b/core/os/os2/user.odin
index 0e9f126aa..0af461bf5 100644
--- a/core/os/os2/user.odin
+++ b/core/os/os2/user.odin
@@ -1,7 +1,7 @@
 package os2
 
 import "core:strings"
-import "core:runtime"
+import "base:runtime"
 
 user_cache_dir :: proc(allocator: runtime.Allocator) -> (dir: string, err: Error) {
 	#partial switch ODIN_OS {
diff --git a/core/os/os_darwin.odin b/core/os/os_darwin.odin
index 82cf5e1f3..c12838387 100644
--- a/core/os/os_darwin.odin
+++ b/core/os/os_darwin.odin
@@ -4,7 +4,7 @@ foreign import dl   "system:dl"
 foreign import libc "System.framework"
 foreign import pthread "System.framework"
 
-import "core:runtime"
+import "base:runtime"
 import "core:strings"
 import "core:c"
 
diff --git a/core/os/os_freebsd.odin b/core/os/os_freebsd.odin
index c2ea82bf5..e6ea0a62a 100644
--- a/core/os/os_freebsd.odin
+++ b/core/os/os_freebsd.odin
@@ -3,7 +3,7 @@ package os
 foreign import dl "system:dl"
 foreign import libc "system:c"
 
-import "core:runtime"
+import "base:runtime"
 import "core:strings"
 import "core:c"
 
diff --git a/core/os/os_js.odin b/core/os/os_js.odin
index 5d7eb784e..de64a0e25 100644
--- a/core/os/os_js.odin
+++ b/core/os/os_js.odin
@@ -1,8 +1,8 @@
 //+build js
 package os
 
-import "core:intrinsics"
-import "core:runtime"
+import "base:intrinsics"
+import "base:runtime"
 import "core:unicode/utf16"
 
 is_path_separator :: proc(c: byte) -> bool {
diff --git a/core/os/os_linux.odin b/core/os/os_linux.odin
index 298335ac9..9d3544142 100644
--- a/core/os/os_linux.odin
+++ b/core/os/os_linux.odin
@@ -3,11 +3,11 @@ package os
 foreign import dl   "system:dl"
 foreign import libc "system:c"
 
-import "core:runtime"
+import "base:runtime"
 import "core:strings"
 import "core:c"
 import "core:strconv"
-import "core:intrinsics"
+import "base:intrinsics"
 
 // NOTE(flysand): For compatibility we'll make core:os package
 // depend on the old (scheduled for removal) linux package.
diff --git a/core/os/os_openbsd.odin b/core/os/os_openbsd.odin
index 957873a0b..eac0098d4 100644
--- a/core/os/os_openbsd.odin
+++ b/core/os/os_openbsd.odin
@@ -4,7 +4,7 @@ foreign import libc "system:c"
 
 import "core:strings"
 import "core:c"
-import "core:runtime"
+import "base:runtime"
 
 Handle    :: distinct i32
 Pid       :: distinct i32
diff --git a/core/os/os_wasi.odin b/core/os/os_wasi.odin
index c407acdb4..f66d04bee 100644
--- a/core/os/os_wasi.odin
+++ b/core/os/os_wasi.odin
@@ -1,7 +1,7 @@
 package os
 
 import "core:sys/wasm/wasi"
-import "core:runtime"
+import "base:runtime"
 
 Handle :: distinct i32
 Errno :: distinct i32
diff --git a/core/os/os_windows.odin b/core/os/os_windows.odin
index 7b4c2f6c2..13fafd4ce 100644
--- a/core/os/os_windows.odin
+++ b/core/os/os_windows.odin
@@ -2,8 +2,8 @@
 package os
 
 import win32 "core:sys/windows"
-import "core:runtime"
-import "core:intrinsics"
+import "base:runtime"
+import "base:intrinsics"
 
 Handle    :: distinct uintptr
 File_Time :: distinct u64
diff --git a/core/os/stat_windows.odin b/core/os/stat_windows.odin
index efea329ce..4bb3bd4c4 100644
--- a/core/os/stat_windows.odin
+++ b/core/os/stat_windows.odin
@@ -1,7 +1,7 @@
 package os
 
 import "core:time"
-import "core:runtime"
+import "base:runtime"
 import win32 "core:sys/windows"
 
 @(private)
diff --git a/core/path/filepath/path_unix.odin b/core/path/filepath/path_unix.odin
index 898f34b6a..55415d878 100644
--- a/core/path/filepath/path_unix.odin
+++ b/core/path/filepath/path_unix.odin
@@ -7,7 +7,7 @@ when ODIN_OS == .Darwin {
 	foreign import libc "system:c"
 }
 
-import "core:runtime"
+import "base:runtime"
 import "core:strings"
 
 SEPARATOR :: '/'
diff --git a/core/path/filepath/path_windows.odin b/core/path/filepath/path_windows.odin
index e7dd4ab3e..5ebd2cdc2 100644
--- a/core/path/filepath/path_windows.odin
+++ b/core/path/filepath/path_windows.odin
@@ -1,7 +1,7 @@
 package filepath
 
 import "core:strings"
-import "core:runtime"
+import "base:runtime"
 import "core:os"
 import win32 "core:sys/windows"
 
diff --git a/core/path/slashpath/path.odin b/core/path/slashpath/path.odin
index ada473c34..52b4878bc 100644
--- a/core/path/slashpath/path.odin
+++ b/core/path/slashpath/path.odin
@@ -5,7 +5,7 @@
 // To manipulate operating system specific paths, use the path/filepath package

 package slashpath

 

-import "core:runtime"

+import "base:runtime"

 import "core:strings"

 

 // is_separator checks whether the byte is a valid separator character

diff --git a/core/prof/spall/spall.odin b/core/prof/spall/spall.odin
index 19a05d70a..7e4334c2c 100644
--- a/core/prof/spall/spall.odin
+++ b/core/prof/spall/spall.odin
@@ -2,7 +2,7 @@ package spall
 
 import "core:os"
 import "core:time"
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:mem"
 
 // File Format
diff --git a/core/reflect/iterator.odin b/core/reflect/iterator.odin
index 2e143284a..5b84f0133 100644
--- a/core/reflect/iterator.odin
+++ b/core/reflect/iterator.odin
@@ -1,6 +1,6 @@
 package reflect
 
-import "core:runtime"
+import "base:runtime"
 
 @(require_results)
 iterate_array :: proc(val: any, it: ^int) -> (elem: any, index: int, ok: bool) {
diff --git a/core/reflect/reflect.odin b/core/reflect/reflect.odin
index 5b57a5ee8..1ff7df229 100644
--- a/core/reflect/reflect.odin
+++ b/core/reflect/reflect.odin
@@ -1,7 +1,7 @@
 package reflect
 
-import "core:runtime"
-import "core:intrinsics"
+import "base:runtime"
+import "base:intrinsics"
 _ :: intrinsics
 
 Type_Info :: runtime.Type_Info
diff --git a/core/simd/simd.odin b/core/simd/simd.odin
index 9d530ec31..c5a594df6 100644
--- a/core/simd/simd.odin
+++ b/core/simd/simd.odin
@@ -1,7 +1,7 @@
 package simd
 
-import "core:builtin"
-import "core:intrinsics"
+import "base:builtin"
+import "base:intrinsics"
 
 // 128-bit vector aliases
 u8x16 :: #simd[16]u8
diff --git a/core/slice/map.odin b/core/slice/map.odin
index 50d6dbd37..545ba8305 100644
--- a/core/slice/map.odin
+++ b/core/slice/map.odin
@@ -1,7 +1,7 @@
 package slice
 
-import "core:intrinsics"
-import "core:runtime"
+import "base:intrinsics"
+import "base:runtime"
 
 _ :: intrinsics
 _ :: runtime
diff --git a/core/slice/ptr.odin b/core/slice/ptr.odin
index b17a27dc8..99d4157c3 100644
--- a/core/slice/ptr.odin
+++ b/core/slice/ptr.odin
@@ -1,7 +1,7 @@
 package slice
 
-import "core:builtin"
-import "core:runtime"
+import "base:builtin"
+import "base:runtime"
 
 ptr_add :: proc(p: $P/^$T, x: int) -> ^T {
 	return ([^]T)(p)[x:]
diff --git a/core/slice/slice.odin b/core/slice/slice.odin
index 2a9e29d01..88f8cb799 100644
--- a/core/slice/slice.odin
+++ b/core/slice/slice.odin
@@ -1,9 +1,9 @@
 package slice
 
-import "core:intrinsics"
-import "core:builtin"
+import "base:intrinsics"
+import "base:builtin"
 import "core:math/bits"
-import "core:runtime"
+import "base:runtime"
 
 _ :: intrinsics
 _ :: builtin
diff --git a/core/slice/sort_private.odin b/core/slice/sort_private.odin
index 32eb7d417..487b51907 100644
--- a/core/slice/sort_private.odin
+++ b/core/slice/sort_private.odin
@@ -1,7 +1,7 @@
 //+private
 package slice
 
-import "core:intrinsics"
+import "base:intrinsics"
 _ :: intrinsics
 
 ORD :: intrinsics.type_is_ordered
diff --git a/core/sort/sort.odin b/core/sort/sort.odin
index ad972ef8e..322613cc4 100644
--- a/core/sort/sort.odin
+++ b/core/sort/sort.odin
@@ -2,7 +2,7 @@ package sort
 
 import "core:mem"
 import _slice "core:slice"
-import "core:intrinsics"
+import "base:intrinsics"
 
 _ :: intrinsics
 _ :: _slice
diff --git a/core/strconv/decimal/decimal.odin b/core/strconv/decimal/decimal.odin
index 4130da306..06503d01a 100644
--- a/core/strconv/decimal/decimal.odin
+++ b/core/strconv/decimal/decimal.odin
@@ -249,7 +249,7 @@ shift_right :: proc(a: ^Decimal, k: uint) {
 	trim(a)
 }
 
-import "core:runtime"
+import "base:runtime"
 println :: proc(args: ..any) {
 	for arg, i in args {
 		if i != 0 {
diff --git a/core/strings/builder.odin b/core/strings/builder.odin
index d87626d07..72eb815f9 100644
--- a/core/strings/builder.odin
+++ b/core/strings/builder.odin
@@ -1,6 +1,6 @@
 package strings
 
-import "core:runtime"
+import "base:runtime"
 import "core:unicode/utf8"
 import "core:strconv"
 import "core:mem"
diff --git a/core/strings/intern.odin b/core/strings/intern.odin
index 812307b2e..88eea3c50 100644
--- a/core/strings/intern.odin
+++ b/core/strings/intern.odin
@@ -1,6 +1,6 @@
 package strings
 
-import "core:runtime"
+import "base:runtime"
 import "core:mem"
 
 // Custom string entry struct
diff --git a/core/sync/atomic.odin b/core/sync/atomic.odin
index 0900a6544..65d063f15 100644
--- a/core/sync/atomic.odin
+++ b/core/sync/atomic.odin
@@ -1,6 +1,6 @@
 package sync
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 cpu_relax :: intrinsics.cpu_relax
 
diff --git a/core/sync/futex_wasm.odin b/core/sync/futex_wasm.odin
index 248542836..de1013364 100644
--- a/core/sync/futex_wasm.odin
+++ b/core/sync/futex_wasm.odin
@@ -2,7 +2,7 @@
 //+build wasm32, wasm64p32
 package sync
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:time"
 
 _futex_wait :: proc "contextless" (f: ^Futex, expected: u32) -> bool {
diff --git a/core/sync/primitives.odin b/core/sync/primitives.odin
index 5e71f6336..8fa3dd232 100644
--- a/core/sync/primitives.odin
+++ b/core/sync/primitives.odin
@@ -1,6 +1,6 @@
 package sync
 
-import "core:runtime"
+import "base:runtime"
 import "core:time"
 
 current_thread_id :: proc "contextless" () -> int {
diff --git a/core/sync/primitives_darwin.odin b/core/sync/primitives_darwin.odin
index 726113ae7..6bb5eb7b3 100644
--- a/core/sync/primitives_darwin.odin
+++ b/core/sync/primitives_darwin.odin
@@ -3,7 +3,7 @@
 package sync
 
 import "core:c"
-import "core:intrinsics"
+import "base:intrinsics"
 
 foreign import pthread "System.framework"
 
diff --git a/core/sys/darwin/xnu_system_call_helpers.odin b/core/sys/darwin/xnu_system_call_helpers.odin
index c225c77fb..753f7f058 100644
--- a/core/sys/darwin/xnu_system_call_helpers.odin
+++ b/core/sys/darwin/xnu_system_call_helpers.odin
@@ -1,7 +1,7 @@
 package darwin
 
 import "core:c"
-import "core:runtime"
+import "base:runtime"
 
 // this package uses the sys prefix for the proc names to indicate that these aren't native syscalls but directly call such
 sys_write_string ::  proc (fd: c.int, message: string) -> bool {
diff --git a/core/sys/darwin/xnu_system_call_wrappers.odin b/core/sys/darwin/xnu_system_call_wrappers.odin
index c7a6d6bc4..3b051ac19 100644
--- a/core/sys/darwin/xnu_system_call_wrappers.odin
+++ b/core/sys/darwin/xnu_system_call_wrappers.odin
@@ -1,7 +1,7 @@
 package darwin
 
 import "core:c"
-import "core:intrinsics"
+import "base:intrinsics"
 
 /* flock */
 LOCK_SH :: 1 /* shared lock */
diff --git a/core/sys/info/cpu_intel.odin b/core/sys/info/cpu_intel.odin
index 1344c3d2a..2b8f9852f 100644
--- a/core/sys/info/cpu_intel.odin
+++ b/core/sys/info/cpu_intel.odin
@@ -1,7 +1,7 @@
 //+build i386, amd64
 package sysinfo
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 // cpuid :: proc(ax, cx: u32) -> (eax, ebc, ecx, edx: u32) ---
 cpuid :: intrinsics.x86_cpuid
diff --git a/core/sys/info/platform_darwin.odin b/core/sys/info/platform_darwin.odin
index 4ca542b7a..4316b2ade 100644
--- a/core/sys/info/platform_darwin.odin
+++ b/core/sys/info/platform_darwin.odin
@@ -4,7 +4,7 @@ package sysinfo
 import sys "core:sys/unix"
 import "core:strconv"
 import "core:strings"
-import "core:runtime"
+import "base:runtime"
 
 @(private)
 version_string_buf: [1024]u8
diff --git a/core/sys/info/platform_freebsd.odin b/core/sys/info/platform_freebsd.odin
index 1d53da998..26b4be7e9 100644
--- a/core/sys/info/platform_freebsd.odin
+++ b/core/sys/info/platform_freebsd.odin
@@ -4,7 +4,7 @@ package sysinfo
 import sys "core:sys/unix"
 import "core:strings"
 import "core:strconv"
-import "core:runtime"
+import "base:runtime"
 
 @(private)
 version_string_buf: [1024]u8
diff --git a/core/sys/info/platform_linux.odin b/core/sys/info/platform_linux.odin
index 14961c2a8..93770a460 100644
--- a/core/sys/info/platform_linux.odin
+++ b/core/sys/info/platform_linux.odin
@@ -1,8 +1,8 @@
 // +build linux
 package sysinfo
 
-import "core:intrinsics"
-import "core:runtime"
+import "base:intrinsics"
+import "base:runtime"
 import "core:strings"
 import "core:strconv"
 
diff --git a/core/sys/info/platform_openbsd.odin b/core/sys/info/platform_openbsd.odin
index dbca6eaf3..772531ceb 100644
--- a/core/sys/info/platform_openbsd.odin
+++ b/core/sys/info/platform_openbsd.odin
@@ -4,7 +4,7 @@ package sysinfo
 import sys "core:sys/unix"
 import "core:strings"
 import "core:strconv"
-import "core:runtime"
+import "base:runtime"
 
 @(private)
 version_string_buf: [1024]u8
diff --git a/core/sys/info/platform_windows.odin b/core/sys/info/platform_windows.odin
index 9c1c7b04c..250f938b1 100644
--- a/core/sys/info/platform_windows.odin
+++ b/core/sys/info/platform_windows.odin
@@ -2,12 +2,12 @@
 package sysinfo
 
 import sys "core:sys/windows"
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:strings"
 import "core:unicode/utf16"
 
 import "core:fmt"
-import "core:runtime"
+import "base:runtime"
 
 @(private)
 version_string_buf: [1024]u8
diff --git a/core/sys/linux/helpers.odin b/core/sys/linux/helpers.odin
index cf4143924..9bee57c11 100644
--- a/core/sys/linux/helpers.odin
+++ b/core/sys/linux/helpers.odin
@@ -1,7 +1,7 @@
 //+build linux
 package linux
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 // Note(flysand): In the case of syscall let's get rid of extra
 // casting. First of all, let these syscalls return int, because
diff --git a/core/sys/linux/sys.odin b/core/sys/linux/sys.odin
index 9a0f18e9f..8a93f0a47 100644
--- a/core/sys/linux/sys.odin
+++ b/core/sys/linux/sys.odin
@@ -1,6 +1,6 @@
 package linux
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 
 /*
diff --git a/core/sys/unix/syscalls_linux.odin b/core/sys/unix/syscalls_linux.odin
index 3083c084b..038c16276 100644
--- a/core/sys/unix/syscalls_linux.odin
+++ b/core/sys/unix/syscalls_linux.odin
@@ -1,6 +1,6 @@
 package unix
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 // Linux has inconsistent system call numbering across architectures,
 // for largely historical reasons.  This attempts to provide a unified
diff --git a/core/sys/unix/sysctl_darwin.odin b/core/sys/unix/sysctl_darwin.odin
index f9530b86f..76c72f478 100644
--- a/core/sys/unix/sysctl_darwin.odin
+++ b/core/sys/unix/sysctl_darwin.odin
@@ -2,7 +2,7 @@
 package unix
 
 import "core:sys/darwin"
-import "core:intrinsics"
+import "base:intrinsics"
 
 _ :: darwin
 
diff --git a/core/sys/unix/sysctl_freebsd.odin b/core/sys/unix/sysctl_freebsd.odin
index 5b0bcb88d..d1acbc2a1 100644
--- a/core/sys/unix/sysctl_freebsd.odin
+++ b/core/sys/unix/sysctl_freebsd.odin
@@ -1,7 +1,7 @@
 //+build freebsd
 package unix
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 sysctl :: proc(mib: []i32, val: ^$T) -> (ok: bool) {
 	mib := mib
diff --git a/core/sys/valgrind/callgrind.odin b/core/sys/valgrind/callgrind.odin
index cf377e353..b1ba8c6e9 100644
--- a/core/sys/valgrind/callgrind.odin
+++ b/core/sys/valgrind/callgrind.odin
@@ -1,7 +1,7 @@
 //+build amd64
 package sys_valgrind
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 Callgrind_Client_Request :: enum uintptr {
 	Dump_Stats = 'C'<<24 | 'T'<<16,
diff --git a/core/sys/valgrind/helgrind.odin b/core/sys/valgrind/helgrind.odin
index 41c047d05..2f0114522 100644
--- a/core/sys/valgrind/helgrind.odin
+++ b/core/sys/valgrind/helgrind.odin
@@ -1,7 +1,7 @@
 //+build amd64
 package sys_valgrind
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 Helgrind_Client_Request :: enum uintptr {
 	Clean_Memory = 'H'<<24 | 'G'<<16,
diff --git a/core/sys/valgrind/memcheck.odin b/core/sys/valgrind/memcheck.odin
index 6a9fab854..dfbe4c3be 100644
--- a/core/sys/valgrind/memcheck.odin
+++ b/core/sys/valgrind/memcheck.odin
@@ -1,7 +1,7 @@
 //+build amd64
 package sys_valgrind
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 Mem_Check_Client_Request :: enum uintptr {
 	Make_Mem_No_Access = 'M'<<24 | 'C'<<16,
diff --git a/core/sys/valgrind/valgrind.odin b/core/sys/valgrind/valgrind.odin
index b587ea3bf..d0c46af53 100644
--- a/core/sys/valgrind/valgrind.odin
+++ b/core/sys/valgrind/valgrind.odin
@@ -1,7 +1,7 @@
 //+build amd64
 package sys_valgrind
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 Client_Request :: enum uintptr {
 	Running_On_Valgrind            = 4097,
diff --git a/core/sys/windows/util.odin b/core/sys/windows/util.odin
index 9c9d8f7b4..c68d58de0 100644
--- a/core/sys/windows/util.odin
+++ b/core/sys/windows/util.odin
@@ -1,8 +1,8 @@
 // +build windows
 package sys_windows
 
-import "core:runtime"
-import "core:intrinsics"
+import "base:runtime"
+import "base:intrinsics"
 
 L :: intrinsics.constant_utf16_cstring
 
diff --git a/core/testing/runner_windows.odin b/core/testing/runner_windows.odin
index dbb9ed1c0..15264355b 100644
--- a/core/testing/runner_windows.odin
+++ b/core/testing/runner_windows.odin
@@ -3,8 +3,8 @@
 package testing
 
 import win32 "core:sys/windows"
-import "core:runtime"
-import "core:intrinsics"
+import "base:runtime"
+import "base:intrinsics"
 import "core:time"
 
 Sema :: struct {
diff --git a/core/testing/testing.odin b/core/testing/testing.odin
index 1ba05315c..fa12c62b4 100644
--- a/core/testing/testing.odin
+++ b/core/testing/testing.odin
@@ -3,7 +3,7 @@ package testing
 import "core:fmt"
 import "core:io"
 import "core:time"
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:reflect"
 
 _ :: reflect // alias reflect to nothing to force visibility for -vet
diff --git a/core/text/edit/text_edit.odin b/core/text/edit/text_edit.odin
index 3f6565557..caccb6be8 100644
--- a/core/text/edit/text_edit.odin
+++ b/core/text/edit/text_edit.odin
@@ -6,7 +6,7 @@ package text_edit
 		* https://rxi.github.io/a_simple_undo_system.html
 */
 
-import "core:runtime"
+import "base:runtime"
 import "core:time"
 import "core:mem"
 import "core:strings"
diff --git a/core/text/match/strlib.odin b/core/text/match/strlib.odin
index 189ed7ec0..bfa696dcd 100644
--- a/core/text/match/strlib.odin
+++ b/core/text/match/strlib.odin
@@ -1,6 +1,6 @@
 package text_match
 
-import "core:runtime"
+import "base:runtime"
 import "core:unicode"
 import "core:unicode/utf8"
 import "core:strings"
diff --git a/core/text/table/table.odin b/core/text/table/table.odin
index 8d96cb26f..5423519d3 100644
--- a/core/text/table/table.odin
+++ b/core/text/table/table.odin
@@ -12,7 +12,7 @@ import "core:io"
 import "core:fmt"
 import "core:mem"
 import "core:mem/virtual"
-import "core:runtime"
+import "base:runtime"
 
 Cell :: struct {
 	text: string,
diff --git a/core/thread/thread.odin b/core/thread/thread.odin
index 9fcc5b84f..1c473bd1d 100644
--- a/core/thread/thread.odin
+++ b/core/thread/thread.odin
@@ -1,8 +1,8 @@
 package thread
 
-import "core:runtime"
+import "base:runtime"
 import "core:mem"
-import "core:intrinsics"
+import "base:intrinsics"
 
 _ :: intrinsics
 
diff --git a/core/thread/thread_js.odin b/core/thread/thread_js.odin
index 3c4935495..4f5b5b086 100644
--- a/core/thread/thread_js.odin
+++ b/core/thread/thread_js.odin
@@ -1,7 +1,7 @@
 //+build js
 package thread
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:sync"
 import "core:mem"
 
diff --git a/core/thread/thread_pool.odin b/core/thread/thread_pool.odin
index 1a4119e5f..fddcac89e 100644
--- a/core/thread/thread_pool.odin
+++ b/core/thread/thread_pool.odin
@@ -6,7 +6,7 @@ package thread
 	Made available under Odin's BSD-3 license.
 */
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:sync"
 import "core:mem"
 
diff --git a/core/thread/thread_unix.odin b/core/thread/thread_unix.odin
index c73085ef6..19e421646 100644
--- a/core/thread/thread_unix.odin
+++ b/core/thread/thread_unix.odin
@@ -2,7 +2,7 @@
 // +private
 package thread
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:sync"
 import "core:sys/unix"
 
diff --git a/core/thread/thread_windows.odin b/core/thread/thread_windows.odin
index 28b2294d1..e85b2b62a 100644
--- a/core/thread/thread_windows.odin
+++ b/core/thread/thread_windows.odin
@@ -2,7 +2,7 @@
 //+private
 package thread
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:sync"
 import win32 "core:sys/windows"
 
diff --git a/core/time/perf.odin b/core/time/perf.odin
index 87192093a..123d67eca 100644
--- a/core/time/perf.odin
+++ b/core/time/perf.odin
@@ -1,7 +1,7 @@
 package time
 
-import "core:runtime"
-import "core:intrinsics"
+import "base:runtime"
+import "base:intrinsics"
 
 Tick :: struct {
 	_nsec: i64, // relative amount
diff --git a/core/time/time.odin b/core/time/time.odin
index 90d051a31..7911457de 100644
--- a/core/time/time.odin
+++ b/core/time/time.odin
@@ -1,6 +1,6 @@
 package time
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 Duration :: distinct i64
 
diff --git a/core/unicode/utf8/utf8string/string.odin b/core/unicode/utf8/utf8string/string.odin
index 86267defb..431939efe 100644
--- a/core/unicode/utf8/utf8string/string.odin
+++ b/core/unicode/utf8/utf8string/string.odin
@@ -1,8 +1,8 @@
 package utf8string
 
 import "core:unicode/utf8"
-import "core:runtime"
-import "core:builtin"
+import "base:runtime"
+import "base:builtin"
 
 String :: struct {
 	contents:   string,
diff --git a/examples/all/all_main.odin b/examples/all/all_main.odin
index 0872e0550..5f03508df 100644
--- a/examples/all/all_main.odin
+++ b/examples/all/all_main.odin
@@ -94,7 +94,7 @@ import slashpath        "core:path/slashpath"
 import filepath         "core:path/filepath"
 
 import reflect          "core:reflect"
-import runtime          "core:runtime"
+import runtime          "base:runtime"
 import simd             "core:simd"
 import slice            "core:slice"
 import slice_heap       "core:slice/heap"
diff --git a/tests/core/hash/test_core_hash.odin b/tests/core/hash/test_core_hash.odin
index e69490143..932d2f34c 100644
--- a/tests/core/hash/test_core_hash.odin
+++ b/tests/core/hash/test_core_hash.odin
@@ -7,7 +7,7 @@ import "core:testing"
 import "core:fmt"
 import "core:os"
 import "core:math/rand"
-import "core:intrinsics"
+import "base:intrinsics"
 
 TEST_count := 0
 TEST_fail  := 0
diff --git a/tests/core/image/test_core_image.odin b/tests/core/image/test_core_image.odin
index bce5c910b..54b3608b7 100644
--- a/tests/core/image/test_core_image.odin
+++ b/tests/core/image/test_core_image.odin
@@ -27,7 +27,7 @@ import "core:mem"
 import "core:os"
 import "core:time"
 
-import "core:runtime"
+import "base:runtime"
 
 TEST_SUITE_PATH   :: "assets/PNG"
 
diff --git a/tests/core/math/big/test.odin b/tests/core/math/big/test.odin
index 8a44ec087..e0762a66d 100644
--- a/tests/core/math/big/test.odin
+++ b/tests/core/math/big/test.odin
@@ -14,7 +14,7 @@ package math_big_tests
 	TODO: Write tests for `internal_*` and test reusing parameters with the public implementations.
 */
 
-import "core:runtime"
+import "base:runtime"
 import "core:strings"
 import "core:math/big"
 
diff --git a/tests/core/runtime/test_core_runtime.odin b/tests/core/runtime/test_core_runtime.odin
index 5ae07ffe2..786cf003a 100644
--- a/tests/core/runtime/test_core_runtime.odin
+++ b/tests/core/runtime/test_core_runtime.odin
@@ -1,11 +1,11 @@
 package test_core_runtime
 
 import "core:fmt"
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:mem"
 import "core:os"
 import "core:reflect"
-import "core:runtime"
+import "base:runtime"
 import "core:testing"
 
 TEST_count := 0
diff --git a/tests/core/strings/test_core_strings.odin b/tests/core/strings/test_core_strings.odin
index 3424675b3..f49476765 100644
--- a/tests/core/strings/test_core_strings.odin
+++ b/tests/core/strings/test_core_strings.odin
@@ -4,7 +4,7 @@ import "core:strings"
 import "core:testing"
 import "core:fmt"
 import "core:os"
-import "core:runtime"
+import "base:runtime"
 import "core:mem"
 
 TEST_count := 0
diff --git a/tests/documentation/documentation_tester.odin b/tests/documentation/documentation_tester.odin
index 1f0f8ca97..8a798d6c5 100644
--- a/tests/documentation/documentation_tester.odin
+++ b/tests/documentation/documentation_tester.odin
@@ -273,7 +273,7 @@ import "core:io"
 import "core:fmt"
 import "core:thread"
 import "core:sync"
-import "core:intrinsics"
+import "base:intrinsics"
 
 @(private="file")
 _read_pipe: os.Handle
diff --git a/tests/internal/test_map.odin b/tests/internal/test_map.odin
index 781fbad74..2c808d85e 100644
--- a/tests/internal/test_map.odin
+++ b/tests/internal/test_map.odin
@@ -1,7 +1,7 @@
 package test_internal_map
 
 import "core:fmt"
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:math/rand"
 import "core:mem"
 import "core:os"
diff --git a/vendor/OpenGL/helpers.odin b/vendor/OpenGL/helpers.odin
index 82b69b9ae..a7432db95 100644
--- a/vendor/OpenGL/helpers.odin
+++ b/vendor/OpenGL/helpers.odin
@@ -5,7 +5,7 @@ package vendor_gl
 import "core:os"
 import "core:fmt"
 import "core:strings"
-import "core:runtime"
+import "base:runtime"
 _ :: fmt
 _ :: runtime
 
diff --git a/vendor/OpenGL/wrappers.odin b/vendor/OpenGL/wrappers.odin
index e17b0eb3c..550ba3cfa 100644
--- a/vendor/OpenGL/wrappers.odin
+++ b/vendor/OpenGL/wrappers.odin
@@ -2,7 +2,7 @@ package vendor_gl
 
 #assert(size_of(bool) == size_of(u8))
 
-import "core:runtime"
+import "base:runtime"
 import "core:fmt"
 _ :: runtime
 _ :: fmt
diff --git a/vendor/commonmark/cmark.odin b/vendor/commonmark/cmark.odin
index 4331e3116..3563dff16 100644
--- a/vendor/commonmark/cmark.odin
+++ b/vendor/commonmark/cmark.odin
@@ -8,7 +8,7 @@ package vendor_commonmark
 
 import "core:c"
 import "core:c/libc"
-import "core:runtime"
+import "base:runtime"
 
 COMMONMARK_SHARED :: #config(COMMONMARK_SHARED, false)
 BINDING_VERSION :: Version_Info{major = 0, minor = 30, patch = 2}
diff --git a/vendor/darwin/Foundation/NSApplication.odin b/vendor/darwin/Foundation/NSApplication.odin
index 3fa0d28b6..c87a3d44c 100644
--- a/vendor/darwin/Foundation/NSApplication.odin
+++ b/vendor/darwin/Foundation/NSApplication.odin
@@ -2,8 +2,8 @@ package objc_Foundation
 
 foreign import "system:Foundation.framework"
 
-import "core:intrinsics"
-import "core:runtime"
+import "base:intrinsics"
+import "base:runtime"
 import "core:strings"
 
 RunLoopMode :: ^String
diff --git a/vendor/darwin/Foundation/NSArray.odin b/vendor/darwin/Foundation/NSArray.odin
index 3e6520c0d..b238f63f8 100644
--- a/vendor/darwin/Foundation/NSArray.odin
+++ b/vendor/darwin/Foundation/NSArray.odin
@@ -1,6 +1,6 @@
 package objc_Foundation
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 @(objc_class="NSArray")
 Array :: struct {
diff --git a/vendor/darwin/Foundation/NSBlock.odin b/vendor/darwin/Foundation/NSBlock.odin
index ecb31bcfb..b9d94bfee 100644
--- a/vendor/darwin/Foundation/NSBlock.odin
+++ b/vendor/darwin/Foundation/NSBlock.odin
@@ -1,7 +1,7 @@
 package objc_Foundation
 
-import "core:intrinsics"
-import "core:builtin"
+import "base:intrinsics"
+import "base:builtin"
 import "core:mem"
 
 @(objc_class="NSBlock")
diff --git a/vendor/darwin/Foundation/NSEnumerator.odin b/vendor/darwin/Foundation/NSEnumerator.odin
index 555e58141..52f3f49d7 100644
--- a/vendor/darwin/Foundation/NSEnumerator.odin
+++ b/vendor/darwin/Foundation/NSEnumerator.odin
@@ -1,7 +1,7 @@
 package objc_Foundation
 
 import "core:c"
-import "core:intrinsics"
+import "base:intrinsics"
 
 FastEnumerationState :: struct #packed {
 	state:        c.ulong,
diff --git a/vendor/darwin/Foundation/NSMenu.odin b/vendor/darwin/Foundation/NSMenu.odin
index 6ed9b9918..79da36601 100644
--- a/vendor/darwin/Foundation/NSMenu.odin
+++ b/vendor/darwin/Foundation/NSMenu.odin
@@ -1,7 +1,7 @@
 package objc_Foundation
 
-import "core:builtin"
-import "core:intrinsics"
+import "base:builtin"
+import "base:intrinsics"
 
 KeyEquivalentModifierFlag :: enum UInteger {
 	CapsLock   = 16, // Set if Caps Lock key is pressed.
diff --git a/vendor/darwin/Foundation/NSObject.odin b/vendor/darwin/Foundation/NSObject.odin
index fdcf05880..31ece47a1 100644
--- a/vendor/darwin/Foundation/NSObject.odin
+++ b/vendor/darwin/Foundation/NSObject.odin
@@ -1,6 +1,6 @@
 package objc_Foundation
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 methodSignatureForSelector :: proc "c" (obj: ^Object, selector: SEL) -> rawptr {
 	return msgSend(rawptr, obj, "methodSignatureForSelector:", selector)
diff --git a/vendor/darwin/Foundation/NSTypes.odin b/vendor/darwin/Foundation/NSTypes.odin
index 671832a2d..fbd883a8f 100644
--- a/vendor/darwin/Foundation/NSTypes.odin
+++ b/vendor/darwin/Foundation/NSTypes.odin
@@ -1,6 +1,6 @@
 package objc_Foundation
 
-import "core:intrinsics"
+import "base:intrinsics"
 
 @(private) msgSend :: intrinsics.objc_send
 
diff --git a/vendor/darwin/Foundation/NSWindow.odin b/vendor/darwin/Foundation/NSWindow.odin
index 16dd5afc3..7159a7c3a 100644
--- a/vendor/darwin/Foundation/NSWindow.odin
+++ b/vendor/darwin/Foundation/NSWindow.odin
@@ -1,8 +1,8 @@
 package objc_Foundation
 
 import "core:strings"
-import "core:runtime"
-import "core:intrinsics"
+import "base:runtime"
+import "base:intrinsics"
 
 Rect :: struct {
 	using origin: Point,
diff --git a/vendor/darwin/Foundation/objc.odin b/vendor/darwin/Foundation/objc.odin
index 6469b1d1d..673996cbe 100644
--- a/vendor/darwin/Foundation/objc.odin
+++ b/vendor/darwin/Foundation/objc.odin
@@ -4,7 +4,7 @@ foreign import "system:Foundation.framework"
 // NOTE: Most of our bindings are reliant on Cocoa (everything under appkit) so just unconditionally import it
 @(require) foreign import "system:Cocoa.framework"
 
-import "core:intrinsics"
+import "base:intrinsics"
 import "core:c"
 
 IMP :: proc "c" (object: id, sel: SEL, #c_vararg args: ..any) -> id
diff --git a/vendor/darwin/Metal/MetalTypes.odin b/vendor/darwin/Metal/MetalTypes.odin
index b14fe2886..6d372b925 100644
--- a/vendor/darwin/Metal/MetalTypes.odin
+++ b/vendor/darwin/Metal/MetalTypes.odin
@@ -1,7 +1,7 @@
 package objc_Metal
 
 import NS "vendor:darwin/Foundation"
-import "core:intrinsics"
+import "base:intrinsics"
 
 BOOL :: NS.BOOL
 id :: ^NS.Object
diff --git a/vendor/darwin/MetalKit/MetalKit.odin b/vendor/darwin/MetalKit/MetalKit.odin
index eb09410d1..060824923 100644
--- a/vendor/darwin/MetalKit/MetalKit.odin
+++ b/vendor/darwin/MetalKit/MetalKit.odin
@@ -3,7 +3,7 @@ package objc_MetalKit
 import NS "vendor:darwin/Foundation"
 import MTL "vendor:darwin/Metal"
 import CA "vendor:darwin/QuartzCore"
-import "core:intrinsics"
+import "base:intrinsics"
 
 @(require)
 foreign import "system:MetalKit.framework"
diff --git a/vendor/darwin/QuartzCore/QuartzCore.odin b/vendor/darwin/QuartzCore/QuartzCore.odin
index 93998d95d..8b118ba04 100644
--- a/vendor/darwin/QuartzCore/QuartzCore.odin
+++ b/vendor/darwin/QuartzCore/QuartzCore.odin
@@ -2,7 +2,7 @@ package objc_QuartzCore
 
 import NS "vendor:darwin/Foundation"
 import MTL "vendor:darwin/Metal"
-import "core:intrinsics"
+import "base:intrinsics"
 
 @(private)
 msgSend :: intrinsics.objc_send
diff --git a/vendor/fontstash/fontstash.odin b/vendor/fontstash/fontstash.odin
index 1516e34cf..70edcd109 100644
--- a/vendor/fontstash/fontstash.odin
+++ b/vendor/fontstash/fontstash.odin
@@ -2,7 +2,7 @@
 //+vet !using-param
 package fontstash
 
-import "core:runtime"
+import "base:runtime"
 import "core:log"
 import "core:os"
 import "core:mem"
diff --git a/vendor/lua/5.1/lua.odin b/vendor/lua/5.1/lua.odin
index a49fa4505..b53c61bb3 100644
--- a/vendor/lua/5.1/lua.odin
+++ b/vendor/lua/5.1/lua.odin
@@ -1,7 +1,7 @@
 package lua_5_1
 
-import "core:intrinsics"
-import "core:builtin"
+import "base:intrinsics"
+import "base:builtin"
 
 import c "core:c/libc"
 
diff --git a/vendor/lua/5.2/lua.odin b/vendor/lua/5.2/lua.odin
index c03fdb6a5..5474da95d 100644
--- a/vendor/lua/5.2/lua.odin
+++ b/vendor/lua/5.2/lua.odin
@@ -1,7 +1,7 @@
 package lua_5_2
 
-import "core:intrinsics"
-import "core:builtin"
+import "base:intrinsics"
+import "base:builtin"
 
 import c "core:c/libc"
 
diff --git a/vendor/lua/5.3/lua.odin b/vendor/lua/5.3/lua.odin
index c32801bb2..e0975e5f8 100644
--- a/vendor/lua/5.3/lua.odin
+++ b/vendor/lua/5.3/lua.odin
@@ -1,7 +1,7 @@
 package lua_5_3
 
-import "core:intrinsics"
-import "core:builtin"
+import "base:intrinsics"
+import "base:builtin"
 
 import c "core:c/libc"
 
diff --git a/vendor/lua/5.4/lua.odin b/vendor/lua/5.4/lua.odin
index dd870d7fa..80f7ead3a 100644
--- a/vendor/lua/5.4/lua.odin
+++ b/vendor/lua/5.4/lua.odin
@@ -1,7 +1,7 @@
 package lua_5_4
 
-import "core:intrinsics"
-import "core:builtin"
+import "base:intrinsics"
+import "base:builtin"
 
 import c "core:c/libc"
 
diff --git a/vendor/sdl2/sdl2.odin b/vendor/sdl2/sdl2.odin
index adf6dbd49..719390adc 100644
--- a/vendor/sdl2/sdl2.odin
+++ b/vendor/sdl2/sdl2.odin
@@ -23,7 +23,7 @@ package sdl2
 
 
 import "core:c"
-import "core:intrinsics"
+import "base:intrinsics"
 
 when ODIN_OS == .Windows {
 	foreign import lib "SDL2.lib"
diff --git a/vendor/wasm/js/dom_all_targets.odin b/vendor/wasm/js/dom_all_targets.odin
index 7b3ad1a64..ef629b347 100644
--- a/vendor/wasm/js/dom_all_targets.odin
+++ b/vendor/wasm/js/dom_all_targets.odin
@@ -1,7 +1,7 @@
 //+build !js
 package wasm_js_interface
 
-import "core:runtime"
+import "base:runtime"
 
 
 get_element_value_string :: proc "contextless" (id: string, buf: []byte) -> string {
diff --git a/vendor/wasm/js/memory_js.odin b/vendor/wasm/js/memory_js.odin
index cdeb58128..1a8690325 100644
--- a/vendor/wasm/js/memory_js.odin
+++ b/vendor/wasm/js/memory_js.odin
@@ -2,7 +2,7 @@
 package wasm_js_interface
 
 import "core:mem"
-import "core:intrinsics"
+import "base:intrinsics"
 
 PAGE_SIZE :: 64 * 1024
 page_alloc :: proc(page_count: int) -> (data: []byte, err: mem.Allocator_Error) {