diff --git a/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java b/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java
index b85ff5034f..07db2763f0 100644
--- a/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java
+++ b/Ghidra/Features/Base/ghidra_scripts/CreateUEFIGDTArchivesScript.java
@@ -128,6 +128,7 @@ public class CreateUEFIGDTArchivesScript extends GhidraScript {
 		};
 		
 		String args[] = {
+			"-DSTATIC_ASSERT=static_assert"
 		};
 		
 		parseHeaderFilesToGDT(outputDirectory, "uefi_"+name, languageID, compiler, filenames, includePaths, args);
diff --git a/gradle/distributableGhidraModule.gradle b/gradle/distributableGhidraModule.gradle
index a1b382db3e..89c3813687 100644
--- a/gradle/distributableGhidraModule.gradle
+++ b/gradle/distributableGhidraModule.gradle
@@ -177,8 +177,6 @@ String getGlobalFilePathSubDirName(File file) {
 
 
 plugins.withType(JavaPlugin) {
-	// build up a java classpath for javadocs
-	rootProject.ghidraPath.from(sourceSets.main.compileClasspath)
 
 	rootProject.assembleSource {
 		from (this.project.zipSourceSubproject) {
diff --git a/gradle/support/distributionCommon.gradle b/gradle/support/distributionCommon.gradle
index 0356418ab9..39627a490e 100644
--- a/gradle/support/distributionCommon.gradle
+++ b/gradle/support/distributionCommon.gradle
@@ -21,6 +21,10 @@ tasks.withType(Test).all {
 }
 
 plugins.withType(JavaPlugin) {
+
+	// build up a java classpath for javadocs
+	rootProject.ghidraPath.from(sourceSets.main.compileClasspath)
+
 	task zipSourceSubproject (type: Zip) { t ->
 							
 		// Define some metadata about the zip (name, location, version, etc....)