diff --git a/docs/build.gradle b/docs/build.gradle
index 67b3f78cc6..56cc1d3c0d 100644
--- a/docs/build.gradle
+++ b/docs/build.gradle
@@ -66,7 +66,6 @@ doxygen {
             cppIncludeRoots.add(it.absolutePath)
         }
     }
-    cppIncludeRoots << '../ntcore/build/generated/main/native/include/'
 
     if (project.hasProperty('docWarningsAsErrors')) {
         // apriltag
diff --git a/shared/javacpp/publish.gradle b/shared/javacpp/publish.gradle
index 7599a7426a..5af49f0c45 100644
--- a/shared/javacpp/publish.gradle
+++ b/shared/javacpp/publish.gradle
@@ -20,6 +20,9 @@ task cppSourcesZip(type: Zip) {
     from('src/main/native/cpp') {
         into '/'
     }
+    from("$buildDir/generated/cpp") {
+        into '/'
+    }
 }
 
 task cppHeadersZip(type: Zip) {
@@ -32,7 +35,8 @@ task cppHeadersZip(type: Zip) {
     }
 
     ext.includeDirs = [
-        project.file('src/main/native/include')
+        project.file('src/main/native/include'),
+        project.file('src/generated/main/native/include')
     ]
 
     ext.includeDirs.each {