diff --git a/pkl-codegen-java/pkl-codegen-java.gradle.kts b/pkl-codegen-java/pkl-codegen-java.gradle.kts
index 1a4f1b55..f8746eed 100644
--- a/pkl-codegen-java/pkl-codegen-java.gradle.kts
+++ b/pkl-codegen-java/pkl-codegen-java.gradle.kts
@@ -21,11 +21,11 @@ plugins {
 }
 
 dependencies {
-  // CliJavaCodeGeneratorOptions exposes CliBaseOptions
+  // CliJavaCodeGeneratorOptions exposes pkl-commons-cli and pkl-base
   api(projects.pklCommonsCli)
+  api(projects.pklCore)
 
   implementation(projects.pklCommons)
-  implementation(projects.pklCore)
   implementation(libs.javaPoet)
 
   testImplementation(projects.pklConfigJava)
diff --git a/pkl-config-kotlin/pkl-config-kotlin.gradle.kts b/pkl-config-kotlin/pkl-config-kotlin.gradle.kts
index 5177fd78..b9c4c876 100644
--- a/pkl-config-kotlin/pkl-config-kotlin.gradle.kts
+++ b/pkl-config-kotlin/pkl-config-kotlin.gradle.kts
@@ -101,7 +101,7 @@ publishing {
             appendNode("groupId", "org.pkl-lang")
             appendNode("artifactId", "pkl-config-java-all")
             appendNode("version", project.version)
-            appendNode("scope", "runtime")
+            appendNode("scope", "compile")
           }
         }
       }
diff --git a/pkl-doc/pkl-doc.gradle.kts b/pkl-doc/pkl-doc.gradle.kts
index 5bc0de8e..449d0c5e 100644
--- a/pkl-doc/pkl-doc.gradle.kts
+++ b/pkl-doc/pkl-doc.gradle.kts
@@ -33,8 +33,10 @@ executable {
 }
 
 dependencies {
-  implementation(projects.pklCore)
-  implementation(projects.pklCommonsCli)
+  // CliDocGeneratorOptions exposes pkl-commons-cli and pkl-base
+  api(projects.pklCore)
+  api(projects.pklCommonsCli)
+
   implementation(projects.pklCommons)
   implementation(projects.pklParser)
   implementation(libs.commonMark)