diff --git a/Cargo.lock b/Cargo.lock
index d58010f9d0..918338a59e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -422,7 +422,6 @@ name = "codegen_runtime_node_addon"
 version = "0.14.2"
 dependencies = [
  "metaslang_cst",
- "metaslang_graph_builder",
  "napi",
  "napi-build",
  "napi-derive",
@@ -1952,7 +1951,6 @@ name = "slang_solidity_node_addon"
 version = "0.14.2"
 dependencies = [
  "metaslang_cst",
- "metaslang_graph_builder",
  "napi",
  "napi-build",
  "napi-derive",
@@ -1972,7 +1970,6 @@ dependencies = [
  "codegen_runtime_generator",
  "infra_utils",
  "metaslang_cst",
- "metaslang_graph_builder",
  "semver",
  "serde",
  "strum",
@@ -1986,7 +1983,6 @@ name = "slang_testlang_node_addon"
 version = "0.14.2"
 dependencies = [
  "metaslang_cst",
- "metaslang_graph_builder",
  "napi",
  "napi-build",
  "napi-derive",
diff --git a/crates/codegen/runtime/cargo/Cargo.toml b/crates/codegen/runtime/cargo/Cargo.toml
index 37b38a1f9d..b66e260a2b 100644
--- a/crates/codegen/runtime/cargo/Cargo.toml
+++ b/crates/codegen/runtime/cargo/Cargo.toml
@@ -15,7 +15,7 @@ codegen_runtime_generator = { workspace = true }
 ariadne = { workspace = true, optional = true }
 clap = { workspace = true, optional = true }
 metaslang_cst = { workspace = true }
-metaslang_graph_builder = { workspace = true }
+metaslang_graph_builder = { workspace = true, optional = true }
 napi = { workspace = true, optional = true }
 napi-derive = { workspace = true, optional = true }
 semver = { workspace = true }
@@ -32,7 +32,7 @@ default = ["slang_napi_interfaces", "__private_ariadne", "cli"]
 slang_napi_interfaces = ["dep:napi", "dep:napi-derive", "dep:serde_json"]
 # Only used by the `slang_solidity` CLI
 __private_ariadne = ["dep:ariadne"]
-cli = ["dep:clap", "dep:serde_json"]
+cli = ["dep:clap", "dep:metaslang_graph_builder", "dep:serde_json"]
 
 [lints]
 workspace = true
diff --git a/crates/codegen/runtime/cargo/src/runtime/mod.rs b/crates/codegen/runtime/cargo/src/runtime/mod.rs
index 704a98e734..4bf5656d77 100644
--- a/crates/codegen/runtime/cargo/src/runtime/mod.rs
+++ b/crates/codegen/runtime/cargo/src/runtime/mod.rs
@@ -73,13 +73,13 @@ pub mod text_index {
     pub use text_index::{TextIndex, TextRange, TextRangeExtensions};
 }
 
-pub mod graph_builder {
-    pub use metaslang_graph_builder::functions::Functions;
-    use metaslang_graph_builder::{ast, graph};
-    pub use metaslang_graph_builder::{ExecutionConfig, ExecutionError, NoCancellation, Variables};
+#[cfg(feature = "cli")]
+pub(crate) mod graph_builder {
+    use metaslang_graph_builder::ast;
+    pub(crate) use metaslang_graph_builder::functions::Functions;
+    pub(crate) use metaslang_graph_builder::{ExecutionConfig, ExecutionError, NoCancellation, Variables};
 
     use super::metaslang_cst::KindTypes;
 
-    pub type File = ast::File<KindTypes>;
-    pub type Graph = graph::Graph<KindTypes>;
+    pub(crate) type File = ast::File<KindTypes>;
 }
diff --git a/crates/codegen/runtime/node_addon/Cargo.toml b/crates/codegen/runtime/node_addon/Cargo.toml
index d8d47b2016..434484540c 100644
--- a/crates/codegen/runtime/node_addon/Cargo.toml
+++ b/crates/codegen/runtime/node_addon/Cargo.toml
@@ -35,7 +35,6 @@ napi-build = { workspace = true }
 
 [dependencies]
 metaslang_cst = { workspace = true }
-metaslang_graph_builder = { workspace = true }
 napi = { workspace = true }
 napi-derive = { workspace = true }
 semver = { workspace = true }
diff --git a/crates/solidity/outputs/cargo/slang_solidity/src/generated/mod.rs b/crates/solidity/outputs/cargo/slang_solidity/src/generated/mod.rs
index bd09fcec4d..a2e178d23e 100644
--- a/crates/solidity/outputs/cargo/slang_solidity/src/generated/mod.rs
+++ b/crates/solidity/outputs/cargo/slang_solidity/src/generated/mod.rs
@@ -75,13 +75,15 @@ pub mod text_index {
     pub use text_index::{TextIndex, TextRange, TextRangeExtensions};
 }
 
-pub mod graph_builder {
-    pub use metaslang_graph_builder::functions::Functions;
-    use metaslang_graph_builder::{ast, graph};
-    pub use metaslang_graph_builder::{ExecutionConfig, ExecutionError, NoCancellation, Variables};
+#[cfg(feature = "cli")]
+pub(crate) mod graph_builder {
+    use metaslang_graph_builder::ast;
+    pub(crate) use metaslang_graph_builder::functions::Functions;
+    pub(crate) use metaslang_graph_builder::{
+        ExecutionConfig, ExecutionError, NoCancellation, Variables,
+    };
 
     use super::metaslang_cst::KindTypes;
 
-    pub type File = ast::File<KindTypes>;
-    pub type Graph = graph::Graph<KindTypes>;
+    pub(crate) type File = ast::File<KindTypes>;
 }
diff --git a/crates/solidity/outputs/cargo/slang_solidity_node_addon/Cargo.toml b/crates/solidity/outputs/cargo/slang_solidity_node_addon/Cargo.toml
index d0ec9628c1..1c05b86f31 100644
--- a/crates/solidity/outputs/cargo/slang_solidity_node_addon/Cargo.toml
+++ b/crates/solidity/outputs/cargo/slang_solidity_node_addon/Cargo.toml
@@ -37,7 +37,6 @@ napi-build = { workspace = true }
 
 [dependencies]
 metaslang_cst = { workspace = true }
-metaslang_graph_builder = { workspace = true }
 napi = { workspace = true }
 napi-derive = { workspace = true }
 semver = { workspace = true }
diff --git a/crates/testlang/outputs/cargo/slang_testlang/Cargo.toml b/crates/testlang/outputs/cargo/slang_testlang/Cargo.toml
index c9d1a44b0e..49c89cf9eb 100644
--- a/crates/testlang/outputs/cargo/slang_testlang/Cargo.toml
+++ b/crates/testlang/outputs/cargo/slang_testlang/Cargo.toml
@@ -14,7 +14,6 @@ testlang_language = { workspace = true }
 
 [dependencies]
 metaslang_cst = { workspace = true }
-metaslang_graph_builder = { workspace = true }
 semver = { workspace = true }
 serde = { workspace = true }
 strum = { workspace = true }
diff --git a/crates/testlang/outputs/cargo/slang_testlang/src/generated/mod.rs b/crates/testlang/outputs/cargo/slang_testlang/src/generated/mod.rs
index bd09fcec4d..a2e178d23e 100644
--- a/crates/testlang/outputs/cargo/slang_testlang/src/generated/mod.rs
+++ b/crates/testlang/outputs/cargo/slang_testlang/src/generated/mod.rs
@@ -75,13 +75,15 @@ pub mod text_index {
     pub use text_index::{TextIndex, TextRange, TextRangeExtensions};
 }
 
-pub mod graph_builder {
-    pub use metaslang_graph_builder::functions::Functions;
-    use metaslang_graph_builder::{ast, graph};
-    pub use metaslang_graph_builder::{ExecutionConfig, ExecutionError, NoCancellation, Variables};
+#[cfg(feature = "cli")]
+pub(crate) mod graph_builder {
+    use metaslang_graph_builder::ast;
+    pub(crate) use metaslang_graph_builder::functions::Functions;
+    pub(crate) use metaslang_graph_builder::{
+        ExecutionConfig, ExecutionError, NoCancellation, Variables,
+    };
 
     use super::metaslang_cst::KindTypes;
 
-    pub type File = ast::File<KindTypes>;
-    pub type Graph = graph::Graph<KindTypes>;
+    pub(crate) type File = ast::File<KindTypes>;
 }
diff --git a/crates/testlang/outputs/cargo/slang_testlang_node_addon/Cargo.toml b/crates/testlang/outputs/cargo/slang_testlang_node_addon/Cargo.toml
index 195cc96183..59f9cdd2a9 100644
--- a/crates/testlang/outputs/cargo/slang_testlang_node_addon/Cargo.toml
+++ b/crates/testlang/outputs/cargo/slang_testlang_node_addon/Cargo.toml
@@ -37,7 +37,6 @@ napi-build = { workspace = true }
 
 [dependencies]
 metaslang_cst = { workspace = true }
-metaslang_graph_builder = { workspace = true }
 napi = { workspace = true }
 napi-derive = { workspace = true }
 semver = { workspace = true }