diff --git a/datalog/src/main/native/cpp/FileLogger.cpp b/datalog/src/main/native/cpp/FileLogger.cpp
index e05a14671d6..c535b857d9c 100644
--- a/datalog/src/main/native/cpp/FileLogger.cpp
+++ b/datalog/src/main/native/cpp/FileLogger.cpp
@@ -99,4 +99,4 @@ std::function<void(std::string_view)> FileLogger::Buffer(
     buf.append(leftover.begin(), leftover.end());
   };
 }
-}  // namespace wpi
+}  // namespace wpi::log
diff --git a/datalog/src/main/native/cpp/jni/DataLogJNI.cpp b/datalog/src/main/native/cpp/jni/DataLogJNI.cpp
index 5af58101db4..272689302b8 100644
--- a/datalog/src/main/native/cpp/jni/DataLogJNI.cpp
+++ b/datalog/src/main/native/cpp/jni/DataLogJNI.cpp
@@ -11,10 +11,10 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include <wpi/datalog/FileLogger.h>
 #include <wpi/datalog/DataLog.h>
 #include <wpi/datalog/DataLogBackgroundWriter.h>
 #include <wpi/datalog/DataLogWriter.h>
+#include <wpi/datalog/FileLogger.h>
 #include <wpi/jni_util.h>
 
 #include "edu_wpi_first_datalog_DataLogJNI.h"
@@ -707,8 +707,8 @@ Java_edu_wpi_first_datalog_DataLogJNI_createFileLogger
     wpi::ThrowNullPointerException(env, "key is null");
     return 0;
   }
