diff --git a/GhidraDocs/build.gradle b/GhidraDocs/build.gradle
index 28ab8790ee..d484ae3b57 100644
--- a/GhidraDocs/build.gradle
+++ b/GhidraDocs/build.gradle
@@ -21,10 +21,15 @@ sourceSets {
 	ghidraClass {
 		java {
 			srcDir 'GhidraClass/AdvancedDevelopment/contrib/gadc/ghidra_scripts'
+			compileClasspath += main.output
 		}
 	}
 }
 
+configurations {
+   ghidraClassImplementation.extendsFrom implementation
+}
+
 dependencies {
 	api project(':Base') 
 }
diff --git a/gradle/javaProject.gradle b/gradle/javaProject.gradle
index e8564e0a22..422c77a630 100644
--- a/gradle/javaProject.gradle
+++ b/gradle/javaProject.gradle
@@ -123,6 +123,7 @@ sourceSets {
 		java {
 			srcDir 'developer_scripts'
 			srcDir 'ghidra_scripts'
+			compileClasspath += main.output
 		}
 	}
 }
@@ -131,6 +132,7 @@ configurations {
 	integrationTestImplementation.extendsFrom testImplementation
 	integrationTestRuntimeOnly.extendsFrom testRuntimeOnly, integrationTestImplementation
 	pcodeTestImplementation.extendsFrom implementation
+	scriptsImplementation.extendsFrom implementation
 	testArtifacts.extendsFrom testRuntimeOnly
 	integrationTestArtifacts.extendsFrom integrationTestRuntimeOnly
 	screenShotsImplementation.extendsFrom integrationTestImplementation