diff --git a/cameraserver.gradle b/cameraserver.gradle
index 77ef614716..179d07b051 100644
--- a/cameraserver.gradle
+++ b/cameraserver.gradle
@@ -9,6 +9,11 @@ def cameraserverSetupModel = { project ->
                     targetPlatform 'x64'
                 }
                 setupDefines(project, binaries)
+                binaries.all {
+                    tasks.withType(CppCompile) {
+                       project.addWpiUtilLibraryLinks(it, linker, targetPlatform)
+                    }
+                }
 
                 if (includeJava) {
                     project.setupJniIncludes(binaries)
diff --git a/test/tests.gradle b/test/tests.gradle
index f7ddfcc24b..d9633d8d5f 100644
--- a/test/tests.gradle
+++ b/test/tests.gradle
@@ -21,6 +21,9 @@ model {
             binaries.all {
                 lib project: ':gmock', library: 'gmock', linkage: 'static'
                 lib library: 'cameraserver', linkage: 'static'
+                tasks.withType(CppCompile) {
+                   project.addWpiUtilLibraryLinks(it, linker, targetPlatform)
+                }
             }
         }
     }