diff --git a/wpiutil/build.gradle b/wpiutil/build.gradle
index a8c1665aee..7d76796309 100644
--- a/wpiutil/build.gradle
+++ b/wpiutil/build.gradle
@@ -40,7 +40,7 @@ ext {
             }
             llvmCpp(CppSourceSet) {
                 source {
-                    srcDirs 'src/main/native/thirdparty/llvm'
+                    srcDirs 'src/main/native/thirdparty/llvm/cpp'
                     include '**/*.cpp'
                 }
                 exportedHeaders {
@@ -206,15 +206,24 @@ cppHeadersZip {
 }
 
 cppSourcesZip {
-    from('src/main/native/thirdparty/llvm/cpp') {
+    from('src/main/native/thirdparty/fmtlib/src') {
         into '/'
     }
     from('src/main/native/thirdparty/json/cpp') {
         into '/'
     }
+    from('src/main/native/thirdparty/llvm/cpp') {
+        into '/'
+    }
     from('src/main/native/thirdparty/memory/src') {
         into '/'
     }
+    from('src/main/native/thirdparty/mpack/src') {
+        into '/'
+    }
+    from('src/main/native/thirdparty/sigslot/src') {
+        into '/'
+    }
 }
 
 model {