-  return reinterpret_cast<jlong>(
-      new wpi::log::FileLogger{JStringRef{env, file}, *f, JStringRef{env, key}});
+  return reinterpret_cast<jlong>(new wpi::log::FileLogger{
+      JStringRef{env, file}, *f, JStringRef{env, key}});
 }
 
 /*
diff --git a/datalog/src/main/native/include/wpi/datalog/FileLogger.h b/datalog/src/main/native/include/wpi/datalog/FileLogger.h
index 7089d1fc070..38dbab4c99e 100644
--- a/datalog/src/main/native/include/wpi/datalog/FileLogger.h
+++ b/datalog/src/main/native/include/wpi/datalog/FileLogger.h
@@ -58,4 +58,4 @@ class FileLogger {
   std::thread m_thread;
 #endif
 };
-}  // namespace wpi
+}  // namespace wpi::log
diff --git a/datalogtool/src/main/native/cpp/Exporter.cpp b/datalogtool/src/main/native/cpp/Exporter.cpp
index eacee16d1e0..2cf399b71c2 100644
--- a/datalogtool/src/main/native/cpp/Exporter.cpp
+++ b/datalogtool/src/main/native/cpp/Exporter.cpp
@@ -24,12 +24,12 @@
 #include <imgui_internal.h>
 #include <imgui_stdlib.h>
 #include <portable-file-dialogs.h>
-#include <wpi/datalog/DataLogReaderThread.h>
 #include <wpi/DenseMap.h>
 #include <wpi/MemoryBuffer.h>
 #include <wpi/SmallVector.h>
 #include <wpi/SpanExtras.h>
 #include <wpi/StringExtras.h>
+#include <wpi/datalog/DataLogReaderThread.h>
 #include <wpi/fmt/raw_ostream.h>
 #include <wpi/fs.h>
 #include <wpi/mutex.h>
diff --git a/ntcore/src/main/native/cpp/ConnectionList.h b/ntcore/src/main/native/cpp/ConnectionList.h
index 1677d75c32f..6551ee468c5 100644
--- a/ntcore/src/main/native/cpp/ConnectionList.h
+++ b/ntcore/src/main/native/cpp/ConnectionList.h
@@ -13,8 +13,8 @@
 #include <string_view>
 #include <vector>
 
-#include <wpi/datalog/DataLog.h>
 #include <wpi/UidVector.h>
+#include <wpi/datalog/DataLog.h>
 #include <wpi/mutex.h>
 
 #include "Handle.h"
diff --git a/ntcore/src/main/native/cpp/local/LocalDataLogger.cpp b/ntcore/src/main/native/cpp/local/LocalDataLogger.cpp
index 6e39ab1d8a7..3ae62f60b18 100644
--- a/ntcore/src/main/native/cpp/local/LocalDataLogger.cpp
+++ b/ntcore/src/main/native/cpp/local/LocalDataLogger.cpp
@@ -5,8 +5,8 @@
 #include "LocalDataLogger.h"
 
 #include <fmt/format.h>
-#include <wpi/datalog/DataLog.h>
 #include <wpi/StringExtras.h>
+#include <wpi/datalog/DataLog.h>
 
 using namespace nt::local;
 
diff --git a/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp b/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp
index 01a9805e7ec..fd00bc9aa68 100644
--- a/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp
+++ b/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp
@@ -11,9 +11,9 @@
 
 #include <fmt/format.h>
 #include <fmt/ranges.h>
-#include <wpi/datalog/DataLog.h>
 #include <wpi/SmallString.h>
 #include <wpi/StringExtras.h>
+#include <wpi/datalog/DataLog.h>
 
 #include "IListenerStorage.h"
 #include "Log.h"
diff --git a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
index 5f1a0899d60..3ae2f39afd7 100644
--- a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
+++ b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
@@ -13,10 +13,10 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 #include <networktables/NetworkTableInstance.h>
-#include <wpi/datalog/DataLogBackgroundWriter.h>
 #include <wpi/FileLogger.h>
 #include <wpi/SafeThread.h>
 #include <wpi/StringExtras.h>
+#include <wpi/datalog/DataLogBackgroundWriter.h>
 #include <wpi/fs.h>
 #include <wpi/print.h>
 
diff --git a/sysid/src/main/native/cpp/view/DataSelector.cpp b/sysid/src/main/native/cpp/view/DataSelector.cpp
index 16a467020e7..17b2ab27e2e 100644
--- a/sysid/src/main/native/cpp/view/DataSelector.cpp
+++ b/sysid/src/main/native/cpp/view/DataSelector.cpp
@@ -11,10 +11,10 @@
 
 #include <fmt/format.h>
 #include <imgui.h>
-#include <wpi/datalog/DataLogReader.h>
-#include <wpi/datalog/DataLogReaderThread.h>
 #include <wpi/Logger.h>
 #include <wpi/StringExtras.h>
+#include <wpi/datalog/DataLogReader.h>
+#include <wpi/datalog/DataLogReaderThread.h>
 
 #include "sysid/Util.h"
 #include "sysid/analysis/AnalysisType.h"
diff --git a/sysid/src/main/native/cpp/view/LogLoader.cpp b/sysid/src/main/native/cpp/view/LogLoader.cpp
index bfe9bd91e8b..b21bea46158 100644
--- a/sysid/src/main/native/cpp/view/LogLoader.cpp
+++ b/sysid/src/main/native/cpp/view/LogLoader.cpp
@@ -15,10 +15,10 @@
 #include <imgui.h>
 #include <imgui_stdlib.h>
 #include <portable-file-dialogs.h>
-#include <wpi/datalog/DataLogReaderThread.h>
 #include <wpi/SmallVector.h>
 #include <wpi/SpanExtras.h>
 #include <wpi/StringExtras.h>
+#include <wpi/datalog/DataLogReaderThread.h>
 #include <wpi/fs.h>
 
 using namespace sysid;
diff --git a/sysid/src/main/native/include/sysid/view/DataSelector.h b/sysid/src/main/native/include/sysid/view/DataSelector.h
index a4e01cd0fcd..1020bc563a4 100644
--- a/sysid/src/main/native/include/sysid/view/DataSelector.h
+++ b/sysid/src/main/native/include/sysid/view/DataSelector.h
@@ -12,8 +12,8 @@
 #include <vector>
 
 #include <glass/View.h>
-#include <wpi/datalog/DataLogReaderThread.h>
 #include <wpi/StringMap.h>
+#include <wpi/datalog/DataLogReaderThread.h>
 
 #include "sysid/analysis/Storage.h"
 
diff --git a/wpilibc/src/main/native/cpp/DataLogManager.cpp b/wpilibc/src/main/native/cpp/DataLogManager.cpp
index 60da8f972b6..2a671366902 100644
--- a/wpilibc/src/main/native/cpp/DataLogManager.cpp
+++ b/wpilibc/src/main/native/cpp/DataLogManager.cpp
@@ -15,11 +15,11 @@
 #include <fmt/chrono.h>
 #include <hal/FRCUsageReporting.h>
 #include <networktables/NetworkTableInstance.h>
+#include <wpi/SafeThread.h>
+#include <wpi/StringExtras.h>
 #include <wpi/datalog/DataLog.h>
 #include <wpi/datalog/DataLogBackgroundWriter.h>
 #include <wpi/datalog/FileLogger.h>
-#include <wpi/SafeThread.h>
-#include <wpi/StringExtras.h>
 #include <wpi/fs.h>
 #include <wpi/print.h>
 #include <wpi/timestamp.h>
diff --git a/wpilibc/src/main/native/cpp/DriverStation.cpp b/wpilibc/src/main/native/cpp/DriverStation.cpp
index 744d1b271bc..001f6ff81f1 100644
--- a/wpilibc/src/main/native/cpp/DriverStation.cpp
+++ b/wpilibc/src/main/native/cpp/DriverStation.cpp
@@ -23,9 +23,9 @@
 #include <networktables/NetworkTable.h>
 #include <networktables/NetworkTableInstance.h>
 #include <networktables/StringTopic.h>
-#include <wpi/datalog/DataLog.h>
 #include <wpi/EventVector.h>
 #include <wpi/condition_variable.h>
+#include <wpi/datalog/DataLog.h>
 #include <wpi/json.h>
 #include <wpi/mutex.h>
 #include <wpi/timestamp.h>