diff --git a/wpilibc/athena/include/CameraServer.h b/wpilibc/athena/include/CameraServer.h
index f0dae65317..d413ad232c 100644
--- a/wpilibc/athena/include/CameraServer.h
+++ b/wpilibc/athena/include/CameraServer.h
@@ -7,13 +7,16 @@
 
 #pragma once
 
+#include <memory>
 #include <mutex>
+#include <string>
+#include <vector>
 
-#include "cscore.h"
 #include "ErrorBase.h"
+#include "cscore.h"
 #include "llvm/DenseMap.h"
-#include "llvm/StringRef.h"
 #include "llvm/StringMap.h"
+#include "llvm/StringRef.h"
 #include "networktables/NetworkTable.h"
 
 namespace frc {
diff --git a/wpilibc/athena/src/CameraServer.cpp b/wpilibc/athena/src/CameraServer.cpp
index 808a2863ab..352a730aa8 100644
--- a/wpilibc/athena/src/CameraServer.cpp
+++ b/wpilibc/athena/src/CameraServer.cpp
@@ -7,10 +7,10 @@
 
 #include "CameraServer.h"
 
-#include "llvm/SmallString.h"
-#include "llvm/raw_ostream.h"
 #include "Utility.h"
 #include "WPIErrors.h"
+#include "llvm/SmallString.h"
+#include "llvm/raw_ostream.h"
 
 using namespace frc;
 
diff --git a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java
index acc1a880e4..ae54319012 100644
--- a/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java
+++ b/wpilibj/src/athena/java/edu/wpi/first/wpilibj/CameraServer.java
@@ -232,7 +232,7 @@ public class CameraServer {
       String relativeKey = key.substring(kPublishName.length());
 
     }, ITable.NOTIFY_IMMEDIATE | ITable.NOTIFY_UPDATE);
-    
+
   }
 
   /**