11 files changed, 27 insertions, 19 deletions
diff --git a/src/common/allocator.odin b/src/common/allocator.odin
index 21499a1..452f729 100644
--- a/src/common/allocator.odin
+++ b/src/common/allocator.odin
@@ -1,7 +1,8 @@
 package common
 
+import "base:runtime"
+
 import "core:mem"
-import "core:runtime"
 
 Scratch_Allocator :: struct {
 	data:               []byte,
diff --git a/src/main.odin b/src/main.odin
index f497557..7f399a6 100644
--- a/src/main.odin
+++ b/src/main.odin
@@ -1,5 +1,7 @@
 package main
 
+import "base:intrinsics"
+
 import "core:encoding/json"
 import "core:fmt"
 import "core:log"
@@ -12,8 +14,6 @@ import "core:strings"
 import "core:sync"
 import "core:thread"
 
-import "core:intrinsics"
-
 import "src:common"
 import "src:server"
 
diff --git a/src/server/build.odin b/src/server/build.odin
index 48b7cf1..9d0d550 100644
--- a/src/server/build.odin
+++ b/src/server/build.odin
@@ -1,5 +1,7 @@
 package server
 
+import "base:runtime"
+
 import "core:fmt"
 import "core:log"
 import "core:mem"
@@ -9,7 +11,6 @@ import "core:odin/tokenizer"
 import "core:os"
 import "core:path/filepath"
 import path "core:path/slashpath"
-import "core:runtime"
 import "core:strings"
 import "core:time"
 
diff --git a/src/server/check.odin b/src/server/check.odin
index a3804df..5f2bdc7 100644
--- a/src/server/check.odin
+++ b/src/server/check.odin
@@ -1,14 +1,15 @@
 package server
 
+import "base:intrinsics"
+import "base:runtime"
+
 import "core:encoding/json"
 import "core:fmt"
-import "core:intrinsics"
 import "core:log"
 import "core:mem"
 import "core:os"
 import "core:path/filepath"
 import path "core:path/slashpath"
-import "core:runtime"
 import "core:slice"
 import "core:strconv"
 import "core:strings"
diff --git a/src/server/clone.odin b/src/server/clone.odin
index d535d19..2057c98 100644
--- a/src/server/clone.odin
+++ b/src/server/clone.odin
@@ -1,13 +1,15 @@
 package server
 
+import "base:intrinsics"
+
 import "core:fmt"
-import "core:intrinsics"
 import "core:log"
 import "core:mem"
 import "core:odin/ast"
 import "core:odin/tokenizer"
 import "core:reflect"
 import "core:strings"
+
 _ :: intrinsics
 
 new_type :: proc(
diff --git a/src/server/documents.odin b/src/server/documents.odin
index 7b3cba4..d78a0d2 100644
--- a/src/server/documents.odin
+++ b/src/server/documents.odin
@@ -1,5 +1,7 @@
 package server
 
+import "base:intrinsics"
+
 import "core:fmt"
 import "core:log"
 import "core:mem"
@@ -11,8 +13,6 @@ import "core:path/filepath"
 import path "core:path/slashpath"
 import "core:strings"
 
-import "core:intrinsics"
-
 import "src:common"
 
 ParserError :: struct {
diff --git a/src/server/marshal.odin b/src/server/marshal.odin
index 932e337..1f18545 100644
--- a/src/server/marshal.odin
+++ b/src/server/marshal.odin
@@ -1,8 +1,9 @@
 package server
 
+import "base:runtime"
+
 import "core:mem"
 import "core:math/bits"
-import "core:runtime"
 import "core:strconv"
 import "core:strings"
 import "core:reflect"
diff --git a/src/server/references.odin b/src/server/references.odin
index 2016351..49d95bf 100644
--- a/src/server/references.odin
+++ b/src/server/references.odin
@@ -1,7 +1,6 @@
 package server
 
-
-import "src:common"
+import "base:runtime"
 
 import "core:fmt"
 import "core:log"
@@ -11,9 +10,10 @@ import "core:odin/parser"
 import "core:os"
 import "core:path/filepath"
 import path "core:path/slashpath"
-import "core:runtime"
 import "core:strings"
 
+import "src:common"
+
 fullpaths: [dynamic]string
 
 walk_directories :: proc(
diff --git a/src/server/rename.odin b/src/server/rename.odin
index b936d40..252ebaa 100644
--- a/src/server/rename.odin
+++ b/src/server/rename.odin
@@ -1,13 +1,14 @@
 package server
 
-import "src:common"
+import "base:runtime"
 
 import "core:log"
 import "core:mem"
 import "core:odin/ast"
-import "core:runtime"
 import "core:strings"
 
+import "src:common"
+
 get_rename :: proc(
 	document: ^Document,
 	new_text: string,
diff --git a/src/server/requests.odin b/src/server/requests.odin
index 330fd14..0a203ec 100644
--- a/src/server/requests.odin
+++ b/src/server/requests.odin
@@ -1,8 +1,10 @@
 package server
 
+import "base:intrinsics"
+import "base:runtime"
+
 import "core:encoding/json"
 import "core:fmt"
-import "core:intrinsics"
 import "core:log"
 import "core:mem"
 import "core:odin/ast"
@@ -19,8 +21,6 @@ import "core:time"
 
 import "src:common"
 
-import "base:runtime"
-
 Header :: struct {
 	content_length: int,
 	content_type:   string,
diff --git a/src/server/unmarshal.odin b/src/server/unmarshal.odin
index ef29801..7ad68c6 100644
--- a/src/server/unmarshal.odin
+++ b/src/server/unmarshal.odin
@@ -1,8 +1,9 @@
 package server
 
+import "base:runtime"
+
 import "core:encoding/json"
 import "core:strings"
-import "core:runtime"
 import "core:mem"
 import "core:fmt"