14 files changed, 20 insertions, 24 deletions
diff --git a/src/gleam/bit_builder.gleam b/src/gleam/bit_builder.gleam
index 49892e8..a3791c8 100644
--- a/src/gleam/bit_builder.gleam
+++ b/src/gleam/bit_builder.gleam
@@ -13,8 +13,11 @@
 //// On Erlang this type is compatible with Erlang's iolists.
 
 import gleam/string_builder.{StringBuilder}
-import gleam/bit_string
-import gleam/list
+
+if javascript {
+  import gleam/list
+  import gleam/bit_string
+}
 
 if erlang {
   pub external type BitBuilder
diff --git a/src/gleam/dynamic.gleam b/src/gleam/dynamic.gleam
index 50345fb..c91f468 100644
--- a/src/gleam/dynamic.gleam
+++ b/src/gleam/dynamic.gleam
@@ -1,13 +1,15 @@
-import gleam/bit_string
 import gleam/list
 import gleam/map
 import gleam/int
-import gleam/option
 import gleam/result
 import gleam/string_builder
 import gleam/map.{Map}
 import gleam/option.{Option}
 
+if erlang {
+  import gleam/bit_string
+}
+
 /// `Dynamic` data is data that we don't know the type of yet.
 /// We likely get data like this from interop with Erlang, or from
 /// IO with the outside world.
diff --git a/src/gleam/map.gleam b/src/gleam/map.gleam
index b801f44..9ec83e0 100644
--- a/src/gleam/map.gleam
+++ b/src/gleam/map.gleam
@@ -1,7 +1,9 @@
-import gleam/result
 import gleam/option.{Option}
 import gleam/list
-import gleam/pair
+
+if javascript {
+  import gleam/pair
+}
 
 /// A dictionary of keys and values.
 ///
diff --git a/src/gleam/string.gleam b/src/gleam/string.gleam
index 8ff8fcd..49e7f73 100644
--- a/src/gleam/string.gleam
+++ b/src/gleam/string.gleam
@@ -5,10 +5,10 @@ import gleam/string_builder
 import gleam/iterator.{Iterator}
 import gleam/list
 import gleam/order
-import gleam/result
 import gleam/option.{None, Option, Some}
 
 if erlang {
+  import gleam/result
   import gleam/dynamic.{Dynamic}
 }
 
diff --git a/src/gleam/uri.gleam b/src/gleam/uri.gleam
index 514a7ff..8bb1746 100644
--- a/src/gleam/uri.gleam
+++ b/src/gleam/uri.gleam
@@ -7,17 +7,18 @@
 //// Query encoding (Form encoding) is defined in the w3c specification.
 //// https://www.w3.org/TR/html52/sec-forms.html#urlencoded-form-data
 
-import gleam/function
 import gleam/string_builder.{StringBuilder}
 import gleam/int
 import gleam/list
-import gleam/map
 import gleam/option.{None, Option, Some}
-import gleam/pair
-import gleam/regex
-import gleam/result
 import gleam/string
 
+if javascript {
+  import gleam/pair
+  import gleam/regex
+  import gleam/result
+}
+
 /// Type representing holding the parsed components of an URI.
 /// All components of a URI are optional, except the path.
 ///
diff --git a/test/gleam/base_test.gleam b/test/gleam/base_test.gleam
index c783efa..a49724f 100644
--- a/test/gleam/base_test.gleam
+++ b/test/gleam/base_test.gleam
@@ -1,5 +1,4 @@
 import gleam/base
-import gleam/list
 import gleam/should
 
 pub fn encode64_test() {
diff --git a/test/gleam/dynamic_test.gleam b/test/gleam/dynamic_test.gleam
index 3e7cbd2..52c49e2 100644
--- a/test/gleam/dynamic_test.gleam
+++ b/test/gleam/dynamic_test.gleam
@@ -1,6 +1,5 @@
 import gleam/should
 import gleam/dynamic.{DecodeError}
-import gleam/bit_string
 import gleam/result
 import gleam/map
 import gleam/option.{None, Some}
diff --git a/test/gleam/function_test.gleam b/test/gleam/function_test.gleam
index b6e9898..163ed6f 100644
--- a/test/gleam/function_test.gleam
+++ b/test/gleam/function_test.gleam
@@ -1,12 +1,10 @@
 import gleam/should
-import gleam/dynamic
 import gleam/function
 import gleam/int
 import gleam/pair
 import gleam/list
 import gleam/result
 import gleam/string
-import gleam/io
 
 pub fn compose_test() {
   let add_two = fn(int: Int) { int + 2 }
diff --git a/test/gleam/int_test.gleam b/test/gleam/int_test.gleam
index 91fa0b3..852d94d 100644
--- a/test/gleam/int_test.gleam
+++ b/test/gleam/int_test.gleam
@@ -3,7 +3,6 @@ import gleam/int
 import gleam/order
 import gleam/list
 import gleam/iterator
-import gleam/float
 
 pub fn absolute_value_test() {
   123
diff --git a/test/gleam/list_test.gleam b/test/gleam/list_test.gleam
index 73d9df5..cfacc68 100644
--- a/test/gleam/list_test.gleam
+++ b/test/gleam/list_test.gleam
@@ -2,8 +2,6 @@ import gleam/should
 import gleam/list
 import gleam/int
 import gleam/float
-import gleam/string
-import gleam/pair
 
 pub fn length_test() {
   list.length([])
diff --git a/test/gleam/queue_test.gleam b/test/gleam/queue_test.gleam
index 511b828..2d8a590 100644
--- a/test/gleam/queue_test.gleam
+++ b/test/gleam/queue_test.gleam
@@ -3,7 +3,6 @@ import gleam/int
 import gleam/list
 import gleam/should
 import gleam/pair
-import gleam/io
 
 pub fn from_and_to_list_test() {
   queue.from_list([])
diff --git a/test/gleam/regex_test.gleam b/test/gleam/regex_test.gleam
index 5916b63..b97eb20 100644
--- a/test/gleam/regex_test.gleam
+++ b/test/gleam/regex_test.gleam
@@ -1,6 +1,5 @@
 import gleam/regex.{Match, Options}
 import gleam/should
-import gleam/io
 import gleam/option.{None, Some}
 
 pub fn from_string_test() {
diff --git a/test/gleam/string_test.gleam b/test/gleam/string_test.gleam
index d3a8496..1151dee 100644
--- a/test/gleam/string_test.gleam
+++ b/test/gleam/string_test.gleam
@@ -2,8 +2,6 @@ import gleam/string
 import gleam/should
 import gleam/order
 import gleam/option.{None, Some}
-import gleam/io
-import gleam/bit_string
 
 pub fn length_test() {
   string.length("ß↑e̊")
diff --git a/test/gleam/uri_test.gleam b/test/gleam/uri_test.gleam
index bcf0d18..c639806 100644
--- a/test/gleam/uri_test.gleam
+++ b/test/gleam/uri_test.gleam
@@ -5,7 +5,6 @@ import gleam/should
 import gleam/option.{None, Some}
 import gleam/string
 import gleam/list
-import gleam/io
 
 pub fn full_parse_test() {
   assert Ok(parsed) =