diff --git a/apriltag/src/main/native/cpp/jni/AprilTagJNI.cpp b/apriltag/src/main/native/cpp/jni/AprilTagJNI.cpp
index e894d7af1de..b68b131087d 100644
--- a/apriltag/src/main/native/cpp/jni/AprilTagJNI.cpp
+++ b/apriltag/src/main/native/cpp/jni/AprilTagJNI.cpp
@@ -2,11 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <jni.h>
+
 #include <cstdio>
 #include <cstring>
 
-#include <jni.h>
-
 #define WPI_RAWFRAME_JNI
 #include <wpi/RawFrame.h>
 #include <wpi/jni_util.h>
@@ -597,7 +597,7 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_estimatePose
 /*
  * Class:     edu_wpi_first_apriltag_jni_AprilTagJNI
  * Method:    generate16h5AprilTagImage
- * Signature: (Ledu/wpi/first/util/RawFrame;JI)V
+ * Signature: (Ljava/lang/Object;JI)V
  */
 JNIEXPORT void JNICALL
 Java_edu_wpi_first_apriltag_jni_AprilTagJNI_generate16h5AprilTagImage
@@ -615,7 +615,7 @@ Java_edu_wpi_first_apriltag_jni_AprilTagJNI_generate16h5AprilTagImage
 /*
  * Class:     edu_wpi_first_apriltag_jni_AprilTagJNI
  * Method:    generate36h11AprilTagImage
- * Signature: (Ledu/wpi/first/util/RawFrame;JI)V
+ * Signature: (Ljava/lang/Object;JI)V
  */
 JNIEXPORT void JNICALL
 Java_edu_wpi_first_apriltag_jni_AprilTagJNI_generate36h11AprilTagImage
diff --git a/cscore/src/main/native/cpp/RawSinkImpl.cpp b/cscore/src/main/native/cpp/RawSinkImpl.cpp
index 73c2377d20b..77116416d8c 100644
--- a/cscore/src/main/native/cpp/RawSinkImpl.cpp
+++ b/cscore/src/main/native/cpp/RawSinkImpl.cpp
@@ -112,8 +112,7 @@ uint64_t RawSinkImpl::GrabFrameImpl(WPI_RawFrame& rawFrame,
   rawFrame.stride = newImage->GetStride();
   rawFrame.pixelFormat = newImage->pixelFormat;
   rawFrame.size = newImage->size();
-  std::copy(newImage->data(), newImage->data() + rawFrame.size,
-            rawFrame.data);
+  std::copy(newImage->data(), newImage->data() + rawFrame.size, rawFrame.data);
 
   return incomingFrame.GetTime();
 }
diff --git a/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp b/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp
index edd0b062ede..d7a9b4537ea 100644
--- a/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp
+++ b/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp
@@ -7,6 +7,7 @@
 
 #include <fmt/format.h>
 #include <opencv2/core/core.hpp>
+
 #define WPI_RAWFRAME_JNI
 #include <wpi/RawFrame.h>
 #include <wpi/SmallString.h>
@@ -1276,8 +1277,8 @@ Java_edu_wpi_first_cscore_CameraServerJNI_putRawSourceFrameBB
  */
 JNIEXPORT void JNICALL
 Java_edu_wpi_first_cscore_CameraServerJNI_putRawSourceFrameData
-  (JNIEnv* env, jclass, jint source, jlong data, jint size, jint width, jint height,
-   jint stride, jint pixelFormat)
+  (JNIEnv* env, jclass, jint source, jlong data, jint size, jint width,
+   jint height, jint stride, jint pixelFormat)
 {
   WPI_RawFrame frame;  // use WPI_Frame because we don't want the destructor
   frame.data = reinterpret_cast<uint8_t*>(data);
@@ -1770,7 +1771,8 @@ Java_edu_wpi_first_cscore_CameraServerJNI_grabRawSinkFrame
   if (!CheckStatus(env, status)) {
     return 0;
   }
-  wpi::SetFrameData(env, rawFrameCls, frameObj, *frame, origData != frame->data);
+  wpi::SetFrameData(env, rawFrameCls, frameObj, *frame,
+                    origData != frame->data);
   return rv;
 }
 
@@ -1787,12 +1789,13 @@ Java_edu_wpi_first_cscore_CameraServerJNI_grabRawSinkFrameTimeout
   auto* frame = reinterpret_cast<wpi::RawFrame*>(framePtr);
   auto origData = frame->data;
   CS_Status status = 0;
-  auto rv = cs::GrabSinkFrameTimeout(static_cast<CS_Sink>(sink), *frame, timeout,
-                                     &status);
+  auto rv = cs::GrabSinkFrameTimeout(static_cast<CS_Sink>(sink), *frame,
+                                     timeout, &status);
   if (!CheckStatus(env, status)) {
     return 0;
   }
-  wpi::SetFrameData(env, rawFrameCls, frameObj, *frame, origData != frame->data);
+  wpi::SetFrameData(env, rawFrameCls, frameObj, *frame,
+                    origData != frame->data);
   return rv;
 }
 
diff --git a/wpiutil/src/main/native/cpp/RawFrame.cpp b/wpiutil/src/main/native/cpp/RawFrame.cpp
index 6688a27788d..2bc36ed1603 100644
--- a/wpiutil/src/main/native/cpp/RawFrame.cpp
+++ b/wpiutil/src/main/native/cpp/RawFrame.cpp
@@ -4,10 +4,10 @@
 
 #include "wpi/RawFrame.h"
 
-#include <cstring>
-
 #include <wpi/MemAlloc.h>
 
+#include <cstring>
+
 extern "C" {
 int WPI_AllocateRawFrameData(WPI_RawFrame* frame, size_t requestedSize) {
   if (frame->capacity >= requestedSize) {
diff --git a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp
index cd32c3351a6..26d1c93a839 100644
--- a/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp
+++ b/wpiutil/src/main/native/cpp/jni/WPIUtilJNI.cpp
@@ -362,11 +362,12 @@ Java_edu_wpi_first_util_WPIUtilJNI_getRawFrameDataPtr
 /*
  * Class:     edu_wpi_first_util_WPIUtilJNI
  * Method:    setRawFrameData
- * Signature: (JLjava/nio/ByteBuffer;IIIII)V
+ * Signature: (JLjava/lang/Object;IIIII)V
  */
 JNIEXPORT void JNICALL
 Java_edu_wpi_first_util_WPIUtilJNI_setRawFrameData
-  (JNIEnv* env, jclass, jlong frame, jobject data, jint size, jint width, jint height, jint stride, jint pixelFormat)
+  (JNIEnv* env, jclass, jlong frame, jobject data, jint size, jint width,
+   jint height, jint stride, jint pixelFormat)
 {
   auto* f = reinterpret_cast<wpi::RawFrame*>(frame);
   if (!f) {
@@ -394,7 +395,8 @@ Java_edu_wpi_first_util_WPIUtilJNI_setRawFrameData
  */
 JNIEXPORT void JNICALL
 Java_edu_wpi_first_util_WPIUtilJNI_setRawFrameInfo
-  (JNIEnv* env, jclass, jlong frame, jint size, jint width, jint height, jint stride, jint pixelFormat)
+  (JNIEnv* env, jclass, jlong frame, jint size, jint width, jint height,
+   jint stride, jint pixelFormat)
 {
   auto* f = reinterpret_cast<wpi::RawFrame*>(frame);
   if (!f) {