diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/Module.manifest b/Ghidra/Debug/Debugger-agent-dbgeng/Module.manifest
index 8f0afe45a1..e69de29bb2 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/Module.manifest
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/Module.manifest
@@ -1,2 +0,0 @@
-MODULE FILE LICENSE: lib/jna-5.4.0.jar Apache License 2.0
-MODULE FILE LICENSE: lib/jna-platform-5.4.0.jar Apache License 2.0
diff --git a/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle b/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
index f2222c1b92..26301609aa 100644
--- a/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
+++ b/Ghidra/Debug/Debugger-agent-dbgeng/build.gradle
@@ -26,8 +26,6 @@ dependencies {
 	api project(":Framework-AsyncComm")
 	api project(":Framework-Debugging")
 	api project(":Debugger-gadp")
-	api "net.java.dev.jna:jna:5.4.0"
-	api "net.java.dev.jna:jna-platform:5.4.0"
 
 	//testImplementation project(":Base")
 	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel-traceloader/Module.manifest b/Ghidra/Debug/Debugger-agent-dbgmodel-traceloader/Module.manifest
index 8f0afe45a1..e69de29bb2 100644
--- a/Ghidra/Debug/Debugger-agent-dbgmodel-traceloader/Module.manifest
+++ b/Ghidra/Debug/Debugger-agent-dbgmodel-traceloader/Module.manifest
@@ -1,2 +0,0 @@
-MODULE FILE LICENSE: lib/jna-5.4.0.jar Apache License 2.0
-MODULE FILE LICENSE: lib/jna-platform-5.4.0.jar Apache License 2.0
diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/Module.manifest b/Ghidra/Debug/Debugger-agent-dbgmodel/Module.manifest
index 8f0afe45a1..e69de29bb2 100644
--- a/Ghidra/Debug/Debugger-agent-dbgmodel/Module.manifest
+++ b/Ghidra/Debug/Debugger-agent-dbgmodel/Module.manifest
@@ -1,2 +0,0 @@
-MODULE FILE LICENSE: lib/jna-5.4.0.jar Apache License 2.0
-MODULE FILE LICENSE: lib/jna-platform-5.4.0.jar Apache License 2.0
diff --git a/Ghidra/Debug/Debugger-agent-dbgmodel/certification.manifest b/Ghidra/Debug/Debugger-agent-dbgmodel/certification.manifest
index 346cd88a39..c4d5c18430 100644
--- a/Ghidra/Debug/Debugger-agent-dbgmodel/certification.manifest
+++ b/Ghidra/Debug/Debugger-agent-dbgmodel/certification.manifest
@@ -1,5 +1,4 @@
 ##VERSION: 2.0
-##MODULE IP: Apache License 2.0
 Module.manifest||GHIDRA||||END|
 src/javaprovider/def/javaprovider.def||GHIDRA||||END|
 src/javaprovider/rc/javaprovider.rc||GHIDRA||||END|
diff --git a/Ghidra/Debug/Debugger-agent-gdb/build.gradle b/Ghidra/Debug/Debugger-agent-gdb/build.gradle
index 65e0541b76..b8d70ee893 100644
--- a/Ghidra/Debug/Debugger-agent-gdb/build.gradle
+++ b/Ghidra/Debug/Debugger-agent-gdb/build.gradle
@@ -28,8 +28,6 @@ dependencies {
 	api project(':Debugger-gadp')
 	api project(':Python')
 	api 'com.jcraft:jsch:0.1.55'
-	api "net.java.dev.jna:jna:5.4.0"
-	api "net.java.dev.jna:jna-platform:5.4.0"
 
 	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
 	testImplementation project(path: ':Framework-Debugging', configuration: 'testArtifacts')
diff --git a/Ghidra/Debug/Framework-Debugging/Module.manifest b/Ghidra/Debug/Framework-Debugging/Module.manifest
index e69de29bb2..adc3d5b00e 100644
--- a/Ghidra/Debug/Framework-Debugging/Module.manifest
+++ b/Ghidra/Debug/Framework-Debugging/Module.manifest
@@ -0,0 +1,2 @@
+MODULE FILE LICENSE: lib/jna-5.4.0.jar Apache License 2.0
+MODULE FILE LICENSE: lib/jna-platform-5.4.0.jar Apache License 2.0
\ No newline at end of file
diff --git a/Ghidra/Debug/Framework-Debugging/build.gradle b/Ghidra/Debug/Framework-Debugging/build.gradle
index df7c0d8b04..1c1a2394c7 100644
--- a/Ghidra/Debug/Framework-Debugging/build.gradle
+++ b/Ghidra/Debug/Framework-Debugging/build.gradle
@@ -27,6 +27,9 @@ dependencies {
 	api project(':Generic')
 	api project(':SoftwareModeling')
 	api project(':ProposedUtils')
+	
+	api "net.java.dev.jna:jna:5.4.0"
+	api "net.java.dev.jna:jna-platform:5.4.0"
 
 	testImplementation project(path: ':Framework-AsyncComm', configuration: 'testArtifacts')
 }
diff --git a/Ghidra/Debug/Framework-Debugging/certification.manifest b/Ghidra/Debug/Framework-Debugging/certification.manifest
index 5bbc754b9b..3cf64be0b6 100644
--- a/Ghidra/Debug/Framework-Debugging/certification.manifest
+++ b/Ghidra/Debug/Framework-Debugging/certification.manifest
@@ -1,4 +1,5 @@
 ##VERSION: 2.0
+##MODULE IP: Apache License 2.0
 Module.manifest||GHIDRA||||END|
 data/ExtensionPoint.manifest||GHIDRA||||END|
 src/main/resources/agent.log4j.xml||GHIDRA||||END|