From 1e7604f81c4a3e3f81d702d45b23c673d840b226 Mon Sep 17 00:00:00 2001
From: PJ Reiniger <pj.reiniger@gmail.com>
Date: Fri, 7 Nov 2025 19:57:55 -0500
Subject: [PATCH] SCRIPT: wpiformat

---
 .../native/include/wpi/apriltag/AprilTag.hpp  |  3 +-
 .../wpi/apriltag/AprilTagDetection.hpp        |  1 +
 .../include/wpi/apriltag/AprilTagDetector.hpp |  3 +-
 .../wpi/apriltag/AprilTagFieldLayout.hpp      |  7 ++-
 .../wpi/apriltag/AprilTagPoseEstimate.hpp     |  3 +-
 .../wpi/apriltag/AprilTagPoseEstimator.hpp    |  5 +-
 .../src/test/native/cpp/AprilTagJsonTest.cpp  |  2 +-
 .../native/cpp/AprilTagPoseSetOriginTest.cpp  |  2 +-
 benchmark/src/main/native/cpp/Main.cpp        |  2 +-
 .../src/main/native/cpp/main.cpp              |  3 +-
 .../native/cpp/cameraserver/CameraServer.cpp  |  6 +--
 commandsv2/CMakeLists.txt                     | 15 ++----
 .../main/native/cpp/frc2/command/Command.cpp  |  5 +-
 .../native/cpp/frc2/command/CommandPtr.cpp    |  3 +-
 .../cpp/frc2/command/CommandScheduler.cpp     | 11 ++--
 .../main/native/cpp/frc2/command/Commands.cpp |  5 +-
 .../cpp/frc2/command/DeferredCommand.cpp      |  3 +-
 .../native/cpp/frc2/command/ProxyCommand.cpp  |  3 +-
 .../native/cpp/frc2/command/Subsystem.cpp     |  3 +-
 .../native/cpp/frc2/command/SubsystemBase.cpp |  5 +-
 .../native/cpp/frc2/command/WaitCommand.cpp   |  1 +
 .../cpp/frc2/command/button/Trigger.cpp       |  3 +-
 .../native/include/wpi/commands2/Command.hpp  |  5 +-
 .../wpi/commands2/CommandScheduler.hpp        |  2 +-
 .../native/include/wpi/commands2/Commands.hpp |  3 +-
 .../include/wpi/commands2/DeferredCommand.hpp |  3 +-
 .../include/wpi/commands2/NotifierCommand.hpp |  5 +-
 .../wpi/commands2/ParallelCommandGroup.hpp    |  3 +-
 .../wpi/commands2/ParallelDeadlineGroup.hpp   |  3 +-
 .../wpi/commands2/ParallelRaceGroup.hpp       |  3 +-
 .../include/wpi/commands2/ProxyCommand.hpp    |  5 +-
 .../include/wpi/commands2/ScheduleCommand.hpp |  3 +-
 .../include/wpi/commands2/SelectCommand.hpp   |  3 +-
 .../wpi/commands2/SequentialCommandGroup.hpp  |  3 +-
 .../include/wpi/commands2/Subsystem.hpp       |  3 +-
 .../include/wpi/commands2/SubsystemBase.hpp   |  3 +-
 .../include/wpi/commands2/WaitCommand.hpp     |  5 +-
 .../wpi/commands2/WaitUntilCommand.hpp        |  3 +-
 .../wpi/commands2/button/CommandGamepad.hpp   |  3 +-
 .../commands2/button/CommandGenericHID.hpp    |  5 +-
 .../wpi/commands2/button/CommandJoystick.hpp  |  5 +-
 .../wpi/commands2/button/JoystickButton.hpp   |  3 +-
 .../wpi/commands2/button/NetworkButton.hpp    |  3 +-
 .../wpi/commands2/button/POVButton.hpp        |  3 +-
 .../include/wpi/commands2/button/Trigger.hpp  |  5 +-
 .../wpi/commands2/sysid/SysIdRoutine.hpp      |  5 +-
 commandsv2/src/test/native/cpp/main.cpp       |  1 +
 .../cpp/wpi/command/AddRequirementsTest.cpp   |  3 +-
 .../cpp/wpi/command/CommandDecoratorTest.cpp  |  3 +-
 .../native/cpp/wpi/command/CommandPtrTest.cpp |  3 +-
 .../wpi/command/CommandRequirementsTest.cpp   |  3 +-
 .../cpp/wpi/command/CommandScheduleTest.cpp   |  5 +-
 .../wpi/command/CommandSendableButtonTest.cpp |  6 +--
 .../cpp/wpi/command/CommandTestBase.hpp       |  4 +-
 .../cpp/wpi/command/CompositionTestBase.hpp   |  2 +-
 .../cpp/wpi/command/NotifierCommandTest.cpp   |  3 +-
 .../native/cpp/wpi/command/POVButtonTest.cpp  |  6 +--
 .../cpp/wpi/command/PrintCommandTest.cpp      |  3 +-
 .../cpp/wpi/command/ProxyCommandTest.cpp      |  3 +-
 .../native/cpp/wpi/command/RunCommandTest.cpp |  3 +-
 .../native/cpp/wpi/command/SchedulerTest.cpp  |  3 +-
 .../wpi/command/SchedulingRecursionTest.cpp   |  3 +-
 .../cpp/wpi/command/StartEndCommandTest.cpp   |  3 +-
 .../cpp/wpi/command/WaitCommandTest.cpp       |  6 +--
 .../cpp/wpi/command/WaitUntilCommandTest.cpp  |  3 +-
 .../wpi/command/button/NetworkButtonTest.cpp  |  2 +-
 .../command/button/RobotModeTriggersTest.cpp  |  5 +-
 .../cpp/wpi/command/button/TriggerTest.cpp    |  2 +-
 .../wpi/command/sysid/SysIdRoutineTest.cpp    | 10 ++--
 cscore/examples/enum_usb/enum_usb.cpp         |  3 +-
 cscore/examples/httpcvstream/httpcvstream.cpp |  2 +-
 cscore/examples/settings/settings.cpp         |  3 +-
 cscore/examples/usbcvstream/usbcvstream.cpp   |  2 +-
 cscore/examples/usbstream/usbstream.cpp       |  3 +-
 cscore/examples/usbviewer/usbviewer.cpp       |  8 +--
 cscore/src/dev/native/cpp/main.cpp            |  3 +-
 .../native/cpp/ConfigurableSourceImpl.cpp     |  3 +-
 .../native/cpp/ConfigurableSourceImpl.hpp     |  6 +--
 cscore/src/main/native/cpp/Frame.hpp          | 11 ++--
 cscore/src/main/native/cpp/Handle.hpp         |  9 ++--
 cscore/src/main/native/cpp/HttpCameraImpl.cpp |  8 +--
 cscore/src/main/native/cpp/HttpCameraImpl.hpp | 14 ++---
 cscore/src/main/native/cpp/Image.hpp          |  8 +--
 cscore/src/main/native/cpp/Instance.cpp       |  1 +
 cscore/src/main/native/cpp/Instance.hpp       | 10 ++--
 cscore/src/main/native/cpp/JpegUtil.hpp       |  6 +--
 cscore/src/main/native/cpp/Log.hpp            |  6 +--
 .../src/main/native/cpp/MjpegServerImpl.cpp   | 16 +++---
 .../src/main/native/cpp/MjpegServerImpl.hpp   | 16 +++---
 .../src/main/native/cpp/NetworkListener.hpp   |  6 +--
 cscore/src/main/native/cpp/Notifier.hpp       |  9 ++--
 .../src/main/native/cpp/PropertyContainer.hpp | 11 ++--
 cscore/src/main/native/cpp/PropertyImpl.hpp   |  9 ++--
 cscore/src/main/native/cpp/RawSinkImpl.hpp    |  9 ++--
 cscore/src/main/native/cpp/RawSourceImpl.cpp  |  3 +-
 cscore/src/main/native/cpp/RawSourceImpl.hpp  |  6 +--
 cscore/src/main/native/cpp/SinkImpl.cpp       |  5 +-
 cscore/src/main/native/cpp/SinkImpl.hpp       |  9 ++--
 cscore/src/main/native/cpp/SourceImpl.cpp     |  7 ++-
 cscore/src/main/native/cpp/SourceImpl.hpp     | 17 +++---
 cscore/src/main/native/cpp/Telemetry.cpp      |  5 +-
 cscore/src/main/native/cpp/Telemetry.hpp      |  9 ++--
 .../native/cpp/UnlimitedHandleResource.hpp    |  6 +--
 .../main/native/cpp/UsbCameraImplCommon.cpp   |  3 +-
 .../src/main/native/cpp/UsbCameraListener.hpp |  6 +--
 cscore/src/main/native/cpp/c_util.hpp         |  6 +--
 cscore/src/main/native/cpp/cscore_c.cpp       |  5 +-
 cscore/src/main/native/cpp/cscore_cpp.cpp     |  6 +--
 cscore/src/main/native/cpp/cscore_oo.cpp      |  1 +
 .../native/cpp/default_init_allocator.hpp     |  6 +--
 .../src/main/native/include/wpi/cs/cscore.h   |  6 +--
 .../src/main/native/include/wpi/cs/cscore_c.h |  6 +--
 .../main/native/include/wpi/cs/cscore_cpp.hpp |  9 ++--
 .../main/native/include/wpi/cs/cscore_cv.hpp  |  8 +--
 .../main/native/include/wpi/cs/cscore_oo.hpp  |  9 ++--
 .../main/native/include/wpi/cs/cscore_raw.h   |  6 +--
 .../src/main/native/linux/NetworkListener.cpp |  3 +-
 .../src/main/native/linux/RunLoopHelpers.cpp  |  3 +-
 .../src/main/native/linux/UsbCameraBuffer.hpp |  6 +--
 .../src/main/native/linux/UsbCameraImpl.cpp   | 12 ++---
 .../src/main/native/linux/UsbCameraImpl.hpp   | 13 +++--
 .../main/native/linux/UsbCameraListener.cpp   |  8 +--
 .../main/native/linux/UsbCameraProperty.cpp   |  4 +-
 .../main/native/linux/UsbCameraProperty.hpp   |  9 ++--
 cscore/src/main/native/linux/UsbUtil.cpp      |  4 +-
 cscore/src/main/native/linux/UsbUtil.hpp      |  6 +--
 .../main/native/windows/RunLoopHelpers.cpp    |  3 +-
 .../src/main/native/windows/UsbCameraImpl.cpp | 10 ++--
 .../src/main/native/windows/UsbCameraImpl.hpp | 16 +++---
 .../main/native/windows/UsbCameraProperty.hpp |  2 +-
 datalog/examples/printlog/printlog.cpp        |  4 +-
 datalog/examples/writelog/writelog.cpp        |  3 +-
 datalog/src/main/native/cpp/DataLogReader.cpp |  3 +-
 datalog/src/main/native/cpp/FileLogger.cpp    |  1 +
 .../src/main/native/cpp/jni/DataLogJNI.cpp    |  2 +-
 .../native/include/wpi/datalog/DataLog.hpp    |  3 +-
 .../wpi/datalog/DataLogBackgroundWriter.hpp   |  3 +-
 .../wpi/datalog/DataLogReaderThread.hpp       |  4 +-
 datalog/src/test/native/cpp/DataLogTest.cpp   |  4 +-
 fields/CMakeLists.txt                         |  6 +--
 glass/src/app/native/cpp/main.cpp             |  8 +--
 glass/src/lib/native/cpp/Context.cpp          |  8 +--
 glass/src/lib/native/cpp/MainMenuBar.cpp      |  4 +-
 glass/src/lib/native/cpp/Storage.cpp          |  1 +
 glass/src/lib/native/cpp/WindowManager.cpp    |  4 +-
 .../lib/native/cpp/hardware/AnalogInput.cpp   |  2 +-
 glass/src/lib/native/cpp/hardware/Encoder.cpp |  2 +-
 glass/src/lib/native/cpp/hardware/Gyro.cpp    |  2 +-
 .../lib/native/cpp/hardware/LEDDisplay.cpp    |  3 +-
 glass/src/lib/native/cpp/hardware/PWM.cpp     |  2 +-
 .../src/lib/native/cpp/hardware/Pneumatic.cpp |  4 +-
 .../native/cpp/hardware/PowerDistribution.cpp |  2 +-
 glass/src/lib/native/cpp/other/DeviceTree.cpp |  2 +-
 glass/src/lib/native/cpp/other/FMS.cpp        |  2 +-
 glass/src/lib/native/cpp/other/Field2D.cpp    | 20 +++----
 .../src/lib/native/cpp/other/Mechanism2D.cpp  | 16 +++---
 glass/src/lib/native/cpp/other/Plot.cpp       |  1 +
 .../native/cpp/support/ExtraGuiWidgets.cpp    |  2 +-
 .../lib/native/cpp/support/NameSetting.cpp    |  1 +
 .../include/wpi/glass/ContextInternal.hpp     |  5 +-
 .../native/include/wpi/glass/DataSource.hpp   |  1 +
 .../lib/native/include/wpi/glass/Provider.hpp |  3 +-
 .../include/wpi/glass/WindowManager.hpp       |  3 +-
 .../wpi/glass/hardware/AnalogInput.hpp        |  3 +-
 .../native/include/wpi/glass/hardware/DIO.hpp |  3 +-
 .../include/wpi/glass/hardware/Encoder.hpp    |  3 +-
 .../include/wpi/glass/hardware/LEDDisplay.hpp |  3 +-
 .../native/include/wpi/glass/hardware/PWM.hpp |  3 +-
 .../include/wpi/glass/hardware/Pneumatic.hpp  |  3 +-
 .../wpi/glass/hardware/PowerDistribution.hpp  |  3 +-
 .../include/wpi/glass/other/DeviceTree.hpp    |  2 +-
 .../include/wpi/glass/other/Field2D.hpp       |  8 +--
 .../include/wpi/glass/other/Mechanism2D.hpp   |  6 +--
 .../libnt/native/cpp/NTCommandScheduler.cpp   |  1 +
 .../libnt/native/cpp/NTCommandSelector.cpp    |  1 +
 .../libnt/native/cpp/NTDifferentialDrive.cpp  |  1 +
 glass/src/libnt/native/cpp/NTDigitalInput.cpp |  1 +
 glass/src/libnt/native/cpp/NTFMS.cpp          |  1 +
 glass/src/libnt/native/cpp/NTField2D.cpp      |  1 +
 glass/src/libnt/native/cpp/NTGyro.cpp         |  1 +
 glass/src/libnt/native/cpp/NTMecanumDrive.cpp |  1 +
 glass/src/libnt/native/cpp/NTMechanism2D.cpp  |  4 +-
 .../libnt/native/cpp/NTMotorController.cpp    |  1 +
 .../src/libnt/native/cpp/NTPIDController.cpp  |  1 +
 .../native/cpp/NTProfiledPIDController.cpp    |  1 +
 .../src/libnt/native/cpp/NTStringChooser.cpp  |  1 +
 glass/src/libnt/native/cpp/NetworkTables.cpp  | 20 +++----
 .../native/cpp/NetworkTablesProvider.cpp      |  6 +--
 .../native/cpp/NetworkTablesSettings.cpp      |  4 +-
 .../wpi/glass/networktables/NTAlerts.hpp      |  3 +-
 .../networktables/NTCommandScheduler.hpp      |  5 +-
 .../glass/networktables/NTCommandSelector.hpp |  5 +-
 .../networktables/NTDifferentialDrive.hpp     |  5 +-
 .../glass/networktables/NTDigitalInput.hpp    |  5 +-
 .../glass/networktables/NTDigitalOutput.hpp   |  5 +-
 .../include/wpi/glass/networktables/NTFMS.hpp |  5 +-
 .../wpi/glass/networktables/NTField2D.hpp     |  3 +-
 .../wpi/glass/networktables/NTGyro.hpp        |  5 +-
 .../glass/networktables/NTMecanumDrive.hpp    |  5 +-
 .../wpi/glass/networktables/NTMechanism2D.hpp |  3 +-
 .../glass/networktables/NTMotorController.hpp |  5 +-
 .../glass/networktables/NTPIDController.hpp   |  5 +-
 .../networktables/NTProfiledPIDController.hpp |  5 +-
 .../glass/networktables/NTStringChooser.hpp   |  3 +-
 .../wpi/glass/networktables/NTSubsystem.hpp   |  5 +-
 .../wpi/glass/networktables/NetworkTables.hpp | 12 ++---
 .../networktables/NetworkTablesProvider.hpp   |  5 +-
 .../networktables/NetworkTablesSettings.hpp   |  3 +-
 hal/src/dev/native/cpp/main.cpp               |  3 +-
 hal/src/main/native/cpp/ErrorHandling.cpp     |  2 +-
 hal/src/main/native/cpp/cpp/fpga_clock.cpp    |  3 +-
 .../main/native/cpp/jni/AddressableLEDJNI.cpp |  3 +-
 hal/src/main/native/cpp/jni/AnalogJNI.cpp     |  3 +-
 hal/src/main/native/cpp/jni/CANAPIJNI.cpp     |  3 +-
 hal/src/main/native/cpp/jni/CANJNI.cpp        |  3 +-
 hal/src/main/native/cpp/jni/CTREPCMJNI.cpp    |  3 +-
 hal/src/main/native/cpp/jni/CounterJNI.cpp    |  3 +-
 hal/src/main/native/cpp/jni/DIOJNI.cpp        |  3 +-
 .../main/native/cpp/jni/DriverStationJNI.cpp  |  7 +--
 hal/src/main/native/cpp/jni/DutyCycleJNI.cpp  |  3 +-
 hal/src/main/native/cpp/jni/HAL.cpp           |  2 +-
 hal/src/main/native/cpp/jni/HALUtil.cpp       |  8 +--
 hal/src/main/native/cpp/jni/I2CJNI.cpp        |  3 +-
 hal/src/main/native/cpp/jni/NotifierJNI.cpp   |  3 +-
 hal/src/main/native/cpp/jni/PWMJNI.cpp        |  3 +-
 .../native/cpp/jni/PowerDistributionJNI.cpp   |  3 +-
 hal/src/main/native/cpp/jni/REVPHJNI.cpp      |  3 +-
 hal/src/main/native/cpp/jni/SerialPortJNI.cpp |  3 +-
 hal/src/main/native/cpp/jni/SimDeviceJNI.cpp  |  3 +-
 .../main/native/cpp/jni/UsageReportingJNI.cpp |  5 +-
 .../jni/simulation/BufferCallbackStore.cpp    |  3 +-
 .../cpp/jni/simulation/BufferCallbackStore.h  |  3 +-
 .../cpp/jni/simulation/CallbackStore.cpp      |  3 +-
 .../native/cpp/jni/simulation/CallbackStore.h |  3 +-
 .../simulation/ConstBufferCallbackStore.cpp   |  3 +-
 .../jni/simulation/ConstBufferCallbackStore.h |  3 +-
 .../jni/simulation/DriverStationDataJNI.cpp   |  5 +-
 .../cpp/jni/simulation/RoboRioDataJNI.cpp     |  3 +-
 .../cpp/jni/simulation/SimDeviceDataJNI.cpp   |  7 ++-
 .../cpp/jni/simulation/SimulatorJNI.cpp       |  3 +-
 .../native/cpp/jni/simulation/SimulatorJNI.h  |  2 +-
 .../native/cpp/proto/ControlDataProto.cpp     |  3 +-
 .../main/native/cpp/proto/ErrorInfoProto.cpp  |  3 +-
 .../cpp/proto/JoystickDescriptorProto.cpp     |  3 +-
 .../cpp/proto/JoystickRumbleDataProto.cpp     |  3 +-
 .../main/native/cpp/proto/MatchInfoProto.cpp  |  3 +-
 hal/src/main/native/cpp/proto/OpModeProto.cpp |  3 +-
 .../include/wpi/hal/AddressableLEDTypes.h     |  3 +-
 hal/src/main/native/include/wpi/hal/CAN.h     |  3 +-
 .../native/include/wpi/hal/DriverStation.h    |  5 +-
 hal/src/main/native/include/wpi/hal/HALBase.h |  3 +-
 .../main/native/include/wpi/hal/Notifier.h    |  3 +-
 .../wpi/hal/handles/DigitalHandleResource.h   |  3 +-
 .../include/wpi/hal/handles/HandlesInternal.h |  3 +-
 .../handles/IndexedClassedHandleResource.h    |  3 +-
 .../wpi/hal/handles/IndexedHandleResource.h   |  3 +-
 .../handles/LimitedClassedHandleResource.h    |  3 +-
 .../wpi/hal/handles/LimitedHandleResource.h   |  3 +-
 .../wpi/hal/handles/UnlimitedHandleResource.h |  3 +-
 .../include/wpi/hal/proto/ControlData.h       |  3 +-
 .../native/include/wpi/hal/proto/ErrorInfo.h  |  3 +-
 .../wpi/hal/proto/JoystickDescriptor.h        |  3 +-
 .../wpi/hal/proto/JoystickRumbleData.h        |  3 +-
 .../native/include/wpi/hal/proto/MatchInfo.h  |  3 +-
 .../native/include/wpi/hal/proto/OpMode.h     |  3 +-
 .../include/wpi/hal/proto/VersionInfo.h       |  3 +-
 .../wpi/hal/simulation/DriverStationData.h    |  3 +-
 .../include/wpi/hal/simulation/RoboRioData.h  |  3 +-
 .../wpi/hal/simulation/SimCallbackRegistry.h  |  3 +-
 .../include/wpi/hal/simulation/SimDataValue.h |  5 +-
 hal/src/main/native/sim/AddressableLED.cpp    |  2 +-
 hal/src/main/native/sim/AnalogInput.cpp       |  2 +-
 hal/src/main/native/sim/CANAPI.cpp            |  7 ++-
 hal/src/main/native/sim/CTREPCM.cpp           |  2 +-
 hal/src/main/native/sim/DIO.cpp               |  4 +-
 hal/src/main/native/sim/DriverStation.cpp     |  8 +--
 hal/src/main/native/sim/DutyCycle.cpp         |  2 +-
 hal/src/main/native/sim/Encoder.cpp           |  2 +-
 hal/src/main/native/sim/HAL.cpp               |  7 ++-
 hal/src/main/native/sim/MockHooks.cpp         |  5 +-
 hal/src/main/native/sim/Notifier.cpp          |  9 ++--
 hal/src/main/native/sim/PWM.cpp               |  2 +-
 hal/src/main/native/sim/PowerDistribution.cpp |  2 +-
 hal/src/main/native/sim/REVPH.cpp             |  2 +-
 .../sim/mockdata/AddressableLEDDataInternal.h |  3 +-
 .../sim/mockdata/DriverStationDataInternal.h  |  3 +-
 hal/src/main/native/sim/mockdata/Reset.cpp    |  3 +-
 .../native/sim/mockdata/RoboRioDataInternal.h |  3 +-
 .../native/sim/mockdata/SimDeviceData.cpp     |  3 +-
 .../sim/mockdata/SimDeviceDataInternal.h      |  7 ++-
 .../main/native/systemcore/AddressableLED.cpp |  4 +-
 .../native/systemcore/AddressableLEDSimd.h    |  2 +-
 .../main/native/systemcore/AnalogInput.cpp    |  3 +-
 hal/src/main/native/systemcore/CAN.cpp        | 11 ++--
 hal/src/main/native/systemcore/CANAPI.cpp     |  7 ++-
 hal/src/main/native/systemcore/CTREPDP.cpp    |  2 +-
 .../native/systemcore/FRCDriverStation.cpp    | 24 ++++-----
 hal/src/main/native/systemcore/HAL.cpp        | 13 +++--
 hal/src/main/native/systemcore/I2C.cpp        |  4 +-
 hal/src/main/native/systemcore/IMU.cpp        |  7 ++-
 hal/src/main/native/systemcore/Notifier.cpp   |  9 ++--
 hal/src/main/native/systemcore/PWM.cpp        |  2 +-
 hal/src/main/native/systemcore/Power.cpp      |  5 +-
 hal/src/main/native/systemcore/REVPDH.cpp     | 13 +++--
 hal/src/main/native/systemcore/REVPH.cpp      |  2 +-
 hal/src/main/native/systemcore/SmartIo.h      |  3 +-
 .../main/native/systemcore/UsageReporting.cpp |  4 +-
 .../cpp/mockdata/DriverStationDataTest.cpp    |  2 +-
 ntcore/generate_topics.py                     |  4 +-
 ntcore/src/dev/native/cpp/main.cpp            |  6 +--
 ntcore/src/main/native/cpp/ConnectionList.cpp |  7 ++-
 ntcore/src/main/native/cpp/ConnectionList.hpp |  7 ++-
 ntcore/src/main/native/cpp/Handle.hpp         |  3 +-
 ntcore/src/main/native/cpp/HandleMap.hpp      |  3 +-
 ntcore/src/main/native/cpp/InstanceImpl.hpp   |  3 +-
 .../src/main/native/cpp/ListenerStorage.cpp   |  3 +-
 .../src/main/native/cpp/ListenerStorage.hpp   | 11 ++--
 ntcore/src/main/native/cpp/LocalStorage.hpp   |  9 ++--
 ntcore/src/main/native/cpp/LoggerImpl.cpp     |  3 +-
 ntcore/src/main/native/cpp/LoggerImpl.hpp     |  3 +-
 ntcore/src/main/native/cpp/NetworkClient.cpp  | 12 ++---
 ntcore/src/main/native/cpp/NetworkClient.hpp  | 11 ++--
 ntcore/src/main/native/cpp/NetworkServer.cpp  | 25 +++++----
 ntcore/src/main/native/cpp/NetworkServer.hpp  |  7 ++-
 ntcore/src/main/native/cpp/Value.cpp          |  5 +-
 .../main/native/cpp/ValueCircularBuffer.hpp   |  3 +-
 ntcore/src/main/native/cpp/Value_internal.hpp |  3 +-
 .../main/native/cpp/jni/NetworkTablesJNI.cpp  |  6 +--
 .../main/native/cpp/local/LocalDataLogger.cpp |  3 +-
 .../native/cpp/local/LocalDataLoggerEntry.cpp |  2 +-
 .../native/cpp/local/LocalDataLoggerEntry.hpp |  1 -
 .../src/main/native/cpp/local/LocalEntry.hpp  |  3 +-
 .../native/cpp/local/LocalMultiSubscriber.hpp |  5 +-
 .../main/native/cpp/local/LocalPublisher.hpp  |  3 +-
 .../native/cpp/local/LocalStorageImpl.cpp     |  6 +--
 .../native/cpp/local/LocalStorageImpl.hpp     | 11 ++--
 .../main/native/cpp/local/LocalSubscriber.hpp |  3 +-
 .../src/main/native/cpp/local/LocalTopic.hpp  |  7 ++-
 ntcore/src/main/native/cpp/net/ClientImpl.cpp |  6 +--
 ntcore/src/main/native/cpp/net/ClientImpl.hpp |  3 +-
 .../native/cpp/net/ClientMessageQueue.hpp     |  5 +-
 ntcore/src/main/native/cpp/net/Message.hpp    |  3 +-
 .../native/cpp/net/NetworkOutgoingQueue.hpp   |  3 +-
 .../native/cpp/net/WebSocketConnection.cpp    |  4 +-
 .../native/cpp/net/WebSocketConnection.hpp    |  5 +-
 .../src/main/native/cpp/net/WireDecoder.cpp   |  6 +--
 .../src/main/native/cpp/net/WireEncoder.cpp   |  7 ++-
 .../native/cpp/networktables/NTSendable.cpp   |  3 +-
 .../native/cpp/networktables/NetworkTable.cpp |  6 +--
 .../networktables/NetworkTableInstance.cpp    |  5 +-
 .../main/native/cpp/networktables/Topic.cpp   |  3 +-
 ntcore/src/main/native/cpp/ntcore_c.cpp       |  7 ++-
 ntcore/src/main/native/cpp/ntcore_cpp.cpp     |  4 +-
 ntcore/src/main/native/cpp/ntcore_meta.cpp    |  4 +-
 ntcore/src/main/native/cpp/ntcore_test.cpp    |  3 +-
 .../main/native/cpp/server/ServerClient.cpp   |  3 +-
 .../main/native/cpp/server/ServerClient.hpp   |  3 +-
 .../main/native/cpp/server/ServerClient4.cpp  |  3 +-
 .../native/cpp/server/ServerClient4Base.cpp   |  2 +-
 .../native/cpp/server/ServerClient4Base.hpp   |  3 +-
 .../src/main/native/cpp/server/ServerImpl.cpp |  3 +-
 .../native/cpp/server/ServerPublisher.cpp     |  3 +-
 .../main/native/cpp/server/ServerStorage.cpp  |  6 +--
 .../main/native/cpp/server/ServerStorage.hpp  |  3 +-
 .../native/cpp/server/ServerSubscriber.cpp    |  5 +-
 .../main/native/cpp/server/ServerTopic.hpp    |  9 ++--
 .../include/wpi/nt/NTSendableBuilder.hpp      |  5 +-
 .../native/include/wpi/nt/NetworkTable.hpp    |  7 ++-
 .../include/wpi/nt/NetworkTableInstance.hpp   |  5 +-
 .../native/include/wpi/nt/ProtobufTopic.hpp   |  7 ++-
 .../include/wpi/nt/StructArrayTopic.hpp       |  7 ++-
 .../native/include/wpi/nt/StructTopic.hpp     |  7 ++-
 .../src/main/native/include/wpi/nt/Topic.hpp  |  3 +-
 .../main/native/include/wpi/nt/UnitTopic.hpp  |  3 +-
 .../main/native/include/wpi/nt/ntcore_cpp.hpp |  3 +-
 .../native/cpp/ConnectionListenerTest.cpp     |  4 +-
 .../src/test/native/cpp/LocalStorageTest.cpp  |  2 +-
 ntcore/src/test/native/cpp/LoggerTest.cpp     |  2 +-
 ntcore/src/test/native/cpp/MockLogger.hpp     |  3 +-
 ntcore/src/test/native/cpp/StructTest.cpp     |  4 +-
 ntcore/src/test/native/cpp/TestPrinters.hpp   |  1 +
 .../src/test/native/cpp/TopicListenerTest.cpp |  4 +-
 .../src/test/native/cpp/ValueListenerTest.cpp |  4 +-
 ntcore/src/test/native/cpp/main.cpp           |  3 +-
 .../native/cpp/net/MockMessageHandler.hpp     |  3 +-
 .../native/cpp/net/MockNetworkInterface.hpp   |  3 +-
 .../native/cpp/net/MockWireConnection.hpp     |  3 +-
 .../test/native/cpp/net/WireDecoderTest.cpp   |  4 +-
 .../test/native/cpp/net/WireEncoderTest.cpp   |  6 +--
 .../test/native/cpp/server/ServerImplTest.cpp |  4 +-
 .../src/main/native/cpp/DataLogManager.cpp    |  5 +-
 .../src/main/native/cpp/romi/OnBoardIO.cpp    |  3 +-
 .../src/main/native/cpp/main.cpp              |  4 +-
 .../wpi/halsim/ds_socket/DSCommPacket.hpp     |  2 +-
 .../src/test/native/cpp/main.cpp              |  1 +
 .../src/main/native/cpp/AddressableLEDGui.cpp |  4 +-
 .../src/main/native/cpp/AnalogInputSimGui.cpp |  1 -
 .../src/main/native/cpp/DIOSimGui.cpp         |  3 +-
 .../src/main/native/cpp/DriverStationGui.cpp  | 12 ++---
 .../src/main/native/cpp/EncoderSimGui.cpp     |  2 +-
 .../src/main/native/cpp/HALSimGui.cpp         |  3 +-
 .../main/native/cpp/NetworkTablesSimGui.cpp   |  1 -
 .../src/main/native/cpp/PCMSimGui.cpp         |  1 -
 .../src/main/native/cpp/PHSimGui.cpp          |  1 -
 .../src/main/native/cpp/PWMSimGui.cpp         |  1 -
 .../native/cpp/PowerDistributionSimGui.cpp    |  1 -
 .../src/main/native/cpp/RoboRioSimGui.cpp     |  1 -
 .../src/main/native/cpp/SimDeviceGui.cpp      |  6 +--
 .../src/main/native/cpp/TimingGui.cpp         |  4 +-
 .../halsim_gui/src/main/native/cpp/main.cpp   | 20 +++----
 .../include/wpi/halsim/gui/HALSimGui.hpp      |  1 -
 .../halsim_gui/src/test/native/cpp/main.cpp   |  1 +
 .../src/main/native/cpp/HALSimWS.cpp          |  5 +-
 .../native/cpp/HALSimWSClientConnection.cpp   |  4 +-
 .../src/main/native/cpp/main.cpp              |  1 -
 .../include/wpi/halsim/ws_client/HALSimWS.hpp |  4 +-
 .../wpi/halsim/ws_client/HALSimWSClient.hpp   |  3 +-
 .../ws_client/HALSimWSClientConnection.hpp    |  7 ++-
 .../main/native/cpp/WSProvider_SimDevice.cpp  |  1 +
 .../main/native/cpp/WSProvider_Solenoid.cpp   |  1 +
 .../wpi/halsim/ws_core/WSBaseProvider.hpp     |  3 +-
 .../wpi/halsim/ws_core/WSHalProviders.hpp     |  4 +-
 .../halsim/ws_core/WSProviderContainer.hpp    |  3 +-
 .../halsim/ws_core/WSProvider_SimDevice.hpp   |  5 +-
 .../main/native/cpp/HALSimHttpConnection.cpp  |  8 +--
 .../src/main/native/cpp/HALSimWeb.cpp         |  9 ++--
 .../src/main/native/cpp/main.cpp              |  1 -
 .../halsim/ws_server/HALSimHttpConnection.hpp |  7 ++-
 .../wpi/halsim/ws_server/HALSimWSServer.hpp   |  3 +-
 .../wpi/halsim/ws_server/HALSimWeb.hpp        |  4 +-
 .../test/native/cpp/WebServerClientTest.cpp   |  5 +-
 .../src/test/native/cpp/main.cpp              |  8 +--
 .../native/include/WebServerClientTest.hpp    |  2 +-
 .../src/main/native/cpp/HALSimXRP.cpp         |  4 +-
 .../halsim_xrp/src/main/native/cpp/XRP.cpp    |  1 +
 .../halsim_xrp/src/main/native/cpp/main.cpp   |  1 -
 .../include/wpi/halsim/xrp/HALSimXRP.hpp      |  5 +-
 .../wpi/halsim/xrp/HALSimXRPClient.hpp        |  3 +-
 .../native/include/wpi/halsim/xrp/XRP.hpp     |  2 +-
 tools/datalogtool/src/main/native/cpp/App.cpp | 10 ++--
 .../src/main/native/cpp/Downloader.cpp        |  6 +--
 .../src/main/native/cpp/Exporter.cpp          |  8 +--
 .../src/main/native/cpp/main.cpp              |  5 +-
 tools/sysid/src/main/native/cpp/Util.cpp      |  1 +
 .../native/cpp/analysis/AnalysisManager.cpp   |  6 +--
 .../src/main/native/cpp/analysis/ArmSim.cpp   |  2 +-
 .../main/native/cpp/analysis/ElevatorSim.cpp  |  2 +-
 .../native/cpp/analysis/FeedbackAnalysis.cpp  |  3 +-
 .../cpp/analysis/FeedforwardAnalysis.cpp      |  4 +-
 .../native/cpp/analysis/FilteringUtils.cpp    |  1 +
 .../native/cpp/analysis/SimpleMotorSim.cpp    |  2 +-
 .../src/main/native/cpp/view/Analyzer.cpp     |  6 +--
 .../src/main/native/cpp/view/AnalyzerPlot.cpp |  2 +-
 .../src/main/native/cpp/view/DataSelector.cpp |  6 +--
 .../src/main/native/cpp/view/LogLoader.cpp    |  3 +-
 .../wpi/sysid/analysis/AnalysisManager.hpp    |  9 ++--
 .../include/wpi/sysid/analysis/ArmSim.hpp     |  1 +
 .../wpi/sysid/analysis/ElevatorSim.hpp        |  1 +
 .../wpi/sysid/analysis/FilteringUtils.hpp     |  6 +--
 .../wpi/sysid/analysis/SimpleMotorSim.hpp     |  1 +
 .../include/wpi/sysid/analysis/Storage.hpp    |  3 +-
 .../wpi/sysid/analysis/TrackwidthAnalysis.hpp |  1 +
 .../include/wpi/sysid/view/Analyzer.hpp       | 12 ++---
 .../include/wpi/sysid/view/AnalyzerPlot.hpp   |  6 +--
 .../include/wpi/sysid/view/DataSelector.hpp   |  5 +-
 .../cpp/analysis/FeedforwardAnalysisTest.cpp  |  4 +-
 tools/wpical/src/main/native/cpp/WPIcal.cpp   | 15 +++---
 .../main/native/include/cameracalibration.hpp |  1 +
 .../main/native/include/fieldcalibration.hpp  |  3 +-
 .../src/main/native/include/fieldmap.hpp      |  3 +-
 tools/wpical/src/main/native/include/fmap.hpp |  3 +-
 .../src/main/native/include/tagpose.hpp       |  1 +
 .../src/test/native/cpp/test_calibrate.cpp    |  7 ++-
 wpilibc/src/dev/native/cpp/main.cpp           |  3 +-
 wpilibc/src/main/native/cpp/ExpansionHub.cpp  |  7 ++-
 .../main/native/cpp/counter/Tachometer.cpp    |  3 +-
 .../main/native/cpp/counter/UpDownCounter.cpp |  3 +-
 .../native/cpp/drive/DifferentialDrive.cpp    |  5 +-
 .../main/native/cpp/drive/MecanumDrive.cpp    |  7 ++-
 .../cpp/driverstation/DriverStation.cpp       | 10 ++--
 .../main/native/cpp/driverstation/Gamepad.cpp |  3 +-
 .../native/cpp/driverstation/GenericHID.cpp   |  5 +-
 .../native/cpp/driverstation/Joystick.cpp     |  3 +-
 .../accelerometer/AnalogAccelerometer.cpp     |  3 +-
 .../src/main/native/cpp/hardware/bus/CAN.cpp  |  3 +-
 .../src/main/native/cpp/hardware/bus/I2C.cpp  |  3 +-
 .../native/cpp/hardware/bus/SerialPort.cpp    |  3 +-
 .../cpp/hardware/discrete/AnalogInput.cpp     |  9 ++--
 .../cpp/hardware/discrete/DigitalInput.cpp    |  5 +-
 .../cpp/hardware/discrete/DigitalOutput.cpp   |  5 +-
 .../main/native/cpp/hardware/discrete/PWM.cpp |  7 ++-
 .../native/cpp/hardware/imu/OnboardIMU.cpp    |  1 -
 .../cpp/hardware/led/AddressableLED.cpp       |  5 +-
 .../native/cpp/hardware/led/LEDPattern.cpp    |  3 +-
 .../native/cpp/hardware/motor/MotorSafety.cpp |  5 +-
 .../cpp/hardware/pneumatic/Compressor.cpp     |  6 +--
 .../cpp/hardware/pneumatic/DoubleSolenoid.cpp |  5 +-
 .../cpp/hardware/pneumatic/PneumaticHub.cpp   | 12 ++---
 .../cpp/hardware/pneumatic/PneumaticsBase.cpp |  3 +-
 .../pneumatic/PneumaticsControlModule.cpp     | 10 ++--
 .../cpp/hardware/pneumatic/Solenoid.cpp       |  5 +-
 .../cpp/hardware/power/PowerDistribution.cpp  |  6 +--
 .../native/cpp/hardware/range/SharpIR.cpp     |  3 +-
 .../cpp/hardware/rotation/AnalogEncoder.cpp   |  5 +-
 .../hardware/rotation/AnalogPotentiometer.cpp |  3 +-
 .../cpp/hardware/rotation/DutyCycle.cpp       |  7 ++-
 .../hardware/rotation/DutyCycleEncoder.cpp    |  5 +-
 .../native/cpp/hardware/rotation/Encoder.cpp  |  7 ++-
 .../cpp/internal/DriverStationModeThread.cpp  |  3 +-
 .../cpp/motorcontrol/PWMMotorController.cpp   |  4 +-
 .../native/cpp/opmode/IterativeRobotBase.cpp  |  8 ++-
 .../src/main/native/cpp/opmode/TimedRobot.cpp |  1 -
 .../cpp/simulation/AddressableLEDSim.cpp      |  1 -
 .../native/cpp/simulation/AnalogInputSim.cpp  |  1 -
 .../main/native/cpp/simulation/CTREPCMSim.cpp |  1 -
 .../main/native/cpp/simulation/DCMotorSim.cpp |  3 +-
 .../src/main/native/cpp/simulation/DIOSim.cpp |  1 -
 .../simulation/DifferentialDrivetrainSim.cpp  | 10 ++--
 .../native/cpp/simulation/DigitalPWMSim.cpp   |  1 -
 .../cpp/simulation/DriverStationSim.cpp       |  3 +-
 .../native/cpp/simulation/DutyCycleSim.cpp    |  1 -
 .../native/cpp/simulation/ElevatorSim.cpp     |  5 +-
 .../main/native/cpp/simulation/EncoderSim.cpp |  1 -
 .../native/cpp/simulation/FlywheelSim.cpp     |  3 +-
 .../cpp/simulation/PWMMotorControllerSim.cpp  |  3 +-
 .../src/main/native/cpp/simulation/PWMSim.cpp |  1 -
 .../cpp/simulation/PneumaticsBaseSim.cpp      |  2 +-
 .../cpp/simulation/PowerDistributionSim.cpp   |  1 -
 .../main/native/cpp/simulation/REVPHSim.cpp   |  1 -
 .../main/native/cpp/simulation/SharpIRSim.cpp |  3 +-
 .../native/cpp/simulation/SimDeviceSim.cpp    |  1 +
 .../cpp/simulation/SingleJointedArmSim.cpp    |  7 ++-
 .../cpp/smartdashboard/SmartDashboard.cpp     |  7 ++-
 .../main/native/cpp/system/DataLogManager.cpp | 21 ++++----
 .../src/main/native/cpp/system/Filesystem.cpp |  3 +-
 .../src/main/native/cpp/system/Notifier.cpp   |  6 +--
 .../src/main/native/cpp/system/Resource.cpp   |  3 +-
 .../native/cpp/system/RobotController.cpp     |  1 -
 .../main/native/cpp/system/SystemServer.cpp   |  3 +-
 .../src/main/native/cpp/system/Threads.cpp    |  3 +-
 wpilibc/src/main/native/cpp/system/Tracer.cpp |  4 +-
 .../src/main/native/cpp/system/Watchdog.cpp   |  6 +--
 wpilibc/src/main/native/cpp/util/Alert.cpp    |  8 +--
 .../src/main/native/cpp/util/Preferences.cpp  |  1 +
 wpilibc/src/main/native/cppcs/RobotBase.cpp   | 13 +++--
 .../native/include/wpi/ExpansionHubMotor.hpp  |  5 +-
 .../native/include/wpi/ExpansionHubServo.hpp  |  3 +-
 .../native/include/wpi/counter/Tachometer.hpp |  3 +-
 .../include/wpi/counter/UpDownCounter.hpp     |  3 +-
 .../include/wpi/drive/DifferentialDrive.hpp   |  3 +-
 .../native/include/wpi/drive/MecanumDrive.hpp |  5 +-
 .../wpi/driverstation/DriverStation.hpp       |  3 +-
 .../include/wpi/driverstation/Gamepad.hpp     |  3 +-
 .../include/wpi/driverstation/Joystick.hpp    |  3 +-
 .../native/include/wpi/event/BooleanEvent.hpp |  6 +--
 .../hardware/accelerometer/ADXL345_I2C.hpp    |  3 +-
 .../accelerometer/AnalogAccelerometer.hpp     |  3 +-
 .../include/wpi/hardware/imu/OnboardIMU.hpp   |  1 -
 .../wpi/hardware/led/AddressableLED.hpp       |  1 -
 .../include/wpi/hardware/led/LEDPattern.hpp   |  3 +-
 .../hardware/motor/MotorControllerGroup.hpp   |  3 +-
 .../wpi/hardware/motor/MotorSafety.hpp        |  3 +-
 .../wpi/hardware/motor/PWMMotorController.hpp |  7 ++-
 .../wpi/hardware/pneumatic/Compressor.hpp     |  5 +-
 .../wpi/hardware/pneumatic/DoubleSolenoid.hpp |  5 +-
 .../wpi/hardware/pneumatic/PneumaticHub.hpp   |  3 +-
 .../wpi/hardware/pneumatic/PneumaticsBase.hpp |  5 +-
 .../pneumatic/PneumaticsControlModule.hpp     |  3 +-
 .../wpi/hardware/pneumatic/Solenoid.hpp       |  5 +-
 .../include/wpi/hardware/range/SharpIR.hpp    |  3 +-
 .../hardware/rotation/AnalogPotentiometer.hpp |  3 +-
 .../include/wpi/hardware/rotation/Encoder.hpp |  3 +-
 .../include/wpi/opmode/IterativeRobotBase.hpp |  3 +-
 .../native/include/wpi/opmode/RobotBase.hpp   |  5 +-
 .../native/include/wpi/opmode/TimedRobot.hpp  |  5 +-
 .../include/wpi/opmode/TimesliceRobot.hpp     |  3 +-
 .../wpi/simulation/AnalogEncoderSim.hpp       |  3 +-
 .../include/wpi/simulation/DCMotorSim.hpp     |  7 ++-
 .../simulation/DifferentialDrivetrainSim.hpp  |  3 +-
 .../wpi/simulation/DriverStationSim.hpp       |  3 +-
 .../include/wpi/simulation/DutyCycleSim.hpp   |  3 +-
 .../include/wpi/simulation/ElevatorSim.hpp    |  5 +-
 .../include/wpi/simulation/FlywheelSim.hpp    |  7 ++-
 .../wpi/simulation/LinearSystemSim.hpp        |  7 ++-
 .../wpi/simulation/PWMMotorControllerSim.hpp  |  3 +-
 .../include/wpi/simulation/RoboRioSim.hpp     |  5 +-
 .../wpi/simulation/SendableChooserSim.hpp     |  1 -
 .../include/wpi/simulation/SharpIRSim.hpp     |  3 +-
 .../wpi/simulation/SingleJointedArmSim.hpp    |  5 +-
 .../include/wpi/smartdashboard/Field2d.hpp    |  7 ++-
 .../wpi/smartdashboard/FieldObject2d.hpp      |  5 +-
 .../wpi/smartdashboard/Mechanism2d.hpp        |  5 +-
 .../smartdashboard/MechanismLigament2d.hpp    |  3 +-
 .../wpi/smartdashboard/MechanismObject2d.hpp  |  3 +-
 .../wpi/smartdashboard/MechanismRoot2d.hpp    |  1 -
 .../wpi/smartdashboard/SendableChooser.hpp    |  3 +-
 .../include/wpi/sysid/SysIdRoutineLog.hpp     |  2 +-
 .../native/include/wpi/system/Watchdog.hpp    |  3 +-
 .../main/native/include/wpi/util/Color.hpp    |  1 +
 .../native/include/wpi/util/Color8Bit.hpp     |  4 +-
 wpilibc/src/test/native/cpp/AlertTest.cpp     |  4 +-
 .../native/cpp/AnalogPotentiometerTest.cpp    |  2 +-
 .../native/cpp/DoubleSolenoidTestCTRE.cpp     |  2 +-
 .../test/native/cpp/DoubleSolenoidTestREV.cpp |  2 +-
 .../src/test/native/cpp/GenericHIDTest.cpp    |  4 +-
 .../src/test/native/cpp/LEDPatternTest.cpp    |  4 +-
 wpilibc/src/test/native/cpp/NotifierTest.cpp  |  2 +-
 .../src/test/native/cpp/ScopedTracerTest.cpp  |  6 +--
 .../src/test/native/cpp/SolenoidTestCTRE.cpp  |  2 +-
 .../src/test/native/cpp/SolenoidTestREV.cpp   |  2 +-
 .../test/native/cpp/UnitNetworkTablesTest.cpp |  1 +
 .../cpp/drive/DifferentialDriveTest.cpp       |  2 +-
 .../native/cpp/drive/MecanumDriveTest.cpp     |  2 +-
 .../test/native/cpp/event/EventLoopTest.cpp   |  2 +-
 .../cpp/event/NetworkBooleanEventTest.cpp     |  4 +-
 wpilibc/src/test/native/cpp/main.cpp          |  1 +
 .../motorcontrol/MotorControllerGroupTest.cpp |  2 +-
 .../cpp/simulation/AddressableLEDSimTest.cpp  |  2 +-
 .../cpp/simulation/AnalogEncoderSimTest.cpp   |  6 +--
 .../cpp/simulation/AnalogInputSimTest.cpp     |  2 +-
 .../native/cpp/simulation/CTREPCMSimTest.cpp  |  2 +-
 .../native/cpp/simulation/DCMotorSimTest.cpp  |  8 +--
 .../test/native/cpp/simulation/DIOSimTest.cpp |  2 +-
 .../DifferentialDrivetrainSimTest.cpp         |  8 +--
 .../cpp/simulation/DigitalPWMSimTest.cpp      |  2 +-
 .../simulation/DutyCycleEncoderSimTest.cpp    |  2 +-
 .../cpp/simulation/DutyCycleSimTest.cpp       |  2 +-
 .../native/cpp/simulation/ElevatorSimTest.cpp | 14 ++---
 .../native/cpp/simulation/EncoderSimTest.cpp  |  4 +-
 .../test/native/cpp/simulation/PDPSimTest.cpp |  2 +-
 .../simulation/PWMMotorControlllerSimTest.cpp |  2 +-
 .../test/native/cpp/simulation/PWMSimTest.cpp |  2 +-
 .../native/cpp/simulation/REVPHSimTest.cpp    |  2 +-
 .../native/cpp/simulation/RoboRioSimTest.cpp  |  4 +-
 .../cpp/simulation/SimDeviceSimTest.cpp       |  2 +-
 .../cpp/simulation/SimInitializationTest.cpp  |  2 +-
 .../cpp/simulation/StateSpaceSimTest.cpp      | 10 ++--
 .../cpp/smartdashboard/Mechanism2dTest.cpp    |  8 +--
 .../smartdashboard/SendableChooserTest.cpp    |  8 +--
 .../motorcontrol/MockMotorController.hpp      |  3 +-
 .../commands/command2/ReplaceMeCommand2.hpp   |  4 +-
 .../ReplaceMeInstantCommand2.hpp              |  4 +-
 .../ReplaceMeParallelCommandGroup.hpp         |  4 +-
 .../ReplaceMeParallelDeadlineGroup.cpp        |  2 +-
 .../ReplaceMeParallelDeadlineGroup.hpp        |  4 +-
 .../ReplaceMeParallelRaceGroup.hpp            |  4 +-
 .../ReplaceMeSequentialCommandGroup.hpp       |  4 +-
 .../subsystem2/ReplaceMeSubsystem2.hpp        |  2 +-
 .../examples/AddressableLED/include/Robot.hpp |  6 +--
 .../examples/AprilTagsVision/cpp/Robot.cpp    | 20 +++----
 .../cpp/examples/ArcadeDrive/cpp/Robot.cpp    |  8 +--
 .../ArcadeDriveXboxController/cpp/Robot.cpp   |  8 +--
 .../ArmSimulation/cpp/subsystems/Arm.cpp      |  8 +--
 .../ArmSimulation/include/Constants.hpp       | 12 ++---
 .../examples/ArmSimulation/include/Robot.hpp  |  4 +-
 .../ArmSimulation/include/subsystems/Arm.hpp  | 26 ++++-----
 .../main/cpp/examples/CANPDP/cpp/Robot.cpp    |  6 +--
 .../DifferentialDriveBot/cpp/Robot.cpp        |  6 +--
 .../include/Drivetrain.hpp                    | 22 ++++----
 .../cpp/Robot.cpp                             |  6 +--
 .../include/Drivetrain.hpp                    | 54 +++++++++----------
 .../ExampleGlobalMeasurementSensor.hpp        |  4 +-
 .../DigitalCommunication/cpp/Robot.cpp        |  2 +-
 .../DigitalCommunication/include/Robot.hpp    |  4 +-
 .../DriveDistanceOffboard/cpp/Robot.cpp       |  4 +-
 .../cpp/RobotContainer.cpp                    |  2 +-
 .../cpp/subsystems/DriveSubsystem.cpp         |  2 +-
 .../include/Constants.hpp                     | 10 ++--
 .../DriveDistanceOffboard/include/Robot.hpp   |  4 +-
 .../include/RobotContainer.hpp                |  8 +--
 .../include/subsystems/DriveSubsystem.hpp     | 16 +++---
 .../examples/DutyCycleEncoder/cpp/Robot.cpp   |  8 +--
 .../cpp/examples/DutyCycleInput/cpp/Robot.cpp |  8 +--
 .../ElevatorExponentialProfile/cpp/Robot.cpp  | 18 +++----
 .../cpp/subsystems/Elevator.cpp               |  6 +--
 .../include/Constants.hpp                     | 14 ++---
 .../include/Robot.hpp                         |  4 +-
 .../include/subsystems/Elevator.hpp           | 28 +++++-----
 .../ElevatorProfiledPID/cpp/Robot.cpp         | 24 ++++-----
 .../cpp/subsystems/Elevator.cpp               |  6 +--
 .../ElevatorSimulation/include/Constants.hpp  | 14 ++---
 .../ElevatorSimulation/include/Robot.hpp      |  4 +-
 .../include/subsystems/Elevator.hpp           | 28 +++++-----
 .../ElevatorTrapezoidProfile/cpp/Robot.cpp    | 18 +++----
 .../main/cpp/examples/Encoder/cpp/Robot.cpp   |  6 +--
 .../main/cpp/examples/EventLoop/cpp/Robot.cpp | 24 ++++-----
 .../FlywheelBangBangController/cpp/Robot.cpp  | 22 ++++----
 .../cpp/examples/GettingStarted/cpp/Robot.cpp | 10 ++--
 .../src/main/cpp/examples/Gyro/cpp/Robot.cpp  | 10 ++--
 .../cpp/examples/GyroMecanum/cpp/Robot.cpp    | 10 ++--
 .../src/main/cpp/examples/HAL/c/Robot.c       |  2 +-
 .../examples/HatchbotInlined/cpp/Robot.cpp    |  8 +--
 .../HatchbotInlined/cpp/RobotContainer.cpp    |  2 +-
 .../HatchbotInlined/cpp/commands/Autos.cpp    |  4 +-
 .../cpp/subsystems/DriveSubsystem.cpp         |  2 +-
 .../cpp/subsystems/HatchSubsystem.cpp         |  2 +-
 .../HatchbotInlined/include/Robot.hpp         |  4 +-
 .../include/RobotContainer.hpp                |  8 +--
 .../include/commands/Autos.hpp                |  2 +-
 .../include/subsystems/DriveSubsystem.hpp     |  8 +--
 .../include/subsystems/HatchSubsystem.hpp     |  8 +--
 .../HatchbotTraditional/cpp/Robot.cpp         |  8 +--
 .../cpp/RobotContainer.cpp                    |  4 +-
 .../cpp/subsystems/DriveSubsystem.cpp         |  2 +-
 .../cpp/subsystems/HatchSubsystem.cpp         |  2 +-
 .../HatchbotTraditional/include/Robot.hpp     |  4 +-
 .../include/RobotContainer.hpp                |  6 +--
 .../include/commands/ComplexAuto.hpp          |  4 +-
 .../include/commands/DefaultDrive.hpp         |  4 +-
 .../include/commands/DriveDistance.hpp        |  4 +-
 .../include/commands/GrabHatch.hpp            |  4 +-
 .../include/commands/HalveDriveSpeed.hpp      |  4 +-
 .../include/commands/ReleaseHatch.hpp         |  4 +-
 .../include/subsystems/DriveSubsystem.hpp     |  8 +--
 .../include/subsystems/HatchSubsystem.hpp     |  6 +--
 .../main/cpp/examples/HidRumble/cpp/Robot.cpp |  4 +-
 .../cpp/examples/HttpCamera/cpp/Robot.cpp     |  4 +-
 .../examples/I2CCommunication/cpp/Robot.cpp   |  4 +-
 .../I2CCommunication/include/Robot.hpp        |  4 +-
 .../examples/IntermediateVision/cpp/Robot.cpp |  4 +-
 .../examples/MecanumBot/cpp/Drivetrain.cpp    |  2 +-
 .../cpp/examples/MecanumBot/cpp/Robot.cpp     |  6 +--
 .../MecanumBot/include/Drivetrain.hpp         | 18 +++----
 .../cpp/examples/MecanumDrive/cpp/Robot.cpp   |  8 +--
 .../cpp/Drivetrain.cpp                        |  2 +-
 .../MecanumDrivePoseEstimator/cpp/Robot.cpp   |  6 +--
 .../include/Drivetrain.hpp                    | 20 +++----
 .../ExampleGlobalMeasurementSensor.hpp        |  4 +-
 .../cpp/examples/Mechanism2d/cpp/Robot.cpp    | 24 ++++-----
 .../cpp/examples/MotorControl/cpp/Robot.cpp   | 10 ++--
 .../PotentiometerPID/include/Robot.hpp        | 12 ++---
 .../cpp/examples/QuickVision/cpp/Robot.cpp    |  4 +-
 .../cpp/RapidReactCommandBot.cpp              |  6 +--
 .../cpp/subsystems/Drive.cpp                  |  4 +-
 .../cpp/subsystems/Shooter.cpp                |  2 +-
 .../include/Constants.hpp                     | 10 ++--
 .../include/RapidReactCommandBot.hpp          |  4 +-
 .../RapidReactCommandBot/include/Robot.hpp    |  4 +-
 .../include/subsystems/Drive.hpp              | 20 +++----
 .../include/subsystems/Intake.hpp             |  8 +--
 .../include/subsystems/Pneumatics.hpp         | 12 ++---
 .../include/subsystems/Shooter.hpp            | 16 +++---
 .../include/subsystems/Storage.hpp            | 10 ++--
 .../cpp/examples/RomiReference/cpp/Robot.cpp  |  2 +-
 .../RomiReference/cpp/RobotContainer.cpp      |  4 +-
 .../cpp/commands/DriveDistance.cpp            |  2 +-
 .../cpp/commands/TurnDegrees.cpp              |  2 +-
 .../examples/RomiReference/include/Robot.hpp  |  4 +-
 .../RomiReference/include/RobotContainer.hpp  | 12 ++---
 .../include/commands/AutonomousDistance.hpp   |  4 +-
 .../include/commands/AutonomousTime.hpp       |  4 +-
 .../include/commands/DriveDistance.hpp        |  6 +--
 .../include/commands/DriveTime.hpp            |  8 +--
 .../include/commands/TeleopArcadeDrive.hpp    |  4 +-
 .../include/commands/TurnDegrees.hpp          |  8 +--
 .../include/commands/TurnTime.hpp             |  8 +--
 .../include/subsystems/Drivetrain.hpp         | 16 +++---
 .../cpp/examples/SelectCommand/cpp/Robot.cpp  |  4 +-
 .../SelectCommand/cpp/RobotContainer.cpp      |  2 +-
 .../examples/SelectCommand/include/Robot.hpp  |  4 +-
 .../SelectCommand/include/RobotContainer.hpp  |  8 +--
 .../cpp/Drivetrain.cpp                        |  2 +-
 .../cpp/Robot.cpp                             | 12 ++---
 .../include/Drivetrain.hpp                    | 32 +++++------
 .../main/cpp/examples/Solenoid/cpp/Robot.cpp  |  4 +-
 .../cpp/examples/Solenoid/include/Robot.hpp   | 14 ++---
 .../cpp/examples/StateSpaceArm/cpp/Robot.cpp  | 26 ++++-----
 .../examples/StateSpaceElevator/cpp/Robot.cpp | 30 +++++------
 .../examples/StateSpaceFlywheel/cpp/Robot.cpp | 24 ++++-----
 .../StateSpaceFlywheelSysId/cpp/Robot.cpp     | 22 ++++----
 .../main/cpp/examples/SwerveBot/cpp/Robot.cpp |  8 +--
 .../examples/SwerveBot/cpp/SwerveModule.cpp   |  2 +-
 .../examples/SwerveBot/include/Drivetrain.hpp |  8 +--
 .../SwerveBot/include/SwerveModule.hpp        | 22 ++++----
 .../cpp/Drivetrain.cpp                        |  2 +-
 .../SwerveDrivePoseEstimator/cpp/Robot.cpp    |  6 +--
 .../cpp/SwerveModule.cpp                      |  2 +-
 .../include/Drivetrain.hpp                    | 10 ++--
 .../ExampleGlobalMeasurementSensor.hpp        |  4 +-
 .../include/SwerveModule.hpp                  | 22 ++++----
 .../cpp/examples/SysIdRoutine/cpp/Robot.cpp   |  2 +-
 .../SysIdRoutine/cpp/SysIdRoutineBot.cpp      |  2 +-
 .../SysIdRoutine/cpp/subsystems/Drive.cpp     |  2 +-
 .../SysIdRoutine/cpp/subsystems/Shooter.cpp   |  6 +--
 .../SysIdRoutine/include/Constants.hpp        | 12 ++---
 .../examples/SysIdRoutine/include/Robot.hpp   |  4 +-
 .../SysIdRoutine/include/SysIdRoutineBot.hpp  |  4 +-
 .../SysIdRoutine/include/subsystems/Drive.hpp | 12 ++---
 .../include/subsystems/Shooter.hpp            | 14 ++---
 .../main/cpp/examples/TankDrive/cpp/Robot.cpp |  8 +--
 .../TankDriveXboxController/cpp/Robot.cpp     |  8 +--
 .../cpp/examples/UnitTest/include/Robot.hpp   |  4 +-
 .../UnitTest/include/subsystems/Intake.hpp    |  4 +-
 .../cpp/examples/XRPReference/cpp/Robot.cpp   |  2 +-
 .../XRPReference/cpp/RobotContainer.cpp       |  6 +--
 .../cpp/commands/DriveDistance.cpp            |  2 +-
 .../XRPReference/cpp/commands/TurnDegrees.cpp |  2 +-
 .../examples/XRPReference/include/Robot.hpp   |  4 +-
 .../XRPReference/include/RobotContainer.hpp   | 12 ++---
 .../include/commands/AutonomousDistance.hpp   |  4 +-
 .../include/commands/AutonomousTime.hpp       |  4 +-
 .../include/commands/DriveDistance.hpp        |  6 +--
 .../include/commands/DriveTime.hpp            |  8 +--
 .../include/commands/TeleopArcadeDrive.hpp    |  4 +-
 .../include/commands/TurnDegrees.hpp          |  8 +--
 .../include/commands/TurnTime.hpp             |  8 +--
 .../XRPReference/include/subsystems/Arm.hpp   |  6 +--
 .../include/subsystems/Drivetrain.hpp         | 16 +++---
 .../snippets/ADXLAccelerometers/cpp/Robot.cpp |  8 +--
 .../AccelerometerCollision/cpp/Robot.cpp      |  8 +--
 .../AccelerometerFilter/cpp/Robot.cpp         | 10 ++--
 .../AnalogAccelerometer/cpp/Robot.cpp         |  6 +--
 .../cpp/snippets/AnalogEncoder/cpp/Robot.cpp  |  4 +-
 .../cpp/snippets/AnalogInput/cpp/Robot.cpp    |  4 +-
 .../AnalogPotentiometer/cpp/Robot.cpp         |  6 +--
 .../cpp/snippets/DigitalInput/cpp/Robot.cpp   |  4 +-
 .../snippets/DutyCycleEncoder/cpp/Robot.cpp   |  4 +-
 .../main/cpp/snippets/Encoder/cpp/Robot.cpp   |  6 +--
 .../cpp/snippets/EncoderDrive/cpp/Robot.cpp   |  8 +--
 .../cpp/snippets/EncoderHoming/cpp/Robot.cpp  |  8 +--
 .../cpp/snippets/LimitSwitch/cpp/Robot.cpp    | 10 ++--
 .../cpp/snippets/OnboardIMU/cpp/Robot.cpp     | 10 ++--
 .../ProfiledPIDFeedforward/cpp/Robot.cpp      | 18 +++----
 .../cpp/templates/commandbased/cpp/Robot.cpp  |  2 +-
 .../commandbased/cpp/RobotContainer.cpp       |  2 +-
 .../commandbased/cpp/commands/Autos.cpp       |  2 +-
 .../templates/commandbased/include/Robot.hpp  |  4 +-
 .../commandbased/include/RobotContainer.hpp   |  4 +-
 .../commandbased/include/commands/Autos.hpp   |  2 +-
 .../include/commands/ExampleCommand.hpp       |  4 +-
 .../include/subsystems/ExampleSubsystem.hpp   |  4 +-
 .../commandbasedskeleton/cpp/Robot.cpp        |  2 +-
 .../cpp/RobotContainer.cpp                    |  2 +-
 .../commandbasedskeleton/include/Robot.hpp    |  4 +-
 .../include/RobotContainer.hpp                |  2 +-
 .../templates/robotbaseskeleton/cpp/Robot.cpp |  8 +--
 .../robotbaseskeleton/include/Robot.hpp       |  2 +-
 .../main/cpp/templates/timed/cpp/Robot.cpp    |  4 +-
 .../cpp/templates/timed/include/Robot.hpp     |  4 +-
 .../templates/timedskeleton/include/Robot.hpp |  2 +-
 .../cpp/templates/timeslice/cpp/Robot.cpp     |  4 +-
 .../cpp/templates/timeslice/include/Robot.hpp |  4 +-
 .../timesliceskeleton/include/Robot.hpp       |  2 +-
 .../ArmSimulation/cpp/ArmSimulationTest.cpp   | 16 +++---
 .../cpp/examples/ArmSimulation/cpp/main.cpp   |  2 +-
 .../cpp/DigitalCommunicationTest.cpp          |  8 +--
 .../DigitalCommunication/cpp/main.cpp         |  2 +-
 .../cpp/ElevatorSimulationTest.cpp            | 16 +++---
 .../examples/ElevatorSimulation/cpp/main.cpp  |  2 +-
 .../cpp/I2CCommunicationTest.cpp              |  8 +--
 .../examples/I2CCommunication/cpp/main.cpp    |  2 +-
 .../cpp/PotentiometerPIDTest.cpp              | 24 ++++-----
 .../examples/PotentiometerPID/cpp/main.cpp    |  2 +-
 .../test/cpp/examples/UnitTest/cpp/main.cpp   |  2 +-
 .../UnitTest/cpp/subsystems/IntakeTest.cpp    |  6 +--
 .../LTVDifferentialDriveController.cpp        |  2 +-
 .../estimator/MecanumDrivePoseEstimator.cpp   |  5 +-
 .../estimator/MecanumDrivePoseEstimator3d.cpp |  5 +-
 .../cpp/geometry/proto/Ellipse2dProto.cpp     |  1 -
 .../native/cpp/geometry/proto/Pose2dProto.cpp |  1 -
 .../native/cpp/geometry/proto/Pose3dProto.cpp |  3 +-
 .../cpp/geometry/proto/Rectangle2dProto.cpp   |  1 -
 .../cpp/geometry/proto/Rotation3dProto.cpp    |  1 -
 .../cpp/geometry/proto/Transform2dProto.cpp   |  1 -
 .../cpp/geometry/proto/Transform3dProto.cpp   |  1 -
 .../main/native/cpp/jni/ArmFeedforwardJNI.cpp |  3 +-
 wpimath/src/main/native/cpp/jni/DAREJNI.cpp   |  5 +-
 wpimath/src/main/native/cpp/jni/EigenJNI.cpp  |  2 +-
 .../src/main/native/cpp/jni/Ellipse2dJNI.cpp  |  5 +-
 .../main/native/cpp/jni/StateSpaceUtilJNI.cpp |  2 +-
 .../main/native/cpp/jni/Transform3dJNI.cpp    |  3 +-
 .../src/main/native/cpp/jni/Twist3dJNI.cpp    |  3 +-
 .../proto/MecanumDriveKinematicsProto.cpp     |  1 -
 .../proto/SwerveModulePositionProto.cpp       |  1 -
 .../proto/SwerveModuleStateProto.cpp          |  1 -
 .../spline/proto/CubicHermiteSplineProto.cpp  |  1 -
 .../proto/QuinticHermiteSplineProto.cpp       |  1 -
 .../cpp/trajectory/TrajectoryGenerator.cpp    |  3 +-
 .../cpp/trajectory/proto/TrajectoryProto.cpp  |  1 -
 .../trajectory/proto/TrajectoryStateProto.cpp |  1 -
 .../src/main/native/cpp/util/MathShared.cpp   |  3 +-
 .../wpi/math/controller/ArmFeedforward.hpp    |  7 ++-
 .../math/controller/BangBangController.hpp    |  4 +-
 .../DifferentialDriveAccelerationLimiter.hpp  |  2 +-
 .../DifferentialDriveFeedforward.hpp          |  3 +-
 .../math/controller/ElevatorFeedforward.hpp   |  7 ++-
 .../math/controller/ImplicitModelFollower.hpp |  3 +-
 .../LTVDifferentialDriveController.hpp        |  6 +--
 .../math/controller/LTVUnicycleController.hpp |  6 +--
 .../controller/LinearQuadraticRegulator.hpp   | 10 ++--
 .../wpi/math/controller/PIDController.hpp     |  8 +--
 .../math/controller/ProfiledPIDController.hpp |  9 ++--
 .../controller/SimpleMotorFeedforward.hpp     |  4 +-
 .../controller/proto/ArmFeedforwardProto.hpp  |  5 +-
 .../DifferentialDriveFeedforwardProto.hpp     |  5 +-
 .../DifferentialDriveWheelVoltagesProto.hpp   |  5 +-
 .../proto/ElevatorFeedforwardProto.hpp        |  5 +-
 .../proto/SimpleMotorFeedforwardProto.hpp     |  5 +-
 .../struct/ArmFeedforwardStruct.hpp           |  3 +-
 .../DifferentialDriveFeedforwardStruct.hpp    |  3 +-
 .../DifferentialDriveWheelVoltagesStruct.hpp  |  3 +-
 .../struct/ElevatorFeedforwardStruct.hpp      |  3 +-
 .../struct/SimpleMotorFeedforwardStruct.hpp   |  3 +-
 .../DifferentialDrivePoseEstimator.hpp        |  5 +-
 .../DifferentialDrivePoseEstimator3d.hpp      |  5 +-
 .../math/estimator/ExtendedKalmanFilter.hpp   |  6 +--
 .../wpi/math/estimator/KalmanFilter.hpp       |  8 +--
 .../estimator/MecanumDrivePoseEstimator.hpp   |  5 +-
 .../estimator/MecanumDrivePoseEstimator3d.hpp |  5 +-
 .../include/wpi/math/estimator/MerweUKF.hpp   |  3 +-
 .../wpi/math/estimator/PoseEstimator.hpp      |  6 +--
 .../wpi/math/estimator/PoseEstimator3d.hpp    |  8 +--
 .../wpi/math/estimator/S3SigmaPoints.hpp      |  5 +-
 .../include/wpi/math/estimator/S3UKF.hpp      |  3 +-
 .../estimator/SteadyStateKalmanFilter.hpp     | 10 ++--
 .../estimator/SwerveDrivePoseEstimator.hpp    |  5 +-
 .../estimator/SwerveDrivePoseEstimator3d.hpp  |  5 +-
 .../math/estimator/UnscentedKalmanFilter.hpp  |  8 +--
 .../include/wpi/math/filter/Debouncer.hpp     |  3 +-
 .../include/wpi/math/filter/LinearFilter.hpp  |  6 +--
 .../wpi/math/filter/SlewRateLimiter.hpp       |  5 +-
 .../wpi/math/geometry/CoordinateAxis.hpp      |  2 +-
 .../wpi/math/geometry/CoordinateSystem.hpp    |  3 +-
 .../include/wpi/math/geometry/Ellipse2d.hpp   |  4 +-
 .../include/wpi/math/geometry/Pose2d.hpp      |  4 +-
 .../include/wpi/math/geometry/Pose3d.hpp      |  6 +--
 .../include/wpi/math/geometry/Quaternion.hpp  |  1 +
 .../include/wpi/math/geometry/Rectangle2d.hpp |  3 +-
 .../include/wpi/math/geometry/Rotation2d.hpp  |  8 +--
 .../include/wpi/math/geometry/Rotation3d.hpp  |  8 +--
 .../include/wpi/math/geometry/Transform2d.hpp |  3 +-
 .../include/wpi/math/geometry/Transform3d.hpp |  3 +-
 .../wpi/math/geometry/Translation2d.hpp       |  4 +-
 .../wpi/math/geometry/Translation3d.hpp       |  4 +-
 .../include/wpi/math/geometry/Twist2d.hpp     |  3 +-
 .../include/wpi/math/geometry/Twist3d.hpp     |  3 +-
 .../math/geometry/proto/Ellipse2dProto.hpp    |  3 +-
 .../wpi/math/geometry/proto/Pose2dProto.hpp   |  5 +-
 .../wpi/math/geometry/proto/Pose3dProto.hpp   |  3 +-
 .../math/geometry/proto/QuaternionProto.hpp   |  3 +-
 .../math/geometry/proto/Rectangle2dProto.hpp  |  3 +-
 .../math/geometry/proto/Rotation2dProto.hpp   |  5 +-
 .../math/geometry/proto/Rotation3dProto.hpp   |  3 +-
 .../math/geometry/proto/Transform2dProto.hpp  |  3 +-
 .../math/geometry/proto/Transform3dProto.hpp  |  3 +-
 .../geometry/proto/Translation2dProto.hpp     |  5 +-
 .../geometry/proto/Translation3dProto.hpp     |  3 +-
 .../wpi/math/geometry/proto/Twist2dProto.hpp  |  3 +-
 .../wpi/math/geometry/proto/Twist3dProto.hpp  |  3 +-
 .../math/geometry/struct/Ellipse2dStruct.hpp  |  3 +-
 .../wpi/math/geometry/struct/Pose2dStruct.hpp |  3 +-
 .../wpi/math/geometry/struct/Pose3dStruct.hpp |  3 +-
 .../math/geometry/struct/QuaternionStruct.hpp |  3 +-
 .../geometry/struct/Rectangle2dStruct.hpp     |  3 +-
 .../math/geometry/struct/Rotation2dStruct.hpp |  3 +-
 .../math/geometry/struct/Rotation3dStruct.hpp |  3 +-
 .../geometry/struct/Transform2dStruct.hpp     |  3 +-
 .../geometry/struct/Transform3dStruct.hpp     |  3 +-
 .../geometry/struct/Translation2dStruct.hpp   |  3 +-
 .../geometry/struct/Translation3dStruct.hpp   |  3 +-
 .../math/geometry/struct/Twist2dStruct.hpp    |  3 +-
 .../math/geometry/struct/Twist3dStruct.hpp    |  3 +-
 .../TimeInterpolatableBuffer.hpp              |  5 +-
 .../wpi/math/kinematics/ChassisSpeeds.hpp     |  3 +-
 .../DifferentialDriveKinematics.hpp           |  5 +-
 .../kinematics/DifferentialDriveOdometry.hpp  |  3 +-
 .../DifferentialDriveOdometry3d.hpp           |  3 +-
 .../DifferentialDriveWheelPositions.hpp       |  3 +-
 .../DifferentialDriveWheelSpeeds.hpp          |  3 +-
 .../wpi/math/kinematics/Kinematics.hpp        |  3 +-
 .../kinematics/MecanumDriveKinematics.hpp     |  4 +-
 .../math/kinematics/MecanumDriveOdometry.hpp  |  5 +-
 .../kinematics/MecanumDriveOdometry3d.hpp     |  5 +-
 .../kinematics/MecanumDriveWheelPositions.hpp |  3 +-
 .../kinematics/MecanumDriveWheelSpeeds.hpp    |  3 +-
 .../include/wpi/math/kinematics/Odometry.hpp  |  3 +-
 .../wpi/math/kinematics/Odometry3d.hpp        |  3 +-
 .../math/kinematics/SwerveDriveKinematics.hpp |  8 +--
 .../math/kinematics/SwerveDriveOdometry.hpp   |  7 ++-
 .../math/kinematics/SwerveDriveOdometry3d.hpp |  7 ++-
 .../math/kinematics/SwerveModulePosition.hpp  |  5 +-
 .../wpi/math/kinematics/SwerveModuleState.hpp |  3 +-
 .../kinematics/proto/ChassisSpeedsProto.hpp   |  3 +-
 .../DifferentialDriveKinematicsProto.hpp      |  3 +-
 .../DifferentialDriveWheelPositionsProto.hpp  |  3 +-
 .../DifferentialDriveWheelSpeedsProto.hpp     |  3 +-
 .../proto/MecanumDriveKinematicsProto.hpp     |  3 +-
 .../proto/MecanumDriveWheelPositionsProto.hpp |  3 +-
 .../proto/MecanumDriveWheelSpeedsProto.hpp    |  3 +-
 .../proto/SwerveDriveKinematicsProto.hpp      |  4 +-
 .../proto/SwerveModulePositionProto.hpp       |  3 +-
 .../proto/SwerveModuleStateProto.hpp          |  3 +-
 .../kinematics/struct/ChassisSpeedsStruct.hpp |  3 +-
 .../DifferentialDriveKinematicsStruct.hpp     |  3 +-
 .../DifferentialDriveWheelPositionsStruct.hpp |  3 +-
 .../DifferentialDriveWheelSpeedsStruct.hpp    |  3 +-
 .../struct/MecanumDriveKinematicsStruct.hpp   |  3 +-
 .../MecanumDriveWheelPositionsStruct.hpp      |  3 +-
 .../struct/MecanumDriveWheelSpeedsStruct.hpp  |  3 +-
 .../struct/SwerveDriveKinematicsStruct.hpp    |  4 +-
 .../struct/SwerveModulePositionStruct.hpp     |  3 +-
 .../struct/SwerveModuleStateStruct.hpp        |  3 +-
 .../native/include/wpi/math/linalg/DARE.hpp   |  2 +-
 .../wpi/math/linalg/proto/MatrixProto.hpp     |  4 +-
 .../wpi/math/linalg/proto/VectorProto.hpp     |  4 +-
 .../wpi/math/linalg/struct/StructProto.hpp    |  4 +-
 .../wpi/math/linalg/struct/VectorStruct.hpp   |  4 +-
 .../wpi/math/path/TravelingSalesman.hpp       |  5 +-
 .../wpi/math/spline/CubicHermiteSpline.hpp    |  5 +-
 .../wpi/math/spline/QuinticHermiteSpline.hpp  |  5 +-
 .../native/include/wpi/math/spline/Spline.hpp |  4 +-
 .../include/wpi/math/spline/SplineHelper.hpp  |  5 +-
 .../wpi/math/spline/SplineParameterizer.hpp   |  3 +-
 .../spline/proto/CubicHermiteSplineProto.hpp  |  3 +-
 .../proto/QuinticHermiteSplineProto.hpp       |  3 +-
 .../struct/CubicHermiteSplineStruct.hpp       |  3 +-
 .../struct/QuinticHermiteSplineStruct.hpp     |  3 +-
 .../include/wpi/math/system/LinearSystem.hpp  |  4 +-
 .../wpi/math/system/LinearSystemLoop.hpp      |  5 +-
 .../include/wpi/math/system/plant/DCMotor.hpp |  3 +-
 .../wpi/math/system/plant/LinearSystemId.hpp  |  2 +-
 .../math/system/plant/proto/DCMotorProto.hpp  |  3 +-
 .../system/plant/struct/DCMotorStruct.hpp     |  3 +-
 .../math/system/proto/LinearSystemProto.hpp   |  4 +-
 .../math/system/struct/LinearSystemStruct.hpp |  4 +-
 .../wpi/math/trajectory/Trajectory.hpp        |  7 ++-
 .../wpi/math/trajectory/TrajectoryConfig.hpp  |  3 +-
 .../math/trajectory/TrajectoryGenerator.hpp   |  3 +-
 .../trajectory/TrajectoryParameterizer.hpp    |  3 +-
 .../wpi/math/trajectory/TrapezoidProfile.hpp  |  2 +-
 .../CentripetalAccelerationConstraint.hpp     |  3 +-
 .../DifferentialDriveKinematicsConstraint.hpp |  3 +-
 .../DifferentialDriveVoltageConstraint.hpp    |  5 +-
 .../constraint/MaxVelocityConstraint.hpp      |  3 +-
 .../MecanumDriveKinematicsConstraint.hpp      |  3 +-
 .../constraint/TrajectoryConstraint.hpp       |  3 +-
 .../math/trajectory/proto/TrajectoryProto.hpp |  3 +-
 .../trajectory/proto/TrajectoryStateProto.hpp |  3 +-
 .../wpi/math/util/ComputerVisionUtil.hpp      |  3 +-
 .../include/wpi/math/util/MathShared.hpp      |  2 +-
 .../native/include/wpi/math/util/MathUtil.hpp |  4 +-
 .../include/wpi/math/util/StateSpaceUtil.hpp  |  6 +--
 wpimath/src/test/native/cpp/DARETest.cpp      |  6 +--
 .../src/test/native/cpp/DARETest_Inst_4x1.cpp |  3 +-
 wpimath/src/test/native/cpp/MathUtilTest.cpp  |  2 +-
 wpimath/src/test/native/cpp/ProtoTestBase.hpp |  1 +
 .../src/test/native/cpp/StateSpaceTest.cpp    |  2 +-
 .../src/test/native/cpp/StructTestBase.hpp    |  1 +
 .../cpp/controller/ArmFeedforwardTest.cpp     |  2 +-
 ...rolAffinePlantInversionFeedforwardTest.cpp |  2 +-
 .../controller/ElevatorFeedforwardTest.cpp    |  2 +-
 .../LTVDifferentialDriveControllerTest.cpp    |  2 +-
 .../controller/LTVUnicycleControllerTest.cpp  |  2 +-
 .../LinearPlantInversionFeedforwardTest.cpp   |  2 +-
 .../LinearQuadraticRegulatorTest.cpp          |  2 +-
 .../controller/SimpleMotorFeedforwardTest.cpp |  2 +-
 .../proto/ArmFeedforwardProtoTest.cpp         |  2 +-
 ...ifferentialDriveWheelVoltagesProtoTest.cpp |  2 +-
 .../proto/ElevatorFeedforwardProtoTest.cpp    |  2 +-
 .../cpp/estimator/AngleStatisticsTest.cpp     |  2 +-
 .../DifferentialDrivePoseEstimator3dTest.cpp  |  4 +-
 .../DifferentialDrivePoseEstimatorTest.cpp    |  4 +-
 .../estimator/ExtendedKalmanFilterTest.cpp    |  4 +-
 .../MecanumDrivePoseEstimator3dTest.cpp       |  2 +-
 .../MecanumDrivePoseEstimatorTest.cpp         |  2 +-
 .../native/cpp/estimator/MerweUKFTest.cpp     |  4 +-
 .../test/native/cpp/estimator/S3UKFTest.cpp   |  4 +-
 .../SwerveDrivePoseEstimator3dTest.cpp        |  4 +-
 .../SwerveDrivePoseEstimatorTest.cpp          |  4 +-
 .../test/native/cpp/filter/DebouncerTest.cpp  |  2 +-
 .../cpp/filter/LinearFilterOutputTest.cpp     |  2 +-
 .../native/cpp/filter/SlewRateLimiterTest.cpp |  2 +-
 .../test/native/cpp/geometry/Pose3dTest.cpp   |  2 +-
 .../native/cpp/geometry/Rotation3dTest.cpp    |  2 +-
 .../cpp/geometry/proto/Ellipse2dProtoTest.cpp |  2 +-
 .../cpp/geometry/proto/Pose2dProtoTest.cpp    |  2 +-
 .../cpp/geometry/proto/Pose3dProtoTest.cpp    |  2 +-
 .../geometry/proto/QuaternionProtoTest.cpp    |  2 +-
 .../geometry/proto/Rectangle2dProtoTest.cpp   |  2 +-
 .../geometry/proto/Rotation2dProtoTest.cpp    |  2 +-
 .../geometry/proto/Rotation3dProtoTest.cpp    |  2 +-
 .../geometry/proto/Transform2dProtoTest.cpp   |  2 +-
 .../geometry/proto/Transform3dProtoTest.cpp   |  2 +-
 .../geometry/proto/Translation2dProtoTest.cpp |  2 +-
 .../geometry/proto/Translation3dProtoTest.cpp |  2 +-
 .../cpp/geometry/proto/Twist2dProtoTest.cpp   |  2 +-
 .../cpp/geometry/proto/Twist3dProtoTest.cpp   |  2 +-
 .../proto/ChassisSpeedsProtoTest.cpp          |  2 +-
 .../DifferentialDriveKinematicsProtoTest.cpp  |  2 +-
 .../DifferentialDriveWheelSpeedsProtoTest.cpp |  2 +-
 .../proto/MecanumDriveKinematicsProtoTest.cpp |  2 +-
 .../MecanumDriveWheelPositionsProtoTest.cpp   |  2 +-
 .../MecanumDriveWheelSpeedsProtoTest.cpp      |  2 +-
 .../proto/SwerveModulePositionProtoTest.cpp   |  2 +-
 .../proto/SwerveModuleStateProtoTest.cpp      |  2 +-
 .../native/cpp/path/TravelingSalesmanTest.cpp |  6 +--
 .../native/cpp/system/LinearSystemIDTest.cpp  |  5 +-
 .../system/plant/proto/DCMotorProtoTest.cpp   |  2 +-
 .../CentripetalAccelerationConstraintTest.cpp |  2 +-
 .../DifferentialDriveKinematicsTest.cpp       |  2 +-
 .../DifferentialDriveVoltageTest.cpp          |  2 +-
 .../EllipticalRegionConstraintTest.cpp        |  2 +-
 .../RectangularRegionConstraintTest.cpp       |  2 +-
 .../trajectory/TrajectoryGeneratorTest.cpp    |  2 +-
 .../trajectory/proto/TrajectoryProtoTest.cpp  |  2 +-
 .../proto/TrajectoryStateProtoTest.cpp        |  2 +-
 wpinet/examples/dsclient/dsclient.cpp         |  5 +-
 .../parallelconnect/parallelconnect.cpp       |  3 +-
 wpinet/examples/webserver/webserver.cpp       |  3 +-
 wpinet/src/main/native/cpp/DsClient.cpp       |  6 +--
 .../src/main/native/cpp/EventLoopRunner.cpp   |  5 +-
 .../main/native/cpp/HttpServerConnection.cpp  |  3 +-
 wpinet/src/main/native/cpp/HttpUtil.cpp       |  1 +
 .../native/cpp/MulticastHandleManager.hpp     |  5 +-
 .../native/cpp/MulticastServiceAnnouncer.cpp  |  3 +-
 .../native/cpp/MulticastServiceResolver.cpp   |  3 +-
 .../main/native/cpp/ParallelTcpConnector.cpp  |  2 +-
 wpinet/src/main/native/cpp/PortForwarder.cpp  |  4 +-
 wpinet/src/main/native/cpp/UDPClient.cpp      |  3 +-
 wpinet/src/main/native/cpp/WebSocket.cpp      | 11 ++--
 .../main/native/cpp/WebSocketSerializer.hpp   |  5 +-
 .../src/main/native/cpp/WebSocketServer.cpp   |  7 ++-
 wpinet/src/main/native/cpp/hostname.cpp       |  3 +-
 wpinet/src/main/native/cpp/jni/WPINetJNI.cpp  |  3 +-
 wpinet/src/main/native/cpp/uv/FsEvent.cpp     |  3 +-
 wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp |  3 +-
 wpinet/src/main/native/cpp/uv/Process.cpp     |  3 +-
 wpinet/src/main/native/cpp/uv/Udp.cpp         |  3 +-
 .../include/wpi/net/EventLoopRunner.hpp       |  9 ++--
 .../native/include/wpi/net/HttpParser.hpp     |  9 ++--
 .../include/wpi/net/HttpServerConnection.hpp  |  6 +--
 .../main/native/include/wpi/net/HttpUtil.hpp  | 13 +++--
 .../wpi/net/HttpWebSocketServerConnection.hpp |  9 ++--
 .../main/native/include/wpi/net/MimeTypes.hpp |  6 +--
 .../include/wpi/net/NetworkAcceptor.hpp       |  6 +--
 .../native/include/wpi/net/NetworkStream.hpp  |  6 +--
 .../native/include/wpi/net/PortForwarder.hpp  |  6 +--
 .../native/include/wpi/net/SocketError.hpp    |  6 +--
 .../main/native/include/wpi/net/UDPClient.hpp |  6 +--
 .../main/native/include/wpi/net/UrlParser.hpp |  9 ++--
 .../main/native/include/wpi/net/WebServer.hpp |  6 +--
 .../main/native/include/wpi/net/WebSocket.hpp | 11 ++--
 .../include/wpi/net/WebSocketServer.hpp       | 11 ++--
 .../native/include/wpi/net/WorkerThread.hpp   |  9 ++--
 .../main/native/include/wpi/net/hostname.hpp  |  6 +--
 .../include/wpi/net/raw_socket_istream.hpp    |  6 +--
 .../include/wpi/net/raw_socket_ostream.hpp    |  6 +--
 .../native/include/wpi/net/raw_uv_ostream.hpp |  9 ++--
 .../main/native/include/wpi/net/uv/Async.hpp  | 11 ++--
 .../include/wpi/net/uv/AsyncFunction.hpp      | 11 ++--
 .../main/native/include/wpi/net/uv/Buffer.hpp |  6 +--
 .../main/native/include/wpi/net/uv/Check.hpp  |  9 ++--
 .../main/native/include/wpi/net/uv/Error.hpp  |  6 +--
 .../native/include/wpi/net/uv/FsEvent.hpp     |  9 ++--
 .../native/include/wpi/net/uv/GetAddrInfo.hpp |  9 ++--
 .../native/include/wpi/net/uv/GetNameInfo.hpp |  9 ++--
 .../main/native/include/wpi/net/uv/Handle.hpp |  9 ++--
 .../main/native/include/wpi/net/uv/Idle.hpp   |  9 ++--
 .../main/native/include/wpi/net/uv/Loop.hpp   |  9 ++--
 .../include/wpi/net/uv/NetworkStream.hpp      |  9 ++--
 .../main/native/include/wpi/net/uv/Pipe.hpp   |  6 +--
 .../main/native/include/wpi/net/uv/Poll.hpp   |  9 ++--
 .../native/include/wpi/net/uv/Prepare.hpp     |  9 ++--
 .../native/include/wpi/net/uv/Process.hpp     |  9 ++--
 .../native/include/wpi/net/uv/Request.hpp     |  6 +--
 .../main/native/include/wpi/net/uv/Signal.hpp |  9 ++--
 .../main/native/include/wpi/net/uv/Stream.hpp |  9 ++--
 .../main/native/include/wpi/net/uv/Tcp.hpp    |  6 +--
 .../main/native/include/wpi/net/uv/Timer.hpp  |  9 ++--
 .../main/native/include/wpi/net/uv/Tty.hpp    |  6 +--
 .../main/native/include/wpi/net/uv/Udp.hpp    |  9 ++--
 .../main/native/include/wpi/net/uv/Work.hpp   |  9 ++--
 .../main/native/include/wpi/net/uv/util.hpp   |  6 +--
 .../linux/MulticastServiceAnnouncer.cpp       |  2 +-
 .../native/linux/MulticastServiceResolver.cpp |  3 +-
 .../macOS/MulticastServiceAnnouncer.cpp       |  3 +-
 .../native/macOS/MulticastServiceResolver.cpp |  3 +-
 .../src/main/native/macOS/ResolverThread.hpp  |  3 +-
 .../windows/MulticastServiceAnnouncer.cpp     |  5 +-
 .../windows/MulticastServiceResolver.cpp      |  3 +-
 .../src/netconsoleServer/native/cpp/main.cpp  |  8 +--
 wpinet/src/netconsoleTee/native/cpp/main.cpp  |  8 +--
 wpinet/src/test/native/cpp/MulticastTest.cpp  |  6 +--
 .../test/native/cpp/WebSocketClientTest.cpp   |  7 ++-
 .../native/cpp/WebSocketIntegrationTest.cpp   |  3 +-
 .../native/cpp/WebSocketSerializerTest.cpp    |  2 +-
 .../test/native/cpp/WebSocketServerTest.cpp   |  5 +-
 wpinet/src/test/native/cpp/WebSocketTest.cpp  |  3 +-
 .../src/test/native/cpp/WorkerThreadTest.cpp  |  4 +-
 wpinet/src/test/native/cpp/hostname.cpp       |  1 +
 wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp |  2 +-
 wpiutil/src/dev/native/cpp/main.cpp           |  3 +-
 wpiutil/src/main/native/cpp/RawFrame.cpp      |  4 +-
 wpiutil/src/main/native/cpp/string.cpp        |  4 +-
 .../main/native/include/wpi/util/Base64.hpp   |  6 +--
 .../include/wpi/util/CallbackManager.hpp      |  6 +--
 .../main/native/include/wpi/util/Demangle.hpp |  6 +--
 .../main/native/include/wpi/util/Logger.hpp   |  6 +--
 .../main/native/include/wpi/util/RawFrame.h   |  6 +--
 .../native/include/wpi/util/SafeThread.hpp    |  6 +--
 .../native/include/wpi/util/StackTrace.hpp    |  6 +--
 .../native/include/wpi/util/UidVector.hpp     |  6 +--
 .../native/include/wpi/util/deprecated.hpp    |  6 +--
 .../include/wpi/util/fmt/raw_ostream.hpp      |  6 +--
 .../main/native/include/wpi/util/future.hpp   |  6 +--
 .../main/native/include/wpi/util/jni_util.hpp |  6 +--
 .../main/native/include/wpi/util/nodiscard.h  |  6 +--
 .../include/wpi/util/priority_queue.hpp       |  6 +--
 .../native/include/wpi/util/raw_istream.hpp   |  6 +--
 .../src/main/native/include/wpi/util/sha1.hpp |  6 +--
 .../main/native/include/wpi/util/timestamp.h  |  6 +--
 .../test/native/cpp/proto/TestProtoInner.hpp  |  3 +-
 .../src/main/native/cpp/xrp/XRPMotor.cpp      |  4 +-
 .../src/main/native/cpp/xrp/XRPServo.cpp      |  3 +-
 .../main/native/include/wpi/xrp/XRPGyro.hpp   |  3 +-
 .../main/native/include/wpi/xrp/XRPMotor.hpp  |  5 +-
 .../native/include/wpi/xrp/XRPOnBoardIO.hpp   |  5 +-
 .../native/include/wpi/xrp/XRPRangefinder.hpp |  1 -
 1218 files changed, 2709 insertions(+), 3267 deletions(-)

diff --git a/apriltag/src/main/native/include/wpi/apriltag/AprilTag.hpp b/apriltag/src/main/native/include/wpi/apriltag/AprilTag.hpp
index 668db92d93..85545335b1 100644
--- a/apriltag/src/main/native/include/wpi/apriltag/AprilTag.hpp
+++ b/apriltag/src/main/native/include/wpi/apriltag/AprilTag.hpp
@@ -4,12 +4,11 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Pose3d.hpp"
 #include "wpi/util/RawFrame.h"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/json_fwd.hpp"
 
-#include "wpi/math/geometry/Pose3d.hpp"
-
 namespace frc {
 
 /**
diff --git a/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetection.hpp b/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetection.hpp
index dfc3c1fe56..4500b7b072 100644
--- a/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetection.hpp
+++ b/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetection.hpp
@@ -10,6 +10,7 @@
 #include <string_view>
 
 #include <Eigen/Core>
+
 #include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
diff --git a/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetector.hpp b/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetector.hpp
index d8ebf55e7a..7449536ba1 100644
--- a/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetector.hpp
+++ b/apriltag/src/main/native/include/wpi/apriltag/AprilTagDetector.hpp
@@ -11,12 +11,11 @@
 #include <string_view>
 #include <utility>
 
+#include "wpi/apriltag/AprilTagDetection.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/SymbolExports.hpp"
 
-#include "wpi/apriltag/AprilTagDetection.hpp"
-
 namespace frc {
 
 /**
diff --git a/apriltag/src/main/native/include/wpi/apriltag/AprilTagFieldLayout.hpp b/apriltag/src/main/native/include/wpi/apriltag/AprilTagFieldLayout.hpp
index 509a8b4a9c..ed81399653 100644
--- a/apriltag/src/main/native/include/wpi/apriltag/AprilTagFieldLayout.hpp
+++ b/apriltag/src/main/native/include/wpi/apriltag/AprilTagFieldLayout.hpp
@@ -9,13 +9,12 @@
 #include <unordered_map>
 #include <vector>
 
-#include "wpi/units/length.hpp"
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/json_fwd.hpp"
-
 #include "wpi/apriltag/AprilTag.hpp"
 #include "wpi/apriltag/AprilTagFields.hpp"
 #include "wpi/math/geometry/Pose3d.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace frc {
 /**
diff --git a/apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimate.hpp b/apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimate.hpp
index 59c9a44d6c..8e8fb587b8 100644
--- a/apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimate.hpp
+++ b/apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimate.hpp
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Transform3d.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimator.hpp b/apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimator.hpp
index 21c35667f1..830658cd66 100644
--- a/apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimator.hpp
+++ b/apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimator.hpp
@@ -6,11 +6,10 @@
 
 #include <span>
 
-#include "wpi/units/length.hpp"
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/apriltag/AprilTagPoseEstimate.hpp"
 #include "wpi/math/geometry/Transform3d.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/apriltag/src/test/native/cpp/AprilTagJsonTest.cpp b/apriltag/src/test/native/cpp/AprilTagJsonTest.cpp
index af72106eb8..4c6d399de4 100644
--- a/apriltag/src/test/native/cpp/AprilTagJsonTest.cpp
+++ b/apriltag/src/test/native/cpp/AprilTagJsonTest.cpp
@@ -5,11 +5,11 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/json.hpp"
 
 #include "wpi/apriltag/AprilTag.hpp"
 #include "wpi/apriltag/AprilTagFieldLayout.hpp"
 #include "wpi/math/geometry/Pose3d.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace frc;
 
diff --git a/apriltag/src/test/native/cpp/AprilTagPoseSetOriginTest.cpp b/apriltag/src/test/native/cpp/AprilTagPoseSetOriginTest.cpp
index 3f2cb79424..0f293724d4 100644
--- a/apriltag/src/test/native/cpp/AprilTagPoseSetOriginTest.cpp
+++ b/apriltag/src/test/native/cpp/AprilTagPoseSetOriginTest.cpp
@@ -5,11 +5,11 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/json.hpp"
 
 #include "wpi/apriltag/AprilTag.hpp"
 #include "wpi/apriltag/AprilTagFieldLayout.hpp"
 #include "wpi/math/geometry/Pose3d.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace frc;
 
diff --git a/benchmark/src/main/native/cpp/Main.cpp b/benchmark/src/main/native/cpp/Main.cpp
index 4d8d1214f2..6e29c56bac 100644
--- a/benchmark/src/main/native/cpp/Main.cpp
+++ b/benchmark/src/main/native/cpp/Main.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <benchmark/benchmark.h>
+
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/path/TravelingSalesman.hpp"
-
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/util/array.hpp"
diff --git a/cameraserver/multiCameraServer/src/main/native/cpp/main.cpp b/cameraserver/multiCameraServer/src/main/native/cpp/main.cpp
index d3a873a4e7..e1f43b8ede 100644
--- a/cameraserver/multiCameraServer/src/main/native/cpp/main.cpp
+++ b/cameraserver/multiCameraServer/src/main/native/cpp/main.cpp
@@ -9,6 +9,7 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/cameraserver/CameraServer.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/util/MemoryBuffer.hpp"
 #include "wpi/util/StringExtras.hpp"
@@ -17,8 +18,6 @@
 #include "wpi/util/print.hpp"
 #include "wpi/util/raw_ostream.hpp"
 
-#include "wpi/cameraserver/CameraServer.hpp"
-
 /*
    JSON format:
    {
diff --git a/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
index 5c08054206..48272ffe3d 100644
--- a/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
+++ b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
@@ -11,21 +11,21 @@
 #include <vector>
 
 #include <fmt/format.h>
+
+#include "wpi/cameraserver/CameraServerShared.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/IntegerTopic.hpp"
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringArrayTopic.hpp"
 #include "wpi/nt/StringTopic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "wpi/cameraserver/CameraServerShared.hpp"
-#include "wpi/nt/ntcore_cpp.hpp"
-
 using namespace frc;
 
 static constexpr char const* kPublishName = "/CameraPublisher";
diff --git a/commandsv2/CMakeLists.txt b/commandsv2/CMakeLists.txt
index 53e5bd1fe8..414e0b4af2 100644
--- a/commandsv2/CMakeLists.txt
+++ b/commandsv2/CMakeLists.txt
@@ -77,19 +77,10 @@ target_include_directories(
 install(TARGETS commandsv2 EXPORT commandsv2)
 export(TARGETS commandsv2 FILE commandsv2.cmake NAMESPACE commandsv2::)
 install(DIRECTORY src/main/native/include/ DESTINATION "${include_dest}/commandsv2")
-install(
-    DIRECTORY src/generated/main/native/include/
-    DESTINATION "${include_dest}/commandsv2"
-)
+install(DIRECTORY src/generated/main/native/include/ DESTINATION "${include_dest}/commandsv2")
 
-configure_file(
-    commandsv2-config.cmake.in
-    ${WPILIB_BINARY_DIR}/commandsv2-config.cmake
-)
-install(
-    FILES ${WPILIB_BINARY_DIR}/commandsv2-config.cmake
-    DESTINATION share/commandsv2
-)
+configure_file(commandsv2-config.cmake.in ${WPILIB_BINARY_DIR}/commandsv2-config.cmake)
+install(FILES ${WPILIB_BINARY_DIR}/commandsv2-config.cmake DESTINATION share/commandsv2)
 install(EXPORT commandsv2 DESTINATION share/commandsv2)
 
 if(WITH_TESTS)
diff --git a/commandsv2/src/main/native/cpp/frc2/command/Command.cpp b/commandsv2/src/main/native/cpp/frc2/command/Command.cpp
index 7355c218de..9edd90a22c 100644
--- a/commandsv2/src/main/native/cpp/frc2/command/Command.cpp
+++ b/commandsv2/src/main/native/cpp/frc2/command/Command.cpp
@@ -7,13 +7,12 @@
 #include <string>
 #include <utility>
 
+#include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/CommandScheduler.hpp"
-
 using namespace frc2;
 
 Command::Command() {
diff --git a/commandsv2/src/main/native/cpp/frc2/command/CommandPtr.cpp b/commandsv2/src/main/native/cpp/frc2/command/CommandPtr.cpp
index 0202a8315a..774c173ff5 100644
--- a/commandsv2/src/main/native/cpp/frc2/command/CommandPtr.cpp
+++ b/commandsv2/src/main/native/cpp/frc2/command/CommandPtr.cpp
@@ -8,8 +8,6 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/system/Errors.hpp"
-
 #include "wpi/commands2/CommandScheduler.hpp"
 #include "wpi/commands2/ConditionalCommand.hpp"
 #include "wpi/commands2/InstantCommand.hpp"
@@ -22,6 +20,7 @@
 #include "wpi/commands2/WaitCommand.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
 #include "wpi/commands2/WrapperCommand.hpp"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc2;
 
diff --git a/commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp b/commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp
index 09d9307954..656d501dfe 100644
--- a/commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp
+++ b/commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp
@@ -10,21 +10,20 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/opmode/RobotBase.hpp"
-#include "wpi/opmode/RobotState.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/commands2/Subsystem.hpp"
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/UsageReporting.h"
 #include "wpi/nt/IntegerArrayTopic.hpp"
 #include "wpi/nt/StringArrayTopic.hpp"
+#include "wpi/opmode/RobotBase.hpp"
+#include "wpi/opmode/RobotState.hpp"
+#include "wpi/opmode/TimedRobot.hpp"
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/Subsystem.hpp"
-
 using namespace frc2;
 
 class CommandScheduler::Impl {
diff --git a/commandsv2/src/main/native/cpp/frc2/command/Commands.cpp b/commandsv2/src/main/native/cpp/frc2/command/Commands.cpp
index 4ecead1129..6e82229278 100644
--- a/commandsv2/src/main/native/cpp/frc2/command/Commands.cpp
+++ b/commandsv2/src/main/native/cpp/frc2/command/Commands.cpp
@@ -7,9 +7,6 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/FunctionExtras.hpp"
-#include "wpi/util/deprecated.hpp"
-
 #include "wpi/commands2/ConditionalCommand.hpp"
 #include "wpi/commands2/DeferredCommand.hpp"
 #include "wpi/commands2/FunctionalCommand.hpp"
@@ -23,6 +20,8 @@
 #include "wpi/commands2/SequentialCommandGroup.hpp"
 #include "wpi/commands2/WaitCommand.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
+#include "wpi/util/FunctionExtras.hpp"
+#include "wpi/util/deprecated.hpp"
 
 using namespace frc2;
 
diff --git a/commandsv2/src/main/native/cpp/frc2/command/DeferredCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/DeferredCommand.cpp
index c827109fa4..93667ef6cf 100644
--- a/commandsv2/src/main/native/cpp/frc2/command/DeferredCommand.cpp
+++ b/commandsv2/src/main/native/cpp/frc2/command/DeferredCommand.cpp
@@ -6,9 +6,8 @@
 
 #include <utility>
 
-#include "wpi/util/sendable/SendableBuilder.hpp"
-
 #include "wpi/commands2/Commands.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc2;
 
diff --git a/commandsv2/src/main/native/cpp/frc2/command/ProxyCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/ProxyCommand.cpp
index 70c6c7ce63..68d2c47386 100644
--- a/commandsv2/src/main/native/cpp/frc2/command/ProxyCommand.cpp
+++ b/commandsv2/src/main/native/cpp/frc2/command/ProxyCommand.cpp
@@ -4,10 +4,11 @@
 
 #include "wpi/commands2/ProxyCommand.hpp"
 
+#include <fmt/format.h>
+
 #include <string>
 #include <utility>
 
-#include <fmt/format.h>
 #include "wpi/util/deprecated.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 
diff --git a/commandsv2/src/main/native/cpp/frc2/command/Subsystem.cpp b/commandsv2/src/main/native/cpp/frc2/command/Subsystem.cpp
index 61dad304e5..ce73da2124 100644
--- a/commandsv2/src/main/native/cpp/frc2/command/Subsystem.cpp
+++ b/commandsv2/src/main/native/cpp/frc2/command/Subsystem.cpp
@@ -7,10 +7,9 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/Demangle.hpp"
-
 #include "wpi/commands2/CommandPtr.hpp"
 #include "wpi/commands2/Commands.hpp"
+#include "wpi/util/Demangle.hpp"
 
 using namespace frc2;
 Subsystem::~Subsystem() {
diff --git a/commandsv2/src/main/native/cpp/frc2/command/SubsystemBase.cpp b/commandsv2/src/main/native/cpp/frc2/command/SubsystemBase.cpp
index 5a8aea9e4f..81dcb3758c 100644
--- a/commandsv2/src/main/native/cpp/frc2/command/SubsystemBase.cpp
+++ b/commandsv2/src/main/native/cpp/frc2/command/SubsystemBase.cpp
@@ -6,11 +6,10 @@
 
 #include <string>
 
-#include "wpi/util/sendable/SendableBuilder.hpp"
-#include "wpi/util/sendable/SendableRegistry.hpp"
-
 #include "wpi/commands2/Command.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
 using namespace frc2;
 
diff --git a/commandsv2/src/main/native/cpp/frc2/command/WaitCommand.cpp b/commandsv2/src/main/native/cpp/frc2/command/WaitCommand.cpp
index 9124c05aed..71d1a7196a 100644
--- a/commandsv2/src/main/native/cpp/frc2/command/WaitCommand.cpp
+++ b/commandsv2/src/main/native/cpp/frc2/command/WaitCommand.cpp
@@ -5,6 +5,7 @@
 #include "wpi/commands2/WaitCommand.hpp"
 
 #include <fmt/format.h>
+
 #include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc2;
diff --git a/commandsv2/src/main/native/cpp/frc2/command/button/Trigger.cpp b/commandsv2/src/main/native/cpp/frc2/command/button/Trigger.cpp
index 1b4777112f..07755afdbb 100644
--- a/commandsv2/src/main/native/cpp/frc2/command/button/Trigger.cpp
+++ b/commandsv2/src/main/native/cpp/frc2/command/button/Trigger.cpp
@@ -6,9 +6,8 @@
 
 #include <utility>
 
-#include "wpi/math/filter/Debouncer.hpp"
-
 #include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/math/filter/Debouncer.hpp"
 
 using namespace frc;
 using namespace frc2;
diff --git a/commandsv2/src/main/native/include/wpi/commands2/Command.hpp b/commandsv2/src/main/native/include/wpi/commands2/Command.hpp
index db1605cb5f..5ff7701470 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/Command.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/Command.hpp
@@ -9,15 +9,14 @@
 #include <optional>
 #include <string>
 
+#include "wpi/commands2/Requirements.hpp"
+#include "wpi/commands2/Subsystem.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/Demangle.hpp"
 #include "wpi/util/SmallSet.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 
-#include "wpi/commands2/Requirements.hpp"
-#include "wpi/commands2/Subsystem.hpp"
-
 namespace frc2 {
 
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/CommandScheduler.hpp b/commandsv2/src/main/native/include/wpi/commands2/CommandScheduler.hpp
index a2053472df..38b00dd02a 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/CommandScheduler.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/CommandScheduler.hpp
@@ -12,9 +12,9 @@
 #include <span>
 #include <utility>
 
+#include "wpi/event/EventLoop.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/system/Watchdog.hpp"
-#include "wpi/event/EventLoop.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/FunctionExtras.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
diff --git a/commandsv2/src/main/native/include/wpi/commands2/Commands.hpp b/commandsv2/src/main/native/include/wpi/commands2/Commands.hpp
index 8f27c2871f..2186922baa 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/Commands.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/Commands.hpp
@@ -12,11 +12,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/deprecated.hpp"
-
 #include "wpi/commands2/CommandPtr.hpp"
 #include "wpi/commands2/Requirements.hpp"
 #include "wpi/commands2/SelectCommand.hpp"
+#include "wpi/util/deprecated.hpp"
 
 namespace frc2 {
 class Subsystem;
diff --git a/commandsv2/src/main/native/include/wpi/commands2/DeferredCommand.hpp b/commandsv2/src/main/native/include/wpi/commands2/DeferredCommand.hpp
index 3e8fe881b7..ba9a4bb45e 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/DeferredCommand.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/DeferredCommand.hpp
@@ -6,11 +6,10 @@
 
 #include <memory>
 
-#include "wpi/util/FunctionExtras.hpp"
-
 #include "wpi/commands2/Command.hpp"
 #include "wpi/commands2/CommandHelper.hpp"
 #include "wpi/commands2/Requirements.hpp"
+#include "wpi/util/FunctionExtras.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/NotifierCommand.hpp b/commandsv2/src/main/native/include/wpi/commands2/NotifierCommand.hpp
index 96a807cc5c..f978ba5ef7 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/NotifierCommand.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/NotifierCommand.hpp
@@ -6,12 +6,11 @@
 
 #include <functional>
 
-#include "wpi/system/Notifier.hpp"
-#include "wpi/units/time.hpp"
-
 #include "wpi/commands2/Command.hpp"
 #include "wpi/commands2/CommandHelper.hpp"
 #include "wpi/commands2/Requirements.hpp"
+#include "wpi/system/Notifier.hpp"
+#include "wpi/units/time.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/ParallelCommandGroup.hpp b/commandsv2/src/main/native/include/wpi/commands2/ParallelCommandGroup.hpp
index c1cd15e3ed..9c7316e207 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/ParallelCommandGroup.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/ParallelCommandGroup.hpp
@@ -14,9 +14,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/DecayedDerivedFrom.hpp"
-
 #include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/util/DecayedDerivedFrom.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/ParallelDeadlineGroup.hpp b/commandsv2/src/main/native/include/wpi/commands2/ParallelDeadlineGroup.hpp
index a92888a427..38fa077039 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/ParallelDeadlineGroup.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/ParallelDeadlineGroup.hpp
@@ -14,9 +14,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/DecayedDerivedFrom.hpp"
-
 #include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/util/DecayedDerivedFrom.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/ParallelRaceGroup.hpp b/commandsv2/src/main/native/include/wpi/commands2/ParallelRaceGroup.hpp
index c4608990a4..39465a09b6 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/ParallelRaceGroup.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/ParallelRaceGroup.hpp
@@ -14,9 +14,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/DecayedDerivedFrom.hpp"
-
 #include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/util/DecayedDerivedFrom.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/ProxyCommand.hpp b/commandsv2/src/main/native/include/wpi/commands2/ProxyCommand.hpp
index 4009caa1d3..7c0c8d44f4 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/ProxyCommand.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/ProxyCommand.hpp
@@ -6,11 +6,10 @@
 
 #include <memory>
 
-#include "wpi/util/FunctionExtras.hpp"
-#include "wpi/util/deprecated.hpp"
-
 #include "wpi/commands2/Command.hpp"
 #include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/util/FunctionExtras.hpp"
+#include "wpi/util/deprecated.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/ScheduleCommand.hpp b/commandsv2/src/main/native/include/wpi/commands2/ScheduleCommand.hpp
index c46eb67b18..04ae047250 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/ScheduleCommand.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/ScheduleCommand.hpp
@@ -6,10 +6,9 @@
 
 #include <span>
 
-#include "wpi/util/SmallSet.hpp"
-
 #include "wpi/commands2/Command.hpp"
 #include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/util/SmallSet.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/SelectCommand.hpp b/commandsv2/src/main/native/include/wpi/commands2/SelectCommand.hpp
index cd976d907b..7f1d5b9100 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/SelectCommand.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/SelectCommand.hpp
@@ -17,10 +17,9 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/sendable/SendableBuilder.hpp"
-
 #include "wpi/commands2/Command.hpp"
 #include "wpi/commands2/PrintCommand.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/SequentialCommandGroup.hpp b/commandsv2/src/main/native/include/wpi/commands2/SequentialCommandGroup.hpp
index b4822a93c8..35bf554302 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/SequentialCommandGroup.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/SequentialCommandGroup.hpp
@@ -15,9 +15,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/DecayedDerivedFrom.hpp"
-
 #include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/util/DecayedDerivedFrom.hpp"
 
 namespace frc2 {
 
diff --git a/commandsv2/src/main/native/include/wpi/commands2/Subsystem.hpp b/commandsv2/src/main/native/include/wpi/commands2/Subsystem.hpp
index 11a4d9065a..3983c6965c 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/Subsystem.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/Subsystem.hpp
@@ -9,9 +9,8 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/FunctionExtras.hpp"
-
 #include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/util/FunctionExtras.hpp"
 
 namespace frc2 {
 class Command;
diff --git a/commandsv2/src/main/native/include/wpi/commands2/SubsystemBase.hpp b/commandsv2/src/main/native/include/wpi/commands2/SubsystemBase.hpp
index 7914619005..179faaa9b1 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/SubsystemBase.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/SubsystemBase.hpp
@@ -7,11 +7,10 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/commands2/Subsystem.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/commands2/Subsystem.hpp"
-
 namespace frc2 {
 /**
  * A base for subsystems that handles registration in the constructor, and
diff --git a/commandsv2/src/main/native/include/wpi/commands2/WaitCommand.hpp b/commandsv2/src/main/native/include/wpi/commands2/WaitCommand.hpp
index 9a6fc2e4ce..ce9435dcd7 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/WaitCommand.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/WaitCommand.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "wpi/system/Timer.hpp"
-#include "wpi/units/time.hpp"
-
 #include "wpi/commands2/Command.hpp"
 #include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/system/Timer.hpp"
+#include "wpi/units/time.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/WaitUntilCommand.hpp b/commandsv2/src/main/native/include/wpi/commands2/WaitUntilCommand.hpp
index 0899320766..59cfc93f59 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/WaitUntilCommand.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/WaitUntilCommand.hpp
@@ -6,10 +6,9 @@
 
 #include <functional>
 
-#include "wpi/units/time.hpp"
-
 #include "wpi/commands2/Command.hpp"
 #include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/units/time.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/button/CommandGamepad.hpp b/commandsv2/src/main/native/include/wpi/commands2/button/CommandGamepad.hpp
index 70d064d4b1..5e21a3fc0f 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/button/CommandGamepad.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/button/CommandGamepad.hpp
@@ -3,11 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #pragma once
-#include "wpi/driverstation/Gamepad.hpp"
-
 #include "wpi/commands2/CommandScheduler.hpp"
 #include "wpi/commands2/button/CommandGenericHID.hpp"
 #include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/driverstation/Gamepad.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/button/CommandGenericHID.hpp b/commandsv2/src/main/native/include/wpi/commands2/button/CommandGenericHID.hpp
index d9246a9624..0cc1846fa0 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/button/CommandGenericHID.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/button/CommandGenericHID.hpp
@@ -4,12 +4,11 @@
 
 #pragma once
 
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/driverstation/DriverStation.hpp"
 #include "wpi/driverstation/GenericHID.hpp"
 
-#include "wpi/commands2/button/Trigger.hpp"
-#include "wpi/commands2/CommandScheduler.hpp"
-
 namespace frc2 {
 
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/button/CommandJoystick.hpp b/commandsv2/src/main/native/include/wpi/commands2/button/CommandJoystick.hpp
index ed3fcd9da4..e7e979e639 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/button/CommandJoystick.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/button/CommandJoystick.hpp
@@ -3,11 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #pragma once
-#include "wpi/driverstation/Joystick.hpp"
-
-#include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
 #include "wpi/commands2/button/CommandGenericHID.hpp"
+#include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/driverstation/Joystick.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/button/JoystickButton.hpp b/commandsv2/src/main/native/include/wpi/commands2/button/JoystickButton.hpp
index a1e79582d6..dba99aef6c 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/button/JoystickButton.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/button/JoystickButton.hpp
@@ -3,9 +3,8 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #pragma once
-#include "wpi/driverstation/GenericHID.hpp"
-
 #include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/driverstation/GenericHID.hpp"
 
 namespace frc2 {
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/button/NetworkButton.hpp b/commandsv2/src/main/native/include/wpi/commands2/button/NetworkButton.hpp
index 2dc208c9b9..6021747f04 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/button/NetworkButton.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/button/NetworkButton.hpp
@@ -7,12 +7,11 @@
 #include <memory>
 #include <string_view>
 
+#include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 
-#include "wpi/commands2/button/Trigger.hpp"
-
 namespace frc2 {
 /**
  * A Button that uses a NetworkTable boolean field.
diff --git a/commandsv2/src/main/native/include/wpi/commands2/button/POVButton.hpp b/commandsv2/src/main/native/include/wpi/commands2/button/POVButton.hpp
index 830e852e52..3ae8f5d6a0 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/button/POVButton.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/button/POVButton.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/commands2/button/Trigger.hpp"
 #include "wpi/driverstation/DriverStation.hpp"
 #include "wpi/driverstation/GenericHID.hpp"
 
-#include "wpi/commands2/button/Trigger.hpp"
-
 namespace frc2 {
 /**
  * A class used to bind command scheduling to joystick POV presses.  Can be
diff --git a/commandsv2/src/main/native/include/wpi/commands2/button/Trigger.hpp b/commandsv2/src/main/native/include/wpi/commands2/button/Trigger.hpp
index 7622a1b270..3292003802 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/button/Trigger.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/button/Trigger.hpp
@@ -7,15 +7,14 @@
 #include <functional>
 #include <utility>
 
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
 #include "wpi/event/BooleanEvent.hpp"
 #include "wpi/event/EventLoop.hpp"
 #include "wpi/math/filter/Debouncer.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/FunctionExtras.hpp"
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandScheduler.hpp"
-
 namespace frc2 {
 class Command;
 /**
diff --git a/commandsv2/src/main/native/include/wpi/commands2/sysid/SysIdRoutine.hpp b/commandsv2/src/main/native/include/wpi/commands2/sysid/SysIdRoutine.hpp
index 32abc42751..049d13ff12 100644
--- a/commandsv2/src/main/native/include/wpi/commands2/sysid/SysIdRoutine.hpp
+++ b/commandsv2/src/main/native/include/wpi/commands2/sysid/SysIdRoutine.hpp
@@ -9,11 +9,10 @@
 #include <string_view>
 #include <utility>
 
-#include "wpi/system/Timer.hpp"
-#include "wpi/sysid/SysIdRoutineLog.hpp"
-
 #include "wpi/commands2/CommandPtr.hpp"
 #include "wpi/commands2/Subsystem.hpp"
+#include "wpi/sysid/SysIdRoutineLog.hpp"
+#include "wpi/system/Timer.hpp"
 
 namespace frc2::sysid {
 
diff --git a/commandsv2/src/test/native/cpp/main.cpp b/commandsv2/src/test/native/cpp/main.cpp
index 9b73af360b..52b60dc4ef 100644
--- a/commandsv2/src/test/native/cpp/main.cpp
+++ b/commandsv2/src/test/native/cpp/main.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
+
 #include "wpi/hal/HALBase.h"
 
 int main(int argc, char** argv) {
diff --git a/commandsv2/src/test/native/cpp/wpi/command/AddRequirementsTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/AddRequirementsTest.cpp
index 4d86cb8c4d..a4f5d4b7cd 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/AddRequirementsTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/AddRequirementsTest.cpp
@@ -2,11 +2,10 @@
 // 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 "wpi/util/array.hpp"
-
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/Command.hpp"
 #include "wpi/commands2/RunCommand.hpp"
+#include "wpi/util/array.hpp"
 
 using namespace frc2;
 
diff --git a/commandsv2/src/test/native/cpp/wpi/command/CommandDecoratorTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandDecoratorTest.cpp
index 6e036a9f97..539886c9eb 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/CommandDecoratorTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/CommandDecoratorTest.cpp
@@ -5,14 +5,13 @@
 #include <string>
 #include <utility>
 
-#include "wpi/simulation/SimHooks.hpp"
-
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/Commands.hpp"
 #include "wpi/commands2/FunctionalCommand.hpp"
 #include "wpi/commands2/InstantCommand.hpp"
 #include "wpi/commands2/RunCommand.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
+#include "wpi/simulation/SimHooks.hpp"
 
 using namespace frc2;
 class CommandDecoratorTest : public CommandTestBase {};
diff --git a/commandsv2/src/test/native/cpp/wpi/command/CommandPtrTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandPtrTest.cpp
index 2cc835b337..48a1c2bbcb 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/CommandPtrTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/CommandPtrTest.cpp
@@ -4,12 +4,11 @@
 
 #include <utility>
 
-#include "wpi/system/Errors.hpp"
-
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/CommandPtr.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
 #include "wpi/commands2/Commands.hpp"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc2;
 class CommandPtrTest : public CommandTestBase {};
diff --git a/commandsv2/src/test/native/cpp/wpi/command/CommandRequirementsTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandRequirementsTest.cpp
index 7ba88b264d..ff8cdaf574 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/CommandRequirementsTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/CommandRequirementsTest.cpp
@@ -4,11 +4,10 @@
 
 #include <utility>
 
-#include "wpi/system/Errors.hpp"
-
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
 #include "wpi/commands2/FunctionalCommand.hpp"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc2;
 class CommandRequirementsTest : public CommandTestBase {};
diff --git a/commandsv2/src/test/native/cpp/wpi/command/CommandScheduleTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandScheduleTest.cpp
index d654211b62..fe01fa793e 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/CommandScheduleTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/CommandScheduleTest.cpp
@@ -2,13 +2,12 @@
 // 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 "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/nt/NetworkTableInstance.hpp"
-
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/FunctionalCommand.hpp"
 #include "wpi/commands2/InstantCommand.hpp"
 #include "wpi/commands2/RunCommand.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/smartdashboard/SmartDashboard.hpp"
 
 using namespace frc2;
 class CommandScheduleTest : public CommandTestBase {};
diff --git a/commandsv2/src/test/native/cpp/wpi/command/CommandSendableButtonTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/CommandSendableButtonTest.cpp
index c7d69361a9..f072cfe99a 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/CommandSendableButtonTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/CommandSendableButtonTest.cpp
@@ -2,13 +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 "CommandTestBase.hpp"
 #include "wpi/commands2/Commands.hpp"
-
-#include "wpi/smartdashboard/SmartDashboard.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
-
-#include "CommandTestBase.hpp"
+#include "wpi/smartdashboard/SmartDashboard.hpp"
 
 using namespace frc2;
 
diff --git a/commandsv2/src/test/native/cpp/wpi/command/CommandTestBase.hpp b/commandsv2/src/test/native/cpp/wpi/command/CommandTestBase.hpp
index 520b5403a2..8a298e351b 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/CommandTestBase.hpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/CommandTestBase.hpp
@@ -7,14 +7,14 @@
 #include <functional>
 #include <utility>
 
-#include "wpi/simulation/DriverStationSim.hpp"
 #include <gtest/gtest.h>
 
+#include "gmock/gmock.h"
 #include "wpi/commands2/CommandHelper.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
 #include "wpi/commands2/Requirements.hpp"
 #include "wpi/commands2/SubsystemBase.hpp"
-#include "gmock/gmock.h"
+#include "wpi/simulation/DriverStationSim.hpp"
 
 namespace frc2 {
 
diff --git a/commandsv2/src/test/native/cpp/wpi/command/CompositionTestBase.hpp b/commandsv2/src/test/native/cpp/wpi/command/CompositionTestBase.hpp
index 087215b154..019298e21c 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/CompositionTestBase.hpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/CompositionTestBase.hpp
@@ -10,8 +10,8 @@
 #include <gtest/gtest.h>
 
 #include "CommandTestBase.hpp"
-#include "wpi/commands2/Commands.hpp"
 #include "make_vector.hpp"
+#include "wpi/commands2/Commands.hpp"
 
 namespace frc2 {
 
diff --git a/commandsv2/src/test/native/cpp/wpi/command/NotifierCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/NotifierCommandTest.cpp
index 34c159600d..0aaae24157 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/NotifierCommandTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/NotifierCommandTest.cpp
@@ -2,10 +2,9 @@
 // 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 "wpi/simulation/SimHooks.hpp"
-
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/NotifierCommand.hpp"
+#include "wpi/simulation/SimHooks.hpp"
 
 using namespace frc2;
 using namespace std::chrono_literals;
diff --git a/commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp
index a2a048f14b..ac3b0db493 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp
@@ -2,9 +2,6 @@
 // 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 "wpi/driverstation/DriverStation.hpp"
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/simulation/JoystickSim.hpp"
 #include <gtest/gtest.h>
 
 #include "CommandTestBase.hpp"
@@ -12,6 +9,9 @@
 #include "wpi/commands2/RunCommand.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
 #include "wpi/commands2/button/POVButton.hpp"
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/driverstation/Joystick.hpp"
+#include "wpi/simulation/JoystickSim.hpp"
 
 using namespace frc2;
 class POVButtonTest : public CommandTestBase {};
diff --git a/commandsv2/src/test/native/cpp/wpi/command/PrintCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/PrintCommandTest.cpp
index ee8d625db1..a2b02e1549 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/PrintCommandTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/PrintCommandTest.cpp
@@ -2,11 +2,10 @@
 // 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 "wpi/commands2/Commands.hpp"
-
 #include <regex>
 
 #include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
 #include "wpi/commands2/PrintCommand.hpp"
 
 using namespace frc2;
diff --git a/commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp
index bbacca168d..a2192d893e 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp
@@ -2,12 +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 "wpi/commands2/Commands.hpp"
-
 #include <memory>
 
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/commands2/Commands.hpp"
 #include "wpi/commands2/InstantCommand.hpp"
 #include "wpi/commands2/ProxyCommand.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
diff --git a/commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.cpp
index 3174226396..307760bff5 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/commands2/Commands.hpp"
-
 #include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
 #include "wpi/commands2/RunCommand.hpp"
 
 using namespace frc2;
diff --git a/commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.cpp
index ea5f200618..d1fef110f0 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.cpp
@@ -2,11 +2,10 @@
 // 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 "wpi/commands2/Commands.hpp"
-
 #include <utility>
 
 #include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
 #include "wpi/commands2/InstantCommand.hpp"
 #include "wpi/commands2/RunCommand.hpp"
 #include "wpi/commands2/StartEndCommand.hpp"
diff --git a/commandsv2/src/test/native/cpp/wpi/command/SchedulingRecursionTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/SchedulingRecursionTest.cpp
index 357ae00ece..a3d6300685 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/SchedulingRecursionTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/SchedulingRecursionTest.cpp
@@ -2,8 +2,6 @@
 // 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 "wpi/commands2/Commands.hpp"
-
 #include <utility>
 
 #include <gtest/gtest.h>
@@ -11,6 +9,7 @@
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/Command.hpp"
 #include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/commands2/Commands.hpp"
 #include "wpi/commands2/FunctionalCommand.hpp"
 #include "wpi/commands2/RunCommand.hpp"
 
diff --git a/commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.cpp
index fac5e304bf..d2997f0133 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/commands2/Commands.hpp"
-
 #include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
 #include "wpi/commands2/StartEndCommand.hpp"
 
 using namespace frc2;
diff --git a/commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.cpp
index 128789b31f..91848df916 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.cpp
@@ -2,13 +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 "wpi/commands2/Commands.hpp"
-
-#include "wpi/simulation/SimHooks.hpp"
-
 #include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
 #include "wpi/commands2/WaitCommand.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
+#include "wpi/simulation/SimHooks.hpp"
 
 using namespace frc2;
 class WaitCommandTest : public CommandTestBase {};
diff --git a/commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.cpp
index 9be81d30fc..e09e1bb642 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/commands2/Commands.hpp"
-
 #include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
 
 using namespace frc2;
diff --git a/commandsv2/src/test/native/cpp/wpi/command/button/NetworkButtonTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/button/NetworkButtonTest.cpp
index a89ff0e9d4..b780c0b98f 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/button/NetworkButtonTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/button/NetworkButtonTest.cpp
@@ -3,13 +3,13 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/nt/NetworkTableInstance.hpp"
 
 #include "../CommandTestBase.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
 #include "wpi/commands2/RunCommand.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
 #include "wpi/commands2/button/NetworkButton.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
 
 using namespace frc2;
 
diff --git a/commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.cpp
index 0c086dcf31..ad461dfa41 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.cpp
@@ -2,12 +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 "wpi/driverstation/DriverStation.hpp"
-#include "wpi/simulation/DriverStationSim.hpp"
-
 #include "../CommandTestBase.hpp"
 #include "wpi/commands2/button/RobotModeTriggers.hpp"
 #include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/simulation/DriverStationSim.hpp"
 
 using namespace frc2;
 using namespace frc::sim;
diff --git a/commandsv2/src/test/native/cpp/wpi/command/button/TriggerTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/button/TriggerTest.cpp
index 0c04053366..9872a5f9d1 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/button/TriggerTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/button/TriggerTest.cpp
@@ -4,7 +4,6 @@
 
 #include <utility>
 
-#include "wpi/simulation/SimHooks.hpp"
 #include <gtest/gtest.h>
 
 #include "../CommandTestBase.hpp"
@@ -14,6 +13,7 @@
 #include "wpi/commands2/RunCommand.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
 #include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/simulation/SimHooks.hpp"
 
 using namespace frc2;
 class TriggerTest : public CommandTestBase {};
diff --git a/commandsv2/src/test/native/cpp/wpi/command/sysid/SysIdRoutineTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/sysid/SysIdRoutineTest.cpp
index 02238e015d..1efa380e7a 100644
--- a/commandsv2/src/test/native/cpp/wpi/command/sysid/SysIdRoutineTest.cpp
+++ b/commandsv2/src/test/native/cpp/wpi/command/sysid/SysIdRoutineTest.cpp
@@ -2,15 +2,15 @@
 // 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 "wpi/commands2/Subsystem.hpp"
-#include "wpi/commands2/sysid/SysIdRoutine.hpp"
-
 #include <utility>
 #include <vector>
 
-#include "wpi/system/Timer.hpp"
-#include "wpi/simulation/SimHooks.hpp"
 #include <gtest/gtest.h>
+
+#include "wpi/commands2/Subsystem.hpp"
+#include "wpi/commands2/sysid/SysIdRoutine.hpp"
+#include "wpi/simulation/SimHooks.hpp"
+#include "wpi/system/Timer.hpp"
 #include "wpi/units/math.hpp"
 
 #define EXPECT_NEAR_UNITS(val1, val2, eps) \
diff --git a/cscore/examples/enum_usb/enum_usb.cpp b/cscore/examples/enum_usb/enum_usb.cpp
index b148a41fb3..4108630b81 100644
--- a/cscore/examples/enum_usb/enum_usb.cpp
+++ b/cscore/examples/enum_usb/enum_usb.cpp
@@ -4,9 +4,8 @@
 
 #include <cstdio>
 
-#include "wpi/util/print.hpp"
-
 #include "wpi/cs/cscore.h"
+#include "wpi/util/print.hpp"
 
 int main() {
   CS_Status status = 0;
diff --git a/cscore/examples/httpcvstream/httpcvstream.cpp b/cscore/examples/httpcvstream/httpcvstream.cpp
index a2a2ebc2ec..3366e84a14 100644
--- a/cscore/examples/httpcvstream/httpcvstream.cpp
+++ b/cscore/examples/httpcvstream/httpcvstream.cpp
@@ -5,10 +5,10 @@
 #include <cstdio>
 
 #include <opencv2/core/core.hpp>
-#include "wpi/util/print.hpp"
 
 #include "wpi/cs/cscore.h"
 #include "wpi/cs/cscore_cv.hpp"
+#include "wpi/util/print.hpp"
 
 int main() {
   cs::HttpCamera camera{"httpcam", "http://localhost:8081/?action=stream"};
diff --git a/cscore/examples/settings/settings.cpp b/cscore/examples/settings/settings.cpp
index 0f7bebe2ac..3ab28f7621 100644
--- a/cscore/examples/settings/settings.cpp
+++ b/cscore/examples/settings/settings.cpp
@@ -6,11 +6,10 @@
 #include <cstdio>
 #include <thread>
 
+#include "wpi/cs/cscore.h"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/print.hpp"
 
-#include "wpi/cs/cscore.h"
-
 int main(int argc, char** argv) {
   if (argc < 2) {
     std::fputs("Usage: settings camera [prop val] ... -- [prop val]...\n",
diff --git a/cscore/examples/usbcvstream/usbcvstream.cpp b/cscore/examples/usbcvstream/usbcvstream.cpp
index 5c629efc9a..6376ae8729 100644
--- a/cscore/examples/usbcvstream/usbcvstream.cpp
+++ b/cscore/examples/usbcvstream/usbcvstream.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <opencv2/core/core.hpp>
-#include "wpi/util/print.hpp"
 
 #include "wpi/cs/cscore_cv.hpp"
+#include "wpi/util/print.hpp"
 
 int main() {
   cs::UsbCamera camera{"usbcam", 0};
diff --git a/cscore/examples/usbstream/usbstream.cpp b/cscore/examples/usbstream/usbstream.cpp
index 6db307be9d..1ca051a16a 100644
--- a/cscore/examples/usbstream/usbstream.cpp
+++ b/cscore/examples/usbstream/usbstream.cpp
@@ -4,9 +4,8 @@
 
 #include <cstdio>
 
-#include "wpi/util/print.hpp"
-
 #include "wpi/cs/cscore.h"
+#include "wpi/util/print.hpp"
 
 int main() {
   wpi::print("hostname: {}\n", cs::GetHostname());
diff --git a/cscore/examples/usbviewer/usbviewer.cpp b/cscore/examples/usbviewer/usbviewer.cpp
index 6cb6c8954b..afd55eed47 100644
--- a/cscore/examples/usbviewer/usbviewer.cpp
+++ b/cscore/examples/usbviewer/usbviewer.cpp
@@ -13,13 +13,13 @@
 #include <opencv2/core/core.hpp>
 #include <opencv2/core/mat.hpp>
 #include <opencv2/imgproc.hpp>
-#include "wpi/util/mutex.hpp"
-#include "wpi/util/print.hpp"
-#include "wpi/util/spinlock.hpp"
-#include "wpi/gui/wpigui.hpp"
 
 #include "wpi/cs/cscore.h"
 #include "wpi/cs/cscore_cv.hpp"
+#include "wpi/gui/wpigui.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/spinlock.hpp"
 
 namespace gui = wpi::gui;
 
diff --git a/cscore/src/dev/native/cpp/main.cpp b/cscore/src/dev/native/cpp/main.cpp
index fde3a9462b..eb649c043d 100644
--- a/cscore/src/dev/native/cpp/main.cpp
+++ b/cscore/src/dev/native/cpp/main.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/util/print.hpp"
-
 #include "wpi/cs/cscore.h"
+#include "wpi/util/print.hpp"
 
 int main() {
   wpi::print("{}\n", cs::GetHostname());
diff --git a/cscore/src/main/native/cpp/ConfigurableSourceImpl.cpp b/cscore/src/main/native/cpp/ConfigurableSourceImpl.cpp
index 2a8b0fc8a5..6b4fd27a0e 100644
--- a/cscore/src/main/native/cpp/ConfigurableSourceImpl.cpp
+++ b/cscore/src/main/native/cpp/ConfigurableSourceImpl.cpp
@@ -7,11 +7,10 @@
 #include <memory>
 #include <string>
 
-#include "wpi/util/timestamp.h"
-
 #include "Handle.hpp"
 #include "Instance.hpp"
 #include "Notifier.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/cpp/ConfigurableSourceImpl.hpp b/cscore/src/main/native/cpp/ConfigurableSourceImpl.hpp
index ff541f2810..65f94c4da4 100644
--- a/cscore/src/main/native/cpp/ConfigurableSourceImpl.hpp
+++ b/cscore/src/main/native/cpp/ConfigurableSourceImpl.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_CONFIGURABLESOURCEIMPL_H_
-#define CSCORE_CONFIGURABLESOURCEIMPL_H_
+#ifndef CSCORE_CONFIGURABLESOURCEIMPL_HPP_
+#define CSCORE_CONFIGURABLESOURCEIMPL_HPP_
 
 #include <atomic>
 #include <functional>
@@ -50,4 +50,4 @@ class ConfigurableSourceImpl : public SourceImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_CONFIGURABLESOURCEIMPL_H_
+#endif  // CSCORE_CONFIGURABLESOURCEIMPL_HPP_
diff --git a/cscore/src/main/native/cpp/Frame.hpp b/cscore/src/main/native/cpp/Frame.hpp
index 703d4f4aea..ebb7e73ba7 100644
--- a/cscore/src/main/native/cpp/Frame.hpp
+++ b/cscore/src/main/native/cpp/Frame.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_FRAME_H_
-#define CSCORE_FRAME_H_
+#ifndef CSCORE_FRAME_HPP_
+#define CSCORE_FRAME_HPP_
 
 #include <atomic>
 #include <memory>
@@ -12,11 +12,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/mutex.hpp"
-
 #include "Image.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace cs {
 
@@ -253,4 +252,4 @@ class Frame {
 
 }  // namespace cs
 
-#endif  // CSCORE_FRAME_H_
+#endif  // CSCORE_FRAME_HPP_
diff --git a/cscore/src/main/native/cpp/Handle.hpp b/cscore/src/main/native/cpp/Handle.hpp
index eec186c58a..ce8133985c 100644
--- a/cscore/src/main/native/cpp/Handle.hpp
+++ b/cscore/src/main/native/cpp/Handle.hpp
@@ -2,12 +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.
 
-#ifndef CSCORE_HANDLE_H_
-#define CSCORE_HANDLE_H_
-
-#include "wpi/util/Synchronization.h"
+#ifndef CSCORE_HANDLE_HPP_
+#define CSCORE_HANDLE_HPP_
 
 #include "wpi/cs/cscore_c.h"
+#include "wpi/util/Synchronization.h"
 
 namespace cs {
 
@@ -66,4 +65,4 @@ class Handle {
 
 }  // namespace cs
 
-#endif  // CSCORE_HANDLE_H_
+#endif  // CSCORE_HANDLE_HPP_
diff --git a/cscore/src/main/native/cpp/HttpCameraImpl.cpp b/cscore/src/main/native/cpp/HttpCameraImpl.cpp
index e65e350cf0..7d1a3a852c 100644
--- a/cscore/src/main/native/cpp/HttpCameraImpl.cpp
+++ b/cscore/src/main/native/cpp/HttpCameraImpl.cpp
@@ -10,10 +10,7 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/MemAlloc.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/timestamp.h"
-#include "wpi/net/TCPConnector.h"
+#include <wpi/net/TCPConnector.h>
 
 #include "Instance.hpp"
 #include "JpegUtil.hpp"
@@ -21,6 +18,9 @@
 #include "Notifier.hpp"
 #include "Telemetry.hpp"
 #include "c_util.hpp"
+#include "wpi/util/MemAlloc.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/cpp/HttpCameraImpl.hpp b/cscore/src/main/native/cpp/HttpCameraImpl.hpp
index b050cd9b22..a7ce5780c9 100644
--- a/cscore/src/main/native/cpp/HttpCameraImpl.hpp
+++ b/cscore/src/main/native/cpp/HttpCameraImpl.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_HTTPCAMERAIMPL_H_
-#define CSCORE_HTTPCAMERAIMPL_H_
+#ifndef CSCORE_HTTPCAMERAIMPL_HPP_
+#define CSCORE_HTTPCAMERAIMPL_HPP_
 
 #include <atomic>
 #include <functional>
@@ -15,13 +15,13 @@
 #include <thread>
 #include <vector>
 
-#include "wpi/util/StringMap.hpp"
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/raw_istream.hpp"
-#include "wpi/net/HttpUtil.hpp"
+#include <wpi/net/HttpUtil.hpp>
 
 #include "SourceImpl.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/raw_istream.hpp"
 
 namespace cs {
 
@@ -160,4 +160,4 @@ class AxisCameraImpl : public HttpCameraImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_HTTPCAMERAIMPL_H_
+#endif  // CSCORE_HTTPCAMERAIMPL_HPP_
diff --git a/cscore/src/main/native/cpp/Image.hpp b/cscore/src/main/native/cpp/Image.hpp
index 84476dbce6..993f7d44d3 100644
--- a/cscore/src/main/native/cpp/Image.hpp
+++ b/cscore/src/main/native/cpp/Image.hpp
@@ -2,16 +2,16 @@
 // 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.
 
-#ifndef CSCORE_IMAGE_H_
-#define CSCORE_IMAGE_H_
+#ifndef CSCORE_IMAGE_HPP_
+#define CSCORE_IMAGE_HPP_
 
 #include <string_view>
 #include <vector>
 
 #include <opencv2/core/core.hpp>
 
-#include "wpi/cs/cscore_cpp.hpp"
 #include "default_init_allocator.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 
 namespace cs {
 
@@ -131,4 +131,4 @@ class Image {
 
 }  // namespace cs
 
-#endif  // CSCORE_IMAGE_H_
+#endif  // CSCORE_IMAGE_HPP_
diff --git a/cscore/src/main/native/cpp/Instance.cpp b/cscore/src/main/native/cpp/Instance.cpp
index eabacd0de7..22b0496df5 100644
--- a/cscore/src/main/native/cpp/Instance.cpp
+++ b/cscore/src/main/native/cpp/Instance.cpp
@@ -9,6 +9,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/fs.hpp"
 #include "wpi/util/print.hpp"
 
diff --git a/cscore/src/main/native/cpp/Instance.hpp b/cscore/src/main/native/cpp/Instance.hpp
index 54cefbe4e8..679c9c9db4 100644
--- a/cscore/src/main/native/cpp/Instance.hpp
+++ b/cscore/src/main/native/cpp/Instance.hpp
@@ -2,14 +2,13 @@
 // 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.
 
-#ifndef CSCORE_INSTANCE_H_
-#define CSCORE_INSTANCE_H_
+#ifndef CSCORE_INSTANCE_HPP_
+#define CSCORE_INSTANCE_HPP_
 
 #include <memory>
 #include <utility>
 
-#include "wpi/util/Logger.hpp"
-#include "wpi/net/EventLoopRunner.hpp"
+#include <wpi/net/EventLoopRunner.hpp>
 
 #include "Log.hpp"
 #include "NetworkListener.hpp"
@@ -19,6 +18,7 @@
 #include "Telemetry.hpp"
 #include "UnlimitedHandleResource.hpp"
 #include "UsbCameraListener.hpp"
+#include "wpi/util/Logger.hpp"
 
 namespace cs {
 
@@ -112,4 +112,4 @@ class Instance {
 
 }  // namespace cs
 
-#endif  // CSCORE_INSTANCE_H_
+#endif  // CSCORE_INSTANCE_HPP_
diff --git a/cscore/src/main/native/cpp/JpegUtil.hpp b/cscore/src/main/native/cpp/JpegUtil.hpp
index 4fe0693f59..d43c3dcaf9 100644
--- a/cscore/src/main/native/cpp/JpegUtil.hpp
+++ b/cscore/src/main/native/cpp/JpegUtil.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_JPEGUTIL_H_
-#define CSCORE_JPEGUTIL_H_
+#ifndef CSCORE_JPEGUTIL_HPP_
+#define CSCORE_JPEGUTIL_HPP_
 
 #include <string>
 #include <string_view>
@@ -26,4 +26,4 @@ bool ReadJpeg(wpi::raw_istream& is, std::string& buf, int* width, int* height);
 
 }  // namespace cs
 
-#endif  // CSCORE_JPEGUTIL_H_
+#endif  // CSCORE_JPEGUTIL_HPP_
diff --git a/cscore/src/main/native/cpp/Log.hpp b/cscore/src/main/native/cpp/Log.hpp
index 47c26bd1b1..d5f2371853 100644
--- a/cscore/src/main/native/cpp/Log.hpp
+++ b/cscore/src/main/native/cpp/Log.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_LOG_H_
-#define CSCORE_LOG_H_
+#ifndef CSCORE_LOG_HPP_
+#define CSCORE_LOG_HPP_
 
 #include <string_view>
 
@@ -88,4 +88,4 @@ inline void NamedLog(wpi::Logger& logger, unsigned int level, const char* file,
   SLOG(::wpi::WPI_LOG_DEBUG4, format __VA_OPT__(, ) __VA_ARGS__)
 #endif
 
-#endif  // CSCORE_LOG_H_
+#endif  // CSCORE_LOG_HPP_
diff --git a/cscore/src/main/native/cpp/MjpegServerImpl.cpp b/cscore/src/main/native/cpp/MjpegServerImpl.cpp
index 83b0e1688b..990dbc5d8a 100644
--- a/cscore/src/main/native/cpp/MjpegServerImpl.cpp
+++ b/cscore/src/main/native/cpp/MjpegServerImpl.cpp
@@ -9,14 +9,10 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/fmt/raw_ostream.hpp"
-#include "wpi/util/print.hpp"
-#include "wpi/net/HttpUtil.hpp"
-#include "wpi/net/TCPAcceptor.h"
-#include "wpi/net/raw_socket_istream.hpp"
-#include "wpi/net/raw_socket_ostream.hpp"
+#include <wpi/net/HttpUtil.hpp>
+#include <wpi/net/TCPAcceptor.h>
+#include <wpi/net/raw_socket_istream.hpp>
+#include <wpi/net/raw_socket_ostream.hpp>
 
 #include "Instance.hpp"
 #include "JpegUtil.hpp"
@@ -25,6 +21,10 @@
 #include "SourceImpl.hpp"
 #include "c_util.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fmt/raw_ostream.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/cpp/MjpegServerImpl.hpp b/cscore/src/main/native/cpp/MjpegServerImpl.hpp
index 834f5d9fa3..1f216ab008 100644
--- a/cscore/src/main/native/cpp/MjpegServerImpl.hpp
+++ b/cscore/src/main/native/cpp/MjpegServerImpl.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_MJPEGSERVERIMPL_H_
-#define CSCORE_MJPEGSERVERIMPL_H_
+#ifndef CSCORE_MJPEGSERVERIMPL_HPP_
+#define CSCORE_MJPEGSERVERIMPL_HPP_
 
 #include <atomic>
 #include <memory>
@@ -12,15 +12,15 @@
 #include <thread>
 #include <vector>
 
+#include <wpi/net/NetworkAcceptor.hpp>
+#include <wpi/net/NetworkStream.hpp>
+#include <wpi/net/raw_socket_ostream.hpp>
+
+#include "SinkImpl.hpp"
 #include "wpi/util/SafeThread.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/raw_istream.hpp"
 #include "wpi/util/raw_ostream.hpp"
-#include "wpi/net/NetworkAcceptor.hpp"
-#include "wpi/net/NetworkStream.hpp"
-#include "wpi/net/raw_socket_ostream.hpp"
-
-#include "SinkImpl.hpp"
 
 namespace cs {
 
@@ -65,4 +65,4 @@ class MjpegServerImpl : public SinkImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_MJPEGSERVERIMPL_H_
+#endif  // CSCORE_MJPEGSERVERIMPL_HPP_
diff --git a/cscore/src/main/native/cpp/NetworkListener.hpp b/cscore/src/main/native/cpp/NetworkListener.hpp
index 4b017cd52c..ec79792792 100644
--- a/cscore/src/main/native/cpp/NetworkListener.hpp
+++ b/cscore/src/main/native/cpp/NetworkListener.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_NETWORKLISTENER_H_
-#define CSCORE_NETWORKLISTENER_H_
+#ifndef CSCORE_NETWORKLISTENER_HPP_
+#define CSCORE_NETWORKLISTENER_HPP_
 
 #include <memory>
 
@@ -28,4 +28,4 @@ class NetworkListener {
 
 }  // namespace cs
 
-#endif  // CSCORE_NETWORKLISTENER_H_
+#endif  // CSCORE_NETWORKLISTENER_HPP_
diff --git a/cscore/src/main/native/cpp/Notifier.hpp b/cscore/src/main/native/cpp/Notifier.hpp
index f36bf9edcf..c5e2975228 100644
--- a/cscore/src/main/native/cpp/Notifier.hpp
+++ b/cscore/src/main/native/cpp/Notifier.hpp
@@ -2,16 +2,15 @@
 // 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.
 
-#ifndef CSCORE_NOTIFIER_H_
-#define CSCORE_NOTIFIER_H_
+#ifndef CSCORE_NOTIFIER_HPP_
+#define CSCORE_NOTIFIER_HPP_
 
 #include <functional>
 #include <utility>
 
-#include "wpi/util/CallbackManager.hpp"
-
 #include "Handle.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/CallbackManager.hpp"
 
 namespace cs {
 
@@ -90,4 +89,4 @@ class Notifier : public wpi::CallbackManager<Notifier, impl::NotifierThread> {
 
 }  // namespace cs
 
-#endif  // CSCORE_NOTIFIER_H_
+#endif  // CSCORE_NOTIFIER_HPP_
diff --git a/cscore/src/main/native/cpp/PropertyContainer.hpp b/cscore/src/main/native/cpp/PropertyContainer.hpp
index ee8586eef3..f830390e76 100644
--- a/cscore/src/main/native/cpp/PropertyContainer.hpp
+++ b/cscore/src/main/native/cpp/PropertyContainer.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_PROPERTYCONTAINER_H_
-#define CSCORE_PROPERTYCONTAINER_H_
+#ifndef CSCORE_PROPERTYCONTAINER_HPP_
+#define CSCORE_PROPERTYCONTAINER_HPP_
 
 #include <atomic>
 #include <cstddef>
@@ -13,13 +13,12 @@
 #include <string_view>
 #include <vector>
 
+#include "PropertyImpl.hpp"
+#include "wpi/cs/cscore_cpp.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/json_fwd.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "PropertyImpl.hpp"
-#include "wpi/cs/cscore_cpp.hpp"
-
 namespace wpi {
 class Logger;
 template <typename T>
@@ -126,4 +125,4 @@ class PropertyContainer {
 
 }  // namespace cs
 
-#endif  // CSCORE_PROPERTYCONTAINER_H_
+#endif  // CSCORE_PROPERTYCONTAINER_HPP_
diff --git a/cscore/src/main/native/cpp/PropertyImpl.hpp b/cscore/src/main/native/cpp/PropertyImpl.hpp
index bdc1fbdd8f..06860ed8f2 100644
--- a/cscore/src/main/native/cpp/PropertyImpl.hpp
+++ b/cscore/src/main/native/cpp/PropertyImpl.hpp
@@ -2,16 +2,15 @@
 // 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.
 
-#ifndef CSCORE_PROPERTYIMPL_H_
-#define CSCORE_PROPERTYIMPL_H_
+#ifndef CSCORE_PROPERTYIMPL_HPP_
+#define CSCORE_PROPERTYIMPL_HPP_
 
 #include <string>
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/cs/cscore_c.h"
+#include "wpi/util/Signal.h"
 
 namespace cs {
 
@@ -51,4 +50,4 @@ class PropertyImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_PROPERTYIMPL_H_
+#endif  // CSCORE_PROPERTYIMPL_HPP_
diff --git a/cscore/src/main/native/cpp/RawSinkImpl.hpp b/cscore/src/main/native/cpp/RawSinkImpl.hpp
index 02aef7512f..c356c11215 100644
--- a/cscore/src/main/native/cpp/RawSinkImpl.hpp
+++ b/cscore/src/main/native/cpp/RawSinkImpl.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_RAWSINKIMPL_H_
-#define CSCORE_RAWSINKIMPL_H_
+#ifndef CSCORE_RAWSINKIMPL_HPP_
+#define CSCORE_RAWSINKIMPL_HPP_
 
 #include <stdint.h>
 
@@ -12,11 +12,10 @@
 #include <string_view>
 #include <thread>
 
-#include "wpi/util/condition_variable.hpp"
-
 #include "Frame.hpp"
 #include "SinkImpl.hpp"
 #include "wpi/cs/cscore_raw.h"
+#include "wpi/util/condition_variable.hpp"
 
 namespace cs {
 class SourceImpl;
@@ -51,4 +50,4 @@ class RawSinkImpl : public SinkImpl {
 };
 }  // namespace cs
 
-#endif  // CSCORE_RAWSINKIMPL_H_
+#endif  // CSCORE_RAWSINKIMPL_HPP_
diff --git a/cscore/src/main/native/cpp/RawSourceImpl.cpp b/cscore/src/main/native/cpp/RawSourceImpl.cpp
index 6e57cc302a..c8b2130468 100644
--- a/cscore/src/main/native/cpp/RawSourceImpl.cpp
+++ b/cscore/src/main/native/cpp/RawSourceImpl.cpp
@@ -6,11 +6,10 @@
 
 #include <memory>
 
-#include "wpi/util/timestamp.h"
-
 #include "Instance.hpp"
 #include "Notifier.hpp"
 #include "wpi/cs/cscore_raw.h"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/cpp/RawSourceImpl.hpp b/cscore/src/main/native/cpp/RawSourceImpl.hpp
index ff7c244719..294080a793 100644
--- a/cscore/src/main/native/cpp/RawSourceImpl.hpp
+++ b/cscore/src/main/native/cpp/RawSourceImpl.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_RAWSOURCEIMPL_H_
-#define CSCORE_RAWSOURCEIMPL_H_
+#ifndef CSCORE_RAWSOURCEIMPL_HPP_
+#define CSCORE_RAWSOURCEIMPL_HPP_
 
 #include <atomic>
 #include <functional>
@@ -33,4 +33,4 @@ class RawSourceImpl : public ConfigurableSourceImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_RAWSOURCEIMPL_H_
+#endif  // CSCORE_RAWSOURCEIMPL_HPP_
diff --git a/cscore/src/main/native/cpp/SinkImpl.cpp b/cscore/src/main/native/cpp/SinkImpl.cpp
index b22188c54d..88869e3089 100644
--- a/cscore/src/main/native/cpp/SinkImpl.cpp
+++ b/cscore/src/main/native/cpp/SinkImpl.cpp
@@ -6,13 +6,12 @@
 
 #include <string>
 
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/json.hpp"
-
 #include "Instance.hpp"
 #include "Notifier.hpp"
 #include "SourceImpl.hpp"
 #include "c_util.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/cpp/SinkImpl.hpp b/cscore/src/main/native/cpp/SinkImpl.hpp
index 12eb447eaa..910ff14567 100644
--- a/cscore/src/main/native/cpp/SinkImpl.hpp
+++ b/cscore/src/main/native/cpp/SinkImpl.hpp
@@ -2,19 +2,18 @@
 // 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.
 
-#ifndef CSCORE_SINKIMPL_H_
-#define CSCORE_SINKIMPL_H_
+#ifndef CSCORE_SINKIMPL_HPP_
+#define CSCORE_SINKIMPL_HPP_
 
 #include <memory>
 #include <string>
 #include <string_view>
 
+#include "SourceImpl.hpp"
 #include "wpi/util/Logger.hpp"
 #include "wpi/util/json_fwd.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "SourceImpl.hpp"
-
 namespace cs {
 
 class Frame;
@@ -75,4 +74,4 @@ class SinkImpl : public PropertyContainer {
 
 }  // namespace cs
 
-#endif  // CSCORE_SINKIMPL_H_
+#endif  // CSCORE_SINKIMPL_HPP_
diff --git a/cscore/src/main/native/cpp/SourceImpl.cpp b/cscore/src/main/native/cpp/SourceImpl.cpp
index 4949d96621..446c3c7bf6 100644
--- a/cscore/src/main/native/cpp/SourceImpl.cpp
+++ b/cscore/src/main/native/cpp/SourceImpl.cpp
@@ -11,13 +11,12 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/json.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "Log.hpp"
 #include "Notifier.hpp"
 #include "Telemetry.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/cpp/SourceImpl.hpp b/cscore/src/main/native/cpp/SourceImpl.hpp
index e05ab31862..abdcd96649 100644
--- a/cscore/src/main/native/cpp/SourceImpl.hpp
+++ b/cscore/src/main/native/cpp/SourceImpl.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_SOURCEIMPL_H_
-#define CSCORE_SOURCEIMPL_H_
+#ifndef CSCORE_SOURCEIMPL_HPP_
+#define CSCORE_SOURCEIMPL_HPP_
 
 #include <atomic>
 #include <cstddef>
@@ -12,17 +12,16 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/RawFrame.h"
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/json_fwd.hpp"
-#include "wpi/util/mutex.hpp"
-
 #include "Frame.hpp"
 #include "Handle.hpp"
 #include "Image.hpp"
 #include "PropertyContainer.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/RawFrame.h"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace cs {
 
@@ -196,4 +195,4 @@ class SourceImpl : public PropertyContainer {
 
 }  // namespace cs
 
-#endif  // CSCORE_SOURCEIMPL_H_
+#endif  // CSCORE_SOURCEIMPL_HPP_
diff --git a/cscore/src/main/native/cpp/Telemetry.cpp b/cscore/src/main/native/cpp/Telemetry.cpp
index 8b124ef88a..0b959b3c39 100644
--- a/cscore/src/main/native/cpp/Telemetry.cpp
+++ b/cscore/src/main/native/cpp/Telemetry.cpp
@@ -7,13 +7,12 @@
 #include <chrono>
 #include <utility>
 
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "Handle.hpp"
 #include "Instance.hpp"
 #include "Notifier.hpp"
 #include "SourceImpl.hpp"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/cpp/Telemetry.hpp b/cscore/src/main/native/cpp/Telemetry.hpp
index dd5ebc842b..a4955b6c0c 100644
--- a/cscore/src/main/native/cpp/Telemetry.hpp
+++ b/cscore/src/main/native/cpp/Telemetry.hpp
@@ -2,12 +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.
 
-#ifndef CSCORE_TELEMETRY_H_
-#define CSCORE_TELEMETRY_H_
-
-#include "wpi/util/SafeThread.hpp"
+#ifndef CSCORE_TELEMETRY_HPP_
+#define CSCORE_TELEMETRY_HPP_
 
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/SafeThread.hpp"
 
 namespace cs {
 
@@ -44,4 +43,4 @@ class Telemetry {
 
 }  // namespace cs
 
-#endif  // CSCORE_TELEMETRY_H_
+#endif  // CSCORE_TELEMETRY_HPP_
diff --git a/cscore/src/main/native/cpp/UnlimitedHandleResource.hpp b/cscore/src/main/native/cpp/UnlimitedHandleResource.hpp
index 57691d0035..5d56167ef8 100644
--- a/cscore/src/main/native/cpp/UnlimitedHandleResource.hpp
+++ b/cscore/src/main/native/cpp/UnlimitedHandleResource.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_UNLIMITEDHANDLERESOURCE_H_
-#define CSCORE_UNLIMITEDHANDLERESOURCE_H_
+#ifndef CSCORE_UNLIMITEDHANDLERESOURCE_HPP_
+#define CSCORE_UNLIMITEDHANDLERESOURCE_HPP_
 
 #include <memory>
 #include <span>
@@ -191,4 +191,4 @@ UnlimitedHandleResource<THandle, TStruct, typeValue, TMutex>::FindIf(F func) {
 
 }  // namespace cs
 
-#endif  // CSCORE_UNLIMITEDHANDLERESOURCE_H_
+#endif  // CSCORE_UNLIMITEDHANDLERESOURCE_HPP_
diff --git a/cscore/src/main/native/cpp/UsbCameraImplCommon.cpp b/cscore/src/main/native/cpp/UsbCameraImplCommon.cpp
index 777b74b038..527960e17a 100644
--- a/cscore/src/main/native/cpp/UsbCameraImplCommon.cpp
+++ b/cscore/src/main/native/cpp/UsbCameraImplCommon.cpp
@@ -4,10 +4,9 @@
 
 #include "wpi/cs/cscore_c.h"  // NOLINT(build/include_order)
 
-#include "wpi/util/MemAlloc.hpp"
-
 #include "c_util.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/MemAlloc.hpp"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/cpp/UsbCameraListener.hpp b/cscore/src/main/native/cpp/UsbCameraListener.hpp
index f6b7b9adc6..467855c3e6 100644
--- a/cscore/src/main/native/cpp/UsbCameraListener.hpp
+++ b/cscore/src/main/native/cpp/UsbCameraListener.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_USBCAMERALISTENER_H_
-#define CSCORE_USBCAMERALISTENER_H_
+#ifndef CSCORE_USBCAMERALISTENER_HPP_
+#define CSCORE_USBCAMERALISTENER_HPP_
 
 #include <memory>
 
@@ -28,4 +28,4 @@ class UsbCameraListener {
 
 }  // namespace cs
 
-#endif  // CSCORE_USBCAMERALISTENER_H_
+#endif  // CSCORE_USBCAMERALISTENER_HPP_
diff --git a/cscore/src/main/native/cpp/c_util.hpp b/cscore/src/main/native/cpp/c_util.hpp
index 7581e0f275..7c328b5194 100644
--- a/cscore/src/main/native/cpp/c_util.hpp
+++ b/cscore/src/main/native/cpp/c_util.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_C_UTIL_H_
-#define CSCORE_C_UTIL_H_
+#ifndef CSCORE_C_UTIL_HPP_
+#define CSCORE_C_UTIL_HPP_
 
 #include <cstring>
 #include <string_view>
@@ -19,4 +19,4 @@ inline void ConvertToC(struct WPI_String* output, std::string_view str) {
 
 }  // namespace cs
 
-#endif  // CSCORE_C_UTIL_H_
+#endif  // CSCORE_C_UTIL_HPP_
diff --git a/cscore/src/main/native/cpp/cscore_c.cpp b/cscore/src/main/native/cpp/cscore_c.cpp
index 5948f57370..941bf78895 100644
--- a/cscore/src/main/native/cpp/cscore_c.cpp
+++ b/cscore/src/main/native/cpp/cscore_c.cpp
@@ -10,11 +10,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/MemAlloc.hpp"
-#include "wpi/util/SmallString.hpp"
-
 #include "c_util.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/MemAlloc.hpp"
+#include "wpi/util/SmallString.hpp"
 
 static CS_Event ConvertToC(const cs::RawEvent& rawEvent) {
   CS_Event event;
diff --git a/cscore/src/main/native/cpp/cscore_cpp.cpp b/cscore/src/main/native/cpp/cscore_cpp.cpp
index f72c1b27b7..8aa92a3f3f 100644
--- a/cscore/src/main/native/cpp/cscore_cpp.cpp
+++ b/cscore/src/main/native/cpp/cscore_cpp.cpp
@@ -8,9 +8,7 @@
 #include <string>
 #include <vector>
 
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/json.hpp"
-#include "wpi/net/hostname.hpp"
+#include <wpi/net/hostname.hpp>
 
 #include "Handle.hpp"
 #include "Instance.hpp"
@@ -20,6 +18,8 @@
 #include "SinkImpl.hpp"
 #include "SourceImpl.hpp"
 #include "Telemetry.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/cpp/cscore_oo.cpp b/cscore/src/main/native/cpp/cscore_oo.cpp
index 1de708c29b..091997509b 100644
--- a/cscore/src/main/native/cpp/cscore_oo.cpp
+++ b/cscore/src/main/native/cpp/cscore_oo.cpp
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include <fmt/format.h>
+
 #include "wpi/util/json.hpp"
 
 using namespace cs;
diff --git a/cscore/src/main/native/cpp/default_init_allocator.hpp b/cscore/src/main/native/cpp/default_init_allocator.hpp
index 089cac7b59..d7706974bc 100644
--- a/cscore/src/main/native/cpp/default_init_allocator.hpp
+++ b/cscore/src/main/native/cpp/default_init_allocator.hpp
@@ -2,8 +2,8 @@
 // http://stackoverflow.com/questions/21028299/is-this-behavior-of-vectorresizesize-type-n-under-c11-and-boost-container
 // Credits: Casey and Howard Hinnant
 
-#ifndef CSCORE_DEFAULT_INIT_ALLOCATOR_H_
-#define CSCORE_DEFAULT_INIT_ALLOCATOR_H_
+#ifndef CSCORE_DEFAULT_INIT_ALLOCATOR_HPP_
+#define CSCORE_DEFAULT_INIT_ALLOCATOR_HPP_
 
 #include <memory>
 #include <utility>
@@ -38,4 +38,4 @@ class default_init_allocator : public A {
 
 }  // namespace cs
 
-#endif  // CSCORE_DEFAULT_INIT_ALLOCATOR_H_
+#endif  // CSCORE_DEFAULT_INIT_ALLOCATOR_HPP_
diff --git a/cscore/src/main/native/include/wpi/cs/cscore.h b/cscore/src/main/native/include/wpi/cs/cscore.h
index 223b041617..44fffae4a4 100644
--- a/cscore/src/main/native/include/wpi/cs/cscore.h
+++ b/cscore/src/main/native/include/wpi/cs/cscore.h
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_CSCORE_H_
-#define CSCORE_CSCORE_H_
+#ifndef CSCORE_WPI_CS_CSCORE_H_
+#define CSCORE_WPI_CS_CSCORE_H_
 
 /* C API */
 #include "wpi/cs/cscore_c.h"
@@ -14,4 +14,4 @@
 #include "wpi/cs/cscore_oo.hpp"
 #endif /* __cplusplus */
 
-#endif  // CSCORE_CSCORE_H_
+#endif  // CSCORE_WPI_CS_CSCORE_H_
diff --git a/cscore/src/main/native/include/wpi/cs/cscore_c.h b/cscore/src/main/native/include/wpi/cs/cscore_c.h
index 9ea6f21294..9b333515da 100644
--- a/cscore/src/main/native/include/wpi/cs/cscore_c.h
+++ b/cscore/src/main/native/include/wpi/cs/cscore_c.h
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_CSCORE_C_H_
-#define CSCORE_CSCORE_C_H_
+#ifndef CSCORE_WPI_CS_CSCORE_C_H_
+#define CSCORE_WPI_CS_CSCORE_C_H_
 
 #include <stdint.h>
 
@@ -528,4 +528,4 @@ struct WPI_String* CS_GetNetworkInterfaces(int* count);
 }  // extern "C"
 #endif
 
-#endif  // CSCORE_CSCORE_C_H_
+#endif  // CSCORE_WPI_CS_CSCORE_C_H_
diff --git a/cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp b/cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp
index 8c2a0f9a8b..63bfe23d18 100644
--- a/cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp
+++ b/cscore/src/main/native/include/wpi/cs/cscore_cpp.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_CSCORE_CPP_H_
-#define CSCORE_CSCORE_CPP_H_
+#ifndef CSCORE_WPI_CS_CSCORE_CPP_HPP_
+#define CSCORE_WPI_CS_CSCORE_CPP_HPP_
 
 #include <stdint.h>
 
@@ -13,12 +13,11 @@
 #include <string_view>
 #include <vector>
 
+#include "wpi/cs/cscore_c.h"
 #include "wpi/util/RawFrame.h"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/json_fwd.hpp"
 
-#include "wpi/cs/cscore_c.h"
-
 #ifdef _WIN32
 // Disable uninitialized variable warnings
 #pragma warning(push)
@@ -455,4 +454,4 @@ std::vector<std::string> GetNetworkInterfaces();
 #pragma warning(pop)
 #endif
 
-#endif  // CSCORE_CSCORE_CPP_H_
+#endif  // CSCORE_WPI_CS_CSCORE_CPP_HPP_
diff --git a/cscore/src/main/native/include/wpi/cs/cscore_cv.hpp b/cscore/src/main/native/include/wpi/cs/cscore_cv.hpp
index 90f61ee0a2..1894c2537d 100644
--- a/cscore/src/main/native/include/wpi/cs/cscore_cv.hpp
+++ b/cscore/src/main/native/include/wpi/cs/cscore_cv.hpp
@@ -2,16 +2,16 @@
 // 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.
 
-#ifndef CSCORE_CSCORE_CV_H_
-#define CSCORE_CSCORE_CV_H_
+#ifndef CSCORE_WPI_CS_CSCORE_CV_HPP_
+#define CSCORE_WPI_CS_CSCORE_CV_HPP_
 
 #include <functional>
 
 #include <opencv2/core/mat.hpp>
-#include "wpi/util/RawFrame.h"
 
 #include "wpi/cs/cscore_oo.hpp"
 #include "wpi/cs/cscore_raw.h"
+#include "wpi/util/RawFrame.h"
 
 namespace cs {
 /**
@@ -433,4 +433,4 @@ inline WPI_TimestampSource CvSink::LastFrameTimeSource() {
 
 }  // namespace cs
 
-#endif  // CSCORE_CSCORE_CV_H_
+#endif  // CSCORE_WPI_CS_CSCORE_CV_HPP_
diff --git a/cscore/src/main/native/include/wpi/cs/cscore_oo.hpp b/cscore/src/main/native/include/wpi/cs/cscore_oo.hpp
index 4375f01c13..c3c66ee3d5 100644
--- a/cscore/src/main/native/include/wpi/cs/cscore_oo.hpp
+++ b/cscore/src/main/native/include/wpi/cs/cscore_oo.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_CSCORE_OO_H_
-#define CSCORE_CSCORE_OO_H_
+#ifndef CSCORE_WPI_CS_CSCORE_OO_HPP_
+#define CSCORE_WPI_CS_CSCORE_OO_HPP_
 
 #include <functional>
 #include <initializer_list>
@@ -13,9 +13,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/deprecated.hpp"
-
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/deprecated.hpp"
 
 namespace cs {
 
@@ -1580,4 +1579,4 @@ class VideoListener {
 
 }  // namespace cs
 
-#endif  // CSCORE_CSCORE_OO_H_
+#endif  // CSCORE_WPI_CS_CSCORE_OO_HPP_
diff --git a/cscore/src/main/native/include/wpi/cs/cscore_raw.h b/cscore/src/main/native/include/wpi/cs/cscore_raw.h
index 693f70ba4c..11f80c2508 100644
--- a/cscore/src/main/native/include/wpi/cs/cscore_raw.h
+++ b/cscore/src/main/native/include/wpi/cs/cscore_raw.h
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_CSCORE_RAW_H_
-#define CSCORE_CSCORE_RAW_H_
+#ifndef CSCORE_WPI_CS_CSCORE_RAW_H_
+#define CSCORE_WPI_CS_CSCORE_RAW_H_
 
 #include <functional>
 
@@ -239,4 +239,4 @@ inline uint64_t RawSink::GrabFrameLastTime(wpi::RawFrame& image,
 
 #endif
 
-#endif  // CSCORE_CSCORE_RAW_H_
+#endif  // CSCORE_WPI_CS_CSCORE_RAW_H_
diff --git a/cscore/src/main/native/linux/NetworkListener.cpp b/cscore/src/main/native/linux/NetworkListener.cpp
index b6816314a3..382d97ca1d 100644
--- a/cscore/src/main/native/linux/NetworkListener.cpp
+++ b/cscore/src/main/native/linux/NetworkListener.cpp
@@ -16,10 +16,9 @@
 #include <algorithm>
 #include <cerrno>
 
-#include "wpi/util/SafeThread.hpp"
-
 #include "Log.hpp"
 #include "Notifier.hpp"
+#include "wpi/util/SafeThread.hpp"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/linux/RunLoopHelpers.cpp b/cscore/src/main/native/linux/RunLoopHelpers.cpp
index 4d850dacab..4c0c9d6b2e 100644
--- a/cscore/src/main/native/linux/RunLoopHelpers.cpp
+++ b/cscore/src/main/native/linux/RunLoopHelpers.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/util/Synchronization.h"
-
 #include "wpi/cs/cscore_runloop.hpp"
+#include "wpi/util/Synchronization.h"
 
 static wpi::Event& GetInstance() {
   static wpi::Event event;
diff --git a/cscore/src/main/native/linux/UsbCameraBuffer.hpp b/cscore/src/main/native/linux/UsbCameraBuffer.hpp
index 91fd588ada..4fd13d1d90 100644
--- a/cscore/src/main/native/linux/UsbCameraBuffer.hpp
+++ b/cscore/src/main/native/linux/UsbCameraBuffer.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_USBCAMERABUFFER_H_
-#define CSCORE_USBCAMERABUFFER_H_
+#ifndef CSCORE_USBCAMERABUFFER_HPP_
+#define CSCORE_USBCAMERABUFFER_HPP_
 
 #include <sys/mman.h>
 
@@ -52,4 +52,4 @@ class UsbCameraBuffer {
 
 }  // namespace cs
 
-#endif  // CSCORE_USBCAMERABUFFER_H_
+#endif  // CSCORE_USBCAMERABUFFER_HPP_
diff --git a/cscore/src/main/native/linux/UsbCameraImpl.cpp b/cscore/src/main/native/linux/UsbCameraImpl.cpp
index 6b1ce0cd8b..4378842819 100644
--- a/cscore/src/main/native/linux/UsbCameraImpl.cpp
+++ b/cscore/src/main/native/linux/UsbCameraImpl.cpp
@@ -26,12 +26,6 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/MemAlloc.hpp"
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/fs.hpp"
-#include "wpi/util/raw_ostream.hpp"
-#include "wpi/util/timestamp.h"
 
 #include "Instance.hpp"
 #include "JpegUtil.hpp"
@@ -40,6 +34,12 @@
 #include "Telemetry.hpp"
 #include "UsbUtil.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/MemAlloc.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fs.hpp"
+#include "wpi/util/raw_ostream.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/linux/UsbCameraImpl.hpp b/cscore/src/main/native/linux/UsbCameraImpl.hpp
index 5dffeb3612..27da2b8280 100644
--- a/cscore/src/main/native/linux/UsbCameraImpl.hpp
+++ b/cscore/src/main/native/linux/UsbCameraImpl.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_USBCAMERAIMPL_H_
-#define CSCORE_USBCAMERAIMPL_H_
+#ifndef CSCORE_USBCAMERAIMPL_HPP_
+#define CSCORE_USBCAMERAIMPL_HPP_
 
 #include <linux/videodev2.h>
 
@@ -15,16 +15,15 @@
 #include <utility>
 #include <vector>
 
+#include "SourceImpl.hpp"
+#include "UsbCameraBuffer.hpp"
+#include "UsbCameraProperty.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/condition_variable.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/raw_istream.hpp"
 #include "wpi/util/raw_ostream.hpp"
 
-#include "SourceImpl.hpp"
-#include "UsbCameraBuffer.hpp"
-#include "UsbCameraProperty.hpp"
-
 namespace cs {
 
 class Notifier;
@@ -179,4 +178,4 @@ class UsbCameraImpl : public SourceImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_USBCAMERAIMPL_H_
+#endif  // CSCORE_USBCAMERAIMPL_HPP_
diff --git a/cscore/src/main/native/linux/UsbCameraListener.cpp b/cscore/src/main/native/linux/UsbCameraListener.cpp
index b1110158a0..55dc9836dd 100644
--- a/cscore/src/main/native/linux/UsbCameraListener.cpp
+++ b/cscore/src/main/native/linux/UsbCameraListener.cpp
@@ -6,12 +6,12 @@
 
 #include <memory>
 
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/net/EventLoopRunner.hpp"
-#include "wpi/net/uv/FsEvent.hpp"
-#include "wpi/net/uv/Timer.hpp"
+#include <wpi/net/EventLoopRunner.hpp>
+#include <wpi/net/uv/FsEvent.hpp>
+#include <wpi/net/uv/Timer.hpp>
 
 #include "Notifier.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/linux/UsbCameraProperty.cpp b/cscore/src/main/native/linux/UsbCameraProperty.cpp
index 7c1432b837..bec5dd770d 100644
--- a/cscore/src/main/native/linux/UsbCameraProperty.cpp
+++ b/cscore/src/main/native/linux/UsbCameraProperty.cpp
@@ -9,10 +9,10 @@
 #include <utility>
 
 #include <fmt/format.h>
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/StringExtras.hpp"
 
 #include "UsbUtil.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/linux/UsbCameraProperty.hpp b/cscore/src/main/native/linux/UsbCameraProperty.hpp
index 4f9238576c..712b5a2b2f 100644
--- a/cscore/src/main/native/linux/UsbCameraProperty.hpp
+++ b/cscore/src/main/native/linux/UsbCameraProperty.hpp
@@ -2,17 +2,16 @@
 // 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.
 
-#ifndef CSCORE_USBCAMERAPROPERTY_H_
-#define CSCORE_USBCAMERAPROPERTY_H_
+#ifndef CSCORE_USBCAMERAPROPERTY_HPP_
+#define CSCORE_USBCAMERAPROPERTY_HPP_
 
 #include <linux/videodev2.h>
 
 #include <memory>
 #include <string_view>
 
-#include "wpi/util/mutex.hpp"
-
 #include "PropertyImpl.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace cs {
 
@@ -76,4 +75,4 @@ class UsbCameraProperty : public PropertyImpl {
 
 }  // namespace cs
 
-#endif  // CSCORE_USBCAMERAPROPERTY_H_
+#endif  // CSCORE_USBCAMERAPROPERTY_HPP_
diff --git a/cscore/src/main/native/linux/UsbUtil.cpp b/cscore/src/main/native/linux/UsbUtil.cpp
index b7b421ead0..1c40d8c374 100644
--- a/cscore/src/main/native/linux/UsbUtil.cpp
+++ b/cscore/src/main/native/linux/UsbUtil.cpp
@@ -11,14 +11,14 @@
 #include <string>
 
 #include <fmt/format.h>
+
+#include "Instance.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/fs.hpp"
 #include "wpi/util/raw_istream.hpp"
 #include "wpi/util/raw_ostream.hpp"
 
-#include "Instance.hpp"
-
 namespace cs {
 
 static std::string GetUsbNameFromFile(int vendor, int product) {
diff --git a/cscore/src/main/native/linux/UsbUtil.hpp b/cscore/src/main/native/linux/UsbUtil.hpp
index 9f6f8f5376..9963821e63 100644
--- a/cscore/src/main/native/linux/UsbUtil.hpp
+++ b/cscore/src/main/native/linux/UsbUtil.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_USBUTIL_H_
-#define CSCORE_USBUTIL_H_
+#ifndef CSCORE_USBUTIL_HPP_
+#define CSCORE_USBUTIL_HPP_
 
 #include <string>
 
@@ -21,4 +21,4 @@ int CheckedIoctl(int fd, unsigned long req, void* data,  // NOLINT(runtime/int)
 
 }  // namespace cs
 
-#endif  // CSCORE_USBUTIL_H_
+#endif  // CSCORE_USBUTIL_HPP_
diff --git a/cscore/src/main/native/windows/RunLoopHelpers.cpp b/cscore/src/main/native/windows/RunLoopHelpers.cpp
index 4d850dacab..4c0c9d6b2e 100644
--- a/cscore/src/main/native/windows/RunLoopHelpers.cpp
+++ b/cscore/src/main/native/windows/RunLoopHelpers.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/util/Synchronization.h"
-
 #include "wpi/cs/cscore_runloop.hpp"
+#include "wpi/util/Synchronization.h"
 
 static wpi::Event& GetInstance() {
   static wpi::Event event;
diff --git a/cscore/src/main/native/windows/UsbCameraImpl.cpp b/cscore/src/main/native/windows/UsbCameraImpl.cpp
index 18c545422e..0bee6fb6df 100644
--- a/cscore/src/main/native/windows/UsbCameraImpl.cpp
+++ b/cscore/src/main/native/windows/UsbCameraImpl.cpp
@@ -22,11 +22,6 @@
 #include <Dbt.h>
 #include <Dshow.h>
 #include <Windows.h>
-#include "wpi/util/ConvertUTF.hpp"
-#include "wpi/util/MemAlloc.hpp"
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/timestamp.h"
 
 #include "COMCreators.hpp"
 #include "ComPtr.hpp"
@@ -40,6 +35,11 @@
 #include "WindowsMessagePump.hpp"
 #include "c_util.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
+#include "wpi/util/ConvertUTF.hpp"
+#include "wpi/util/MemAlloc.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/timestamp.h"
 
 #pragma comment(lib, "Mfplat.lib")
 #pragma comment(lib, "Mf.lib")
diff --git a/cscore/src/main/native/windows/UsbCameraImpl.hpp b/cscore/src/main/native/windows/UsbCameraImpl.hpp
index fa502304c6..86ae606211 100644
--- a/cscore/src/main/native/windows/UsbCameraImpl.hpp
+++ b/cscore/src/main/native/windows/UsbCameraImpl.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef CSCORE_USBCAMERAIMPL_H_
-#define CSCORE_USBCAMERAIMPL_H_
+#ifndef CSCORE_USBCAMERAIMPL_HPP_
+#define CSCORE_USBCAMERAIMPL_HPP_
 
 #include <mfapi.h>
 #include <mfidl.h>
@@ -22,17 +22,17 @@
 #include <vector>
 
 #include <Dbt.h>
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/mutex.hpp"
-#include "wpi/util/raw_istream.hpp"
-#include "wpi/util/raw_ostream.hpp"
 
 #include "COMCreators.hpp"
 #include "ComPtr.hpp"
 #include "SourceImpl.hpp"
 #include "UsbCameraProperty.hpp"
 #include "WindowsMessagePump.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/raw_istream.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
 namespace cs {
 
@@ -176,4 +176,4 @@ class UsbCameraImpl : public SourceImpl,
 
 }  // namespace cs
 
-#endif  // CSCORE_USBCAMERAIMPL_H_
+#endif  // CSCORE_USBCAMERAIMPL_HPP_
diff --git a/cscore/src/main/native/windows/UsbCameraProperty.hpp b/cscore/src/main/native/windows/UsbCameraProperty.hpp
index ef39bf85f8..2f0c056839 100644
--- a/cscore/src/main/native/windows/UsbCameraProperty.hpp
+++ b/cscore/src/main/native/windows/UsbCameraProperty.hpp
@@ -12,9 +12,9 @@
 #include <string_view>
 
 #include <Dshow.h>
-#include "wpi/util/mutex.hpp"
 
 #include "PropertyImpl.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace cs {
 
diff --git a/datalog/examples/printlog/printlog.cpp b/datalog/examples/printlog/printlog.cpp
index a819b1a89e..c4e966fdf1 100644
--- a/datalog/examples/printlog/printlog.cpp
+++ b/datalog/examples/printlog/printlog.cpp
@@ -9,12 +9,12 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 #include <fmt/ranges.h>
+
+#include "wpi/datalog/DataLogReader.hpp"
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/MemoryBuffer.hpp"
 #include "wpi/util/print.hpp"
 
-#include "wpi/datalog/DataLogReader.hpp"
-
 int main(int argc, const char** argv) {
   if (argc != 2) {
     wpi::print(stderr, "Usage: printlog <file>\n");
diff --git a/datalog/examples/writelog/writelog.cpp b/datalog/examples/writelog/writelog.cpp
index 7915f6aeaa..154a97dcd1 100644
--- a/datalog/examples/writelog/writelog.cpp
+++ b/datalog/examples/writelog/writelog.cpp
@@ -8,9 +8,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/print.hpp"
-
 #include "wpi/datalog/DataLogBackgroundWriter.hpp"
+#include "wpi/util/print.hpp"
 
 int main(int argc, char** argv) {
   using std::chrono::duration_cast;
diff --git a/datalog/src/main/native/cpp/DataLogReader.cpp b/datalog/src/main/native/cpp/DataLogReader.cpp
index b9edb593fa..c33346a67c 100644
--- a/datalog/src/main/native/cpp/DataLogReader.cpp
+++ b/datalog/src/main/native/cpp/DataLogReader.cpp
@@ -7,9 +7,8 @@
 #include <bit>
 #include <utility>
 
-#include "wpi/util/Endian.hpp"
-
 #include "wpi/datalog/DataLog.hpp"
+#include "wpi/util/Endian.hpp"
 
 using namespace wpi::log;
 
diff --git a/datalog/src/main/native/cpp/FileLogger.cpp b/datalog/src/main/native/cpp/FileLogger.cpp
index aa2c112ad6..67af422dcb 100644
--- a/datalog/src/main/native/cpp/FileLogger.cpp
+++ b/datalog/src/main/native/cpp/FileLogger.cpp
@@ -18,6 +18,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/StringExtras.hpp"
 
 namespace wpi::log {
diff --git a/datalog/src/main/native/cpp/jni/DataLogJNI.cpp b/datalog/src/main/native/cpp/jni/DataLogJNI.cpp
index 095e68bc94..f3f11dbfa2 100644
--- a/datalog/src/main/native/cpp/jni/DataLogJNI.cpp
+++ b/datalog/src/main/native/cpp/jni/DataLogJNI.cpp
@@ -11,13 +11,13 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_datalog_DataLogJNI.h"
 #include "wpi/datalog/DataLog.hpp"
 #include "wpi/datalog/DataLogBackgroundWriter.hpp"
 #include "wpi/datalog/DataLogWriter.hpp"
 #include "wpi/datalog/FileLogger.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 using namespace wpi::log;
diff --git a/datalog/src/main/native/include/wpi/datalog/DataLog.hpp b/datalog/src/main/native/include/wpi/datalog/DataLog.hpp
index efb3a6e6e8..98c30ef356 100644
--- a/datalog/src/main/native/include/wpi/datalog/DataLog.hpp
+++ b/datalog/src/main/native/include/wpi/datalog/DataLog.hpp
@@ -19,6 +19,7 @@
 #include <vector>
 #include <version>
 
+#include "wpi/datalog/DataLog_c.h"
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/StringMap.hpp"
@@ -28,8 +29,6 @@
 #include "wpi/util/struct/Struct.hpp"
 #include "wpi/util/timestamp.h"
 
-#include "wpi/datalog/DataLog_c.h"
-
 namespace wpi {
 class Logger;
 }  // namespace wpi
diff --git a/datalog/src/main/native/include/wpi/datalog/DataLogBackgroundWriter.hpp b/datalog/src/main/native/include/wpi/datalog/DataLogBackgroundWriter.hpp
index 3e9077cbd4..2effef25e6 100644
--- a/datalog/src/main/native/include/wpi/datalog/DataLogBackgroundWriter.hpp
+++ b/datalog/src/main/native/include/wpi/datalog/DataLogBackgroundWriter.hpp
@@ -12,11 +12,10 @@
 #include <string_view>
 #include <thread>
 
+#include "wpi/datalog/DataLog.hpp"
 #include "wpi/util/condition_variable.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "wpi/datalog/DataLog.hpp"
-
 namespace wpi {
 class Logger;
 }  // namespace wpi
diff --git a/datalog/src/main/native/include/wpi/datalog/DataLogReaderThread.hpp b/datalog/src/main/native/include/wpi/datalog/DataLogReaderThread.hpp
index bd1d0c4572..f3ae461b23 100644
--- a/datalog/src/main/native/include/wpi/datalog/DataLogReaderThread.hpp
+++ b/datalog/src/main/native/include/wpi/datalog/DataLogReaderThread.hpp
@@ -15,13 +15,13 @@
 
 #include <upb/mem/arena.h>
 #include <upb/reflection/def.h>
+
+#include "wpi/datalog/DataLogReader.hpp"
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/Signal.h"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/struct/DynamicStruct.hpp"
 
-#include "wpi/datalog/DataLogReader.hpp"
-
 namespace wpi::log {
 
 class DataLogReaderRange {
diff --git a/datalog/src/test/native/cpp/DataLogTest.cpp b/datalog/src/test/native/cpp/DataLogTest.cpp
index 909bccba97..eb92dea619 100644
--- a/datalog/src/test/native/cpp/DataLogTest.cpp
+++ b/datalog/src/test/native/cpp/DataLogTest.cpp
@@ -8,10 +8,10 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/raw_ostream.hpp"
 
 #include "wpi/datalog/DataLogWriter.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
 namespace {
 struct ThingA {
diff --git a/fields/CMakeLists.txt b/fields/CMakeLists.txt
index 0d337ca287..39e170903e 100644
--- a/fields/CMakeLists.txt
+++ b/fields/CMakeLists.txt
@@ -27,11 +27,7 @@ if(WITH_JAVA)
     )
     set_property(TARGET field_images_jar PROPERTY FOLDER "java")
     install_jar(field_images_jar DESTINATION ${java_lib_dest})
-    install_jar_exports(
-        TARGETS field_images_jar
-        FILE fields_jar.cmake
-        DESTINATION share/fields
-    )
+    install_jar_exports(TARGETS field_images_jar FILE fields_jar.cmake DESTINATION share/fields)
 endif()
 
 generate_resources(
diff --git a/glass/src/app/native/cpp/main.cpp b/glass/src/app/native/cpp/main.cpp
index 981060bc7d..03a439b3bb 100644
--- a/glass/src/app/native/cpp/main.cpp
+++ b/glass/src/app/native/cpp/main.cpp
@@ -8,10 +8,6 @@
 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
 #include <imgui.h>
-#include "wpi/nt/ntcore_cpp.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/gui/wpigui.hpp"
-#include "wpi/gui/wpigui_openurl.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/MainMenuBar.hpp"
@@ -22,6 +18,10 @@
 #include "wpi/glass/networktables/NetworkTablesSettings.hpp"
 #include "wpi/glass/other/Log.hpp"
 #include "wpi/glass/other/Plot.hpp"
+#include "wpi/gui/wpigui.hpp"
+#include "wpi/gui/wpigui_openurl.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 namespace gui = wpi::gui;
 
diff --git a/glass/src/lib/native/cpp/Context.cpp b/glass/src/lib/native/cpp/Context.cpp
index 64bc48f4e5..60c8545617 100644
--- a/glass/src/lib/native/cpp/Context.cpp
+++ b/glass/src/lib/native/cpp/Context.cpp
@@ -13,16 +13,16 @@
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <imgui_stdlib.h>
+
+#include "wpi/glass/ContextInternal.hpp"
+#include "wpi/gui/wpigui.hpp"
+#include "wpi/gui/wpigui_internal.hpp"
 #include "wpi/util/MemoryBuffer.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/fs.hpp"
 #include "wpi/util/json.hpp"
 #include "wpi/util/raw_ostream.hpp"
 #include "wpi/util/timestamp.h"
-#include "wpi/gui/wpigui.hpp"
-#include "wpi/gui/wpigui_internal.hpp"
-
-#include "wpi/glass/ContextInternal.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/MainMenuBar.cpp b/glass/src/lib/native/cpp/MainMenuBar.cpp
index 724e3ed50a..3ca982414a 100644
--- a/glass/src/lib/native/cpp/MainMenuBar.cpp
+++ b/glass/src/lib/native/cpp/MainMenuBar.cpp
@@ -8,11 +8,11 @@
 #include <utility>
 
 #include <imgui.h>
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/gui/wpigui.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/ContextInternal.hpp"
+#include "wpi/gui/wpigui.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/Storage.cpp b/glass/src/lib/native/cpp/Storage.cpp
index 07d9864f53..d37657622c 100644
--- a/glass/src/lib/native/cpp/Storage.cpp
+++ b/glass/src/lib/native/cpp/Storage.cpp
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include <imgui.h>
+
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/json.hpp"
 
diff --git a/glass/src/lib/native/cpp/WindowManager.cpp b/glass/src/lib/native/cpp/WindowManager.cpp
index 4eb2fb1210..b301477561 100644
--- a/glass/src/lib/native/cpp/WindowManager.cpp
+++ b/glass/src/lib/native/cpp/WindowManager.cpp
@@ -10,11 +10,11 @@
 #include <utility>
 
 #include <fmt/format.h>
-#include "wpi/util/print.hpp"
-#include "wpi/gui/wpigui.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/Storage.hpp"
+#include "wpi/gui/wpigui.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/hardware/AnalogInput.cpp b/glass/src/lib/native/cpp/hardware/AnalogInput.cpp
index 5dc0b71946..7920de1f5c 100644
--- a/glass/src/lib/native/cpp/hardware/AnalogInput.cpp
+++ b/glass/src/lib/native/cpp/hardware/AnalogInput.cpp
@@ -7,11 +7,11 @@
 #include <string>
 
 #include <imgui.h>
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/DataSource.hpp"
 #include "wpi/glass/Storage.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/hardware/Encoder.cpp b/glass/src/lib/native/cpp/hardware/Encoder.cpp
index e061ff19dc..092f451009 100644
--- a/glass/src/lib/native/cpp/hardware/Encoder.cpp
+++ b/glass/src/lib/native/cpp/hardware/Encoder.cpp
@@ -8,11 +8,11 @@
 
 #include <fmt/format.h>
 #include <imgui.h>
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/DataSource.hpp"
 #include "wpi/glass/Storage.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/hardware/Gyro.cpp b/glass/src/lib/native/cpp/hardware/Gyro.cpp
index a6ebeb5f0f..654b3c98fd 100644
--- a/glass/src/lib/native/cpp/hardware/Gyro.cpp
+++ b/glass/src/lib/native/cpp/hardware/Gyro.cpp
@@ -9,10 +9,10 @@
 
 #include <imgui.h>
 #include <imgui_internal.h>
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/DataSource.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/hardware/LEDDisplay.cpp b/glass/src/lib/native/cpp/hardware/LEDDisplay.cpp
index 7ab00b76f5..fe23b716a3 100644
--- a/glass/src/lib/native/cpp/hardware/LEDDisplay.cpp
+++ b/glass/src/lib/native/cpp/hardware/LEDDisplay.cpp
@@ -6,11 +6,10 @@
 
 #include <vector>
 
-#include "wpi/util/SmallVector.hpp"
-
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/Storage.hpp"
 #include "wpi/glass/support/ExtraGuiWidgets.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/hardware/PWM.cpp b/glass/src/lib/native/cpp/hardware/PWM.cpp
index 6c05644fa1..20c71ec25e 100644
--- a/glass/src/lib/native/cpp/hardware/PWM.cpp
+++ b/glass/src/lib/native/cpp/hardware/PWM.cpp
@@ -7,11 +7,11 @@
 #include <string>
 
 #include <imgui.h>
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/DataSource.hpp"
 #include "wpi/glass/Storage.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/hardware/Pneumatic.cpp b/glass/src/lib/native/cpp/hardware/Pneumatic.cpp
index f2107f1c41..fe97d8d008 100644
--- a/glass/src/lib/native/cpp/hardware/Pneumatic.cpp
+++ b/glass/src/lib/native/cpp/hardware/Pneumatic.cpp
@@ -9,8 +9,6 @@
 #include <string>
 
 #include <imgui.h>
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/DataSource.hpp"
@@ -18,6 +16,8 @@
 #include "wpi/glass/other/DeviceTree.hpp"
 #include "wpi/glass/support/ExtraGuiWidgets.hpp"
 #include "wpi/glass/support/NameSetting.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/hardware/PowerDistribution.cpp b/glass/src/lib/native/cpp/hardware/PowerDistribution.cpp
index 911ebe48f3..9b6635bb68 100644
--- a/glass/src/lib/native/cpp/hardware/PowerDistribution.cpp
+++ b/glass/src/lib/native/cpp/hardware/PowerDistribution.cpp
@@ -7,11 +7,11 @@
 #include <algorithm>
 
 #include <imgui.h>
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/DataSource.hpp"
 #include "wpi/glass/support/NameSetting.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/other/DeviceTree.cpp b/glass/src/lib/native/cpp/other/DeviceTree.cpp
index 131ff2ddf4..776cd76145 100644
--- a/glass/src/lib/native/cpp/other/DeviceTree.cpp
+++ b/glass/src/lib/native/cpp/other/DeviceTree.cpp
@@ -8,11 +8,11 @@
 #include <string>
 
 #include <imgui.h>
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/ContextInternal.hpp"
 #include "wpi/glass/DataSource.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/other/FMS.cpp b/glass/src/lib/native/cpp/other/FMS.cpp
index b4e6486d9c..8d379ebc11 100644
--- a/glass/src/lib/native/cpp/other/FMS.cpp
+++ b/glass/src/lib/native/cpp/other/FMS.cpp
@@ -8,9 +8,9 @@
 
 #include <imgui.h>
 #include <imgui_stdlib.h>
-#include "wpi/util/SmallString.hpp"
 
 #include "wpi/glass/DataSource.hpp"
+#include "wpi/util/SmallString.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/other/Field2D.cpp b/glass/src/lib/native/cpp/other/Field2D.cpp
index dd0d71f61a..85b4456d27 100644
--- a/glass/src/lib/native/cpp/other/Field2D.cpp
+++ b/glass/src/lib/native/cpp/other/Field2D.cpp
@@ -13,14 +13,20 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/fields/fields.hpp"
-#include "wpi/math/geometry/Pose2d.hpp"
-#include "wpi/math/geometry/Rotation2d.hpp"
-#include "wpi/math/geometry/Translation2d.hpp"
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <imgui_stdlib.h>
+
+#include "wpi/fields/fields.hpp"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/support/ColorSetting.hpp"
+#include "wpi/glass/support/EnumSetting.hpp"
 #include "wpi/gui/portable-file-dialogs.h"
+#include "wpi/gui/wpigui.hpp"
+#include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/util/MemoryBuffer.hpp"
@@ -30,12 +36,6 @@
 #include "wpi/util/fs.hpp"
 #include "wpi/util/json.hpp"
 #include "wpi/util/print.hpp"
-#include "wpi/gui/wpigui.hpp"
-
-#include "wpi/glass/Context.hpp"
-#include "wpi/glass/Storage.hpp"
-#include "wpi/glass/support/ColorSetting.hpp"
-#include "wpi/glass/support/EnumSetting.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/other/Mechanism2D.cpp b/glass/src/lib/native/cpp/other/Mechanism2D.cpp
index 5616ce7889..81e9d2f737 100644
--- a/glass/src/lib/native/cpp/other/Mechanism2D.cpp
+++ b/glass/src/lib/native/cpp/other/Mechanism2D.cpp
@@ -13,21 +13,21 @@
 #include <utility>
 #include <vector>
 
+#include <imgui.h>
+#include <imgui_internal.h>
+#include <imgui_stdlib.h>
+
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/gui/portable-file-dialogs.h"
+#include "wpi/gui/wpigui.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/geometry/Transform2d.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
-#include <imgui.h>
-#include <imgui_internal.h>
-#include <imgui_stdlib.h>
-#include "wpi/gui/portable-file-dialogs.h"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/util/print.hpp"
-#include "wpi/gui/wpigui.hpp"
-
-#include "wpi/glass/Context.hpp"
-#include "wpi/glass/Storage.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/other/Plot.cpp b/glass/src/lib/native/cpp/other/Plot.cpp
index 2929016f49..79226daa2a 100644
--- a/glass/src/lib/native/cpp/other/Plot.cpp
+++ b/glass/src/lib/native/cpp/other/Plot.cpp
@@ -16,6 +16,7 @@
 #include <vector>
 
 #include <fmt/format.h>
+
 #include "wpi/util/StringExtras.hpp"
 
 #if defined(__GNUC__)
diff --git a/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp b/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp
index 76af409ad6..98f45dbbfb 100644
--- a/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp
+++ b/glass/src/lib/native/cpp/support/ExtraGuiWidgets.cpp
@@ -10,10 +10,10 @@
 
 #include <imgui.h>
 #include <imgui_internal.h>
-#include "wpi/util/DenseMap.hpp"
 
 #include "wpi/glass/DataSource.hpp"
 #include "wpi/glass/support/ExpressionParser.hpp"
+#include "wpi/util/DenseMap.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/cpp/support/NameSetting.cpp b/glass/src/lib/native/cpp/support/NameSetting.cpp
index 4b0489a00f..4321b43432 100644
--- a/glass/src/lib/native/cpp/support/NameSetting.cpp
+++ b/glass/src/lib/native/cpp/support/NameSetting.cpp
@@ -6,6 +6,7 @@
 
 #include <imgui_internal.h>
 #include <imgui_stdlib.h>
+
 #include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
diff --git a/glass/src/lib/native/include/wpi/glass/ContextInternal.hpp b/glass/src/lib/native/include/wpi/glass/ContextInternal.hpp
index 9a8e5449ca..972dfd8b19 100644
--- a/glass/src/lib/native/include/wpi/glass/ContextInternal.hpp
+++ b/glass/src/lib/native/include/wpi/glass/ContextInternal.hpp
@@ -10,11 +10,10 @@
 #include <string>
 #include <vector>
 
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/StringMap.hpp"
-
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/Storage.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringMap.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/DataSource.hpp b/glass/src/lib/native/include/wpi/glass/DataSource.hpp
index 2870ac1b4d..9801d9ae67 100644
--- a/glass/src/lib/native/include/wpi/glass/DataSource.hpp
+++ b/glass/src/lib/native/include/wpi/glass/DataSource.hpp
@@ -13,6 +13,7 @@
 #include <utility>
 
 #include <imgui.h>
+
 #include "wpi/util/Signal.h"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/spinlock.hpp"
diff --git a/glass/src/lib/native/include/wpi/glass/Provider.hpp b/glass/src/lib/native/include/wpi/glass/Provider.hpp
index 5d628c9590..8857f3300b 100644
--- a/glass/src/lib/native/include/wpi/glass/Provider.hpp
+++ b/glass/src/lib/native/include/wpi/glass/Provider.hpp
@@ -12,10 +12,9 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/gui/wpigui.hpp"
-
 #include "wpi/glass/Model.hpp"
 #include "wpi/glass/WindowManager.hpp"
+#include "wpi/gui/wpigui.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/WindowManager.hpp b/glass/src/lib/native/include/wpi/glass/WindowManager.hpp
index 98ed449fd8..5e60759420 100644
--- a/glass/src/lib/native/include/wpi/glass/WindowManager.hpp
+++ b/glass/src/lib/native/include/wpi/glass/WindowManager.hpp
@@ -8,9 +8,8 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/FunctionExtras.hpp"
-
 #include "wpi/glass/Window.hpp"
+#include "wpi/util/FunctionExtras.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/hardware/AnalogInput.hpp b/glass/src/lib/native/include/wpi/glass/hardware/AnalogInput.hpp
index 6b4bdbdf5e..c5e48160da 100644
--- a/glass/src/lib/native/include/wpi/glass/hardware/AnalogInput.hpp
+++ b/glass/src/lib/native/include/wpi/glass/hardware/AnalogInput.hpp
@@ -6,9 +6,8 @@
 
 #include <string_view>
 
-#include "wpi/util/function_ref.hpp"
-
 #include "wpi/glass/Model.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/hardware/DIO.hpp b/glass/src/lib/native/include/wpi/glass/hardware/DIO.hpp
index 53a20a9801..57474ddc2c 100644
--- a/glass/src/lib/native/include/wpi/glass/hardware/DIO.hpp
+++ b/glass/src/lib/native/include/wpi/glass/hardware/DIO.hpp
@@ -6,9 +6,8 @@
 
 #include <string_view>
 
-#include "wpi/util/function_ref.hpp"
-
 #include "wpi/glass/Model.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/hardware/Encoder.hpp b/glass/src/lib/native/include/wpi/glass/hardware/Encoder.hpp
index 228f75801e..99ffdecbb4 100644
--- a/glass/src/lib/native/include/wpi/glass/hardware/Encoder.hpp
+++ b/glass/src/lib/native/include/wpi/glass/hardware/Encoder.hpp
@@ -6,9 +6,8 @@
 
 #include <string_view>
 
-#include "wpi/util/function_ref.hpp"
-
 #include "wpi/glass/Model.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/hardware/LEDDisplay.hpp b/glass/src/lib/native/include/wpi/glass/hardware/LEDDisplay.hpp
index 1661851f11..004d3dfeef 100644
--- a/glass/src/lib/native/include/wpi/glass/hardware/LEDDisplay.hpp
+++ b/glass/src/lib/native/include/wpi/glass/hardware/LEDDisplay.hpp
@@ -6,9 +6,8 @@
 
 #include <span>
 
-#include "wpi/util/function_ref.hpp"
-
 #include "wpi/glass/Model.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace wpi {
 template <typename T>
diff --git a/glass/src/lib/native/include/wpi/glass/hardware/PWM.hpp b/glass/src/lib/native/include/wpi/glass/hardware/PWM.hpp
index c87f7224fc..4833078912 100644
--- a/glass/src/lib/native/include/wpi/glass/hardware/PWM.hpp
+++ b/glass/src/lib/native/include/wpi/glass/hardware/PWM.hpp
@@ -6,9 +6,8 @@
 
 #include <string_view>
 
-#include "wpi/util/function_ref.hpp"
-
 #include "wpi/glass/Model.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/hardware/Pneumatic.hpp b/glass/src/lib/native/include/wpi/glass/hardware/Pneumatic.hpp
index 6efb4790e2..53be6bc1b5 100644
--- a/glass/src/lib/native/include/wpi/glass/hardware/Pneumatic.hpp
+++ b/glass/src/lib/native/include/wpi/glass/hardware/Pneumatic.hpp
@@ -8,9 +8,8 @@
 #include <string_view>
 #include <utility>
 
-#include "wpi/util/function_ref.hpp"
-
 #include "wpi/glass/Model.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/hardware/PowerDistribution.hpp b/glass/src/lib/native/include/wpi/glass/hardware/PowerDistribution.hpp
index f65a23d751..011e4b3a34 100644
--- a/glass/src/lib/native/include/wpi/glass/hardware/PowerDistribution.hpp
+++ b/glass/src/lib/native/include/wpi/glass/hardware/PowerDistribution.hpp
@@ -6,9 +6,8 @@
 
 #include <string_view>
 
-#include "wpi/util/function_ref.hpp"
-
 #include "wpi/glass/Model.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/other/DeviceTree.hpp b/glass/src/lib/native/include/wpi/glass/other/DeviceTree.hpp
index 9883b286b5..72be8d25c0 100644
--- a/glass/src/lib/native/include/wpi/glass/other/DeviceTree.hpp
+++ b/glass/src/lib/native/include/wpi/glass/other/DeviceTree.hpp
@@ -9,9 +9,9 @@
 #include <vector>
 
 #include <imgui.h>
-#include "wpi/util/FunctionExtras.hpp"
 
 #include "wpi/glass/Model.hpp"
+#include "wpi/util/FunctionExtras.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/other/Field2D.hpp b/glass/src/lib/native/include/wpi/glass/other/Field2D.hpp
index 7f699d8365..51416f0635 100644
--- a/glass/src/lib/native/include/wpi/glass/other/Field2D.hpp
+++ b/glass/src/lib/native/include/wpi/glass/other/Field2D.hpp
@@ -7,14 +7,14 @@
 #include <span>
 #include <string_view>
 
-#include "wpi/math/geometry/Pose2d.hpp"
-#include "wpi/math/geometry/Rotation2d.hpp"
-#include "wpi/math/geometry/Translation2d.hpp"
 #include <imgui.h>
-#include "wpi/util/function_ref.hpp"
 
 #include "wpi/glass/Model.hpp"
 #include "wpi/glass/View.hpp"
+#include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/math/geometry/Translation2d.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace glass {
 
diff --git a/glass/src/lib/native/include/wpi/glass/other/Mechanism2D.hpp b/glass/src/lib/native/include/wpi/glass/other/Mechanism2D.hpp
index 63da874c4a..093a1ba939 100644
--- a/glass/src/lib/native/include/wpi/glass/other/Mechanism2D.hpp
+++ b/glass/src/lib/native/include/wpi/glass/other/Mechanism2D.hpp
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "wpi/math/geometry/Rotation2d.hpp"
-#include "wpi/math/geometry/Translation2d.hpp"
 #include <imgui.h>
-#include "wpi/util/function_ref.hpp"
 
 #include "wpi/glass/Model.hpp"
 #include "wpi/glass/View.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/math/geometry/Translation2d.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace glass {
 
diff --git a/glass/src/libnt/native/cpp/NTCommandScheduler.cpp b/glass/src/libnt/native/cpp/NTCommandScheduler.cpp
index 71faa9c895..7dc2406dde 100644
--- a/glass/src/libnt/native/cpp/NTCommandScheduler.cpp
+++ b/glass/src/libnt/native/cpp/NTCommandScheduler.cpp
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
diff --git a/glass/src/libnt/native/cpp/NTCommandSelector.cpp b/glass/src/libnt/native/cpp/NTCommandSelector.cpp
index db3d497429..c6b9fa3805 100644
--- a/glass/src/libnt/native/cpp/NTCommandSelector.cpp
+++ b/glass/src/libnt/native/cpp/NTCommandSelector.cpp
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
diff --git a/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp b/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp
index f06d8de296..7959303e9a 100644
--- a/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp
+++ b/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp
@@ -8,6 +8,7 @@
 
 #include <fmt/format.h>
 #include <imgui.h>
+
 #include "wpi/util/MathExtras.hpp"
 #include "wpi/util/StringExtras.hpp"
 
diff --git a/glass/src/libnt/native/cpp/NTDigitalInput.cpp b/glass/src/libnt/native/cpp/NTDigitalInput.cpp
index c0d8de9e26..f5de2402a7 100644
--- a/glass/src/libnt/native/cpp/NTDigitalInput.cpp
+++ b/glass/src/libnt/native/cpp/NTDigitalInput.cpp
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
diff --git a/glass/src/libnt/native/cpp/NTFMS.cpp b/glass/src/libnt/native/cpp/NTFMS.cpp
index 488afebefd..e534af9f7c 100644
--- a/glass/src/libnt/native/cpp/NTFMS.cpp
+++ b/glass/src/libnt/native/cpp/NTFMS.cpp
@@ -9,6 +9,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/timestamp.h"
 
diff --git a/glass/src/libnt/native/cpp/NTField2D.cpp b/glass/src/libnt/native/cpp/NTField2D.cpp
index a37b6baea4..08a4aca06d 100644
--- a/glass/src/libnt/native/cpp/NTField2D.cpp
+++ b/glass/src/libnt/native/cpp/NTField2D.cpp
@@ -11,6 +11,7 @@
 #include <vector>
 
 #include <fmt/format.h>
+
 #include "wpi/nt/DoubleArrayTopic.hpp"
 #include "wpi/nt/MultiSubscriber.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
diff --git a/glass/src/libnt/native/cpp/NTGyro.cpp b/glass/src/libnt/native/cpp/NTGyro.cpp
index 94af426a86..ef26c89e02 100644
--- a/glass/src/libnt/native/cpp/NTGyro.cpp
+++ b/glass/src/libnt/native/cpp/NTGyro.cpp
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
diff --git a/glass/src/libnt/native/cpp/NTMecanumDrive.cpp b/glass/src/libnt/native/cpp/NTMecanumDrive.cpp
index 9b06026914..b7f5fd7769 100644
--- a/glass/src/libnt/native/cpp/NTMecanumDrive.cpp
+++ b/glass/src/libnt/native/cpp/NTMecanumDrive.cpp
@@ -8,6 +8,7 @@
 
 #include <fmt/format.h>
 #include <imgui.h>
+
 #include "wpi/util/MathExtras.hpp"
 #include "wpi/util/StringExtras.hpp"
 
diff --git a/glass/src/libnt/native/cpp/NTMechanism2D.cpp b/glass/src/libnt/native/cpp/NTMechanism2D.cpp
index 980fce17ce..70dd92283f 100644
--- a/glass/src/libnt/native/cpp/NTMechanism2D.cpp
+++ b/glass/src/libnt/native/cpp/NTMechanism2D.cpp
@@ -12,10 +12,10 @@
 
 #include <fmt/format.h>
 #include <imgui.h>
-#include "wpi/nt/ntcore_cpp.hpp"
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/glass/other/Mechanism2D.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/libnt/native/cpp/NTMotorController.cpp b/glass/src/libnt/native/cpp/NTMotorController.cpp
index fa9a3bbabf..6a799639a8 100644
--- a/glass/src/libnt/native/cpp/NTMotorController.cpp
+++ b/glass/src/libnt/native/cpp/NTMotorController.cpp
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
diff --git a/glass/src/libnt/native/cpp/NTPIDController.cpp b/glass/src/libnt/native/cpp/NTPIDController.cpp
index 7fb78728d9..184374db36 100644
--- a/glass/src/libnt/native/cpp/NTPIDController.cpp
+++ b/glass/src/libnt/native/cpp/NTPIDController.cpp
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
diff --git a/glass/src/libnt/native/cpp/NTProfiledPIDController.cpp b/glass/src/libnt/native/cpp/NTProfiledPIDController.cpp
index 14697c6bb8..e521975597 100644
--- a/glass/src/libnt/native/cpp/NTProfiledPIDController.cpp
+++ b/glass/src/libnt/native/cpp/NTProfiledPIDController.cpp
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
diff --git a/glass/src/libnt/native/cpp/NTStringChooser.cpp b/glass/src/libnt/native/cpp/NTStringChooser.cpp
index e2d1be21a0..313f5e8888 100644
--- a/glass/src/libnt/native/cpp/NTStringChooser.cpp
+++ b/glass/src/libnt/native/cpp/NTStringChooser.cpp
@@ -7,6 +7,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/json.hpp"
 
 using namespace glass;
diff --git a/glass/src/libnt/native/cpp/NetworkTables.cpp b/glass/src/libnt/native/cpp/NetworkTables.cpp
index e305f6f824..6201aef30b 100644
--- a/glass/src/libnt/native/cpp/NetworkTables.cpp
+++ b/glass/src/libnt/native/cpp/NetworkTables.cpp
@@ -20,17 +20,22 @@
 #include <fmt/format.h>
 #include <imgui.h>
 #include <imgui_stdlib.h>
-#include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/nt/NetworkTableValue.hpp"
-#include "wpi/nt/ntcore_c.h"
-#include "wpi/nt/ntcore_cpp.hpp"
-#include "wpi/nt/ntcore_cpp_types.hpp"
 #include <upb/message/message.h>
 #include <upb/mini_table/message.h>
 #include <upb/reflection/def.h>
 #include <upb/reflection/message.h>
 #include <upb/reflection/stage0/google/protobuf/descriptor.upb.h>
 #include <upb/wire/decode.h>
+
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/support/ExtraGuiWidgets.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/NetworkTableValue.hpp"
+#include "wpi/nt/ntcore_c.h"
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/nt/ntcore_cpp_types.hpp"
 #include "wpi/util/MessagePack.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/SpanExtras.hpp"
@@ -39,11 +44,6 @@
 #include "wpi/util/print.hpp"
 #include "wpi/util/raw_ostream.hpp"
 
-#include "wpi/glass/Context.hpp"
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/Storage.hpp"
-#include "wpi/glass/support/ExtraGuiWidgets.hpp"
-
 using namespace glass;
 using namespace mpack;
 
diff --git a/glass/src/libnt/native/cpp/NetworkTablesProvider.cpp b/glass/src/libnt/native/cpp/NetworkTablesProvider.cpp
index 025ed652f2..dd7f6792a5 100644
--- a/glass/src/libnt/native/cpp/NetworkTablesProvider.cpp
+++ b/glass/src/libnt/native/cpp/NetworkTablesProvider.cpp
@@ -9,12 +9,12 @@
 #include <utility>
 
 #include <fmt/format.h>
+
+#include "wpi/glass/Storage.hpp"
+#include "wpi/gui/wpigui.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
-#include "wpi/gui/wpigui.hpp"
-
-#include "wpi/glass/Storage.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/libnt/native/cpp/NetworkTablesSettings.cpp b/glass/src/libnt/native/cpp/NetworkTablesSettings.cpp
index f0c0483341..62dd13a2e3 100644
--- a/glass/src/libnt/native/cpp/NetworkTablesSettings.cpp
+++ b/glass/src/libnt/native/cpp/NetworkTablesSettings.cpp
@@ -11,11 +11,11 @@
 
 #include <imgui.h>
 #include <imgui_stdlib.h>
-#include "wpi/nt/ntcore_cpp.hpp"
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/Storage.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;
 
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTAlerts.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTAlerts.hpp
index b5378b16b2..f6ad5c0b06 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTAlerts.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTAlerts.hpp
@@ -8,11 +8,10 @@
 #include <string_view>
 #include <vector>
 
+#include "wpi/glass/other/Alerts.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringArrayTopic.hpp"
 
-#include "wpi/glass/other/Alerts.hpp"
-
 namespace glass {
 
 class NTAlertsModel : public AlertsModel {
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTCommandScheduler.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTCommandScheduler.hpp
index f5b7c02ba9..2e8a2ae15e 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTCommandScheduler.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTCommandScheduler.hpp
@@ -10,14 +10,13 @@
 #include <string_view>
 #include <vector>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/other/CommandScheduler.hpp"
 #include "wpi/nt/IntegerArrayTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringArrayTopic.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/other/CommandScheduler.hpp"
-
 namespace glass {
 class NTCommandSchedulerModel : public CommandSchedulerModel {
  public:
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTCommandSelector.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTCommandSelector.hpp
index ed069c23b5..86b89c3bfa 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTCommandSelector.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTCommandSelector.hpp
@@ -7,13 +7,12 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/other/CommandSelector.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/other/CommandSelector.hpp"
-
 namespace glass {
 class NTCommandSelectorModel : public CommandSelectorModel {
  public:
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTDifferentialDrive.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTDifferentialDrive.hpp
index bb12b3864f..8826135a9d 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTDifferentialDrive.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTDifferentialDrive.hpp
@@ -8,14 +8,13 @@
 #include <string_view>
 #include <vector>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/other/Drive.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/DoubleTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/other/Drive.hpp"
-
 namespace glass {
 class NTDifferentialDriveModel : public DriveModel {
  public:
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalInput.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalInput.hpp
index 5e77a2c7d0..3847581439 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalInput.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalInput.hpp
@@ -7,13 +7,12 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/hardware/DIO.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/hardware/DIO.hpp"
-
 namespace glass {
 
 class NTDigitalInputModel : public DIOModel {
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalOutput.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalOutput.hpp
index 215fd3eeeb..84bdb6e2f8 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalOutput.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTDigitalOutput.hpp
@@ -7,13 +7,12 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/hardware/DIO.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/hardware/DIO.hpp"
-
 namespace glass {
 
 class NTDigitalOutputModel : public DIOModel {
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTFMS.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTFMS.hpp
index b0e7b25ae7..f519b94544 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTFMS.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTFMS.hpp
@@ -6,14 +6,13 @@
 
 #include <string_view>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/other/FMS.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/IntegerTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/other/FMS.hpp"
-
 namespace glass {
 
 class NTFMSModel : public FMSModel {
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTField2D.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTField2D.hpp
index 5ebb087557..8863bebf83 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTField2D.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTField2D.hpp
@@ -10,14 +10,13 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/glass/other/Field2D.hpp"
 #include "wpi/nt/MultiSubscriber.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/NetworkTableListener.hpp"
 #include "wpi/nt/StringTopic.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
 
-#include "wpi/glass/other/Field2D.hpp"
-
 namespace glass {
 
 class NTField2DModel : public Field2DModel {
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTGyro.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTGyro.hpp
index 74af23502f..335fdd28ad 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTGyro.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTGyro.hpp
@@ -7,13 +7,12 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/hardware/Gyro.hpp"
 #include "wpi/nt/DoubleTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/hardware/Gyro.hpp"
-
 namespace glass {
 class NTGyroModel : public GyroModel {
  public:
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTMecanumDrive.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTMecanumDrive.hpp
index 8b390b9245..883c30e9c8 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTMecanumDrive.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTMecanumDrive.hpp
@@ -8,14 +8,13 @@
 #include <string_view>
 #include <vector>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/other/Drive.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/DoubleTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/other/Drive.hpp"
-
 namespace glass {
 class NTMecanumDriveModel : public DriveModel {
  public:
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTMechanism2D.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTMechanism2D.hpp
index c5c6c9555d..2ab5bf5241 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTMechanism2D.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTMechanism2D.hpp
@@ -10,13 +10,12 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/glass/other/Mechanism2D.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/nt/MultiSubscriber.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/NetworkTableListener.hpp"
 
-#include "wpi/glass/other/Mechanism2D.hpp"
-
 namespace glass {
 
 class NTMechanism2DModel : public Mechanism2DModel {
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTMotorController.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTMotorController.hpp
index 75d3223da8..30045fbe5e 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTMotorController.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTMotorController.hpp
@@ -7,14 +7,13 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/hardware/MotorController.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/DoubleTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/hardware/MotorController.hpp"
-
 namespace glass {
 class NTMotorControllerModel : public MotorControllerModel {
  public:
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTPIDController.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTPIDController.hpp
index 97e1bd8ed6..9bcd5ce26e 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTPIDController.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTPIDController.hpp
@@ -7,14 +7,13 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/other/PIDController.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/DoubleTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/other/PIDController.hpp"
-
 namespace glass {
 class NTPIDControllerModel : public PIDControllerModel {
  public:
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTProfiledPIDController.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTProfiledPIDController.hpp
index 6d9bd8f95d..4e32af616e 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTProfiledPIDController.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTProfiledPIDController.hpp
@@ -7,14 +7,13 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/other/ProfiledPIDController.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/DoubleTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/DataSource.hpp"
-#include "wpi/glass/other/ProfiledPIDController.hpp"
-
 namespace glass {
 class NTProfiledPIDControllerModel : public ProfiledPIDControllerModel {
  public:
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTStringChooser.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTStringChooser.hpp
index 5299172607..1178415f6d 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTStringChooser.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTStringChooser.hpp
@@ -7,12 +7,11 @@
 #include <string>
 #include <vector>
 
+#include "wpi/glass/other/StringChooser.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringArrayTopic.hpp"
 #include "wpi/nt/StringTopic.hpp"
 
-#include "wpi/glass/other/StringChooser.hpp"
-
 namespace glass {
 
 class NTStringChooserModel : public StringChooserModel {
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NTSubsystem.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NTSubsystem.hpp
index 8003de956d..904dfb9c1d 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NTSubsystem.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NTSubsystem.hpp
@@ -7,11 +7,10 @@
 #include <string>
 #include <string_view>
 
-#include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/nt/StringTopic.hpp"
-
 #include "wpi/glass/DataSource.hpp"
 #include "wpi/glass/other/Subsystem.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/StringTopic.hpp"
 
 namespace glass {
 class NTSubsystemModel : public SubsystemModel {
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTables.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTables.hpp
index c21a27b9b5..d63c32d394 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTables.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTables.hpp
@@ -13,17 +13,17 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/nt/NetworkTableListener.hpp"
-#include "wpi/nt/ntcore_cpp.hpp"
 #include <upb/mem/arena.h>
 #include <upb/reflection/def.h>
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/json.hpp"
-#include "wpi/util/struct/DynamicStruct.hpp"
 
 #include "wpi/glass/Model.hpp"
 #include "wpi/glass/View.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/NetworkTableListener.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/struct/DynamicStruct.hpp"
 
 namespace glass {
 
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesProvider.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesProvider.hpp
index 5b23c10693..f88e43f6b1 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesProvider.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesProvider.hpp
@@ -9,6 +9,8 @@
 #include <string_view>
 #include <vector>
 
+#include "wpi/glass/Model.hpp"
+#include "wpi/glass/Provider.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/NetworkTableListener.hpp"
 #include "wpi/nt/StringTopic.hpp"
@@ -16,9 +18,6 @@
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/StringMap.hpp"
 
-#include "wpi/glass/Model.hpp"
-#include "wpi/glass/Provider.hpp"
-
 namespace glass {
 
 class Window;
diff --git a/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesSettings.hpp b/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesSettings.hpp
index 96080e8827..465a4163ce 100644
--- a/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesSettings.hpp
+++ b/glass/src/libnt/native/include/wpi/glass/networktables/NetworkTablesSettings.hpp
@@ -6,11 +6,10 @@
 
 #include <string>
 
+#include "wpi/glass/support/EnumSetting.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
 #include "wpi/util/SafeThread.hpp"
 
-#include "wpi/glass/support/EnumSetting.hpp"
-
 namespace wpi {
 template <typename T>
 class SmallVectorImpl;
diff --git a/hal/src/dev/native/cpp/main.cpp b/hal/src/dev/native/cpp/main.cpp
index f392c614d2..68974e3429 100644
--- a/hal/src/dev/native/cpp/main.cpp
+++ b/hal/src/dev/native/cpp/main.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/util/print.hpp"
-
 #include "wpi/hal/HAL.h"
+#include "wpi/util/print.hpp"
 
 int main() {
   wpi::print("Hello World\n");
diff --git a/hal/src/main/native/cpp/ErrorHandling.cpp b/hal/src/main/native/cpp/ErrorHandling.cpp
index 808e3165bc..ed88a96273 100644
--- a/hal/src/main/native/cpp/ErrorHandling.cpp
+++ b/hal/src/main/native/cpp/ErrorHandling.cpp
@@ -3,10 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <fmt/format.h>
-#include "wpi/util/SmallString.hpp"
 
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/HALBase.h"
+#include "wpi/util/SmallString.hpp"
 
 namespace {
 struct LastErrorStorage {
diff --git a/hal/src/main/native/cpp/cpp/fpga_clock.cpp b/hal/src/main/native/cpp/cpp/fpga_clock.cpp
index a54e9fe96e..5dccf4b12e 100644
--- a/hal/src/main/native/cpp/cpp/fpga_clock.cpp
+++ b/hal/src/main/native/cpp/cpp/fpga_clock.cpp
@@ -7,9 +7,8 @@
 #include <cstdio>
 #include <limits>
 
-#include "wpi/util/print.hpp"
-
 #include "wpi/hal/HALBase.h"
+#include "wpi/util/print.hpp"
 
 namespace hal {
 const fpga_clock::time_point fpga_clock::min_time =
diff --git a/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp b/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp
index 24b30cae3d..5d36ab71c0 100644
--- a/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp
@@ -4,11 +4,10 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_AddressableLEDJNI.h"
 #include "wpi/hal/AddressableLED.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/AnalogJNI.cpp b/hal/src/main/native/cpp/jni/AnalogJNI.cpp
index 4949f933da..78ce48cb98 100644
--- a/hal/src/main/native/cpp/jni/AnalogJNI.cpp
+++ b/hal/src/main/native/cpp/jni/AnalogJNI.cpp
@@ -6,13 +6,12 @@
 
 #include <cassert>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_AnalogJNI.h"
 #include "wpi/hal/AnalogInput.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp
index 376baec99a..b5d4c4e522 100644
--- a/hal/src/main/native/cpp/jni/CANAPIJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CANAPIJNI.cpp
@@ -6,13 +6,12 @@
 
 #include <cassert>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_CANAPIJNI.h"
 #include "wpi/hal/CAN.h"
 #include "wpi/hal/CANAPI.h"
 #include "wpi/hal/Errors.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/CANJNI.cpp b/hal/src/main/native/cpp/jni/CANJNI.cpp
index e002373e69..4d1e67afc1 100644
--- a/hal/src/main/native/cpp/jni/CANJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CANJNI.cpp
@@ -6,12 +6,11 @@
 
 #include <cassert>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_can_CANJNI.h"
 #include "wpi/hal/CAN.h"
 #include "wpi/hal/Errors.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp b/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp
index 1547cea092..1e4940b6a4 100644
--- a/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp
@@ -4,13 +4,12 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_CTREPCMJNI.h"
 #include "wpi/hal/CTREPCM.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/cpp/jni/CounterJNI.cpp b/hal/src/main/native/cpp/jni/CounterJNI.cpp
index efddf40071..4a005e4114 100644
--- a/hal/src/main/native/cpp/jni/CounterJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CounterJNI.cpp
@@ -6,12 +6,11 @@
 
 #include <cassert>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_CounterJNI.h"
 #include "wpi/hal/Counter.h"
 #include "wpi/hal/Errors.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/cpp/jni/DIOJNI.cpp b/hal/src/main/native/cpp/jni/DIOJNI.cpp
index 85a60e2c36..b3f803548a 100644
--- a/hal/src/main/native/cpp/jni/DIOJNI.cpp
+++ b/hal/src/main/native/cpp/jni/DIOJNI.cpp
@@ -6,14 +6,13 @@
 
 #include <cassert>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_DIOJNI.h"
 #include "wpi/hal/DIO.h"
 #include "wpi/hal/PWM.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/cpp/jni/DriverStationJNI.cpp b/hal/src/main/native/cpp/jni/DriverStationJNI.cpp
index 233db6d680..716dee492c 100644
--- a/hal/src/main/native/cpp/jni/DriverStationJNI.cpp
+++ b/hal/src/main/native/cpp/jni/DriverStationJNI.cpp
@@ -7,15 +7,16 @@
 #include <cassert>
 
 #include <fmt/format.h>
-#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_DriverStationJNI.h"
 #include "wpi/hal/DriverStation.h"
 #include "wpi/hal/HALBase.h"
+#include "wpi/util/jni_util.hpp"
 
-static_assert(org_wpilib_hardware_hal_DriverStationJNI_kUnknownAllianceStation ==
-              HAL_AllianceStationID_kUnknown);
+static_assert(
+    org_wpilib_hardware_hal_DriverStationJNI_kUnknownAllianceStation ==
+    HAL_AllianceStationID_kUnknown);
 static_assert(org_wpilib_hardware_hal_DriverStationJNI_kRed1AllianceStation ==
               HAL_AllianceStationID_kRed1);
 static_assert(org_wpilib_hardware_hal_DriverStationJNI_kRed2AllianceStation ==
diff --git a/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp b/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp
index 3b4c5bd1ac..a745244048 100644
--- a/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp
+++ b/hal/src/main/native/cpp/jni/DutyCycleJNI.cpp
@@ -4,11 +4,10 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_DutyCycleJNI.h"
 #include "wpi/hal/DutyCycle.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/cpp/jni/HAL.cpp b/hal/src/main/native/cpp/jni/HAL.cpp
index a9a1f4c1d8..5d0a706cad 100644
--- a/hal/src/main/native/cpp/jni/HAL.cpp
+++ b/hal/src/main/native/cpp/jni/HAL.cpp
@@ -14,12 +14,12 @@
 #include <cstring>
 
 #include <fmt/format.h>
-#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_HAL.h"
 #include "wpi/hal/DriverStation.h"
 #include "wpi/hal/Main.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/HALUtil.cpp b/hal/src/main/native/cpp/jni/HALUtil.cpp
index a645ead720..7f54386c4f 100644
--- a/hal/src/main/native/cpp/jni/HALUtil.cpp
+++ b/hal/src/main/native/cpp/jni/HALUtil.cpp
@@ -13,13 +13,13 @@
 #include <string>
 
 #include <fmt/format.h>
-#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_hardware_hal_HALUtil.h"
 #include "wpi/hal/CAN.h"
 #include "wpi/hal/DriverStation.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/HAL.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
@@ -30,7 +30,8 @@ using namespace wpi::java;
 #define kRIOStatusFeatureNotSupported (kRioStatusOffset - 193)
 #define kRIOStatusResourceNotInitialized -52010
 
-static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_ROBORIO == HAL_Runtime_RoboRIO);
+static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_ROBORIO ==
+              HAL_Runtime_RoboRIO);
 static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_ROBORIO2 ==
               HAL_Runtime_RoboRIO2);
 static_assert(org_wpilib_hardware_hal_HALUtil_RUNTIME_SIMULATION ==
@@ -73,7 +74,8 @@ static const JExceptionInit exceptions[] = {
     {"org/wpilib/hardware/hal/util/BoundaryException", &boundaryExCls},
     {"org/wpilib/hardware/hal/util/AllocationException", &allocationExCls},
     {"org/wpilib/hardware/hal/util/HalHandleException", &halHandleExCls},
-    {"org/wpilib/hardware/hal/util/UncleanStatusException", &uncleanStatusExCls},
+    {"org/wpilib/hardware/hal/util/UncleanStatusException",
+     &uncleanStatusExCls},
     {"java/lang/NullPointerException", &nullPointerEx}};
 
 namespace hal {
diff --git a/hal/src/main/native/cpp/jni/I2CJNI.cpp b/hal/src/main/native/cpp/jni/I2CJNI.cpp
index 56a98af4a9..35425d0222 100644
--- a/hal/src/main/native/cpp/jni/I2CJNI.cpp
+++ b/hal/src/main/native/cpp/jni/I2CJNI.cpp
@@ -6,11 +6,10 @@
 
 #include <cassert>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_I2CJNI.h"
 #include "wpi/hal/I2C.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/NotifierJNI.cpp b/hal/src/main/native/cpp/jni/NotifierJNI.cpp
index 3832769544..90702d3a24 100644
--- a/hal/src/main/native/cpp/jni/NotifierJNI.cpp
+++ b/hal/src/main/native/cpp/jni/NotifierJNI.cpp
@@ -7,11 +7,10 @@
 #include <cassert>
 #include <cstdio>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_NotifierJNI.h"
 #include "wpi/hal/Notifier.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/cpp/jni/PWMJNI.cpp b/hal/src/main/native/cpp/jni/PWMJNI.cpp
index a04e88ade4..6297505ce8 100644
--- a/hal/src/main/native/cpp/jni/PWMJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PWMJNI.cpp
@@ -6,14 +6,13 @@
 
 #include <cassert>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_PWMJNI.h"
 #include "wpi/hal/DIO.h"
 #include "wpi/hal/PWM.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp b/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp
index a59944e6f9..6b6fc185ef 100644
--- a/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp
+++ b/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp
@@ -4,12 +4,11 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_PowerDistributionJNI.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/PowerDistribution.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/cpp/jni/REVPHJNI.cpp b/hal/src/main/native/cpp/jni/REVPHJNI.cpp
index fd1f82c22b..e2b7e1f04a 100644
--- a/hal/src/main/native/cpp/jni/REVPHJNI.cpp
+++ b/hal/src/main/native/cpp/jni/REVPHJNI.cpp
@@ -4,13 +4,12 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_REVPHJNI.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/REVPH.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/jni_util.hpp"
 
 static_assert(
     org_wpilib_hardware_hal_REVPHJNI_COMPRESSOR_CONFIG_TYPE_DISABLED ==
diff --git a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp
index b505e489fa..fa0fb94d6d 100644
--- a/hal/src/main/native/cpp/jni/SerialPortJNI.cpp
+++ b/hal/src/main/native/cpp/jni/SerialPortJNI.cpp
@@ -6,11 +6,10 @@
 
 #include <cassert>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_SerialPortJNI.h"
 #include "wpi/hal/SerialPort.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp b/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp
index a07e4c2024..07bf750161 100644
--- a/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp
+++ b/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp
@@ -7,11 +7,10 @@
 #include <string>
 #include <vector>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_SimDeviceJNI.h"
 #include "wpi/hal/SimDevice.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
diff --git a/hal/src/main/native/cpp/jni/UsageReportingJNI.cpp b/hal/src/main/native/cpp/jni/UsageReportingJNI.cpp
index e18d271d31..c57039b853 100644
--- a/hal/src/main/native/cpp/jni/UsageReportingJNI.cpp
+++ b/hal/src/main/native/cpp/jni/UsageReportingJNI.cpp
@@ -6,11 +6,10 @@
 
 #include <cassert>
 
-#include "wpi/util/jni_util.hpp"
-#include "wpi/util/string.h"
-
 #include "org_wpilib_hardware_hal_UsageReportingJNI.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/util/jni_util.hpp"
+#include "wpi/util/string.h"
 
 using namespace wpi::java;
 
diff --git a/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp b/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp
index fa643ea61a..b12de5eba6 100644
--- a/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp
@@ -9,11 +9,10 @@
 #include <cstdio>
 #include <memory>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "SimulatorJNI.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace hal::sim;
diff --git a/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.h b/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.h
index e006879302..2a681ffbd7 100644
--- a/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.h
+++ b/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.h
@@ -6,13 +6,12 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "SimulatorJNI.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/Value.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
 #include "wpi/hal/simulation/NotifyListener.h"
+#include "wpi/util/jni_util.hpp"
 
 namespace hal::sim {
 class BufferCallbackStore {
diff --git a/hal/src/main/native/cpp/jni/simulation/CallbackStore.cpp b/hal/src/main/native/cpp/jni/simulation/CallbackStore.cpp
index 6b33ed8a32..2156ee892e 100644
--- a/hal/src/main/native/cpp/jni/simulation/CallbackStore.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/CallbackStore.cpp
@@ -9,12 +9,11 @@
 #include <cstdio>
 #include <memory>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "SimulatorJNI.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/Value.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace hal::sim;
diff --git a/hal/src/main/native/cpp/jni/simulation/CallbackStore.h b/hal/src/main/native/cpp/jni/simulation/CallbackStore.h
index 9e0f386407..079d2e16cd 100644
--- a/hal/src/main/native/cpp/jni/simulation/CallbackStore.h
+++ b/hal/src/main/native/cpp/jni/simulation/CallbackStore.h
@@ -6,13 +6,12 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "SimulatorJNI.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/Value.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
 #include "wpi/hal/simulation/NotifyListener.h"
+#include "wpi/util/jni_util.hpp"
 
 namespace hal::sim {
 class CallbackStore {
diff --git a/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp b/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp
index aa3cc4c314..69a4aeaa45 100644
--- a/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp
@@ -9,11 +9,10 @@
 #include <cstdio>
 #include <memory>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "SimulatorJNI.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace hal::sim;
diff --git a/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.h b/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.h
index fee5f736d6..97f4b4b8d2 100644
--- a/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.h
+++ b/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.h
@@ -6,13 +6,12 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "SimulatorJNI.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/Value.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
 #include "wpi/hal/simulation/NotifyListener.h"
+#include "wpi/util/jni_util.hpp"
 
 namespace hal::sim {
 class ConstBufferCallbackStore {
diff --git a/hal/src/main/native/cpp/jni/simulation/DriverStationDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/DriverStationDataJNI.cpp
index 91488e816d..4b4737d7a0 100644
--- a/hal/src/main/native/cpp/jni/simulation/DriverStationDataJNI.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/DriverStationDataJNI.cpp
@@ -4,13 +4,12 @@
 
 #include <jni.h>
 
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/jni_util.hpp"
-
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_DriverStationDataJNI.h"
 #include "wpi/hal/simulation/DriverStationData.h"
 #include "wpi/hal/simulation/MockHooks.h"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/simulation/RoboRioDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/RoboRioDataJNI.cpp
index 2f85288c27..75485a8870 100644
--- a/hal/src/main/native/cpp/jni/simulation/RoboRioDataJNI.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/RoboRioDataJNI.cpp
@@ -4,11 +4,10 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_RoboRioDataJNI.h"
 #include "wpi/hal/simulation/RoboRioData.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace wpi::java;
diff --git a/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp
index b5f97a5a0a..76457b58c3 100644
--- a/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp
@@ -12,12 +12,11 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "SimulatorJNI.h"
 #include "org_wpilib_hardware_hal_simulation_SimDeviceDataJNI.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
 #include "wpi/hal/simulation/SimDeviceData.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace hal;
 using namespace wpi::java;
@@ -317,8 +316,8 @@ bool InitializeSimDeviceDataJNI(JNIEnv* env) {
     return false;
   }
 
-  simValueInfoCls =
-      JClass(env, "org/wpilib/hardware/hal/simulation/SimDeviceDataJNI$SimValueInfo");
+  simValueInfoCls = JClass(
+      env, "org/wpilib/hardware/hal/simulation/SimDeviceDataJNI$SimValueInfo");
   if (!simValueInfoCls) {
     return false;
   }
diff --git a/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp b/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp
index 3013487270..f72381052c 100644
--- a/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp
@@ -4,8 +4,6 @@
 
 #include "SimulatorJNI.h"
 
-#include "wpi/util/jni_util.hpp"
-
 #include "BufferCallbackStore.h"
 #include "CallbackStore.h"
 #include "ConstBufferCallbackStore.h"
@@ -14,6 +12,7 @@
 #include "wpi/hal/HAL.h"
 #include "wpi/hal/handles/HandlesInternal.h"
 #include "wpi/hal/simulation/MockHooks.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
diff --git a/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.h b/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.h
index 0dfaf26893..2d5181753a 100644
--- a/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.h
+++ b/hal/src/main/native/cpp/jni/simulation/SimulatorJNI.h
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/hal/Types.h"
 #include "jni.h"
+#include "wpi/hal/Types.h"
 
 using SIM_JniHandle = HAL_Handle;  // NOLINT
 
diff --git a/hal/src/main/native/cpp/proto/ControlDataProto.cpp b/hal/src/main/native/cpp/proto/ControlDataProto.cpp
index 669a26c28b..3bc22fa0c1 100644
--- a/hal/src/main/native/cpp/proto/ControlDataProto.cpp
+++ b/hal/src/main/native/cpp/proto/ControlDataProto.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpi/hal/proto/ControlData.h"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 static_assert(sizeof(mrc::ControlFlags) == sizeof(uint32_t));
 
diff --git a/hal/src/main/native/cpp/proto/ErrorInfoProto.cpp b/hal/src/main/native/cpp/proto/ErrorInfoProto.cpp
index 79a21e5c43..f2f3fa9864 100644
--- a/hal/src/main/native/cpp/proto/ErrorInfoProto.cpp
+++ b/hal/src/main/native/cpp/proto/ErrorInfoProto.cpp
@@ -5,9 +5,8 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpi/hal/proto/ErrorInfo.h"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 std::optional<mrc::ErrorInfo> wpi::Protobuf<mrc::ErrorInfo>::Unpack(
     InputStream& Stream) {
diff --git a/hal/src/main/native/cpp/proto/JoystickDescriptorProto.cpp b/hal/src/main/native/cpp/proto/JoystickDescriptorProto.cpp
index e612f977b8..acf5218724 100644
--- a/hal/src/main/native/cpp/proto/JoystickDescriptorProto.cpp
+++ b/hal/src/main/native/cpp/proto/JoystickDescriptorProto.cpp
@@ -5,9 +5,8 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpi/hal/proto/JoystickDescriptor.h"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 std::optional<mrc::JoystickDescriptor>
 wpi::Protobuf<mrc::JoystickDescriptor>::Unpack(InputStream& Stream) {
diff --git a/hal/src/main/native/cpp/proto/JoystickRumbleDataProto.cpp b/hal/src/main/native/cpp/proto/JoystickRumbleDataProto.cpp
index 382a771286..ff793f8b0a 100644
--- a/hal/src/main/native/cpp/proto/JoystickRumbleDataProto.cpp
+++ b/hal/src/main/native/cpp/proto/JoystickRumbleDataProto.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpi/hal/proto/JoystickRumbleData.h"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 std::optional<mrc::JoystickRumbleData>
 wpi::Protobuf<mrc::JoystickRumbleData>::Unpack(InputStream& Stream) {
diff --git a/hal/src/main/native/cpp/proto/MatchInfoProto.cpp b/hal/src/main/native/cpp/proto/MatchInfoProto.cpp
index d0cf4d0a33..0f1c6526d6 100644
--- a/hal/src/main/native/cpp/proto/MatchInfoProto.cpp
+++ b/hal/src/main/native/cpp/proto/MatchInfoProto.cpp
@@ -5,9 +5,8 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpi/hal/proto/MatchInfo.h"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 std::optional<mrc::MatchInfo> wpi::Protobuf<mrc::MatchInfo>::Unpack(
     InputStream& Stream) {
diff --git a/hal/src/main/native/cpp/proto/OpModeProto.cpp b/hal/src/main/native/cpp/proto/OpModeProto.cpp
index fd51258567..4f8fe862c9 100644
--- a/hal/src/main/native/cpp/proto/OpModeProto.cpp
+++ b/hal/src/main/native/cpp/proto/OpModeProto.cpp
@@ -6,9 +6,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpi/hal/proto/OpMode.h"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 std::optional<mrc::OpMode> wpi::Protobuf<mrc::OpMode>::Unpack(
     InputStream& Stream) {
diff --git a/hal/src/main/native/include/wpi/hal/AddressableLEDTypes.h b/hal/src/main/native/include/wpi/hal/AddressableLEDTypes.h
index 338483c518..5d5f8c2bc2 100644
--- a/hal/src/main/native/include/wpi/hal/AddressableLEDTypes.h
+++ b/hal/src/main/native/include/wpi/hal/AddressableLEDTypes.h
@@ -4,9 +4,10 @@
 
 #pragma once
 
-#include "wpi/hal/Types.h"
 #include <stdint.h>
 
+#include "wpi/hal/Types.h"
+
 /** max length of LED strip supported by device. */
 #define HAL_kAddressableLEDMaxLength 1024
 
diff --git a/hal/src/main/native/include/wpi/hal/CAN.h b/hal/src/main/native/include/wpi/hal/CAN.h
index 21ace70147..e7541049fe 100644
--- a/hal/src/main/native/include/wpi/hal/CAN.h
+++ b/hal/src/main/native/include/wpi/hal/CAN.h
@@ -4,9 +4,10 @@
 
 #pragma once
 
+#include <stdint.h>
+
 #include "wpi/hal/CANAPITypes.h"
 #include "wpi/hal/Types.h"
-#include <stdint.h>
 
 /**
  * @defgroup hal_can CAN Functions
diff --git a/hal/src/main/native/include/wpi/hal/DriverStation.h b/hal/src/main/native/include/wpi/hal/DriverStation.h
index 103833567e..c1af5b605d 100644
--- a/hal/src/main/native/include/wpi/hal/DriverStation.h
+++ b/hal/src/main/native/include/wpi/hal/DriverStation.h
@@ -8,11 +8,10 @@
 
 #include <stddef.h>  //NOLINT
 
-#include "wpi/util/Synchronization.h"
-#include "wpi/util/string.h"
-
 #include "wpi/hal/DriverStationTypes.h"
 #include "wpi/hal/Types.h"
+#include "wpi/util/Synchronization.h"
+#include "wpi/util/string.h"
 
 /**
  * @defgroup hal_driverstation Driver Station Functions
diff --git a/hal/src/main/native/include/wpi/hal/HALBase.h b/hal/src/main/native/include/wpi/hal/HALBase.h
index ec6d139c25..107878e6e9 100644
--- a/hal/src/main/native/include/wpi/hal/HALBase.h
+++ b/hal/src/main/native/include/wpi/hal/HALBase.h
@@ -14,9 +14,8 @@
 
 #endif
 
-#include "wpi/util/string.h"
-
 #include "wpi/hal/Types.h"
+#include "wpi/util/string.h"
 
 /**
  * @defgroup hal_capi WPILib HAL API
diff --git a/hal/src/main/native/include/wpi/hal/Notifier.h b/hal/src/main/native/include/wpi/hal/Notifier.h
index f734c22856..ebed422a41 100644
--- a/hal/src/main/native/include/wpi/hal/Notifier.h
+++ b/hal/src/main/native/include/wpi/hal/Notifier.h
@@ -6,9 +6,8 @@
 
 #include <stdint.h>
 
-#include "wpi/util/nodiscard.h"
-
 #include "wpi/hal/Types.h"
+#include "wpi/util/nodiscard.h"
 
 /**
  * @defgroup hal_notifier Notifier Functions
diff --git a/hal/src/main/native/include/wpi/hal/handles/DigitalHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/DigitalHandleResource.h
index f581fc5a16..1c7384f0ad 100644
--- a/hal/src/main/native/include/wpi/hal/handles/DigitalHandleResource.h
+++ b/hal/src/main/native/include/wpi/hal/handles/DigitalHandleResource.h
@@ -9,11 +9,10 @@
 #include <array>
 #include <memory>
 
-#include "wpi/util/mutex.hpp"
-
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/mutex.hpp"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/wpi/hal/handles/HandlesInternal.h b/hal/src/main/native/include/wpi/hal/handles/HandlesInternal.h
index d650e3b100..58cc35f3cf 100644
--- a/hal/src/main/native/include/wpi/hal/handles/HandlesInternal.h
+++ b/hal/src/main/native/include/wpi/hal/handles/HandlesInternal.h
@@ -6,9 +6,8 @@
 
 #include <stdint.h>
 
-#include "wpi/util/Synchronization.h"
-
 #include "wpi/hal/Types.h"
+#include "wpi/util/Synchronization.h"
 
 /* General Handle Data Layout
  * Bits 0-15:  Handle Index
diff --git a/hal/src/main/native/include/wpi/hal/handles/IndexedClassedHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/IndexedClassedHandleResource.h
index 8951820ee8..0666192e06 100644
--- a/hal/src/main/native/include/wpi/hal/handles/IndexedClassedHandleResource.h
+++ b/hal/src/main/native/include/wpi/hal/handles/IndexedClassedHandleResource.h
@@ -10,11 +10,10 @@
 #include <memory>
 #include <vector>
 
-#include "wpi/util/mutex.hpp"
-
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/mutex.hpp"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/wpi/hal/handles/IndexedHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/IndexedHandleResource.h
index e3ced63559..9b201c230d 100644
--- a/hal/src/main/native/include/wpi/hal/handles/IndexedHandleResource.h
+++ b/hal/src/main/native/include/wpi/hal/handles/IndexedHandleResource.h
@@ -9,11 +9,10 @@
 #include <array>
 #include <memory>
 
-#include "wpi/util/mutex.hpp"
-
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/mutex.hpp"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/wpi/hal/handles/LimitedClassedHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/LimitedClassedHandleResource.h
index 8c0d15f84b..3f6003243d 100644
--- a/hal/src/main/native/include/wpi/hal/handles/LimitedClassedHandleResource.h
+++ b/hal/src/main/native/include/wpi/hal/handles/LimitedClassedHandleResource.h
@@ -9,10 +9,9 @@
 #include <array>
 #include <memory>
 
-#include "wpi/util/mutex.hpp"
-
 #include "wpi/hal/Types.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/mutex.hpp"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/wpi/hal/handles/LimitedHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/LimitedHandleResource.h
index d929e45379..f0b5a17563 100644
--- a/hal/src/main/native/include/wpi/hal/handles/LimitedHandleResource.h
+++ b/hal/src/main/native/include/wpi/hal/handles/LimitedHandleResource.h
@@ -9,10 +9,9 @@
 #include <array>
 #include <memory>
 
-#include "wpi/util/mutex.hpp"
-
 #include "HandlesInternal.h"
 #include "wpi/hal/Types.h"
+#include "wpi/util/mutex.hpp"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/wpi/hal/handles/UnlimitedHandleResource.h b/hal/src/main/native/include/wpi/hal/handles/UnlimitedHandleResource.h
index a8770a8be1..c94beae210 100644
--- a/hal/src/main/native/include/wpi/hal/handles/UnlimitedHandleResource.h
+++ b/hal/src/main/native/include/wpi/hal/handles/UnlimitedHandleResource.h
@@ -10,10 +10,9 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/mutex.hpp"
-
 #include "wpi/hal/Types.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/mutex.hpp"
 
 namespace hal {
 
diff --git a/hal/src/main/native/include/wpi/hal/proto/ControlData.h b/hal/src/main/native/include/wpi/hal/proto/ControlData.h
index f4dfc64151..4afd22f2e1 100644
--- a/hal/src/main/native/include/wpi/hal/proto/ControlData.h
+++ b/hal/src/main/native/include/wpi/hal/proto/ControlData.h
@@ -6,10 +6,9 @@
 
 #include <stdint.h>
 
-#include "wpi/util/protobuf/Protobuf.hpp"
-
 #include "MrcComm.npb.h"
 #include "mrc/NetComm.h"
+#include "wpi/util/protobuf/Protobuf.hpp"
 
 template <>
 struct wpi::Protobuf<mrc::ControlData> {
diff --git a/hal/src/main/native/include/wpi/hal/proto/ErrorInfo.h b/hal/src/main/native/include/wpi/hal/proto/ErrorInfo.h
index c3c2dffb41..59db959785 100644
--- a/hal/src/main/native/include/wpi/hal/proto/ErrorInfo.h
+++ b/hal/src/main/native/include/wpi/hal/proto/ErrorInfo.h
@@ -6,10 +6,9 @@
 
 #include <stdint.h>
 
-#include "wpi/util/protobuf/Protobuf.hpp"
-
 #include "MrcComm.npb.h"
 #include "mrc/NetComm.h"
+#include "wpi/util/protobuf/Protobuf.hpp"
 
 template <>
 struct wpi::Protobuf<mrc::ErrorInfo> {
diff --git a/hal/src/main/native/include/wpi/hal/proto/JoystickDescriptor.h b/hal/src/main/native/include/wpi/hal/proto/JoystickDescriptor.h
index 6c615eafc1..14fc86f238 100644
--- a/hal/src/main/native/include/wpi/hal/proto/JoystickDescriptor.h
+++ b/hal/src/main/native/include/wpi/hal/proto/JoystickDescriptor.h
@@ -6,10 +6,9 @@
 
 #include <stdint.h>
 
-#include "wpi/util/protobuf/Protobuf.hpp"
-
 #include "MrcComm.npb.h"
 #include "mrc/NetComm.h"
+#include "wpi/util/protobuf/Protobuf.hpp"
 
 template <>
 struct wpi::Protobuf<mrc::JoystickDescriptor> {
diff --git a/hal/src/main/native/include/wpi/hal/proto/JoystickRumbleData.h b/hal/src/main/native/include/wpi/hal/proto/JoystickRumbleData.h
index a3f3b6abd6..4a7b9b1ff1 100644
--- a/hal/src/main/native/include/wpi/hal/proto/JoystickRumbleData.h
+++ b/hal/src/main/native/include/wpi/hal/proto/JoystickRumbleData.h
@@ -6,10 +6,9 @@
 
 #include <stdint.h>
 
-#include "wpi/util/protobuf/Protobuf.hpp"
-
 #include "MrcComm.npb.h"
 #include "mrc/NetComm.h"
+#include "wpi/util/protobuf/Protobuf.hpp"
 
 template <>
 struct wpi::Protobuf<mrc::JoystickRumbleData> {
diff --git a/hal/src/main/native/include/wpi/hal/proto/MatchInfo.h b/hal/src/main/native/include/wpi/hal/proto/MatchInfo.h
index fa3c155258..da54907ee0 100644
--- a/hal/src/main/native/include/wpi/hal/proto/MatchInfo.h
+++ b/hal/src/main/native/include/wpi/hal/proto/MatchInfo.h
@@ -6,10 +6,9 @@
 
 #include <stdint.h>
 
-#include "wpi/util/protobuf/Protobuf.hpp"
-
 #include "MrcComm.npb.h"
 #include "mrc/NetComm.h"
+#include "wpi/util/protobuf/Protobuf.hpp"
 
 template <>
 struct wpi::Protobuf<mrc::MatchInfo> {
diff --git a/hal/src/main/native/include/wpi/hal/proto/OpMode.h b/hal/src/main/native/include/wpi/hal/proto/OpMode.h
index ab73dc8923..477af5c73e 100644
--- a/hal/src/main/native/include/wpi/hal/proto/OpMode.h
+++ b/hal/src/main/native/include/wpi/hal/proto/OpMode.h
@@ -8,10 +8,9 @@
 
 #include <vector>
 
-#include "wpi/util/protobuf/Protobuf.hpp"
-
 #include "MrcComm.npb.h"
 #include "mrc/NetComm.h"
+#include "wpi/util/protobuf/Protobuf.hpp"
 
 template <>
 struct wpi::Protobuf<mrc::OpMode> {
diff --git a/hal/src/main/native/include/wpi/hal/proto/VersionInfo.h b/hal/src/main/native/include/wpi/hal/proto/VersionInfo.h
index 5aefcfcaf1..4072c1c08c 100644
--- a/hal/src/main/native/include/wpi/hal/proto/VersionInfo.h
+++ b/hal/src/main/native/include/wpi/hal/proto/VersionInfo.h
@@ -6,10 +6,9 @@
 
 #include <stdint.h>
 
-#include "wpi/util/protobuf/Protobuf.hpp"
-
 #include "MrcComm.npb.h"
 #include "mrc/NetComm.h"
+#include "wpi/util/protobuf/Protobuf.hpp"
 
 template <>
 struct wpi::Protobuf<mrc::VersionInfo> {
diff --git a/hal/src/main/native/include/wpi/hal/simulation/DriverStationData.h b/hal/src/main/native/include/wpi/hal/simulation/DriverStationData.h
index 90eb0bb95c..4bde0b817c 100644
--- a/hal/src/main/native/include/wpi/hal/simulation/DriverStationData.h
+++ b/hal/src/main/native/include/wpi/hal/simulation/DriverStationData.h
@@ -6,11 +6,10 @@
 
 #include <cstddef>
 
-#include "wpi/util/string.h"
-
 #include "wpi/hal/DriverStationTypes.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/simulation/NotifyListener.h"
+#include "wpi/util/string.h"
 
 typedef void (*HAL_JoystickAxesCallback)(const char* name, void* param,
                                          int32_t joystickNum,
diff --git a/hal/src/main/native/include/wpi/hal/simulation/RoboRioData.h b/hal/src/main/native/include/wpi/hal/simulation/RoboRioData.h
index e5abe2a2f2..b17a12281f 100644
--- a/hal/src/main/native/include/wpi/hal/simulation/RoboRioData.h
+++ b/hal/src/main/native/include/wpi/hal/simulation/RoboRioData.h
@@ -6,10 +6,9 @@
 
 #include <cstddef>
 
-#include "wpi/util/string.h"
-
 #include "wpi/hal/Types.h"
 #include "wpi/hal/simulation/NotifyListener.h"
+#include "wpi/util/string.h"
 
 typedef void (*HAL_RoboRioStringCallback)(const char* name, void* param,
                                           const char* str, size_t size);
diff --git a/hal/src/main/native/include/wpi/hal/simulation/SimCallbackRegistry.h b/hal/src/main/native/include/wpi/hal/simulation/SimCallbackRegistry.h
index 071b00f2ab..b3d9b00e54 100644
--- a/hal/src/main/native/include/wpi/hal/simulation/SimCallbackRegistry.h
+++ b/hal/src/main/native/include/wpi/hal/simulation/SimCallbackRegistry.h
@@ -7,12 +7,11 @@
 #include <memory>
 #include <utility>
 
+#include "wpi/hal/simulation/NotifyListener.h"
 #include "wpi/util/Compiler.hpp"
 #include "wpi/util/UidVector.hpp"
 #include "wpi/util/spinlock.hpp"
 
-#include "wpi/hal/simulation/NotifyListener.h"
-
 namespace hal {
 
 namespace impl {
diff --git a/hal/src/main/native/include/wpi/hal/simulation/SimDataValue.h b/hal/src/main/native/include/wpi/hal/simulation/SimDataValue.h
index ec87b57025..9d62f03a2a 100644
--- a/hal/src/main/native/include/wpi/hal/simulation/SimDataValue.h
+++ b/hal/src/main/native/include/wpi/hal/simulation/SimDataValue.h
@@ -6,13 +6,12 @@
 
 #include <memory>
 
+#include "wpi/hal/simulation/NotifyListener.h"
+#include "wpi/hal/simulation/SimCallbackRegistry.h"
 #include "wpi/util/Compiler.hpp"
 #include "wpi/util/UidVector.hpp"
 #include "wpi/util/spinlock.hpp"
 
-#include "wpi/hal/simulation/NotifyListener.h"
-#include "wpi/hal/simulation/SimCallbackRegistry.h"
-
 namespace hal {
 
 namespace impl {
diff --git a/hal/src/main/native/sim/AddressableLED.cpp b/hal/src/main/native/sim/AddressableLED.cpp
index e34e4eea05..8856e7438b 100644
--- a/hal/src/main/native/sim/AddressableLED.cpp
+++ b/hal/src/main/native/sim/AddressableLED.cpp
@@ -10,10 +10,10 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/AddressableLEDDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/HandlesInternal.h"
 #include "wpi/hal/handles/IndexedHandleResource.h"
-#include "mockdata/AddressableLEDDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/AnalogInput.cpp b/hal/src/main/native/sim/AnalogInput.cpp
index 2e7c45080d..ca4e5ec81d 100644
--- a/hal/src/main/native/sim/AnalogInput.cpp
+++ b/hal/src/main/native/sim/AnalogInput.cpp
@@ -8,8 +8,8 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "wpi/hal/handles/HandlesInternal.h"
 #include "mockdata/AnalogInDataInternal.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/CANAPI.cpp b/hal/src/main/native/sim/CANAPI.cpp
index 202f4c3202..901899e5e2 100644
--- a/hal/src/main/native/sim/CANAPI.cpp
+++ b/hal/src/main/native/sim/CANAPI.cpp
@@ -7,15 +7,14 @@
 #include <ctime>
 #include <memory>
 
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/mutex.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "HALInitializer.h"
 #include "PortsInternal.h"
 #include "wpi/hal/CAN.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/CTREPCM.cpp b/hal/src/main/native/sim/CTREPCM.cpp
index 58f01b458c..121fc7ce12 100644
--- a/hal/src/main/native/sim/CTREPCM.cpp
+++ b/hal/src/main/native/sim/CTREPCM.cpp
@@ -9,9 +9,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/CTREPCMDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/IndexedHandleResource.h"
-#include "mockdata/CTREPCMDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/DIO.cpp b/hal/src/main/native/sim/DIO.cpp
index bc7e3859b0..458f629f7a 100644
--- a/hal/src/main/native/sim/DIO.cpp
+++ b/hal/src/main/native/sim/DIO.cpp
@@ -8,10 +8,10 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "wpi/hal/handles/HandlesInternal.h"
-#include "wpi/hal/handles/LimitedHandleResource.h"
 #include "mockdata/DIODataInternal.h"
 #include "mockdata/DigitalPWMDataInternal.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/LimitedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/DriverStation.cpp b/hal/src/main/native/sim/DriverStation.cpp
index c55d504967..e2011d52e3 100644
--- a/hal/src/main/native/sim/DriverStation.cpp
+++ b/hal/src/main/native/sim/DriverStation.cpp
@@ -15,15 +15,15 @@
 #include <string>
 
 #include <fmt/format.h>
-#include "wpi/util/EventVector.hpp"
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/mutex.hpp"
 
 #include "HALInitializer.h"
+#include "mockdata/DriverStationDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/cpp/fpga_clock.h"
 #include "wpi/hal/simulation/MockHooks.h"
-#include "mockdata/DriverStationDataInternal.h"
+#include "wpi/util/EventVector.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
 
 static wpi::mutex msgMutex;
 static std::atomic<HALSIM_SendErrorHandler> sendErrorHandler{nullptr};
diff --git a/hal/src/main/native/sim/DutyCycle.cpp b/hal/src/main/native/sim/DutyCycle.cpp
index 176e68bf1d..cff3f145cb 100644
--- a/hal/src/main/native/sim/DutyCycle.cpp
+++ b/hal/src/main/native/sim/DutyCycle.cpp
@@ -9,10 +9,10 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/DutyCycleDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/HandlesInternal.h"
 #include "wpi/hal/handles/IndexedHandleResource.h"
-#include "mockdata/DutyCycleDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/Encoder.cpp b/hal/src/main/native/sim/Encoder.cpp
index ad796996d9..45a7ad5d40 100644
--- a/hal/src/main/native/sim/Encoder.cpp
+++ b/hal/src/main/native/sim/Encoder.cpp
@@ -10,10 +10,10 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/EncoderDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/HandlesInternal.h"
 #include "wpi/hal/handles/LimitedHandleResource.h"
-#include "mockdata/EncoderDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/HAL.cpp b/hal/src/main/native/sim/HAL.cpp
index 58bea9fd85..1dd59a3d39 100644
--- a/hal/src/main/native/sim/HAL.cpp
+++ b/hal/src/main/native/sim/HAL.cpp
@@ -9,9 +9,6 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/mutex.hpp"
-#include "wpi/util/spinlock.hpp"
-
 #ifdef _WIN32
 #include <Windows.h>
 #pragma comment(lib, "Winmm.lib")
@@ -26,12 +23,14 @@ NtQueryTimerResolution(PULONG MinimumResolution, PULONG MaximumResolution,
 #include "ErrorsInternal.h"
 #include "HALInitializer.h"
 #include "MockHooksInternal.h"
+#include "mockdata/RoboRioDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/Extensions.h"
 #include "wpi/hal/handles/HandlesInternal.h"
 #include "wpi/hal/simulation/DriverStationData.h"
 #include "wpi/hal/simulation/SimCallbackRegistry.h"
-#include "mockdata/RoboRioDataInternal.h"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/spinlock.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/MockHooks.cpp b/hal/src/main/native/sim/MockHooks.cpp
index abe6f77ed6..85f24d6347 100644
--- a/hal/src/main/native/sim/MockHooks.cpp
+++ b/hal/src/main/native/sim/MockHooks.cpp
@@ -8,12 +8,11 @@
 #include <cstdio>
 #include <thread>
 
-#include "wpi/util/print.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "MockHooksInternal.h"
 #include "NotifierInternal.h"
 #include "wpi/hal/simulation/NotifierData.h"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 static std::atomic<bool> programStarted{false};
 
diff --git a/hal/src/main/native/sim/Notifier.cpp b/hal/src/main/native/sim/Notifier.cpp
index a8f161488d..fea0261a6a 100644
--- a/hal/src/main/native/sim/Notifier.cpp
+++ b/hal/src/main/native/sim/Notifier.cpp
@@ -12,11 +12,6 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/mutex.hpp"
-
 #include "HALInitializer.h"
 #include "NotifierInternal.h"
 #include "wpi/hal/Errors.h"
@@ -24,6 +19,10 @@
 #include "wpi/hal/cpp/fpga_clock.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
 #include "wpi/hal/simulation/NotifierData.h"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace {
 struct Notifier {
diff --git a/hal/src/main/native/sim/PWM.cpp b/hal/src/main/native/sim/PWM.cpp
index b6954728b3..09209fd21b 100644
--- a/hal/src/main/native/sim/PWM.cpp
+++ b/hal/src/main/native/sim/PWM.cpp
@@ -12,8 +12,8 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "wpi/hal/handles/HandlesInternal.h"
 #include "mockdata/PWMDataInternal.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/PowerDistribution.cpp b/hal/src/main/native/sim/PowerDistribution.cpp
index 7ca81efe53..8afcf6c3fc 100644
--- a/hal/src/main/native/sim/PowerDistribution.cpp
+++ b/hal/src/main/native/sim/PowerDistribution.cpp
@@ -10,9 +10,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/PowerDistributionDataInternal.h"
 #include "wpi/hal/CANAPI.h"
 #include "wpi/hal/Errors.h"
-#include "mockdata/PowerDistributionDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/REVPH.cpp b/hal/src/main/native/sim/REVPH.cpp
index f72fcc081e..56967c84ea 100644
--- a/hal/src/main/native/sim/REVPH.cpp
+++ b/hal/src/main/native/sim/REVPH.cpp
@@ -9,9 +9,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "mockdata/REVPHDataInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/IndexedHandleResource.h"
-#include "mockdata/REVPHDataInternal.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h b/hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h
index bc5961452c..2b217a1eca 100644
--- a/hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h
@@ -6,11 +6,10 @@
 
 #include <vector>
 
-#include "wpi/util/spinlock.hpp"
-
 #include "wpi/hal/simulation/AddressableLEDData.h"
 #include "wpi/hal/simulation/SimCallbackRegistry.h"
 #include "wpi/hal/simulation/SimDataValue.h"
+#include "wpi/util/spinlock.hpp"
 
 namespace hal {
 class AddressableLEDData {
diff --git a/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h b/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h
index f5591c1ed3..1f007e9ebe 100644
--- a/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/DriverStationDataInternal.h
@@ -6,11 +6,10 @@
 
 #include <memory>
 
-#include "wpi/util/spinlock.hpp"
-
 #include "wpi/hal/simulation/DriverStationData.h"
 #include "wpi/hal/simulation/SimCallbackRegistry.h"
 #include "wpi/hal/simulation/SimDataValue.h"
+#include "wpi/util/spinlock.hpp"
 
 namespace hal {
 
diff --git a/hal/src/main/native/sim/mockdata/Reset.cpp b/hal/src/main/native/sim/mockdata/Reset.cpp
index da22447437..c3c5f44c77 100644
--- a/hal/src/main/native/sim/mockdata/Reset.cpp
+++ b/hal/src/main/native/sim/mockdata/Reset.cpp
@@ -2,6 +2,7 @@
 // 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 "../PortsInternal.h"
 #include "wpi/hal/simulation/AddressableLEDData.h"
 #include "wpi/hal/simulation/AnalogInData.h"
 #include "wpi/hal/simulation/CTREPCMData.h"
@@ -18,8 +19,6 @@
 #include "wpi/hal/simulation/RoboRioData.h"
 #include "wpi/hal/simulation/SimDeviceData.h"
 
-#include "../PortsInternal.h"
-
 extern "C" void HALSIM_ResetAllSimData(void) {
   for (int32_t i = 0; i < hal::kNumAddressableLEDs; i++) {
     HALSIM_ResetAddressableLEDData(i);
diff --git a/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h b/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h
index 559015d49b..5c9c0ca63f 100644
--- a/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/RoboRioDataInternal.h
@@ -7,10 +7,9 @@
 #include <cstddef>
 #include <string>
 
-#include "wpi/util/spinlock.hpp"
-
 #include "wpi/hal/simulation/RoboRioData.h"
 #include "wpi/hal/simulation/SimDataValue.h"
+#include "wpi/util/spinlock.hpp"
 
 namespace hal {
 class RoboRioData {
diff --git a/hal/src/main/native/sim/mockdata/SimDeviceData.cpp b/hal/src/main/native/sim/mockdata/SimDeviceData.cpp
index 44ae17bf9c..045692eada 100644
--- a/hal/src/main/native/sim/mockdata/SimDeviceData.cpp
+++ b/hal/src/main/native/sim/mockdata/SimDeviceData.cpp
@@ -8,9 +8,8 @@
 #include <memory>
 #include <utility>
 
-#include "wpi/util/StringExtras.hpp"
-
 #include "SimDeviceDataInternal.h"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h b/hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h
index f26e76aa48..6f8839139c 100644
--- a/hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h
+++ b/hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h
@@ -11,15 +11,14 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/hal/Value.h"
+#include "wpi/hal/simulation/SimCallbackRegistry.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/UidVector.hpp"
 #include "wpi/util/spinlock.hpp"
 
-#include "wpi/hal/Value.h"
-#include "wpi/hal/simulation/SimCallbackRegistry.h"
-#include "wpi/hal/simulation/SimDeviceData.h"
-
 namespace hal {
 
 namespace impl {
diff --git a/hal/src/main/native/systemcore/AddressableLED.cpp b/hal/src/main/native/systemcore/AddressableLED.cpp
index 5dc5af06c2..f193276c6a 100644
--- a/hal/src/main/native/systemcore/AddressableLED.cpp
+++ b/hal/src/main/native/systemcore/AddressableLED.cpp
@@ -12,8 +12,6 @@
 #include <thread>
 
 #include <fmt/format.h>
-#include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/nt/RawTopic.hpp"
 
 #include "AddressableLEDSimd.h"
 #include "HALInitializer.h"
@@ -24,6 +22,8 @@
 #include "wpi/hal/AddressableLEDTypes.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/cpp/fpga_clock.h"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/RawTopic.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/systemcore/AddressableLEDSimd.h b/hal/src/main/native/systemcore/AddressableLEDSimd.h
index d35420461e..eddda08892 100644
--- a/hal/src/main/native/systemcore/AddressableLEDSimd.h
+++ b/hal/src/main/native/systemcore/AddressableLEDSimd.h
@@ -5,8 +5,8 @@
 #pragma once
 #include <utility>
 
-#include "wpi/hal/AddressableLEDTypes.h"
 #include "simd/simd.h"
+#include "wpi/hal/AddressableLEDTypes.h"
 
 namespace hal::detail {
 
diff --git a/hal/src/main/native/systemcore/AnalogInput.cpp b/hal/src/main/native/systemcore/AnalogInput.cpp
index 715058390e..e471f7b37e 100644
--- a/hal/src/main/native/systemcore/AnalogInput.cpp
+++ b/hal/src/main/native/systemcore/AnalogInput.cpp
@@ -7,8 +7,6 @@
 #include <cstdio>
 #include <thread>
 
-#include "wpi/util/mutex.hpp"
-
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
@@ -16,6 +14,7 @@
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/cpp/fpga_clock.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/mutex.hpp"
 
 namespace hal::init {
 void InitializeAnalogInput() {}
diff --git a/hal/src/main/native/systemcore/CAN.cpp b/hal/src/main/native/systemcore/CAN.cpp
index f3d4a17a39..a76066b1be 100644
--- a/hal/src/main/native/systemcore/CAN.cpp
+++ b/hal/src/main/native/systemcore/CAN.cpp
@@ -17,12 +17,6 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/circular_buffer.hpp"
-#include "wpi/util/mutex.hpp"
-#include "wpi/util/print.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "PortsInternal.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/Threads.h"
@@ -30,6 +24,11 @@
 #include "wpi/net/EventLoopRunner.hpp"
 #include "wpi/net/uv/Poll.hpp"
 #include "wpi/net/uv/Timer.hpp"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/circular_buffer.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/systemcore/CANAPI.cpp b/hal/src/main/native/systemcore/CANAPI.cpp
index 4bcdd66a27..22b3cd21aa 100644
--- a/hal/src/main/native/systemcore/CANAPI.cpp
+++ b/hal/src/main/native/systemcore/CANAPI.cpp
@@ -7,15 +7,14 @@
 #include <ctime>
 #include <memory>
 
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/mutex.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "HALInitializer.h"
 #include "PortsInternal.h"
 #include "wpi/hal/CAN.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/systemcore/CTREPDP.cpp b/hal/src/main/native/systemcore/CTREPDP.cpp
index 578d2376a0..231762dce5 100644
--- a/hal/src/main/native/systemcore/CTREPDP.cpp
+++ b/hal/src/main/native/systemcore/CTREPDP.cpp
@@ -7,7 +7,6 @@
 #include <string>
 
 #include <fmt/format.h>
-#include "wpi/util/mutex.hpp"
 
 #include "HALInitializer.h"
 #include "HALInternal.h"
@@ -16,6 +15,7 @@
 #include "wpi/hal/CANAPI.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/IndexedHandleResource.h"
+#include "wpi/util/mutex.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/systemcore/FRCDriverStation.cpp b/hal/src/main/native/systemcore/FRCDriverStation.cpp
index 7e5b2ccae7..7454dd0e4a 100644
--- a/hal/src/main/native/systemcore/FRCDriverStation.cpp
+++ b/hal/src/main/native/systemcore/FRCDriverStation.cpp
@@ -14,6 +14,18 @@
 #include <vector>
 
 #include <fmt/format.h>
+
+#include "HALInitializer.h"
+#include "SystemServerInternal.h"
+#include "mrc/NtNetComm.h"
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/proto/ControlData.h"
+#include "wpi/hal/proto/ErrorInfo.h"
+#include "wpi/hal/proto/JoystickDescriptor.h"
+#include "wpi/hal/proto/JoystickRumbleData.h"
+#include "wpi/hal/proto/MatchInfo.h"
+#include "wpi/hal/proto/OpMode.h"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/IntegerTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
@@ -27,18 +39,6 @@
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/timestamp.h"
 
-#include "HALInitializer.h"
-#include "SystemServerInternal.h"
-#include "wpi/hal/DriverStation.h"
-#include "wpi/hal/Errors.h"
-#include "wpi/hal/proto/ControlData.h"
-#include "wpi/hal/proto/ErrorInfo.h"
-#include "wpi/hal/proto/JoystickDescriptor.h"
-#include "wpi/hal/proto/JoystickRumbleData.h"
-#include "wpi/hal/proto/MatchInfo.h"
-#include "wpi/hal/proto/OpMode.h"
-#include "mrc/NtNetComm.h"
-
 static_assert(sizeof(int32_t) >= sizeof(int),
               "FRC_NetworkComm status variable is larger than 32 bits");
 
diff --git a/hal/src/main/native/systemcore/HAL.cpp b/hal/src/main/native/systemcore/HAL.cpp
index c59b46e6db..6a3db125f6 100644
--- a/hal/src/main/native/systemcore/HAL.cpp
+++ b/hal/src/main/native/systemcore/HAL.cpp
@@ -17,13 +17,6 @@
 #include <thread>
 #include <utility>
 
-#include "wpi/util/MemoryBuffer.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/fs.hpp"
-#include "wpi/util/mutex.hpp"
-#include "wpi/util/print.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "CANInternal.h"
 #include "HALInitializer.h"
 #include "HALInternal.h"
@@ -32,6 +25,12 @@
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/Notifier.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/MemoryBuffer.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fs.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/systemcore/I2C.cpp b/hal/src/main/native/systemcore/I2C.cpp
index 7520b29e0b..09f6ef6dc8 100644
--- a/hal/src/main/native/systemcore/I2C.cpp
+++ b/hal/src/main/native/systemcore/I2C.cpp
@@ -13,14 +13,14 @@
 #include <cstring>
 
 #include <fmt/format.h>
-#include "wpi/util/mutex.hpp"
-#include "wpi/util/print.hpp"
 
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
 #include "wpi/hal/DIO.h"
 #include "wpi/hal/HAL.h"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/systemcore/IMU.cpp b/hal/src/main/native/systemcore/IMU.cpp
index e7ab4012e4..2e2eb7b22d 100644
--- a/hal/src/main/native/systemcore/IMU.cpp
+++ b/hal/src/main/native/systemcore/IMU.cpp
@@ -6,13 +6,12 @@
 
 #include <numbers>
 
-#include "wpi/nt/DoubleArrayTopic.hpp"
-#include "wpi/nt/DoubleTopic.hpp"
-#include "wpi/nt/NetworkTableInstance.hpp"
-
 #include "HALInitializer.h"
 #include "SystemServerInternal.h"
 #include "wpi/hal/Errors.h"
+#include "wpi/nt/DoubleArrayTopic.hpp"
+#include "wpi/nt/DoubleTopic.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
 
 #define IMU_PREFIX "/imu/"
 
diff --git a/hal/src/main/native/systemcore/Notifier.cpp b/hal/src/main/native/systemcore/Notifier.cpp
index dd174e17ed..cbc2e0757b 100644
--- a/hal/src/main/native/systemcore/Notifier.cpp
+++ b/hal/src/main/native/systemcore/Notifier.cpp
@@ -12,17 +12,16 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/mutex.hpp"
-
 #include "HALInitializer.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/cpp/fpga_clock.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.h"
 #include "wpi/hal/simulation/NotifierData.h"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace {
 struct Notifier {
diff --git a/hal/src/main/native/systemcore/PWM.cpp b/hal/src/main/native/systemcore/PWM.cpp
index 20c3785366..af3048638e 100644
--- a/hal/src/main/native/systemcore/PWM.cpp
+++ b/hal/src/main/native/systemcore/PWM.cpp
@@ -10,7 +10,6 @@
 #include <thread>
 
 #include <fmt/format.h>
-#include "wpi/util/print.hpp"
 
 #include "HALInitializer.h"
 #include "HALInternal.h"
@@ -19,6 +18,7 @@
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/cpp/fpga_clock.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/util/print.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/systemcore/Power.cpp b/hal/src/main/native/systemcore/Power.cpp
index ae001d0a1a..c97001a3e4 100644
--- a/hal/src/main/native/systemcore/Power.cpp
+++ b/hal/src/main/native/systemcore/Power.cpp
@@ -6,12 +6,11 @@
 
 #include <memory>
 
-#include "wpi/nt/DoubleTopic.hpp"
-
 #include "HALInitializer.h"
 #include "SystemServerInternal.h"
-#include "wpi/hal/Errors.h"
 #include "mrc/NtNetComm.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/nt/DoubleTopic.hpp"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/systemcore/REVPDH.cpp b/hal/src/main/native/systemcore/REVPDH.cpp
index ca3872db81..a2b8ad2e4b 100644
--- a/hal/src/main/native/systemcore/REVPDH.cpp
+++ b/hal/src/main/native/systemcore/REVPDH.cpp
@@ -4,13 +4,6 @@
 
 #include "REVPDH.h"
 
-#include "wpi/hal/CAN.h"
-#include "wpi/hal/CANAPI.h"
-#include "wpi/hal/CANAPITypes.h"
-#include "wpi/hal/Errors.h"
-#include "wpi/hal/handles/HandlesInternal.h"
-#include "wpi/hal/handles/IndexedHandleResource.h"
-
 #include <cstring>
 #include <string>
 #include <thread>
@@ -21,6 +14,12 @@
 #include "HALInternal.h"
 #include "PortsInternal.h"
 #include "rev/PDHFrames.h"
+#include "wpi/hal/CAN.h"
+#include "wpi/hal/CANAPI.h"
+#include "wpi/hal/CANAPITypes.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/systemcore/REVPH.cpp b/hal/src/main/native/systemcore/REVPH.cpp
index 4f93529999..4a0cb7f01b 100644
--- a/hal/src/main/native/systemcore/REVPH.cpp
+++ b/hal/src/main/native/systemcore/REVPH.cpp
@@ -12,10 +12,10 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
+#include "rev/PHFrames.h"
 #include "wpi/hal/CANAPI.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/IndexedHandleResource.h"
-#include "rev/PHFrames.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/systemcore/SmartIo.h b/hal/src/main/native/systemcore/SmartIo.h
index a4a371a3b6..916b2abdc8 100644
--- a/hal/src/main/native/systemcore/SmartIo.h
+++ b/hal/src/main/native/systemcore/SmartIo.h
@@ -6,11 +6,10 @@
 
 #include <string>
 
-#include "wpi/nt/IntegerTopic.hpp"
-
 #include "PortsInternal.h"
 #include "wpi/hal/handles/DigitalHandleResource.h"
 #include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/nt/IntegerTopic.hpp"
 
 namespace hal {
 
diff --git a/hal/src/main/native/systemcore/UsageReporting.cpp b/hal/src/main/native/systemcore/UsageReporting.cpp
index f38a69d76b..08c0ae2e5c 100644
--- a/hal/src/main/native/systemcore/UsageReporting.cpp
+++ b/hal/src/main/native/systemcore/UsageReporting.cpp
@@ -5,13 +5,13 @@
 #include <stdint.h>
 
 #include <fmt/format.h>
+
+#include "SystemServerInternal.h"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/string.h"
 
-#include "SystemServerInternal.h"
-
 namespace {
 struct SystemServerUsageReporting {
   nt::NetworkTableInstance ntInst;
diff --git a/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp b/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp
index 1388f7cdab..736101555d 100644
--- a/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp
@@ -6,10 +6,10 @@
 #include <string>
 
 #include <gtest/gtest.h>
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/hal/HAL.h"
 #include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/util/StringExtras.hpp"
 
 namespace hal {
 
diff --git a/ntcore/generate_topics.py b/ntcore/generate_topics.py
index 26b085bca7..dbc79f09ce 100755
--- a/ntcore/generate_topics.py
+++ b/ntcore/generate_topics.py
@@ -97,9 +97,7 @@ def generate_topics(
     )
     template = env.get_template("ntcore_c_types.h.jinja")
     output = template.render(types=types)
-    Output(
-        output_directory / hdr_subdirectory / "wpi/nt", "ntcore_c_types.h", output
-    )
+    Output(output_directory / hdr_subdirectory / "wpi/nt", "ntcore_c_types.h", output)
 
     # C handle API (source)
     c_subdirectory = "main/native/cpp"
diff --git a/ntcore/src/dev/native/cpp/main.cpp b/ntcore/src/dev/native/cpp/main.cpp
index d5e02f420e..1d9b15e5bd 100644
--- a/ntcore/src/dev/native/cpp/main.cpp
+++ b/ntcore/src/dev/native/cpp/main.cpp
@@ -16,15 +16,15 @@
 
 #include <fmt/format.h>
 #include <fmt/ranges.h>
-#include "wpi/util/Synchronization.h"
-#include "wpi/util/print.hpp"
-#include "wpi/util/timestamp.h"
 
 #include "wpi/nt/DoubleArrayTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/ntcore.h"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/Synchronization.h"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 void bench();
 void bench2();
diff --git a/ntcore/src/main/native/cpp/ConnectionList.cpp b/ntcore/src/main/native/cpp/ConnectionList.cpp
index 243ac52b17..1676ee1c90 100644
--- a/ntcore/src/main/native/cpp/ConnectionList.cpp
+++ b/ntcore/src/main/native/cpp/ConnectionList.cpp
@@ -7,13 +7,12 @@
 #include <string>
 #include <vector>
 
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/json.hpp"
-#include "wpi/util/raw_ostream.hpp"
-
 #include "IListenerStorage.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
 using namespace nt;
 
diff --git a/ntcore/src/main/native/cpp/ConnectionList.hpp b/ntcore/src/main/native/cpp/ConnectionList.hpp
index 448f23945d..edf4ef0c3e 100644
--- a/ntcore/src/main/native/cpp/ConnectionList.hpp
+++ b/ntcore/src/main/native/cpp/ConnectionList.hpp
@@ -13,14 +13,13 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/UidVector.hpp"
-#include "wpi/datalog/DataLog.hpp"
-#include "wpi/util/mutex.hpp"
-
 #include "Handle.hpp"
 #include "HandleMap.hpp"
 #include "IConnectionList.hpp"
+#include "wpi/datalog/DataLog.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/UidVector.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/cpp/Handle.hpp b/ntcore/src/main/native/cpp/Handle.hpp
index e17fe192fe..e29a9a627f 100644
--- a/ntcore/src/main/native/cpp/Handle.hpp
+++ b/ntcore/src/main/native/cpp/Handle.hpp
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "wpi/util/Synchronization.h"
-
 #include "wpi/nt/ntcore_c.h"
+#include "wpi/util/Synchronization.h"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/cpp/HandleMap.hpp b/ntcore/src/main/native/cpp/HandleMap.hpp
index d3f8d84b84..22f4354513 100644
--- a/ntcore/src/main/native/cpp/HandleMap.hpp
+++ b/ntcore/src/main/native/cpp/HandleMap.hpp
@@ -8,9 +8,8 @@
 #include <memory>
 #include <utility>
 
-#include "wpi/util/UidVector.hpp"
-
 #include "Handle.hpp"
+#include "wpi/util/UidVector.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/cpp/InstanceImpl.hpp b/ntcore/src/main/native/cpp/InstanceImpl.hpp
index a2438cccd8..7dcfb9cae4 100644
--- a/ntcore/src/main/native/cpp/InstanceImpl.hpp
+++ b/ntcore/src/main/native/cpp/InstanceImpl.hpp
@@ -12,8 +12,6 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/mutex.hpp"
-
 #include "ConnectionList.hpp"
 #include "Handle.hpp"
 #include "ListenerStorage.hpp"
@@ -22,6 +20,7 @@
 #include "LoggerImpl.hpp"
 #include "NetworkClient.hpp"
 #include "NetworkServer.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/cpp/ListenerStorage.cpp b/ntcore/src/main/native/cpp/ListenerStorage.cpp
index 3e81281106..76d92f6d0c 100644
--- a/ntcore/src/main/native/cpp/ListenerStorage.cpp
+++ b/ntcore/src/main/native/cpp/ListenerStorage.cpp
@@ -8,9 +8,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/SmallVector.hpp"
-
 #include "wpi/nt/ntcore_c.h"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace nt;
 
diff --git a/ntcore/src/main/native/cpp/ListenerStorage.hpp b/ntcore/src/main/native/cpp/ListenerStorage.hpp
index 7888892c4e..458f99a5e9 100644
--- a/ntcore/src/main/native/cpp/ListenerStorage.hpp
+++ b/ntcore/src/main/native/cpp/ListenerStorage.hpp
@@ -11,17 +11,16 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/SafeThread.hpp"
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/Synchronization.h"
-#include "wpi/util/mutex.hpp"
-
 #include "Handle.hpp"
 #include "HandleMap.hpp"
 #include "IListenerStorage.hpp"
 #include "VectorSet.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/SafeThread.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/Synchronization.h"
+#include "wpi/util/mutex.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/cpp/LocalStorage.hpp b/ntcore/src/main/native/cpp/LocalStorage.hpp
index a92984eb4f..696e700705 100644
--- a/ntcore/src/main/native/cpp/LocalStorage.hpp
+++ b/ntcore/src/main/native/cpp/LocalStorage.hpp
@@ -12,15 +12,14 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/json.hpp"
-#include "wpi/util/mutex.hpp"
-
 #include "local/LocalStorageImpl.hpp"
 #include "net/MessageHandler.hpp"
 #include "net/NetworkInterface.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace wpi {
 class Logger;
diff --git a/ntcore/src/main/native/cpp/LoggerImpl.cpp b/ntcore/src/main/native/cpp/LoggerImpl.cpp
index 48e1b0d0a3..478653758b 100644
--- a/ntcore/src/main/native/cpp/LoggerImpl.cpp
+++ b/ntcore/src/main/native/cpp/LoggerImpl.cpp
@@ -6,13 +6,12 @@
 
 #include <string>
 
+#include "IListenerStorage.hpp"
 #include "wpi/util/Logger.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/fs.hpp"
 #include "wpi/util/print.hpp"
 
-#include "IListenerStorage.hpp"
-
 using namespace nt;
 
 static void DefaultLogger(unsigned int level, const char* file,
diff --git a/ntcore/src/main/native/cpp/LoggerImpl.hpp b/ntcore/src/main/native/cpp/LoggerImpl.hpp
index 054ee797df..5641f151df 100644
--- a/ntcore/src/main/native/cpp/LoggerImpl.hpp
+++ b/ntcore/src/main/native/cpp/LoggerImpl.hpp
@@ -7,11 +7,10 @@
 #include <atomic>
 #include <vector>
 
-#include "wpi/util/mutex.hpp"
-
 #include "IListenerStorage.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/cpp/NetworkClient.cpp b/ntcore/src/main/native/cpp/NetworkClient.cpp
index 6a59fb6b02..8b659dc86b 100644
--- a/ntcore/src/main/native/cpp/NetworkClient.cpp
+++ b/ntcore/src/main/native/cpp/NetworkClient.cpp
@@ -13,16 +13,16 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/net/HttpUtil.hpp"
-#include "wpi/net/uv/Loop.hpp"
-#include "wpi/net/uv/Tcp.hpp"
-#include "wpi/net/uv/util.hpp"
 
 #include "IConnectionList.hpp"
 #include "Log.hpp"
 #include "net/NetworkInterface.hpp"
+#include "wpi/net/HttpUtil.hpp"
+#include "wpi/net/uv/Loop.hpp"
+#include "wpi/net/uv/Tcp.hpp"
+#include "wpi/net/uv/util.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace nt;
 namespace uv = wpi::uv;
diff --git a/ntcore/src/main/native/cpp/NetworkClient.hpp b/ntcore/src/main/native/cpp/NetworkClient.hpp
index dec9ddeb03..aba53f4ab4 100644
--- a/ntcore/src/main/native/cpp/NetworkClient.hpp
+++ b/ntcore/src/main/native/cpp/NetworkClient.hpp
@@ -13,6 +13,11 @@
 #include <utility>
 #include <vector>
 
+#include "INetworkClient.hpp"
+#include "net/ClientImpl.hpp"
+#include "net/ClientMessageQueue.hpp"
+#include "net/Message.hpp"
+#include "net/WebSocketConnection.hpp"
 #include "wpi/net/DsClient.hpp"
 #include "wpi/net/EventLoopRunner.hpp"
 #include "wpi/net/ParallelTcpConnector.hpp"
@@ -20,12 +25,6 @@
 #include "wpi/net/uv/Async.hpp"
 #include "wpi/net/uv/Timer.hpp"
 
-#include "INetworkClient.hpp"
-#include "net/ClientImpl.hpp"
-#include "net/ClientMessageQueue.hpp"
-#include "net/Message.hpp"
-#include "net/WebSocketConnection.hpp"
-
 namespace wpi {
 class Logger;
 }  // namespace wpi
diff --git a/ntcore/src/main/native/cpp/NetworkServer.cpp b/ntcore/src/main/native/cpp/NetworkServer.cpp
index f77d9e3483..804d3ee18b 100644
--- a/ntcore/src/main/native/cpp/NetworkServer.cpp
+++ b/ntcore/src/main/native/cpp/NetworkServer.cpp
@@ -14,6 +14,18 @@
 #include <utility>
 #include <vector>
 
+#include "IConnectionList.hpp"
+#include "InstanceImpl.hpp"
+#include "Log.hpp"
+#include "net/WebSocketConnection.hpp"
+#include "net/WireDecoder.hpp"
+#include "net/WireEncoder.hpp"
+#include "wpi/net/HttpUtil.hpp"
+#include "wpi/net/HttpWebSocketServerConnection.hpp"
+#include "wpi/net/UrlParser.hpp"
+#include "wpi/net/uv/Tcp.hpp"
+#include "wpi/net/uv/Work.hpp"
+#include "wpi/net/uv/util.hpp"
 #include "wpi/util/MemoryBuffer.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
@@ -21,19 +33,6 @@
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/raw_ostream.hpp"
 #include "wpi/util/timestamp.h"
-#include "wpi/net/HttpUtil.hpp"
-#include "wpi/net/HttpWebSocketServerConnection.hpp"
-#include "wpi/net/UrlParser.hpp"
-#include "wpi/net/uv/Tcp.hpp"
-#include "wpi/net/uv/Work.hpp"
-#include "wpi/net/uv/util.hpp"
-
-#include "IConnectionList.hpp"
-#include "InstanceImpl.hpp"
-#include "Log.hpp"
-#include "net/WebSocketConnection.hpp"
-#include "net/WireDecoder.hpp"
-#include "net/WireEncoder.hpp"
 
 using namespace nt;
 namespace uv = wpi::uv;
diff --git a/ntcore/src/main/native/cpp/NetworkServer.hpp b/ntcore/src/main/native/cpp/NetworkServer.hpp
index ab00a701b0..b542dca8fe 100644
--- a/ntcore/src/main/native/cpp/NetworkServer.hpp
+++ b/ntcore/src/main/native/cpp/NetworkServer.hpp
@@ -11,15 +11,14 @@
 #include <string_view>
 #include <vector>
 
+#include "net/ClientMessageQueue.hpp"
+#include "net/Message.hpp"
+#include "server/ServerImpl.hpp"
 #include "wpi/net/EventLoopRunner.hpp"
 #include "wpi/net/uv/Async.hpp"
 #include "wpi/net/uv/Idle.hpp"
 #include "wpi/net/uv/Timer.hpp"
-
-#include "net/ClientMessageQueue.hpp"
-#include "net/Message.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
-#include "server/ServerImpl.hpp"
 
 namespace wpi {
 class Logger;
diff --git a/ntcore/src/main/native/cpp/Value.cpp b/ntcore/src/main/native/cpp/Value.cpp
index 357643c346..626343148b 100644
--- a/ntcore/src/main/native/cpp/Value.cpp
+++ b/ntcore/src/main/native/cpp/Value.cpp
@@ -13,11 +13,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/MemAlloc.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "Value_internal.hpp"
 #include "wpi/nt/NetworkTableValue.hpp"
+#include "wpi/util/MemAlloc.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace nt;
 
diff --git a/ntcore/src/main/native/cpp/ValueCircularBuffer.hpp b/ntcore/src/main/native/cpp/ValueCircularBuffer.hpp
index 2405c7d9a3..fd363a5cb0 100644
--- a/ntcore/src/main/native/cpp/ValueCircularBuffer.hpp
+++ b/ntcore/src/main/native/cpp/ValueCircularBuffer.hpp
@@ -7,11 +7,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/circular_buffer.hpp"
-
 #include "Value_internal.hpp"
 #include "wpi/nt/NetworkTableValue.hpp"
 #include "wpi/nt/ntcore_cpp_types.hpp"
+#include "wpi/util/circular_buffer.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/cpp/Value_internal.hpp b/ntcore/src/main/native/cpp/Value_internal.hpp
index 2634578f53..e4c2a24632 100644
--- a/ntcore/src/main/native/cpp/Value_internal.hpp
+++ b/ntcore/src/main/native/cpp/Value_internal.hpp
@@ -13,11 +13,10 @@
 #include <type_traits>
 #include <vector>
 
-#include "wpi/util/MemAlloc.hpp"
-
 #include "wpi/nt/NetworkTableValue.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp_types.hpp"
+#include "wpi/util/MemAlloc.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp b/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp
index 0d796f89e1..be77522dfd 100644
--- a/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp
+++ b/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp
@@ -10,13 +10,13 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/ConvertUTF.hpp"
-#include "wpi/util/jni_util.hpp"
-#include "wpi/util/json.hpp"
 
 #include "org_wpilib_networktables_NetworkTablesJNI.h"
 #include "wpi/nt/ntcore.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/ConvertUTF.hpp"
+#include "wpi/util/jni_util.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace wpi::java;
 
diff --git a/ntcore/src/main/native/cpp/local/LocalDataLogger.cpp b/ntcore/src/main/native/cpp/local/LocalDataLogger.cpp
index a68cc11241..d3fd1095df 100644
--- a/ntcore/src/main/native/cpp/local/LocalDataLogger.cpp
+++ b/ntcore/src/main/native/cpp/local/LocalDataLogger.cpp
@@ -5,8 +5,9 @@
 #include "LocalDataLogger.hpp"
 
 #include <fmt/format.h>
-#include "wpi/util/StringExtras.hpp"
+
 #include "wpi/datalog/DataLog.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace nt::local;
 
diff --git a/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.cpp b/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.cpp
index 0082bf63c5..36c0a43391 100644
--- a/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.cpp
+++ b/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.cpp
@@ -8,9 +8,9 @@
 #include <string_view>
 
 #include <fmt/format.h>
-#include "wpi/util/StringExtras.hpp"
 
 #include "wpi/nt/NetworkTableValue.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace nt::local;
 
diff --git a/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.hpp b/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.hpp
index 3b90642de1..ad89746a5e 100644
--- a/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.hpp
+++ b/ntcore/src/main/native/cpp/local/LocalDataLoggerEntry.hpp
@@ -10,7 +10,6 @@
 #include <string_view>
 
 #include "wpi/datalog/DataLog.hpp"
-
 #include "wpi/nt/ntcore_c.h"
 
 namespace wpi::log {
diff --git a/ntcore/src/main/native/cpp/local/LocalEntry.hpp b/ntcore/src/main/native/cpp/local/LocalEntry.hpp
index 5a1bdb9aad..876779a373 100644
--- a/ntcore/src/main/native/cpp/local/LocalEntry.hpp
+++ b/ntcore/src/main/native/cpp/local/LocalEntry.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/Synchronization.h"
-
 #include "Handle.hpp"
 #include "local/LocalSubscriber.hpp"
+#include "wpi/util/Synchronization.h"
 
 namespace nt::local {
 
diff --git a/ntcore/src/main/native/cpp/local/LocalMultiSubscriber.hpp b/ntcore/src/main/native/cpp/local/LocalMultiSubscriber.hpp
index 29feab2249..04b821caad 100644
--- a/ntcore/src/main/native/cpp/local/LocalMultiSubscriber.hpp
+++ b/ntcore/src/main/native/cpp/local/LocalMultiSubscriber.hpp
@@ -9,13 +9,12 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/Synchronization.h"
-
 #include "Handle.hpp"
 #include "PubSubOptions.hpp"
 #include "VectorSet.hpp"
 #include "wpi/nt/ntcore_c.h"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/Synchronization.h"
 
 namespace nt::local {
 
diff --git a/ntcore/src/main/native/cpp/local/LocalPublisher.hpp b/ntcore/src/main/native/cpp/local/LocalPublisher.hpp
index 05c7d54196..68cdd38919 100644
--- a/ntcore/src/main/native/cpp/local/LocalPublisher.hpp
+++ b/ntcore/src/main/native/cpp/local/LocalPublisher.hpp
@@ -6,11 +6,10 @@
 
 #include <utility>
 
-#include "wpi/util/Synchronization.h"
-
 #include "Handle.hpp"
 #include "local/LocalTopic.hpp"
 #include "local/PubSubConfig.hpp"
+#include "wpi/util/Synchronization.h"
 
 namespace nt::local {
 
diff --git a/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp b/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp
index 8debac8d8e..d12bdef4dc 100644
--- a/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp
+++ b/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp
@@ -11,13 +11,13 @@
 
 #include <fmt/format.h>
 #include <fmt/ranges.h>
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/datalog/DataLog.hpp"
 
 #include "IListenerStorage.hpp"
 #include "Log.hpp"
 #include "net/MessageHandler.hpp"
+#include "wpi/datalog/DataLog.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace nt;
 using namespace nt::local;
diff --git a/ntcore/src/main/native/cpp/local/LocalStorageImpl.hpp b/ntcore/src/main/native/cpp/local/LocalStorageImpl.hpp
index 3041f07109..7f248321a1 100644
--- a/ntcore/src/main/native/cpp/local/LocalStorageImpl.hpp
+++ b/ntcore/src/main/native/cpp/local/LocalStorageImpl.hpp
@@ -8,12 +8,6 @@
 #include <memory>
 #include <string_view>
 
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/StringMap.hpp"
-#include "wpi/util/Synchronization.h"
-#include "wpi/util/json.hpp"
-
 #include "HandleMap.hpp"
 #include "local/LocalDataLogger.hpp"
 #include "local/LocalEntry.hpp"
@@ -24,6 +18,11 @@
 #include "local/LocalTopic.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/Synchronization.h"
+#include "wpi/util/json.hpp"
 
 namespace wpi {
 class Logger;
diff --git a/ntcore/src/main/native/cpp/local/LocalSubscriber.hpp b/ntcore/src/main/native/cpp/local/LocalSubscriber.hpp
index 4f9d0a0a06..2b4e8379df 100644
--- a/ntcore/src/main/native/cpp/local/LocalSubscriber.hpp
+++ b/ntcore/src/main/native/cpp/local/LocalSubscriber.hpp
@@ -6,8 +6,6 @@
 
 #include <utility>
 
-#include "wpi/util/Synchronization.h"
-
 #include "Handle.hpp"
 #include "Types_internal.hpp"
 #include "ValueCircularBuffer.hpp"
@@ -15,6 +13,7 @@
 #include "local/LocalTopic.hpp"
 #include "local/PubSubConfig.hpp"
 #include "wpi/nt/ntcore_c.h"
+#include "wpi/util/Synchronization.h"
 
 namespace nt::local {
 
diff --git a/ntcore/src/main/native/cpp/local/LocalTopic.hpp b/ntcore/src/main/native/cpp/local/LocalTopic.hpp
index 5b11e9b363..087ee16e94 100644
--- a/ntcore/src/main/native/cpp/local/LocalTopic.hpp
+++ b/ntcore/src/main/native/cpp/local/LocalTopic.hpp
@@ -9,15 +9,14 @@
 #include <string>
 #include <string_view>
 
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/Synchronization.h"
-#include "wpi/util/json.hpp"
-
 #include "Handle.hpp"
 #include "VectorSet.hpp"
 #include "local/LocalDataLogger.hpp"
 #include "local/LocalDataLoggerEntry.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/Synchronization.h"
+#include "wpi/util/json.hpp"
 
 namespace nt::local {
 
diff --git a/ntcore/src/main/native/cpp/net/ClientImpl.cpp b/ntcore/src/main/native/cpp/net/ClientImpl.cpp
index de412fa95b..25731449a3 100644
--- a/ntcore/src/main/native/cpp/net/ClientImpl.cpp
+++ b/ntcore/src/main/native/cpp/net/ClientImpl.cpp
@@ -12,9 +12,6 @@
 #include <variant>
 
 #include <fmt/format.h>
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/raw_ostream.hpp"
-#include "wpi/util/timestamp.h"
 
 #include "Handle.hpp"
 #include "Log.hpp"
@@ -23,6 +20,9 @@
 #include "WireConnection.hpp"
 #include "WireEncoder.hpp"
 #include "wpi/nt/NetworkTableValue.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/raw_ostream.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace nt;
 using namespace nt::net;
diff --git a/ntcore/src/main/native/cpp/net/ClientImpl.hpp b/ntcore/src/main/native/cpp/net/ClientImpl.hpp
index 846f0d9f06..69cbf52317 100644
--- a/ntcore/src/main/native/cpp/net/ClientImpl.hpp
+++ b/ntcore/src/main/native/cpp/net/ClientImpl.hpp
@@ -12,14 +12,13 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/DenseMap.hpp"
-
 #include "MessageHandler.hpp"
 #include "NetworkOutgoingQueue.hpp"
 #include "NetworkPing.hpp"
 #include "PubSubOptions.hpp"
 #include "WireConnection.hpp"
 #include "WireDecoder.hpp"
+#include "wpi/util/DenseMap.hpp"
 
 namespace wpi {
 class Logger;
diff --git a/ntcore/src/main/native/cpp/net/ClientMessageQueue.hpp b/ntcore/src/main/native/cpp/net/ClientMessageQueue.hpp
index 4f71f22834..988ff90854 100644
--- a/ntcore/src/main/native/cpp/net/ClientMessageQueue.hpp
+++ b/ntcore/src/main/native/cpp/net/ClientMessageQueue.hpp
@@ -7,13 +7,12 @@
 #include <span>
 #include <string>
 
+#include "Message.hpp"
+#include "MessageHandler.hpp"
 #include "wpi/util/FastQueue.hpp"
 #include "wpi/util/Logger.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "Message.hpp"
-#include "MessageHandler.hpp"
-
 namespace wpi {
 class Logger;
 }  // namespace wpi
diff --git a/ntcore/src/main/native/cpp/net/Message.hpp b/ntcore/src/main/native/cpp/net/Message.hpp
index db59c262d1..9de180dbba 100644
--- a/ntcore/src/main/native/cpp/net/Message.hpp
+++ b/ntcore/src/main/native/cpp/net/Message.hpp
@@ -9,10 +9,9 @@
 #include <variant>
 #include <vector>
 
-#include "wpi/util/json.hpp"
-
 #include "PubSubOptions.hpp"
 #include "wpi/nt/NetworkTableValue.hpp"
+#include "wpi/util/json.hpp"
 
 namespace nt::net {
 
diff --git a/ntcore/src/main/native/cpp/net/NetworkOutgoingQueue.hpp b/ntcore/src/main/native/cpp/net/NetworkOutgoingQueue.hpp
index 5ea4e26fc7..32655a22e4 100644
--- a/ntcore/src/main/native/cpp/net/NetworkOutgoingQueue.hpp
+++ b/ntcore/src/main/native/cpp/net/NetworkOutgoingQueue.hpp
@@ -13,13 +13,12 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/DenseMap.hpp"
-
 #include "Message.hpp"
 #include "WireConnection.hpp"
 #include "WireEncoder.hpp"
 #include "wpi/nt/NetworkTableValue.hpp"
 #include "wpi/nt/ntcore_c.h"
+#include "wpi/util/DenseMap.hpp"
 
 namespace nt::net {
 
diff --git a/ntcore/src/main/native/cpp/net/WebSocketConnection.cpp b/ntcore/src/main/native/cpp/net/WebSocketConnection.cpp
index 2909d49c13..d79c1a4385 100644
--- a/ntcore/src/main/native/cpp/net/WebSocketConnection.cpp
+++ b/ntcore/src/main/native/cpp/net/WebSocketConnection.cpp
@@ -7,13 +7,13 @@
 #include <algorithm>
 #include <span>
 
+#include "wpi/net/WebSocket.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
 #include "wpi/util/Endian.hpp"
 #include "wpi/util/Logger.hpp"
 #include "wpi/util/SpanExtras.hpp"
 #include "wpi/util/raw_ostream.hpp"
 #include "wpi/util/timestamp.h"
-#include "wpi/net/WebSocket.hpp"
-#include "wpi/net/raw_uv_ostream.hpp"
 
 using namespace nt;
 using namespace nt::net;
diff --git a/ntcore/src/main/native/cpp/net/WebSocketConnection.hpp b/ntcore/src/main/native/cpp/net/WebSocketConnection.hpp
index 7a293f6129..48c4103645 100644
--- a/ntcore/src/main/native/cpp/net/WebSocketConnection.hpp
+++ b/ntcore/src/main/native/cpp/net/WebSocketConnection.hpp
@@ -9,12 +9,11 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/function_ref.hpp"
+#include "WireConnection.hpp"
 #include "wpi/net/WebSocket.hpp"
 #include "wpi/net/uv/Buffer.hpp"
 #include "wpi/net/uv/Stream.hpp"
-
-#include "WireConnection.hpp"
+#include "wpi/util/function_ref.hpp"
 
 namespace wpi {
 class Logger;
diff --git a/ntcore/src/main/native/cpp/net/WireDecoder.cpp b/ntcore/src/main/native/cpp/net/WireDecoder.cpp
index b5819f50ec..0b756a694e 100644
--- a/ntcore/src/main/native/cpp/net/WireDecoder.cpp
+++ b/ntcore/src/main/native/cpp/net/WireDecoder.cpp
@@ -11,14 +11,14 @@
 #include <vector>
 
 #include <fmt/format.h>
+
+#include "Message.hpp"
+#include "MessageHandler.hpp"
 #include "wpi/util/Logger.hpp"
 #include "wpi/util/SpanExtras.hpp"
 #include "wpi/util/json.hpp"
 #include "wpi/util/mpack.h"
 
-#include "Message.hpp"
-#include "MessageHandler.hpp"
-
 using namespace nt;
 using namespace nt::net;
 using namespace mpack;
diff --git a/ntcore/src/main/native/cpp/net/WireEncoder.cpp b/ntcore/src/main/native/cpp/net/WireEncoder.cpp
index a8dec61c3e..907a1f50e2 100644
--- a/ntcore/src/main/native/cpp/net/WireEncoder.cpp
+++ b/ntcore/src/main/native/cpp/net/WireEncoder.cpp
@@ -7,13 +7,12 @@
 #include <optional>
 #include <string>
 
-#include "wpi/util/json.hpp"
-#include "wpi/util/mpack.h"
-#include "wpi/util/raw_ostream.hpp"
-
 #include "Message.hpp"
 #include "PubSubOptions.hpp"
 #include "wpi/nt/NetworkTableValue.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/mpack.h"
+#include "wpi/util/raw_ostream.hpp"
 
 using namespace nt;
 using namespace nt::net;
diff --git a/ntcore/src/main/native/cpp/networktables/NTSendable.cpp b/ntcore/src/main/native/cpp/networktables/NTSendable.cpp
index 0b8f337ace..1901a2b463 100644
--- a/ntcore/src/main/native/cpp/networktables/NTSendable.cpp
+++ b/ntcore/src/main/native/cpp/networktables/NTSendable.cpp
@@ -4,9 +4,8 @@
 
 #include "wpi/nt/NTSendable.hpp"
 
-#include "wpi/util/sendable/SendableBuilder.hpp"
-
 #include "wpi/nt/NTSendableBuilder.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace nt;
 
diff --git a/ntcore/src/main/native/cpp/networktables/NetworkTable.cpp b/ntcore/src/main/native/cpp/networktables/NetworkTable.cpp
index 1c8c9e64ee..c965ba7584 100644
--- a/ntcore/src/main/native/cpp/networktables/NetworkTable.cpp
+++ b/ntcore/src/main/native/cpp/networktables/NetworkTable.cpp
@@ -11,9 +11,6 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/StringMap.hpp"
 
 #include "wpi/nt/BooleanArrayTopic.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
@@ -29,6 +26,9 @@
 #include "wpi/nt/StringTopic.hpp"
 #include "wpi/nt/ntcore.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/StringMap.hpp"
 
 using namespace nt;
 
diff --git a/ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp b/ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp
index 8f501c55f6..bee3228035 100644
--- a/ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp
+++ b/ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp
@@ -9,9 +9,6 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/print.hpp"
-
 #include "wpi/nt/BooleanArrayTopic.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/DoubleArrayTopic.hpp"
@@ -24,6 +21,8 @@
 #include "wpi/nt/RawTopic.hpp"
 #include "wpi/nt/StringArrayTopic.hpp"
 #include "wpi/nt/StringTopic.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace nt;
 
diff --git a/ntcore/src/main/native/cpp/networktables/Topic.cpp b/ntcore/src/main/native/cpp/networktables/Topic.cpp
index 54aed43dcd..8a92e65fb2 100644
--- a/ntcore/src/main/native/cpp/networktables/Topic.cpp
+++ b/ntcore/src/main/native/cpp/networktables/Topic.cpp
@@ -4,10 +4,9 @@
 
 #include "wpi/nt/Topic.hpp"
 
-#include "wpi/util/json.hpp"
-
 #include "wpi/nt/GenericEntry.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace nt;
 
diff --git a/ntcore/src/main/native/cpp/ntcore_c.cpp b/ntcore/src/main/native/cpp/ntcore_c.cpp
index 96243a38c7..9386ba3f94 100644
--- a/ntcore/src/main/native/cpp/ntcore_c.cpp
+++ b/ntcore/src/main/native/cpp/ntcore_c.cpp
@@ -13,15 +13,14 @@
 #include <utility>
 #include <vector>
 
+#include "Value_internal.hpp"
+#include "wpi/nt/ntcore.h"
+#include "wpi/nt/ntcore_cpp.hpp"
 #include "wpi/util/MemAlloc.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/json.hpp"
 #include "wpi/util/timestamp.h"
 
-#include "Value_internal.hpp"
-#include "wpi/nt/ntcore.h"
-#include "wpi/nt/ntcore_cpp.hpp"
-
 using namespace nt;
 
 // Conversion helpers
diff --git a/ntcore/src/main/native/cpp/ntcore_cpp.cpp b/ntcore/src/main/native/cpp/ntcore_cpp.cpp
index ee5faefa4d..6643b08fb2 100644
--- a/ntcore/src/main/native/cpp/ntcore_cpp.cpp
+++ b/ntcore/src/main/native/cpp/ntcore_cpp.cpp
@@ -13,8 +13,6 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/json.hpp"
-#include "wpi/util/timestamp.h"
 
 #include "Handle.hpp"
 #include "InstanceImpl.hpp"
@@ -22,6 +20,8 @@
 #include "Types_internal.hpp"
 #include "wpi/nt/ntcore.h"
 #include "wpi/nt/ntcore_c.h"
+#include "wpi/util/json.hpp"
+#include "wpi/util/timestamp.h"
 
 static std::atomic_bool gNowSet{false};
 static std::atomic<int64_t> gNowTime;
diff --git a/ntcore/src/main/native/cpp/ntcore_meta.cpp b/ntcore/src/main/native/cpp/ntcore_meta.cpp
index 24441b5af6..c49a67c79f 100644
--- a/ntcore/src/main/native/cpp/ntcore_meta.cpp
+++ b/ntcore/src/main/native/cpp/ntcore_meta.cpp
@@ -7,10 +7,10 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/MessagePack.hpp"
-#include "wpi/util/mpack.h"
 
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/MessagePack.hpp"
+#include "wpi/util/mpack.h"
 
 using namespace mpack;
 
diff --git a/ntcore/src/main/native/cpp/ntcore_test.cpp b/ntcore/src/main/native/cpp/ntcore_test.cpp
index 08ea6167b1..75d8f80092 100644
--- a/ntcore/src/main/native/cpp/ntcore_test.cpp
+++ b/ntcore/src/main/native/cpp/ntcore_test.cpp
@@ -6,9 +6,8 @@
 
 #include <cstring>
 
-#include "wpi/util/MemAlloc.hpp"
-
 #include "Value_internal.hpp"
+#include "wpi/util/MemAlloc.hpp"
 
 extern "C" {
 struct WPI_String* NT_GetStringForTesting(const char* str, int* struct_size) {
diff --git a/ntcore/src/main/native/cpp/server/ServerClient.cpp b/ntcore/src/main/native/cpp/server/ServerClient.cpp
index 95f9275ece..fbac6808d6 100644
--- a/ntcore/src/main/native/cpp/server/ServerClient.cpp
+++ b/ntcore/src/main/native/cpp/server/ServerClient.cpp
@@ -6,11 +6,10 @@
 
 #include <utility>
 
-#include "wpi/util/MessagePack.hpp"
-
 #include "server/MessagePackWriter.hpp"
 #include "server/ServerPublisher.hpp"
 #include "server/ServerStorage.hpp"
+#include "wpi/util/MessagePack.hpp"
 
 using namespace nt::server;
 using namespace mpack;
diff --git a/ntcore/src/main/native/cpp/server/ServerClient.hpp b/ntcore/src/main/native/cpp/server/ServerClient.hpp
index d79a09d7db..061b6c897e 100644
--- a/ntcore/src/main/native/cpp/server/ServerClient.hpp
+++ b/ntcore/src/main/native/cpp/server/ServerClient.hpp
@@ -13,12 +13,11 @@
 #include <string_view>
 #include <utility>
 
-#include "wpi/util/json_fwd.hpp"
-
 #include "net/NetworkOutgoingQueue.hpp"
 #include "server/Functions.hpp"
 #include "server/ServerPublisher.hpp"
 #include "server/ServerSubscriber.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace wpi {
 class Logger;
diff --git a/ntcore/src/main/native/cpp/server/ServerClient4.cpp b/ntcore/src/main/native/cpp/server/ServerClient4.cpp
index 13f1a0f1af..1ec8d88169 100644
--- a/ntcore/src/main/native/cpp/server/ServerClient4.cpp
+++ b/ntcore/src/main/native/cpp/server/ServerClient4.cpp
@@ -6,12 +6,11 @@
 
 #include <string>
 
-#include "wpi/util/timestamp.h"
-
 #include "Log.hpp"
 #include "net/WireDecoder.hpp"
 #include "server/ServerStorage.hpp"
 #include "server/ServerTopic.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace nt::server;
 
diff --git a/ntcore/src/main/native/cpp/server/ServerClient4Base.cpp b/ntcore/src/main/native/cpp/server/ServerClient4Base.cpp
index 000e101f11..e0e5e792bc 100644
--- a/ntcore/src/main/native/cpp/server/ServerClient4Base.cpp
+++ b/ntcore/src/main/native/cpp/server/ServerClient4Base.cpp
@@ -9,11 +9,11 @@
 #include <vector>
 
 #include <fmt/ranges.h>
-#include "wpi/util/SpanExtras.hpp"
 
 #include "Log.hpp"
 #include "server/ServerImpl.hpp"
 #include "server/ServerPublisher.hpp"
+#include "wpi/util/SpanExtras.hpp"
 
 using namespace nt::server;
 
diff --git a/ntcore/src/main/native/cpp/server/ServerClient4Base.hpp b/ntcore/src/main/native/cpp/server/ServerClient4Base.hpp
index d95be81e8c..f80f5e6813 100644
--- a/ntcore/src/main/native/cpp/server/ServerClient4Base.hpp
+++ b/ntcore/src/main/native/cpp/server/ServerClient4Base.hpp
@@ -7,11 +7,10 @@
 #include <string>
 #include <string_view>
 
-#include "wpi/util/DenseMap.hpp"
-
 #include "net/ClientMessageQueue.hpp"
 #include "server/Functions.hpp"
 #include "server/ServerClient.hpp"
+#include "wpi/util/DenseMap.hpp"
 
 namespace nt::server {
 
diff --git a/ntcore/src/main/native/cpp/server/ServerImpl.cpp b/ntcore/src/main/native/cpp/server/ServerImpl.cpp
index a01db23c73..efbd72c8ac 100644
--- a/ntcore/src/main/native/cpp/server/ServerImpl.cpp
+++ b/ntcore/src/main/native/cpp/server/ServerImpl.cpp
@@ -12,12 +12,11 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/MessagePack.hpp"
-
 #include "Log.hpp"
 #include "server/MessagePackWriter.hpp"
 #include "server/ServerClient4.hpp"
 #include "server/ServerClientLocal.hpp"
+#include "wpi/util/MessagePack.hpp"
 
 using namespace nt;
 using namespace nt::server;
diff --git a/ntcore/src/main/native/cpp/server/ServerPublisher.cpp b/ntcore/src/main/native/cpp/server/ServerPublisher.cpp
index 66b48da39e..7219116c90 100644
--- a/ntcore/src/main/native/cpp/server/ServerPublisher.cpp
+++ b/ntcore/src/main/native/cpp/server/ServerPublisher.cpp
@@ -6,10 +6,9 @@
 
 #include <utility>
 
-#include "wpi/util/MessagePack.hpp"
-
 #include "server/MessagePackWriter.hpp"
 #include "server/ServerTopic.hpp"
+#include "wpi/util/MessagePack.hpp"
 
 using namespace nt::server;
 using namespace mpack;
diff --git a/ntcore/src/main/native/cpp/server/ServerStorage.cpp b/ntcore/src/main/native/cpp/server/ServerStorage.cpp
index 14ae4d0bd3..9556606943 100644
--- a/ntcore/src/main/native/cpp/server/ServerStorage.cpp
+++ b/ntcore/src/main/native/cpp/server/ServerStorage.cpp
@@ -10,13 +10,13 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/Base64.hpp"
-#include "wpi/util/MessagePack.hpp"
-#include "wpi/util/json.hpp"
 
 #include "Log.hpp"
 #include "server/MessagePackWriter.hpp"
 #include "server/ServerClient.hpp"
+#include "wpi/util/Base64.hpp"
+#include "wpi/util/MessagePack.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace nt;
 using namespace nt::server;
diff --git a/ntcore/src/main/native/cpp/server/ServerStorage.hpp b/ntcore/src/main/native/cpp/server/ServerStorage.hpp
index 15d1aa21c8..8c0711740f 100644
--- a/ntcore/src/main/native/cpp/server/ServerStorage.hpp
+++ b/ntcore/src/main/native/cpp/server/ServerStorage.hpp
@@ -9,12 +9,11 @@
 #include <string_view>
 #include <utility>
 
+#include "server/ServerTopic.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/UidVector.hpp"
 #include "wpi/util/json_fwd.hpp"
 
-#include "server/ServerTopic.hpp"
-
 namespace wpi {
 class Logger;
 class raw_ostream;
diff --git a/ntcore/src/main/native/cpp/server/ServerSubscriber.cpp b/ntcore/src/main/native/cpp/server/ServerSubscriber.cpp
index e010e3cba7..efb9f2faf5 100644
--- a/ntcore/src/main/native/cpp/server/ServerSubscriber.cpp
+++ b/ntcore/src/main/native/cpp/server/ServerSubscriber.cpp
@@ -6,11 +6,10 @@
 
 #include <utility>
 
-#include "wpi/util/MessagePack.hpp"
-#include "wpi/util/StringExtras.hpp"
-
 #include "PubSubOptions.hpp"
 #include "server/MessagePackWriter.hpp"
+#include "wpi/util/MessagePack.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace nt;
 using namespace nt::server;
diff --git a/ntcore/src/main/native/cpp/server/ServerTopic.hpp b/ntcore/src/main/native/cpp/server/ServerTopic.hpp
index c82a5ef743..7d15feab25 100644
--- a/ntcore/src/main/native/cpp/server/ServerTopic.hpp
+++ b/ntcore/src/main/native/cpp/server/ServerTopic.hpp
@@ -8,15 +8,14 @@
 #include <string_view>
 #include <utility>
 
+#include "net/NetworkOutgoingQueue.hpp"
+#include "server/ServerPublisher.hpp"
+#include "server/ServerSubscriber.hpp"
+#include "wpi/nt/NetworkTableValue.hpp"
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/SmallPtrSet.hpp"
 #include "wpi/util/json.hpp"
 
-#include "net/NetworkOutgoingQueue.hpp"
-#include "wpi/nt/NetworkTableValue.hpp"
-#include "server/ServerPublisher.hpp"
-#include "server/ServerSubscriber.hpp"
-
 namespace wpi {
 class Logger;
 }  // namespace wpi
diff --git a/ntcore/src/main/native/include/wpi/nt/NTSendableBuilder.hpp b/ntcore/src/main/native/include/wpi/nt/NTSendableBuilder.hpp
index 0e837eaf64..ebcca731ea 100644
--- a/ntcore/src/main/native/include/wpi/nt/NTSendableBuilder.hpp
+++ b/ntcore/src/main/native/include/wpi/nt/NTSendableBuilder.hpp
@@ -7,11 +7,10 @@
 #include <memory>
 #include <string_view>
 
-#include "wpi/util/FunctionExtras.hpp"
-#include "wpi/util/sendable/SendableBuilder.hpp"
-
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/Topic.hpp"
+#include "wpi/util/FunctionExtras.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/include/wpi/nt/NetworkTable.hpp b/ntcore/src/main/native/include/wpi/nt/NetworkTable.hpp
index b3f353b7e9..98bed3a5c4 100644
--- a/ntcore/src/main/native/include/wpi/nt/NetworkTable.hpp
+++ b/ntcore/src/main/native/include/wpi/nt/NetworkTable.hpp
@@ -12,15 +12,14 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/nt/NetworkTableEntry.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_c.h"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/nt/NetworkTableEntry.hpp"
-#include "wpi/nt/Topic.hpp"
-#include "wpi/nt/ntcore_c.h"
-
 namespace nt {
 
 class BooleanArrayTopic;
diff --git a/ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp b/ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp
index f9ed5472df..fd3ec015c0 100644
--- a/ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp
+++ b/ntcore/src/main/native/include/wpi/nt/NetworkTableInstance.hpp
@@ -11,13 +11,12 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/protobuf/Protobuf.hpp"
-#include "wpi/util/struct/Struct.hpp"
-
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/NetworkTableEntry.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/protobuf/Protobuf.hpp"
+#include "wpi/util/struct/Struct.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/include/wpi/nt/ProtobufTopic.hpp b/ntcore/src/main/native/include/wpi/nt/ProtobufTopic.hpp
index 0d43dddde9..fdddb241e9 100644
--- a/ntcore/src/main/native/include/wpi/nt/ProtobufTopic.hpp
+++ b/ntcore/src/main/native/include/wpi/nt/ProtobufTopic.hpp
@@ -11,15 +11,14 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/json_fwd.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
 
-#include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/nt/Topic.hpp"
-#include "wpi/nt/ntcore_cpp.hpp"
-
 namespace nt {
 
 template <wpi::ProtobufSerializable T>
diff --git a/ntcore/src/main/native/include/wpi/nt/StructArrayTopic.hpp b/ntcore/src/main/native/include/wpi/nt/StructArrayTopic.hpp
index dc211a557b..17257eea13 100644
--- a/ntcore/src/main/native/include/wpi/nt/StructArrayTopic.hpp
+++ b/ntcore/src/main/native/include/wpi/nt/StructArrayTopic.hpp
@@ -15,15 +15,14 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/Topic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/json_fwd.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/nt/Topic.hpp"
-#include "wpi/nt/ntcore_cpp.hpp"
-
 namespace nt {
 
 template <typename T, typename... I>
diff --git a/ntcore/src/main/native/include/wpi/nt/StructTopic.hpp b/ntcore/src/main/native/include/wpi/nt/StructTopic.hpp
index f0e111692b..95ea213f94 100644
--- a/ntcore/src/main/native/include/wpi/nt/StructTopic.hpp
+++ b/ntcore/src/main/native/include/wpi/nt/StructTopic.hpp
@@ -15,13 +15,12 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/json_fwd.hpp"
-#include "wpi/util/struct/Struct.hpp"
-
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/Topic.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/struct/Struct.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/include/wpi/nt/Topic.hpp b/ntcore/src/main/native/include/wpi/nt/Topic.hpp
index 619b839fad..d8dcd7cd4c 100644
--- a/ntcore/src/main/native/include/wpi/nt/Topic.hpp
+++ b/ntcore/src/main/native/include/wpi/nt/Topic.hpp
@@ -11,11 +11,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/json_fwd.hpp"
-
 #include "wpi/nt/NetworkTableType.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/include/wpi/nt/UnitTopic.hpp b/ntcore/src/main/native/include/wpi/nt/UnitTopic.hpp
index 259ef62f91..1ed11525b0 100644
--- a/ntcore/src/main/native/include/wpi/nt/UnitTopic.hpp
+++ b/ntcore/src/main/native/include/wpi/nt/UnitTopic.hpp
@@ -9,10 +9,9 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/json.hpp"
-
 #include "wpi/nt/Topic.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/json.hpp"
 
 namespace nt {
 
diff --git a/ntcore/src/main/native/include/wpi/nt/ntcore_cpp.hpp b/ntcore/src/main/native/include/wpi/nt/ntcore_cpp.hpp
index f6e95a45dd..86ff330694 100644
--- a/ntcore/src/main/native/include/wpi/nt/ntcore_cpp.hpp
+++ b/ntcore/src/main/native/include/wpi/nt/ntcore_cpp.hpp
@@ -17,11 +17,10 @@
 #include <variant>
 #include <vector>
 
-#include "wpi/util/json_fwd.hpp"
-
 #include "wpi/nt/NetworkTableValue.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp_types.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace wpi {
 template <typename T>
diff --git a/ntcore/src/test/native/cpp/ConnectionListenerTest.cpp b/ntcore/src/test/native/cpp/ConnectionListenerTest.cpp
index 5e1aa7ac1b..186f61c0b8 100644
--- a/ntcore/src/test/native/cpp/ConnectionListenerTest.cpp
+++ b/ntcore/src/test/native/cpp/ConnectionListenerTest.cpp
@@ -7,11 +7,11 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/Synchronization.h"
-#include "wpi/util/mutex.hpp"
 
 #include "TestPrinters.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/Synchronization.h"
+#include "wpi/util/mutex.hpp"
 
 class ConnectionListenerTest : public ::testing::Test {
  public:
diff --git a/ntcore/src/test/native/cpp/LocalStorageTest.cpp b/ntcore/src/test/native/cpp/LocalStorageTest.cpp
index feb6ec21be..28f8ad015b 100644
--- a/ntcore/src/test/native/cpp/LocalStorageTest.cpp
+++ b/ntcore/src/test/native/cpp/LocalStorageTest.cpp
@@ -6,7 +6,6 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/SpanMatcher.hpp"
 
 #include "LocalStorage.hpp"
 #include "MockListenerStorage.hpp"
@@ -19,6 +18,7 @@
 #include "net/MockNetworkInterface.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/SpanMatcher.hpp"
 
 using ::testing::_;
 using ::testing::AllOf;
diff --git a/ntcore/src/test/native/cpp/LoggerTest.cpp b/ntcore/src/test/native/cpp/LoggerTest.cpp
index f0367f2e14..488098022d 100644
--- a/ntcore/src/test/native/cpp/LoggerTest.cpp
+++ b/ntcore/src/test/native/cpp/LoggerTest.cpp
@@ -5,11 +5,11 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/Synchronization.h"
 
 #include "Handle.hpp"
 #include "TestPrinters.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/Synchronization.h"
 
 class LoggerTest : public ::testing::Test {
  public:
diff --git a/ntcore/src/test/native/cpp/MockLogger.hpp b/ntcore/src/test/native/cpp/MockLogger.hpp
index 6c15304dd1..616abb08d8 100644
--- a/ntcore/src/test/native/cpp/MockLogger.hpp
+++ b/ntcore/src/test/native/cpp/MockLogger.hpp
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "wpi/util/Logger.hpp"
-
 #include "gmock/gmock.h"
+#include "wpi/util/Logger.hpp"
 
 namespace wpi {
 
diff --git a/ntcore/src/test/native/cpp/StructTest.cpp b/ntcore/src/test/native/cpp/StructTest.cpp
index 928f9e9a31..b0c36b586e 100644
--- a/ntcore/src/test/native/cpp/StructTest.cpp
+++ b/ntcore/src/test/native/cpp/StructTest.cpp
@@ -3,12 +3,12 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SpanMatcher.hpp"
-#include "wpi/util/struct/Struct.hpp"
 
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StructArrayTopic.hpp"
 #include "wpi/nt/StructTopic.hpp"
+#include "wpi/util/SpanMatcher.hpp"
+#include "wpi/util/struct/Struct.hpp"
 
 namespace {
 struct Inner {
diff --git a/ntcore/src/test/native/cpp/TestPrinters.hpp b/ntcore/src/test/native/cpp/TestPrinters.hpp
index 58db5f2733..d51905c1f8 100644
--- a/ntcore/src/test/native/cpp/TestPrinters.hpp
+++ b/ntcore/src/test/native/cpp/TestPrinters.hpp
@@ -10,6 +10,7 @@
 #include <string_view>
 
 #include <gtest/gtest.h>
+
 #include "wpi/util/TestPrinters.hpp"
 
 namespace nt {
diff --git a/ntcore/src/test/native/cpp/TopicListenerTest.cpp b/ntcore/src/test/native/cpp/TopicListenerTest.cpp
index bf192f4edd..b7722ccd65 100644
--- a/ntcore/src/test/native/cpp/TopicListenerTest.cpp
+++ b/ntcore/src/test/native/cpp/TopicListenerTest.cpp
@@ -8,13 +8,13 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/Synchronization.h"
-#include "wpi/util/json.hpp"
 
 #include "TestPrinters.hpp"
 #include "ValueMatcher.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/Synchronization.h"
+#include "wpi/util/json.hpp"
 
 class TopicListenerTest : public ::testing::Test {
  public:
diff --git a/ntcore/src/test/native/cpp/ValueListenerTest.cpp b/ntcore/src/test/native/cpp/ValueListenerTest.cpp
index ed59b326fc..86dc41f1aa 100644
--- a/ntcore/src/test/native/cpp/ValueListenerTest.cpp
+++ b/ntcore/src/test/native/cpp/ValueListenerTest.cpp
@@ -3,13 +3,13 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/Synchronization.h"
 
 #include "TestPrinters.hpp"
 #include "ValueMatcher.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/Synchronization.h"
 
 using ::testing::_;
 using ::testing::AnyNumber;
diff --git a/ntcore/src/test/native/cpp/main.cpp b/ntcore/src/test/native/cpp/main.cpp
index b7ec6da49a..6332a300a4 100644
--- a/ntcore/src/test/native/cpp/main.cpp
+++ b/ntcore/src/test/native/cpp/main.cpp
@@ -5,10 +5,9 @@
 #include <climits>
 #include <cstdio>
 
-#include "wpi/util/timestamp.h"
-
 #include "gmock/gmock.h"
 #include "wpi/nt/ntcore.h"
+#include "wpi/util/timestamp.h"
 
 int main(int argc, char** argv) {
   nt::AddLogger(nt::GetDefaultInstance(), 0, UINT_MAX, [](auto& event) {
diff --git a/ntcore/src/test/native/cpp/net/MockMessageHandler.hpp b/ntcore/src/test/native/cpp/net/MockMessageHandler.hpp
index 0c524e28bd..cb4d3d67e7 100644
--- a/ntcore/src/test/native/cpp/net/MockMessageHandler.hpp
+++ b/ntcore/src/test/native/cpp/net/MockMessageHandler.hpp
@@ -6,11 +6,10 @@
 
 #include <string>
 
-#include "wpi/util/json.hpp"
-
 #include "PubSubOptions.hpp"
 #include "gmock/gmock.h"
 #include "net/MessageHandler.hpp"
+#include "wpi/util/json.hpp"
 
 namespace nt::net {
 
diff --git a/ntcore/src/test/native/cpp/net/MockNetworkInterface.hpp b/ntcore/src/test/native/cpp/net/MockNetworkInterface.hpp
index 649079979a..ff50a19c1c 100644
--- a/ntcore/src/test/native/cpp/net/MockNetworkInterface.hpp
+++ b/ntcore/src/test/native/cpp/net/MockNetworkInterface.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/json.hpp"
-
 #include "gmock/gmock.h"
 #include "net/NetworkInterface.hpp"
+#include "wpi/util/json.hpp"
 
 namespace nt::net {
 
diff --git a/ntcore/src/test/native/cpp/net/MockWireConnection.hpp b/ntcore/src/test/native/cpp/net/MockWireConnection.hpp
index 1675eb661e..8072823f62 100644
--- a/ntcore/src/test/native/cpp/net/MockWireConnection.hpp
+++ b/ntcore/src/test/native/cpp/net/MockWireConnection.hpp
@@ -11,10 +11,9 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/util/raw_ostream.hpp"
-
 #include "gmock/gmock.h"
 #include "net/WireConnection.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
 namespace nt::net {
 
diff --git a/ntcore/src/test/native/cpp/net/WireDecoderTest.cpp b/ntcore/src/test/native/cpp/net/WireDecoderTest.cpp
index 8db59a11fc..379fcde909 100644
--- a/ntcore/src/test/native/cpp/net/WireDecoderTest.cpp
+++ b/ntcore/src/test/native/cpp/net/WireDecoderTest.cpp
@@ -5,8 +5,6 @@
 #include <string>
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/raw_ostream.hpp"
 
 #include "../MockLogger.hpp"
 #include "../PubSubOptionsMatcher.hpp"
@@ -17,6 +15,8 @@
 #include "net/MessageHandler.hpp"
 #include "net/WireDecoder.hpp"
 #include "wpi/nt/NetworkTableValue.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
 using namespace std::string_view_literals;
 using testing::_;
diff --git a/ntcore/src/test/native/cpp/net/WireEncoderTest.cpp b/ntcore/src/test/native/cpp/net/WireEncoderTest.cpp
index 8ec1904046..4a8378cd9c 100644
--- a/ntcore/src/test/native/cpp/net/WireEncoderTest.cpp
+++ b/ntcore/src/test/native/cpp/net/WireEncoderTest.cpp
@@ -8,9 +8,6 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/SpanMatcher.hpp"
-#include "wpi/util/json.hpp"
-#include "wpi/util/raw_ostream.hpp"
 
 #include "../TestPrinters.hpp"
 #include "Handle.hpp"
@@ -19,6 +16,9 @@
 #include "net/Message.hpp"
 #include "net/WireEncoder.hpp"
 #include "wpi/nt/NetworkTableValue.hpp"
+#include "wpi/util/SpanMatcher.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
 using namespace std::string_view_literals;
 
diff --git a/ntcore/src/test/native/cpp/server/ServerImplTest.cpp b/ntcore/src/test/native/cpp/server/ServerImplTest.cpp
index 3c93f40fa7..207d182445 100644
--- a/ntcore/src/test/native/cpp/server/ServerImplTest.cpp
+++ b/ntcore/src/test/native/cpp/server/ServerImplTest.cpp
@@ -11,7 +11,6 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/SpanMatcher.hpp"
 
 #include "../MockLogger.hpp"
 #include "../PubSubOptionsMatcher.hpp"
@@ -24,9 +23,10 @@
 #include "gmock/gmock.h"
 #include "net/Message.hpp"
 #include "net/WireEncoder.hpp"
+#include "server/ServerImpl.hpp"
 #include "wpi/nt/ntcore_c.h"
 #include "wpi/nt/ntcore_cpp.hpp"
-#include "server/ServerImpl.hpp"
+#include "wpi/util/SpanMatcher.hpp"
 
 using ::testing::_;
 using ::testing::AllOf;
diff --git a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
index cf0d6506ad..737e55f048 100644
--- a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
+++ b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
@@ -12,11 +12,12 @@
 
 #include <fmt/chrono.h>
 #include <fmt/format.h>
+
+#include "wpi/datalog/DataLogBackgroundWriter.hpp"
+#include "wpi/datalog/FileLogger.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/util/SafeThread.hpp"
 #include "wpi/util/StringExtras.hpp"
-#include "wpi/datalog/DataLogBackgroundWriter.hpp"
-#include "wpi/datalog/FileLogger.hpp"
 #include "wpi/util/fs.hpp"
 #include "wpi/util/print.hpp"
 
diff --git a/romiVendordep/src/main/native/cpp/romi/OnBoardIO.cpp b/romiVendordep/src/main/native/cpp/romi/OnBoardIO.cpp
index 641c331f43..47db61f7bd 100644
--- a/romiVendordep/src/main/native/cpp/romi/OnBoardIO.cpp
+++ b/romiVendordep/src/main/native/cpp/romi/OnBoardIO.cpp
@@ -2,13 +2,14 @@
 // 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 "wpi/romi/OnBoardIO.hpp"
+
 #include <memory>
 
 #include "wpi/hardware/discrete/DigitalInput.hpp"
 #include "wpi/hardware/discrete/DigitalOutput.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/system/Timer.hpp"
-#include "wpi/romi/OnBoardIO.hpp"
 
 using namespace frc;
 
diff --git a/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp b/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp
index 6de64cf9a4..4fc36af0d8 100644
--- a/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp
+++ b/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp
@@ -20,15 +20,15 @@
 #include <memory>
 #include <string_view>
 
-#include "wpi/halsim/ds_socket/DSCommPacket.hpp"
 #include "wpi/hal/Extensions.h"
-#include "wpi/util/print.hpp"
+#include "wpi/halsim/ds_socket/DSCommPacket.hpp"
 #include "wpi/net/EventLoopRunner.hpp"
 #include "wpi/net/raw_uv_ostream.hpp"
 #include "wpi/net/uv/Tcp.hpp"
 #include "wpi/net/uv/Timer.hpp"
 #include "wpi/net/uv/Udp.hpp"
 #include "wpi/net/uv/util.hpp"
+#include "wpi/util/print.hpp"
 
 #if defined(Win32) || defined(_WIN32)
 #pragma comment(lib, "Ws2_32.lib")
diff --git a/simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommPacket.hpp b/simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommPacket.hpp
index 6210107f12..327adcd25f 100644
--- a/simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommPacket.hpp
+++ b/simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommPacket.hpp
@@ -7,8 +7,8 @@
 #include <array>
 #include <span>
 
-#include "wpi/halsim/ds_socket/DSCommJoystickPacket.hpp"
 #include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/halsim/ds_socket/DSCommJoystickPacket.hpp"
 #include "wpi/net/raw_uv_ostream.hpp"
 
 class DSCommPacketTest;
diff --git a/simulation/halsim_ds_socket/src/test/native/cpp/main.cpp b/simulation/halsim_ds_socket/src/test/native/cpp/main.cpp
index 9b73af360b..52b60dc4ef 100644
--- a/simulation/halsim_ds_socket/src/test/native/cpp/main.cpp
+++ b/simulation/halsim_ds_socket/src/test/native/cpp/main.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
+
 #include "wpi/hal/HALBase.h"
 
 int main(int argc, char** argv) {
diff --git a/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp
index 2f488588c4..15f0a592fb 100644
--- a/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp
@@ -7,11 +7,11 @@
 #include <memory>
 #include <vector>
 
+#include <imgui.h>
+
 #include "wpi/glass/hardware/LEDDisplay.hpp"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/simulation/AddressableLEDData.h"
-#include <imgui.h>
-
 #include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
diff --git a/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp
index 22b98aa053..3faa56a9bd 100644
--- a/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp
@@ -12,7 +12,6 @@
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/simulation/AnalogInData.h"
 #include "wpi/hal/simulation/SimDeviceData.h"
-
 #include "wpi/halsim/gui/HALDataSource.hpp"
 #include "wpi/halsim/gui/HALSimGui.hpp"
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp
index 36d05f862c..73dc70cc28 100644
--- a/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp
@@ -7,6 +7,7 @@
 #include <memory>
 #include <vector>
 
+#include "EncoderSimGui.hpp"
 #include "wpi/glass/hardware/DIO.hpp"
 #include "wpi/glass/hardware/Encoder.hpp"
 #include "wpi/hal/Ports.h"
@@ -15,8 +16,6 @@
 #include "wpi/hal/simulation/DutyCycleData.h"
 #include "wpi/hal/simulation/EncoderData.h"
 #include "wpi/hal/simulation/SimDeviceData.h"
-
-#include "EncoderSimGui.hpp"
 #include "wpi/halsim/gui/HALDataSource.hpp"
 #include "wpi/halsim/gui/HALSimGui.hpp"
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
index 906e0a29a9..b6be9790e7 100644
--- a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
@@ -14,22 +14,22 @@
 
 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
+#include <imgui.h>
+#include <imgui_internal.h>
+
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/Storage.hpp"
 #include "wpi/glass/other/FMS.hpp"
 #include "wpi/glass/support/ExtraGuiWidgets.hpp"
 #include "wpi/glass/support/NameSetting.hpp"
+#include "wpi/gui/wpigui.hpp"
 #include "wpi/hal/DriverStationTypes.h"
 #include "wpi/hal/simulation/DriverStationData.h"
 #include "wpi/hal/simulation/MockHooks.h"
-#include <imgui.h>
-#include <imgui_internal.h>
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/gui/wpigui.hpp"
-
 #include "wpi/halsim/gui/HALDataSource.hpp"
 #include "wpi/halsim/gui/HALSimGui.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace halsimgui;
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.cpp
index e092b19c13..f1e6838d12 100644
--- a/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.cpp
@@ -12,12 +12,12 @@
 #include <vector>
 
 #include <fmt/format.h>
+
 #include "wpi/glass/DataSource.hpp"
 #include "wpi/glass/hardware/Encoder.hpp"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/simulation/EncoderData.h"
 #include "wpi/hal/simulation/SimDeviceData.h"
-
 #include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
diff --git a/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
index 6152d25188..4402f47c6d 100644
--- a/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
@@ -7,9 +7,10 @@
 #include <memory>
 #include <utility>
 
+#include <imgui.h>
+
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/Storage.hpp"
-#include <imgui.h>
 #include "wpi/gui/wpigui.hpp"
 
 using namespace halsimgui;
diff --git a/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.cpp
index ec29eab270..0ee72f9d8a 100644
--- a/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.cpp
@@ -10,7 +10,6 @@
 #include "wpi/glass/Storage.hpp"
 #include "wpi/glass/networktables/NetworkTables.hpp"
 #include "wpi/gui/wpigui.hpp"
-
 #include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
diff --git a/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.cpp
index 7be3616a29..90e3fbd6a1 100644
--- a/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.cpp
@@ -13,7 +13,6 @@
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/Value.h"
 #include "wpi/hal/simulation/CTREPCMData.h"
-
 #include "wpi/halsim/gui/HALDataSource.hpp"
 #include "wpi/halsim/gui/HALSimGui.hpp"
 #include "wpi/halsim/gui/SimDeviceGui.hpp"
diff --git a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp
index 17132ccbb4..31701b041d 100644
--- a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp
@@ -13,7 +13,6 @@
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/Value.h"
 #include "wpi/hal/simulation/REVPHData.h"
-
 #include "wpi/halsim/gui/HALDataSource.hpp"
 #include "wpi/halsim/gui/HALSimGui.hpp"
 #include "wpi/halsim/gui/SimDeviceGui.hpp"
diff --git a/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp
index c60a5b5f1b..f857a74fe3 100644
--- a/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp
@@ -11,7 +11,6 @@
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/simulation/AddressableLEDData.h"
 #include "wpi/hal/simulation/PWMData.h"
-
 #include "wpi/halsim/gui/HALDataSource.hpp"
 #include "wpi/halsim/gui/HALSimGui.hpp"
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp
index 673d9b3288..f3adf2d6c5 100644
--- a/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp
@@ -12,7 +12,6 @@
 #include "wpi/glass/hardware/PowerDistribution.hpp"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/simulation/PowerDistributionData.h"
-
 #include "wpi/halsim/gui/HALDataSource.hpp"
 #include "wpi/halsim/gui/HALSimGui.hpp"
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.cpp
index d7187d32f4..8229c16838 100644
--- a/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.cpp
@@ -8,7 +8,6 @@
 
 #include "wpi/glass/hardware/RoboRio.hpp"
 #include "wpi/hal/simulation/RoboRioData.h"
-
 #include "wpi/halsim/gui/HALDataSource.hpp"
 #include "wpi/halsim/gui/HALSimGui.hpp"
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp b/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp
index 0cc2d5020a..cc97333267 100644
--- a/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp
@@ -10,14 +10,14 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/glass/other/DeviceTree.hpp"
 #include "wpi/hal/SimDevice.h"
 #include "wpi/hal/simulation/SimDeviceData.h"
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/StringExtras.hpp"
-
 #include "wpi/halsim/gui/HALDataSource.hpp"
 #include "wpi/halsim/gui/HALSimGui.hpp"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace halsimgui;
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp b/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp
index 5d7eae52b9..92a5d17e64 100644
--- a/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp
@@ -9,13 +9,13 @@
 #include <memory>
 #include <vector>
 
+#include <imgui.h>
+
 #include "wpi/glass/Model.hpp"
 #include "wpi/glass/View.hpp"
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/simulation/MockHooks.h"
 #include "wpi/hal/simulation/NotifierData.h"
-#include <imgui.h>
-
 #include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
diff --git a/simulation/halsim_gui/src/main/native/cpp/main.cpp b/simulation/halsim_gui/src/main/native/cpp/main.cpp
index 8bc9300901..c708914c7b 100644
--- a/simulation/halsim_gui/src/main/native/cpp/main.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/main.cpp
@@ -6,30 +6,30 @@
 #include <memory>
 #include <string_view>
 
-#include "wpi/glass/Context.hpp"
-#include "wpi/glass/Storage.hpp"
-#include "wpi/glass/hardware/Pneumatic.hpp"
-#include "wpi/glass/other/Plot.hpp"
-#include "wpi/hal/Extensions.h"
-#include "wpi/hal/Main.h"
 #include <imgui.h>
-#include "wpi/gui/wpigui.hpp"
 
 #include "AddressableLEDGui.hpp"
 #include "AnalogInputSimGui.hpp"
 #include "DIOSimGui.hpp"
 #include "DriverStationGui.hpp"
 #include "EncoderSimGui.hpp"
-#include "wpi/halsim/gui/HALSimGui.hpp"
-#include "wpi/halsim/gui/HALSimGuiExt.hpp"
 #include "NetworkTablesSimGui.hpp"
 #include "PCMSimGui.hpp"
 #include "PHSimGui.hpp"
 #include "PWMSimGui.hpp"
 #include "PowerDistributionSimGui.hpp"
 #include "RoboRioSimGui.hpp"
-#include "wpi/halsim/gui/SimDeviceGui.hpp"
 #include "TimingGui.hpp"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/hardware/Pneumatic.hpp"
+#include "wpi/glass/other/Plot.hpp"
+#include "wpi/gui/wpigui.hpp"
+#include "wpi/hal/Extensions.h"
+#include "wpi/hal/Main.h"
+#include "wpi/halsim/gui/HALSimGui.hpp"
+#include "wpi/halsim/gui/HALSimGuiExt.hpp"
+#include "wpi/halsim/gui/SimDeviceGui.hpp"
 
 using namespace halsimgui;
 
diff --git a/simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALSimGui.hpp b/simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALSimGui.hpp
index 7c2d952e4b..21a38c485a 100644
--- a/simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALSimGui.hpp
+++ b/simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALSimGui.hpp
@@ -10,7 +10,6 @@
 #include "wpi/glass/MainMenuBar.hpp"
 #include "wpi/glass/WindowManager.hpp"
 #include "wpi/glass/networktables/NetworkTablesProvider.hpp"
-
 #include "wpi/halsim/gui/HALProvider.hpp"
 
 namespace halsimgui {
diff --git a/simulation/halsim_gui/src/test/native/cpp/main.cpp b/simulation/halsim_gui/src/test/native/cpp/main.cpp
index 9b73af360b..52b60dc4ef 100644
--- a/simulation/halsim_gui/src/test/native/cpp/main.cpp
+++ b/simulation/halsim_gui/src/test/native/cpp/main.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
+
 #include "wpi/hal/HALBase.h"
 
 int main(int argc, char** argv) {
diff --git a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp
index 71b39f0a7f..2c8ae0d901 100644
--- a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp
+++ b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp
@@ -8,12 +8,11 @@
 #include <memory>
 #include <string>
 
+#include "wpi/halsim/ws_client/HALSimWSClientConnection.hpp"
+#include "wpi/net/uv/util.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/print.hpp"
-#include "wpi/net/uv/util.hpp"
-
-#include "wpi/halsim/ws_client/HALSimWSClientConnection.hpp"
 
 static constexpr int kTcpConnectAttemptTimeout = 1000;
 
diff --git a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp
index 98fe0a5317..a26c45938b 100644
--- a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp
+++ b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp
@@ -8,10 +8,10 @@
 #include <string>
 
 #include <fmt/format.h>
-#include "wpi/util/print.hpp"
-#include "wpi/net/raw_uv_ostream.hpp"
 
 #include "wpi/halsim/ws_client/HALSimWS.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
+#include "wpi/util/print.hpp"
 
 namespace uv = wpi::uv;
 
diff --git a/simulation/halsim_ws_client/src/main/native/cpp/main.cpp b/simulation/halsim_ws_client/src/main/native/cpp/main.cpp
index 81712ff05c..664e2e77ab 100644
--- a/simulation/halsim_ws_client/src/main/native/cpp/main.cpp
+++ b/simulation/halsim_ws_client/src/main/native/cpp/main.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 
 #include "wpi/hal/Extensions.h"
-
 #include "wpi/halsim/ws_client/HALSimWSClient.hpp"
 
 using namespace wpilibws;
diff --git a/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWS.hpp b/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWS.hpp
index b3af4f0579..0235d720a5 100644
--- a/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWS.hpp
+++ b/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWS.hpp
@@ -11,12 +11,12 @@
 
 #include "wpi/halsim/ws_core/WSProviderContainer.hpp"
 #include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
-#include "wpi/util/StringMap.hpp"
-#include "wpi/util/json_fwd.hpp"
 #include "wpi/net/uv/Async.hpp"
 #include "wpi/net/uv/Loop.hpp"
 #include "wpi/net/uv/Tcp.hpp"
 #include "wpi/net/uv/Timer.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace wpilibws {
 
diff --git a/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClient.hpp b/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClient.hpp
index 864de26298..505cb7ccec 100644
--- a/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClient.hpp
+++ b/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClient.hpp
@@ -6,12 +6,11 @@
 
 #include <memory>
 
+#include "wpi/halsim/ws_client/HALSimWS.hpp"
 #include "wpi/halsim/ws_core/WSProviderContainer.hpp"
 #include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
 #include "wpi/net/EventLoopRunner.hpp"
 
-#include "wpi/halsim/ws_client/HALSimWS.hpp"
-
 namespace wpilibws {
 
 class HALSimWSClient {
diff --git a/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClientConnection.hpp b/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClientConnection.hpp
index 2c851696b8..bdc9f0b46e 100644
--- a/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClientConnection.hpp
+++ b/simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClientConnection.hpp
@@ -7,14 +7,13 @@
 #include <memory>
 #include <utility>
 
+#include "wpi/halsim/ws_client/HALSimWS.hpp"
 #include "wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp"
-#include "wpi/util/json_fwd.hpp"
-#include "wpi/util/mutex.hpp"
 #include "wpi/net/WebSocket.hpp"
 #include "wpi/net/uv/Buffer.hpp"
 #include "wpi/net/uv/Stream.hpp"
-
-#include "wpi/halsim/ws_client/HALSimWS.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace wpilibws {
 
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp
index 793de3cb44..fbfca9c02e 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp
@@ -11,6 +11,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/hal/Ports.h"
 #include "wpi/util/StringExtras.hpp"
 
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Solenoid.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Solenoid.cpp
index 29922bce81..d00f4ce538 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Solenoid.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Solenoid.cpp
@@ -9,6 +9,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/simulation/CTREPCMData.h"
 
diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp
index 007cc98b22..854248436c 100644
--- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp
+++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp
@@ -9,9 +9,8 @@
 #include <string>
 #include <string_view>
 
-#include "wpi/util/json.hpp"
-
 #include "wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp"
+#include "wpi/util/json.hpp"
 
 namespace wpilibws {
 
diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSHalProviders.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSHalProviders.hpp
index 20f76050da..730b0d34a0 100644
--- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSHalProviders.hpp
+++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSHalProviders.hpp
@@ -10,12 +10,12 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/hal/simulation/NotifyListener.h"
+#include "wpi/halsim/ws_core/WSBaseProvider.hpp"
 #include "wpi/util/json_fwd.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "wpi/halsim/ws_core/WSBaseProvider.hpp"
-
 namespace wpilibws {
 
 using HALCbRegisterIndexedFunc = void (*)(int32_t index,
diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProviderContainer.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProviderContainer.hpp
index 03421d6a2b..341c67e7ef 100644
--- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProviderContainer.hpp
+++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProviderContainer.hpp
@@ -10,9 +10,8 @@
 #include <shared_mutex>
 #include <string_view>
 
-#include "wpi/util/StringMap.hpp"
-
 #include "wpi/halsim/ws_core/WSBaseProvider.hpp"
+#include "wpi/util/StringMap.hpp"
 
 namespace wpilibws {
 
diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp
index 5bfacc8d67..45ae515be5 100644
--- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp
+++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp
@@ -12,11 +12,10 @@
 
 #include "wpi/hal/SimDevice.h"
 #include "wpi/hal/simulation/SimDeviceData.h"
-#include "wpi/util/StringMap.hpp"
-#include "wpi/net/uv/AsyncFunction.hpp"
-
 #include "wpi/halsim/ws_core/WSBaseProvider.hpp"
 #include "wpi/halsim/ws_core/WSProviderContainer.hpp"
+#include "wpi/net/uv/AsyncFunction.hpp"
+#include "wpi/util/StringMap.hpp"
 
 namespace wpilibws {
 
diff --git a/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp b/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp
index 1c3c6c9a1f..59532fb3a8 100644
--- a/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp
+++ b/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp
@@ -10,15 +10,15 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/net/MimeTypes.hpp"
+#include "wpi/net/UrlParser.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
+#include "wpi/net/uv/Request.hpp"
 #include "wpi/util/MemoryBuffer.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/fs.hpp"
 #include "wpi/util/print.hpp"
-#include "wpi/net/MimeTypes.hpp"
-#include "wpi/net/UrlParser.hpp"
-#include "wpi/net/raw_uv_ostream.hpp"
-#include "wpi/net/uv/Request.hpp"
 
 namespace uv = wpi::uv;
 
diff --git a/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp b/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp
index 9598f9038e..1a9eff2507 100644
--- a/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp
+++ b/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp
@@ -7,16 +7,15 @@
 #include <memory>
 #include <string>
 
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/fs.hpp"
-#include "wpi/util/print.hpp"
+#include "wpi/halsim/ws_server/HALSimHttpConnection.hpp"
 #include "wpi/net/UrlParser.hpp"
 #include "wpi/net/WebSocketServer.hpp"
 #include "wpi/net/raw_uv_ostream.hpp"
 #include "wpi/net/uv/Loop.hpp"
 #include "wpi/net/uv/Tcp.hpp"
-
-#include "wpi/halsim/ws_server/HALSimHttpConnection.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/fs.hpp"
+#include "wpi/util/print.hpp"
 
 namespace uv = wpi::uv;
 
diff --git a/simulation/halsim_ws_server/src/main/native/cpp/main.cpp b/simulation/halsim_ws_server/src/main/native/cpp/main.cpp
index 9881c02e82..4ca352d9b2 100644
--- a/simulation/halsim_ws_server/src/main/native/cpp/main.cpp
+++ b/simulation/halsim_ws_server/src/main/native/cpp/main.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 
 #include "wpi/hal/Extensions.h"
-
 #include "wpi/halsim/ws_server/HALSimWSServer.hpp"
 
 using namespace std::placeholders;
diff --git a/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimHttpConnection.hpp b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimHttpConnection.hpp
index 9c19d85a90..8fec5cc299 100644
--- a/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimHttpConnection.hpp
+++ b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimHttpConnection.hpp
@@ -10,13 +10,12 @@
 #include <utility>
 
 #include "wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp"
-#include "wpi/util/json_fwd.hpp"
-#include "wpi/util/mutex.hpp"
+#include "wpi/halsim/ws_server/HALSimWeb.hpp"
 #include "wpi/net/HttpWebSocketServerConnection.hpp"
 #include "wpi/net/uv/AsyncFunction.hpp"
 #include "wpi/net/uv/Buffer.hpp"
-
-#include "wpi/halsim/ws_server/HALSimWeb.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace wpilibws {
 
diff --git a/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWSServer.hpp b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWSServer.hpp
index 99573aed96..22a2d536ae 100644
--- a/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWSServer.hpp
+++ b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWSServer.hpp
@@ -8,9 +8,8 @@
 
 #include "wpi/halsim/ws_core/WSProviderContainer.hpp"
 #include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
-#include "wpi/net/EventLoopRunner.hpp"
-
 #include "wpi/halsim/ws_server/HALSimWeb.hpp"
+#include "wpi/net/EventLoopRunner.hpp"
 
 namespace wpilibws {
 
diff --git a/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp
index 9e206cdae7..e57556430a 100644
--- a/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp
+++ b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp
@@ -12,11 +12,11 @@
 #include "wpi/halsim/ws_core/WSBaseProvider.hpp"
 #include "wpi/halsim/ws_core/WSProviderContainer.hpp"
 #include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
-#include "wpi/util/StringMap.hpp"
-#include "wpi/util/json_fwd.hpp"
 #include "wpi/net/uv/Async.hpp"
 #include "wpi/net/uv/Loop.hpp"
 #include "wpi/net/uv/Tcp.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace wpilibws {
 
diff --git a/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp b/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp
index 4ea553bda5..e31dbb1bcd 100644
--- a/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp
+++ b/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp
@@ -9,10 +9,11 @@
 #include <string>
 
 #include <fmt/format.h>
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/print.hpp"
+
 #include "wpi/net/raw_uv_ostream.hpp"
 #include "wpi/net/uv/util.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/print.hpp"
 
 static constexpr int kTcpConnectAttemptTimeout = 1000;
 
diff --git a/simulation/halsim_ws_server/src/test/native/cpp/main.cpp b/simulation/halsim_ws_server/src/test/native/cpp/main.cpp
index 8915f3b4f5..45f35f74fe 100644
--- a/simulation/halsim_ws_server/src/test/native/cpp/main.cpp
+++ b/simulation/halsim_ws_server/src/test/native/cpp/main.cpp
@@ -7,15 +7,15 @@
 #include <thread>
 
 #include <gtest/gtest.h>
+
+#include "WebServerClientTest.hpp"
 #include "wpi/hal/DriverStation.h"
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/Main.h"
 #include "wpi/hal/simulation/DIOData.h"
-#include "wpi/util/print.hpp"
-#include "wpi/net/uv/Loop.hpp"
-
 #include "wpi/halsim/ws_server/HALSimWSServer.hpp"
-#include "WebServerClientTest.hpp"
+#include "wpi/net/uv/Loop.hpp"
+#include "wpi/util/print.hpp"
 
 namespace uv = wpi::uv;
 
diff --git a/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.hpp b/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.hpp
index 06c0988620..fec11d9234 100644
--- a/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.hpp
+++ b/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.hpp
@@ -8,7 +8,6 @@
 #include <memory>
 #include <string>
 
-#include "wpi/util/json.hpp"
 #include "wpi/net/WebSocket.hpp"
 #include "wpi/net/uv/AsyncFunction.hpp"
 #include "wpi/net/uv/Buffer.hpp"
@@ -16,6 +15,7 @@
 #include "wpi/net/uv/Stream.hpp"
 #include "wpi/net/uv/Tcp.hpp"
 #include "wpi/net/uv/Timer.hpp"
+#include "wpi/util/json.hpp"
 
 namespace wpilibws {
 
diff --git a/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp b/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp
index 7292b15d42..2d73c9aa2f 100644
--- a/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp
+++ b/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp
@@ -7,12 +7,12 @@
 #include <cstdio>
 #include <string>
 
+#include "wpi/net/raw_uv_ostream.hpp"
+#include "wpi/net/uv/util.hpp"
 #include "wpi/util/Endian.hpp"
 #include "wpi/util/MathExtras.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/print.hpp"
-#include "wpi/net/raw_uv_ostream.hpp"
-#include "wpi/net/uv/util.hpp"
 
 namespace uv = wpi::uv;
 
diff --git a/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp b/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp
index 2f11e1b86b..9f7c0d148d 100644
--- a/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp
+++ b/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp
@@ -8,6 +8,7 @@
 #include <string>
 
 #include <fmt/format.h>
+
 #include "wpi/util/Endian.hpp"
 #include "wpi/util/json.hpp"
 
diff --git a/simulation/halsim_xrp/src/main/native/cpp/main.cpp b/simulation/halsim_xrp/src/main/native/cpp/main.cpp
index acb99dce9f..b4ee851ea5 100644
--- a/simulation/halsim_xrp/src/main/native/cpp/main.cpp
+++ b/simulation/halsim_xrp/src/main/native/cpp/main.cpp
@@ -6,7 +6,6 @@
 #include <memory>
 
 #include "wpi/hal/Extensions.h"
-
 #include "wpi/halsim/xrp/HALSimXRPClient.hpp"
 
 #if defined(Win32) || defined(_WIN32)
diff --git a/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRP.hpp b/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRP.hpp
index 94c0c1b7b9..0a59aa4270 100644
--- a/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRP.hpp
+++ b/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRP.hpp
@@ -12,14 +12,13 @@
 #include "wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp"
 #include "wpi/halsim/ws_core/WSProviderContainer.hpp"
 #include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
-#include "wpi/util/json_fwd.hpp"
+#include "wpi/halsim/xrp/XRP.hpp"
 #include "wpi/net/uv/Async.hpp"
 #include "wpi/net/uv/Buffer.hpp"
 #include "wpi/net/uv/Loop.hpp"
 #include "wpi/net/uv/Timer.hpp"
 #include "wpi/net/uv/Udp.hpp"
-
-#include "wpi/halsim/xrp/XRP.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace wpilibxrp {
 
diff --git a/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRPClient.hpp b/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRPClient.hpp
index f6f0e368d2..2126001da8 100644
--- a/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRPClient.hpp
+++ b/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRPClient.hpp
@@ -8,9 +8,8 @@
 
 #include "wpi/halsim/ws_core/WSProviderContainer.hpp"
 #include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
-#include "wpi/net/EventLoopRunner.hpp"
-
 #include "wpi/halsim/xrp/HALSimXRP.hpp"
+#include "wpi/net/EventLoopRunner.hpp"
 
 namespace wpilibxrp {
 
diff --git a/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/XRP.hpp b/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/XRP.hpp
index 0666782d92..29969d8db5 100644
--- a/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/XRP.hpp
+++ b/simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/XRP.hpp
@@ -9,8 +9,8 @@
 #include <span>
 #include <string>
 
-#include "wpi/util/json_fwd.hpp"
 #include "wpi/net/raw_uv_ostream.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 #define XRP_TAG_MOTOR 0x12
 #define XRP_TAG_SERVO 0x13
diff --git a/tools/datalogtool/src/main/native/cpp/App.cpp b/tools/datalogtool/src/main/native/cpp/App.cpp
index 10bcf3e8a7..0b7285e628 100644
--- a/tools/datalogtool/src/main/native/cpp/App.cpp
+++ b/tools/datalogtool/src/main/native/cpp/App.cpp
@@ -7,17 +7,17 @@
 #include <memory>
 #include <string_view>
 
-#include "wpi/glass/Context.hpp"
-#include "wpi/glass/MainMenuBar.hpp"
-#include "wpi/glass/Storage.hpp"
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <libssh/libssh.h>
-#include "wpi/gui/wpigui.hpp"
-#include "wpi/gui/wpigui_openurl.hpp"
 
 #include "Downloader.hpp"
 #include "Exporter.hpp"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/MainMenuBar.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/gui/wpigui.hpp"
+#include "wpi/gui/wpigui_openurl.hpp"
 
 namespace gui = wpi::gui;
 
diff --git a/tools/datalogtool/src/main/native/cpp/Downloader.cpp b/tools/datalogtool/src/main/native/cpp/Downloader.cpp
index 2c9b9e0f12..dc76cd80f0 100644
--- a/tools/datalogtool/src/main/native/cpp/Downloader.cpp
+++ b/tools/datalogtool/src/main/native/cpp/Downloader.cpp
@@ -18,16 +18,16 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/glass/Storage.hpp"
 #include <imgui.h>
 #include <imgui_stdlib.h>
 #include <libssh/sftp.h>
+
+#include "Sftp.hpp"
+#include "wpi/glass/Storage.hpp"
 #include "wpi/gui/portable-file-dialogs.h"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/fs.hpp"
 
-#include "Sftp.hpp"
-
 Downloader::Downloader(glass::Storage& storage)
     : m_serverTeam{storage.GetString("serverTeam")},
       m_remoteDir{storage.GetString("remoteDir", "/home/systemcore/logs")},
diff --git a/tools/datalogtool/src/main/native/cpp/Exporter.cpp b/tools/datalogtool/src/main/native/cpp/Exporter.cpp
index cd9b97a72f..76fbd4df9a 100644
--- a/tools/datalogtool/src/main/native/cpp/Exporter.cpp
+++ b/tools/datalogtool/src/main/native/cpp/Exporter.cpp
@@ -19,25 +19,25 @@
 #include <fmt/chrono.h>
 #include <fmt/format.h>
 #include <fmt/ranges.h>
-#include "wpi/glass/Storage.hpp"
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <imgui_stdlib.h>
+
+#include "App.hpp"
+#include "wpi/datalog/DataLogReaderThread.hpp"
+#include "wpi/glass/Storage.hpp"
 #include "wpi/gui/portable-file-dialogs.h"
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/MemoryBuffer.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/SpanExtras.hpp"
 #include "wpi/util/StringExtras.hpp"
-#include "wpi/datalog/DataLogReaderThread.hpp"
 #include "wpi/util/fmt/raw_ostream.hpp"
 #include "wpi/util/fs.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/print.hpp"
 #include "wpi/util/raw_ostream.hpp"
 
-#include "App.hpp"
-
 namespace {
 struct InputFile {
   explicit InputFile(std::unique_ptr<wpi::log::DataLogReaderThread> datalog);
diff --git a/tools/outlineviewer/src/main/native/cpp/main.cpp b/tools/outlineviewer/src/main/native/cpp/main.cpp
index 66ceea13c4..74b1008947 100644
--- a/tools/outlineviewer/src/main/native/cpp/main.cpp
+++ b/tools/outlineviewer/src/main/native/cpp/main.cpp
@@ -7,6 +7,8 @@
 
 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
+#include <imgui.h>
+
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/MainMenuBar.hpp"
 #include "wpi/glass/Model.hpp"
@@ -14,10 +16,9 @@
 #include "wpi/glass/networktables/NetworkTables.hpp"
 #include "wpi/glass/networktables/NetworkTablesSettings.hpp"
 #include "wpi/glass/other/Log.hpp"
-#include <imgui.h>
-#include "wpi/nt/ntcore_cpp.hpp"
 #include "wpi/gui/wpigui.hpp"
 #include "wpi/gui/wpigui_openurl.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 namespace gui = wpi::gui;
 
diff --git a/tools/sysid/src/main/native/cpp/Util.cpp b/tools/sysid/src/main/native/cpp/Util.cpp
index 538e61194a..95296c8627 100644
--- a/tools/sysid/src/main/native/cpp/Util.cpp
+++ b/tools/sysid/src/main/native/cpp/Util.cpp
@@ -9,6 +9,7 @@
 
 #include <IconsFontAwesome6.h>
 #include <imgui.h>
+
 #include "wpi/util/raw_ostream.hpp"
 
 void sysid::CreateTooltip(const char* text) {
diff --git a/tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp b/tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
index 676df87de2..7aa9ac2cbd 100644
--- a/tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
+++ b/tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
@@ -10,14 +10,14 @@
 #include <vector>
 
 #include <fmt/format.h>
+
+#include "wpi/sysid/analysis/FeedforwardAnalysis.hpp"
+#include "wpi/sysid/analysis/FilteringUtils.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/util/MathExtras.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/StringMap.hpp"
 
-#include "wpi/sysid/analysis/FeedforwardAnalysis.hpp"
-#include "wpi/sysid/analysis/FilteringUtils.hpp"
-
 using namespace sysid;
 
 static double Lerp(units::second_t time,
diff --git a/tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp b/tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp
index ad83958aac..7fa8358763 100644
--- a/tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp
+++ b/tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp
@@ -6,8 +6,8 @@
 
 #include <cmath>
 
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/util/MathExtras.hpp"
 
 using namespace sysid;
diff --git a/tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp b/tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp
index 0f452912f0..545a05ea2e 100644
--- a/tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp
+++ b/tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp
@@ -4,8 +4,8 @@
 
 #include "wpi/sysid/analysis/ElevatorSim.hpp"
 
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/system/Discretization.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/util/MathExtras.hpp"
 
 using namespace sysid;
diff --git a/tools/sysid/src/main/native/cpp/analysis/FeedbackAnalysis.cpp b/tools/sysid/src/main/native/cpp/analysis/FeedbackAnalysis.cpp
index 3a6648a7c7..ec1a9f19ca 100644
--- a/tools/sysid/src/main/native/cpp/analysis/FeedbackAnalysis.cpp
+++ b/tools/sysid/src/main/native/cpp/analysis/FeedbackAnalysis.cpp
@@ -9,12 +9,11 @@
 #include "wpi/math/controller/LinearQuadraticRegulator.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
+#include "wpi/sysid/analysis/FeedbackControllerPreset.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/velocity.hpp"
 #include "wpi/units/voltage.hpp"
 
-#include "wpi/sysid/analysis/FeedbackControllerPreset.hpp"
-
 using namespace sysid;
 
 using Kv_t = decltype(1_V / 1_mps);
diff --git a/tools/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp b/tools/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp
index 571b899b4b..3cef8fb4d7 100644
--- a/tools/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp
+++ b/tools/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp
@@ -13,10 +13,10 @@
 #include <Eigen/Eigenvalues>
 #include <fmt/format.h>
 #include <fmt/ranges.h>
-#include "wpi/units/math.hpp"
-#include "wpi/units/time.hpp"
 
 #include "wpi/sysid/analysis/OLS.hpp"
+#include "wpi/units/math.hpp"
+#include "wpi/units/time.hpp"
 
 namespace sysid {
 
diff --git a/tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp b/tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp
index 2fe401872d..c9457689de 100644
--- a/tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp
+++ b/tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp
@@ -14,6 +14,7 @@
 #include <vector>
 
 #include <fmt/format.h>
+
 #include "wpi/math/filter/LinearFilter.hpp"
 #include "wpi/math/filter/MedianFilter.hpp"
 #include "wpi/units/math.hpp"
diff --git a/tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp b/tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp
index 39cef13b8f..49c4411fe7 100644
--- a/tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp
+++ b/tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp
@@ -4,8 +4,8 @@
 
 #include "wpi/sysid/analysis/SimpleMotorSim.hpp"
 
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/system/Discretization.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/util/MathExtras.hpp"
 
 using namespace sysid;
diff --git a/tools/sysid/src/main/native/cpp/view/Analyzer.cpp b/tools/sysid/src/main/native/cpp/view/Analyzer.cpp
index 44b60ddafa..b0542a2e28 100644
--- a/tools/sysid/src/main/native/cpp/view/Analyzer.cpp
+++ b/tools/sysid/src/main/native/cpp/view/Analyzer.cpp
@@ -13,19 +13,19 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/glass/Context.hpp"
-#include "wpi/glass/Storage.hpp"
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <imgui_stdlib.h>
-#include "wpi/util/json.hpp"
 
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
 #include "wpi/sysid/Util.hpp"
 #include "wpi/sysid/analysis/AnalysisManager.hpp"
 #include "wpi/sysid/analysis/AnalysisType.hpp"
 #include "wpi/sysid/analysis/FeedbackControllerPreset.hpp"
 #include "wpi/sysid/analysis/FilteringUtils.hpp"
 #include "wpi/sysid/view/UILayout.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace sysid;
 
diff --git a/tools/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp b/tools/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp
index b6bcf3b978..d9a370adbe 100644
--- a/tools/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp
+++ b/tools/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp
@@ -12,7 +12,6 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/units/math.hpp"
 
 #include "wpi/sysid/Util.hpp"
 #include "wpi/sysid/analysis/AnalysisManager.hpp"
@@ -20,6 +19,7 @@
 #include "wpi/sysid/analysis/ElevatorSim.hpp"
 #include "wpi/sysid/analysis/FilteringUtils.hpp"
 #include "wpi/sysid/analysis/SimpleMotorSim.hpp"
+#include "wpi/units/math.hpp"
 
 using namespace sysid;
 
diff --git a/tools/sysid/src/main/native/cpp/view/DataSelector.cpp b/tools/sysid/src/main/native/cpp/view/DataSelector.cpp
index 2f39df07ed..d3f52651ad 100644
--- a/tools/sysid/src/main/native/cpp/view/DataSelector.cpp
+++ b/tools/sysid/src/main/native/cpp/view/DataSelector.cpp
@@ -12,14 +12,14 @@
 
 #include <fmt/format.h>
 #include <imgui.h>
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/StringExtras.hpp"
+
 #include "wpi/datalog/DataLogReader.hpp"
 #include "wpi/datalog/DataLogReaderThread.hpp"
-
 #include "wpi/sysid/Util.hpp"
 #include "wpi/sysid/analysis/AnalysisType.hpp"
 #include "wpi/sysid/analysis/Storage.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 using namespace sysid;
 
diff --git a/tools/sysid/src/main/native/cpp/view/LogLoader.cpp b/tools/sysid/src/main/native/cpp/view/LogLoader.cpp
index 04a1005e06..12df0cf9ff 100644
--- a/tools/sysid/src/main/native/cpp/view/LogLoader.cpp
+++ b/tools/sysid/src/main/native/cpp/view/LogLoader.cpp
@@ -14,11 +14,12 @@
 
 #include <imgui.h>
 #include <imgui_stdlib.h>
+
+#include "wpi/datalog/DataLogReaderThread.hpp"
 #include "wpi/gui/portable-file-dialogs.h"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/SpanExtras.hpp"
 #include "wpi/util/StringExtras.hpp"
-#include "wpi/datalog/DataLogReaderThread.hpp"
 #include "wpi/util/fs.hpp"
 
 using namespace sysid;
diff --git a/tools/sysid/src/main/native/include/wpi/sysid/analysis/AnalysisManager.hpp b/tools/sysid/src/main/native/include/wpi/sysid/analysis/AnalysisManager.hpp
index 0d245cda29..c57de76efc 100644
--- a/tools/sysid/src/main/native/include/wpi/sysid/analysis/AnalysisManager.hpp
+++ b/tools/sysid/src/main/native/include/wpi/sysid/analysis/AnalysisManager.hpp
@@ -13,16 +13,15 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/units/time.hpp"
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/StringMap.hpp"
-#include "wpi/util/json.hpp"
-
 #include "wpi/sysid/analysis/AnalysisType.hpp"
 #include "wpi/sysid/analysis/FeedbackAnalysis.hpp"
 #include "wpi/sysid/analysis/FeedbackControllerPreset.hpp"
 #include "wpi/sysid/analysis/OLS.hpp"
 #include "wpi/sysid/analysis/Storage.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/json.hpp"
 
 namespace sysid {
 
diff --git a/tools/sysid/src/main/native/include/wpi/sysid/analysis/ArmSim.hpp b/tools/sysid/src/main/native/include/wpi/sysid/analysis/ArmSim.hpp
index a7122c01b9..51a615ec6c 100644
--- a/tools/sysid/src/main/native/include/wpi/sysid/analysis/ArmSim.hpp
+++ b/tools/sysid/src/main/native/include/wpi/sysid/analysis/ArmSim.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <Eigen/Core>
+
 #include "wpi/units/time.hpp"
 #include "wpi/units/voltage.hpp"
 
diff --git a/tools/sysid/src/main/native/include/wpi/sysid/analysis/ElevatorSim.hpp b/tools/sysid/src/main/native/include/wpi/sysid/analysis/ElevatorSim.hpp
index 545ce56b86..8d82928d66 100644
--- a/tools/sysid/src/main/native/include/wpi/sysid/analysis/ElevatorSim.hpp
+++ b/tools/sysid/src/main/native/include/wpi/sysid/analysis/ElevatorSim.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <Eigen/Core>
+
 #include "wpi/units/time.hpp"
 #include "wpi/units/voltage.hpp"
 
diff --git a/tools/sysid/src/main/native/include/wpi/sysid/analysis/FilteringUtils.hpp b/tools/sysid/src/main/native/include/wpi/sysid/analysis/FilteringUtils.hpp
index 658f047f95..847d824d4d 100644
--- a/tools/sysid/src/main/native/include/wpi/sysid/analysis/FilteringUtils.hpp
+++ b/tools/sysid/src/main/native/include/wpi/sysid/analysis/FilteringUtils.hpp
@@ -14,14 +14,14 @@
 
 #include <fmt/format.h>
 #include <fmt/ranges.h>
+
 #include "wpi/math/filter/LinearFilter.hpp"
+#include "wpi/sysid/analysis/AnalysisManager.hpp"
+#include "wpi/sysid/analysis/Storage.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/array.hpp"
 
-#include "wpi/sysid/analysis/AnalysisManager.hpp"
-#include "wpi/sysid/analysis/Storage.hpp"
-
 namespace sysid {
 
 constexpr int kNoiseMeanWindow = 9;
diff --git a/tools/sysid/src/main/native/include/wpi/sysid/analysis/SimpleMotorSim.hpp b/tools/sysid/src/main/native/include/wpi/sysid/analysis/SimpleMotorSim.hpp
index 7fb1d0791b..d78f66bf08 100644
--- a/tools/sysid/src/main/native/include/wpi/sysid/analysis/SimpleMotorSim.hpp
+++ b/tools/sysid/src/main/native/include/wpi/sysid/analysis/SimpleMotorSim.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <Eigen/Core>
+
 #include "wpi/units/time.hpp"
 #include "wpi/units/voltage.hpp"
 
diff --git a/tools/sysid/src/main/native/include/wpi/sysid/analysis/Storage.hpp b/tools/sysid/src/main/native/include/wpi/sysid/analysis/Storage.hpp
index 96a6870b7f..4ce6cde226 100644
--- a/tools/sysid/src/main/native/include/wpi/sysid/analysis/Storage.hpp
+++ b/tools/sysid/src/main/native/include/wpi/sysid/analysis/Storage.hpp
@@ -7,12 +7,11 @@
 #include <string>
 #include <vector>
 
+#include "wpi/sysid/analysis/AnalysisType.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/voltage.hpp"
 #include "wpi/util/StringMap.hpp"
 
-#include "wpi/sysid/analysis/AnalysisType.hpp"
-
 namespace sysid {
 
 struct MotorData {
diff --git a/tools/sysid/src/main/native/include/wpi/sysid/analysis/TrackwidthAnalysis.hpp b/tools/sysid/src/main/native/include/wpi/sysid/analysis/TrackwidthAnalysis.hpp
index 09b57c0334..219758d36e 100644
--- a/tools/sysid/src/main/native/include/wpi/sysid/analysis/TrackwidthAnalysis.hpp
+++ b/tools/sysid/src/main/native/include/wpi/sysid/analysis/TrackwidthAnalysis.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <gcem.hpp>
+
 #include "wpi/units/angle.hpp"
 
 namespace sysid {
diff --git a/tools/sysid/src/main/native/include/wpi/sysid/view/Analyzer.hpp b/tools/sysid/src/main/native/include/wpi/sysid/view/Analyzer.hpp
index e80252b93c..d218e48d6e 100644
--- a/tools/sysid/src/main/native/include/wpi/sysid/view/Analyzer.hpp
+++ b/tools/sysid/src/main/native/include/wpi/sysid/view/Analyzer.hpp
@@ -10,18 +10,18 @@
 #include <thread>
 #include <vector>
 
-#include "wpi/glass/View.hpp"
 #include <implot.h>
-#include "wpi/gui/portable-file-dialogs.h"
-#include "wpi/units/time.hpp"
-#include "wpi/units/voltage.hpp"
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/StringMap.hpp"
 
+#include "wpi/glass/View.hpp"
+#include "wpi/gui/portable-file-dialogs.h"
 #include "wpi/sysid/analysis/AnalysisManager.hpp"
 #include "wpi/sysid/analysis/FeedbackAnalysis.hpp"
 #include "wpi/sysid/analysis/FeedbackControllerPreset.hpp"
 #include "wpi/sysid/view/AnalyzerPlot.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/units/voltage.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/StringMap.hpp"
 
 struct ImPlotPoint;
 
diff --git a/tools/sysid/src/main/native/include/wpi/sysid/view/AnalyzerPlot.hpp b/tools/sysid/src/main/native/include/wpi/sysid/view/AnalyzerPlot.hpp
index 0d754cd0a3..396bedcf63 100644
--- a/tools/sysid/src/main/native/include/wpi/sysid/view/AnalyzerPlot.hpp
+++ b/tools/sysid/src/main/native/include/wpi/sysid/view/AnalyzerPlot.hpp
@@ -13,13 +13,13 @@
 
 #include <imgui.h>
 #include <implot.h>
-#include "wpi/units/time.hpp"
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/spinlock.hpp"
 
 #include "wpi/sysid/analysis/AnalysisManager.hpp"
 #include "wpi/sysid/analysis/AnalysisType.hpp"
 #include "wpi/sysid/analysis/Storage.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/spinlock.hpp"
 
 namespace sysid {
 /**
diff --git a/tools/sysid/src/main/native/include/wpi/sysid/view/DataSelector.hpp b/tools/sysid/src/main/native/include/wpi/sysid/view/DataSelector.hpp
index 4b6cf65f11..0059675462 100644
--- a/tools/sysid/src/main/native/include/wpi/sysid/view/DataSelector.hpp
+++ b/tools/sysid/src/main/native/include/wpi/sysid/view/DataSelector.hpp
@@ -12,11 +12,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/glass/View.hpp"
-#include "wpi/util/StringMap.hpp"
 #include "wpi/datalog/DataLogReaderThread.hpp"
-
+#include "wpi/glass/View.hpp"
 #include "wpi/sysid/analysis/Storage.hpp"
+#include "wpi/util/StringMap.hpp"
 
 namespace glass {
 class Storage;
diff --git a/tools/sysid/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp b/tools/sysid/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp
index daceacd347..6f9094b433 100644
--- a/tools/sysid/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp
+++ b/tools/sysid/src/test/native/cpp/analysis/FeedforwardAnalysisTest.cpp
@@ -9,8 +9,6 @@
 #include <span>
 
 #include <gtest/gtest.h>
-#include "wpi/units/time.hpp"
-#include "wpi/units/voltage.hpp"
 
 #include "wpi/sysid/analysis/AnalysisManager.hpp"
 #include "wpi/sysid/analysis/AnalysisType.hpp"
@@ -18,6 +16,8 @@
 #include "wpi/sysid/analysis/ElevatorSim.hpp"
 #include "wpi/sysid/analysis/FeedforwardAnalysis.hpp"
 #include "wpi/sysid/analysis/SimpleMotorSim.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/units/voltage.hpp"
 
 namespace {
 
diff --git a/tools/wpical/src/main/native/cpp/WPIcal.cpp b/tools/wpical/src/main/native/cpp/WPIcal.cpp
index 50610cae7f..ba9205bd31 100644
--- a/tools/wpical/src/main/native/cpp/WPIcal.cpp
+++ b/tools/wpical/src/main/native/cpp/WPIcal.cpp
@@ -2,11 +2,6 @@
 // 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 "cameracalibration.hpp"
-#include "fieldcalibration.hpp"
-#include "fieldmap.hpp"
-#include "fmap.hpp"
-
 #include <fstream>
 #include <iostream>
 #include <map>
@@ -18,11 +13,15 @@
 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
 #include <imgui.h>
-#include "wpi/gui/portable-file-dialogs.h"
-#include "wpi/util/json.hpp"
-#include "wpi/gui/wpigui.hpp"
 
+#include "cameracalibration.hpp"
+#include "fieldcalibration.hpp"
+#include "fieldmap.hpp"
+#include "fmap.hpp"
 #include "tagpose.hpp"
+#include "wpi/gui/portable-file-dialogs.h"
+#include "wpi/gui/wpigui.hpp"
+#include "wpi/util/json.hpp"
 
 namespace gui = wpi::gui;
 
diff --git a/tools/wpical/src/main/native/include/cameracalibration.hpp b/tools/wpical/src/main/native/include/cameracalibration.hpp
index 8d3f9357ca..3e728ac1ae 100644
--- a/tools/wpical/src/main/native/include/cameracalibration.hpp
+++ b/tools/wpical/src/main/native/include/cameracalibration.hpp
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include <Eigen/Core>
+
 #include "wpi/util/json.hpp"
 
 namespace cameracalibration {
diff --git a/tools/wpical/src/main/native/include/fieldcalibration.hpp b/tools/wpical/src/main/native/include/fieldcalibration.hpp
index ef9cd6151c..673b6a236f 100644
--- a/tools/wpical/src/main/native/include/fieldcalibration.hpp
+++ b/tools/wpical/src/main/native/include/fieldcalibration.hpp
@@ -6,9 +6,8 @@
 
 #include <string>
 
-#include "wpi/util/json.hpp"
-
 #include "cameracalibration.hpp"
+#include "wpi/util/json.hpp"
 
 namespace fieldcalibration {
 int calibrate(std::string input_dir_path, wpi::json& output_json,
diff --git a/tools/wpical/src/main/native/include/fieldmap.hpp b/tools/wpical/src/main/native/include/fieldmap.hpp
index 13717e1909..c3fb241927 100644
--- a/tools/wpical/src/main/native/include/fieldmap.hpp
+++ b/tools/wpical/src/main/native/include/fieldmap.hpp
@@ -7,9 +7,8 @@
 #include <cmath>
 #include <map>
 
-#include "wpi/util/json.hpp"
-
 #include "tagpose.hpp"
+#include "wpi/util/json.hpp"
 
 class Fieldmap {
  public:
diff --git a/tools/wpical/src/main/native/include/fmap.hpp b/tools/wpical/src/main/native/include/fmap.hpp
index 221d3c9934..6975e8a3ee 100644
--- a/tools/wpical/src/main/native/include/fmap.hpp
+++ b/tools/wpical/src/main/native/include/fmap.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/json.hpp"
-
 #include "fieldmap.hpp"
 #include "tagpose.hpp"
+#include "wpi/util/json.hpp"
 
 namespace fmap {
 wpi::json singleTag(int tag, const tag::Pose& tagpose);
diff --git a/tools/wpical/src/main/native/include/tagpose.hpp b/tools/wpical/src/main/native/include/tagpose.hpp
index 5ec998d784..6c9f37247a 100644
--- a/tools/wpical/src/main/native/include/tagpose.hpp
+++ b/tools/wpical/src/main/native/include/tagpose.hpp
@@ -6,6 +6,7 @@
 
 #include <Eigen/Core>
 #include <Eigen/Geometry>
+
 #include "wpi/util/json.hpp"
 
 namespace tag {
diff --git a/tools/wpical/src/test/native/cpp/test_calibrate.cpp b/tools/wpical/src/test/native/cpp/test_calibrate.cpp
index 4b3c4e9332..5e298f7a6d 100644
--- a/tools/wpical/src/test/native/cpp/test_calibrate.cpp
+++ b/tools/wpical/src/test/native/cpp/test_calibrate.cpp
@@ -2,15 +2,14 @@
 // 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 "cameracalibration.hpp"
-#include "fieldcalibration.hpp"
-
 #include <string>
 
 #include <gtest/gtest.h>
-#include "wpi/util/json.hpp"
 
+#include "cameracalibration.hpp"
+#include "fieldcalibration.hpp"
 #include "path_lookup.hpp"
+#include "wpi/util/json.hpp"
 
 const std::string projectRootPath = PROJECT_ROOT_PATH;
 
diff --git a/wpilibc/src/dev/native/cpp/main.cpp b/wpilibc/src/dev/native/cpp/main.cpp
index 6647f530b6..9fb77f5ade 100644
--- a/wpilibc/src/dev/native/cpp/main.cpp
+++ b/wpilibc/src/dev/native/cpp/main.cpp
@@ -3,9 +3,8 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include "wpi/hal/HALBase.h"
-#include "wpi/util/print.hpp"
-
 #include "wpi/system/WPILibVersion.hpp"
+#include "wpi/util/print.hpp"
 
 int main() {
   wpi::print("Hello World\n");
diff --git a/wpilibc/src/main/native/cpp/ExpansionHub.cpp b/wpilibc/src/main/native/cpp/ExpansionHub.cpp
index 51dba94fc0..2c3be13a19 100644
--- a/wpilibc/src/main/native/cpp/ExpansionHub.cpp
+++ b/wpilibc/src/main/native/cpp/ExpansionHub.cpp
@@ -6,12 +6,11 @@
 
 #include <memory>
 
-#include "wpi/hal/UsageReporting.h"
-#include "wpi/nt/BooleanTopic.hpp"
-
-#include "wpi/system/Errors.hpp"
 #include "wpi/ExpansionHubMotor.hpp"
 #include "wpi/ExpansionHubServo.hpp"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/system/Errors.hpp"
 #include "wpi/system/SystemServer.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/counter/Tachometer.cpp b/wpilibc/src/main/native/cpp/counter/Tachometer.cpp
index 3efa031925..731ded1126 100644
--- a/wpilibc/src/main/native/cpp/counter/Tachometer.cpp
+++ b/wpilibc/src/main/native/cpp/counter/Tachometer.cpp
@@ -8,11 +8,10 @@
 
 #include "wpi/hal/Counter.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "wpi/system/Errors.hpp"
-
 using namespace frc;
 
 Tachometer::Tachometer(int channel, EdgeConfiguration configuration)
diff --git a/wpilibc/src/main/native/cpp/counter/UpDownCounter.cpp b/wpilibc/src/main/native/cpp/counter/UpDownCounter.cpp
index cd290625fc..f996b4e32a 100644
--- a/wpilibc/src/main/native/cpp/counter/UpDownCounter.cpp
+++ b/wpilibc/src/main/native/cpp/counter/UpDownCounter.cpp
@@ -9,11 +9,10 @@
 
 #include "wpi/hal/Counter.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "wpi/system/Errors.hpp"
-
 using namespace frc;
 
 UpDownCounter::UpDownCounter(int channel, EdgeConfiguration configuration)
diff --git a/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp b/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
index 0d096186ca..0d3ed58b49 100644
--- a/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
+++ b/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
@@ -10,12 +10,11 @@
 #include <utility>
 
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/hardware/motor/MotorController.hpp"
+#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/math/util/MathUtil.hpp"
-#include "wpi/hardware/motor/MotorController.hpp"
-
 using namespace frc;
 
 WPI_IGNORE_DEPRECATED
diff --git a/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp b/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
index 749ea14e08..e5ea2f5810 100644
--- a/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
+++ b/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
@@ -9,13 +9,12 @@
 #include <utility>
 
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/hardware/motor/MotorController.hpp"
+#include "wpi/math/geometry/Translation2d.hpp"
+#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/math/util/MathUtil.hpp"
-#include "wpi/math/geometry/Translation2d.hpp"
-#include "wpi/hardware/motor/MotorController.hpp"
-
 using namespace frc;
 
 WPI_IGNORE_DEPRECATED
diff --git a/wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp b/wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp
index f7b86fd243..20cb4d3208 100644
--- a/wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp
+++ b/wpilibc/src/main/native/cpp/driverstation/DriverStation.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/hal/DriverStation.h"
 
 #include <stdint.h>
 
@@ -14,7 +15,8 @@
 #include <string_view>
 
 #include <fmt/format.h>
-#include "wpi/hal/DriverStation.h"
+
+#include "wpi/datalog/DataLog.hpp"
 #include "wpi/hal/DriverStationTypes.h"
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/Power.h"
@@ -23,16 +25,14 @@
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/Timer.hpp"
 #include "wpi/util/EventVector.hpp"
 #include "wpi/util/condition_variable.hpp"
-#include "wpi/datalog/DataLog.hpp"
 #include "wpi/util/json.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/timestamp.h"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/system/Timer.hpp"
-
 using namespace frc;
 
 static constexpr int availableToCount(uint64_t available) {
diff --git a/wpilibc/src/main/native/cpp/driverstation/Gamepad.cpp b/wpilibc/src/main/native/cpp/driverstation/Gamepad.cpp
index 7e94ced954..3289642b63 100644
--- a/wpilibc/src/main/native/cpp/driverstation/Gamepad.cpp
+++ b/wpilibc/src/main/native/cpp/driverstation/Gamepad.cpp
@@ -4,11 +4,10 @@
 
 #include "wpi/driverstation/Gamepad.hpp"
 
+#include "wpi/event/BooleanEvent.hpp"
 #include "wpi/hal/UsageReporting.h"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "wpi/event/BooleanEvent.hpp"
-
 using namespace frc;
 
 Gamepad::Gamepad(int port) : GenericHID(port) {
diff --git a/wpilibc/src/main/native/cpp/driverstation/GenericHID.cpp b/wpilibc/src/main/native/cpp/driverstation/GenericHID.cpp
index 7614e04c52..5e212f68fb 100644
--- a/wpilibc/src/main/native/cpp/driverstation/GenericHID.cpp
+++ b/wpilibc/src/main/native/cpp/driverstation/GenericHID.cpp
@@ -6,11 +6,10 @@
 
 #include <string>
 
-#include "wpi/hal/DriverStation.h"
-
 #include "wpi/driverstation/DriverStation.hpp"
-#include "wpi/system/Errors.hpp"
 #include "wpi/event/BooleanEvent.hpp"
+#include "wpi/hal/DriverStation.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/driverstation/Joystick.cpp b/wpilibc/src/main/native/cpp/driverstation/Joystick.cpp
index d0f48cc8bc..5eaddf8269 100644
--- a/wpilibc/src/main/native/cpp/driverstation/Joystick.cpp
+++ b/wpilibc/src/main/native/cpp/driverstation/Joystick.cpp
@@ -6,9 +6,8 @@
 
 #include <cmath>
 
-#include "wpi/hal/UsageReporting.h"
-
 #include "wpi/event/BooleanEvent.hpp"
+#include "wpi/hal/UsageReporting.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/hardware/accelerometer/AnalogAccelerometer.cpp b/wpilibc/src/main/native/cpp/hardware/accelerometer/AnalogAccelerometer.cpp
index 9d99799c09..3e6ed317c7 100644
--- a/wpilibc/src/main/native/cpp/hardware/accelerometer/AnalogAccelerometer.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/accelerometer/AnalogAccelerometer.cpp
@@ -5,12 +5,11 @@
 #include "wpi/hardware/accelerometer/AnalogAccelerometer.hpp"
 
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/NullDeleter.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-
 using namespace frc;
 
 AnalogAccelerometer::AnalogAccelerometer(int channel)
diff --git a/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp b/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp
index 2bdbe4597e..0855298f9e 100644
--- a/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp
@@ -2,15 +2,14 @@
 // 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 "wpi/hal/CAN.h"
 #include "wpi/hardware/bus/CAN.hpp"
 
 #include <utility>
 
-#include "wpi/hal/CAN.h"
 #include "wpi/hal/CANAPI.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/UsageReporting.h"
-
 #include "wpi/system/Errors.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/hardware/bus/I2C.cpp b/wpilibc/src/main/native/cpp/hardware/bus/I2C.cpp
index 6afe3e0297..ad09146dca 100644
--- a/wpilibc/src/main/native/cpp/hardware/bus/I2C.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/bus/I2C.cpp
@@ -2,13 +2,12 @@
 // 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 "wpi/hal/I2C.h"
 #include "wpi/hardware/bus/I2C.hpp"
 
 #include <algorithm>
 
-#include "wpi/hal/I2C.h"
 #include "wpi/hal/UsageReporting.h"
-
 #include "wpi/system/Errors.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/hardware/bus/SerialPort.cpp b/wpilibc/src/main/native/cpp/hardware/bus/SerialPort.cpp
index 61784a7ef9..41077a3f4d 100644
--- a/wpilibc/src/main/native/cpp/hardware/bus/SerialPort.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/bus/SerialPort.cpp
@@ -2,13 +2,12 @@
 // 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 "wpi/hal/SerialPort.h"
 #include "wpi/hardware/bus/SerialPort.hpp"
 
 #include <string>
 
-#include "wpi/hal/SerialPort.h"
 #include "wpi/hal/UsageReporting.h"
-
 #include "wpi/system/Errors.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/hardware/discrete/AnalogInput.cpp b/wpilibc/src/main/native/cpp/hardware/discrete/AnalogInput.cpp
index ef99469a77..718125159a 100644
--- a/wpilibc/src/main/native/cpp/hardware/discrete/AnalogInput.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/discrete/AnalogInput.cpp
@@ -2,22 +2,21 @@
 // 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 "wpi/hal/AnalogInput.h"
 #include "wpi/hardware/discrete/AnalogInput.hpp"
 
 #include <string>
 
-#include "wpi/hal/AnalogInput.h"
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/Timer.hpp"
+#include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/util/SensorUtil.hpp"
-#include "wpi/system/Timer.hpp"
-
 using namespace frc;
 
 AnalogInput::AnalogInput(int channel) {
diff --git a/wpilibc/src/main/native/cpp/hardware/discrete/DigitalInput.cpp b/wpilibc/src/main/native/cpp/hardware/discrete/DigitalInput.cpp
index 00964b3625..e4f00eed7b 100644
--- a/wpilibc/src/main/native/cpp/hardware/discrete/DigitalInput.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/discrete/DigitalInput.cpp
@@ -10,13 +10,12 @@
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/util/SensorUtil.hpp"
-
 using namespace frc;
 
 DigitalInput::DigitalInput(int channel) {
diff --git a/wpilibc/src/main/native/cpp/hardware/discrete/DigitalOutput.cpp b/wpilibc/src/main/native/cpp/hardware/discrete/DigitalOutput.cpp
index ce695e546e..d8549b3241 100644
--- a/wpilibc/src/main/native/cpp/hardware/discrete/DigitalOutput.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/discrete/DigitalOutput.cpp
@@ -10,13 +10,12 @@
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/util/SensorUtil.hpp"
-
 using namespace frc;
 
 DigitalOutput::DigitalOutput(int channel) {
diff --git a/wpilibc/src/main/native/cpp/hardware/discrete/PWM.cpp b/wpilibc/src/main/native/cpp/hardware/discrete/PWM.cpp
index 2620284fbf..33cfa1d9f4 100644
--- a/wpilibc/src/main/native/cpp/hardware/discrete/PWM.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/discrete/PWM.cpp
@@ -2,21 +2,20 @@
 // 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 "wpi/hal/PWM.h"
 #include "wpi/hardware/discrete/PWM.hpp"
 
 #include <utility>
 
 #include "wpi/hal/HALBase.h"
-#include "wpi/hal/PWM.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/util/SensorUtil.hpp"
-
 using namespace frc;
 
 PWM::PWM(int channel, bool registerSendable) {
diff --git a/wpilibc/src/main/native/cpp/hardware/imu/OnboardIMU.cpp b/wpilibc/src/main/native/cpp/hardware/imu/OnboardIMU.cpp
index e2bb8369fb..7f7154f6e1 100644
--- a/wpilibc/src/main/native/cpp/hardware/imu/OnboardIMU.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/imu/OnboardIMU.cpp
@@ -5,7 +5,6 @@
 #include "wpi/hardware/imu/OnboardIMU.hpp"
 
 #include "wpi/hal/IMU.h"
-
 #include "wpi/system/Errors.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/hardware/led/AddressableLED.cpp b/wpilibc/src/main/native/cpp/hardware/led/AddressableLED.cpp
index 99ff7b99ba..b1057a31e1 100644
--- a/wpilibc/src/main/native/cpp/hardware/led/AddressableLED.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/led/AddressableLED.cpp
@@ -2,19 +2,18 @@
 // 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 "wpi/hal/AddressableLED.h"
 #include "wpi/hardware/led/AddressableLED.hpp"
 
 #include <algorithm>
 
-#include "wpi/hal/AddressableLED.h"
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/PWM.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/UsageReporting.h"
-#include "wpi/util/StackTrace.hpp"
-
 #include "wpi/system/Errors.hpp"
 #include "wpi/util/SensorUtil.hpp"
+#include "wpi/util/StackTrace.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/hardware/led/LEDPattern.cpp b/wpilibc/src/main/native/cpp/hardware/led/LEDPattern.cpp
index b675bf4ff2..bb0219fd00 100644
--- a/wpilibc/src/main/native/cpp/hardware/led/LEDPattern.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/led/LEDPattern.cpp
@@ -11,11 +11,10 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/util/MathExtras.hpp"
 #include "wpi/util/timestamp.h"
 
-#include "wpi/math/util/MathUtil.hpp"
-
 using namespace frc;
 
 LEDPattern::LEDPattern(std::function<void(frc::LEDPattern::LEDReader,
diff --git a/wpilibc/src/main/native/cpp/hardware/motor/MotorSafety.cpp b/wpilibc/src/main/native/cpp/hardware/motor/MotorSafety.cpp
index 0d3ffe5683..1b2543f818 100644
--- a/wpilibc/src/main/native/cpp/hardware/motor/MotorSafety.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/motor/MotorSafety.cpp
@@ -7,13 +7,12 @@
 #include <algorithm>
 #include <utility>
 
+#include "wpi/driverstation/DriverStation.hpp"
 #include "wpi/hal/DriverStation.h"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/SafeThread.hpp"
 #include "wpi/util/SmallPtrSet.hpp"
 
-#include "wpi/driverstation/DriverStation.hpp"
-#include "wpi/system/Errors.hpp"
-
 using namespace frc;
 
 namespace {
diff --git a/wpilibc/src/main/native/cpp/hardware/pneumatic/Compressor.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/Compressor.cpp
index 2de547475a..b320c048a1 100644
--- a/wpilibc/src/main/native/cpp/hardware/pneumatic/Compressor.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/pneumatic/Compressor.cpp
@@ -4,14 +4,12 @@
 
 #include "wpi/hardware/pneumatic/Compressor.hpp"
 
-#include "wpi/hardware/pneumatic/PneumaticHub.hpp"
-
 #include "wpi/hal/Ports.h"
+#include "wpi/hardware/pneumatic/PneumaticHub.hpp"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-
 using namespace frc;
 
 Compressor::Compressor(int busId, int module, PneumaticsModuleType moduleType)
diff --git a/wpilibc/src/main/native/cpp/hardware/pneumatic/DoubleSolenoid.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/DoubleSolenoid.cpp
index 3b7891bf03..28865514fa 100644
--- a/wpilibc/src/main/native/cpp/hardware/pneumatic/DoubleSolenoid.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/pneumatic/DoubleSolenoid.cpp
@@ -7,13 +7,12 @@
 #include <utility>
 
 #include "wpi/hal/Ports.h"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/util/SensorUtil.hpp"
-
 using namespace frc;
 
 DoubleSolenoid::DoubleSolenoid(int busId, int module,
diff --git a/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp
index e6d2fe87cd..24de9fd6bd 100644
--- a/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp
@@ -10,18 +10,18 @@
 #include <string>
 
 #include <fmt/format.h>
+
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/REVPH.h"
 #include "wpi/hal/UsageReporting.h"
-#include "wpi/util/NullDeleter.hpp"
-#include "wpi/util/StackTrace.hpp"
-
 #include "wpi/hardware/pneumatic/Compressor.hpp"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
-#include "wpi/system/Errors.hpp"
-#include "wpi/opmode/RobotBase.hpp"
-#include "wpi/util/SensorUtil.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"
+#include "wpi/opmode/RobotBase.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/SensorUtil.hpp"
+#include "wpi/util/StackTrace.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsBase.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsBase.cpp
index 8b045b28b8..50cfd6c31a 100644
--- a/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsBase.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsBase.cpp
@@ -7,10 +7,9 @@
 #include <memory>
 
 #include "wpi/hal/REVPH.h"
-
-#include "wpi/system/Errors.hpp"
 #include "wpi/hardware/pneumatic/PneumaticHub.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp
index f6d2e8d679..f408496148 100644
--- a/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp
@@ -8,17 +8,17 @@
 #include <string>
 
 #include <fmt/format.h>
+
 #include "wpi/hal/CTREPCM.h"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/UsageReporting.h"
-#include "wpi/util/NullDeleter.hpp"
-#include "wpi/util/StackTrace.hpp"
-
 #include "wpi/hardware/pneumatic/Compressor.hpp"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
-#include "wpi/system/Errors.hpp"
-#include "wpi/util/SensorUtil.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/SensorUtil.hpp"
+#include "wpi/util/StackTrace.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/hardware/pneumatic/Solenoid.cpp b/wpilibc/src/main/native/cpp/hardware/pneumatic/Solenoid.cpp
index 5de73cf33a..6f6e1474ec 100644
--- a/wpilibc/src/main/native/cpp/hardware/pneumatic/Solenoid.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/pneumatic/Solenoid.cpp
@@ -6,13 +6,12 @@
 
 #include <utility>
 
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/util/SensorUtil.hpp"
-
 using namespace frc;
 
 Solenoid::Solenoid(int busId, int module, PneumaticsModuleType moduleType,
diff --git a/wpilibc/src/main/native/cpp/hardware/power/PowerDistribution.cpp b/wpilibc/src/main/native/cpp/hardware/power/PowerDistribution.cpp
index 314005cf58..2ba6f2d0d9 100644
--- a/wpilibc/src/main/native/cpp/hardware/power/PowerDistribution.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/power/PowerDistribution.cpp
@@ -2,20 +2,20 @@
 // 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 "wpi/hal/PowerDistribution.h"
 #include "wpi/hardware/power/PowerDistribution.hpp"
 
 #include <vector>
 
 #include <fmt/format.h>
+
 #include "wpi/hal/Ports.h"
-#include "wpi/hal/PowerDistribution.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-
 static_assert(static_cast<HAL_PowerDistributionType>(
                   frc::PowerDistribution::ModuleType::kCTRE) ==
               HAL_PowerDistributionType::HAL_PowerDistributionType_kCTRE);
diff --git a/wpilibc/src/main/native/cpp/hardware/range/SharpIR.cpp b/wpilibc/src/main/native/cpp/hardware/range/SharpIR.cpp
index bb02dd6098..9f8e4ce2ce 100644
--- a/wpilibc/src/main/native/cpp/hardware/range/SharpIR.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/range/SharpIR.cpp
@@ -7,12 +7,11 @@
 #include <algorithm>
 
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/hardware/discrete/AnalogInput.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/hardware/discrete/AnalogInput.hpp"
-
 using namespace frc;
 
 SharpIR SharpIR::GP2Y0A02YK0F(int channel) {
diff --git a/wpilibc/src/main/native/cpp/hardware/rotation/AnalogEncoder.cpp b/wpilibc/src/main/native/cpp/hardware/rotation/AnalogEncoder.cpp
index 77dca5ba8f..6f5ca07265 100644
--- a/wpilibc/src/main/native/cpp/hardware/rotation/AnalogEncoder.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/rotation/AnalogEncoder.cpp
@@ -7,12 +7,11 @@
 #include <utility>
 
 #include "wpi/hal/UsageReporting.h"
-#include "wpi/util/NullDeleter.hpp"
-#include "wpi/util/sendable/SendableBuilder.hpp"
-
 #include "wpi/hardware/discrete/AnalogInput.hpp"
 #include "wpi/math/util/MathUtil.hpp"
 #include "wpi/system/RobotController.hpp"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/hardware/rotation/AnalogPotentiometer.cpp b/wpilibc/src/main/native/cpp/hardware/rotation/AnalogPotentiometer.cpp
index 143e1b6e3c..0f5e8a59c4 100644
--- a/wpilibc/src/main/native/cpp/hardware/rotation/AnalogPotentiometer.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/rotation/AnalogPotentiometer.cpp
@@ -7,12 +7,11 @@
 #include <memory>
 #include <utility>
 
+#include "wpi/system/RobotController.hpp"
 #include "wpi/util/NullDeleter.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/RobotController.hpp"
-
 using namespace frc;
 
 AnalogPotentiometer::AnalogPotentiometer(int channel, double fullRange,
diff --git a/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycle.cpp b/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycle.cpp
index 9913a9c80c..e866a754dc 100644
--- a/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycle.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycle.cpp
@@ -2,21 +2,20 @@
 // 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 "wpi/hal/DutyCycle.h"
 #include "wpi/hardware/rotation/DutyCycle.hpp"
 
 #include <string>
 #include <utility>
 
-#include "wpi/hal/DutyCycle.h"
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/util/SensorUtil.hpp"
-
 using namespace frc;
 
 DutyCycle::DutyCycle(int channel) : m_channel{channel} {
diff --git a/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycleEncoder.cpp b/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycleEncoder.cpp
index 4427ec6fd4..d0be46d51c 100644
--- a/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycleEncoder.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycleEncoder.cpp
@@ -7,12 +7,11 @@
 #include <memory>
 #include <utility>
 
-#include "wpi/util/NullDeleter.hpp"
-#include "wpi/util/sendable/SendableBuilder.hpp"
-
 #include "wpi/hardware/discrete/DigitalInput.hpp"
 #include "wpi/hardware/rotation/DutyCycle.hpp"
 #include "wpi/math/util/MathUtil.hpp"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/hardware/rotation/Encoder.cpp b/wpilibc/src/main/native/cpp/hardware/rotation/Encoder.cpp
index d26b8c153b..217eb9d6bb 100644
--- a/wpilibc/src/main/native/cpp/hardware/rotation/Encoder.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/rotation/Encoder.cpp
@@ -2,20 +2,19 @@
 // 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 "wpi/hal/Encoder.h"
 #include "wpi/hardware/rotation/Encoder.hpp"
 
 #include <memory>
 #include <utility>
 
-#include "wpi/hal/Encoder.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/hardware/discrete/DigitalInput.hpp"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/NullDeleter.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/hardware/discrete/DigitalInput.hpp"
-#include "wpi/system/Errors.hpp"
-
 using namespace frc;
 
 Encoder::Encoder(int aChannel, int bChannel, bool reverseDirection,
diff --git a/wpilibc/src/main/native/cpp/internal/DriverStationModeThread.cpp b/wpilibc/src/main/native/cpp/internal/DriverStationModeThread.cpp
index d31f414624..4412a6d715 100644
--- a/wpilibc/src/main/native/cpp/internal/DriverStationModeThread.cpp
+++ b/wpilibc/src/main/native/cpp/internal/DriverStationModeThread.cpp
@@ -4,11 +4,10 @@
 
 #include "wpi/internal/DriverStationModeThread.hpp"
 
+#include "wpi/driverstation/DriverStation.hpp"
 #include "wpi/hal/DriverStation.h"
 #include "wpi/util/Synchronization.h"
 
-#include "wpi/driverstation/DriverStation.hpp"
-
 using namespace frc::internal;
 
 DriverStationModeThread::DriverStationModeThread() {
diff --git a/wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.cpp b/wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.cpp
index 0481587f81..c4b2e66463 100644
--- a/wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.cpp
+++ b/wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.cpp
@@ -7,10 +7,10 @@
 #include <string>
 
 #include <fmt/format.h>
-#include "wpi/util/sendable/SendableBuilder.hpp"
-#include "wpi/util/sendable/SendableRegistry.hpp"
 
 #include "wpi/system/RobotController.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp
index 83b19a6ff8..0733ff2c9c 100644
--- a/wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp
+++ b/wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.cpp
@@ -4,15 +4,13 @@
 
 #include "wpi/opmode/IterativeRobotBase.hpp"
 
+#include "wpi/driverstation/DSControlWord.hpp"
 #include "wpi/driverstation/DriverStation.hpp"
-
 #include "wpi/hal/DriverStation.h"
 #include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/util/print.hpp"
-
-#include "wpi/driverstation/DSControlWord.hpp"
-#include "wpi/system/Errors.hpp"
 #include "wpi/smartdashboard/SmartDashboard.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp b/wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp
index 067df15d42..04bf0feaf0 100644
--- a/wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp
+++ b/wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp
@@ -12,7 +12,6 @@
 #include "wpi/hal/DriverStation.h"
 #include "wpi/hal/Notifier.h"
 #include "wpi/hal/UsageReporting.h"
-
 #include "wpi/system/Errors.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/simulation/AddressableLEDSim.cpp b/wpilibc/src/main/native/cpp/simulation/AddressableLEDSim.cpp
index d95d7da381..1b5b3b8574 100644
--- a/wpilibc/src/main/native/cpp/simulation/AddressableLEDSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/AddressableLEDSim.cpp
@@ -8,7 +8,6 @@
 #include <stdexcept>
 
 #include "wpi/hal/simulation/AddressableLEDData.h"
-
 #include "wpi/hardware/led/AddressableLED.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/simulation/AnalogInputSim.cpp b/wpilibc/src/main/native/cpp/simulation/AnalogInputSim.cpp
index af205fc78d..1d7604f68b 100644
--- a/wpilibc/src/main/native/cpp/simulation/AnalogInputSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/AnalogInputSim.cpp
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "wpi/hal/simulation/AnalogInData.h"
-
 #include "wpi/hardware/discrete/AnalogInput.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/simulation/CTREPCMSim.cpp b/wpilibc/src/main/native/cpp/simulation/CTREPCMSim.cpp
index 5b1261ea10..b2a41457a0 100644
--- a/wpilibc/src/main/native/cpp/simulation/CTREPCMSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/CTREPCMSim.cpp
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "wpi/hal/simulation/CTREPCMData.h"
-
 #include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/simulation/DCMotorSim.cpp b/wpilibc/src/main/native/cpp/simulation/DCMotorSim.cpp
index 59bb1b00c8..10786d96ca 100644
--- a/wpilibc/src/main/native/cpp/simulation/DCMotorSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/DCMotorSim.cpp
@@ -4,9 +4,8 @@
 
 #include "wpi/simulation/DCMotorSim.hpp"
 
-#include "wpi/util/MathExtras.hpp"
-
 #include "wpi/system/RobotController.hpp"
+#include "wpi/util/MathExtras.hpp"
 
 using namespace frc;
 using namespace frc::sim;
diff --git a/wpilibc/src/main/native/cpp/simulation/DIOSim.cpp b/wpilibc/src/main/native/cpp/simulation/DIOSim.cpp
index 98d2bf304d..4e27727ef8 100644
--- a/wpilibc/src/main/native/cpp/simulation/DIOSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/DIOSim.cpp
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "wpi/hal/simulation/DIOData.h"
-
 #include "wpi/hardware/discrete/DigitalInput.hpp"
 #include "wpi/hardware/discrete/DigitalOutput.hpp"
 
diff --git a/wpilibc/src/main/native/cpp/simulation/DifferentialDrivetrainSim.cpp b/wpilibc/src/main/native/cpp/simulation/DifferentialDrivetrainSim.cpp
index 6d06a4f24d..becdcbe7f8 100644
--- a/wpilibc/src/main/native/cpp/simulation/DifferentialDrivetrainSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/DifferentialDrivetrainSim.cpp
@@ -4,15 +4,13 @@
 
 #include "wpi/simulation/DifferentialDrivetrainSim.hpp"
 
-#include "wpi/math/system/plant/LinearSystemId.hpp"
-
 #include <utility>
 
-#include "wpi/util/MathExtras.hpp"
-
-#include "wpi/system/RobotController.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
+#include "wpi/math/system/plant/LinearSystemId.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/system/RobotController.hpp"
+#include "wpi/util/MathExtras.hpp"
 
 using namespace frc;
 using namespace frc::sim;
diff --git a/wpilibc/src/main/native/cpp/simulation/DigitalPWMSim.cpp b/wpilibc/src/main/native/cpp/simulation/DigitalPWMSim.cpp
index 563cb1f7af..46b6eae653 100644
--- a/wpilibc/src/main/native/cpp/simulation/DigitalPWMSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/DigitalPWMSim.cpp
@@ -8,7 +8,6 @@
 #include <stdexcept>
 
 #include "wpi/hal/simulation/DigitalPWMData.h"
-
 #include "wpi/hardware/discrete/DigitalOutput.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/simulation/DriverStationSim.cpp b/wpilibc/src/main/native/cpp/simulation/DriverStationSim.cpp
index 6797f6b6ae..d040cdc31c 100644
--- a/wpilibc/src/main/native/cpp/simulation/DriverStationSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/DriverStationSim.cpp
@@ -6,12 +6,11 @@
 
 #include <memory>
 
+#include "wpi/driverstation/DriverStation.hpp"
 #include "wpi/hal/DriverStation.h"
 #include "wpi/hal/simulation/DriverStationData.h"
 #include "wpi/hal/simulation/MockHooks.h"
 
-#include "wpi/driverstation/DriverStation.hpp"
-
 using namespace frc;
 using namespace frc::sim;
 
diff --git a/wpilibc/src/main/native/cpp/simulation/DutyCycleSim.cpp b/wpilibc/src/main/native/cpp/simulation/DutyCycleSim.cpp
index bb463028ba..5bbe46632b 100644
--- a/wpilibc/src/main/native/cpp/simulation/DutyCycleSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/DutyCycleSim.cpp
@@ -8,7 +8,6 @@
 #include <stdexcept>
 
 #include "wpi/hal/simulation/DutyCycleData.h"
-
 #include "wpi/hardware/rotation/DutyCycle.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/simulation/ElevatorSim.cpp b/wpilibc/src/main/native/cpp/simulation/ElevatorSim.cpp
index 1ad942366c..605bfe38e1 100644
--- a/wpilibc/src/main/native/cpp/simulation/ElevatorSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/ElevatorSim.cpp
@@ -4,11 +4,10 @@
 
 #include "wpi/simulation/ElevatorSim.hpp"
 
-#include "wpi/util/MathExtras.hpp"
-
-#include "wpi/system/RobotController.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
+#include "wpi/system/RobotController.hpp"
+#include "wpi/util/MathExtras.hpp"
 
 using namespace frc;
 using namespace frc::sim;
diff --git a/wpilibc/src/main/native/cpp/simulation/EncoderSim.cpp b/wpilibc/src/main/native/cpp/simulation/EncoderSim.cpp
index c634b7c2dd..cbf030ff48 100644
--- a/wpilibc/src/main/native/cpp/simulation/EncoderSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/EncoderSim.cpp
@@ -8,7 +8,6 @@
 #include <stdexcept>
 
 #include "wpi/hal/simulation/EncoderData.h"
-
 #include "wpi/hardware/rotation/Encoder.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/simulation/FlywheelSim.cpp b/wpilibc/src/main/native/cpp/simulation/FlywheelSim.cpp
index 7832655d83..939f7c00d9 100644
--- a/wpilibc/src/main/native/cpp/simulation/FlywheelSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/FlywheelSim.cpp
@@ -4,9 +4,8 @@
 
 #include "wpi/simulation/FlywheelSim.hpp"
 
-#include "wpi/util/MathExtras.hpp"
-
 #include "wpi/system/RobotController.hpp"
+#include "wpi/util/MathExtras.hpp"
 
 using namespace frc;
 using namespace frc::sim;
diff --git a/wpilibc/src/main/native/cpp/simulation/PWMMotorControllerSim.cpp b/wpilibc/src/main/native/cpp/simulation/PWMMotorControllerSim.cpp
index d4e706eb4a..560a927a89 100644
--- a/wpilibc/src/main/native/cpp/simulation/PWMMotorControllerSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/PWMMotorControllerSim.cpp
@@ -5,9 +5,8 @@
 #include "wpi/simulation/PWMMotorControllerSim.hpp"
 
 #include "wpi/hal/SimDevice.h"
-#include "wpi/units/length.hpp"
-
 #include "wpi/simulation/SimDeviceSim.hpp"
+#include "wpi/units/length.hpp"
 
 using namespace frc;
 using namespace frc::sim;
diff --git a/wpilibc/src/main/native/cpp/simulation/PWMSim.cpp b/wpilibc/src/main/native/cpp/simulation/PWMSim.cpp
index 03be762b5d..5f9d5d1f0f 100644
--- a/wpilibc/src/main/native/cpp/simulation/PWMSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/PWMSim.cpp
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "wpi/hal/simulation/PWMData.h"
-
 #include "wpi/hardware/discrete/PWM.hpp"
 #include "wpi/hardware/motor/PWMMotorController.hpp"
 
diff --git a/wpilibc/src/main/native/cpp/simulation/PneumaticsBaseSim.cpp b/wpilibc/src/main/native/cpp/simulation/PneumaticsBaseSim.cpp
index c002137539..7e7b32b281 100644
--- a/wpilibc/src/main/native/cpp/simulation/PneumaticsBaseSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/PneumaticsBaseSim.cpp
@@ -6,10 +6,10 @@
 
 #include <memory>
 
-#include "wpi/system/Errors.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
 #include "wpi/simulation/CTREPCMSim.hpp"
 #include "wpi/simulation/REVPHSim.hpp"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 using namespace frc::sim;
diff --git a/wpilibc/src/main/native/cpp/simulation/PowerDistributionSim.cpp b/wpilibc/src/main/native/cpp/simulation/PowerDistributionSim.cpp
index 39f303eb53..b4b465eda7 100644
--- a/wpilibc/src/main/native/cpp/simulation/PowerDistributionSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/PowerDistributionSim.cpp
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "wpi/hal/simulation/PowerDistributionData.h"
-
 #include "wpi/hardware/power/PowerDistribution.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/simulation/REVPHSim.cpp b/wpilibc/src/main/native/cpp/simulation/REVPHSim.cpp
index d2280a002d..e40b9cd26e 100644
--- a/wpilibc/src/main/native/cpp/simulation/REVPHSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/REVPHSim.cpp
@@ -7,7 +7,6 @@
 #include <memory>
 
 #include "wpi/hal/simulation/REVPHData.h"
-
 #include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/simulation/SharpIRSim.cpp b/wpilibc/src/main/native/cpp/simulation/SharpIRSim.cpp
index 164635e337..9d3c052ecb 100644
--- a/wpilibc/src/main/native/cpp/simulation/SharpIRSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/SharpIRSim.cpp
@@ -5,9 +5,8 @@
 #include "wpi/simulation/SharpIRSim.hpp"
 
 #include "wpi/hal/SimDevice.h"
-#include "wpi/units/length.hpp"
-
 #include "wpi/simulation/SimDeviceSim.hpp"
+#include "wpi/units/length.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/simulation/SimDeviceSim.cpp b/wpilibc/src/main/native/cpp/simulation/SimDeviceSim.cpp
index 62df5419e9..216a0af7da 100644
--- a/wpilibc/src/main/native/cpp/simulation/SimDeviceSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/SimDeviceSim.cpp
@@ -8,6 +8,7 @@
 #include <vector>
 
 #include <fmt/format.h>
+
 #include "wpi/hal/SimDevice.h"
 #include "wpi/hal/simulation/SimDeviceData.h"
 
diff --git a/wpilibc/src/main/native/cpp/simulation/SingleJointedArmSim.cpp b/wpilibc/src/main/native/cpp/simulation/SingleJointedArmSim.cpp
index ef2a97787b..7aaf77a6c5 100644
--- a/wpilibc/src/main/native/cpp/simulation/SingleJointedArmSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/SingleJointedArmSim.cpp
@@ -6,12 +6,11 @@
 
 #include <cmath>
 
-#include "wpi/units/voltage.hpp"
-#include "wpi/util/MathExtras.hpp"
-
-#include "wpi/system/RobotController.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
+#include "wpi/system/RobotController.hpp"
+#include "wpi/units/voltage.hpp"
+#include "wpi/util/MathExtras.hpp"
 
 using namespace frc;
 using namespace frc::sim;
diff --git a/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp b/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
index 59fd6caf79..7070fc82e6 100644
--- a/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
@@ -12,14 +12,13 @@
 #include "wpi/hal/UsageReporting.h"
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/smartdashboard/ListenerExecutor.hpp"
+#include "wpi/smartdashboard/SendableBuilderImpl.hpp"
+#include "wpi/system/Errors.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/smartdashboard/ListenerExecutor.hpp"
-#include "wpi/smartdashboard/SendableBuilderImpl.hpp"
-
 using namespace frc;
 
 namespace {
diff --git a/wpilibc/src/main/native/cpp/system/DataLogManager.cpp b/wpilibc/src/main/native/cpp/system/DataLogManager.cpp
index d51f2f63a6..95c0eeca61 100644
--- a/wpilibc/src/main/native/cpp/system/DataLogManager.cpp
+++ b/wpilibc/src/main/native/cpp/system/DataLogManager.cpp
@@ -4,8 +4,6 @@
 
 #include "wpi/system/DataLogManager.hpp"
 
-#include "wpi/system/Errors.hpp"
-
 #include <algorithm>
 #include <ctime>
 #include <random>
@@ -13,22 +11,23 @@
 #include <vector>
 
 #include <fmt/chrono.h>
-#include "wpi/hal/UsageReporting.h"
-#include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/util/SafeThread.hpp"
-#include "wpi/util/StringExtras.hpp"
+
 #include "wpi/datalog/DataLog.hpp"
 #include "wpi/datalog/DataLogBackgroundWriter.hpp"
 #include "wpi/datalog/FileLogger.hpp"
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/opmode/RobotBase.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/Filesystem.hpp"
+#include "wpi/system/RobotController.hpp"
+#include "wpi/util/SafeThread.hpp"
+#include "wpi/util/StringExtras.hpp"
 #include "wpi/util/fs.hpp"
 #include "wpi/util/print.hpp"
 #include "wpi/util/timestamp.h"
 
-#include "wpi/driverstation/DriverStation.hpp"
-#include "wpi/system/Filesystem.hpp"
-#include "wpi/opmode/RobotBase.hpp"
-#include "wpi/system/RobotController.hpp"
-
 using namespace frc;
 
 namespace {
diff --git a/wpilibc/src/main/native/cpp/system/Filesystem.cpp b/wpilibc/src/main/native/cpp/system/Filesystem.cpp
index 9157892bcc..eb73b5481a 100644
--- a/wpilibc/src/main/native/cpp/system/Filesystem.cpp
+++ b/wpilibc/src/main/native/cpp/system/Filesystem.cpp
@@ -6,9 +6,8 @@
 
 #include <string>
 
-#include "wpi/util/fs.hpp"
-
 #include "wpi/opmode/RobotBase.hpp"
+#include "wpi/util/fs.hpp"
 
 std::string frc::filesystem::GetLaunchDirectory() {
   return fs::current_path().string();
diff --git a/wpilibc/src/main/native/cpp/system/Notifier.cpp b/wpilibc/src/main/native/cpp/system/Notifier.cpp
index 74702cc96e..1c01c5c7fb 100644
--- a/wpilibc/src/main/native/cpp/system/Notifier.cpp
+++ b/wpilibc/src/main/native/cpp/system/Notifier.cpp
@@ -2,15 +2,15 @@
 // 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 "wpi/hal/Notifier.h"
 #include "wpi/system/Notifier.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
-#include "wpi/hal/DriverStation.h"
-#include "wpi/hal/Notifier.h"
-#include "wpi/hal/Threads.h"
 
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/Threads.h"
 #include "wpi/system/Errors.hpp"
 #include "wpi/system/Timer.hpp"
 
diff --git a/wpilibc/src/main/native/cpp/system/Resource.cpp b/wpilibc/src/main/native/cpp/system/Resource.cpp
index 76517f99e9..feafdc4c21 100644
--- a/wpilibc/src/main/native/cpp/system/Resource.cpp
+++ b/wpilibc/src/main/native/cpp/system/Resource.cpp
@@ -9,9 +9,8 @@
 #include <string>
 #include <vector>
 
-#include "wpi/util/deprecated.hpp"
-
 #include "wpi/system/Errors.hpp"
+#include "wpi/util/deprecated.hpp"
 
 WPI_IGNORE_DEPRECATED
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/system/RobotController.cpp b/wpilibc/src/main/native/cpp/system/RobotController.cpp
index 2944287ef9..3b60c64d0d 100644
--- a/wpilibc/src/main/native/cpp/system/RobotController.cpp
+++ b/wpilibc/src/main/native/cpp/system/RobotController.cpp
@@ -10,7 +10,6 @@
 #include "wpi/hal/CAN.h"
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/Power.h"
-
 #include "wpi/system/Errors.hpp"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/system/SystemServer.cpp b/wpilibc/src/main/native/cpp/system/SystemServer.cpp
index ed25a4e461..892b23d9ec 100644
--- a/wpilibc/src/main/native/cpp/system/SystemServer.cpp
+++ b/wpilibc/src/main/native/cpp/system/SystemServer.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/system/SystemServer.hpp"
-
 #include "wpi/hal/SystemServer.h"
+#include "wpi/system/SystemServer.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/cpp/system/Threads.cpp b/wpilibc/src/main/native/cpp/system/Threads.cpp
index b3dd529ef9..8f4e11c28c 100644
--- a/wpilibc/src/main/native/cpp/system/Threads.cpp
+++ b/wpilibc/src/main/native/cpp/system/Threads.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/system/Threads.hpp"
-
 #include "wpi/hal/Threads.h"
+#include "wpi/system/Threads.hpp"
 
 #include "wpi/system/Errors.hpp"
 
diff --git a/wpilibc/src/main/native/cpp/system/Tracer.cpp b/wpilibc/src/main/native/cpp/system/Tracer.cpp
index 4579603931..c3db2b8482 100644
--- a/wpilibc/src/main/native/cpp/system/Tracer.cpp
+++ b/wpilibc/src/main/native/cpp/system/Tracer.cpp
@@ -5,10 +5,10 @@
 #include "wpi/system/Tracer.hpp"
 
 #include <fmt/format.h>
-#include "wpi/util/SmallString.hpp"
-#include "wpi/util/raw_ostream.hpp"
 
 #include "wpi/system/Errors.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/system/Watchdog.cpp b/wpilibc/src/main/native/cpp/system/Watchdog.cpp
index 399a451d20..a7f66d2d16 100644
--- a/wpilibc/src/main/native/cpp/system/Watchdog.cpp
+++ b/wpilibc/src/main/native/cpp/system/Watchdog.cpp
@@ -10,12 +10,12 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/hal/Notifier.h"
-#include "wpi/util/mutex.hpp"
-#include "wpi/util/priority_queue.hpp"
 
+#include "wpi/hal/Notifier.h"
 #include "wpi/system/Errors.hpp"
 #include "wpi/system/Timer.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/priority_queue.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/util/Alert.cpp b/wpilibc/src/main/native/cpp/util/Alert.cpp
index eb6daed2f4..6cf7d7f434 100644
--- a/wpilibc/src/main/native/cpp/util/Alert.cpp
+++ b/wpilibc/src/main/native/cpp/util/Alert.cpp
@@ -10,16 +10,16 @@
 #include <vector>
 
 #include <fmt/format.h>
+
 #include "wpi/nt/NTSendable.hpp"
 #include "wpi/nt/NTSendableBuilder.hpp"
+#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/RobotController.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/system/RobotController.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-
 using namespace frc;
 
 class Alert::PublishedAlert {
diff --git a/wpilibc/src/main/native/cpp/util/Preferences.cpp b/wpilibc/src/main/native/cpp/util/Preferences.cpp
index d0979bf438..4cba8c2e59 100644
--- a/wpilibc/src/main/native/cpp/util/Preferences.cpp
+++ b/wpilibc/src/main/native/cpp/util/Preferences.cpp
@@ -9,6 +9,7 @@
 #include <vector>
 
 #include <fmt/format.h>
+
 #include "wpi/hal/UsageReporting.h"
 #include "wpi/nt/MultiSubscriber.hpp"
 #include "wpi/nt/NetworkTable.hpp"
diff --git a/wpilibc/src/main/native/cppcs/RobotBase.cpp b/wpilibc/src/main/native/cppcs/RobotBase.cpp
index 25019eb710..529ba00ce9 100644
--- a/wpilibc/src/main/native/cppcs/RobotBase.cpp
+++ b/wpilibc/src/main/native/cppcs/RobotBase.cpp
@@ -14,19 +14,18 @@
 #include <utility>
 
 #include "wpi/cameraserver/CameraServerShared.hpp"
+#include "wpi/driverstation/DriverStation.hpp"
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/UsageReporting.h"
+#include "wpi/math/util/MathShared.hpp"
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/util/print.hpp"
-#include "wpi/util/timestamp.h"
-#include "wpi/math/util/MathShared.hpp"
-
-#include "wpi/system/WPILibVersion.hpp"
-#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/smartdashboard/SmartDashboard.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/system/Notifier.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include "wpi/system/WPILibVersion.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 static_assert(frc::RuntimeType::kRoboRIO ==
               static_cast<frc::RuntimeType>(HAL_Runtime_RoboRIO));
diff --git a/wpilibc/src/main/native/include/wpi/ExpansionHubMotor.hpp b/wpilibc/src/main/native/include/wpi/ExpansionHubMotor.hpp
index 525b85a509..df123430a9 100644
--- a/wpilibc/src/main/native/include/wpi/ExpansionHubMotor.hpp
+++ b/wpilibc/src/main/native/include/wpi/ExpansionHubMotor.hpp
@@ -6,6 +6,8 @@
 
 #include <memory>
 
+#include "wpi/ExpansionHub.hpp"
+#include "wpi/ExpansionHubPidConstants.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/DoubleTopic.hpp"
 #include "wpi/nt/IntegerTopic.hpp"
@@ -14,9 +16,6 @@
 #include "wpi/units/time.hpp"
 #include "wpi/units/voltage.hpp"
 
-#include "wpi/ExpansionHub.hpp"
-#include "wpi/ExpansionHubPidConstants.hpp"
-
 namespace frc {
 
 /** This class controls a specific motor and encoder hooked up to an
diff --git a/wpilibc/src/main/native/include/wpi/ExpansionHubServo.hpp b/wpilibc/src/main/native/include/wpi/ExpansionHubServo.hpp
index 8b2d091f3d..1f9c7956fe 100644
--- a/wpilibc/src/main/native/include/wpi/ExpansionHubServo.hpp
+++ b/wpilibc/src/main/native/include/wpi/ExpansionHubServo.hpp
@@ -6,13 +6,12 @@
 
 #include <memory>
 
+#include "wpi/ExpansionHub.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
 #include "wpi/nt/IntegerTopic.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/time.hpp"
 
-#include "wpi/ExpansionHub.hpp"
-
 namespace frc {
 
 /** This class controls a specific servo hooked up to an ExpansionHub. */
diff --git a/wpilibc/src/main/native/include/wpi/counter/Tachometer.hpp b/wpilibc/src/main/native/include/wpi/counter/Tachometer.hpp
index 851d0bf228..a7b3a9c6d9 100644
--- a/wpilibc/src/main/native/include/wpi/counter/Tachometer.hpp
+++ b/wpilibc/src/main/native/include/wpi/counter/Tachometer.hpp
@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "EdgeConfiguration.hpp"
 #include "wpi/hal/Counter.h"
 #include "wpi/hal/Types.h"
 #include "wpi/units/angular_velocity.hpp"
@@ -14,8 +15,6 @@
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "EdgeConfiguration.hpp"
-
 namespace frc {
 /**
  * Tachometer for getting rotational speed from a device.
diff --git a/wpilibc/src/main/native/include/wpi/counter/UpDownCounter.hpp b/wpilibc/src/main/native/include/wpi/counter/UpDownCounter.hpp
index dd8c9351bc..297f51e2ef 100644
--- a/wpilibc/src/main/native/include/wpi/counter/UpDownCounter.hpp
+++ b/wpilibc/src/main/native/include/wpi/counter/UpDownCounter.hpp
@@ -6,13 +6,12 @@
 
 #include <memory>
 
+#include "EdgeConfiguration.hpp"
 #include "wpi/hal/Counter.h"
 #include "wpi/hal/Types.h"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "EdgeConfiguration.hpp"
-
 namespace frc {
 /** Up Down Counter.
  *
diff --git a/wpilibc/src/main/native/include/wpi/drive/DifferentialDrive.hpp b/wpilibc/src/main/native/include/wpi/drive/DifferentialDrive.hpp
index a838e7eaec..073ca32472 100644
--- a/wpilibc/src/main/native/include/wpi/drive/DifferentialDrive.hpp
+++ b/wpilibc/src/main/native/include/wpi/drive/DifferentialDrive.hpp
@@ -7,12 +7,11 @@
 #include <functional>
 #include <string>
 
+#include "wpi/drive/RobotDriveBase.hpp"
 #include "wpi/util/deprecated.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/drive/RobotDriveBase.hpp"
-
 namespace frc {
 
 class MotorController;
diff --git a/wpilibc/src/main/native/include/wpi/drive/MecanumDrive.hpp b/wpilibc/src/main/native/include/wpi/drive/MecanumDrive.hpp
index d17b8747c8..8c54eee311 100644
--- a/wpilibc/src/main/native/include/wpi/drive/MecanumDrive.hpp
+++ b/wpilibc/src/main/native/include/wpi/drive/MecanumDrive.hpp
@@ -8,14 +8,13 @@
 #include <memory>
 #include <string>
 
+#include "wpi/drive/RobotDriveBase.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/util/deprecated.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/drive/RobotDriveBase.hpp"
-#include "wpi/math/geometry/Rotation2d.hpp"
-
 namespace frc {
 
 class MotorController;
diff --git a/wpilibc/src/main/native/include/wpi/driverstation/DriverStation.hpp b/wpilibc/src/main/native/include/wpi/driverstation/DriverStation.hpp
index 51b7cfdfad..1255b11d5c 100644
--- a/wpilibc/src/main/native/include/wpi/driverstation/DriverStation.hpp
+++ b/wpilibc/src/main/native/include/wpi/driverstation/DriverStation.hpp
@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include "wpi/math/geometry/Rotation2d.hpp"
-
 #include <optional>
 #include <string>
 
 #include "wpi/hal/DriverStationTypes.h"
+#include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/Synchronization.h"
 
diff --git a/wpilibc/src/main/native/include/wpi/driverstation/Gamepad.hpp b/wpilibc/src/main/native/include/wpi/driverstation/Gamepad.hpp
index c40d9b7004..9d25ca3e17 100644
--- a/wpilibc/src/main/native/include/wpi/driverstation/Gamepad.hpp
+++ b/wpilibc/src/main/native/include/wpi/driverstation/Gamepad.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/driverstation/GenericHID.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/driverstation/GenericHID.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/driverstation/Joystick.hpp b/wpilibc/src/main/native/include/wpi/driverstation/Joystick.hpp
index e4dc88101e..53908fb013 100644
--- a/wpilibc/src/main/native/include/wpi/driverstation/Joystick.hpp
+++ b/wpilibc/src/main/native/include/wpi/driverstation/Joystick.hpp
@@ -6,9 +6,8 @@
 
 #include <array>
 
-#include "wpi/units/angle.hpp"
-
 #include "wpi/driverstation/GenericHID.hpp"
+#include "wpi/units/angle.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/event/BooleanEvent.hpp b/wpilibc/src/main/native/include/wpi/event/BooleanEvent.hpp
index 9519bc7c2e..f548048ee3 100644
--- a/wpilibc/src/main/native/include/wpi/event/BooleanEvent.hpp
+++ b/wpilibc/src/main/native/include/wpi/event/BooleanEvent.hpp
@@ -4,16 +4,14 @@
 
 #pragma once
 
-#include "wpi/math/filter/Debouncer.hpp"
-
 #include <functional>
 #include <memory>
 
+#include "EventLoop.hpp"
+#include "wpi/math/filter/Debouncer.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/FunctionExtras.hpp"
 
-#include "EventLoop.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/hardware/accelerometer/ADXL345_I2C.hpp b/wpilibc/src/main/native/include/wpi/hardware/accelerometer/ADXL345_I2C.hpp
index c06cb37d01..09c31fcec8 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/accelerometer/ADXL345_I2C.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/accelerometer/ADXL345_I2C.hpp
@@ -5,11 +5,10 @@
 #pragma once
 
 #include "wpi/hal/SimDevice.h"
+#include "wpi/hardware/bus/I2C.hpp"
 #include "wpi/nt/NTSendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/hardware/bus/I2C.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/hardware/accelerometer/AnalogAccelerometer.hpp b/wpilibc/src/main/native/include/wpi/hardware/accelerometer/AnalogAccelerometer.hpp
index a7f08bd468..637c1080e1 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/accelerometer/AnalogAccelerometer.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/accelerometer/AnalogAccelerometer.hpp
@@ -6,11 +6,10 @@
 
 #include <memory>
 
+#include "wpi/hardware/discrete/AnalogInput.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/hardware/discrete/AnalogInput.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp b/wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp
index dc15e79b94..b456938716 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp
@@ -6,7 +6,6 @@
 #include "wpi/math/geometry/Quaternion.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/geometry/Rotation3d.hpp"
-
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/angular_velocity.hpp"
diff --git a/wpilibc/src/main/native/include/wpi/hardware/led/AddressableLED.hpp b/wpilibc/src/main/native/include/wpi/hardware/led/AddressableLED.hpp
index b32a63a0b4..0b711344c9 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/led/AddressableLED.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/led/AddressableLED.hpp
@@ -11,7 +11,6 @@
 #include "wpi/hal/AddressableLEDTypes.h"
 #include "wpi/hal/Types.h"
 #include "wpi/units/time.hpp"
-
 #include "wpi/util/Color.hpp"
 #include "wpi/util/Color8Bit.hpp"
 
diff --git a/wpilibc/src/main/native/include/wpi/hardware/led/LEDPattern.hpp b/wpilibc/src/main/native/include/wpi/hardware/led/LEDPattern.hpp
index b5143fa49b..5594f87d06 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/led/LEDPattern.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/led/LEDPattern.hpp
@@ -8,12 +8,11 @@
 #include <span>
 #include <utility>
 
+#include "wpi/hardware/led/AddressableLED.hpp"
 #include "wpi/units/frequency.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/velocity.hpp"
-
-#include "wpi/hardware/led/AddressableLED.hpp"
 #include "wpi/util/Color.hpp"
 
 namespace frc {
diff --git a/wpilibc/src/main/native/include/wpi/hardware/motor/MotorControllerGroup.hpp b/wpilibc/src/main/native/include/wpi/hardware/motor/MotorControllerGroup.hpp
index b4510b70ce..4118ff332e 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/motor/MotorControllerGroup.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/motor/MotorControllerGroup.hpp
@@ -7,12 +7,11 @@
 #include <functional>
 #include <vector>
 
+#include "wpi/hardware/motor/MotorController.hpp"
 #include "wpi/util/deprecated.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/hardware/motor/MotorController.hpp"
-
 WPI_IGNORE_DEPRECATED
 
 namespace frc {
diff --git a/wpilibc/src/main/native/include/wpi/hardware/motor/MotorSafety.hpp b/wpilibc/src/main/native/include/wpi/hardware/motor/MotorSafety.hpp
index ca5844318f..0a7278c7e3 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/motor/MotorSafety.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/motor/MotorSafety.hpp
@@ -6,11 +6,10 @@
 
 #include <string>
 
+#include "wpi/system/Timer.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "wpi/system/Timer.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/hardware/motor/PWMMotorController.hpp b/wpilibc/src/main/native/include/wpi/hardware/motor/PWMMotorController.hpp
index a25cbb4566..c4182bad2e 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/motor/PWMMotorController.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/motor/PWMMotorController.hpp
@@ -13,15 +13,14 @@
 #include <vector>
 
 #include "wpi/hal/SimDevice.h"
+#include "wpi/hardware/discrete/PWM.hpp"
+#include "wpi/hardware/motor/MotorController.hpp"
+#include "wpi/hardware/motor/MotorSafety.hpp"
 #include "wpi/units/voltage.hpp"
 #include "wpi/util/deprecated.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/hardware/motor/MotorSafety.hpp"
-#include "wpi/hardware/discrete/PWM.hpp"
-#include "wpi/hardware/motor/MotorController.hpp"
-
 namespace frc {
 
 WPI_IGNORE_DEPRECATED
diff --git a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/Compressor.hpp b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/Compressor.hpp
index dad6ffbb8a..f103df7bce 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/Compressor.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/Compressor.hpp
@@ -7,13 +7,12 @@
 #include <memory>
 
 #include "wpi/hal/Types.h"
-#include "wpi/util/sendable/Sendable.hpp"
-#include "wpi/util/sendable/SendableHelper.hpp"
-
 #include "wpi/hardware/pneumatic/CompressorConfigType.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
 #include "wpi/util/SensorUtil.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/DoubleSolenoid.hpp b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/DoubleSolenoid.hpp
index e07f35eb4c..b0c25e2b46 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/DoubleSolenoid.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/DoubleSolenoid.hpp
@@ -7,11 +7,10 @@
 #include <memory>
 
 #include "wpi/hal/Types.h"
-#include "wpi/util/sendable/Sendable.hpp"
-#include "wpi/util/sendable/SendableHelper.hpp"
-
 #include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticHub.hpp b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticHub.hpp
index a2f2553403..ca66425911 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticHub.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticHub.hpp
@@ -6,13 +6,12 @@
 
 #include <memory>
 
+#include "PneumaticsBase.hpp"
 #include "wpi/hal/Types.h"
 #include "wpi/units/pressure.hpp"
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "PneumaticsBase.hpp"
-
 namespace frc {
 /** Module class for controlling a REV Robotics Pneumatic Hub. */
 class PneumaticHub : public PneumaticsBase {
diff --git a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsBase.hpp b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsBase.hpp
index b184c8c71f..b6c839e348 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsBase.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsBase.hpp
@@ -7,14 +7,13 @@
 #include <memory>
 #include <string_view>
 
+#include "wpi/hardware/pneumatic/CompressorConfigType.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
 #include "wpi/units/current.hpp"
 #include "wpi/units/pressure.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/voltage.hpp"
 
-#include "wpi/hardware/pneumatic/CompressorConfigType.hpp"
-#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
-
 namespace frc {
 class Solenoid;
 class DoubleSolenoid;
diff --git a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsControlModule.hpp b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsControlModule.hpp
index 42f246575b..b940918834 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsControlModule.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsControlModule.hpp
@@ -6,12 +6,11 @@
 
 #include <memory>
 
+#include "PneumaticsBase.hpp"
 #include "wpi/hal/Types.h"
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "PneumaticsBase.hpp"
-
 namespace frc {
 /** Module class for controlling a Cross The Road Electronics Pneumatics Control
  * Module. */
diff --git a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/Solenoid.hpp b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/Solenoid.hpp
index eb63a5c682..8f641ff780 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/pneumatic/Solenoid.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/pneumatic/Solenoid.hpp
@@ -7,13 +7,12 @@
 #include <memory>
 
 #include "wpi/hal/Types.h"
+#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
-#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/hardware/range/SharpIR.hpp b/wpilibc/src/main/native/include/wpi/hardware/range/SharpIR.hpp
index aa343afcb5..db2610a467 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/range/SharpIR.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/range/SharpIR.hpp
@@ -5,12 +5,11 @@
 #pragma once
 
 #include "wpi/hal/SimDevice.h"
+#include "wpi/hardware/discrete/AnalogInput.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/hardware/discrete/AnalogInput.hpp"
-
 namespace frc {
 
 class SharpIR : public wpi::Sendable, public wpi::SendableHelper<SharpIR> {
diff --git a/wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogPotentiometer.hpp b/wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogPotentiometer.hpp
index 96f5ec674f..d42dd4baa8 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogPotentiometer.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogPotentiometer.hpp
@@ -6,11 +6,10 @@
 
 #include <memory>
 
+#include "wpi/hardware/discrete/AnalogInput.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/hardware/discrete/AnalogInput.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/hardware/rotation/Encoder.hpp b/wpilibc/src/main/native/include/wpi/hardware/rotation/Encoder.hpp
index 2a54aa8250..a8a7516636 100644
--- a/wpilibc/src/main/native/include/wpi/hardware/rotation/Encoder.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/rotation/Encoder.hpp
@@ -8,11 +8,10 @@
 
 #include "wpi/hal/Encoder.h"
 #include "wpi/hal/Types.h"
+#include "wpi/hardware/discrete/CounterBase.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/hardware/discrete/CounterBase.hpp"
-
 namespace frc {
 /**
  * Class to read quad encoders.
diff --git a/wpilibc/src/main/native/include/wpi/opmode/IterativeRobotBase.hpp b/wpilibc/src/main/native/include/wpi/opmode/IterativeRobotBase.hpp
index ba467bf76b..0d3618a0f4 100644
--- a/wpilibc/src/main/native/include/wpi/opmode/IterativeRobotBase.hpp
+++ b/wpilibc/src/main/native/include/wpi/opmode/IterativeRobotBase.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/units/time.hpp"
-
 #include "wpi/opmode/RobotBase.hpp"
 #include "wpi/system/Watchdog.hpp"
+#include "wpi/units/time.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/opmode/RobotBase.hpp b/wpilibc/src/main/native/include/wpi/opmode/RobotBase.hpp
index f46bacbf4d..cb83c551ce 100644
--- a/wpilibc/src/main/native/include/wpi/opmode/RobotBase.hpp
+++ b/wpilibc/src/main/native/include/wpi/opmode/RobotBase.hpp
@@ -11,14 +11,13 @@
 #include "wpi/hal/HALBase.h"
 #include "wpi/hal/Main.h"
 #include "wpi/nt/NetworkTable.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/RuntimeType.hpp"
 #include "wpi/util/RuntimeCheck.h"
 #include "wpi/util/condition_variable.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/string.h"
 
-#include "wpi/system/Errors.hpp"
-#include "wpi/system/RuntimeType.hpp"
-
 namespace frc {
 
 int RunHALInitialization();
diff --git a/wpilibc/src/main/native/include/wpi/opmode/TimedRobot.hpp b/wpilibc/src/main/native/include/wpi/opmode/TimedRobot.hpp
index 6db14012fa..cb652320ef 100644
--- a/wpilibc/src/main/native/include/wpi/opmode/TimedRobot.hpp
+++ b/wpilibc/src/main/native/include/wpi/opmode/TimedRobot.hpp
@@ -11,14 +11,13 @@
 
 #include "wpi/hal/Notifier.h"
 #include "wpi/hal/Types.h"
+#include "wpi/opmode/IterativeRobotBase.hpp"
+#include "wpi/system/RobotController.hpp"
 #include "wpi/units/frequency.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/priority_queue.hpp"
 
-#include "wpi/opmode/IterativeRobotBase.hpp"
-#include "wpi/system/RobotController.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/opmode/TimesliceRobot.hpp b/wpilibc/src/main/native/include/wpi/opmode/TimesliceRobot.hpp
index 1567ad9854..6488dd3cd5 100644
--- a/wpilibc/src/main/native/include/wpi/opmode/TimesliceRobot.hpp
+++ b/wpilibc/src/main/native/include/wpi/opmode/TimesliceRobot.hpp
@@ -6,9 +6,8 @@
 
 #include <functional>
 
-#include "wpi/units/time.hpp"
-
 #include "wpi/opmode/TimedRobot.hpp"
+#include "wpi/units/time.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/simulation/AnalogEncoderSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/AnalogEncoderSim.hpp
index 0b6fa0944a..199f1fb865 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/AnalogEncoderSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/AnalogEncoderSim.hpp
@@ -5,9 +5,8 @@
 #pragma once
 
 #include "wpi/hal/SimDevice.h"
-#include "wpi/units/angle.hpp"
-
 #include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/units/angle.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/simulation/DCMotorSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/DCMotorSim.hpp
index 915b601e50..a4c320d692 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/DCMotorSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/DCMotorSim.hpp
@@ -4,16 +4,15 @@
 
 #pragma once
 
+#include "wpi/math/system/LinearSystem.hpp"
+#include "wpi/math/system/plant/DCMotor.hpp"
+#include "wpi/simulation/LinearSystemSim.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/angular_acceleration.hpp"
 #include "wpi/units/angular_velocity.hpp"
 #include "wpi/units/moment_of_inertia.hpp"
 #include "wpi/units/torque.hpp"
 
-#include "wpi/simulation/LinearSystemSim.hpp"
-#include "wpi/math/system/LinearSystem.hpp"
-#include "wpi/math/system/plant/DCMotor.hpp"
-
 namespace frc::sim {
 /**
  * Represents a simulated DC motor mechanism.
diff --git a/wpilibc/src/main/native/include/wpi/simulation/DifferentialDrivetrainSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/DifferentialDrivetrainSim.hpp
index d58a21a6f3..4b133d5443 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/DifferentialDrivetrainSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/DifferentialDrivetrainSim.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
 #include "wpi/math/system/plant/DCMotor.hpp"
-
 #include "wpi/units/length.hpp"
 #include "wpi/units/moment_of_inertia.hpp"
 #include "wpi/units/time.hpp"
diff --git a/wpilibc/src/main/native/include/wpi/simulation/DriverStationSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/DriverStationSim.hpp
index 8ed8f11d38..ca85972e68 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/DriverStationSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/DriverStationSim.hpp
@@ -6,9 +6,8 @@
 
 #include <memory>
 
-#include "wpi/hal/DriverStationTypes.h"
-
 #include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/hal/DriverStationTypes.h"
 #include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc::sim {
diff --git a/wpilibc/src/main/native/include/wpi/simulation/DutyCycleSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/DutyCycleSim.hpp
index 8c16146f7c..e043728993 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/DutyCycleSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/DutyCycleSim.hpp
@@ -6,9 +6,8 @@
 
 #include <memory>
 
-#include "wpi/units/frequency.hpp"
-
 #include "wpi/simulation/CallbackStore.hpp"
+#include "wpi/units/frequency.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/simulation/ElevatorSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/ElevatorSim.hpp
index b501792457..c60261d5c1 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/ElevatorSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/ElevatorSim.hpp
@@ -6,13 +6,12 @@
 
 #include <array>
 
+#include "wpi/math/system/plant/DCMotor.hpp"
+#include "wpi/simulation/LinearSystemSim.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/mass.hpp"
 #include "wpi/units/velocity.hpp"
 
-#include "wpi/simulation/LinearSystemSim.hpp"
-#include "wpi/math/system/plant/DCMotor.hpp"
-
 namespace frc::sim {
 /**
  * Represents a simulated elevator mechanism.
diff --git a/wpilibc/src/main/native/include/wpi/simulation/FlywheelSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/FlywheelSim.hpp
index f44156e5be..2411bc378f 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/FlywheelSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/FlywheelSim.hpp
@@ -4,15 +4,14 @@
 
 #pragma once
 
+#include "wpi/math/system/LinearSystem.hpp"
+#include "wpi/math/system/plant/DCMotor.hpp"
+#include "wpi/simulation/LinearSystemSim.hpp"
 #include "wpi/units/angular_acceleration.hpp"
 #include "wpi/units/angular_velocity.hpp"
 #include "wpi/units/moment_of_inertia.hpp"
 #include "wpi/units/torque.hpp"
 
-#include "wpi/simulation/LinearSystemSim.hpp"
-#include "wpi/math/system/LinearSystem.hpp"
-#include "wpi/math/system/plant/DCMotor.hpp"
-
 namespace frc::sim {
 /**
  * Represents a simulated flywheel mechanism.
diff --git a/wpilibc/src/main/native/include/wpi/simulation/LinearSystemSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/LinearSystemSim.hpp
index b56cca6635..0fe12916e7 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/LinearSystemSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/LinearSystemSim.hpp
@@ -6,13 +6,12 @@
 
 #include <array>
 
+#include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/math/system/LinearSystem.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/units/current.hpp"
 #include "wpi/units/time.hpp"
 
-#include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/math/system/LinearSystem.hpp"
-
 namespace frc::sim {
 /**
  * This class helps simulate linear systems. To use this class, do the following
diff --git a/wpilibc/src/main/native/include/wpi/simulation/PWMMotorControllerSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/PWMMotorControllerSim.hpp
index 3acc230fb7..2231dc74d5 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/PWMMotorControllerSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/PWMMotorControllerSim.hpp
@@ -5,9 +5,8 @@
 #pragma once
 
 #include "wpi/hal/SimDevice.h"
-#include "wpi/units/length.hpp"
-
 #include "wpi/hardware/motor/PWMMotorController.hpp"
+#include "wpi/units/length.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/simulation/RoboRioSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/RoboRioSim.hpp
index 08c8bbb3d3..03041c2760 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/RoboRioSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/RoboRioSim.hpp
@@ -7,13 +7,12 @@
 #include <memory>
 #include <string>
 
+#include "wpi/simulation/CallbackStore.hpp"
+#include "wpi/system/RobotController.hpp"
 #include "wpi/units/current.hpp"
 #include "wpi/units/temperature.hpp"
 #include "wpi/units/voltage.hpp"
 
-#include "wpi/system/RobotController.hpp"
-#include "wpi/simulation/CallbackStore.hpp"
-
 namespace frc::sim {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp
index ddfa4ca9a0..f2ca2f205d 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp
@@ -8,7 +8,6 @@
 
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
-
 #include "wpi/opmode/RobotBase.hpp"
 
 namespace frc::sim {
diff --git a/wpilibc/src/main/native/include/wpi/simulation/SharpIRSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/SharpIRSim.hpp
index 87486c7088..60bb17a13a 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/SharpIRSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/SharpIRSim.hpp
@@ -5,9 +5,8 @@
 #pragma once
 
 #include "wpi/hal/SimDevice.h"
-#include "wpi/units/length.hpp"
-
 #include "wpi/hardware/range/SharpIR.hpp"
+#include "wpi/units/length.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/simulation/SingleJointedArmSim.hpp b/wpilibc/src/main/native/include/wpi/simulation/SingleJointedArmSim.hpp
index bf022e7d0a..b453a24763 100644
--- a/wpilibc/src/main/native/include/wpi/simulation/SingleJointedArmSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/SingleJointedArmSim.hpp
@@ -6,14 +6,13 @@
 
 #include <array>
 
+#include "wpi/math/system/plant/DCMotor.hpp"
+#include "wpi/simulation/LinearSystemSim.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/mass.hpp"
 #include "wpi/units/moment_of_inertia.hpp"
 
-#include "wpi/simulation/LinearSystemSim.hpp"
-#include "wpi/math/system/plant/DCMotor.hpp"
-
 namespace frc::sim {
 /**
  * Represents a simulated arm mechanism.
diff --git a/wpilibc/src/main/native/include/wpi/smartdashboard/Field2d.hpp b/wpilibc/src/main/native/include/wpi/smartdashboard/Field2d.hpp
index 89e3949c5b..a5f2334b05 100644
--- a/wpilibc/src/main/native/include/wpi/smartdashboard/Field2d.hpp
+++ b/wpilibc/src/main/native/include/wpi/smartdashboard/Field2d.hpp
@@ -8,17 +8,16 @@
 #include <string_view>
 #include <vector>
 
+#include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/nt/NTSendable.hpp"
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/NetworkTableEntry.hpp"
+#include "wpi/smartdashboard/FieldObject2d.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/math/geometry/Pose2d.hpp"
-#include "wpi/math/geometry/Rotation2d.hpp"
-#include "wpi/smartdashboard/FieldObject2d.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/smartdashboard/FieldObject2d.hpp b/wpilibc/src/main/native/include/wpi/smartdashboard/FieldObject2d.hpp
index 187a0ffe5c..5df248590b 100644
--- a/wpilibc/src/main/native/include/wpi/smartdashboard/FieldObject2d.hpp
+++ b/wpilibc/src/main/native/include/wpi/smartdashboard/FieldObject2d.hpp
@@ -10,14 +10,13 @@
 #include <string_view>
 #include <vector>
 
+#include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/nt/DoubleArrayTopic.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "wpi/math/geometry/Pose2d.hpp"
-#include "wpi/math/geometry/Rotation2d.hpp"
-
 namespace frc {
 
 class Field2d;
diff --git a/wpilibc/src/main/native/include/wpi/smartdashboard/Mechanism2d.hpp b/wpilibc/src/main/native/include/wpi/smartdashboard/Mechanism2d.hpp
index 396089efcf..c6f276c976 100644
--- a/wpilibc/src/main/native/include/wpi/smartdashboard/Mechanism2d.hpp
+++ b/wpilibc/src/main/native/include/wpi/smartdashboard/Mechanism2d.hpp
@@ -11,13 +11,12 @@
 #include "wpi/nt/NTSendable.hpp"
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/StringTopic.hpp"
+#include "wpi/smartdashboard/MechanismRoot2d.hpp"
+#include "wpi/util/Color8Bit.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/smartdashboard/MechanismRoot2d.hpp"
-#include "wpi/util/Color8Bit.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismLigament2d.hpp b/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismLigament2d.hpp
index ba462768f2..a5f4bbc813 100644
--- a/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismLigament2d.hpp
+++ b/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismLigament2d.hpp
@@ -9,9 +9,8 @@
 
 #include "wpi/nt/DoubleTopic.hpp"
 #include "wpi/nt/StringTopic.hpp"
-#include "wpi/units/angle.hpp"
-
 #include "wpi/smartdashboard/MechanismObject2d.hpp"
+#include "wpi/units/angle.hpp"
 #include "wpi/util/Color8Bit.hpp"
 
 namespace frc {
diff --git a/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismObject2d.hpp b/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismObject2d.hpp
index ba7c0b31ee..c63bde18a9 100644
--- a/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismObject2d.hpp
+++ b/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismObject2d.hpp
@@ -12,9 +12,8 @@
 #include <utility>
 
 #include "wpi/nt/NetworkTable.hpp"
-#include "wpi/util/StringMap.hpp"
-
 #include "wpi/system/Errors.hpp"
+#include "wpi/util/StringMap.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismRoot2d.hpp b/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismRoot2d.hpp
index 6b038f37ef..7c14eb0678 100644
--- a/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismRoot2d.hpp
+++ b/wpilibc/src/main/native/include/wpi/smartdashboard/MechanismRoot2d.hpp
@@ -8,7 +8,6 @@
 #include <string_view>
 
 #include "wpi/nt/DoubleTopic.hpp"
-
 #include "wpi/smartdashboard/MechanismObject2d.hpp"
 
 namespace frc {
diff --git a/wpilibc/src/main/native/include/wpi/smartdashboard/SendableChooser.hpp b/wpilibc/src/main/native/include/wpi/smartdashboard/SendableChooser.hpp
index 33113bd6b8..92e20e8e0a 100644
--- a/wpilibc/src/main/native/include/wpi/smartdashboard/SendableChooser.hpp
+++ b/wpilibc/src/main/native/include/wpi/smartdashboard/SendableChooser.hpp
@@ -13,11 +13,10 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/smartdashboard/SendableChooserBase.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "wpi/smartdashboard/SendableChooserBase.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpilibc/src/main/native/include/wpi/sysid/SysIdRoutineLog.hpp b/wpilibc/src/main/native/include/wpi/sysid/SysIdRoutineLog.hpp
index eaedaed982..443d069455 100644
--- a/wpilibc/src/main/native/include/wpi/sysid/SysIdRoutineLog.hpp
+++ b/wpilibc/src/main/native/include/wpi/sysid/SysIdRoutineLog.hpp
@@ -7,6 +7,7 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/datalog/DataLog.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/angular_acceleration.hpp"
@@ -15,7 +16,6 @@
 #include "wpi/units/length.hpp"
 #include "wpi/units/velocity.hpp"
 #include "wpi/units/voltage.hpp"
-#include "wpi/datalog/DataLog.hpp"
 
 namespace frc::sysid {
 
diff --git a/wpilibc/src/main/native/include/wpi/system/Watchdog.hpp b/wpilibc/src/main/native/include/wpi/system/Watchdog.hpp
index 4b03e23a84..252767c2c3 100644
--- a/wpilibc/src/main/native/include/wpi/system/Watchdog.hpp
+++ b/wpilibc/src/main/native/include/wpi/system/Watchdog.hpp
@@ -8,9 +8,8 @@
 #include <string_view>
 #include <utility>
 
-#include "wpi/units/time.hpp"
-
 #include "wpi/system/Tracer.hpp"
+#include "wpi/units/time.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/main/native/include/wpi/util/Color.hpp b/wpilibc/src/main/native/include/wpi/util/Color.hpp
index 204cc04627..22bd61a7d7 100644
--- a/wpilibc/src/main/native/include/wpi/util/Color.hpp
+++ b/wpilibc/src/main/native/include/wpi/util/Color.hpp
@@ -11,6 +11,7 @@
 
 #include <fmt/format.h>
 #include <gcem.hpp>
+
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/ct_string.hpp"
 
diff --git a/wpilibc/src/main/native/include/wpi/util/Color8Bit.hpp b/wpilibc/src/main/native/include/wpi/util/Color8Bit.hpp
index c43bd6aba1..840dc54add 100644
--- a/wpilibc/src/main/native/include/wpi/util/Color8Bit.hpp
+++ b/wpilibc/src/main/native/include/wpi/util/Color8Bit.hpp
@@ -10,10 +10,10 @@
 #include <string_view>
 
 #include <fmt/format.h>
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/ct_string.hpp"
 
 #include "wpi/util/Color.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/ct_string.hpp"
 
 namespace frc {
 
diff --git a/wpilibc/src/test/native/cpp/AlertTest.cpp b/wpilibc/src/test/native/cpp/AlertTest.cpp
index 1453716759..596a5bcd17 100644
--- a/wpilibc/src/test/native/cpp/AlertTest.cpp
+++ b/wpilibc/src/test/native/cpp/AlertTest.cpp
@@ -11,12 +11,12 @@
 
 #include <fmt/format.h>
 #include <gtest/gtest.h>
+
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringArrayTopic.hpp"
-
-#include "wpi/util/Alert.hpp"
 #include "wpi/simulation/SimHooks.hpp"
 #include "wpi/smartdashboard/SmartDashboard.hpp"
+#include "wpi/util/Alert.hpp"
 
 using namespace frc;
 using enum Alert::AlertType;
diff --git a/wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp b/wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp
index d5d79d2763..1f1fad930a 100644
--- a/wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp
+++ b/wpilibc/src/test/native/cpp/AnalogPotentiometerTest.cpp
@@ -3,8 +3,8 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/rotation/AnalogPotentiometer.hpp"
 #include "wpi/simulation/AnalogInputSim.hpp"
 #include "wpi/simulation/RoboRioSim.hpp"
diff --git a/wpilibc/src/test/native/cpp/DoubleSolenoidTestCTRE.cpp b/wpilibc/src/test/native/cpp/DoubleSolenoidTestCTRE.cpp
index 44645bb6fb..6b31311886 100644
--- a/wpilibc/src/test/native/cpp/DoubleSolenoidTestCTRE.cpp
+++ b/wpilibc/src/test/native/cpp/DoubleSolenoidTestCTRE.cpp
@@ -3,8 +3,8 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"
diff --git a/wpilibc/src/test/native/cpp/DoubleSolenoidTestREV.cpp b/wpilibc/src/test/native/cpp/DoubleSolenoidTestREV.cpp
index 7c20ddafad..079f6c0e1e 100644
--- a/wpilibc/src/test/native/cpp/DoubleSolenoidTestREV.cpp
+++ b/wpilibc/src/test/native/cpp/DoubleSolenoidTestREV.cpp
@@ -3,8 +3,8 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"
diff --git a/wpilibc/src/test/native/cpp/GenericHIDTest.cpp b/wpilibc/src/test/native/cpp/GenericHIDTest.cpp
index fbddee94a3..388b9db69e 100644
--- a/wpilibc/src/test/native/cpp/GenericHIDTest.cpp
+++ b/wpilibc/src/test/native/cpp/GenericHIDTest.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 <gtest/gtest.h>
+
 #include "wpi/driverstation/GenericHID.hpp"
 #include "wpi/simulation/GenericHIDSim.hpp"
 
-#include <gtest/gtest.h>
-
 using namespace frc;
 using RumbleType = GenericHID::RumbleType;
 static constexpr double kEpsilon = 0.0001;
diff --git a/wpilibc/src/test/native/cpp/LEDPatternTest.cpp b/wpilibc/src/test/native/cpp/LEDPatternTest.cpp
index cc863fc331..e0bd6a009a 100644
--- a/wpilibc/src/test/native/cpp/LEDPatternTest.cpp
+++ b/wpilibc/src/test/native/cpp/LEDPatternTest.cpp
@@ -3,11 +3,11 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/MathExtras.hpp"
-#include "wpi/util/timestamp.h"
 
 #include "wpi/hardware/led/LEDPattern.hpp"
 #include "wpi/math/util/MathUtil.hpp"
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/timestamp.h"
 
 namespace frc {
 
diff --git a/wpilibc/src/test/native/cpp/NotifierTest.cpp b/wpilibc/src/test/native/cpp/NotifierTest.cpp
index 28792a3454..2af8892574 100644
--- a/wpilibc/src/test/native/cpp/NotifierTest.cpp
+++ b/wpilibc/src/test/native/cpp/NotifierTest.cpp
@@ -6,8 +6,8 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/system/Notifier.hpp"
 #include "wpi/simulation/SimHooks.hpp"
+#include "wpi/system/Notifier.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/test/native/cpp/ScopedTracerTest.cpp b/wpilibc/src/test/native/cpp/ScopedTracerTest.cpp
index 9a770347d5..b1fce42b8e 100644
--- a/wpilibc/src/test/native/cpp/ScopedTracerTest.cpp
+++ b/wpilibc/src/test/native/cpp/ScopedTracerTest.cpp
@@ -5,13 +5,13 @@
 #include <string_view>
 
 #include <gtest/gtest.h>
+
+#include "wpi/simulation/SimHooks.hpp"
+#include "wpi/system/ScopedTracer.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/raw_ostream.hpp"
 
-#include "wpi/system/ScopedTracer.hpp"
-#include "wpi/simulation/SimHooks.hpp"
-
 TEST(ScopedTracerTest, Timing) {
   wpi::SmallString<128> buf;
   wpi::raw_svector_ostream os(buf);
diff --git a/wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp b/wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp
index a9675e574e..83676caf30 100644
--- a/wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp
+++ b/wpilibc/src/test/native/cpp/SolenoidTestCTRE.cpp
@@ -3,8 +3,8 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"
diff --git a/wpilibc/src/test/native/cpp/SolenoidTestREV.cpp b/wpilibc/src/test/native/cpp/SolenoidTestREV.cpp
index b1ac5b7eec..e899a9ad2b 100644
--- a/wpilibc/src/test/native/cpp/SolenoidTestREV.cpp
+++ b/wpilibc/src/test/native/cpp/SolenoidTestREV.cpp
@@ -3,8 +3,8 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"
diff --git a/wpilibc/src/test/native/cpp/UnitNetworkTablesTest.cpp b/wpilibc/src/test/native/cpp/UnitNetworkTablesTest.cpp
index 593cbf65e3..1ef9b775e8 100644
--- a/wpilibc/src/test/native/cpp/UnitNetworkTablesTest.cpp
+++ b/wpilibc/src/test/native/cpp/UnitNetworkTablesTest.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
+
 #include "wpi/nt/DoubleTopic.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/UnitTopic.hpp"
diff --git a/wpilibc/src/test/native/cpp/drive/DifferentialDriveTest.cpp b/wpilibc/src/test/native/cpp/drive/DifferentialDriveTest.cpp
index 670ee76972..e12b3b82ab 100644
--- a/wpilibc/src/test/native/cpp/drive/DifferentialDriveTest.cpp
+++ b/wpilibc/src/test/native/cpp/drive/DifferentialDriveTest.cpp
@@ -4,8 +4,8 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/drive/DifferentialDrive.hpp"
 #include "motorcontrol/MockPWMMotorController.hpp"
+#include "wpi/drive/DifferentialDrive.hpp"
 
 TEST(DifferentialDriveTest, ArcadeDriveIK) {
   // Forward
diff --git a/wpilibc/src/test/native/cpp/drive/MecanumDriveTest.cpp b/wpilibc/src/test/native/cpp/drive/MecanumDriveTest.cpp
index 68ba42863a..0a386641a0 100644
--- a/wpilibc/src/test/native/cpp/drive/MecanumDriveTest.cpp
+++ b/wpilibc/src/test/native/cpp/drive/MecanumDriveTest.cpp
@@ -4,8 +4,8 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/drive/MecanumDrive.hpp"
 #include "motorcontrol/MockPWMMotorController.hpp"
+#include "wpi/drive/MecanumDrive.hpp"
 
 TEST(MecanumDriveTest, CartesianIK) {
   // Forward
diff --git a/wpilibc/src/test/native/cpp/event/EventLoopTest.cpp b/wpilibc/src/test/native/cpp/event/EventLoopTest.cpp
index b19a305c80..c15b2ca35b 100644
--- a/wpilibc/src/test/native/cpp/event/EventLoopTest.cpp
+++ b/wpilibc/src/test/native/cpp/event/EventLoopTest.cpp
@@ -4,8 +4,8 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/system/Errors.hpp"
 #include "wpi/event/EventLoop.hpp"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/test/native/cpp/event/NetworkBooleanEventTest.cpp b/wpilibc/src/test/native/cpp/event/NetworkBooleanEventTest.cpp
index 52520b8b9e..ab926f14ee 100644
--- a/wpilibc/src/test/native/cpp/event/NetworkBooleanEventTest.cpp
+++ b/wpilibc/src/test/native/cpp/event/NetworkBooleanEventTest.cpp
@@ -3,11 +3,11 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/nt/BooleanTopic.hpp"
-#include "wpi/nt/NetworkTableInstance.hpp"
 
 #include "wpi/event/EventLoop.hpp"
 #include "wpi/event/NetworkBooleanEvent.hpp"
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/test/native/cpp/main.cpp b/wpilibc/src/test/native/cpp/main.cpp
index 5d490ed343..1af368e2d5 100644
--- a/wpilibc/src/test/native/cpp/main.cpp
+++ b/wpilibc/src/test/native/cpp/main.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
+
 #include "wpi/hal/HALBase.h"
 
 #ifndef __FRC_SYSTEMCORE__
diff --git a/wpilibc/src/test/native/cpp/motorcontrol/MotorControllerGroupTest.cpp b/wpilibc/src/test/native/cpp/motorcontrol/MotorControllerGroupTest.cpp
index ecb3e9ada0..bab0feb43e 100644
--- a/wpilibc/src/test/native/cpp/motorcontrol/MotorControllerGroupTest.cpp
+++ b/wpilibc/src/test/native/cpp/motorcontrol/MotorControllerGroupTest.cpp
@@ -8,9 +8,9 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/deprecated.hpp"
 
 #include "motorcontrol/MockMotorController.hpp"
+#include "wpi/util/deprecated.hpp"
 
 using namespace frc;
 
diff --git a/wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp
index bd4aa6e5d3..2411bf6b3b 100644
--- a/wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/AddressableLEDSimTest.cpp
@@ -7,9 +7,9 @@
 #include <array>
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/led/AddressableLED.hpp"
 
 namespace frc::sim {
diff --git a/wpilibc/src/test/native/cpp/simulation/AnalogEncoderSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/AnalogEncoderSimTest.cpp
index a05e8cc896..441814d0d4 100644
--- a/wpilibc/src/test/native/cpp/simulation/AnalogEncoderSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/AnalogEncoderSimTest.cpp
@@ -5,12 +5,12 @@
 #include <numbers>
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
-#include "wpi/units/math.hpp"
 
-#include "wpi/hardware/rotation/AnalogEncoder.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/discrete/AnalogInput.hpp"
+#include "wpi/hardware/rotation/AnalogEncoder.hpp"
 #include "wpi/simulation/AnalogEncoderSim.hpp"
+#include "wpi/units/math.hpp"
 
 #define EXPECT_NEAR_UNITS(val1, val2, eps) \
   EXPECT_LE(units::math::abs(val1 - val2), eps)
diff --git a/wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp
index 9c3be4292d..b413e01603 100644
--- a/wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/AnalogInputSimTest.cpp
@@ -5,9 +5,9 @@
 #include "wpi/simulation/AnalogInputSim.hpp"  // NOLINT(build/include_order)
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/discrete/AnalogInput.hpp"
 
 namespace frc::sim {
diff --git a/wpilibc/src/test/native/cpp/simulation/CTREPCMSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/CTREPCMSimTest.cpp
index fcaf5eac08..c84985714b 100644
--- a/wpilibc/src/test/native/cpp/simulation/CTREPCMSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/CTREPCMSimTest.cpp
@@ -5,9 +5,9 @@
 #include "wpi/simulation/CTREPCMSim.hpp"  // NOLINT(build/include_order)
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
 
diff --git a/wpilibc/src/test/native/cpp/simulation/DCMotorSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DCMotorSimTest.cpp
index 3013129911..a52758d5f8 100644
--- a/wpilibc/src/test/native/cpp/simulation/DCMotorSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DCMotorSimTest.cpp
@@ -4,15 +4,15 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/system/RobotController.hpp"
-#include "wpi/math/controller/PIDController.hpp"
 #include "wpi/hardware/motor/PWMVictorSPX.hpp"
+#include "wpi/hardware/rotation/Encoder.hpp"
+#include "wpi/math/controller/PIDController.hpp"
+#include "wpi/math/system/plant/LinearSystemId.hpp"
 #include "wpi/simulation/BatterySim.hpp"
 #include "wpi/simulation/DCMotorSim.hpp"
 #include "wpi/simulation/EncoderSim.hpp"
 #include "wpi/simulation/RoboRioSim.hpp"
-#include "wpi/math/system/plant/LinearSystemId.hpp"
+#include "wpi/system/RobotController.hpp"
 
 TEST(DCMotorSimTest, VoltageSteadyState) {
   frc::DCMotor gearbox = frc::DCMotor::NEO(1);
diff --git a/wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp
index f13347464d..906db14322 100644
--- a/wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DIOSimTest.cpp
@@ -5,9 +5,9 @@
 #include "wpi/simulation/DIOSim.hpp"  // NOLINT(build/include_order)
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/discrete/DigitalInput.hpp"
 #include "wpi/hardware/discrete/DigitalOutput.hpp"
 
diff --git a/wpilibc/src/test/native/cpp/simulation/DifferentialDrivetrainSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DifferentialDrivetrainSimTest.cpp
index f6feeafc2a..504f062607 100644
--- a/wpilibc/src/test/native/cpp/simulation/DifferentialDrivetrainSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DifferentialDrivetrainSimTest.cpp
@@ -3,19 +3,19 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/units/current.hpp"
-#include "wpi/units/math.hpp"
-#include "wpi/units/moment_of_inertia.hpp"
 
 #include "wpi/math/controller/LTVUnicycleController.hpp"
 #include "wpi/math/controller/LinearPlantInversionFeedforward.hpp"
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
-#include "wpi/simulation/DifferentialDrivetrainSim.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/math/system/plant/DCMotor.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
 #include "wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp"
+#include "wpi/simulation/DifferentialDrivetrainSim.hpp"
+#include "wpi/units/current.hpp"
+#include "wpi/units/math.hpp"
+#include "wpi/units/moment_of_inertia.hpp"
 
 TEST(DifferentialDrivetrainSimTest, Convergence) {
   auto motor = frc::DCMotor::NEO(2);
diff --git a/wpilibc/src/test/native/cpp/simulation/DigitalPWMSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DigitalPWMSimTest.cpp
index 43c72bb675..ae598cb3ef 100644
--- a/wpilibc/src/test/native/cpp/simulation/DigitalPWMSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DigitalPWMSimTest.cpp
@@ -5,9 +5,9 @@
 #include "wpi/simulation/DigitalPWMSim.hpp"  // NOLINT(build/include_order)
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/discrete/DigitalOutput.hpp"
 
 namespace frc::sim {
diff --git a/wpilibc/src/test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp
index dbddaff515..571934ce60 100644
--- a/wpilibc/src/test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DutyCycleEncoderSimTest.cpp
@@ -5,9 +5,9 @@
 #include "wpi/simulation/DutyCycleEncoderSim.hpp"  // NOLINT(build/include_order)
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/rotation/DutyCycleEncoder.hpp"
 
 namespace frc::sim {
diff --git a/wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp
index 008b65283b..0373ab3372 100644
--- a/wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/DutyCycleSimTest.cpp
@@ -5,9 +5,9 @@
 #include "wpi/simulation/DutyCycleSim.hpp"  // NOLINT(build/include_order)
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/discrete/DigitalInput.hpp"
 #include "wpi/hardware/rotation/DutyCycle.hpp"
 
diff --git a/wpilibc/src/test/native/cpp/simulation/ElevatorSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/ElevatorSimTest.cpp
index f8050a6956..cdd426a1da 100644
--- a/wpilibc/src/test/native/cpp/simulation/ElevatorSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/ElevatorSimTest.cpp
@@ -3,18 +3,18 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/units/math.hpp"
-#include "wpi/units/time.hpp"
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/system/RobotController.hpp"
-#include "wpi/math/controller/PIDController.hpp"
 #include "wpi/hardware/motor/PWMVictorSPX.hpp"
-#include "wpi/simulation/ElevatorSim.hpp"
-#include "wpi/simulation/EncoderSim.hpp"
+#include "wpi/hardware/rotation/Encoder.hpp"
+#include "wpi/math/controller/PIDController.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/math/system/plant/DCMotor.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
+#include "wpi/simulation/ElevatorSim.hpp"
+#include "wpi/simulation/EncoderSim.hpp"
+#include "wpi/system/RobotController.hpp"
+#include "wpi/units/math.hpp"
+#include "wpi/units/time.hpp"
 
 #define EXPECT_NEAR_UNITS(val1, val2, eps) \
   EXPECT_LE(units::math::abs(val1 - val2), eps)
diff --git a/wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp
index e469f8aa2b..17b5415137 100644
--- a/wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/EncoderSimTest.cpp
@@ -5,11 +5,11 @@
 #include "wpi/simulation/EncoderSim.hpp"  // NOLINT(build/include_order)
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
-#include "wpi/util/deprecated.hpp"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/rotation/Encoder.hpp"
+#include "wpi/util/deprecated.hpp"
 
 namespace frc::sim {
 
diff --git a/wpilibc/src/test/native/cpp/simulation/PDPSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/PDPSimTest.cpp
index b72160fd87..b6b724d298 100644
--- a/wpilibc/src/test/native/cpp/simulation/PDPSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/PDPSimTest.cpp
@@ -7,9 +7,9 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/power/PowerDistribution.hpp"
 
 namespace frc::sim {
diff --git a/wpilibc/src/test/native/cpp/simulation/PWMMotorControlllerSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/PWMMotorControlllerSimTest.cpp
index fb35339b5d..a84a1216e3 100644
--- a/wpilibc/src/test/native/cpp/simulation/PWMMotorControlllerSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/PWMMotorControlllerSimTest.cpp
@@ -5,8 +5,8 @@
 #include "wpi/simulation/PWMMotorControllerSim.hpp"  // NOLINT(build/include_order)
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/motor/Spark.hpp"
 
 namespace frc::sim {
diff --git a/wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp
index 1532d5abe4..1d3638cecc 100644
--- a/wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/PWMSimTest.cpp
@@ -5,9 +5,9 @@
 #include "wpi/simulation/PWMSim.hpp"  // NOLINT(build/include_order)
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/discrete/PWM.hpp"
 
 namespace frc::sim {
diff --git a/wpilibc/src/test/native/cpp/simulation/REVPHSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/REVPHSimTest.cpp
index 3c90b8d847..55f43681af 100644
--- a/wpilibc/src/test/native/cpp/simulation/REVPHSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/REVPHSimTest.cpp
@@ -5,9 +5,9 @@
 #include "wpi/simulation/REVPHSim.hpp"  // NOLINT(build/include_order)
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/PneumaticHub.hpp"
 
diff --git a/wpilibc/src/test/native/cpp/simulation/RoboRioSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/RoboRioSimTest.cpp
index a4d900bf5b..8e22650782 100644
--- a/wpilibc/src/test/native/cpp/simulation/RoboRioSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/RoboRioSimTest.cpp
@@ -7,10 +7,10 @@
 #include <string>
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
-#include "wpi/hal/HALBase.h"
 
 #include "callback_helpers/TestCallbackHelpers.hpp"
+#include "wpi/hal/HAL.h"
+#include "wpi/hal/HALBase.h"
 #include "wpi/system/RobotController.hpp"
 
 namespace frc::sim {
diff --git a/wpilibc/src/test/native/cpp/simulation/SimDeviceSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/SimDeviceSimTest.cpp
index 88f9c0f32a..9f14e65f6a 100644
--- a/wpilibc/src/test/native/cpp/simulation/SimDeviceSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/SimDeviceSimTest.cpp
@@ -5,8 +5,8 @@
 #include <string_view>
 
 #include <gtest/gtest.h>
-#include "wpi/hal/SimDevice.h"
 
+#include "wpi/hal/SimDevice.h"
 #include "wpi/simulation/SimDeviceSim.hpp"
 
 using namespace frc::sim;
diff --git a/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp b/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp
index 1846c655a8..ff58114ce3 100644
--- a/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/SimInitializationTest.cpp
@@ -5,8 +5,8 @@
 #include <exception>
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HAL.h"
 
+#include "wpi/hal/HAL.h"
 #include "wpi/simulation/AddressableLEDSim.hpp"
 #include "wpi/simulation/AnalogInputSim.hpp"
 #include "wpi/simulation/CTREPCMSim.hpp"
diff --git a/wpilibc/src/test/native/cpp/simulation/StateSpaceSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/StateSpaceSimTest.cpp
index 77ef505f33..1bb974c16a 100644
--- a/wpilibc/src/test/native/cpp/simulation/StateSpaceSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/StateSpaceSimTest.cpp
@@ -3,14 +3,12 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/units/angular_acceleration.hpp"
-#include "wpi/units/angular_velocity.hpp"
 
+#include "wpi/hardware/motor/PWMVictorSPX.hpp"
 #include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/system/RobotController.hpp"
 #include "wpi/math/controller/PIDController.hpp"
 #include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/hardware/motor/PWMVictorSPX.hpp"
+#include "wpi/math/system/plant/LinearSystemId.hpp"
 #include "wpi/simulation/BatterySim.hpp"
 #include "wpi/simulation/DifferentialDrivetrainSim.hpp"
 #include "wpi/simulation/ElevatorSim.hpp"
@@ -19,7 +17,9 @@
 #include "wpi/simulation/LinearSystemSim.hpp"
 #include "wpi/simulation/PWMSim.hpp"
 #include "wpi/simulation/RoboRioSim.hpp"
-#include "wpi/math/system/plant/LinearSystemId.hpp"
+#include "wpi/system/RobotController.hpp"
+#include "wpi/units/angular_acceleration.hpp"
+#include "wpi/units/angular_velocity.hpp"
 
 TEST(StateSpaceSimTest, FlywheelSim) {
   const frc::LinearSystem<1, 1, 1> plant =
diff --git a/wpilibc/src/test/native/cpp/smartdashboard/Mechanism2dTest.cpp b/wpilibc/src/test/native/cpp/smartdashboard/Mechanism2dTest.cpp
index 64c29108dd..510fd50156 100644
--- a/wpilibc/src/test/native/cpp/smartdashboard/Mechanism2dTest.cpp
+++ b/wpilibc/src/test/native/cpp/smartdashboard/Mechanism2dTest.cpp
@@ -2,14 +2,14 @@
 // 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 <gtest/gtest.h>
+
+#include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/smartdashboard/Mechanism2d.hpp"
 #include "wpi/smartdashboard/MechanismLigament2d.hpp"
 #include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/util/Color8Bit.hpp"
-
-#include <gtest/gtest.h>
-#include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/units/angle.hpp"
+#include "wpi/util/Color8Bit.hpp"
 
 class Mechanism2dTest;
 
diff --git a/wpilibc/src/test/native/cpp/smartdashboard/SendableChooserTest.cpp b/wpilibc/src/test/native/cpp/smartdashboard/SendableChooserTest.cpp
index 2ae50427d9..e2c37a048e 100644
--- a/wpilibc/src/test/native/cpp/smartdashboard/SendableChooserTest.cpp
+++ b/wpilibc/src/test/native/cpp/smartdashboard/SendableChooserTest.cpp
@@ -2,16 +2,16 @@
 // 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 "wpi/simulation/SendableChooserSim.hpp"
-#include "wpi/smartdashboard/SendableChooser.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-
 #include <string>
 
 #include <fmt/format.h>
 #include <gtest/gtest.h>
+
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/nt/StringTopic.hpp"
+#include "wpi/simulation/SendableChooserSim.hpp"
+#include "wpi/smartdashboard/SendableChooser.hpp"
+#include "wpi/smartdashboard/SmartDashboard.hpp"
 
 class SendableChooserTest : public ::testing::TestWithParam<int> {};
 
diff --git a/wpilibc/src/test/native/include/motorcontrol/MockMotorController.hpp b/wpilibc/src/test/native/include/motorcontrol/MockMotorController.hpp
index f32a31962d..1d14727780 100644
--- a/wpilibc/src/test/native/include/motorcontrol/MockMotorController.hpp
+++ b/wpilibc/src/test/native/include/motorcontrol/MockMotorController.hpp
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "wpi/util/deprecated.hpp"
-
 #include "wpi/hardware/motor/MotorController.hpp"
+#include "wpi/util/deprecated.hpp"
 
 namespace frc {
 
diff --git a/wpilibcExamples/src/main/cpp/commands/command2/ReplaceMeCommand2.hpp b/wpilibcExamples/src/main/cpp/commands/command2/ReplaceMeCommand2.hpp
index 8e8f1a4408..8b480207df 100644
--- a/wpilibcExamples/src/main/cpp/commands/command2/ReplaceMeCommand2.hpp
+++ b/wpilibcExamples/src/main/cpp/commands/command2/ReplaceMeCommand2.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
 
 /**
  * An example command.
diff --git a/wpilibcExamples/src/main/cpp/commands/instantcommand/ReplaceMeInstantCommand2.hpp b/wpilibcExamples/src/main/cpp/commands/instantcommand/ReplaceMeInstantCommand2.hpp
index 32a39d0cce..9114cb6e6c 100644
--- a/wpilibcExamples/src/main/cpp/commands/instantcommand/ReplaceMeInstantCommand2.hpp
+++ b/wpilibcExamples/src/main/cpp/commands/instantcommand/ReplaceMeInstantCommand2.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/commands2/InstantCommand.hpp"
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/commands2/InstantCommand.hpp>
 
 // NOTE:  Consider using this command inline, rather than writing a subclass.
 // For more information, see:
diff --git a/wpilibcExamples/src/main/cpp/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.hpp b/wpilibcExamples/src/main/cpp/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.hpp
index 237b04cc7e..baa00521b0 100644
--- a/wpilibcExamples/src/main/cpp/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.hpp
+++ b/wpilibcExamples/src/main/cpp/commands/parallelcommandgroup/ReplaceMeParallelCommandGroup.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/commands2/ParallelCommandGroup.hpp"
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/commands2/ParallelCommandGroup.hpp>
 
 // NOTE:  Consider using this command inline, rather than writing a subclass.
 // For more information, see:
diff --git a/wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.cpp b/wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.cpp
index 4b4d44d713..b7b65e40ca 100644
--- a/wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.cpp
+++ b/wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.cpp
@@ -4,7 +4,7 @@
 
 #include "ReplaceMeParallelDeadlineGroup.hpp"
 
-#include "wpi/commands2/InstantCommand.hpp"
+#include <wpi/commands2/InstantCommand.hpp>
 
 // NOTE:  Consider using this command inline, rather than writing a subclass.
 // For more information, see:
diff --git a/wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.hpp b/wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.hpp
index 405ffc7839..2ec4a7bd6a 100644
--- a/wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.hpp
+++ b/wpilibcExamples/src/main/cpp/commands/paralleldeadlinegroup/ReplaceMeParallelDeadlineGroup.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/commands2/ParallelDeadlineGroup.hpp"
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/commands2/ParallelDeadlineGroup.hpp>
 
 // NOTE:  Consider using this command inline, rather than writing a subclass.
 // For more information, see:
diff --git a/wpilibcExamples/src/main/cpp/commands/parallelracegroup/ReplaceMeParallelRaceGroup.hpp b/wpilibcExamples/src/main/cpp/commands/parallelracegroup/ReplaceMeParallelRaceGroup.hpp
index 5e9140957f..635ef64176 100644
--- a/wpilibcExamples/src/main/cpp/commands/parallelracegroup/ReplaceMeParallelRaceGroup.hpp
+++ b/wpilibcExamples/src/main/cpp/commands/parallelracegroup/ReplaceMeParallelRaceGroup.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/commands2/ParallelRaceGroup.hpp"
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/commands2/ParallelRaceGroup.hpp>
 
 // NOTE:  Consider using this command inline, rather than writing a subclass.
 // For more information, see:
diff --git a/wpilibcExamples/src/main/cpp/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.hpp b/wpilibcExamples/src/main/cpp/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.hpp
index a896bef5b5..fd02c378e6 100644
--- a/wpilibcExamples/src/main/cpp/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.hpp
+++ b/wpilibcExamples/src/main/cpp/commands/sequentialcommandgroup/ReplaceMeSequentialCommandGroup.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/commands2/SequentialCommandGroup.hpp"
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/commands2/SequentialCommandGroup.hpp>
 
 // NOTE:  Consider using this command inline, rather than writing a subclass.
 // For more information, see:
diff --git a/wpilibcExamples/src/main/cpp/commands/subsystem2/ReplaceMeSubsystem2.hpp b/wpilibcExamples/src/main/cpp/commands/subsystem2/ReplaceMeSubsystem2.hpp
index cdadc54dd9..c98e3c0141 100644
--- a/wpilibcExamples/src/main/cpp/commands/subsystem2/ReplaceMeSubsystem2.hpp
+++ b/wpilibcExamples/src/main/cpp/commands/subsystem2/ReplaceMeSubsystem2.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "wpi/commands2/SubsystemBase.hpp"
+#include <wpi/commands2/SubsystemBase.hpp>
 
 class ReplaceMeSubsystem2 : public frc2::SubsystemBase {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.hpp
index 12867f2231..4c17cc6d21 100644
--- a/wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/AddressableLED/include/Robot.hpp
@@ -6,9 +6,9 @@
 
 #include <array>
 
-#include "wpi/hardware/led/AddressableLED.hpp"
-#include "wpi/hardware/led/LEDPattern.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/hardware/led/AddressableLED.hpp>
+#include <wpi/hardware/led/LEDPattern.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 class Robot : public frc::TimedRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp
index 9ea2210d09..77cf206af0 100644
--- a/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp
@@ -8,20 +8,20 @@
 #include <thread>
 #include <vector>
 
-#include "wpi/cameraserver/CameraServer.hpp"
 #include <fmt/format.h>
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/apriltag/AprilTagDetection.hpp"
-#include "wpi/apriltag/AprilTagDetector.hpp"
-#include "wpi/apriltag/AprilTagPoseEstimator.hpp"
-#include "wpi/math/geometry/Transform3d.hpp"
-#include "wpi/nt/IntegerArrayTopic.hpp"
-#include "wpi/nt/NetworkTableInstance.hpp"
 #include <opencv2/core/core.hpp>
 #include <opencv2/core/types.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
-#include "wpi/units/angle.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/apriltag/AprilTagDetection.hpp>
+#include <wpi/apriltag/AprilTagDetector.hpp>
+#include <wpi/apriltag/AprilTagPoseEstimator.hpp>
+#include <wpi/cameraserver/CameraServer.hpp>
+#include <wpi/math/geometry/Transform3d.hpp>
+#include <wpi/nt/IntegerArrayTopic.hpp>
+#include <wpi/nt/NetworkTableInstance.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/length.hpp>
 
 /**
  * This is a demo program showing the detection of AprilTags.
diff --git a/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp
index d7b31aa947..9baa0905c0 100644
--- a/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/ArcadeDrive/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a demo program showing the use of the DifferentialDrive class.
diff --git a/wpilibcExamples/src/main/cpp/examples/ArcadeDriveXboxController/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ArcadeDriveXboxController/cpp/Robot.cpp
index b03d170709..58c319541c 100644
--- a/wpilibcExamples/src/main/cpp/examples/ArcadeDriveXboxController/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/ArcadeDriveXboxController/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a demo program showing the use of the DifferentialDrive class.
diff --git a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/cpp/subsystems/Arm.cpp b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/cpp/subsystems/Arm.cpp
index bafd2f9b1d..cead817b37 100644
--- a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/cpp/subsystems/Arm.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/cpp/subsystems/Arm.cpp
@@ -4,10 +4,10 @@
 
 #include "subsystems/Arm.hpp"
 
-#include "wpi/util/Preferences.hpp"
-#include "wpi/system/RobotController.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include <wpi/math/util/StateSpaceUtil.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/system/RobotController.hpp>
+#include <wpi/util/Preferences.hpp>
 
 Arm::Arm() {
   m_encoder.SetDistancePerPulse(kArmEncoderDistPerPulse);
diff --git a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Constants.hpp b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Constants.hpp
index 2c9a8f132b..816a7d39db 100644
--- a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Constants.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Constants.hpp
@@ -6,12 +6,12 @@
 
 #include <numbers>
 
-#include "wpi/units/angle.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/mass.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/velocity.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/units/angle.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/mass.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/velocity.hpp>
+#include <wpi/units/voltage.hpp>
 
 /**
  * The Constants header provides a convenient place for teams to hold robot-wide
diff --git a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.hpp
index 4b1b921c6f..53f13e7f0c 100644
--- a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/Robot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "subsystems/Arm.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/subsystems/Arm.hpp b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/subsystems/Arm.hpp
index a5c7730215..01abb0d076 100644
--- a/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/subsystems/Arm.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/ArmSimulation/include/subsystems/Arm.hpp
@@ -4,19 +4,19 @@
 
 #pragma once
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/math/controller/ArmFeedforward.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/simulation/BatterySim.hpp"
-#include "wpi/simulation/EncoderSim.hpp"
-#include "wpi/simulation/PWMSim.hpp"
-#include "wpi/simulation/RoboRioSim.hpp"
-#include "wpi/simulation/SingleJointedArmSim.hpp"
-#include "wpi/smartdashboard/Mechanism2d.hpp"
-#include "wpi/smartdashboard/MechanismLigament2d.hpp"
-#include "wpi/smartdashboard/MechanismRoot2d.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/ArmFeedforward.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/simulation/BatterySim.hpp>
+#include <wpi/simulation/EncoderSim.hpp>
+#include <wpi/simulation/PWMSim.hpp>
+#include <wpi/simulation/RoboRioSim.hpp>
+#include <wpi/simulation/SingleJointedArmSim.hpp>
+#include <wpi/smartdashboard/Mechanism2d.hpp>
+#include <wpi/smartdashboard/MechanismLigament2d.hpp>
+#include <wpi/smartdashboard/MechanismRoot2d.hpp>
+#include <wpi/units/length.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp
index 87a4422d40..3a83020687 100644
--- a/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/CANPDP/cpp/Robot.cpp
@@ -2,9 +2,9 @@
 // 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 "wpi/hardware/power/PowerDistribution.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include <wpi/hardware/power/PowerDistribution.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 /**
  * This is a sample program showing how to retrieve information from the Power
diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp
index 7e36e5a15b..bbc136e116 100644
--- a/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/cpp/Robot.cpp
@@ -2,9 +2,9 @@
 // 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 "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/filter/SlewRateLimiter.hpp"
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/math/filter/SlewRateLimiter.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/include/Drivetrain.hpp b/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/include/Drivetrain.hpp
index 8ee4341621..ca300d571f 100644
--- a/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/include/Drivetrain.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/DifferentialDriveBot/include/Drivetrain.hpp
@@ -6,17 +6,17 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
-#include "wpi/math/kinematics/DifferentialDriveOdometry.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/angular_velocity.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/velocity.hpp"
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/kinematics/DifferentialDriveKinematics.hpp>
+#include <wpi/math/kinematics/DifferentialDriveOdometry.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/angular_velocity.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/velocity.hpp>
 
 /**
  * Represents a differential drive style drivetrain.
diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp
index 3b3297568c..a012a7b0e1 100644
--- a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Robot.cpp
@@ -2,9 +2,9 @@
 // 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 "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/filter/SlewRateLimiter.hpp"
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/math/filter/SlewRateLimiter.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/Drivetrain.hpp b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/Drivetrain.hpp
index 4c77d3f669..014a3581ec 100644
--- a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/Drivetrain.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/Drivetrain.hpp
@@ -6,33 +6,33 @@
 
 #include <numbers>
 
-#include "wpi/math/util/ComputerVisionUtil.hpp"
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/system/RobotController.hpp"
-#include "wpi/system/Timer.hpp"
-#include "wpi/apriltag/AprilTagFieldLayout.hpp"
-#include "wpi/apriltag/AprilTagFields.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/math/estimator/DifferentialDrivePoseEstimator.hpp"
-#include "wpi/math/geometry/Pose2d.hpp"
-#include "wpi/math/geometry/Pose3d.hpp"
-#include "wpi/math/geometry/Quaternion.hpp"
-#include "wpi/math/geometry/Transform3d.hpp"
-#include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/simulation/DifferentialDrivetrainSim.hpp"
-#include "wpi/simulation/EncoderSim.hpp"
-#include "wpi/smartdashboard/Field2d.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/math/system/plant/LinearSystemId.hpp"
-#include "wpi/nt/DoubleArrayTopic.hpp"
-#include "wpi/nt/NetworkTableInstance.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/angular_velocity.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/velocity.hpp"
+#include <wpi/apriltag/AprilTagFieldLayout.hpp>
+#include <wpi/apriltag/AprilTagFields.hpp>
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/estimator/DifferentialDrivePoseEstimator.hpp>
+#include <wpi/math/geometry/Pose2d.hpp>
+#include <wpi/math/geometry/Pose3d.hpp>
+#include <wpi/math/geometry/Quaternion.hpp>
+#include <wpi/math/geometry/Transform3d.hpp>
+#include <wpi/math/kinematics/DifferentialDriveKinematics.hpp>
+#include <wpi/math/system/plant/LinearSystemId.hpp>
+#include <wpi/math/util/ComputerVisionUtil.hpp>
+#include <wpi/nt/DoubleArrayTopic.hpp>
+#include <wpi/nt/NetworkTableInstance.hpp>
+#include <wpi/simulation/DifferentialDrivetrainSim.hpp>
+#include <wpi/simulation/EncoderSim.hpp>
+#include <wpi/smartdashboard/Field2d.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/system/RobotController.hpp>
+#include <wpi/system/Timer.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/angular_velocity.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/velocity.hpp>
 
 /**
  * Represents a differential drive style drivetrain.
diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
index e62c125943..d4f9b4e52f 100644
--- a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/math/geometry/Pose2d.hpp"
+#include <wpi/math/geometry/Pose2d.hpp>
+#include <wpi/math/util/StateSpaceUtil.hpp>
 
 /**
  * This dummy class represents a global measurement sensor, such as a computer
diff --git a/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/cpp/Robot.cpp
index 0eb8cf81e3..3cd22ea1b3 100644
--- a/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/cpp/Robot.cpp
@@ -4,7 +4,7 @@
 
 #include "Robot.hpp"
 
-#include "wpi/driverstation/DriverStation.hpp"
+#include <wpi/driverstation/DriverStation.hpp>
 
 void Robot::RobotPeriodic() {
   // pull alliance port high if on red alliance, pull low if on blue alliance
diff --git a/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.hpp
index 0d94f98ba7..ec24e1f048 100644
--- a/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/DigitalCommunication/include/Robot.hpp
@@ -6,8 +6,8 @@
 
 #include <array>
 
-#include "wpi/hardware/discrete/DigitalOutput.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/hardware/discrete/DigitalOutput.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a sample program demonstrating how to communicate to a light
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/Robot.cpp
index 4171cf2259..de43981c60 100644
--- a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/Robot.cpp
@@ -4,8 +4,8 @@
 
 #include "Robot.hpp"
 
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/commands2/CommandScheduler.hpp"
+#include <wpi/commands2/CommandScheduler.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 Robot::Robot() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/RobotContainer.cpp
index bbf9217e0f..b3c825e314 100644
--- a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/RobotContainer.cpp
@@ -4,7 +4,7 @@
 
 #include "RobotContainer.hpp"
 
-#include "wpi/commands2/Commands.hpp"
+#include <wpi/commands2/Commands.hpp>
 
 RobotContainer::RobotContainer() {
   // Initialize all of your commands and subsystems here
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/subsystems/DriveSubsystem.cpp b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/subsystems/DriveSubsystem.cpp
index a2039b9728..e19392b09d 100644
--- a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/subsystems/DriveSubsystem.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/cpp/subsystems/DriveSubsystem.cpp
@@ -4,7 +4,7 @@
 
 #include "subsystems/DriveSubsystem.hpp"
 
-#include "wpi/system/RobotController.hpp"
+#include <wpi/system/RobotController.hpp>
 
 using namespace DriveConstants;
 
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Constants.hpp b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Constants.hpp
index d0ac788a1c..81e325f9ca 100644
--- a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Constants.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Constants.hpp
@@ -6,11 +6,11 @@
 
 #include <numbers>
 
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/velocity.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/velocity.hpp>
+#include <wpi/units/voltage.hpp>
 
 /**
  * The Constants header provides a convenient place for teams to hold robot-wide
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.hpp
index dcd14942f4..ef3760deda 100644
--- a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/Robot.hpp
@@ -6,8 +6,8 @@
 
 #include <optional>
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/commands2/Command.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "RobotContainer.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/RobotContainer.hpp b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/RobotContainer.hpp
index 7a6c391b89..9aed0824ef 100644
--- a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/RobotContainer.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/RobotContainer.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/Commands.hpp"
-#include "wpi/commands2/button/CommandXboxController.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/Commands.hpp>
+#include <wpi/commands2/button/CommandXboxController.hpp>
 
 #include "Constants.hpp"
 #include "subsystems/DriveSubsystem.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/subsystems/DriveSubsystem.hpp b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/subsystems/DriveSubsystem.hpp
index a6488a10d7..612b16a1bd 100644
--- a/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/subsystems/DriveSubsystem.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/DriveDistanceOffboard/include/subsystems/DriveSubsystem.hpp
@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/system/Timer.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/math/trajectory/TrapezoidProfile.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/trajectory/TrapezoidProfile.hpp>
+#include <wpi/system/Timer.hpp>
+#include <wpi/units/length.hpp>
 
 #include "Constants.hpp"
 #include "ExampleSmartMotorController.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/DutyCycleEncoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DutyCycleEncoder/cpp/Robot.cpp
index a79a1b166d..49fbd3c3ab 100644
--- a/wpilibcExamples/src/main/cpp/examples/DutyCycleEncoder/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/DutyCycleEncoder/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/hardware/rotation/DutyCycleEncoder.hpp"
-#include "wpi/math/util/MathUtil.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include <wpi/hardware/rotation/DutyCycleEncoder.hpp>
+#include <wpi/math/util/MathUtil.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 constexpr double fullRange = 1.3;
 constexpr double expectedZero = 0.0;
diff --git a/wpilibcExamples/src/main/cpp/examples/DutyCycleInput/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/DutyCycleInput/cpp/Robot.cpp
index f0d144e52d..371e54a309 100644
--- a/wpilibcExamples/src/main/cpp/examples/DutyCycleInput/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/DutyCycleInput/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/hardware/discrete/DigitalInput.hpp"
-#include "wpi/hardware/rotation/DutyCycle.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include <wpi/hardware/discrete/DigitalInput.hpp>
+#include <wpi/hardware/rotation/DutyCycle.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 class Robot : public frc::TimedRobot {
   frc::DutyCycle m_dutyCycle{0};  // Duty cycle input
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/cpp/Robot.cpp
index f9bf4726d0..f7c9b35b53 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialProfile/cpp/Robot.cpp
@@ -4,15 +4,15 @@
 
 #include <numbers>
 
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/math/trajectory/ExponentialProfile.hpp"
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/velocity.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/trajectory/ExponentialProfile.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/velocity.hpp>
+#include <wpi/units/voltage.hpp>
 
 #include "ExampleSmartMotorController.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/cpp/subsystems/Elevator.cpp b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/cpp/subsystems/Elevator.cpp
index adf098512a..f727f5591f 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/cpp/subsystems/Elevator.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/cpp/subsystems/Elevator.cpp
@@ -4,9 +4,9 @@
 
 #include "subsystems/Elevator.hpp"
 
-#include "wpi/system/RobotController.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include <wpi/math/util/StateSpaceUtil.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/system/RobotController.hpp>
 
 Elevator::Elevator() {
   m_encoder.SetDistancePerPulse(Constants::kArmEncoderDistPerPulse);
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Constants.hpp b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Constants.hpp
index 2a31145aff..a3c97c7866 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Constants.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Constants.hpp
@@ -6,13 +6,13 @@
 
 #include <numbers>
 
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/mass.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/velocity.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/mass.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/velocity.hpp>
+#include <wpi/units/voltage.hpp>
 
 /**
  * The Constants header provides a convenient place for teams to hold robot-wide
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.hpp
index 0af79640f4..ec33857b69 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/Robot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "subsystems/Elevator.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/subsystems/Elevator.hpp b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/subsystems/Elevator.hpp
index 2c449f675c..8b040e913b 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/subsystems/Elevator.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorExponentialSimulation/include/subsystems/Elevator.hpp
@@ -4,20 +4,20 @@
 
 #pragma once
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/math/controller/ElevatorFeedforward.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/simulation/BatterySim.hpp"
-#include "wpi/simulation/ElevatorSim.hpp"
-#include "wpi/simulation/EncoderSim.hpp"
-#include "wpi/simulation/PWMMotorControllerSim.hpp"
-#include "wpi/simulation/RoboRioSim.hpp"
-#include "wpi/smartdashboard/Mechanism2d.hpp"
-#include "wpi/smartdashboard/MechanismLigament2d.hpp"
-#include "wpi/smartdashboard/MechanismRoot2d.hpp"
-#include "wpi/math/trajectory/ExponentialProfile.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/ElevatorFeedforward.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/trajectory/ExponentialProfile.hpp>
+#include <wpi/simulation/BatterySim.hpp>
+#include <wpi/simulation/ElevatorSim.hpp>
+#include <wpi/simulation/EncoderSim.hpp>
+#include <wpi/simulation/PWMMotorControllerSim.hpp>
+#include <wpi/simulation/RoboRioSim.hpp>
+#include <wpi/smartdashboard/Mechanism2d.hpp>
+#include <wpi/smartdashboard/MechanismLigament2d.hpp>
+#include <wpi/smartdashboard/MechanismRoot2d.hpp>
+#include <wpi/units/length.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorProfiledPID/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ElevatorProfiledPID/cpp/Robot.cpp
index 04d4c78346..d4da52a748 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorProfiledPID/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorProfiledPID/cpp/Robot.cpp
@@ -4,18 +4,18 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/math/controller/ElevatorFeedforward.hpp"
-#include "wpi/math/controller/ProfiledPIDController.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/math/trajectory/TrapezoidProfile.hpp"
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/velocity.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/ElevatorFeedforward.hpp>
+#include <wpi/math/controller/ProfiledPIDController.hpp>
+#include <wpi/math/trajectory/TrapezoidProfile.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/velocity.hpp>
+#include <wpi/units/voltage.hpp>
 
 class Robot : public frc::TimedRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/cpp/subsystems/Elevator.cpp b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/cpp/subsystems/Elevator.cpp
index c14c395078..3206082c9e 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/cpp/subsystems/Elevator.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/cpp/subsystems/Elevator.cpp
@@ -4,9 +4,9 @@
 
 #include "subsystems/Elevator.hpp"
 
-#include "wpi/system/RobotController.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include <wpi/math/util/StateSpaceUtil.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/system/RobotController.hpp>
 
 Elevator::Elevator() {
   m_encoder.SetDistancePerPulse(Constants::kArmEncoderDistPerPulse);
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Constants.hpp b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Constants.hpp
index 8ad13f6dca..928bfa061d 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Constants.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Constants.hpp
@@ -6,13 +6,13 @@
 
 #include <numbers>
 
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/mass.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/velocity.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/mass.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/velocity.hpp>
+#include <wpi/units/voltage.hpp>
 
 /**
  * The Constants header provides a convenient place for teams to hold robot-wide
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.hpp
index b1ea606417..ea1bf8775f 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/Robot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "subsystems/Elevator.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/subsystems/Elevator.hpp b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/subsystems/Elevator.hpp
index 19c77c968e..8ed8bd3a2e 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/subsystems/Elevator.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorSimulation/include/subsystems/Elevator.hpp
@@ -4,20 +4,20 @@
 
 #pragma once
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/math/controller/ElevatorFeedforward.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/ProfiledPIDController.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/simulation/BatterySim.hpp"
-#include "wpi/simulation/ElevatorSim.hpp"
-#include "wpi/simulation/EncoderSim.hpp"
-#include "wpi/simulation/PWMMotorControllerSim.hpp"
-#include "wpi/simulation/RoboRioSim.hpp"
-#include "wpi/smartdashboard/Mechanism2d.hpp"
-#include "wpi/smartdashboard/MechanismLigament2d.hpp"
-#include "wpi/smartdashboard/MechanismRoot2d.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/ElevatorFeedforward.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/ProfiledPIDController.hpp>
+#include <wpi/simulation/BatterySim.hpp>
+#include <wpi/simulation/ElevatorSim.hpp>
+#include <wpi/simulation/EncoderSim.hpp>
+#include <wpi/simulation/PWMMotorControllerSim.hpp>
+#include <wpi/simulation/RoboRioSim.hpp>
+#include <wpi/smartdashboard/Mechanism2d.hpp>
+#include <wpi/smartdashboard/MechanismLigament2d.hpp>
+#include <wpi/smartdashboard/MechanismRoot2d.hpp>
+#include <wpi/units/length.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/cpp/Robot.cpp
index 9002ea2062..9ffb16b58c 100644
--- a/wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/ElevatorTrapezoidProfile/cpp/Robot.cpp
@@ -4,15 +4,15 @@
 
 #include <numbers>
 
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/math/trajectory/TrapezoidProfile.hpp"
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/velocity.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/trajectory/TrapezoidProfile.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/velocity.hpp>
+#include <wpi/units/voltage.hpp>
 
 #include "ExampleSmartMotorController.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp
index 9b28604b58..8d92d4441d 100644
--- a/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Encoder/cpp/Robot.cpp
@@ -4,9 +4,9 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 /**
  * Sample program displaying the value of a quadrature encoder on the
diff --git a/wpilibcExamples/src/main/cpp/examples/EventLoop/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/EventLoop/cpp/Robot.cpp
index 0c6f95219f..fd47f6880d 100644
--- a/wpilibcExamples/src/main/cpp/examples/EventLoop/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/EventLoop/cpp/Robot.cpp
@@ -2,18 +2,18 @@
 // 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 "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/event/BooleanEvent.hpp"
-#include "wpi/event/EventLoop.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/units/angular_velocity.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/event/BooleanEvent.hpp>
+#include <wpi/event/EventLoop.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/angular_velocity.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/voltage.hpp>
 
 static const auto SHOT_VELOCITY = 200_rpm;
 static const auto TOLERANCE = 8_rpm;
diff --git a/wpilibcExamples/src/main/cpp/examples/FlywheelBangBangController/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/FlywheelBangBangController/cpp/Robot.cpp
index 0c29d55425..b115ff94c3 100644
--- a/wpilibcExamples/src/main/cpp/examples/FlywheelBangBangController/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/FlywheelBangBangController/cpp/Robot.cpp
@@ -2,17 +2,17 @@
 // 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 "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/math/controller/BangBangController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/simulation/EncoderSim.hpp"
-#include "wpi/simulation/FlywheelSim.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/math/system/plant/LinearSystemId.hpp"
-#include "wpi/units/moment_of_inertia.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/BangBangController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/system/plant/LinearSystemId.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/simulation/EncoderSim.hpp>
+#include <wpi/simulation/FlywheelSim.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/units/moment_of_inertia.hpp>
 
 /**
  * This is a sample program to demonstrate the use of a BangBangController with
diff --git a/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp
index a993c8118f..f721bee724 100644
--- a/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GettingStarted/cpp/Robot.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 "wpi/opmode/TimedRobot.hpp"
-#include "wpi/system/Timer.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/system/Timer.hpp>
 
 class Robot : public frc::TimedRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp
index 5f677e5b4c..3b8dc7329b 100644
--- a/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Gyro/cpp/Robot.cpp
@@ -4,11 +4,11 @@
 
 #include <cmath>
 
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a sample program to demonstrate how to use a gyro sensor to make a
diff --git a/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp
index 4b1b5a8ff4..876af1b314 100644
--- a/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GyroMecanum/cpp/Robot.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 "wpi/driverstation/Joystick.hpp"
-#include "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/drive/MecanumDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/drive/MecanumDrive.hpp>
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a sample program that uses mecanum drive with a gyro sensor to
diff --git a/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c b/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c
index 64f732b522..14d71729cb 100644
--- a/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c
+++ b/wpilibcExamples/src/main/cpp/examples/HAL/c/Robot.c
@@ -15,7 +15,7 @@ that want even more control over what code runs on their robot.
 
 #include <stdio.h>
 
-#include "wpi/hal/HAL.h"
+#include <wpi/hal/HAL.h>
 
 enum DriverStationMode {
   DisabledMode,
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/Robot.cpp
index 920321a33a..a65f524314 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/Robot.cpp
@@ -4,10 +4,10 @@
 
 #include "Robot.hpp"
 
-#include "wpi/system/DataLogManager.hpp"
-#include "wpi/driverstation/DriverStation.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/commands2/CommandScheduler.hpp"
+#include <wpi/commands2/CommandScheduler.hpp>
+#include <wpi/driverstation/DriverStation.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/system/DataLogManager.hpp>
 
 Robot::Robot() {
   // Start recording to data log
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/RobotContainer.cpp
index 940fcd90b3..caf50ec9d6 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/RobotContainer.cpp
@@ -4,7 +4,7 @@
 
 #include "RobotContainer.hpp"
 
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 RobotContainer::RobotContainer() {
   // Initialize all of your commands and subsystems here
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/commands/Autos.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/commands/Autos.cpp
index dc3ccc5491..473fdbfbfa 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/commands/Autos.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/commands/Autos.cpp
@@ -4,8 +4,8 @@
 
 #include "commands/Autos.hpp"
 
-#include "wpi/commands2/Commands.hpp"
-#include "wpi/commands2/FunctionalCommand.hpp"
+#include <wpi/commands2/Commands.hpp>
+#include <wpi/commands2/FunctionalCommand.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/subsystems/DriveSubsystem.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/subsystems/DriveSubsystem.cpp
index 59f7232e61..0d1c8a6f4e 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/subsystems/DriveSubsystem.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/subsystems/DriveSubsystem.cpp
@@ -4,7 +4,7 @@
 
 #include "subsystems/DriveSubsystem.hpp"
 
-#include "wpi/util/sendable/SendableBuilder.hpp"
+#include <wpi/util/sendable/SendableBuilder.hpp>
 
 using namespace DriveConstants;
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/subsystems/HatchSubsystem.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/subsystems/HatchSubsystem.cpp
index fa1726d8be..cf47294bd5 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/subsystems/HatchSubsystem.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/subsystems/HatchSubsystem.cpp
@@ -4,7 +4,7 @@
 
 #include "subsystems/HatchSubsystem.hpp"
 
-#include "wpi/util/sendable/SendableBuilder.hpp"
+#include <wpi/util/sendable/SendableBuilder.hpp>
 
 using namespace HatchConstants;
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.hpp
index fe9d7335c9..7a9d5e7e42 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/commands2/Command.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "RobotContainer.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.hpp
index 8de46b9d49..0358d8c556 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/smartdashboard/SendableChooser.hpp"
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/Commands.hpp"
-#include "wpi/commands2/button/CommandPS4Controller.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/Commands.hpp>
+#include <wpi/commands2/button/CommandPS4Controller.hpp>
+#include <wpi/smartdashboard/SendableChooser.hpp>
 
 #include "Constants.hpp"
 #include "commands/Autos.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/commands/Autos.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/commands/Autos.hpp
index 3deed280df..979689161d 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/commands/Autos.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/commands/Autos.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandPtr.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
 
 #include "subsystems/DriveSubsystem.hpp"
 #include "subsystems/HatchSubsystem.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.hpp
index c4480d2f0d..88339eb767 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.hpp
index 124a69a6e0..5e8970ac5e 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
-#include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/hardware/pneumatic/DoubleSolenoid.hpp>
+#include <wpi/hardware/pneumatic/PneumaticsControlModule.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/Robot.cpp
index 920321a33a..a65f524314 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/Robot.cpp
@@ -4,10 +4,10 @@
 
 #include "Robot.hpp"
 
-#include "wpi/system/DataLogManager.hpp"
-#include "wpi/driverstation/DriverStation.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/commands2/CommandScheduler.hpp"
+#include <wpi/commands2/CommandScheduler.hpp>
+#include <wpi/driverstation/DriverStation.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/system/DataLogManager.hpp>
 
 Robot::Robot() {
   // Start recording to data log
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/RobotContainer.cpp
index f32b800222..928a670e4f 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/RobotContainer.cpp
@@ -4,8 +4,8 @@
 
 #include "RobotContainer.hpp"
 
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/commands2/button/JoystickButton.hpp"
+#include <wpi/commands2/button/JoystickButton.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 #include "commands/DefaultDrive.hpp"
 #include "commands/GrabHatch.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/subsystems/DriveSubsystem.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/subsystems/DriveSubsystem.cpp
index 59f7232e61..0d1c8a6f4e 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/subsystems/DriveSubsystem.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/subsystems/DriveSubsystem.cpp
@@ -4,7 +4,7 @@
 
 #include "subsystems/DriveSubsystem.hpp"
 
-#include "wpi/util/sendable/SendableBuilder.hpp"
+#include <wpi/util/sendable/SendableBuilder.hpp>
 
 using namespace DriveConstants;
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/subsystems/HatchSubsystem.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/subsystems/HatchSubsystem.cpp
index 8d80d336c2..5aa2b96317 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/subsystems/HatchSubsystem.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/subsystems/HatchSubsystem.cpp
@@ -4,7 +4,7 @@
 
 #include "subsystems/HatchSubsystem.hpp"
 
-#include "wpi/util/sendable/SendableBuilder.hpp"
+#include <wpi/util/sendable/SendableBuilder.hpp>
 
 using namespace HatchConstants;
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.hpp
index fe9d7335c9..7a9d5e7e42 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/commands2/Command.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "RobotContainer.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.hpp
index 56895f598a..c32adf6bf4 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/smartdashboard/SendableChooser.hpp"
-#include "wpi/commands2/Command.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/smartdashboard/SendableChooser.hpp>
 
 #include "Constants.hpp"
 #include "commands/ComplexAuto.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ComplexAuto.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ComplexAuto.hpp
index 07874a8c09..25e8d6c3e9 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ComplexAuto.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ComplexAuto.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/commands2/SequentialCommandGroup.hpp"
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/commands2/SequentialCommandGroup.hpp>
 
 #include "Constants.hpp"
 #include "commands/DriveDistance.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DefaultDrive.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DefaultDrive.hpp
index 823276edb5..d069c5086b 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DefaultDrive.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DefaultDrive.hpp
@@ -6,8 +6,8 @@
 
 #include <functional>
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
 
 #include "subsystems/DriveSubsystem.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DriveDistance.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DriveDistance.hpp
index 7e83ab61ff..79fdde41f6 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DriveDistance.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/DriveDistance.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
 
 #include "subsystems/DriveSubsystem.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/GrabHatch.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/GrabHatch.hpp
index 8b90c1019e..cfd3971ebb 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/GrabHatch.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/GrabHatch.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
 
 #include "subsystems/HatchSubsystem.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/HalveDriveSpeed.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/HalveDriveSpeed.hpp
index b407c56c9a..85e0c79ec9 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/HalveDriveSpeed.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/HalveDriveSpeed.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
 
 #include "subsystems/DriveSubsystem.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ReleaseHatch.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ReleaseHatch.hpp
index 20825b8176..868bb88bb4 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ReleaseHatch.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/commands/ReleaseHatch.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
 
 #include "subsystems/HatchSubsystem.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.hpp
index c4480d2f0d..88339eb767 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.hpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.hpp
index c9755411aa..6f0ecaeaa9 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
-#include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/hardware/pneumatic/DoubleSolenoid.hpp>
+#include <wpi/hardware/pneumatic/PneumaticsControlModule.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HidRumble/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HidRumble/cpp/Robot.cpp
index 18112533af..092ea96fb4 100644
--- a/wpilibcExamples/src/main/cpp/examples/HidRumble/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HidRumble/cpp/Robot.cpp
@@ -2,8 +2,8 @@
 // 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 "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a demo program showing the use of GenericHID's rumble feature.
diff --git a/wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.cpp
index 4d319535e9..46db9dc877 100644
--- a/wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HttpCamera/cpp/Robot.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 "wpi/cameraserver/CameraServer.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
 #include <opencv2/core/core.hpp>
 #include <opencv2/core/types.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
+#include <wpi/cameraserver/CameraServer.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a demo program showing the use of OpenCV to do vision processing. The
diff --git a/wpilibcExamples/src/main/cpp/examples/I2CCommunication/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/I2CCommunication/cpp/Robot.cpp
index 628839b9bd..9b61fd5158 100644
--- a/wpilibcExamples/src/main/cpp/examples/I2CCommunication/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/I2CCommunication/cpp/Robot.cpp
@@ -7,8 +7,8 @@
 #include <string>
 
 #include <fmt/format.h>
-#include "wpi/driverstation/DriverStation.hpp"
-#include "wpi/system/Timer.hpp"
+#include <wpi/driverstation/DriverStation.hpp>
+#include <wpi/system/Timer.hpp>
 
 void Robot::RobotPeriodic() {
   // Creates a string to hold current robot state information, including
diff --git a/wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.hpp
index b4ee9e1b29..0e2bc795a4 100644
--- a/wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/I2CCommunication/include/Robot.hpp
@@ -6,8 +6,8 @@
 
 #include <array>
 
-#include "wpi/hardware/bus/I2C.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/hardware/bus/I2C.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a sample program demonstrating how to communicate to a light
diff --git a/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp
index 33f71241e6..db5c5e732b 100644
--- a/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/IntermediateVision/cpp/Robot.cpp
@@ -5,11 +5,11 @@
 #include <cstdio>
 #include <thread>
 
-#include "wpi/cameraserver/CameraServer.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
 #include <opencv2/core/core.hpp>
 #include <opencv2/core/types.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
+#include <wpi/cameraserver/CameraServer.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a demo program showing the use of OpenCV to do vision processing. The
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Drivetrain.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Drivetrain.cpp
index 0d9e2a5967..6d5d7ffd88 100644
--- a/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Drivetrain.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Drivetrain.cpp
@@ -4,7 +4,7 @@
 
 #include "Drivetrain.hpp"
 
-#include "wpi/math/kinematics/ChassisSpeeds.hpp"
+#include <wpi/math/kinematics/ChassisSpeeds.hpp>
 
 frc::MecanumDriveWheelSpeeds Drivetrain::GetCurrentState() const {
   return {units::meters_per_second_t{m_frontLeftEncoder.GetRate()},
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp
index b506b67274..dd29ae5889 100644
--- a/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/MecanumBot/cpp/Robot.cpp
@@ -2,9 +2,9 @@
 // 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 "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/filter/SlewRateLimiter.hpp"
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/math/filter/SlewRateLimiter.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumBot/include/Drivetrain.hpp b/wpilibcExamples/src/main/cpp/examples/MecanumBot/include/Drivetrain.hpp
index 810a0082a5..c6c2f7aa89 100644
--- a/wpilibcExamples/src/main/cpp/examples/MecanumBot/include/Drivetrain.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/MecanumBot/include/Drivetrain.hpp
@@ -6,15 +6,15 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/math/geometry/Translation2d.hpp"
-#include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
-#include "wpi/math/kinematics/MecanumDriveOdometry.hpp"
-#include "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/geometry/Translation2d.hpp>
+#include <wpi/math/kinematics/MecanumDriveKinematics.hpp>
+#include <wpi/math/kinematics/MecanumDriveOdometry.hpp>
+#include <wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp>
 
 /**
  * Represents a mecanum drive style drivetrain.
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp
index e3b570dd88..7d802193e4 100644
--- a/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/MecanumDrive/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/drive/MecanumDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/drive/MecanumDrive.hpp>
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a demo program showing how to use Mecanum control with the
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Drivetrain.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Drivetrain.cpp
index a0ff227487..75d69618e5 100644
--- a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Drivetrain.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Drivetrain.cpp
@@ -4,7 +4,7 @@
 
 #include "Drivetrain.hpp"
 
-#include "wpi/system/Timer.hpp"
+#include <wpi/system/Timer.hpp>
 
 #include "ExampleGlobalMeasurementSensor.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp
index b506b67274..dd29ae5889 100644
--- a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/cpp/Robot.cpp
@@ -2,9 +2,9 @@
 // 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 "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/filter/SlewRateLimiter.hpp"
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/math/filter/SlewRateLimiter.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/Drivetrain.hpp b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/Drivetrain.hpp
index 2f3177d717..c94027326d 100644
--- a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/Drivetrain.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/Drivetrain.hpp
@@ -6,16 +6,16 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/math/estimator/MecanumDrivePoseEstimator.hpp"
-#include "wpi/math/geometry/Translation2d.hpp"
-#include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
-#include "wpi/math/kinematics/MecanumDriveOdometry.hpp"
-#include "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/estimator/MecanumDrivePoseEstimator.hpp>
+#include <wpi/math/geometry/Translation2d.hpp>
+#include <wpi/math/kinematics/MecanumDriveKinematics.hpp>
+#include <wpi/math/kinematics/MecanumDriveOdometry.hpp>
+#include <wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp>
 
 /**
  * Represents a mecanum drive style drivetrain.
diff --git a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
index e62c125943..d4f9b4e52f 100644
--- a/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/MecanumDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/math/geometry/Pose2d.hpp"
+#include <wpi/math/geometry/Pose2d.hpp>
+#include <wpi/math/util/StateSpaceUtil.hpp>
 
 /**
  * This dummy class represents a global measurement sensor, such as a computer
diff --git a/wpilibcExamples/src/main/cpp/examples/Mechanism2d/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Mechanism2d/cpp/Robot.cpp
index 1c56fba1b1..7d06b68678 100644
--- a/wpilibcExamples/src/main/cpp/examples/Mechanism2d/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Mechanism2d/cpp/Robot.cpp
@@ -2,18 +2,18 @@
 // 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 "wpi/hardware/rotation/AnalogPotentiometer.hpp"
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/simulation/SimHooks.hpp"
-#include "wpi/smartdashboard/Mechanism2d.hpp"
-#include "wpi/smartdashboard/MechanismLigament2d.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/util/Color.hpp"
-#include "wpi/util/Color8Bit.hpp"
-#include "wpi/units/angle.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/AnalogPotentiometer.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/simulation/SimHooks.hpp>
+#include <wpi/smartdashboard/Mechanism2d.hpp>
+#include <wpi/smartdashboard/MechanismLigament2d.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/util/Color.hpp>
+#include <wpi/util/Color8Bit.hpp>
 
 /**
  * This sample program shows how to use Mechanism2d - a visual representation of
diff --git a/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp
index 437038bca4..149681af48 100644
--- a/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/MotorControl/cpp/Robot.cpp
@@ -4,11 +4,11 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 /**
  * This sample program shows how to control a motor using a joystick. In the
diff --git a/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.hpp
index 108903e489..6d1bab4d76 100644
--- a/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/PotentiometerPID/include/Robot.hpp
@@ -6,12 +6,12 @@
 
 #include <array>
 
-#include "wpi/hardware/rotation/AnalogPotentiometer.hpp"
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/AnalogPotentiometer.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/length.hpp>
 
 /**
  * This is a sample program to demonstrate how to use a soft potentiometer and a
diff --git a/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp
index 822f2f4db5..34447b0838 100644
--- a/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/QuickVision/cpp/Robot.cpp
@@ -4,8 +4,8 @@
 
 #include <cstdio>
 
-#include "wpi/cameraserver/CameraServer.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/cameraserver/CameraServer.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * Uses the CameraServer class to automatically capture video from a USB webcam
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/RapidReactCommandBot.cpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/RapidReactCommandBot.cpp
index 087f036f59..baf2a58586 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/RapidReactCommandBot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/RapidReactCommandBot.cpp
@@ -4,9 +4,9 @@
 
 #include "RapidReactCommandBot.hpp"
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/Commands.hpp"
-#include "wpi/commands2/button/Trigger.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/Commands.hpp>
+#include <wpi/commands2/button/Trigger.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/subsystems/Drive.cpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/subsystems/Drive.cpp
index 17107ff5cb..1c4beb469b 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/subsystems/Drive.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/subsystems/Drive.cpp
@@ -6,8 +6,8 @@
 
 #include <utility>
 
-#include "wpi/system/RobotController.hpp"
-#include "wpi/commands2/Commands.hpp"
+#include <wpi/commands2/Commands.hpp>
+#include <wpi/system/RobotController.hpp>
 
 Drive::Drive() {
   wpi::SendableRegistry::AddChild(&m_drive, &m_leftLeader);
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/subsystems/Shooter.cpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/subsystems/Shooter.cpp
index 3d384d436f..8f5d0ac648 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/subsystems/Shooter.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/cpp/subsystems/Shooter.cpp
@@ -4,7 +4,7 @@
 
 #include "subsystems/Shooter.hpp"
 
-#include "wpi/commands2/Commands.hpp"
+#include <wpi/commands2/Commands.hpp>
 
 Shooter::Shooter() {
   m_shooterFeedback.SetTolerance(ShooterConstants::kShooterTolerance.value());
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Constants.hpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Constants.hpp
index 7c026f84d5..1639e36aba 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Constants.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Constants.hpp
@@ -6,11 +6,11 @@
 
 #include <numbers>
 
-#include "wpi/units/angle.hpp"
-#include "wpi/units/angular_velocity.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/units/angle.hpp>
+#include <wpi/units/angular_velocity.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/voltage.hpp>
 
 namespace DriveConstants {
 inline constexpr int kLeftMotor1Port = 0;
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/RapidReactCommandBot.hpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/RapidReactCommandBot.hpp
index 9f70a9fe42..ee40f47131 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/RapidReactCommandBot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/RapidReactCommandBot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/button/CommandXboxController.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/button/CommandXboxController.hpp>
 
 #include "Constants.hpp"
 #include "subsystems/Drive.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.hpp
index ee585859b3..00b67e52e1 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/Robot.hpp
@@ -6,8 +6,8 @@
 
 #include <optional>
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "RapidReactCommandBot.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Drive.hpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Drive.hpp
index 389aa1b621..332d084c76 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Drive.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Drive.hpp
@@ -6,16 +6,16 @@
 
 #include <functional>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/math/controller/ProfiledPIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/ProfiledPIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/length.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Intake.hpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Intake.hpp
index a91a099c1c..0b460db465 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Intake.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Intake.hpp
@@ -6,10 +6,10 @@
 
 #include <functional>
 
-#include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/pneumatic/DoubleSolenoid.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Pneumatics.hpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Pneumatics.hpp
index 9806a3fcc5..c97c61b15d 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Pneumatics.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Pneumatics.hpp
@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "wpi/hardware/rotation/AnalogPotentiometer.hpp"
-#include "wpi/hardware/pneumatic/Compressor.hpp"
-#include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
-#include "wpi/units/pressure.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/hardware/pneumatic/Compressor.hpp>
+#include <wpi/hardware/pneumatic/PneumaticsControlModule.hpp>
+#include <wpi/hardware/rotation/AnalogPotentiometer.hpp>
+#include <wpi/units/pressure.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Shooter.hpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Shooter.hpp
index 29136e84ae..992a8c65a7 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Shooter.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Shooter.hpp
@@ -6,14 +6,14 @@
 
 #include <functional>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/angular_velocity.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/angular_velocity.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Storage.hpp b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Storage.hpp
index cbd3d95698..f29d53f38d 100644
--- a/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Storage.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RapidReactCommandBot/include/subsystems/Storage.hpp
@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include "wpi/hardware/discrete/DigitalInput.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
-#include "wpi/commands2/button/Trigger.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/commands2/button/Trigger.hpp>
+#include <wpi/hardware/discrete/DigitalInput.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/Robot.cpp
index 7d8a762694..534158dc96 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/Robot.cpp
@@ -4,7 +4,7 @@
 
 #include "Robot.hpp"
 
-#include "wpi/commands2/CommandScheduler.hpp"
+#include <wpi/commands2/CommandScheduler.hpp>
 
 Robot::Robot() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/RobotContainer.cpp
index f3f97f4f33..d191e2cb7b 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/RobotContainer.cpp
@@ -4,8 +4,8 @@
 
 #include "RobotContainer.hpp"
 
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/commands2/Commands.hpp"
+#include <wpi/commands2/Commands.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 #include "commands/TeleopArcadeDrive.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/commands/DriveDistance.cpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/commands/DriveDistance.cpp
index e8c6be3733..ae9499479f 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/commands/DriveDistance.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/commands/DriveDistance.cpp
@@ -4,7 +4,7 @@
 
 #include "commands/DriveDistance.hpp"
 
-#include "wpi/units/math.hpp"
+#include <wpi/units/math.hpp>
 
 void DriveDistance::Initialize() {
   m_drive->ArcadeDrive(0, 0);
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/commands/TurnDegrees.cpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/commands/TurnDegrees.cpp
index 9d75a6a4a2..94b3fea060 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/commands/TurnDegrees.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/cpp/commands/TurnDegrees.cpp
@@ -6,7 +6,7 @@
 
 #include <numbers>
 
-#include "wpi/units/math.hpp"
+#include <wpi/units/math.hpp>
 
 void TurnDegrees::Initialize() {
   // Set motors to stop, read encoder values for starting point
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.hpp
index 3f4fb2d2a5..b89d567b62 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/Robot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/commands2/Command.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "RobotContainer.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/RobotContainer.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/RobotContainer.hpp
index 9b2f898808..e7a30a9613 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/RobotContainer.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/RobotContainer.hpp
@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/romi/OnBoardIO.hpp"
-#include "wpi/smartdashboard/SendableChooser.hpp"
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/button/Trigger.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/button/Trigger.hpp>
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/romi/OnBoardIO.hpp>
+#include <wpi/smartdashboard/SendableChooser.hpp>
 
 #include "Constants.hpp"
 #include "commands/AutonomousDistance.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousDistance.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousDistance.hpp
index b54ddac2f5..227f0924de 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousDistance.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousDistance.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/commands2/SequentialCommandGroup.hpp"
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/commands2/SequentialCommandGroup.hpp>
 
 #include "commands/DriveDistance.hpp"
 #include "commands/TurnDegrees.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousTime.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousTime.hpp
index 65c9c648f7..31cc56df0c 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousTime.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/AutonomousTime.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/commands2/SequentialCommandGroup.hpp"
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/commands2/SequentialCommandGroup.hpp>
 
 #include "commands/DriveTime.hpp"
 #include "commands/TurnTime.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveDistance.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveDistance.hpp
index b9bb3c908b..3b6abf364f 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveDistance.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveDistance.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/units/length.hpp>
 
 #include "subsystems/Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveTime.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveTime.hpp
index 4490229846..e8983b5acf 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveTime.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/DriveTime.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/system/Timer.hpp"
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/units/time.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/system/Timer.hpp>
+#include <wpi/units/time.hpp>
 
 #include "subsystems/Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TeleopArcadeDrive.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TeleopArcadeDrive.hpp
index 9209e0491f..f4682d6299 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TeleopArcadeDrive.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TeleopArcadeDrive.hpp
@@ -6,8 +6,8 @@
 
 #include <functional>
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
 
 #include "subsystems/Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnDegrees.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnDegrees.hpp
index 7dd4518fce..2dd2b4cf86 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnDegrees.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnDegrees.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/length.hpp>
 
 #include "subsystems/Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnTime.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnTime.hpp
index 36f9d009a8..3a2b4fc33f 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnTime.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/commands/TurnTime.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/system/Timer.hpp"
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/units/time.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/system/Timer.hpp>
+#include <wpi/units/time.hpp>
 
 #include "subsystems/Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/subsystems/Drivetrain.hpp b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/subsystems/Drivetrain.hpp
index d2453c213e..67453f4f8f 100644
--- a/wpilibcExamples/src/main/cpp/examples/RomiReference/include/subsystems/Drivetrain.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/RomiReference/include/subsystems/Drivetrain.hpp
@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/Spark.hpp"
-#include "wpi/romi/RomiGyro.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/hardware/motor/Spark.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/romi/RomiGyro.hpp>
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/length.hpp>
 
 class Drivetrain : public frc2::SubsystemBase {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/Robot.cpp
index 91d1c4a2d8..36079cc8e9 100644
--- a/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/Robot.cpp
@@ -4,8 +4,8 @@
 
 #include "Robot.hpp"
 
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/commands2/CommandScheduler.hpp"
+#include <wpi/commands2/CommandScheduler.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 Robot::Robot() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/RobotContainer.cpp
index e8b1aab104..70bab22b3c 100644
--- a/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/RobotContainer.cpp
@@ -4,7 +4,7 @@
 
 #include "RobotContainer.hpp"
 
-#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 RobotContainer::RobotContainer() {
   // Initialize all of your commands and subsystems here
diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.hpp
index fe9d7335c9..7a9d5e7e42 100644
--- a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/commands2/Command.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "RobotContainer.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/RobotContainer.hpp b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/RobotContainer.hpp
index c239ab6fbd..f594b09ae1 100644
--- a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/RobotContainer.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/RobotContainer.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/smartdashboard/SendableChooser.hpp"
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/Commands.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/Commands.hpp>
+#include <wpi/smartdashboard/SendableChooser.hpp>
 
 /**
  * This class is where the bulk of the robot should be declared.  Since
diff --git a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Drivetrain.cpp b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Drivetrain.cpp
index b3b84d6b48..33b5bbfc23 100644
--- a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Drivetrain.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Drivetrain.cpp
@@ -4,7 +4,7 @@
 
 #include "Drivetrain.hpp"
 
-#include "wpi/system/RobotController.hpp"
+#include <wpi/system/RobotController.hpp>
 
 void Drivetrain::SetSpeeds(const frc::DifferentialDriveWheelSpeeds& speeds) {
   auto leftFeedforward = m_feedforward.Calculate(speeds.left);
diff --git a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp
index c39a9810ca..cdf131f3c4 100644
--- a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/cpp/Robot.cpp
@@ -2,12 +2,12 @@
 // 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 "wpi/opmode/TimedRobot.hpp"
-#include "wpi/system/Timer.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/controller/LTVUnicycleController.hpp"
-#include "wpi/math/filter/SlewRateLimiter.hpp"
-#include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/math/controller/LTVUnicycleController.hpp>
+#include <wpi/math/filter/SlewRateLimiter.hpp>
+#include <wpi/math/trajectory/TrajectoryGenerator.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/system/Timer.hpp>
 
 #include "Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/include/Drivetrain.hpp b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/include/Drivetrain.hpp
index cdb919407a..c0767524fe 100644
--- a/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/include/Drivetrain.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SimpleDifferentialDriveSimulation/include/Drivetrain.hpp
@@ -6,22 +6,22 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
-#include "wpi/math/kinematics/DifferentialDriveOdometry.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/simulation/DifferentialDrivetrainSim.hpp"
-#include "wpi/simulation/EncoderSim.hpp"
-#include "wpi/smartdashboard/Field2d.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/math/system/plant/LinearSystemId.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/angular_velocity.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/velocity.hpp"
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/kinematics/DifferentialDriveKinematics.hpp>
+#include <wpi/math/kinematics/DifferentialDriveOdometry.hpp>
+#include <wpi/math/system/plant/LinearSystemId.hpp>
+#include <wpi/simulation/DifferentialDrivetrainSim.hpp>
+#include <wpi/simulation/EncoderSim.hpp>
+#include <wpi/smartdashboard/Field2d.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/angular_velocity.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/velocity.hpp>
 
 /**
  * Represents a differential drive style drivetrain.
diff --git a/wpilibcExamples/src/main/cpp/examples/Solenoid/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Solenoid/cpp/Robot.cpp
index 1bf08db973..0d33e6fc44 100644
--- a/wpilibcExamples/src/main/cpp/examples/Solenoid/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Solenoid/cpp/Robot.cpp
@@ -4,8 +4,8 @@
 
 #include "Robot.hpp"
 
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/units/pressure.hpp"
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/units/pressure.hpp>
 
 Robot::Robot() {
   // Publish elements to shuffleboard.
diff --git a/wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.hpp
index c5f9b7cfb3..d72be2d7be 100644
--- a/wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/Solenoid/include/Robot.hpp
@@ -4,13 +4,13 @@
 
 #pragma once
 
-#include "wpi/hardware/rotation/AnalogPotentiometer.hpp"
-#include "wpi/hardware/pneumatic/Compressor.hpp"
-#include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
-#include "wpi/hardware/pneumatic/Solenoid.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/pneumatic/Compressor.hpp>
+#include <wpi/hardware/pneumatic/DoubleSolenoid.hpp>
+#include <wpi/hardware/pneumatic/PneumaticsControlModule.hpp>
+#include <wpi/hardware/pneumatic/Solenoid.hpp>
+#include <wpi/hardware/rotation/AnalogPotentiometer.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a sample program showing the use of the solenoid classes during
diff --git a/wpilibcExamples/src/main/cpp/examples/StateSpaceArm/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/StateSpaceArm/cpp/Robot.cpp
index 5774fbc69d..bacaf7a575 100644
--- a/wpilibcExamples/src/main/cpp/examples/StateSpaceArm/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/StateSpaceArm/cpp/Robot.cpp
@@ -4,19 +4,19 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/controller/LinearQuadraticRegulator.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/math/estimator/KalmanFilter.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/math/system/LinearSystemLoop.hpp"
-#include "wpi/math/system/plant/DCMotor.hpp"
-#include "wpi/math/system/plant/LinearSystemId.hpp"
-#include "wpi/math/trajectory/TrapezoidProfile.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/moment_of_inertia.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/LinearQuadraticRegulator.hpp>
+#include <wpi/math/estimator/KalmanFilter.hpp>
+#include <wpi/math/system/LinearSystemLoop.hpp>
+#include <wpi/math/system/plant/DCMotor.hpp>
+#include <wpi/math/system/plant/LinearSystemId.hpp>
+#include <wpi/math/trajectory/TrapezoidProfile.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/moment_of_inertia.hpp>
 
 /**
  * This is a sample program to demonstrate how to use a state-space controller
diff --git a/wpilibcExamples/src/main/cpp/examples/StateSpaceElevator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/StateSpaceElevator/cpp/Robot.cpp
index 485ed4a0d2..cafca88950 100644
--- a/wpilibcExamples/src/main/cpp/examples/StateSpaceElevator/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/StateSpaceElevator/cpp/Robot.cpp
@@ -4,21 +4,21 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/controller/LinearQuadraticRegulator.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/math/estimator/KalmanFilter.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/math/system/LinearSystemLoop.hpp"
-#include "wpi/math/system/plant/DCMotor.hpp"
-#include "wpi/math/system/plant/LinearSystemId.hpp"
-#include "wpi/math/trajectory/TrapezoidProfile.hpp"
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/mass.hpp"
-#include "wpi/units/velocity.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/LinearQuadraticRegulator.hpp>
+#include <wpi/math/estimator/KalmanFilter.hpp>
+#include <wpi/math/system/LinearSystemLoop.hpp>
+#include <wpi/math/system/plant/DCMotor.hpp>
+#include <wpi/math/system/plant/LinearSystemId.hpp>
+#include <wpi/math/trajectory/TrapezoidProfile.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/mass.hpp>
+#include <wpi/units/velocity.hpp>
 
 /**
  * This is a sample program to demonstrate how to use a state-space controller
diff --git a/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheel/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheel/cpp/Robot.cpp
index e48385a226..c4bab2cb24 100644
--- a/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheel/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheel/cpp/Robot.cpp
@@ -4,18 +4,18 @@
 
 #include <numbers>
 
-#include "wpi/driverstation/DriverStation.hpp"
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/controller/LinearQuadraticRegulator.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/math/estimator/KalmanFilter.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/math/system/LinearSystemLoop.hpp"
-#include "wpi/math/system/plant/DCMotor.hpp"
-#include "wpi/math/system/plant/LinearSystemId.hpp"
-#include "wpi/units/angular_velocity.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/driverstation/DriverStation.hpp>
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/LinearQuadraticRegulator.hpp>
+#include <wpi/math/estimator/KalmanFilter.hpp>
+#include <wpi/math/system/LinearSystemLoop.hpp>
+#include <wpi/math/system/plant/DCMotor.hpp>
+#include <wpi/math/system/plant/LinearSystemId.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/angular_velocity.hpp>
 
 /**
  * This is a sample program to demonstrate how to use a state-space controller
diff --git a/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheelSysId/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheelSysId/cpp/Robot.cpp
index e76da074dd..17af787545 100644
--- a/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheelSysId/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/StateSpaceFlywheelSysId/cpp/Robot.cpp
@@ -4,17 +4,17 @@
 
 #include <numbers>
 
-#include "wpi/driverstation/DriverStation.hpp"
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/controller/LinearQuadraticRegulator.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/math/estimator/KalmanFilter.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/math/system/LinearSystemLoop.hpp"
-#include "wpi/math/system/plant/DCMotor.hpp"
-#include "wpi/math/system/plant/LinearSystemId.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/driverstation/DriverStation.hpp>
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/LinearQuadraticRegulator.hpp>
+#include <wpi/math/estimator/KalmanFilter.hpp>
+#include <wpi/math/system/LinearSystemLoop.hpp>
+#include <wpi/math/system/plant/DCMotor.hpp>
+#include <wpi/math/system/plant/LinearSystemId.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a sample program to demonstrate how to use a state-space controller
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp
index 09c588f2a7..e50c6681d5 100644
--- a/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/math/util/MathUtil.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/filter/SlewRateLimiter.hpp"
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/math/filter/SlewRateLimiter.hpp>
+#include <wpi/math/util/MathUtil.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/SwerveModule.cpp b/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/SwerveModule.cpp
index 6f4232a5a4..7b8ecc19fe 100644
--- a/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/SwerveModule.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SwerveBot/cpp/SwerveModule.cpp
@@ -6,7 +6,7 @@
 
 #include <numbers>
 
-#include "wpi/math/geometry/Rotation2d.hpp"
+#include <wpi/math/geometry/Rotation2d.hpp>
 
 SwerveModule::SwerveModule(const int driveMotorChannel,
                            const int turningMotorChannel,
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/Drivetrain.hpp b/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/Drivetrain.hpp
index 7d5293b898..2b7860eb84 100644
--- a/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/Drivetrain.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/Drivetrain.hpp
@@ -6,10 +6,10 @@
 
 #include <numbers>
 
-#include "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/math/geometry/Translation2d.hpp"
-#include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
-#include "wpi/math/kinematics/SwerveDriveOdometry.hpp"
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/math/geometry/Translation2d.hpp>
+#include <wpi/math/kinematics/SwerveDriveKinematics.hpp>
+#include <wpi/math/kinematics/SwerveDriveOdometry.hpp>
 
 #include "SwerveModule.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/SwerveModule.hpp b/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/SwerveModule.hpp
index 2bf25188c7..79fb5eae3a 100644
--- a/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/SwerveModule.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SwerveBot/include/SwerveModule.hpp
@@ -6,17 +6,17 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/ProfiledPIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/math/kinematics/SwerveModulePosition.hpp"
-#include "wpi/math/kinematics/SwerveModuleState.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/units/angular_velocity.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/velocity.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/ProfiledPIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/kinematics/SwerveModulePosition.hpp>
+#include <wpi/math/kinematics/SwerveModuleState.hpp>
+#include <wpi/units/angular_velocity.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/velocity.hpp>
+#include <wpi/units/voltage.hpp>
 
 class SwerveModule {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Drivetrain.cpp b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Drivetrain.cpp
index e718e7389c..f75f86a8d2 100644
--- a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Drivetrain.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Drivetrain.cpp
@@ -4,7 +4,7 @@
 
 #include "Drivetrain.hpp"
 
-#include "wpi/system/Timer.hpp"
+#include <wpi/system/Timer.hpp>
 
 #include "ExampleGlobalMeasurementSensor.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp
index 396c977758..4382b8ef17 100644
--- a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/Robot.cpp
@@ -2,9 +2,9 @@
 // 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 "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/math/filter/SlewRateLimiter.hpp"
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/math/filter/SlewRateLimiter.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/SwerveModule.cpp b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/SwerveModule.cpp
index 488ce0654b..408295180f 100644
--- a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/SwerveModule.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/cpp/SwerveModule.cpp
@@ -6,7 +6,7 @@
 
 #include <numbers>
 
-#include "wpi/math/geometry/Rotation2d.hpp"
+#include <wpi/math/geometry/Rotation2d.hpp>
 
 SwerveModule::SwerveModule(const int driveMotorChannel,
                            const int turningMotorChannel,
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/Drivetrain.hpp b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/Drivetrain.hpp
index 005adb21cd..6a8d900b0d 100644
--- a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/Drivetrain.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/Drivetrain.hpp
@@ -6,11 +6,11 @@
 
 #include <numbers>
 
-#include "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/math/estimator/SwerveDrivePoseEstimator.hpp"
-#include "wpi/math/geometry/Translation2d.hpp"
-#include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
-#include "wpi/math/kinematics/SwerveDriveOdometry.hpp"
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/math/estimator/SwerveDrivePoseEstimator.hpp>
+#include <wpi/math/geometry/Translation2d.hpp>
+#include <wpi/math/kinematics/SwerveDriveKinematics.hpp>
+#include <wpi/math/kinematics/SwerveDriveOdometry.hpp>
 
 #include "SwerveModule.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
index e62c125943..d4f9b4e52f 100644
--- a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/ExampleGlobalMeasurementSensor.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/math/geometry/Pose2d.hpp"
+#include <wpi/math/geometry/Pose2d.hpp>
+#include <wpi/math/util/StateSpaceUtil.hpp>
 
 /**
  * This dummy class represents a global measurement sensor, such as a computer
diff --git a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/SwerveModule.hpp b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/SwerveModule.hpp
index eef6db3775..044c8b4f0e 100644
--- a/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/SwerveModule.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SwerveDrivePoseEstimator/include/SwerveModule.hpp
@@ -6,17 +6,17 @@
 
 #include <numbers>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/ProfiledPIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/math/kinematics/SwerveModulePosition.hpp"
-#include "wpi/math/kinematics/SwerveModuleState.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/units/angular_velocity.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/velocity.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/ProfiledPIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/math/kinematics/SwerveModulePosition.hpp>
+#include <wpi/math/kinematics/SwerveModuleState.hpp>
+#include <wpi/units/angular_velocity.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/velocity.hpp>
+#include <wpi/units/voltage.hpp>
 
 class SwerveModule {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/Robot.cpp
index a430c3a632..9b66f55e3d 100644
--- a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/Robot.cpp
@@ -4,7 +4,7 @@
 
 #include "Robot.hpp"
 
-#include "wpi/commands2/CommandScheduler.hpp"
+#include <wpi/commands2/CommandScheduler.hpp>
 
 Robot::Robot() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/SysIdRoutineBot.cpp b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/SysIdRoutineBot.cpp
index 74b5a888f9..83f5444991 100644
--- a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/SysIdRoutineBot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/SysIdRoutineBot.cpp
@@ -4,7 +4,7 @@
 
 #include "SysIdRoutineBot.hpp"
 
-#include "wpi/commands2/Commands.hpp"
+#include <wpi/commands2/Commands.hpp>
 
 SysIdRoutineBot::SysIdRoutineBot() {
   ConfigureBindings();
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/subsystems/Drive.cpp b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/subsystems/Drive.cpp
index bbc7d24dbc..94fde5eb2d 100644
--- a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/subsystems/Drive.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/subsystems/Drive.cpp
@@ -4,7 +4,7 @@
 
 #include "subsystems/Drive.hpp"
 
-#include "wpi/commands2/Commands.hpp"
+#include <wpi/commands2/Commands.hpp>
 
 Drive::Drive() {
   m_leftMotor.AddFollower(frc::PWMSparkMax{constants::drive::kLeftMotor2Port});
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/subsystems/Shooter.cpp b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/subsystems/Shooter.cpp
index d294c8d05b..fb0a2d8fa6 100644
--- a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/subsystems/Shooter.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/cpp/subsystems/Shooter.cpp
@@ -4,9 +4,9 @@
 
 #include "subsystems/Shooter.hpp"
 
-#include "wpi/commands2/Commands.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/commands2/Commands.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/voltage.hpp>
 
 Shooter::Shooter() {
   m_shooterEncoder.SetDistancePerPulse(
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Constants.hpp b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Constants.hpp
index a2022f9394..51c6058fe1 100644
--- a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Constants.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Constants.hpp
@@ -7,12 +7,12 @@
 #include <array>
 #include <numbers>
 
-#include "wpi/units/angle.hpp"
-#include "wpi/units/angular_acceleration.hpp"
-#include "wpi/units/angular_velocity.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/units/angle.hpp>
+#include <wpi/units/angular_acceleration.hpp>
+#include <wpi/units/angular_velocity.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/units/voltage.hpp>
 
 namespace constants {
 namespace drive {
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.hpp
index fd5ff5c562..e7ff10a265 100644
--- a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/Robot.hpp
@@ -6,8 +6,8 @@
 
 #include <optional>
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "SysIdRoutineBot.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/SysIdRoutineBot.hpp b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/SysIdRoutineBot.hpp
index f990ed814a..dd8f994ffb 100644
--- a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/SysIdRoutineBot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/SysIdRoutineBot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/button/CommandXboxController.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/button/CommandXboxController.hpp>
 
 #include "Constants.hpp"
 #include "subsystems/Drive.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Drive.hpp b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Drive.hpp
index 4b8280c237..164bcfef04 100644
--- a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Drive.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Drive.hpp
@@ -6,12 +6,12 @@
 
 #include <functional>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/system/RobotController.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
-#include "wpi/commands2/sysid/SysIdRoutine.hpp"
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/commands2/sysid/SysIdRoutine.hpp>
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/system/RobotController.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Shooter.hpp b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Shooter.hpp
index 1123d5953e..8041518a1a 100644
--- a/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Shooter.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/SysIdRoutine/include/subsystems/Shooter.hpp
@@ -6,13 +6,13 @@
 
 #include <functional>
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/system/RobotController.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
-#include "wpi/commands2/sysid/SysIdRoutine.hpp"
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/commands2/sysid/SysIdRoutine.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/PIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/system/RobotController.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/TankDrive/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/TankDrive/cpp/Robot.cpp
index f42edfd9df..a803c23494 100644
--- a/wpilibcExamples/src/main/cpp/examples/TankDrive/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/TankDrive/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a demo program showing the use of the DifferentialDrive class.
diff --git a/wpilibcExamples/src/main/cpp/examples/TankDriveXboxController/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/TankDriveXboxController/cpp/Robot.cpp
index 77139912d0..bf95821712 100644
--- a/wpilibcExamples/src/main/cpp/examples/TankDriveXboxController/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/TankDriveXboxController/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/opmode/TimedRobot.hpp"
-#include "wpi/driverstation/XboxController.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/driverstation/XboxController.hpp>
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * This is a demo program showing the use of the DifferentialDrive class.
diff --git a/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.hpp
index 8ef9a89789..e47864d3a5 100644
--- a/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/UnitTest/include/Robot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "Constants.hpp"
 #include "subsystems/Intake.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/UnitTest/include/subsystems/Intake.hpp b/wpilibcExamples/src/main/cpp/examples/UnitTest/include/subsystems/Intake.hpp
index b65b959a43..9305a51c6b 100644
--- a/wpilibcExamples/src/main/cpp/examples/UnitTest/include/subsystems/Intake.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/UnitTest/include/subsystems/Intake.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/pneumatic/DoubleSolenoid.hpp>
 
 #include "Constants.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/Robot.cpp
index 7d8a762694..534158dc96 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/Robot.cpp
@@ -4,7 +4,7 @@
 
 #include "Robot.hpp"
 
-#include "wpi/commands2/CommandScheduler.hpp"
+#include <wpi/commands2/CommandScheduler.hpp>
 
 Robot::Robot() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/RobotContainer.cpp
index dc98b37f9a..98965eecf2 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/RobotContainer.cpp
@@ -4,9 +4,9 @@
 
 #include "RobotContainer.hpp"
 
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/commands2/Commands.hpp"
-#include "wpi/commands2/button/JoystickButton.hpp"
+#include <wpi/commands2/Commands.hpp>
+#include <wpi/commands2/button/JoystickButton.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
 
 #include "commands/TeleopArcadeDrive.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/commands/DriveDistance.cpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/commands/DriveDistance.cpp
index e8c6be3733..ae9499479f 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/commands/DriveDistance.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/commands/DriveDistance.cpp
@@ -4,7 +4,7 @@
 
 #include "commands/DriveDistance.hpp"
 
-#include "wpi/units/math.hpp"
+#include <wpi/units/math.hpp>
 
 void DriveDistance::Initialize() {
   m_drive->ArcadeDrive(0, 0);
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/commands/TurnDegrees.cpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/commands/TurnDegrees.cpp
index d3e6356079..8b0f96e708 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/commands/TurnDegrees.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/cpp/commands/TurnDegrees.cpp
@@ -6,7 +6,7 @@
 
 #include <numbers>
 
-#include "wpi/units/math.hpp"
+#include <wpi/units/math.hpp>
 
 void TurnDegrees::Initialize() {
   // Set motors to stop, read encoder values for starting point
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.hpp
index 3f4fb2d2a5..b89d567b62 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/Robot.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/commands2/Command.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "RobotContainer.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/RobotContainer.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/RobotContainer.hpp
index 1636f3b6f3..4e45d6be82 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/RobotContainer.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/RobotContainer.hpp
@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/smartdashboard/SendableChooser.hpp"
-#include "wpi/xrp/XRPOnBoardIO.hpp"
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/button/Trigger.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/button/Trigger.hpp>
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/smartdashboard/SendableChooser.hpp>
+#include <wpi/xrp/XRPOnBoardIO.hpp>
 
 #include "Constants.hpp"
 #include "commands/AutonomousDistance.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousDistance.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousDistance.hpp
index b54ddac2f5..227f0924de 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousDistance.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousDistance.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/commands2/SequentialCommandGroup.hpp"
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/commands2/SequentialCommandGroup.hpp>
 
 #include "commands/DriveDistance.hpp"
 #include "commands/TurnDegrees.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousTime.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousTime.hpp
index 65c9c648f7..31cc56df0c 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousTime.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/AutonomousTime.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/commands2/SequentialCommandGroup.hpp"
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/commands2/SequentialCommandGroup.hpp>
 
 #include "commands/DriveTime.hpp"
 #include "commands/TurnTime.hpp"
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveDistance.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveDistance.hpp
index b9bb3c908b..3b6abf364f 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveDistance.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveDistance.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/units/length.hpp>
 
 #include "subsystems/Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveTime.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveTime.hpp
index 4490229846..e8983b5acf 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveTime.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/DriveTime.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/system/Timer.hpp"
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/units/time.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/system/Timer.hpp>
+#include <wpi/units/time.hpp>
 
 #include "subsystems/Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TeleopArcadeDrive.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TeleopArcadeDrive.hpp
index 9209e0491f..f4682d6299 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TeleopArcadeDrive.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TeleopArcadeDrive.hpp
@@ -6,8 +6,8 @@
 
 #include <functional>
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
 
 #include "subsystems/Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnDegrees.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnDegrees.hpp
index f7e61c6395..75fd83a885 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnDegrees.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnDegrees.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/length.hpp>
 
 #include "subsystems/Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnTime.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnTime.hpp
index 36f9d009a8..3a2b4fc33f 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnTime.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/commands/TurnTime.hpp
@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include "wpi/system/Timer.hpp"
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
-#include "wpi/units/time.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
+#include <wpi/system/Timer.hpp>
+#include <wpi/units/time.hpp>
 
 #include "subsystems/Drivetrain.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Arm.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Arm.hpp
index 2dc0e57f18..22c30451b2 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Arm.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Arm.hpp
@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "wpi/xrp/XRPServo.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
-#include "wpi/units/angle.hpp"
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/xrp/XRPServo.hpp>
 
 class Arm : public frc2::SubsystemBase {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Drivetrain.hpp b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Drivetrain.hpp
index 47f2a802c2..186b2eae79 100644
--- a/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Drivetrain.hpp
+++ b/wpilibcExamples/src/main/cpp/examples/XRPReference/include/subsystems/Drivetrain.hpp
@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/xrp/XRPGyro.hpp"
-#include "wpi/xrp/XRPMotor.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/units/length.hpp"
+#include <wpi/commands2/SubsystemBase.hpp>
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/angle.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/xrp/XRPGyro.hpp>
+#include <wpi/xrp/XRPMotor.hpp>
 
 class Drivetrain : public frc2::SubsystemBase {
  public:
diff --git a/wpilibcExamples/src/main/cpp/snippets/ADXLAccelerometers/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/ADXLAccelerometers/cpp/Robot.cpp
index f7e09d2a7f..9dc1b03872 100644
--- a/wpilibcExamples/src/main/cpp/snippets/ADXLAccelerometers/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/ADXLAccelerometers/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/hardware/accelerometer/ADXL345_I2C.hpp"
-#include "wpi/hardware/discrete/AnalogInput.hpp"
-#include "wpi/hardware/bus/I2C.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/hardware/accelerometer/ADXL345_I2C.hpp>
+#include <wpi/hardware/bus/I2C.hpp>
+#include <wpi/hardware/discrete/AnalogInput.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * ADXL346, 362 Accelerometer snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/AccelerometerCollision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AccelerometerCollision/cpp/Robot.cpp
index 124e986329..2aced8d66f 100644
--- a/wpilibcExamples/src/main/cpp/snippets/AccelerometerCollision/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/AccelerometerCollision/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/units/acceleration.hpp"
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/units/acceleration.hpp>
 
 /**
  * Collision detection snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/AccelerometerFilter/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AccelerometerFilter/cpp/Robot.cpp
index 5b3cf02d7b..a0c8c8bb50 100644
--- a/wpilibcExamples/src/main/cpp/snippets/AccelerometerFilter/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/AccelerometerFilter/cpp/Robot.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 "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/math/filter/LinearFilter.hpp"
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/units/acceleration.hpp"
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/math/filter/LinearFilter.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/units/acceleration.hpp>
 
 /**
  * Accelerometer filtering snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/AnalogAccelerometer/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AnalogAccelerometer/cpp/Robot.cpp
index 113a471867..8f0e7564d2 100644
--- a/wpilibcExamples/src/main/cpp/snippets/AnalogAccelerometer/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/AnalogAccelerometer/cpp/Robot.cpp
@@ -2,9 +2,9 @@
 // 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 "wpi/hardware/accelerometer/AnalogAccelerometer.hpp"
-#include "wpi/hardware/discrete/AnalogInput.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/hardware/accelerometer/AnalogAccelerometer.hpp>
+#include <wpi/hardware/discrete/AnalogInput.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * AnalogAccelerometer snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/AnalogEncoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AnalogEncoder/cpp/Robot.cpp
index 4ac7217f7b..2f78a7cd07 100644
--- a/wpilibcExamples/src/main/cpp/snippets/AnalogEncoder/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/AnalogEncoder/cpp/Robot.cpp
@@ -2,8 +2,8 @@
 // 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 "wpi/hardware/rotation/AnalogEncoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/hardware/rotation/AnalogEncoder.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * AnalogEncoder snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/AnalogInput/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AnalogInput/cpp/Robot.cpp
index c252511ed4..14f184e081 100644
--- a/wpilibcExamples/src/main/cpp/snippets/AnalogInput/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/AnalogInput/cpp/Robot.cpp
@@ -2,8 +2,8 @@
 // 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 "wpi/hardware/discrete/AnalogInput.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/hardware/discrete/AnalogInput.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * AnalogInput snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/AnalogPotentiometer/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/AnalogPotentiometer/cpp/Robot.cpp
index 036651e671..a2958e6a90 100644
--- a/wpilibcExamples/src/main/cpp/snippets/AnalogPotentiometer/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/AnalogPotentiometer/cpp/Robot.cpp
@@ -2,9 +2,9 @@
 // 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 "wpi/hardware/discrete/AnalogInput.hpp"
-#include "wpi/hardware/rotation/AnalogPotentiometer.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/hardware/discrete/AnalogInput.hpp>
+#include <wpi/hardware/rotation/AnalogPotentiometer.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * AnalogPotentiometer snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/DigitalInput/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/DigitalInput/cpp/Robot.cpp
index cb4429834c..14b35a7487 100644
--- a/wpilibcExamples/src/main/cpp/snippets/DigitalInput/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/DigitalInput/cpp/Robot.cpp
@@ -2,8 +2,8 @@
 // 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 "wpi/hardware/discrete/DigitalInput.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/hardware/discrete/DigitalInput.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * Digital Input snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/DutyCycleEncoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/DutyCycleEncoder/cpp/Robot.cpp
index f26f79e931..e31decd746 100644
--- a/wpilibcExamples/src/main/cpp/snippets/DutyCycleEncoder/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/DutyCycleEncoder/cpp/Robot.cpp
@@ -2,8 +2,8 @@
 // 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 "wpi/hardware/rotation/DutyCycleEncoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/hardware/rotation/DutyCycleEncoder.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * DutyCycleEncoder snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/Encoder/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/Encoder/cpp/Robot.cpp
index 4a2fd46d3e..c793391338 100644
--- a/wpilibcExamples/src/main/cpp/snippets/Encoder/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/Encoder/cpp/Robot.cpp
@@ -2,9 +2,9 @@
 // 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 "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/util/deprecated.hpp"
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/util/deprecated.hpp>
 
 /**
  * Encoder snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/EncoderDrive/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/EncoderDrive/cpp/Robot.cpp
index d54e97e858..beb66bcc12 100644
--- a/wpilibcExamples/src/main/cpp/snippets/EncoderDrive/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/EncoderDrive/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/drive/DifferentialDrive.hpp"
-#include "wpi/hardware/motor/Spark.hpp"
+#include <wpi/drive/DifferentialDrive.hpp>
+#include <wpi/hardware/motor/Spark.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * Encoder drive to distance snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/EncoderHoming/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/EncoderHoming/cpp/Robot.cpp
index 912f738f99..34b0510a3e 100644
--- a/wpilibcExamples/src/main/cpp/snippets/EncoderHoming/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/EncoderHoming/cpp/Robot.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/hardware/discrete/DigitalInput.hpp"
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/hardware/motor/Spark.hpp"
+#include <wpi/hardware/discrete/DigitalInput.hpp>
+#include <wpi/hardware/motor/Spark.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * Encoder mechanism homing snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/LimitSwitch/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/LimitSwitch/cpp/Robot.cpp
index 702d56df4a..66123dbb3f 100644
--- a/wpilibcExamples/src/main/cpp/snippets/LimitSwitch/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/LimitSwitch/cpp/Robot.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 "wpi/hardware/discrete/DigitalInput.hpp"
-#include "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/driverstation/Joystick.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/hardware/motor/PWMVictorSPX.hpp"
+#include <wpi/driverstation/Joystick.hpp>
+#include <wpi/hardware/discrete/DigitalInput.hpp>
+#include <wpi/hardware/motor/PWMVictorSPX.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 /**
  * Limit Switch snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/OnboardIMU/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/OnboardIMU/cpp/Robot.cpp
index e508b62d22..c46e8b72a1 100644
--- a/wpilibcExamples/src/main/cpp/snippets/OnboardIMU/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/OnboardIMU/cpp/Robot.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 "wpi/hardware/imu/OnboardIMU.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/math/geometry/Rotation2d.hpp"
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/angle.hpp"
+#include <wpi/hardware/imu/OnboardIMU.hpp>
+#include <wpi/math/geometry/Rotation2d.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/angle.hpp>
 
 /**
  * Onboard IMU snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/snippets/ProfiledPIDFeedforward/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/snippets/ProfiledPIDFeedforward/cpp/Robot.cpp
index 2f5ce8c5c7..d9015f9e15 100644
--- a/wpilibcExamples/src/main/cpp/snippets/ProfiledPIDFeedforward/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/snippets/ProfiledPIDFeedforward/cpp/Robot.cpp
@@ -2,15 +2,15 @@
 // 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 "wpi/hardware/rotation/Encoder.hpp"
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/math/controller/ProfiledPIDController.hpp"
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
-#include "wpi/hardware/motor/PWMSparkMax.hpp"
-#include "wpi/units/acceleration.hpp"
-#include "wpi/units/length.hpp"
-#include "wpi/units/velocity.hpp"
-#include "wpi/units/voltage.hpp"
+#include <wpi/hardware/motor/PWMSparkMax.hpp>
+#include <wpi/hardware/rotation/Encoder.hpp>
+#include <wpi/math/controller/ProfiledPIDController.hpp>
+#include <wpi/math/controller/SimpleMotorFeedforward.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/units/acceleration.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/velocity.hpp>
+#include <wpi/units/voltage.hpp>
 
 /**
  * ProfiledPIDController with feedforward snippets for frc-docs.
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
index 6c4a27d3de..91dbc4c72e 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
@@ -4,7 +4,7 @@
 
 #include "Robot.hpp"
 
-#include "wpi/commands2/CommandScheduler.hpp"
+#include <wpi/commands2/CommandScheduler.hpp>
 
 Robot::Robot() {}
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/RobotContainer.cpp
index dd3549f985..bd53e8b60b 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/RobotContainer.cpp
@@ -4,7 +4,7 @@
 
 #include "RobotContainer.hpp"
 
-#include "wpi/commands2/button/Trigger.hpp"
+#include <wpi/commands2/button/Trigger.hpp>
 
 #include "commands/Autos.hpp"
 #include "commands/ExampleCommand.hpp"
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/Autos.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/Autos.cpp
index 9064fe7e7c..59f5904b11 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/Autos.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/commands/Autos.cpp
@@ -4,7 +4,7 @@
 
 #include "commands/Autos.hpp"
 
-#include "wpi/commands2/Commands.hpp"
+#include <wpi/commands2/Commands.hpp>
 
 #include "commands/ExampleCommand.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp
index 54e6e21b38..31de7f348a 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.hpp
@@ -6,8 +6,8 @@
 
 #include <optional>
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "RobotContainer.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotContainer.hpp b/wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotContainer.hpp
index 0fe4978e5f..4b24ca59a1 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotContainer.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/RobotContainer.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/button/CommandXboxController.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/button/CommandXboxController.hpp>
 
 #include "Constants.hpp"
 #include "subsystems/ExampleSubsystem.hpp"
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/Autos.hpp b/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/Autos.hpp
index 2820c7e791..717284afe7 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/Autos.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/Autos.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandPtr.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
 
 #include "subsystems/ExampleSubsystem.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.hpp b/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.hpp
index a61359429a..85d72e3f68 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/commands/ExampleCommand.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/Command.hpp"
-#include "wpi/commands2/CommandHelper.hpp"
+#include <wpi/commands2/Command.hpp>
+#include <wpi/commands2/CommandHelper.hpp>
 
 #include "subsystems/ExampleSubsystem.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.hpp b/wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.hpp
index 7a7247f5d8..c13c4aedda 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/subsystems/ExampleSubsystem.hpp
@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandPtr.hpp"
-#include "wpi/commands2/SubsystemBase.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/commands2/SubsystemBase.hpp>
 
 class ExampleSubsystem : public frc2::SubsystemBase {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/Robot.cpp
index a430c3a632..9b66f55e3d 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/Robot.cpp
@@ -4,7 +4,7 @@
 
 #include "Robot.hpp"
 
-#include "wpi/commands2/CommandScheduler.hpp"
+#include <wpi/commands2/CommandScheduler.hpp>
 
 Robot::Robot() {}
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/RobotContainer.cpp
index 78c5562fbb..30616bb7c9 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/cpp/RobotContainer.cpp
@@ -4,7 +4,7 @@
 
 #include "RobotContainer.hpp"
 
-#include "wpi/commands2/Commands.hpp"
+#include <wpi/commands2/Commands.hpp>
 
 RobotContainer::RobotContainer() {
   ConfigureBindings();
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp
index edb0e78940..fcf8c8c81f 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/Robot.hpp
@@ -6,8 +6,8 @@
 
 #include <optional>
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/commands2/CommandPtr.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
+#include <wpi/opmode/TimedRobot.hpp>
 
 #include "RobotContainer.hpp"
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/RobotContainer.hpp b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/RobotContainer.hpp
index 24133ae39d..bb795a347c 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/RobotContainer.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbasedskeleton/include/RobotContainer.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "wpi/commands2/CommandPtr.hpp"
+#include <wpi/commands2/CommandPtr.hpp>
 
 class RobotContainer {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp
index b24fe33553..2f377a4032 100644
--- a/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/cpp/Robot.cpp
@@ -4,10 +4,10 @@
 
 #include "Robot.hpp"
 
-#include "wpi/driverstation/DriverStation.hpp"
-#include "wpi/internal/DriverStationModeThread.hpp"
-#include "wpi/hal/DriverStation.h"
-#include "wpi/nt/NetworkTable.hpp"
+#include <wpi/driverstation/DriverStation.hpp>
+#include <wpi/hal/DriverStation.h>
+#include <wpi/internal/DriverStationModeThread.hpp>
+#include <wpi/nt/NetworkTable.hpp>
 
 Robot::Robot() {}
 
diff --git a/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.hpp
index 34022cb2b4..7b8f1bad3f 100644
--- a/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/robotbaseskeleton/include/Robot.hpp
@@ -6,7 +6,7 @@
 
 #include <atomic>
 
-#include "wpi/opmode/RobotBase.hpp"
+#include <wpi/opmode/RobotBase.hpp>
 
 class Robot : public frc::RobotBase {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp
index 9adce1fdd6..a08a1cffd5 100644
--- a/wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/timed/cpp/Robot.cpp
@@ -4,8 +4,8 @@
 
 #include "Robot.hpp"
 
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/util/print.hpp"
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/util/print.hpp>
 
 Robot::Robot() {
   m_chooser.SetDefaultOption(kAutoNameDefault, kAutoNameDefault);
diff --git a/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.hpp
index 6c636b462e..39e5ca91dd 100644
--- a/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/timed/include/Robot.hpp
@@ -6,8 +6,8 @@
 
 #include <string>
 
-#include "wpi/opmode/TimedRobot.hpp"
-#include "wpi/smartdashboard/SendableChooser.hpp"
+#include <wpi/opmode/TimedRobot.hpp>
+#include <wpi/smartdashboard/SendableChooser.hpp>
 
 class Robot : public frc::TimedRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.hpp
index 8d6e4be70c..33a087e501 100644
--- a/wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/timedskeleton/include/Robot.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "wpi/opmode/TimedRobot.hpp"
+#include <wpi/opmode/TimedRobot.hpp>
 
 class Robot : public frc::TimedRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/timeslice/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/timeslice/cpp/Robot.cpp
index f265f4df9a..61300c9504 100644
--- a/wpilibcExamples/src/main/cpp/templates/timeslice/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/timeslice/cpp/Robot.cpp
@@ -4,8 +4,8 @@
 
 #include "Robot.hpp"
 
-#include "wpi/smartdashboard/SmartDashboard.hpp"
-#include "wpi/util/print.hpp"
+#include <wpi/smartdashboard/SmartDashboard.hpp>
+#include <wpi/util/print.hpp>
 
 // Run robot periodic() functions for 5 ms, and run controllers every 10 ms
 Robot::Robot() : frc::TimesliceRobot{5_ms, 10_ms} {
diff --git a/wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.hpp
index 25dd60c84b..f896468b13 100644
--- a/wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/timeslice/include/Robot.hpp
@@ -6,8 +6,8 @@
 
 #include <string>
 
-#include "wpi/opmode/TimesliceRobot.hpp"
-#include "wpi/smartdashboard/SendableChooser.hpp"
+#include <wpi/opmode/TimesliceRobot.hpp>
+#include <wpi/smartdashboard/SendableChooser.hpp>
 
 class Robot : public frc::TimesliceRobot {
  public:
diff --git a/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.hpp b/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.hpp
index 5577bf0035..bc3b7a2bae 100644
--- a/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.hpp
+++ b/wpilibcExamples/src/main/cpp/templates/timesliceskeleton/include/Robot.hpp
@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "wpi/opmode/TimesliceRobot.hpp"
+#include <wpi/opmode/TimesliceRobot.hpp>
 
 class Robot : public frc::TimesliceRobot {
  public:
diff --git a/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/ArmSimulationTest.cpp b/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/ArmSimulationTest.cpp
index 20cc3c1bc6..8fcbe076da 100644
--- a/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/ArmSimulationTest.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/ArmSimulationTest.cpp
@@ -5,15 +5,15 @@
 #include <string>
 #include <thread>
 
-#include "wpi/util/Preferences.hpp"
-#include "wpi/simulation/DriverStationSim.hpp"
-#include "wpi/simulation/JoystickSim.hpp"
-#include "wpi/simulation/PWMMotorControllerSim.hpp"
-#include "wpi/simulation/SimHooks.hpp"
 #include <gtest/gtest.h>
-#include "wpi/hal/simulation/MockHooks.h"
-#include "wpi/units/length.hpp"
-#include "wpi/units/time.hpp"
+#include <wpi/hal/simulation/MockHooks.h>
+#include <wpi/simulation/DriverStationSim.hpp>
+#include <wpi/simulation/JoystickSim.hpp>
+#include <wpi/simulation/PWMMotorControllerSim.hpp>
+#include <wpi/simulation/SimHooks.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/time.hpp>
+#include <wpi/util/Preferences.hpp>
 
 #include "Constants.hpp"
 #include "Robot.hpp"
diff --git a/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/main.cpp
index b48f11e376..d0ebd73dad 100644
--- a/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/main.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/ArmSimulation/cpp/main.cpp
@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HALBase.h"
+#include <wpi/hal/HALBase.h>
 
 /**
  * Runs all unit tests.
diff --git a/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/DigitalCommunicationTest.cpp b/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/DigitalCommunicationTest.cpp
index eba6dcc828..0d02f5f016 100644
--- a/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/DigitalCommunicationTest.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/DigitalCommunicationTest.cpp
@@ -5,11 +5,11 @@
 #include <string>
 #include <thread>
 
-#include "wpi/simulation/DIOSim.hpp"
-#include "wpi/simulation/DriverStationSim.hpp"
-#include "wpi/simulation/SimHooks.hpp"
 #include <gtest/gtest.h>
-#include "wpi/units/time.hpp"
+#include <wpi/simulation/DIOSim.hpp>
+#include <wpi/simulation/DriverStationSim.hpp>
+#include <wpi/simulation/SimHooks.hpp>
+#include <wpi/units/time.hpp>
 
 #include "Robot.hpp"
 
diff --git a/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/main.cpp
index b48f11e376..d0ebd73dad 100644
--- a/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/main.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/DigitalCommunication/cpp/main.cpp
@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HALBase.h"
+#include <wpi/hal/HALBase.h>
 
 /**
  * Runs all unit tests.
diff --git a/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/ElevatorSimulationTest.cpp b/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/ElevatorSimulationTest.cpp
index 7554d0feb7..cb34ed35fb 100644
--- a/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/ElevatorSimulationTest.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/ElevatorSimulationTest.cpp
@@ -5,15 +5,15 @@
 #include <string>
 #include <thread>
 
-#include "wpi/simulation/DriverStationSim.hpp"
-#include "wpi/simulation/JoystickSim.hpp"
-#include "wpi/simulation/PWMMotorControllerSim.hpp"
-#include "wpi/simulation/SimHooks.hpp"
 #include <gtest/gtest.h>
-#include "wpi/hal/simulation/MockHooks.h"
-#include "wpi/units/length.hpp"
-#include "wpi/units/mass.hpp"
-#include "wpi/units/time.hpp"
+#include <wpi/hal/simulation/MockHooks.h>
+#include <wpi/simulation/DriverStationSim.hpp>
+#include <wpi/simulation/JoystickSim.hpp>
+#include <wpi/simulation/PWMMotorControllerSim.hpp>
+#include <wpi/simulation/SimHooks.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/mass.hpp>
+#include <wpi/units/time.hpp>
 
 #include "Constants.hpp"
 #include "Robot.hpp"
diff --git a/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/main.cpp
index b48f11e376..d0ebd73dad 100644
--- a/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/main.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/ElevatorSimulation/cpp/main.cpp
@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HALBase.h"
+#include <wpi/hal/HALBase.h>
 
 /**
  * Runs all unit tests.
diff --git a/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/I2CCommunicationTest.cpp b/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/I2CCommunicationTest.cpp
index 4f009ff55c..35c7436e62 100644
--- a/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/I2CCommunicationTest.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/I2CCommunicationTest.cpp
@@ -5,11 +5,11 @@
 #include <string>
 #include <thread>
 
-#include "wpi/simulation/DriverStationSim.hpp"
-#include "wpi/simulation/SimHooks.hpp"
 #include <gtest/gtest.h>
-#include "wpi/hal/simulation/I2CData.h"
-#include "wpi/units/time.hpp"
+#include <wpi/hal/simulation/I2CData.h>
+#include <wpi/simulation/DriverStationSim.hpp>
+#include <wpi/simulation/SimHooks.hpp>
+#include <wpi/units/time.hpp>
 
 #include "Robot.hpp"
 
diff --git a/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/main.cpp
index b48f11e376..d0ebd73dad 100644
--- a/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/main.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/I2CCommunication/cpp/main.cpp
@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HALBase.h"
+#include <wpi/hal/HALBase.h>
 
 /**
  * Runs all unit tests.
diff --git a/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/PotentiometerPIDTest.cpp b/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/PotentiometerPIDTest.cpp
index 73a2fcef0b..594609795f 100644
--- a/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/PotentiometerPIDTest.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/PotentiometerPIDTest.cpp
@@ -5,19 +5,19 @@
 #include <string>
 #include <thread>
 
-#include "wpi/system/RobotController.hpp"
-#include "wpi/simulation/AnalogInputSim.hpp"
-#include "wpi/simulation/DriverStationSim.hpp"
-#include "wpi/simulation/ElevatorSim.hpp"
-#include "wpi/simulation/JoystickSim.hpp"
-#include "wpi/simulation/PWMMotorControllerSim.hpp"
-#include "wpi/simulation/SimHooks.hpp"
-#include "wpi/math/system/plant/DCMotor.hpp"
 #include <gtest/gtest.h>
-#include "wpi/hal/simulation/MockHooks.h"
-#include "wpi/units/length.hpp"
-#include "wpi/units/mass.hpp"
-#include "wpi/units/time.hpp"
+#include <wpi/hal/simulation/MockHooks.h>
+#include <wpi/math/system/plant/DCMotor.hpp>
+#include <wpi/simulation/AnalogInputSim.hpp>
+#include <wpi/simulation/DriverStationSim.hpp>
+#include <wpi/simulation/ElevatorSim.hpp>
+#include <wpi/simulation/JoystickSim.hpp>
+#include <wpi/simulation/PWMMotorControllerSim.hpp>
+#include <wpi/simulation/SimHooks.hpp>
+#include <wpi/system/RobotController.hpp>
+#include <wpi/units/length.hpp>
+#include <wpi/units/mass.hpp>
+#include <wpi/units/time.hpp>
 
 #include "Robot.hpp"
 
diff --git a/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/main.cpp
index b48f11e376..d0ebd73dad 100644
--- a/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/main.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/PotentiometerPID/cpp/main.cpp
@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HALBase.h"
+#include <wpi/hal/HALBase.h>
 
 /**
  * Runs all unit tests.
diff --git a/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/main.cpp b/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/main.cpp
index b48f11e376..d0ebd73dad 100644
--- a/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/main.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/main.cpp
@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/hal/HALBase.h"
+#include <wpi/hal/HALBase.h>
 
 /**
  * Runs all unit tests.
diff --git a/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/subsystems/IntakeTest.cpp b/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/subsystems/IntakeTest.cpp
index 0276ca4728..c6f541c9e8 100644
--- a/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/subsystems/IntakeTest.cpp
+++ b/wpilibcExamples/src/test/cpp/examples/UnitTest/cpp/subsystems/IntakeTest.cpp
@@ -2,10 +2,10 @@
 // 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 "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
-#include "wpi/simulation/DoubleSolenoidSim.hpp"
-#include "wpi/simulation/PWMMotorControllerSim.hpp"
 #include <gtest/gtest.h>
+#include <wpi/hardware/pneumatic/DoubleSolenoid.hpp>
+#include <wpi/simulation/DoubleSolenoidSim.hpp>
+#include <wpi/simulation/PWMMotorControllerSim.hpp>
 
 #include "Constants.hpp"
 #include "subsystems/Intake.hpp"
diff --git a/wpimath/src/main/native/cpp/controller/LTVDifferentialDriveController.cpp b/wpimath/src/main/native/cpp/controller/LTVDifferentialDriveController.cpp
index 0619eca798..ae9dce653c 100644
--- a/wpimath/src/main/native/cpp/controller/LTVDifferentialDriveController.cpp
+++ b/wpimath/src/main/native/cpp/controller/LTVDifferentialDriveController.cpp
@@ -7,8 +7,8 @@
 #include <cmath>
 
 #include "wpi/math/linalg/DARE.hpp"
-#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/math/system/Discretization.hpp"
+#include "wpi/math/util/MathUtil.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator.cpp b/wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator.cpp
index 1c4f99f405..64a51f853d 100644
--- a/wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator.cpp
+++ b/wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator.cpp
@@ -4,11 +4,10 @@
 
 #include "wpi/math/estimator/MecanumDrivePoseEstimator.hpp"
 
-#include "wpi/util/timestamp.h"
-
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/estimator/AngleStatistics.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace frc;
 
diff --git a/wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator3d.cpp b/wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator3d.cpp
index 91ffe7a221..3b5a9dafc5 100644
--- a/wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator3d.cpp
+++ b/wpimath/src/main/native/cpp/estimator/MecanumDrivePoseEstimator3d.cpp
@@ -4,11 +4,10 @@
 
 #include "wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp"
 
-#include "wpi/util/timestamp.h"
-
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/estimator/AngleStatistics.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/util/timestamp.h"
 
 using namespace frc;
 
diff --git a/wpimath/src/main/native/cpp/geometry/proto/Ellipse2dProto.cpp b/wpimath/src/main/native/cpp/geometry/proto/Ellipse2dProto.cpp
index c66451ee24..2431d4e616 100644
--- a/wpimath/src/main/native/cpp/geometry/proto/Ellipse2dProto.cpp
+++ b/wpimath/src/main/native/cpp/geometry/proto/Ellipse2dProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Ellipse2dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 std::optional<frc::Ellipse2d> wpi::Protobuf<frc::Ellipse2d>::Unpack(
diff --git a/wpimath/src/main/native/cpp/geometry/proto/Pose2dProto.cpp b/wpimath/src/main/native/cpp/geometry/proto/Pose2dProto.cpp
index 1cf5955eda..ab1c9f0ec3 100644
--- a/wpimath/src/main/native/cpp/geometry/proto/Pose2dProto.cpp
+++ b/wpimath/src/main/native/cpp/geometry/proto/Pose2dProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Pose2dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 std::optional<frc::Pose2d> wpi::Protobuf<frc::Pose2d>::Unpack(
diff --git a/wpimath/src/main/native/cpp/geometry/proto/Pose3dProto.cpp b/wpimath/src/main/native/cpp/geometry/proto/Pose3dProto.cpp
index b89a784fdd..d09bf57281 100644
--- a/wpimath/src/main/native/cpp/geometry/proto/Pose3dProto.cpp
+++ b/wpimath/src/main/native/cpp/geometry/proto/Pose3dProto.cpp
@@ -4,10 +4,9 @@
 
 #include "wpi/math/geometry/proto/Pose3dProto.hpp"
 
+#include "wpi/math/geometry/Pose3d.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
-#include "wpi/math/geometry/Pose3d.hpp"
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 std::optional<frc::Pose3d> wpi::Protobuf<frc::Pose3d>::Unpack(
diff --git a/wpimath/src/main/native/cpp/geometry/proto/Rectangle2dProto.cpp b/wpimath/src/main/native/cpp/geometry/proto/Rectangle2dProto.cpp
index 141f3c87c1..1f2ecbc776 100644
--- a/wpimath/src/main/native/cpp/geometry/proto/Rectangle2dProto.cpp
+++ b/wpimath/src/main/native/cpp/geometry/proto/Rectangle2dProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Rectangle2dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 std::optional<frc::Rectangle2d> wpi::Protobuf<frc::Rectangle2d>::Unpack(
diff --git a/wpimath/src/main/native/cpp/geometry/proto/Rotation3dProto.cpp b/wpimath/src/main/native/cpp/geometry/proto/Rotation3dProto.cpp
index aa91d33b2f..4a25ceca59 100644
--- a/wpimath/src/main/native/cpp/geometry/proto/Rotation3dProto.cpp
+++ b/wpimath/src/main/native/cpp/geometry/proto/Rotation3dProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Rotation3dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 std::optional<frc::Rotation3d> wpi::Protobuf<frc::Rotation3d>::Unpack(
diff --git a/wpimath/src/main/native/cpp/geometry/proto/Transform2dProto.cpp b/wpimath/src/main/native/cpp/geometry/proto/Transform2dProto.cpp
index 131ca8b764..c19a90986a 100644
--- a/wpimath/src/main/native/cpp/geometry/proto/Transform2dProto.cpp
+++ b/wpimath/src/main/native/cpp/geometry/proto/Transform2dProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Transform2dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 std::optional<frc::Transform2d> wpi::Protobuf<frc::Transform2d>::Unpack(
diff --git a/wpimath/src/main/native/cpp/geometry/proto/Transform3dProto.cpp b/wpimath/src/main/native/cpp/geometry/proto/Transform3dProto.cpp
index 0ac40d6a4e..2e07e280ce 100644
--- a/wpimath/src/main/native/cpp/geometry/proto/Transform3dProto.cpp
+++ b/wpimath/src/main/native/cpp/geometry/proto/Transform3dProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/geometry/proto/Transform3dProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 std::optional<frc::Transform3d> wpi::Protobuf<frc::Transform3d>::Unpack(
diff --git a/wpimath/src/main/native/cpp/jni/ArmFeedforwardJNI.cpp b/wpimath/src/main/native/cpp/jni/ArmFeedforwardJNI.cpp
index d2c6566bf0..67d1b6c498 100644
--- a/wpimath/src/main/native/cpp/jni/ArmFeedforwardJNI.cpp
+++ b/wpimath/src/main/native/cpp/jni/ArmFeedforwardJNI.cpp
@@ -4,10 +4,9 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "org_wpilib_math_jni_ArmFeedforwardJNI.h"
 #include "wpi/math/controller/ArmFeedforward.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
diff --git a/wpimath/src/main/native/cpp/jni/DAREJNI.cpp b/wpimath/src/main/native/cpp/jni/DAREJNI.cpp
index aec0b9c3f7..a0e96e0beb 100644
--- a/wpimath/src/main/native/cpp/jni/DAREJNI.cpp
+++ b/wpimath/src/main/native/cpp/jni/DAREJNI.cpp
@@ -7,12 +7,11 @@
 #include <stdexcept>
 #include <string>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "Exceptions.hpp"
 #include "org_wpilib_math_jni_DAREJNI.h"
-#include "wpi/math/linalg/DARE.hpp"
 #include "wpi/math/fmt/Eigen.hpp"
+#include "wpi/math/linalg/DARE.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
diff --git a/wpimath/src/main/native/cpp/jni/EigenJNI.cpp b/wpimath/src/main/native/cpp/jni/EigenJNI.cpp
index 5f3f7fd495..2c810e3e1b 100644
--- a/wpimath/src/main/native/cpp/jni/EigenJNI.cpp
+++ b/wpimath/src/main/native/cpp/jni/EigenJNI.cpp
@@ -8,9 +8,9 @@
 #include <Eigen/Core>
 #include <Eigen/QR>
 #include <unsupported/Eigen/MatrixFunctions>
-#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_math_jni_EigenJNI.h"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
diff --git a/wpimath/src/main/native/cpp/jni/Ellipse2dJNI.cpp b/wpimath/src/main/native/cpp/jni/Ellipse2dJNI.cpp
index 5fae3c6c13..a91e44fd44 100644
--- a/wpimath/src/main/native/cpp/jni/Ellipse2dJNI.cpp
+++ b/wpimath/src/main/native/cpp/jni/Ellipse2dJNI.cpp
@@ -4,11 +4,10 @@
 
 #include <jni.h>
 
-#include "wpi/util/array.hpp"
-#include "wpi/util/jni_util.hpp"
-
 #include "org_wpilib_math_jni_Ellipse2dJNI.h"
 #include "wpi/math/geometry/Ellipse2d.hpp"
+#include "wpi/util/array.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
diff --git a/wpimath/src/main/native/cpp/jni/StateSpaceUtilJNI.cpp b/wpimath/src/main/native/cpp/jni/StateSpaceUtilJNI.cpp
index 39a9731938..03539452f2 100644
--- a/wpimath/src/main/native/cpp/jni/StateSpaceUtilJNI.cpp
+++ b/wpimath/src/main/native/cpp/jni/StateSpaceUtilJNI.cpp
@@ -5,10 +5,10 @@
 #include <jni.h>
 
 #include <Eigen/Core>
-#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_math_jni_StateSpaceUtilJNI.h"
 #include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
diff --git a/wpimath/src/main/native/cpp/jni/Transform3dJNI.cpp b/wpimath/src/main/native/cpp/jni/Transform3dJNI.cpp
index 849738e21c..369e722aa7 100644
--- a/wpimath/src/main/native/cpp/jni/Transform3dJNI.cpp
+++ b/wpimath/src/main/native/cpp/jni/Transform3dJNI.cpp
@@ -4,8 +4,6 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "org_wpilib_math_jni_Transform3dJNI.h"
 #include "wpi/math/geometry/Quaternion.hpp"
 #include "wpi/math/geometry/Rotation3d.hpp"
@@ -13,6 +11,7 @@
 #include "wpi/math/geometry/Twist3d.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
diff --git a/wpimath/src/main/native/cpp/jni/Twist3dJNI.cpp b/wpimath/src/main/native/cpp/jni/Twist3dJNI.cpp
index 8512446fbd..e9de7cbcfb 100644
--- a/wpimath/src/main/native/cpp/jni/Twist3dJNI.cpp
+++ b/wpimath/src/main/native/cpp/jni/Twist3dJNI.cpp
@@ -4,13 +4,12 @@
 
 #include <jni.h>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "org_wpilib_math_jni_Twist3dJNI.h"
 #include "wpi/math/geometry/Transform3d.hpp"
 #include "wpi/math/geometry/Twist3d.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
diff --git a/wpimath/src/main/native/cpp/kinematics/proto/MecanumDriveKinematicsProto.cpp b/wpimath/src/main/native/cpp/kinematics/proto/MecanumDriveKinematicsProto.cpp
index dcd115a954..abeca52516 100644
--- a/wpimath/src/main/native/cpp/kinematics/proto/MecanumDriveKinematicsProto.cpp
+++ b/wpimath/src/main/native/cpp/kinematics/proto/MecanumDriveKinematicsProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/kinematics/proto/MecanumDriveKinematicsProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/kinematics.npb.h"
 
 std::optional<frc::MecanumDriveKinematics>
diff --git a/wpimath/src/main/native/cpp/kinematics/proto/SwerveModulePositionProto.cpp b/wpimath/src/main/native/cpp/kinematics/proto/SwerveModulePositionProto.cpp
index c1fe8e0708..cba4492cd7 100644
--- a/wpimath/src/main/native/cpp/kinematics/proto/SwerveModulePositionProto.cpp
+++ b/wpimath/src/main/native/cpp/kinematics/proto/SwerveModulePositionProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/kinematics/proto/SwerveModulePositionProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/kinematics.npb.h"
 
 std::optional<frc::SwerveModulePosition>
diff --git a/wpimath/src/main/native/cpp/kinematics/proto/SwerveModuleStateProto.cpp b/wpimath/src/main/native/cpp/kinematics/proto/SwerveModuleStateProto.cpp
index 8e38804675..31de39e996 100644
--- a/wpimath/src/main/native/cpp/kinematics/proto/SwerveModuleStateProto.cpp
+++ b/wpimath/src/main/native/cpp/kinematics/proto/SwerveModuleStateProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/kinematics/proto/SwerveModuleStateProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/kinematics.npb.h"
 
 std::optional<frc::SwerveModuleState>
diff --git a/wpimath/src/main/native/cpp/spline/proto/CubicHermiteSplineProto.cpp b/wpimath/src/main/native/cpp/spline/proto/CubicHermiteSplineProto.cpp
index 83760c930a..8e62cb1dbf 100644
--- a/wpimath/src/main/native/cpp/spline/proto/CubicHermiteSplineProto.cpp
+++ b/wpimath/src/main/native/cpp/spline/proto/CubicHermiteSplineProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/spline/proto/CubicHermiteSplineProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/spline.npb.h"
 
 std::optional<frc::CubicHermiteSpline>
diff --git a/wpimath/src/main/native/cpp/spline/proto/QuinticHermiteSplineProto.cpp b/wpimath/src/main/native/cpp/spline/proto/QuinticHermiteSplineProto.cpp
index 666d9800fb..5112cd555f 100644
--- a/wpimath/src/main/native/cpp/spline/proto/QuinticHermiteSplineProto.cpp
+++ b/wpimath/src/main/native/cpp/spline/proto/QuinticHermiteSplineProto.cpp
@@ -5,7 +5,6 @@
 #include "wpi/math/spline/proto/QuinticHermiteSplineProto.hpp"
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/spline.npb.h"
 
 std::optional<frc::QuinticHermiteSpline>
diff --git a/wpimath/src/main/native/cpp/trajectory/TrajectoryGenerator.cpp b/wpimath/src/main/native/cpp/trajectory/TrajectoryGenerator.cpp
index 82d60204e5..678fec2789 100644
--- a/wpimath/src/main/native/cpp/trajectory/TrajectoryGenerator.cpp
+++ b/wpimath/src/main/native/cpp/trajectory/TrajectoryGenerator.cpp
@@ -7,11 +7,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/print.hpp"
-
 #include "wpi/math/spline/SplineHelper.hpp"
 #include "wpi/math/spline/SplineParameterizer.hpp"
 #include "wpi/math/trajectory/TrajectoryParameterizer.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryProto.cpp b/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryProto.cpp
index 7922b5bc0e..3853a3f12d 100644
--- a/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryProto.cpp
+++ b/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryProto.cpp
@@ -7,7 +7,6 @@
 #include <vector>
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/trajectory.npb.h"
 
 std::optional<frc::Trajectory> wpi::Protobuf<frc::Trajectory>::Unpack(
diff --git a/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryStateProto.cpp b/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryStateProto.cpp
index bc4dd97931..6a1f1ed80d 100644
--- a/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryStateProto.cpp
+++ b/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryStateProto.cpp
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"
-
 #include "wpimath/protobuf/trajectory.npb.h"
 
 std::optional<frc::Trajectory::State>
diff --git a/wpimath/src/main/native/cpp/util/MathShared.cpp b/wpimath/src/main/native/cpp/util/MathShared.cpp
index d17417adc0..5738f063f3 100644
--- a/wpimath/src/main/native/cpp/util/MathShared.cpp
+++ b/wpimath/src/main/native/cpp/util/MathShared.cpp
@@ -7,11 +7,10 @@
 #include <memory>
 #include <utility>
 
+#include "wpi/units/time.hpp"
 #include "wpi/util/mutex.hpp"
 #include "wpi/util/timestamp.h"
 
-#include "wpi/units/time.hpp"
-
 using namespace wpi::math;
 
 namespace {
diff --git a/wpimath/src/main/native/include/wpi/math/controller/ArmFeedforward.hpp b/wpimath/src/main/native/include/wpi/math/controller/ArmFeedforward.hpp
index 1ccdb6f574..22cff97d97 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/ArmFeedforward.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/ArmFeedforward.hpp
@@ -6,14 +6,13 @@
 
 #include <cstdlib>
 
-#include "wpi/util/MathExtras.hpp"
-#include "wpi/util/SymbolExports.hpp"
-
+#include "wpi/math/util/MathShared.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/angular_velocity.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/voltage.hpp"
-#include "wpi/math/util/MathShared.hpp"
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/controller/BangBangController.hpp b/wpimath/src/main/native/include/wpi/math/controller/BangBangController.hpp
index ac537e494e..e5098b820b 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/BangBangController.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/BangBangController.hpp
@@ -7,12 +7,12 @@
 #include <limits>
 
 #include <gcem.hpp>
+
+#include "wpi/math/util/MathShared.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/math/util/MathShared.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveAccelerationLimiter.hpp b/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveAccelerationLimiter.hpp
index e4958e7336..699012d719 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveAccelerationLimiter.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveAccelerationLimiter.hpp
@@ -7,7 +7,6 @@
 #include <utility>
 
 #include <Eigen/Core>
-#include "wpi/util/SymbolExports.hpp"
 
 #include "wpi/math/controller/DifferentialDriveWheelVoltages.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
@@ -16,6 +15,7 @@
 #include "wpi/units/length.hpp"
 #include "wpi/units/velocity.hpp"
 #include "wpi/units/voltage.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveFeedforward.hpp b/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveFeedforward.hpp
index 1254201b45..d5a9b3a626 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveFeedforward.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/DifferentialDriveFeedforward.hpp
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/controller/DifferentialDriveWheelVoltages.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
@@ -16,6 +14,7 @@
 #include "wpi/units/time.hpp"
 #include "wpi/units/velocity.hpp"
 #include "wpi/units/voltage.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/controller/ElevatorFeedforward.hpp b/wpimath/src/main/native/include/wpi/math/controller/ElevatorFeedforward.hpp
index cd5bf820f6..fcffd91206 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/ElevatorFeedforward.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/ElevatorFeedforward.hpp
@@ -4,15 +4,14 @@
 
 #pragma once
 
-#include "wpi/util/MathExtras.hpp"
-
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/controller/LinearPlantInversionFeedforward.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
+#include "wpi/math/util/MathShared.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/voltage.hpp"
-#include "wpi/math/util/MathShared.hpp"
+#include "wpi/util/MathExtras.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/controller/ImplicitModelFollower.hpp b/wpimath/src/main/native/include/wpi/math/controller/ImplicitModelFollower.hpp
index 883894fd60..7ac78eedee 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/ImplicitModelFollower.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/ImplicitModelFollower.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "wpi/math/system/LinearSystem.hpp"
-
 #include <Eigen/QR>
 
 #include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/math/system/LinearSystem.hpp"
 #include "wpi/units/time.hpp"
 
 namespace frc {
diff --git a/wpimath/src/main/native/include/wpi/math/controller/LTVDifferentialDriveController.hpp b/wpimath/src/main/native/include/wpi/math/controller/LTVDifferentialDriveController.hpp
index 96911cc16b..aa82959153 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/LTVDifferentialDriveController.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/LTVDifferentialDriveController.hpp
@@ -7,17 +7,17 @@
 #include <cmath>
 
 #include <Eigen/Core>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
 
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/controller/DifferentialDriveWheelVoltages.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
 #include "wpi/math/trajectory/Trajectory.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/controller/LTVUnicycleController.hpp b/wpimath/src/main/native/include/wpi/math/controller/LTVUnicycleController.hpp
index 8cde1e9162..15012504da 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/LTVUnicycleController.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/LTVUnicycleController.hpp
@@ -5,17 +5,17 @@
 #pragma once
 
 #include <Eigen/Core>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
 
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/ChassisSpeeds.hpp"
 #include "wpi/math/trajectory/Trajectory.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/units/angular_velocity.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/controller/LinearQuadraticRegulator.hpp b/wpimath/src/main/native/include/wpi/math/controller/LinearQuadraticRegulator.hpp
index 8b87c21081..a3f5424768 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/LinearQuadraticRegulator.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/LinearQuadraticRegulator.hpp
@@ -9,17 +9,17 @@
 
 #include <Eigen/Cholesky>
 #include <unsupported/Eigen/MatrixFunctions>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
 
+#include "wpi/math/fmt/Eigen.hpp"
 #include "wpi/math/linalg/DARE.hpp"
 #include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/math/fmt/Eigen.hpp"
 #include "wpi/math/system/Discretization.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
-#include "wpi/units/time.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/controller/PIDController.hpp b/wpimath/src/main/native/include/wpi/math/controller/PIDController.hpp
index 277fe8fc90..5d3ae2fa75 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/PIDController.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/PIDController.hpp
@@ -10,15 +10,15 @@
 #include <type_traits>
 
 #include <gcem.hpp>
+
+#include "wpi/math/util/MathShared.hpp"
+#include "wpi/math/util/MathUtil.hpp"
+#include "wpi/units/time.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "wpi/math/util/MathUtil.hpp"
-#include "wpi/units/time.hpp"
-#include "wpi/math/util/MathShared.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/controller/ProfiledPIDController.hpp b/wpimath/src/main/native/include/wpi/math/controller/ProfiledPIDController.hpp
index 76eed3b0d3..f1a8196f1d 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/ProfiledPIDController.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/ProfiledPIDController.hpp
@@ -8,16 +8,15 @@
 #include <limits>
 #include <type_traits>
 
+#include "wpi/math/controller/PIDController.hpp"
+#include "wpi/math/trajectory/TrapezoidProfile.hpp"
+#include "wpi/math/util/MathUtil.hpp"
+#include "wpi/units/time.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "wpi/math/util/MathUtil.hpp"
-#include "wpi/math/controller/PIDController.hpp"
-#include "wpi/math/trajectory/TrapezoidProfile.hpp"
-#include "wpi/units/time.hpp"
-
 namespace frc {
 namespace detail {
 WPILIB_DLLEXPORT
diff --git a/wpimath/src/main/native/include/wpi/math/controller/SimpleMotorFeedforward.hpp b/wpimath/src/main/native/include/wpi/math/controller/SimpleMotorFeedforward.hpp
index b57801d04d..2f87995c49 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/SimpleMotorFeedforward.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/SimpleMotorFeedforward.hpp
@@ -5,13 +5,13 @@
 #pragma once
 
 #include <gcem.hpp>
-#include "wpi/util/MathExtras.hpp"
 
+#include "wpi/math/util/MathShared.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/voltage.hpp"
-#include "wpi/math/util/MathShared.hpp"
+#include "wpi/util/MathExtras.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/controller/proto/ArmFeedforwardProto.hpp b/wpimath/src/main/native/include/wpi/math/controller/proto/ArmFeedforwardProto.hpp
index 279638f397..ce8ca33f37 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/proto/ArmFeedforwardProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/proto/ArmFeedforwardProto.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "pb.h"
+#include "wpi/math/controller/ArmFeedforward.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/controller/ArmFeedforward.hpp"
-#include "pb.h"
 #include "wpimath/protobuf/controller.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveFeedforwardProto.hpp b/wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveFeedforwardProto.hpp
index 540330cc39..156fb67c96 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveFeedforwardProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveFeedforwardProto.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "pb.h"
+#include "wpi/math/controller/DifferentialDriveFeedforward.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/controller/DifferentialDriveFeedforward.hpp"
-#include "pb.h"
 #include "wpimath/protobuf/controller.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveWheelVoltagesProto.hpp b/wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveWheelVoltagesProto.hpp
index b70e4db6c3..491a84ede7 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveWheelVoltagesProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/proto/DifferentialDriveWheelVoltagesProto.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "pb.h"
+#include "wpi/math/controller/DifferentialDriveWheelVoltages.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/controller/DifferentialDriveWheelVoltages.hpp"
-#include "pb.h"
 #include "wpimath/protobuf/controller.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/controller/proto/ElevatorFeedforwardProto.hpp b/wpimath/src/main/native/include/wpi/math/controller/proto/ElevatorFeedforwardProto.hpp
index db9bc2afb2..e585e3dc14 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/proto/ElevatorFeedforwardProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/proto/ElevatorFeedforwardProto.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "pb.h"
+#include "wpi/math/controller/ElevatorFeedforward.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/controller/ElevatorFeedforward.hpp"
-#include "pb.h"
 #include "wpimath/protobuf/controller.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/controller/proto/SimpleMotorFeedforwardProto.hpp b/wpimath/src/main/native/include/wpi/math/controller/proto/SimpleMotorFeedforwardProto.hpp
index 917718fd73..f4d0101c88 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/proto/SimpleMotorFeedforwardProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/proto/SimpleMotorFeedforwardProto.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
 #include "pb.h"
+#include "wpi/math/controller/SimpleMotorFeedforward.hpp"
 #include "wpi/units/length.hpp"
+#include "wpi/util/protobuf/Protobuf.hpp"
 #include "wpimath/protobuf/controller.npb.h"
 
 // Everything is converted into units for
diff --git a/wpimath/src/main/native/include/wpi/math/controller/struct/ArmFeedforwardStruct.hpp b/wpimath/src/main/native/include/wpi/math/controller/struct/ArmFeedforwardStruct.hpp
index 16b11fd072..f4889e2820 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/struct/ArmFeedforwardStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/struct/ArmFeedforwardStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/controller/ArmFeedforward.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/controller/ArmFeedforward.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::ArmFeedforward> {
   static constexpr std::string_view GetTypeName() { return "ArmFeedforward"; }
diff --git a/wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveFeedforwardStruct.hpp b/wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveFeedforwardStruct.hpp
index 53e26e634d..bbdbd1aac9 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveFeedforwardStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveFeedforwardStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/controller/DifferentialDriveFeedforward.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/controller/DifferentialDriveFeedforward.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::DifferentialDriveFeedforward> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveWheelVoltagesStruct.hpp b/wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveWheelVoltagesStruct.hpp
index 8fbef5dca9..d1f40c3262 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveWheelVoltagesStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/struct/DifferentialDriveWheelVoltagesStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/controller/DifferentialDriveWheelVoltages.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/controller/DifferentialDriveWheelVoltages.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::DifferentialDriveWheelVoltages> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/controller/struct/ElevatorFeedforwardStruct.hpp b/wpimath/src/main/native/include/wpi/math/controller/struct/ElevatorFeedforwardStruct.hpp
index d8540178a9..1927eedfbb 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/struct/ElevatorFeedforwardStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/struct/ElevatorFeedforwardStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/controller/ElevatorFeedforward.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/controller/ElevatorFeedforward.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::ElevatorFeedforward> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/controller/struct/SimpleMotorFeedforwardStruct.hpp b/wpimath/src/main/native/include/wpi/math/controller/struct/SimpleMotorFeedforwardStruct.hpp
index 1372883fbd..c984128612 100644
--- a/wpimath/src/main/native/include/wpi/math/controller/struct/SimpleMotorFeedforwardStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/controller/struct/SimpleMotorFeedforwardStruct.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/struct/Struct.hpp"
-
 #include "wpi/math/controller/SimpleMotorFeedforward.hpp"
 #include "wpi/units/length.hpp"
+#include "wpi/util/struct/Struct.hpp"
 
 // Everything is converted into units for
 // frc::SimpleMotorFeedforward<units::meters> or
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator.hpp b/wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator.hpp
index 7daebaa734..2fe52337fb 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator.hpp
@@ -4,15 +4,14 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
-
 #include "wpi/math/estimator/PoseEstimator.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/math/kinematics/DifferentialDriveOdometry.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp b/wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp
index 837075614c..136dd73bbe 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp
@@ -4,15 +4,14 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
-
 #include "wpi/math/estimator/PoseEstimator3d.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/math/kinematics/DifferentialDriveOdometry3d.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/ExtendedKalmanFilter.hpp b/wpimath/src/main/native/include/wpi/math/estimator/ExtendedKalmanFilter.hpp
index f138196c8b..96c74b09f7 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/ExtendedKalmanFilter.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/ExtendedKalmanFilter.hpp
@@ -9,16 +9,16 @@
 #include <utility>
 
 #include <Eigen/Cholesky>
-#include "wpi/util/array.hpp"
 
+#include "wpi/math/fmt/Eigen.hpp"
 #include "wpi/math/linalg/DARE.hpp"
 #include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/math/fmt/Eigen.hpp"
 #include "wpi/math/system/Discretization.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/math/system/NumericalJacobian.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/KalmanFilter.hpp b/wpimath/src/main/native/include/wpi/math/estimator/KalmanFilter.hpp
index c0a9f1faaf..12b98de097 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/KalmanFilter.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/KalmanFilter.hpp
@@ -9,16 +9,16 @@
 #include <string>
 
 #include <Eigen/Cholesky>
-#include "wpi/util/array.hpp"
 
+#include "wpi/math/fmt/Eigen.hpp"
 #include "wpi/math/linalg/DARE.hpp"
 #include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/math/fmt/Eigen.hpp"
 #include "wpi/math/system/Discretization.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
-#include "wpi/units/time.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator.hpp b/wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator.hpp
index a39b82a22d..3db122aad7 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator.hpp
@@ -6,9 +6,6 @@
 
 #include <functional>
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
-
 #include "wpi/math/estimator/PoseEstimator.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
@@ -16,6 +13,8 @@
 #include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpi/math/kinematics/MecanumDriveOdometry.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp b/wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp
index 4cfa1cf1bd..171c90a212 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp
@@ -6,9 +6,6 @@
 
 #include <functional>
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
-
 #include "wpi/math/estimator/PoseEstimator3d.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
@@ -16,6 +13,8 @@
 #include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpi/math/kinematics/MecanumDriveOdometry3d.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/MerweUKF.hpp b/wpimath/src/main/native/include/wpi/math/estimator/MerweUKF.hpp
index 687070b373..7f2ede4207 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/MerweUKF.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/MerweUKF.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/estimator/MerweScaledSigmaPoints.hpp"
 #include "wpi/math/estimator/UnscentedKalmanFilter.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator.hpp b/wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator.hpp
index b32e1bca77..0c2238aab8 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator.hpp
@@ -9,8 +9,6 @@
 #include <vector>
 
 #include <Eigen/Core>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
 
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
@@ -18,8 +16,10 @@
 #include "wpi/math/interpolation/TimeInterpolatableBuffer.hpp"
 #include "wpi/math/kinematics/Kinematics.hpp"
 #include "wpi/math/kinematics/Odometry.hpp"
-#include "wpi/units/time.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator3d.hpp b/wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator3d.hpp
index 69798949b4..6d475470c6 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/PoseEstimator3d.hpp
@@ -10,18 +10,18 @@
 #include <vector>
 
 #include <Eigen/Core>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/math/interpolation/TimeInterpolatableBuffer.hpp"
 #include "wpi/math/kinematics/Kinematics.hpp"
 #include "wpi/math/kinematics/Odometry3d.hpp"
-#include "wpi/units/time.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/S3SigmaPoints.hpp b/wpimath/src/main/native/include/wpi/math/estimator/S3SigmaPoints.hpp
index fbeed4cdd7..4f226d6703 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/S3SigmaPoints.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/S3SigmaPoints.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/array.hpp"
-
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/estimator/SigmaPoints.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/S3UKF.hpp b/wpimath/src/main/native/include/wpi/math/estimator/S3UKF.hpp
index 3f8eb2785f..8eaea80512 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/S3UKF.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/S3UKF.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/estimator/S3SigmaPoints.hpp"
 #include "wpi/math/estimator/UnscentedKalmanFilter.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/SteadyStateKalmanFilter.hpp b/wpimath/src/main/native/include/wpi/math/estimator/SteadyStateKalmanFilter.hpp
index c88d694c68..07f1321088 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/SteadyStateKalmanFilter.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/SteadyStateKalmanFilter.hpp
@@ -9,17 +9,17 @@
 #include <string>
 
 #include <Eigen/Cholesky>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
 
+#include "wpi/math/fmt/Eigen.hpp"
 #include "wpi/math/linalg/DARE.hpp"
 #include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
-#include "wpi/math/fmt/Eigen.hpp"
 #include "wpi/math/system/Discretization.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
-#include "wpi/units/time.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator.hpp b/wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator.hpp
index d9602eed95..0ca22472b7 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator.hpp
@@ -6,15 +6,14 @@
 
 #include <cmath>
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
-
 #include "wpi/math/estimator/PoseEstimator.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
 #include "wpi/math/kinematics/SwerveDriveOdometry.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp b/wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp
index b76e6ab15d..5719af034e 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp
@@ -6,15 +6,14 @@
 
 #include <cmath>
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
-
 #include "wpi/math/estimator/PoseEstimator3d.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
 #include "wpi/math/kinematics/SwerveDriveOdometry3d.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/estimator/UnscentedKalmanFilter.hpp b/wpimath/src/main/native/include/wpi/math/estimator/UnscentedKalmanFilter.hpp
index c126743061..90d436afd7 100644
--- a/wpimath/src/main/native/include/wpi/math/estimator/UnscentedKalmanFilter.hpp
+++ b/wpimath/src/main/native/include/wpi/math/estimator/UnscentedKalmanFilter.hpp
@@ -8,17 +8,17 @@
 #include <utility>
 
 #include <Eigen/Cholesky>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
 
-#include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/estimator/SigmaPoints.hpp"
 #include "wpi/math/estimator/UnscentedTransform.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/Discretization.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/math/system/NumericalJacobian.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/filter/Debouncer.hpp b/wpimath/src/main/native/include/wpi/math/filter/Debouncer.hpp
index 318486d990..76106ea087 100644
--- a/wpimath/src/main/native/include/wpi/math/filter/Debouncer.hpp
+++ b/wpimath/src/main/native/include/wpi/math/filter/Debouncer.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/units/time.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/timestamp.h"
 
-#include "wpi/units/time.hpp"
-
 namespace frc {
 /**
  * A simple debounce filter for boolean streams.  Requires that the boolean
diff --git a/wpimath/src/main/native/include/wpi/math/filter/LinearFilter.hpp b/wpimath/src/main/native/include/wpi/math/filter/LinearFilter.hpp
index b5ab5a6e78..09e0a392a1 100644
--- a/wpimath/src/main/native/include/wpi/math/filter/LinearFilter.hpp
+++ b/wpimath/src/main/native/include/wpi/math/filter/LinearFilter.hpp
@@ -13,12 +13,12 @@
 
 #include <Eigen/QR>
 #include <gcem.hpp>
-#include "wpi/util/array.hpp"
-#include "wpi/util/circular_buffer.hpp"
 
 #include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/units/time.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/array.hpp"
+#include "wpi/util/circular_buffer.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/filter/SlewRateLimiter.hpp b/wpimath/src/main/native/include/wpi/math/filter/SlewRateLimiter.hpp
index c34fb647ed..9e954cdc83 100644
--- a/wpimath/src/main/native/include/wpi/math/filter/SlewRateLimiter.hpp
+++ b/wpimath/src/main/native/include/wpi/math/filter/SlewRateLimiter.hpp
@@ -6,10 +6,9 @@
 
 #include <algorithm>
 
-#include "wpi/util/timestamp.h"
-
-#include "wpi/units/time.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/timestamp.h"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/CoordinateAxis.hpp b/wpimath/src/main/native/include/wpi/math/geometry/CoordinateAxis.hpp
index 9196ba8433..d5d8fbfb07 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/CoordinateAxis.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/CoordinateAxis.hpp
@@ -6,10 +6,10 @@
 
 #include <Eigen/Core>
 #include <gcem.hpp>
-#include "wpi/util/SymbolExports.hpp"
 
 #include "wpi/math/geometry/Pose3d.hpp"
 #include "wpi/math/geometry/Rotation3d.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/CoordinateSystem.hpp b/wpimath/src/main/native/include/wpi/math/geometry/CoordinateSystem.hpp
index 84d2519808..5b5efb64b5 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/CoordinateSystem.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/CoordinateSystem.hpp
@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/CoordinateAxis.hpp"
 #include "wpi/math/geometry/Pose3d.hpp"
 #include "wpi/math/geometry/Rotation3d.hpp"
 #include "wpi/math/geometry/Translation3d.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Ellipse2d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Ellipse2d.hpp
index 9fd187b849..37a2481f80 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Ellipse2d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Ellipse2d.hpp
@@ -7,8 +7,6 @@
 #include <stdexcept>
 
 #include <gcem.hpp>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
 
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
@@ -16,6 +14,8 @@
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Pose2d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Pose2d.hpp
index 3c238bd241..66a8899db7 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Pose2d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Pose2d.hpp
@@ -10,12 +10,12 @@
 #include <utility>
 
 #include <gcem.hpp>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/json_fwd.hpp"
 
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/units/length.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Pose3d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Pose3d.hpp
index 4c39f8e630..b90cc984d2 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Pose3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Pose3d.hpp
@@ -12,13 +12,13 @@
 #include <utility>
 
 #include <Eigen/Core>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/json_fwd.hpp"
 
-#include "wpi/math/linalg/ct_matrix.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation3d.hpp"
 #include "wpi/math/geometry/Translation3d.hpp"
+#include "wpi/math/linalg/ct_matrix.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Quaternion.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Quaternion.hpp
index 01e3ef1774..4fa3831c92 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Quaternion.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Quaternion.hpp
@@ -8,6 +8,7 @@
 
 #include <Eigen/Core>
 #include <gcem.hpp>
+
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/json_fwd.hpp"
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Rectangle2d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Rectangle2d.hpp
index fa114b29d9..10ef949680 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Rectangle2d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Rectangle2d.hpp
@@ -7,14 +7,13 @@
 #include <algorithm>
 #include <stdexcept>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/geometry/Transform2d.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Rotation2d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Rotation2d.hpp
index 036519a34b..0961421dcd 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Rotation2d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Rotation2d.hpp
@@ -9,14 +9,14 @@
 
 #include <Eigen/Core>
 #include <gcem.hpp>
+
+#include "wpi/math/linalg/ct_matrix.hpp"
+#include "wpi/math/util/MathShared.hpp"
+#include "wpi/units/angle.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/json_fwd.hpp"
 
-#include "wpi/math/linalg/ct_matrix.hpp"
-#include "wpi/units/angle.hpp"
-#include "wpi/math/util/MathShared.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Rotation3d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Rotation3d.hpp
index 664880f9bb..9548c4ce4c 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Rotation3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Rotation3d.hpp
@@ -10,16 +10,16 @@
 #include <Eigen/Core>
 #include <fmt/format.h>
 #include <gcem.hpp>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/json_fwd.hpp"
 
-#include "wpi/math/linalg/ct_matrix.hpp"
 #include "wpi/math/fmt/Eigen.hpp"
 #include "wpi/math/geometry/Quaternion.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/math/linalg/ct_matrix.hpp"
+#include "wpi/math/util/MathShared.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/math.hpp"
-#include "wpi/math/util/MathShared.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Transform2d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Transform2d.hpp
index df4f633d15..fe257e76cf 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Transform2d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Transform2d.hpp
@@ -6,10 +6,9 @@
 
 #include <utility>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Transform3d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Transform3d.hpp
index 81571416fa..e235986578 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Transform3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Transform3d.hpp
@@ -6,10 +6,9 @@
 
 #include <utility>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Transform2d.hpp"
 #include "wpi/math/geometry/Translation3d.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Translation2d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Translation2d.hpp
index acec201e9f..9270e38448 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Translation2d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Translation2d.hpp
@@ -9,13 +9,13 @@
 #include <span>
 
 #include <Eigen/Core>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/json_fwd.hpp"
 
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/units/area.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Translation3d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Translation3d.hpp
index f6624bc240..564394ad6e 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Translation3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Translation3d.hpp
@@ -9,14 +9,14 @@
 #include <span>
 
 #include <Eigen/Core>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/json_fwd.hpp"
 
 #include "wpi/math/geometry/Rotation3d.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/units/area.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Twist2d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Twist2d.hpp
index 3e7226d024..9406c4fe1b 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Twist2d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Twist2d.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/Twist3d.hpp b/wpimath/src/main/native/include/wpi/math/geometry/Twist3d.hpp
index bb5abbba12..01debdd51c 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/Twist3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/Twist3d.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Ellipse2dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Ellipse2dProto.hpp
index 6afd272d7c..d8b8ddaa09 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Ellipse2dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Ellipse2dProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Ellipse2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Ellipse2d.hpp"
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Pose2dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Pose2dProto.hpp
index 7907a17326..1f832c77d6 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Pose2dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Pose2dProto.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "pb.h"
+#include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Pose2d.hpp"
-#include "pb.h"
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Pose3dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Pose3dProto.hpp
index 8150840252..46fdd17871 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Pose3dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Pose3dProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Pose3d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Pose3d.hpp"
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/QuaternionProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/QuaternionProto.hpp
index 06aa42dae1..a9cb881d2e 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/QuaternionProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/QuaternionProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Quaternion.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Quaternion.hpp"
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Rectangle2dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Rectangle2dProto.hpp
index 5c94d3631c..319b445a5b 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Rectangle2dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Rectangle2dProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Rectangle2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Rectangle2d.hpp"
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation2dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation2dProto.hpp
index baeb0f4b3e..91493fcff4 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation2dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation2dProto.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "pb.h"
+#include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Rotation2d.hpp"
-#include "pb.h"
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation3dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation3dProto.hpp
index 1f475fd2be..96ff0dfabe 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation3dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Rotation3dProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Rotation3d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Rotation3d.hpp"
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Transform2dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Transform2dProto.hpp
index b9eb5688d3..5c0d5a46a8 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Transform2dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Transform2dProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Transform2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Transform2d.hpp"
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Transform3dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Transform3dProto.hpp
index ea9e2be303..9be0d7c8a2 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Transform3dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Transform3dProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Transform3d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Transform3d.hpp"
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Translation2dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Translation2dProto.hpp
index 7b602a913c..010f4f25e9 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Translation2dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Translation2dProto.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "pb.h"
+#include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Translation2d.hpp"
-#include "pb.h"
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Translation3dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Translation3dProto.hpp
index 85d1186c62..38af2c7841 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Translation3dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Translation3dProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Translation3d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Translation3d.hpp"
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Twist2dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Twist2dProto.hpp
index ef662927f0..7ae0a2985c 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Twist2dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Twist2dProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Twist2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Twist2d.hpp"
 #include "wpimath/protobuf/geometry2d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/proto/Twist3dProto.hpp b/wpimath/src/main/native/include/wpi/math/geometry/proto/Twist3dProto.hpp
index fa0daa6224..768f135d0a 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/proto/Twist3dProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/proto/Twist3dProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Twist3d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/geometry/Twist3d.hpp"
 #include "wpimath/protobuf/geometry3d.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Ellipse2dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Ellipse2dStruct.hpp
index bd809f3205..9ddc2809e8 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Ellipse2dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Ellipse2dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Ellipse2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Ellipse2d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Ellipse2d> {
   static constexpr std::string_view GetTypeName() { return "Ellipse2d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Pose2dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Pose2dStruct.hpp
index 4964f333c1..de4bfc79da 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Pose2dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Pose2dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Pose2d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Pose2d> {
   static constexpr std::string_view GetTypeName() { return "Pose2d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Pose3dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Pose3dStruct.hpp
index 14f5722b95..bca905129f 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Pose3dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Pose3dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Pose3d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Pose3d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Pose3d> {
   static constexpr std::string_view GetTypeName() { return "Pose3d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/QuaternionStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/QuaternionStruct.hpp
index 0775e547a8..bb73c93578 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/QuaternionStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/QuaternionStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Quaternion.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Quaternion.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Quaternion> {
   static constexpr std::string_view GetTypeName() { return "Quaternion"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Rectangle2dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Rectangle2dStruct.hpp
index 4c11425950..4ac58c0b1a 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Rectangle2dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Rectangle2dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Rectangle2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Rectangle2d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Rectangle2d> {
   static constexpr std::string_view GetTypeName() { return "Rectangle2d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation2dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation2dStruct.hpp
index 52203577ba..b7915e89e9 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation2dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation2dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Rotation2d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Rotation2d> {
   static constexpr std::string_view GetTypeName() { return "Rotation2d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation3dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation3dStruct.hpp
index e0a651ec4b..6b768dee9a 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation3dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Rotation3dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Rotation3d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Rotation3d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Rotation3d> {
   static constexpr std::string_view GetTypeName() { return "Rotation3d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Transform2dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Transform2dStruct.hpp
index 88cf9352fe..607426ebe0 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Transform2dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Transform2dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Transform2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Transform2d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Transform2d> {
   static constexpr std::string_view GetTypeName() { return "Transform2d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Transform3dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Transform3dStruct.hpp
index ea81d0d228..c1afec39b5 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Transform3dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Transform3dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Transform3d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Transform3d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Transform3d> {
   static constexpr std::string_view GetTypeName() { return "Transform3d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Translation2dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Translation2dStruct.hpp
index bbf6a24c42..191c0b268d 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Translation2dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Translation2dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Translation2d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Translation2d> {
   static constexpr std::string_view GetTypeName() { return "Translation2d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Translation3dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Translation3dStruct.hpp
index f969af0b73..5a4315df3c 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Translation3dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Translation3dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Translation3d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Translation3d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Translation3d> {
   static constexpr std::string_view GetTypeName() { return "Translation3d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Twist2dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Twist2dStruct.hpp
index 11e1417559..6b5396f067 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Twist2dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Twist2dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Twist2d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Twist2d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Twist2d> {
   static constexpr std::string_view GetTypeName() { return "Twist2d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/geometry/struct/Twist3dStruct.hpp b/wpimath/src/main/native/include/wpi/math/geometry/struct/Twist3dStruct.hpp
index 8407c9fc42..e2607162b4 100644
--- a/wpimath/src/main/native/include/wpi/math/geometry/struct/Twist3dStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/geometry/struct/Twist3dStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/geometry/Twist3d.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/geometry/Twist3d.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::Twist3d> {
   static constexpr std::string_view GetTypeName() { return "Twist3d"; }
diff --git a/wpimath/src/main/native/include/wpi/math/interpolation/TimeInterpolatableBuffer.hpp b/wpimath/src/main/native/include/wpi/math/interpolation/TimeInterpolatableBuffer.hpp
index 129f75064e..d7de0020b9 100644
--- a/wpimath/src/main/native/include/wpi/math/interpolation/TimeInterpolatableBuffer.hpp
+++ b/wpimath/src/main/native/include/wpi/math/interpolation/TimeInterpolatableBuffer.hpp
@@ -10,11 +10,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/MathExtras.hpp"
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/ChassisSpeeds.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/ChassisSpeeds.hpp
index e22e22e911..45bad721b0 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/ChassisSpeeds.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/ChassisSpeeds.hpp
@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/units/angular_velocity.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveKinematics.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveKinematics.hpp
index d6fcbb9ae6..1c8af561ac 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveKinematics.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveKinematics.hpp
@@ -6,16 +6,15 @@
 
 #include <type_traits>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Twist2d.hpp"
 #include "wpi/math/kinematics/ChassisSpeeds.hpp"
 #include "wpi/math/kinematics/DifferentialDriveWheelPositions.hpp"
 #include "wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp"
 #include "wpi/math/kinematics/Kinematics.hpp"
+#include "wpi/math/util/MathShared.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
-#include "wpi/math/util/MathShared.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry.hpp
index ca69fa31f2..b608551f85 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry.hpp
@@ -4,14 +4,13 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/math/kinematics/DifferentialDriveWheelPositions.hpp"
 #include "wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp"
 #include "wpi/math/kinematics/Odometry.hpp"
 #include "wpi/units/length.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry3d.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry3d.hpp
index b44092290a..f1d3d5cf0f 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveOdometry3d.hpp
@@ -4,14 +4,13 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/math/kinematics/DifferentialDriveWheelPositions.hpp"
 #include "wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp"
 #include "wpi/math/kinematics/Odometry3d.hpp"
 #include "wpi/units/length.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelPositions.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelPositions.hpp
index ca271ebec2..45fd579985 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelPositions.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelPositions.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/units/length.hpp"
 #include "wpi/util/MathExtras.hpp"
 #include "wpi/util/SymbolExports.hpp"
 
-#include "wpi/units/length.hpp"
-
 namespace frc {
 /**
  * Represents the wheel positions for a differential drive drivetrain.
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp
index 6ec8656037..3c89bc4114 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/units/math.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/Kinematics.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/Kinematics.hpp
index 813ccf6655..a5f514de9b 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/Kinematics.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/Kinematics.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Twist2d.hpp"
 #include "wpi/math/kinematics/ChassisSpeeds.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveKinematics.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveKinematics.hpp
index f288f76b82..f4f2e7157a 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveKinematics.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveKinematics.hpp
@@ -5,16 +5,16 @@
 #pragma once
 
 #include <Eigen/QR>
-#include "wpi/util/SymbolExports.hpp"
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/math/geometry/Twist2d.hpp"
 #include "wpi/math/kinematics/ChassisSpeeds.hpp"
 #include "wpi/math/kinematics/Kinematics.hpp"
 #include "wpi/math/kinematics/MecanumDriveWheelPositions.hpp"
 #include "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry.hpp
index b68634b34a..8d01bbbdc6 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry.hpp
@@ -4,15 +4,14 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpi/math/kinematics/MecanumDriveWheelPositions.hpp"
 #include "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp"
 #include "wpi/math/kinematics/Odometry.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/timestamp.h"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry3d.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry3d.hpp
index 1a7bfd7d60..d20cf5fc1e 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveOdometry3d.hpp
@@ -4,15 +4,14 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/timestamp.h"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpi/math/kinematics/MecanumDriveWheelPositions.hpp"
 #include "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp"
 #include "wpi/math/kinematics/Odometry3d.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/timestamp.h"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelPositions.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelPositions.hpp
index 759b520aaf..9fd0aa4e29 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelPositions.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelPositions.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/units/length.hpp"
 #include "wpi/util/MathExtras.hpp"
 #include "wpi/util/SymbolExports.hpp"
 
-#include "wpi/units/length.hpp"
-
 namespace frc {
 /**
  * Represents the wheel positions for a mecanum drive drivetrain.
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp
index 270f785873..ab908cf68a 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp
@@ -8,10 +8,9 @@
 #include <array>
 #include <cmath>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/units/math.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/Odometry.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/Odometry.hpp
index defe9592db..7093df2d21 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/Odometry.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/Odometry.hpp
@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/math/kinematics/Kinematics.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/Odometry3d.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/Odometry3d.hpp
index 85f4eba7a8..c6b1b447f5 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/Odometry3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/Odometry3d.hpp
@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Pose3d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
@@ -13,6 +11,7 @@
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/math/geometry/Translation3d.hpp"
 #include "wpi/math/kinematics/Kinematics.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveKinematics.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveKinematics.hpp
index b120bc203f..a675cc7adc 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveKinematics.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveKinematics.hpp
@@ -9,10 +9,7 @@
 #include <cstddef>
 
 #include <Eigen/QR>
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/math/geometry/Twist2d.hpp"
@@ -20,9 +17,12 @@
 #include "wpi/math/kinematics/Kinematics.hpp"
 #include "wpi/math/kinematics/SwerveModulePosition.hpp"
 #include "wpi/math/kinematics/SwerveModuleState.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/math/util/MathShared.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/velocity.hpp"
-#include "wpi/math/util/MathShared.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry.hpp
index ee308f45a4..3f0dd423d8 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry.hpp
@@ -7,15 +7,14 @@
 #include <cstddef>
 #include <ctime>
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/timestamp.h"
-
+#include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/Odometry.hpp"
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
 #include "wpi/math/kinematics/SwerveModulePosition.hpp"
 #include "wpi/math/kinematics/SwerveModuleState.hpp"
-#include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/util/MathShared.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/timestamp.h"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry3d.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry3d.hpp
index f55913330e..4f26ddedd8 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry3d.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveDriveOdometry3d.hpp
@@ -8,15 +8,14 @@
 #include <cstddef>
 #include <ctime>
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/timestamp.h"
-
+#include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/Odometry3d.hpp"
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
 #include "wpi/math/kinematics/SwerveModulePosition.hpp"
 #include "wpi/math/kinematics/SwerveModuleState.hpp"
-#include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/timestamp.h"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/SwerveModulePosition.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveModulePosition.hpp
index bda4a0a0f0..6b29b60922 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/SwerveModulePosition.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveModulePosition.hpp
@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include "wpi/util/MathExtras.hpp"
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/SwerveModuleState.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveModuleState.hpp
index 5c35847db2..ce02db2735 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/SwerveModuleState.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/SwerveModuleState.hpp
@@ -4,12 +4,11 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/ChassisSpeedsProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/ChassisSpeedsProto.hpp
index 090697fad4..b8c53907e4 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/ChassisSpeedsProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/ChassisSpeedsProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/ChassisSpeeds.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/kinematics/ChassisSpeeds.hpp"
 #include "wpimath/protobuf/kinematics.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveKinematicsProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveKinematicsProto.hpp
index 537969a4f0..0dd48a504f 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveKinematicsProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveKinematicsProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpimath/protobuf/kinematics.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelPositionsProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelPositionsProto.hpp
index 68de9c76c6..1cc4af0da4 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelPositionsProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelPositionsProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/DifferentialDriveWheelPositions.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/kinematics/DifferentialDriveWheelPositions.hpp"
 #include "wpimath/protobuf/kinematics.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.hpp
index aacab3c5a4..3396a3abe2 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/DifferentialDriveWheelSpeedsProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp"
 #include "wpimath/protobuf/kinematics.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveKinematicsProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveKinematicsProto.hpp
index a09aa88a71..33c6d550c5 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveKinematicsProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveKinematicsProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpimath/protobuf/kinematics.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelPositionsProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelPositionsProto.hpp
index 2be5e30776..7ed4ca0ebc 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelPositionsProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelPositionsProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/MecanumDriveWheelPositions.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/kinematics/MecanumDriveWheelPositions.hpp"
 #include "wpimath/protobuf/kinematics.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelSpeedsProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelSpeedsProto.hpp
index 37aa0b03dd..167394c588 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelSpeedsProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/MecanumDriveWheelSpeedsProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp"
 #include "wpimath/protobuf/kinematics.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp
index c057ce6f95..79058313e1 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp
@@ -7,10 +7,10 @@
 #include <stdexcept>
 
 #include <fmt/format.h>
-#include "wpi/util/protobuf/Protobuf.hpp"
-#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
+#include "wpi/util/protobuf/Protobuf.hpp"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 #include "wpimath/protobuf/kinematics.npb.h"
 
 template <size_t NumModules>
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModulePositionProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModulePositionProto.hpp
index 787c3be6e9..d44b71cc33 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModulePositionProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModulePositionProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/SwerveModulePosition.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/kinematics/SwerveModulePosition.hpp"
 #include "wpimath/protobuf/kinematics.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModuleStateProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModuleStateProto.hpp
index 04ffb9e162..6da75cdf4e 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModuleStateProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveModuleStateProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/SwerveModuleState.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/kinematics/SwerveModuleState.hpp"
 #include "wpimath/protobuf/kinematics.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/ChassisSpeedsStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/ChassisSpeedsStruct.hpp
index 69e66ad629..f0114220f3 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/ChassisSpeedsStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/ChassisSpeedsStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/ChassisSpeeds.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/kinematics/ChassisSpeeds.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::ChassisSpeeds> {
   static constexpr std::string_view GetTypeName() { return "ChassisSpeeds"; }
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveKinematicsStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveKinematicsStruct.hpp
index a4f9f35e47..03b1167860 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveKinematicsStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveKinematicsStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::DifferentialDriveKinematics> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.hpp
index b94d7a3754..f99d7381ad 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelPositionsStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/DifferentialDriveWheelPositions.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/kinematics/DifferentialDriveWheelPositions.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::DifferentialDriveWheelPositions> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.hpp
index 94dd6c6bca..45f83f0265 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/DifferentialDriveWheelSpeedsStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::DifferentialDriveWheelSpeeds> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveKinematicsStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveKinematicsStruct.hpp
index 0620ce3c4a..a4db523874 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveKinematicsStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveKinematicsStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::MecanumDriveKinematics> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelPositionsStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelPositionsStruct.hpp
index 18a8dae305..81b1b55ea8 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelPositionsStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelPositionsStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/MecanumDriveWheelPositions.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/kinematics/MecanumDriveWheelPositions.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::MecanumDriveWheelPositions> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.hpp
index 008d8d6659..de7678022e 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/MecanumDriveWheelSpeedsStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::MecanumDriveWheelSpeeds> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp
index 12410d2172..45bc12fd74 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp
@@ -5,10 +5,10 @@
 #pragma once
 
 #include <fmt/format.h>
-#include "wpi/util/ct_string.hpp"
-#include "wpi/util/struct/Struct.hpp"
 
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
+#include "wpi/util/ct_string.hpp"
+#include "wpi/util/struct/Struct.hpp"
 
 template <size_t NumModules>
 struct wpi::Struct<frc::SwerveDriveKinematics<NumModules>> {
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModulePositionStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModulePositionStruct.hpp
index 427b78ddc6..344100d182 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModulePositionStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModulePositionStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/SwerveModulePosition.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/kinematics/SwerveModulePosition.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::SwerveModulePosition> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModuleStateStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModuleStateStruct.hpp
index 2edc93c8de..c9f626181f 100644
--- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModuleStateStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveModuleStateStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/kinematics/SwerveModuleState.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/kinematics/SwerveModuleState.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::SwerveModuleState> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/linalg/DARE.hpp b/wpimath/src/main/native/include/wpi/math/linalg/DARE.hpp
index 156cdf572f..6db59d8fe0 100644
--- a/wpimath/src/main/native/include/wpi/math/linalg/DARE.hpp
+++ b/wpimath/src/main/native/include/wpi/math/linalg/DARE.hpp
@@ -9,9 +9,9 @@
 #include <Eigen/Cholesky>
 #include <Eigen/Core>
 #include <Eigen/LU>
-#include "wpi/util/expected"
 
 #include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/util/expected"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp b/wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp
index e0fd7dc97b..fd3d2c8bda 100644
--- a/wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp
@@ -7,10 +7,10 @@
 #include <stdexcept>
 
 #include <fmt/format.h>
-#include "wpi/util/protobuf/Protobuf.hpp"
-#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/util/protobuf/Protobuf.hpp"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 #include "wpimath/protobuf/wpimath.npb.h"
 
 template <int Rows, int Cols, int Options, int MaxRows, int MaxCols>
diff --git a/wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp b/wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp
index 4ed412845c..c39bef2391 100644
--- a/wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp
@@ -7,10 +7,10 @@
 #include <stdexcept>
 
 #include <fmt/format.h>
-#include "wpi/util/protobuf/Protobuf.hpp"
-#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/util/protobuf/Protobuf.hpp"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 #include "wpimath/protobuf/wpimath.npb.h"
 
 template <int Size, int Options, int MaxRows, int MaxCols>
diff --git a/wpimath/src/main/native/include/wpi/math/linalg/struct/StructProto.hpp b/wpimath/src/main/native/include/wpi/math/linalg/struct/StructProto.hpp
index 418b67d0c2..eb6cadfde8 100644
--- a/wpimath/src/main/native/include/wpi/math/linalg/struct/StructProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/linalg/struct/StructProto.hpp
@@ -5,10 +5,10 @@
 #pragma once
 
 #include <fmt/format.h>
-#include "wpi/util/ct_string.hpp"
-#include "wpi/util/struct/Struct.hpp"
 
 #include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/util/ct_string.hpp"
+#include "wpi/util/struct/Struct.hpp"
 
 template <int Rows, int Cols, int Options, int MaxRows, int MaxCols>
   requires(Cols != 1)
diff --git a/wpimath/src/main/native/include/wpi/math/linalg/struct/VectorStruct.hpp b/wpimath/src/main/native/include/wpi/math/linalg/struct/VectorStruct.hpp
index c26badcb94..dc72505b0a 100644
--- a/wpimath/src/main/native/include/wpi/math/linalg/struct/VectorStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/linalg/struct/VectorStruct.hpp
@@ -5,10 +5,10 @@
 #pragma once
 
 #include <fmt/format.h>
-#include "wpi/util/ct_string.hpp"
-#include "wpi/util/struct/Struct.hpp"
 
 #include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/util/ct_string.hpp"
+#include "wpi/util/struct/Struct.hpp"
 
 template <int Size, int Options, int MaxRows, int MaxCols>
 struct wpi::Struct<frc::Matrixd<Size, 1, Options, MaxRows, MaxCols>> {
diff --git a/wpimath/src/main/native/include/wpi/math/path/TravelingSalesman.hpp b/wpimath/src/main/native/include/wpi/math/path/TravelingSalesman.hpp
index 0ce6a31e4e..180b65d949 100644
--- a/wpimath/src/main/native/include/wpi/math/path/TravelingSalesman.hpp
+++ b/wpimath/src/main/native/include/wpi/math/path/TravelingSalesman.hpp
@@ -10,11 +10,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/array.hpp"
-
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/optimization/SimulatedAnnealing.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/spline/CubicHermiteSpline.hpp b/wpimath/src/main/native/include/wpi/math/spline/CubicHermiteSpline.hpp
index 0edbe5fa0b..471b984b1e 100644
--- a/wpimath/src/main/native/include/wpi/math/spline/CubicHermiteSpline.hpp
+++ b/wpimath/src/main/native/include/wpi/math/spline/CubicHermiteSpline.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
-
 #include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/spline/Spline.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/spline/QuinticHermiteSpline.hpp b/wpimath/src/main/native/include/wpi/math/spline/QuinticHermiteSpline.hpp
index cf5552b866..c33d358eec 100644
--- a/wpimath/src/main/native/include/wpi/math/spline/QuinticHermiteSpline.hpp
+++ b/wpimath/src/main/native/include/wpi/math/spline/QuinticHermiteSpline.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
-
 #include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/spline/Spline.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/spline/Spline.hpp b/wpimath/src/main/native/include/wpi/math/spline/Spline.hpp
index 7d7b99e1c3..12a6d37756 100644
--- a/wpimath/src/main/native/include/wpi/math/spline/Spline.hpp
+++ b/wpimath/src/main/native/include/wpi/math/spline/Spline.hpp
@@ -8,12 +8,12 @@
 #include <utility>
 
 #include <gcem.hpp>
-#include "wpi/util/array.hpp"
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/units/curvature.hpp"
 #include "wpi/units/length.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/spline/SplineHelper.hpp b/wpimath/src/main/native/include/wpi/math/spline/SplineHelper.hpp
index 955c7f8e34..1e577d7a16 100644
--- a/wpimath/src/main/native/include/wpi/math/spline/SplineHelper.hpp
+++ b/wpimath/src/main/native/include/wpi/math/spline/SplineHelper.hpp
@@ -7,11 +7,10 @@
 #include <cstddef>
 #include <vector>
 
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/array.hpp"
-
 #include "wpi/math/spline/CubicHermiteSpline.hpp"
 #include "wpi/math/spline/QuinticHermiteSpline.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/array.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/spline/SplineParameterizer.hpp b/wpimath/src/main/native/include/wpi/math/spline/SplineParameterizer.hpp
index 31d51cebff..124ee32357 100644
--- a/wpimath/src/main/native/include/wpi/math/spline/SplineParameterizer.hpp
+++ b/wpimath/src/main/native/include/wpi/math/spline/SplineParameterizer.hpp
@@ -33,13 +33,12 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/spline/Spline.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/curvature.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/spline/proto/CubicHermiteSplineProto.hpp b/wpimath/src/main/native/include/wpi/math/spline/proto/CubicHermiteSplineProto.hpp
index ba9c78079e..35950ecd24 100644
--- a/wpimath/src/main/native/include/wpi/math/spline/proto/CubicHermiteSplineProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/spline/proto/CubicHermiteSplineProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/spline/CubicHermiteSpline.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/spline/CubicHermiteSpline.hpp"
 #include "wpimath/protobuf/spline.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/spline/proto/QuinticHermiteSplineProto.hpp b/wpimath/src/main/native/include/wpi/math/spline/proto/QuinticHermiteSplineProto.hpp
index 56e60ca115..4f189437e6 100644
--- a/wpimath/src/main/native/include/wpi/math/spline/proto/QuinticHermiteSplineProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/spline/proto/QuinticHermiteSplineProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/spline/QuinticHermiteSpline.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/spline/QuinticHermiteSpline.hpp"
 #include "wpimath/protobuf/spline.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/spline/struct/CubicHermiteSplineStruct.hpp b/wpimath/src/main/native/include/wpi/math/spline/struct/CubicHermiteSplineStruct.hpp
index 9207fbbf33..fc7b5f65a6 100644
--- a/wpimath/src/main/native/include/wpi/math/spline/struct/CubicHermiteSplineStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/spline/struct/CubicHermiteSplineStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/spline/CubicHermiteSpline.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/spline/CubicHermiteSpline.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::CubicHermiteSpline> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/spline/struct/QuinticHermiteSplineStruct.hpp b/wpimath/src/main/native/include/wpi/math/spline/struct/QuinticHermiteSplineStruct.hpp
index 3458e95c0d..c650cada04 100644
--- a/wpimath/src/main/native/include/wpi/math/spline/struct/QuinticHermiteSplineStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/spline/struct/QuinticHermiteSplineStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/spline/QuinticHermiteSpline.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/spline/QuinticHermiteSpline.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::QuinticHermiteSpline> {
   static constexpr std::string_view GetTypeName() {
diff --git a/wpimath/src/main/native/include/wpi/math/system/LinearSystem.hpp b/wpimath/src/main/native/include/wpi/math/system/LinearSystem.hpp
index eb523151f2..ac3761b83a 100644
--- a/wpimath/src/main/native/include/wpi/math/system/LinearSystem.hpp
+++ b/wpimath/src/main/native/include/wpi/math/system/LinearSystem.hpp
@@ -10,12 +10,12 @@
 #include <type_traits>
 
 #include <gcem.hpp>
-#include "wpi/util/Algorithm.hpp"
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/Discretization.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/Algorithm.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/system/LinearSystemLoop.hpp b/wpimath/src/main/native/include/wpi/math/system/LinearSystemLoop.hpp
index a729fac05d..2656d3ce39 100644
--- a/wpimath/src/main/native/include/wpi/math/system/LinearSystemLoop.hpp
+++ b/wpimath/src/main/native/include/wpi/math/system/LinearSystemLoop.hpp
@@ -6,15 +6,14 @@
 
 #include <functional>
 
-#include "wpi/util/SymbolExports.hpp"
-
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/controller/LinearPlantInversionFeedforward.hpp"
 #include "wpi/math/controller/LinearQuadraticRegulator.hpp"
 #include "wpi/math/estimator/KalmanFilter.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/voltage.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/system/plant/DCMotor.hpp b/wpimath/src/main/native/include/wpi/math/system/plant/DCMotor.hpp
index cebfd6e390..a8bedb2e34 100644
--- a/wpimath/src/main/native/include/wpi/math/system/plant/DCMotor.hpp
+++ b/wpimath/src/main/native/include/wpi/math/system/plant/DCMotor.hpp
@@ -4,13 +4,12 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/units/angular_velocity.hpp"
 #include "wpi/units/current.hpp"
 #include "wpi/units/impedance.hpp"
 #include "wpi/units/torque.hpp"
 #include "wpi/units/voltage.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/system/plant/LinearSystemId.hpp b/wpimath/src/main/native/include/wpi/math/system/plant/LinearSystemId.hpp
index 94a71ddd99..e6ab5f70c5 100644
--- a/wpimath/src/main/native/include/wpi/math/system/plant/LinearSystemId.hpp
+++ b/wpimath/src/main/native/include/wpi/math/system/plant/LinearSystemId.hpp
@@ -8,7 +8,6 @@
 #include <stdexcept>
 
 #include <gcem.hpp>
-#include "wpi/util/SymbolExports.hpp"
 
 #include "wpi/math/system/LinearSystem.hpp"
 #include "wpi/math/system/plant/DCMotor.hpp"
@@ -19,6 +18,7 @@
 #include "wpi/units/moment_of_inertia.hpp"
 #include "wpi/units/velocity.hpp"
 #include "wpi/units/voltage.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/system/plant/proto/DCMotorProto.hpp b/wpimath/src/main/native/include/wpi/math/system/plant/proto/DCMotorProto.hpp
index 0f3d861ca9..33ae790a8c 100644
--- a/wpimath/src/main/native/include/wpi/math/system/plant/proto/DCMotorProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/system/plant/proto/DCMotorProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/system/plant/DCMotor.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/system/plant/DCMotor.hpp"
 #include "wpimath/protobuf/plant.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/system/plant/struct/DCMotorStruct.hpp b/wpimath/src/main/native/include/wpi/math/system/plant/struct/DCMotorStruct.hpp
index 11f0e69d4a..417c21e2cb 100644
--- a/wpimath/src/main/native/include/wpi/math/system/plant/struct/DCMotorStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/system/plant/struct/DCMotorStruct.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
+#include "wpi/math/system/plant/DCMotor.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/struct/Struct.hpp"
 
-#include "wpi/math/system/plant/DCMotor.hpp"
-
 template <>
 struct WPILIB_DLLEXPORT wpi::Struct<frc::DCMotor> {
   static constexpr std::string_view GetTypeName() { return "DCMotor"; }
diff --git a/wpimath/src/main/native/include/wpi/math/system/proto/LinearSystemProto.hpp b/wpimath/src/main/native/include/wpi/math/system/proto/LinearSystemProto.hpp
index 4f04169e3f..cc74931c66 100644
--- a/wpimath/src/main/native/include/wpi/math/system/proto/LinearSystemProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/system/proto/LinearSystemProto.hpp
@@ -8,11 +8,11 @@
 #include <utility>
 
 #include <fmt/format.h>
-#include "wpi/util/protobuf/Protobuf.hpp"
-#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
 #include "wpi/math/linalg/proto/MatrixProto.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
+#include "wpi/util/protobuf/Protobuf.hpp"
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 #include "wpimath/protobuf/system.npb.h"
 
 template <int States, int Inputs, int Outputs>
diff --git a/wpimath/src/main/native/include/wpi/math/system/struct/LinearSystemStruct.hpp b/wpimath/src/main/native/include/wpi/math/system/struct/LinearSystemStruct.hpp
index 42b8492b7b..ffeff892f9 100644
--- a/wpimath/src/main/native/include/wpi/math/system/struct/LinearSystemStruct.hpp
+++ b/wpimath/src/main/native/include/wpi/math/system/struct/LinearSystemStruct.hpp
@@ -5,11 +5,11 @@
 #pragma once
 
 #include <fmt/format.h>
-#include "wpi/util/ct_string.hpp"
-#include "wpi/util/struct/Struct.hpp"
 
 #include "wpi/math/linalg/struct/StructProto.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
+#include "wpi/util/ct_string.hpp"
+#include "wpi/util/struct/Struct.hpp"
 
 template <int States, int Inputs, int Outputs>
 struct wpi::Struct<frc::LinearSystem<States, Inputs, Outputs>> {
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/Trajectory.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/Trajectory.hpp
index 3ad171e9df..db9f48141e 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/Trajectory.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/Trajectory.hpp
@@ -8,10 +8,6 @@
 #include <stdexcept>
 #include <vector>
 
-#include "wpi/util/MathExtras.hpp"
-#include "wpi/util/SymbolExports.hpp"
-#include "wpi/util/json_fwd.hpp"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Transform2d.hpp"
 #include "wpi/units/acceleration.hpp"
@@ -19,6 +15,9 @@
 #include "wpi/units/math.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/json_fwd.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryConfig.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryConfig.hpp
index c1cea72d37..6662ad97cf 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryConfig.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryConfig.hpp
@@ -9,8 +9,6 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
@@ -20,6 +18,7 @@
 #include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryGenerator.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryGenerator.hpp
index 163fa4304c..446eb6e5ed 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryGenerator.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryGenerator.hpp
@@ -9,13 +9,12 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/spline/SplineParameterizer.hpp"
 #include "wpi/math/trajectory/Trajectory.hpp"
 #include "wpi/math/trajectory/TrajectoryConfig.hpp"
 #include "wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp"
 #include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryParameterizer.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryParameterizer.hpp
index af2b08e22e..6adfd4785e 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryParameterizer.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/TrajectoryParameterizer.hpp
@@ -32,10 +32,9 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/trajectory/Trajectory.hpp"
 #include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/TrapezoidProfile.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/TrapezoidProfile.hpp
index b6308127b7..69bb5bc647 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/TrapezoidProfile.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/TrapezoidProfile.hpp
@@ -6,9 +6,9 @@
 
 #include <type_traits>
 
+#include "wpi/math/util/MathShared.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/time.hpp"
-#include "wpi/math/util/MathShared.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/CentripetalAccelerationConstraint.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/CentripetalAccelerationConstraint.hpp
index 8d2924840f..3dbf3a8d22 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/CentripetalAccelerationConstraint.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/CentripetalAccelerationConstraint.hpp
@@ -4,13 +4,12 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/curvature.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp
index c2cf48397c..38f03bc8ee 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp
@@ -6,11 +6,10 @@
 
 #include <utility>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveVoltageConstraint.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveVoltageConstraint.hpp
index 55d37db396..cf0c23a182 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveVoltageConstraint.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/DifferentialDriveVoltageConstraint.hpp
@@ -8,15 +8,14 @@
 #include <limits>
 #include <utility>
 
-#include "wpi/util/MathExtras.hpp"
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/controller/SimpleMotorFeedforward.hpp"
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/voltage.hpp"
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/MaxVelocityConstraint.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/MaxVelocityConstraint.hpp
index ad549e11d2..37e71cff78 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/MaxVelocityConstraint.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/MaxVelocityConstraint.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/MecanumDriveKinematicsConstraint.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/MecanumDriveKinematicsConstraint.hpp
index 1031815af7..5f191e4ece 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/MecanumDriveKinematicsConstraint.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/MecanumDriveKinematicsConstraint.hpp
@@ -6,12 +6,11 @@
 
 #include <cmath>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/TrajectoryConstraint.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/TrajectoryConstraint.hpp
index f5589867b3..17db36c8b9 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/constraint/TrajectoryConstraint.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/constraint/TrajectoryConstraint.hpp
@@ -6,12 +6,11 @@
 
 #include <limits>
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/curvature.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 /**
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryProto.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryProto.hpp
index b9e9e26d71..fad9868bd2 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/trajectory/Trajectory.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/trajectory/Trajectory.hpp"
 #include "wpimath/protobuf/trajectory.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryStateProto.hpp b/wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryStateProto.hpp
index 60022eadfa..680a63073b 100644
--- a/wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryStateProto.hpp
+++ b/wpimath/src/main/native/include/wpi/math/trajectory/proto/TrajectoryStateProto.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
+#include "wpi/math/trajectory/Trajectory.hpp"
 #include "wpi/util/SymbolExports.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
-
-#include "wpi/math/trajectory/Trajectory.hpp"
 #include "wpimath/protobuf/trajectory.npb.h"
 
 template <>
diff --git a/wpimath/src/main/native/include/wpi/math/util/ComputerVisionUtil.hpp b/wpimath/src/main/native/include/wpi/math/util/ComputerVisionUtil.hpp
index ab1dba123b..596952aff1 100644
--- a/wpimath/src/main/native/include/wpi/math/util/ComputerVisionUtil.hpp
+++ b/wpimath/src/main/native/include/wpi/math/util/ComputerVisionUtil.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/SymbolExports.hpp"
-
 #include "wpi/math/geometry/Pose3d.hpp"
 #include "wpi/math/geometry/Transform3d.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/util/MathShared.hpp b/wpimath/src/main/native/include/wpi/math/util/MathShared.hpp
index c9726a3154..97fb39b8d5 100644
--- a/wpimath/src/main/native/include/wpi/math/util/MathShared.hpp
+++ b/wpimath/src/main/native/include/wpi/math/util/MathShared.hpp
@@ -7,9 +7,9 @@
 #include <memory>
 
 #include <fmt/format.h>
-#include "wpi/util/SymbolExports.hpp"
 
 #include "wpi/units/time.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace wpi::math {
 
diff --git a/wpimath/src/main/native/include/wpi/math/util/MathUtil.hpp b/wpimath/src/main/native/include/wpi/math/util/MathUtil.hpp
index 77a77e9b7a..c32807aa4b 100644
--- a/wpimath/src/main/native/include/wpi/math/util/MathUtil.hpp
+++ b/wpimath/src/main/native/include/wpi/math/util/MathUtil.hpp
@@ -8,17 +8,17 @@
 #include <type_traits>
 
 #include <gcem.hpp>
-#include "wpi/util/SymbolExports.hpp"
 
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/math/geometry/Translation3d.hpp"
+#include "wpi/math/util/MathShared.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/base.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/velocity.hpp"
-#include "wpi/math/util/MathShared.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 
diff --git a/wpimath/src/main/native/include/wpi/math/util/StateSpaceUtil.hpp b/wpimath/src/main/native/include/wpi/math/util/StateSpaceUtil.hpp
index 340b63b59d..9268f09090 100644
--- a/wpimath/src/main/native/include/wpi/math/util/StateSpaceUtil.hpp
+++ b/wpimath/src/main/native/include/wpi/math/util/StateSpaceUtil.hpp
@@ -12,12 +12,12 @@
 
 #include <Eigen/Eigenvalues>
 #include <Eigen/QR>
+
+#include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/util/Algorithm.hpp"
 #include "wpi/util/SymbolExports.hpp"
 
-#include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/geometry/Pose2d.hpp"
-
 namespace frc {
 
 /**
diff --git a/wpimath/src/test/native/cpp/DARETest.cpp b/wpimath/src/test/native/cpp/DARETest.cpp
index 4ba82bed34..b5b72e00f6 100644
--- a/wpimath/src/test/native/cpp/DARETest.cpp
+++ b/wpimath/src/test/native/cpp/DARETest.cpp
@@ -7,12 +7,12 @@
 #include <Eigen/Core>
 #include <Eigen/Eigenvalues>
 #include <gtest/gtest.h>
-#include "wpi/util/expected"
-#include "wpi/util/print.hpp"
 
+#include "wpi/math/fmt/Eigen.hpp"
 #include "wpi/math/linalg/DARE.hpp"
 #include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/fmt/Eigen.hpp"
+#include "wpi/util/expected"
+#include "wpi/util/print.hpp"
 
 // 2x1
 extern template wpi::expected<Eigen::Matrix<double, 2, 2>, frc::DAREError>
diff --git a/wpimath/src/test/native/cpp/DARETest_Inst_4x1.cpp b/wpimath/src/test/native/cpp/DARETest_Inst_4x1.cpp
index 176b3796d9..5fa1ab1e7d 100644
--- a/wpimath/src/test/native/cpp/DARETest_Inst_4x1.cpp
+++ b/wpimath/src/test/native/cpp/DARETest_Inst_4x1.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/util/expected"
-
 #include "wpi/math/linalg/DARE.hpp"
+#include "wpi/util/expected"
 
 template wpi::expected<Eigen::Matrix<double, 4, 4>, frc::DAREError>
 frc::DARE<4, 1>(const Eigen::Matrix<double, 4, 4>& A,
diff --git a/wpimath/src/test/native/cpp/MathUtilTest.cpp b/wpimath/src/test/native/cpp/MathUtilTest.cpp
index 7f4ec2806a..f87dc991e6 100644
--- a/wpimath/src/test/native/cpp/MathUtilTest.cpp
+++ b/wpimath/src/test/native/cpp/MathUtilTest.cpp
@@ -7,9 +7,9 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/math/geometry/Translation3d.hpp"
+#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
diff --git a/wpimath/src/test/native/cpp/ProtoTestBase.hpp b/wpimath/src/test/native/cpp/ProtoTestBase.hpp
index 45bce36fe2..e1bc16ed78 100644
--- a/wpimath/src/test/native/cpp/ProtoTestBase.hpp
+++ b/wpimath/src/test/native/cpp/ProtoTestBase.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <gtest/gtest.h>
+
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
 
diff --git a/wpimath/src/test/native/cpp/StateSpaceTest.cpp b/wpimath/src/test/native/cpp/StateSpaceTest.cpp
index 2f300d3963..3cf8a3b258 100644
--- a/wpimath/src/test/native/cpp/StateSpaceTest.cpp
+++ b/wpimath/src/test/native/cpp/StateSpaceTest.cpp
@@ -7,10 +7,10 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/controller/LinearPlantInversionFeedforward.hpp"
 #include "wpi/math/controller/LinearQuadraticRegulator.hpp"
 #include "wpi/math/estimator/KalmanFilter.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
 #include "wpi/math/system/LinearSystemLoop.hpp"
 #include "wpi/math/system/plant/DCMotor.hpp"
diff --git a/wpimath/src/test/native/cpp/StructTestBase.hpp b/wpimath/src/test/native/cpp/StructTestBase.hpp
index 383cbb61e5..014db74760 100644
--- a/wpimath/src/test/native/cpp/StructTestBase.hpp
+++ b/wpimath/src/test/native/cpp/StructTestBase.hpp
@@ -5,6 +5,7 @@
 #pragma once
 
 #include <gtest/gtest.h>
+
 #include "wpi/util/struct/Struct.hpp"
 
 template <typename T>
diff --git a/wpimath/src/test/native/cpp/controller/ArmFeedforwardTest.cpp b/wpimath/src/test/native/cpp/controller/ArmFeedforwardTest.cpp
index 35ce225def..b2f1d03d03 100644
--- a/wpimath/src/test/native/cpp/controller/ArmFeedforwardTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/ArmFeedforwardTest.cpp
@@ -7,8 +7,8 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/controller/ArmFeedforward.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/units/angular_acceleration.hpp"
 #include "wpi/units/angular_velocity.hpp"
diff --git a/wpimath/src/test/native/cpp/controller/ControlAffinePlantInversionFeedforwardTest.cpp b/wpimath/src/test/native/cpp/controller/ControlAffinePlantInversionFeedforwardTest.cpp
index c2bbedfaeb..0c2a4c181f 100644
--- a/wpimath/src/test/native/cpp/controller/ControlAffinePlantInversionFeedforwardTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/ControlAffinePlantInversionFeedforwardTest.cpp
@@ -4,8 +4,8 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/controller/ControlAffinePlantInversionFeedforward.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/units/time.hpp"
 
 namespace frc {
diff --git a/wpimath/src/test/native/cpp/controller/ElevatorFeedforwardTest.cpp b/wpimath/src/test/native/cpp/controller/ElevatorFeedforwardTest.cpp
index b18febdad3..5c3bfc395d 100644
--- a/wpimath/src/test/native/cpp/controller/ElevatorFeedforwardTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/ElevatorFeedforwardTest.cpp
@@ -6,9 +6,9 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/controller/ElevatorFeedforward.hpp"
 #include "wpi/math/controller/LinearPlantInversionFeedforward.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
diff --git a/wpimath/src/test/native/cpp/controller/LTVDifferentialDriveControllerTest.cpp b/wpimath/src/test/native/cpp/controller/LTVDifferentialDriveControllerTest.cpp
index c20886715a..406ce3c3af 100644
--- a/wpimath/src/test/native/cpp/controller/LTVDifferentialDriveControllerTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/LTVDifferentialDriveControllerTest.cpp
@@ -6,11 +6,11 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/math/controller/LTVDifferentialDriveController.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/units/math.hpp"
 
 #define EXPECT_NEAR_UNITS(val1, val2, eps) \
diff --git a/wpimath/src/test/native/cpp/controller/LTVUnicycleControllerTest.cpp b/wpimath/src/test/native/cpp/controller/LTVUnicycleControllerTest.cpp
index 25aafc0b15..db2482137d 100644
--- a/wpimath/src/test/native/cpp/controller/LTVUnicycleControllerTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/LTVUnicycleControllerTest.cpp
@@ -4,9 +4,9 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/math/controller/LTVUnicycleController.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/units/math.hpp"
 
 #define EXPECT_NEAR_UNITS(val1, val2, eps) \
diff --git a/wpimath/src/test/native/cpp/controller/LinearPlantInversionFeedforwardTest.cpp b/wpimath/src/test/native/cpp/controller/LinearPlantInversionFeedforwardTest.cpp
index f2ce30bb07..eadce768de 100644
--- a/wpimath/src/test/native/cpp/controller/LinearPlantInversionFeedforwardTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/LinearPlantInversionFeedforwardTest.cpp
@@ -6,8 +6,8 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/controller/LinearPlantInversionFeedforward.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/units/time.hpp"
 
 namespace frc {
diff --git a/wpimath/src/test/native/cpp/controller/LinearQuadraticRegulatorTest.cpp b/wpimath/src/test/native/cpp/controller/LinearQuadraticRegulatorTest.cpp
index c4b6534650..f4f8440229 100644
--- a/wpimath/src/test/native/cpp/controller/LinearQuadraticRegulatorTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/LinearQuadraticRegulatorTest.cpp
@@ -6,8 +6,8 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/controller/LinearQuadraticRegulator.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/LinearSystem.hpp"
 #include "wpi/math/system/plant/DCMotor.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
diff --git a/wpimath/src/test/native/cpp/controller/SimpleMotorFeedforwardTest.cpp b/wpimath/src/test/native/cpp/controller/SimpleMotorFeedforwardTest.cpp
index c34d6c5489..8545e663ca 100644
--- a/wpimath/src/test/native/cpp/controller/SimpleMotorFeedforwardTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/SimpleMotorFeedforwardTest.cpp
@@ -6,9 +6,9 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/controller/LinearPlantInversionFeedforward.hpp"
 #include "wpi/math/controller/SimpleMotorFeedforward.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
diff --git a/wpimath/src/test/native/cpp/controller/proto/ArmFeedforwardProtoTest.cpp b/wpimath/src/test/native/cpp/controller/proto/ArmFeedforwardProtoTest.cpp
index d22423e0c5..7e7f1d1e90 100644
--- a/wpimath/src/test/native/cpp/controller/proto/ArmFeedforwardProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/proto/ArmFeedforwardProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/controller/ArmFeedforward.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/controller/proto/DifferentialDriveWheelVoltagesProtoTest.cpp b/wpimath/src/test/native/cpp/controller/proto/DifferentialDriveWheelVoltagesProtoTest.cpp
index 7cbf08e41e..0aba8c90e1 100644
--- a/wpimath/src/test/native/cpp/controller/proto/DifferentialDriveWheelVoltagesProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/proto/DifferentialDriveWheelVoltagesProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/controller/DifferentialDriveWheelVoltages.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/controller/proto/ElevatorFeedforwardProtoTest.cpp b/wpimath/src/test/native/cpp/controller/proto/ElevatorFeedforwardProtoTest.cpp
index 9cdaf1cd5f..483d9986cc 100644
--- a/wpimath/src/test/native/cpp/controller/proto/ElevatorFeedforwardProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/controller/proto/ElevatorFeedforwardProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/controller/ElevatorFeedforward.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/estimator/AngleStatisticsTest.cpp b/wpimath/src/test/native/cpp/estimator/AngleStatisticsTest.cpp
index 4b64d95d68..5d9d8773d2 100644
--- a/wpimath/src/test/native/cpp/estimator/AngleStatisticsTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/AngleStatisticsTest.cpp
@@ -6,8 +6,8 @@
 
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/estimator/AngleStatistics.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 
 TEST(AngleStatisticsTest, Mean) {
   frc::Matrixd<3, 3> sigmas{
diff --git a/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimator3dTest.cpp b/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimator3dTest.cpp
index 2987a3f190..34112b4502 100644
--- a/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimator3dTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimator3dTest.cpp
@@ -9,17 +9,17 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/print.hpp"
 
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/estimator/DifferentialDrivePoseEstimator3d.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/print.hpp"
 
 void testFollowTrajectory(
     const frc::DifferentialDriveKinematics& kinematics,
diff --git a/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimatorTest.cpp b/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimatorTest.cpp
index 974c51c122..121b26dcba 100644
--- a/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimatorTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimatorTest.cpp
@@ -10,17 +10,17 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/print.hpp"
 
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/estimator/DifferentialDrivePoseEstimator.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/print.hpp"
 
 void testFollowTrajectory(
     const frc::DifferentialDriveKinematics& kinematics,
diff --git a/wpimath/src/test/native/cpp/estimator/ExtendedKalmanFilterTest.cpp b/wpimath/src/test/native/cpp/estimator/ExtendedKalmanFilterTest.cpp
index dcaf24248c..d3dd4ccd27 100644
--- a/wpimath/src/test/native/cpp/estimator/ExtendedKalmanFilterTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/ExtendedKalmanFilterTest.cpp
@@ -8,12 +8,12 @@
 #include <Eigen/QR>
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/estimator/ExtendedKalmanFilter.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/NumericalJacobian.hpp"
 #include "wpi/math/system/plant/DCMotor.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/units/moment_of_inertia.hpp"
 
 namespace {
diff --git a/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimator3dTest.cpp b/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimator3dTest.cpp
index 33f8bba7e1..d0097cffe0 100644
--- a/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimator3dTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimator3dTest.cpp
@@ -8,12 +8,12 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/print.hpp"
 
 #include "wpi/math/estimator/MecanumDrivePoseEstimator3d.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/util/print.hpp"
 
 void testFollowTrajectory(
     const frc::MecanumDriveKinematics& kinematics,
diff --git a/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimatorTest.cpp b/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimatorTest.cpp
index 965628632b..99fc0763a0 100644
--- a/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimatorTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimatorTest.cpp
@@ -9,12 +9,12 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/print.hpp"
 
 #include "wpi/math/estimator/MecanumDrivePoseEstimator.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/util/print.hpp"
 
 void testFollowTrajectory(
     const frc::MecanumDriveKinematics& kinematics,
diff --git a/wpimath/src/test/native/cpp/estimator/MerweUKFTest.cpp b/wpimath/src/test/native/cpp/estimator/MerweUKFTest.cpp
index a50b45209b..1467163f64 100644
--- a/wpimath/src/test/native/cpp/estimator/MerweUKFTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/MerweUKFTest.cpp
@@ -10,16 +10,16 @@
 #include <Eigen/QR>
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/estimator/AngleStatistics.hpp"
 #include "wpi/math/estimator/MerweUKF.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/Discretization.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/math/system/NumericalJacobian.hpp"
 #include "wpi/math/system/plant/DCMotor.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/units/moment_of_inertia.hpp"
 
 namespace {
diff --git a/wpimath/src/test/native/cpp/estimator/S3UKFTest.cpp b/wpimath/src/test/native/cpp/estimator/S3UKFTest.cpp
index 159da83d56..018755b6a3 100644
--- a/wpimath/src/test/native/cpp/estimator/S3UKFTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/S3UKFTest.cpp
@@ -10,16 +10,16 @@
 #include <Eigen/QR>
 #include <gtest/gtest.h>
 
-#include "wpi/math/linalg/EigenCore.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/math/estimator/AngleStatistics.hpp"
 #include "wpi/math/estimator/S3UKF.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/system/Discretization.hpp"
 #include "wpi/math/system/NumericalIntegration.hpp"
 #include "wpi/math/system/NumericalJacobian.hpp"
 #include "wpi/math/system/plant/DCMotor.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/units/moment_of_inertia.hpp"
 
 namespace {
diff --git a/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimator3dTest.cpp b/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimator3dTest.cpp
index 21544f7dc4..2fedcf7813 100644
--- a/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimator3dTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimator3dTest.cpp
@@ -9,13 +9,13 @@
 
 #include <fmt/format.h>
 #include <gtest/gtest.h>
-#include "wpi/util/print.hpp"
-#include "wpi/util/timestamp.h"
 
 #include "wpi/math/estimator/SwerveDrivePoseEstimator3d.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 void testFollowTrajectory(
     const frc::SwerveDriveKinematics<4>& kinematics,
diff --git a/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp b/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp
index 3179f363b4..53d24a06fa 100644
--- a/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp
@@ -10,13 +10,13 @@
 
 #include <fmt/format.h>
 #include <gtest/gtest.h>
-#include "wpi/util/print.hpp"
-#include "wpi/util/timestamp.h"
 
 #include "wpi/math/estimator/SwerveDrivePoseEstimator.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 void testFollowTrajectory(
     const frc::SwerveDriveKinematics<4>& kinematics,
diff --git a/wpimath/src/test/native/cpp/filter/DebouncerTest.cpp b/wpimath/src/test/native/cpp/filter/DebouncerTest.cpp
index 656ee19d23..fe6dbfdd85 100644
--- a/wpimath/src/test/native/cpp/filter/DebouncerTest.cpp
+++ b/wpimath/src/test/native/cpp/filter/DebouncerTest.cpp
@@ -3,10 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/timestamp.h"
 
 #include "wpi/math/filter/Debouncer.hpp"
 #include "wpi/units/time.hpp"
+#include "wpi/util/timestamp.h"
 
 static units::second_t now = 0_s;
 
diff --git a/wpimath/src/test/native/cpp/filter/LinearFilterOutputTest.cpp b/wpimath/src/test/native/cpp/filter/LinearFilterOutputTest.cpp
index cd48f4ef57..13cd3890f2 100644
--- a/wpimath/src/test/native/cpp/filter/LinearFilterOutputTest.cpp
+++ b/wpimath/src/test/native/cpp/filter/LinearFilterOutputTest.cpp
@@ -11,9 +11,9 @@
 #include <random>
 
 #include <gtest/gtest.h>
-#include "wpi/util/array.hpp"
 
 #include "wpi/units/time.hpp"
+#include "wpi/util/array.hpp"
 
 // Filter constants
 static constexpr auto kFilterStep = 5_ms;
diff --git a/wpimath/src/test/native/cpp/filter/SlewRateLimiterTest.cpp b/wpimath/src/test/native/cpp/filter/SlewRateLimiterTest.cpp
index 32cf579358..7220855f4f 100644
--- a/wpimath/src/test/native/cpp/filter/SlewRateLimiterTest.cpp
+++ b/wpimath/src/test/native/cpp/filter/SlewRateLimiterTest.cpp
@@ -3,12 +3,12 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/timestamp.h"
 
 #include "wpi/math/filter/SlewRateLimiter.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/units/velocity.hpp"
+#include "wpi/util/timestamp.h"
 
 static units::second_t now = 0_s;
 
diff --git a/wpimath/src/test/native/cpp/geometry/Pose3dTest.cpp b/wpimath/src/test/native/cpp/geometry/Pose3dTest.cpp
index 447c80d21b..01ddbd456b 100644
--- a/wpimath/src/test/native/cpp/geometry/Pose3dTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/Pose3dTest.cpp
@@ -5,9 +5,9 @@
 #include <cmath>
 
 #include <gtest/gtest.h>
-#include "wpi/util/array.hpp"
 
 #include "wpi/math/geometry/Pose3d.hpp"
+#include "wpi/util/array.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/Rotation3dTest.cpp b/wpimath/src/test/native/cpp/geometry/Rotation3dTest.cpp
index 1bc1be254a..a8802b4794 100644
--- a/wpimath/src/test/native/cpp/geometry/Rotation3dTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/Rotation3dTest.cpp
@@ -7,9 +7,9 @@
 
 #include <Eigen/Core>
 #include <gtest/gtest.h>
-#include "wpi/util/MathExtras.hpp"
 
 #include "wpi/math/geometry/Rotation3d.hpp"
+#include "wpi/util/MathExtras.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Ellipse2dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Ellipse2dProtoTest.cpp
index 470c2de32c..81f16779da 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Ellipse2dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Ellipse2dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Ellipse2d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Pose2dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Pose2dProtoTest.cpp
index c6313ada06..f99a6b3bf3 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Pose2dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Pose2dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Pose3dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Pose3dProtoTest.cpp
index 89d0ce9bbf..2c7a0d94a6 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Pose3dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Pose3dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Pose3d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/QuaternionProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/QuaternionProtoTest.cpp
index df1456319a..fc0b972e05 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/QuaternionProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/QuaternionProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Quaternion.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Rectangle2dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Rectangle2dProtoTest.cpp
index 23d6b40991..45e111dadc 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Rectangle2dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Rectangle2dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Rectangle2d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Rotation2dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Rotation2dProtoTest.cpp
index 87108f0b33..5cfb826238 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Rotation2dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Rotation2dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Rotation3dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Rotation3dProtoTest.cpp
index dcc93b6c68..3ad8ab0d2a 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Rotation3dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Rotation3dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Rotation3d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Transform2dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Transform2dProtoTest.cpp
index 2dadf88160..c6bedb2d7f 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Transform2dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Transform2dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Transform2d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Transform3dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Transform3dProtoTest.cpp
index cfff4a6419..56af438c87 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Transform3dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Transform3dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Transform3d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Translation2dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Translation2dProtoTest.cpp
index 1dd9875217..b53076b605 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Translation2dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Translation2dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Translation2d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Translation3dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Translation3dProtoTest.cpp
index 5e0f6f2a61..12b5d54517 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Translation3dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Translation3dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Translation3d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Twist2dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Twist2dProtoTest.cpp
index 1dea023c99..04bda40d36 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Twist2dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Twist2dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Twist2d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/geometry/proto/Twist3dProtoTest.cpp b/wpimath/src/test/native/cpp/geometry/proto/Twist3dProtoTest.cpp
index b2f2524c78..c1db34038a 100644
--- a/wpimath/src/test/native/cpp/geometry/proto/Twist3dProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/geometry/proto/Twist3dProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/geometry/Twist3d.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/kinematics/proto/ChassisSpeedsProtoTest.cpp b/wpimath/src/test/native/cpp/kinematics/proto/ChassisSpeedsProtoTest.cpp
index 58e5f69952..682d197915 100644
--- a/wpimath/src/test/native/cpp/kinematics/proto/ChassisSpeedsProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/kinematics/proto/ChassisSpeedsProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/kinematics/ChassisSpeeds.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/kinematics/proto/DifferentialDriveKinematicsProtoTest.cpp b/wpimath/src/test/native/cpp/kinematics/proto/DifferentialDriveKinematicsProtoTest.cpp
index b358f5903e..7e74b05484 100644
--- a/wpimath/src/test/native/cpp/kinematics/proto/DifferentialDriveKinematicsProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/kinematics/proto/DifferentialDriveKinematicsProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.cpp b/wpimath/src/test/native/cpp/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.cpp
index 8bcbb46840..21d3ad6b3e 100644
--- a/wpimath/src/test/native/cpp/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/kinematics/proto/DifferentialDriveWheelSpeedsProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/kinematics/DifferentialDriveWheelSpeeds.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveKinematicsProtoTest.cpp b/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveKinematicsProtoTest.cpp
index e96e684c01..03ac227596 100644
--- a/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveKinematicsProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveKinematicsProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/kinematics/MecanumDriveKinematics.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveWheelPositionsProtoTest.cpp b/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveWheelPositionsProtoTest.cpp
index 67da458f58..82ca0605ff 100644
--- a/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveWheelPositionsProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveWheelPositionsProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/kinematics/MecanumDriveWheelPositions.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.cpp b/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.cpp
index 75e547e94b..9981b67e4e 100644
--- a/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/kinematics/proto/MecanumDriveWheelSpeedsProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/kinematics/MecanumDriveWheelSpeeds.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/kinematics/proto/SwerveModulePositionProtoTest.cpp b/wpimath/src/test/native/cpp/kinematics/proto/SwerveModulePositionProtoTest.cpp
index 179e94cefc..c3d7d480df 100644
--- a/wpimath/src/test/native/cpp/kinematics/proto/SwerveModulePositionProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/kinematics/proto/SwerveModulePositionProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/kinematics/SwerveModulePosition.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/kinematics/proto/SwerveModuleStateProtoTest.cpp b/wpimath/src/test/native/cpp/kinematics/proto/SwerveModuleStateProtoTest.cpp
index 0d9ca442b7..670ff10584 100644
--- a/wpimath/src/test/native/cpp/kinematics/proto/SwerveModuleStateProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/kinematics/proto/SwerveModuleStateProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/kinematics/SwerveModuleState.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/path/TravelingSalesmanTest.cpp b/wpimath/src/test/native/cpp/path/TravelingSalesmanTest.cpp
index 94525df4f4..c180506628 100644
--- a/wpimath/src/test/native/cpp/path/TravelingSalesmanTest.cpp
+++ b/wpimath/src/test/native/cpp/path/TravelingSalesmanTest.cpp
@@ -7,13 +7,13 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include "wpi/util/array.hpp"
-#include "wpi/util/circular_buffer.hpp"
 
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/path/TravelingSalesman.hpp"
+#include "wpi/util/array.hpp"
+#include "wpi/util/circular_buffer.hpp"
 
 /**
  * Returns true if the cycles represented by the two lists match.
diff --git a/wpimath/src/test/native/cpp/system/LinearSystemIDTest.cpp b/wpimath/src/test/native/cpp/system/LinearSystemIDTest.cpp
index f9a6bbd2e7..b9ca8e452b 100644
--- a/wpimath/src/test/native/cpp/system/LinearSystemIDTest.cpp
+++ b/wpimath/src/test/native/cpp/system/LinearSystemIDTest.cpp
@@ -2,12 +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 <gtest/gtest.h>
+
 #include "wpi/math/system/LinearSystem.hpp"
 #include "wpi/math/system/plant/DCMotor.hpp"
 #include "wpi/math/system/plant/LinearSystemId.hpp"
-
-#include <gtest/gtest.h>
-
 #include "wpi/units/length.hpp"
 #include "wpi/units/mass.hpp"
 
diff --git a/wpimath/src/test/native/cpp/system/plant/proto/DCMotorProtoTest.cpp b/wpimath/src/test/native/cpp/system/plant/proto/DCMotorProtoTest.cpp
index c3c0a7dc9c..5013167455 100644
--- a/wpimath/src/test/native/cpp/system/plant/proto/DCMotorProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/system/plant/proto/DCMotorProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/system/plant/DCMotor.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/trajectory/CentripetalAccelerationConstraintTest.cpp b/wpimath/src/test/native/cpp/trajectory/CentripetalAccelerationConstraintTest.cpp
index 71c36fbb98..1678cfdd47 100644
--- a/wpimath/src/test/native/cpp/trajectory/CentripetalAccelerationConstraintTest.cpp
+++ b/wpimath/src/test/native/cpp/trajectory/CentripetalAccelerationConstraintTest.cpp
@@ -7,9 +7,9 @@
 
 #include <gtest/gtest.h>
 
+#include "wpi/math/trajectory/TestTrajectory.hpp"
 #include "wpi/math/trajectory/constraint/CentripetalAccelerationConstraint.hpp"
 #include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp"
-#include "wpi/math/trajectory/TestTrajectory.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/math.hpp"
diff --git a/wpimath/src/test/native/cpp/trajectory/DifferentialDriveKinematicsTest.cpp b/wpimath/src/test/native/cpp/trajectory/DifferentialDriveKinematicsTest.cpp
index 97ed3d2c56..53ce0410f4 100644
--- a/wpimath/src/test/native/cpp/trajectory/DifferentialDriveKinematicsTest.cpp
+++ b/wpimath/src/test/native/cpp/trajectory/DifferentialDriveKinematicsTest.cpp
@@ -8,8 +8,8 @@
 #include <gtest/gtest.h>
 
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
-#include "wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp"
 #include "wpi/math/trajectory/TestTrajectory.hpp"
+#include "wpi/math/trajectory/constraint/DifferentialDriveKinematicsConstraint.hpp"
 #include "wpi/units/time.hpp"
 
 using namespace frc;
diff --git a/wpimath/src/test/native/cpp/trajectory/DifferentialDriveVoltageTest.cpp b/wpimath/src/test/native/cpp/trajectory/DifferentialDriveVoltageTest.cpp
index 5b991b9ab6..8c85895132 100644
--- a/wpimath/src/test/native/cpp/trajectory/DifferentialDriveVoltageTest.cpp
+++ b/wpimath/src/test/native/cpp/trajectory/DifferentialDriveVoltageTest.cpp
@@ -9,9 +9,9 @@
 
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
+#include "wpi/math/trajectory/TestTrajectory.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
 #include "wpi/math/trajectory/constraint/DifferentialDriveVoltageConstraint.hpp"
-#include "wpi/math/trajectory/TestTrajectory.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"
diff --git a/wpimath/src/test/native/cpp/trajectory/EllipticalRegionConstraintTest.cpp b/wpimath/src/test/native/cpp/trajectory/EllipticalRegionConstraintTest.cpp
index 067c15930e..d4986142f3 100644
--- a/wpimath/src/test/native/cpp/trajectory/EllipticalRegionConstraintTest.cpp
+++ b/wpimath/src/test/native/cpp/trajectory/EllipticalRegionConstraintTest.cpp
@@ -4,9 +4,9 @@
 
 #include <gtest/gtest.h>
 
+#include "wpi/math/trajectory/TestTrajectory.hpp"
 #include "wpi/math/trajectory/constraint/EllipticalRegionConstraint.hpp"
 #include "wpi/math/trajectory/constraint/MaxVelocityConstraint.hpp"
-#include "wpi/math/trajectory/TestTrajectory.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/length.hpp"
diff --git a/wpimath/src/test/native/cpp/trajectory/RectangularRegionConstraintTest.cpp b/wpimath/src/test/native/cpp/trajectory/RectangularRegionConstraintTest.cpp
index a7bc689919..cdd9f4ef12 100644
--- a/wpimath/src/test/native/cpp/trajectory/RectangularRegionConstraintTest.cpp
+++ b/wpimath/src/test/native/cpp/trajectory/RectangularRegionConstraintTest.cpp
@@ -4,9 +4,9 @@
 
 #include <gtest/gtest.h>
 
+#include "wpi/math/trajectory/TestTrajectory.hpp"
 #include "wpi/math/trajectory/constraint/MaxVelocityConstraint.hpp"
 #include "wpi/math/trajectory/constraint/RectangularRegionConstraint.hpp"
-#include "wpi/math/trajectory/TestTrajectory.hpp"
 #include "wpi/units/acceleration.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/math.hpp"
diff --git a/wpimath/src/test/native/cpp/trajectory/TrajectoryGeneratorTest.cpp b/wpimath/src/test/native/cpp/trajectory/TrajectoryGeneratorTest.cpp
index 4c3f598ee6..054dcd65e0 100644
--- a/wpimath/src/test/native/cpp/trajectory/TrajectoryGeneratorTest.cpp
+++ b/wpimath/src/test/native/cpp/trajectory/TrajectoryGeneratorTest.cpp
@@ -6,11 +6,11 @@
 
 #include <gtest/gtest.h>
 
+#include "wpi/math/trajectory/TestTrajectory.hpp"
 #include "wpi/math/trajectory/Trajectory.hpp"
 #include "wpi/math/trajectory/TrajectoryGenerator.hpp"
 #include "wpi/math/trajectory/constraint/CentripetalAccelerationConstraint.hpp"
 #include "wpi/math/trajectory/constraint/TrajectoryConstraint.hpp"
-#include "wpi/math/trajectory/TestTrajectory.hpp"
 #include "wpi/units/math.hpp"
 
 using namespace frc;
diff --git a/wpimath/src/test/native/cpp/trajectory/proto/TrajectoryProtoTest.cpp b/wpimath/src/test/native/cpp/trajectory/proto/TrajectoryProtoTest.cpp
index ebcac091b2..c4b87f6997 100644
--- a/wpimath/src/test/native/cpp/trajectory/proto/TrajectoryProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/trajectory/proto/TrajectoryProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/trajectory/Trajectory.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpimath/src/test/native/cpp/trajectory/proto/TrajectoryStateProtoTest.cpp b/wpimath/src/test/native/cpp/trajectory/proto/TrajectoryStateProtoTest.cpp
index fb5451bac8..9b27dcf3c2 100644
--- a/wpimath/src/test/native/cpp/trajectory/proto/TrajectoryStateProtoTest.cpp
+++ b/wpimath/src/test/native/cpp/trajectory/proto/TrajectoryStateProtoTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include "wpi/util/SmallVector.hpp"
 
 #include "wpi/math/trajectory/Trajectory.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace frc;
 
diff --git a/wpinet/examples/dsclient/dsclient.cpp b/wpinet/examples/dsclient/dsclient.cpp
index a749711198..3e4e03d705 100644
--- a/wpinet/examples/dsclient/dsclient.cpp
+++ b/wpinet/examples/dsclient/dsclient.cpp
@@ -5,11 +5,10 @@
 #include <cstdio>
 #include <memory>
 
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/print.hpp"
-
 #include "wpi/net/DsClient.hpp"
 #include "wpi/net/EventLoopRunner.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/print.hpp"
 
 namespace uv = wpi::uv;
 
diff --git a/wpinet/examples/parallelconnect/parallelconnect.cpp b/wpinet/examples/parallelconnect/parallelconnect.cpp
index 640af54f31..6f1c680921 100644
--- a/wpinet/examples/parallelconnect/parallelconnect.cpp
+++ b/wpinet/examples/parallelconnect/parallelconnect.cpp
@@ -5,12 +5,11 @@
 #include <cstdio>
 #include <memory>
 
-#include "wpi/util/Logger.hpp"
-
 #include "wpi/net/EventLoopRunner.hpp"
 #include "wpi/net/ParallelTcpConnector.hpp"
 #include "wpi/net/uv/Error.hpp"
 #include "wpi/net/uv/Tcp.hpp"
+#include "wpi/util/Logger.hpp"
 
 namespace uv = wpi::uv;
 
diff --git a/wpinet/examples/webserver/webserver.cpp b/wpinet/examples/webserver/webserver.cpp
index 1494911eb5..92483fede6 100644
--- a/wpinet/examples/webserver/webserver.cpp
+++ b/wpinet/examples/webserver/webserver.cpp
@@ -5,13 +5,12 @@
 #include <cstdio>
 #include <memory>
 
-#include "wpi/util/print.hpp"
-
 #include "wpi/net/EventLoopRunner.hpp"
 #include "wpi/net/HttpServerConnection.hpp"
 #include "wpi/net/UrlParser.hpp"
 #include "wpi/net/uv/Loop.hpp"
 #include "wpi/net/uv/Tcp.hpp"
+#include "wpi/util/print.hpp"
 
 namespace uv = wpi::uv;
 
diff --git a/wpinet/src/main/native/cpp/DsClient.cpp b/wpinet/src/main/native/cpp/DsClient.cpp
index cc8b7653fc..6e0d2ae376 100644
--- a/wpinet/src/main/native/cpp/DsClient.cpp
+++ b/wpinet/src/main/native/cpp/DsClient.cpp
@@ -7,12 +7,12 @@
 #include <memory>
 
 #include <fmt/format.h>
-#include "wpi/util/Logger.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/json.hpp"
 
 #include "wpi/net/uv/Tcp.hpp"
 #include "wpi/net/uv/Timer.hpp"
+#include "wpi/util/Logger.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace wpi;
 
diff --git a/wpinet/src/main/native/cpp/EventLoopRunner.cpp b/wpinet/src/main/native/cpp/EventLoopRunner.cpp
index 12afcca253..8bff0c5afe 100644
--- a/wpinet/src/main/native/cpp/EventLoopRunner.cpp
+++ b/wpinet/src/main/native/cpp/EventLoopRunner.cpp
@@ -7,13 +7,12 @@
 #include <memory>
 #include <utility>
 
+#include "wpi/net/uv/AsyncFunction.hpp"
+#include "wpi/net/uv/Loop.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/condition_variable.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "wpi/net/uv/AsyncFunction.hpp"
-#include "wpi/net/uv/Loop.hpp"
-
 using namespace wpi;
 
 class EventLoopRunner::Thread : public SafeThread {
diff --git a/wpinet/src/main/native/cpp/HttpServerConnection.cpp b/wpinet/src/main/native/cpp/HttpServerConnection.cpp
index 34ca600c86..b49a9c02af 100644
--- a/wpinet/src/main/native/cpp/HttpServerConnection.cpp
+++ b/wpinet/src/main/native/cpp/HttpServerConnection.cpp
@@ -6,6 +6,7 @@
 
 #include <memory>
 
+#include "wpi/net/raw_uv_ostream.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/SpanExtras.hpp"
@@ -13,8 +14,6 @@
 #include "wpi/util/fmt/raw_ostream.hpp"
 #include "wpi/util/print.hpp"
 
-#include "wpi/net/raw_uv_ostream.hpp"
-
 using namespace wpi;
 
 HttpServerConnection::HttpServerConnection(std::shared_ptr<uv::Stream> stream)
diff --git a/wpinet/src/main/native/cpp/HttpUtil.cpp b/wpinet/src/main/native/cpp/HttpUtil.cpp
index 9afc89940d..3e55ce53e5 100644
--- a/wpinet/src/main/native/cpp/HttpUtil.cpp
+++ b/wpinet/src/main/native/cpp/HttpUtil.cpp
@@ -9,6 +9,7 @@
 #include <utility>
 
 #include <fmt/format.h>
+
 #include "wpi/util/Base64.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/raw_ostream.hpp"
diff --git a/wpinet/src/main/native/cpp/MulticastHandleManager.hpp b/wpinet/src/main/native/cpp/MulticastHandleManager.hpp
index c3fdfc3f48..d7916cc0e4 100644
--- a/wpinet/src/main/native/cpp/MulticastHandleManager.hpp
+++ b/wpinet/src/main/native/cpp/MulticastHandleManager.hpp
@@ -6,11 +6,10 @@
 
 #include <memory>
 
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/UidVector.hpp"
-
 #include "wpi/net/MulticastServiceAnnouncer.h"
 #include "wpi/net/MulticastServiceResolver.h"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/UidVector.hpp"
 
 namespace wpi {
 struct MulticastHandleManager {
diff --git a/wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp
index 04c98c41ce..462e484748 100644
--- a/wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp
+++ b/wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp
@@ -7,9 +7,8 @@
 #include <memory>
 #include <utility>
 
-#include "wpi/util/SmallVector.hpp"
-
 #include "MulticastHandleManager.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 extern "C" {
 WPI_MulticastServiceAnnouncerHandle WPI_CreateMulticastServiceAnnouncer(
diff --git a/wpinet/src/main/native/cpp/MulticastServiceResolver.cpp b/wpinet/src/main/native/cpp/MulticastServiceResolver.cpp
index 6634aa907d..a230523460 100644
--- a/wpinet/src/main/native/cpp/MulticastServiceResolver.cpp
+++ b/wpinet/src/main/native/cpp/MulticastServiceResolver.cpp
@@ -8,9 +8,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/MemAlloc.hpp"
-
 #include "MulticastHandleManager.hpp"
+#include "wpi/util/MemAlloc.hpp"
 
 extern "C" {
 WPI_MulticastServiceResolverHandle WPI_CreateMulticastServiceResolver(
diff --git a/wpinet/src/main/native/cpp/ParallelTcpConnector.cpp b/wpinet/src/main/native/cpp/ParallelTcpConnector.cpp
index 45c6f6fc12..9d157d9c93 100644
--- a/wpinet/src/main/native/cpp/ParallelTcpConnector.cpp
+++ b/wpinet/src/main/native/cpp/ParallelTcpConnector.cpp
@@ -11,13 +11,13 @@
 #include <utility>
 
 #include <fmt/format.h>
-#include "wpi/util/Logger.hpp"
 
 #include "wpi/net/uv/GetAddrInfo.hpp"
 #include "wpi/net/uv/Loop.hpp"
 #include "wpi/net/uv/Tcp.hpp"
 #include "wpi/net/uv/Timer.hpp"
 #include "wpi/net/uv/util.hpp"
+#include "wpi/util/Logger.hpp"
 
 using namespace wpi;
 
diff --git a/wpinet/src/main/native/cpp/PortForwarder.cpp b/wpinet/src/main/native/cpp/PortForwarder.cpp
index a48505a2ab..e6a2816394 100644
--- a/wpinet/src/main/native/cpp/PortForwarder.cpp
+++ b/wpinet/src/main/native/cpp/PortForwarder.cpp
@@ -8,13 +8,13 @@
 #include <string>
 
 #include <fmt/format.h>
-#include "wpi/util/DenseMap.hpp"
-#include "wpi/util/print.hpp"
 
 #include "wpi/net/EventLoopRunner.hpp"
 #include "wpi/net/uv/GetAddrInfo.hpp"
 #include "wpi/net/uv/Tcp.hpp"
 #include "wpi/net/uv/Timer.hpp"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace wpi;
 
diff --git a/wpinet/src/main/native/cpp/UDPClient.cpp b/wpinet/src/main/native/cpp/UDPClient.cpp
index 2538346083..ef80809f1c 100644
--- a/wpinet/src/main/native/cpp/UDPClient.cpp
+++ b/wpinet/src/main/native/cpp/UDPClient.cpp
@@ -18,11 +18,10 @@
 
 #include <utility>
 
+#include "wpi/net/SocketError.hpp"
 #include "wpi/util/Logger.hpp"
 #include "wpi/util/SmallString.hpp"
 
-#include "wpi/net/SocketError.hpp"
-
 using namespace wpi;
 
 UDPClient::UDPClient(Logger& logger) : UDPClient("", logger) {}
diff --git a/wpinet/src/main/native/cpp/WebSocket.cpp b/wpinet/src/main/native/cpp/WebSocket.cpp
index 02a82e865b..bdacbbea2b 100644
--- a/wpinet/src/main/native/cpp/WebSocket.cpp
+++ b/wpinet/src/main/native/cpp/WebSocket.cpp
@@ -12,6 +12,11 @@
 #include <string_view>
 #include <utility>
 
+#include "WebSocketDebug.hpp"
+#include "WebSocketSerializer.hpp"
+#include "wpi/net/HttpParser.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
+#include "wpi/net/uv/Stream.hpp"
 #include "wpi/util/Base64.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/SmallVector.hpp"
@@ -20,12 +25,6 @@
 #include "wpi/util/raw_ostream.hpp"
 #include "wpi/util/sha1.hpp"
 
-#include "WebSocketDebug.hpp"
-#include "WebSocketSerializer.hpp"
-#include "wpi/net/HttpParser.hpp"
-#include "wpi/net/raw_uv_ostream.hpp"
-#include "wpi/net/uv/Stream.hpp"
-
 using namespace wpi;
 
 static std::string DebugBinary(std::span<const uint8_t> val) {
diff --git a/wpinet/src/main/native/cpp/WebSocketSerializer.hpp b/wpinet/src/main/native/cpp/WebSocketSerializer.hpp
index 315b6a0e1a..2c8f7b1a4b 100644
--- a/wpinet/src/main/native/cpp/WebSocketSerializer.hpp
+++ b/wpinet/src/main/native/cpp/WebSocketSerializer.hpp
@@ -8,12 +8,11 @@
 #include <memory>
 #include <utility>
 
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/SpanExtras.hpp"
-
 #include "WebSocketDebug.hpp"
 #include "wpi/net/WebSocket.hpp"
 #include "wpi/net/uv/Buffer.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/SpanExtras.hpp"
 
 namespace wpi::detail {
 
diff --git a/wpinet/src/main/native/cpp/WebSocketServer.cpp b/wpinet/src/main/native/cpp/WebSocketServer.cpp
index 3981c4e38f..57dd89e856 100644
--- a/wpinet/src/main/native/cpp/WebSocketServer.cpp
+++ b/wpinet/src/main/native/cpp/WebSocketServer.cpp
@@ -8,13 +8,12 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/fmt/raw_ostream.hpp"
-#include "wpi/util/print.hpp"
-
 #include "wpi/net/raw_uv_ostream.hpp"
 #include "wpi/net/uv/Buffer.hpp"
 #include "wpi/net/uv/Stream.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fmt/raw_ostream.hpp"
+#include "wpi/util/print.hpp"
 
 using namespace wpi;
 
diff --git a/wpinet/src/main/native/cpp/hostname.cpp b/wpinet/src/main/native/cpp/hostname.cpp
index 252cc93e5b..5483b0467b 100644
--- a/wpinet/src/main/native/cpp/hostname.cpp
+++ b/wpinet/src/main/native/cpp/hostname.cpp
@@ -8,9 +8,8 @@
 #include <string>
 #include <string_view>
 
-#include "wpi/util/SmallVector.hpp"
-
 #include "uv.h"
+#include "wpi/util/SmallVector.hpp"
 
 namespace wpi {
 
diff --git a/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp b/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp
index b497324ee3..32d16f170b 100644
--- a/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp
+++ b/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp
@@ -9,14 +9,13 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/jni_util.hpp"
-
 #include "../MulticastHandleManager.hpp"
 #include "org_wpilib_net_WPINetJNI.h"
 #include "wpi/net/MulticastServiceAnnouncer.h"
 #include "wpi/net/MulticastServiceResolver.h"
 #include "wpi/net/PortForwarder.hpp"
 #include "wpi/net/WebServer.hpp"
+#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::java;
 
diff --git a/wpinet/src/main/native/cpp/uv/FsEvent.cpp b/wpinet/src/main/native/cpp/uv/FsEvent.cpp
index 9d85a26a39..9720a5e94b 100644
--- a/wpinet/src/main/native/cpp/uv/FsEvent.cpp
+++ b/wpinet/src/main/native/cpp/uv/FsEvent.cpp
@@ -8,9 +8,8 @@
 #include <memory>
 #include <string>
 
-#include "wpi/util/SmallString.hpp"
-
 #include "wpi/net/uv/Loop.hpp"
+#include "wpi/util/SmallString.hpp"
 
 namespace wpi::uv {
 
diff --git a/wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp b/wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp
index 96f53dd62a..002d970c44 100644
--- a/wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp
+++ b/wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp
@@ -8,9 +8,8 @@
 #include <memory>
 #include <utility>
 
-#include "wpi/util/SmallString.hpp"
-
 #include "wpi/net/uv/Loop.hpp"
+#include "wpi/util/SmallString.hpp"
 
 namespace wpi::uv {
 
diff --git a/wpinet/src/main/native/cpp/uv/Process.cpp b/wpinet/src/main/native/cpp/uv/Process.cpp
index 7938527f56..d067491885 100644
--- a/wpinet/src/main/native/cpp/uv/Process.cpp
+++ b/wpinet/src/main/native/cpp/uv/Process.cpp
@@ -6,10 +6,9 @@
 
 #include <memory>
 
-#include "wpi/util/SmallString.hpp"
-
 #include "wpi/net/uv/Loop.hpp"
 #include "wpi/net/uv/Pipe.hpp"
+#include "wpi/util/SmallString.hpp"
 
 namespace wpi::uv {
 
diff --git a/wpinet/src/main/native/cpp/uv/Udp.cpp b/wpinet/src/main/native/cpp/uv/Udp.cpp
index 4131e18457..0ff3880dcb 100644
--- a/wpinet/src/main/native/cpp/uv/Udp.cpp
+++ b/wpinet/src/main/native/cpp/uv/Udp.cpp
@@ -9,11 +9,10 @@
 #include <memory>
 #include <utility>
 
+#include "wpi/net/uv/util.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/SmallVector.hpp"
 
-#include "wpi/net/uv/util.hpp"
-
 namespace {
 
 using namespace wpi;
diff --git a/wpinet/src/main/native/include/wpi/net/EventLoopRunner.hpp b/wpinet/src/main/native/include/wpi/net/EventLoopRunner.hpp
index 3c60588521..22f2be54d5 100644
--- a/wpinet/src/main/native/include/wpi/net/EventLoopRunner.hpp
+++ b/wpinet/src/main/native/include/wpi/net/EventLoopRunner.hpp
@@ -2,15 +2,14 @@
 // 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.
 
-#ifndef WPINET_EVENTLOOPRUNNER_H_
-#define WPINET_EVENTLOOPRUNNER_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_EVENTLOOPRUNNER_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_EVENTLOOPRUNNER_HPP_
 
 #include <functional>
 #include <memory>
 
-#include "wpi/util/SafeThread.hpp"
-
 #include "wpi/net/uv/Loop.hpp"
+#include "wpi/util/SafeThread.hpp"
 
 namespace wpi {
 
@@ -60,4 +59,4 @@ class EventLoopRunner {
 
 }  // namespace wpi
 
-#endif  // WPINET_EVENTLOOPRUNNER_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_EVENTLOOPRUNNER_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/HttpParser.hpp b/wpinet/src/main/native/include/wpi/net/HttpParser.hpp
index d3537c5f23..6f2d14b28c 100644
--- a/wpinet/src/main/native/include/wpi/net/HttpParser.hpp
+++ b/wpinet/src/main/native/include/wpi/net/HttpParser.hpp
@@ -2,18 +2,17 @@
 // 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.
 
-#ifndef WPINET_HTTPPARSER_H_
-#define WPINET_HTTPPARSER_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPPARSER_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPPARSER_HPP_
 
 #include <stdint.h>
 
 #include <string_view>
 
+#include "wpi/net/http_parser.hpp"
 #include "wpi/util/Signal.h"
 #include "wpi/util/SmallString.hpp"
 
-#include "wpi/net/http_parser.hpp"
-
 namespace wpi {
 
 /**
@@ -225,4 +224,4 @@ class HttpParser {
 
 }  // namespace wpi
 
-#endif  // WPINET_HTTPPARSER_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPPARSER_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp b/wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp
index 1fad9cdf70..44f3c8ed90 100644
--- a/wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp
+++ b/wpinet/src/main/native/include/wpi/net/HttpServerConnection.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_HTTPSERVERCONNECTION_H_
-#define WPINET_HTTPSERVERCONNECTION_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPSERVERCONNECTION_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPSERVERCONNECTION_HPP_
 
 #include <memory>
 #include <span>
@@ -149,4 +149,4 @@ class HttpServerConnection {
 
 }  // namespace wpi
 
-#endif  // WPINET_HTTPSERVERCONNECTION_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPSERVERCONNECTION_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/HttpUtil.hpp b/wpinet/src/main/native/include/wpi/net/HttpUtil.hpp
index 8e5039cc41..d56b80f400 100644
--- a/wpinet/src/main/native/include/wpi/net/HttpUtil.hpp
+++ b/wpinet/src/main/native/include/wpi/net/HttpUtil.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_HTTPUTIL_H_
-#define WPINET_HTTPUTIL_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPUTIL_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPUTIL_HPP_
 
 #include <initializer_list>
 #include <memory>
@@ -14,15 +14,14 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/net/NetworkStream.hpp"
+#include "wpi/net/raw_socket_istream.hpp"
+#include "wpi/net/raw_socket_ostream.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/StringMap.hpp"
 #include "wpi/util/raw_istream.hpp"
 
-#include "wpi/net/NetworkStream.hpp"
-#include "wpi/net/raw_socket_istream.hpp"
-#include "wpi/net/raw_socket_ostream.hpp"
-
 namespace wpi {
 
 // Unescape a %xx-encoded URI.
@@ -457,4 +456,4 @@ inline HttpPathRef HttpPath::drop_front(size_t n) const {
 
 }  // namespace wpi
 
-#endif  // WPINET_HTTPUTIL_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPUTIL_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/HttpWebSocketServerConnection.hpp b/wpinet/src/main/native/include/wpi/net/HttpWebSocketServerConnection.hpp
index b53aed912c..511a05337d 100644
--- a/wpinet/src/main/native/include/wpi/net/HttpWebSocketServerConnection.hpp
+++ b/wpinet/src/main/native/include/wpi/net/HttpWebSocketServerConnection.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_HTTPWEBSOCKETSERVERCONNECTION_H_
-#define WPINET_HTTPWEBSOCKETSERVERCONNECTION_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPWEBSOCKETSERVERCONNECTION_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPWEBSOCKETSERVERCONNECTION_HPP_
 
 #include <initializer_list>
 #include <memory>
@@ -11,12 +11,11 @@
 #include <string>
 #include <string_view>
 
-#include "wpi/util/SmallVector.hpp"
-
 #include "wpi/net/HttpServerConnection.hpp"
 #include "wpi/net/WebSocket.hpp"
 #include "wpi/net/WebSocketServer.hpp"
 #include "wpi/net/uv/Stream.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 namespace wpi {
 
@@ -124,4 +123,4 @@ class HttpWebSocketServerConnection
 
 }  // namespace wpi
 
-#endif  // WPINET_HTTPWEBSOCKETSERVERCONNECTION_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HTTPWEBSOCKETSERVERCONNECTION_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/MimeTypes.hpp b/wpinet/src/main/native/include/wpi/net/MimeTypes.hpp
index 2f5fe7228a..8bf1844ab0 100644
--- a/wpinet/src/main/native/include/wpi/net/MimeTypes.hpp
+++ b/wpinet/src/main/native/include/wpi/net/MimeTypes.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_MIMETYPES_H_
-#define WPINET_MIMETYPES_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_MIMETYPES_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_MIMETYPES_HPP_
 
 #include <string_view>
 
@@ -13,4 +13,4 @@ std::string_view MimeTypeFromPath(std::string_view path);
 
 }  // namespace wpi
 
-#endif  // WPINET_MIMETYPES_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_MIMETYPES_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/NetworkAcceptor.hpp b/wpinet/src/main/native/include/wpi/net/NetworkAcceptor.hpp
index b763e8fbb0..714bdab931 100644
--- a/wpinet/src/main/native/include/wpi/net/NetworkAcceptor.hpp
+++ b/wpinet/src/main/native/include/wpi/net/NetworkAcceptor.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_NETWORKACCEPTOR_H_
-#define WPINET_NETWORKACCEPTOR_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKACCEPTOR_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKACCEPTOR_HPP_
 
 #include <memory>
 
@@ -26,4 +26,4 @@ class NetworkAcceptor {
 
 }  // namespace wpi
 
-#endif  // WPINET_NETWORKACCEPTOR_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKACCEPTOR_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/NetworkStream.hpp b/wpinet/src/main/native/include/wpi/net/NetworkStream.hpp
index 8329b88403..00a414372f 100644
--- a/wpinet/src/main/native/include/wpi/net/NetworkStream.hpp
+++ b/wpinet/src/main/native/include/wpi/net/NetworkStream.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_NETWORKSTREAM_H_
-#define WPINET_NETWORKSTREAM_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKSTREAM_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKSTREAM_HPP_
 
 #include <cstddef>
 #include <string_view>
@@ -41,4 +41,4 @@ class NetworkStream {
 
 }  // namespace wpi
 
-#endif  // WPINET_NETWORKSTREAM_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_NETWORKSTREAM_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/PortForwarder.hpp b/wpinet/src/main/native/include/wpi/net/PortForwarder.hpp
index 14453a3e01..0bd30cb47b 100644
--- a/wpinet/src/main/native/include/wpi/net/PortForwarder.hpp
+++ b/wpinet/src/main/native/include/wpi/net/PortForwarder.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_PORTFORWARDER_H_
-#define WPINET_PORTFORWARDER_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_PORTFORWARDER_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_PORTFORWARDER_HPP_
 
 #pragma once
 
@@ -56,4 +56,4 @@ class PortForwarder {
 
 }  // namespace wpi
 
-#endif  // WPINET_PORTFORWARDER_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_PORTFORWARDER_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/SocketError.hpp b/wpinet/src/main/native/include/wpi/net/SocketError.hpp
index c944b0cce7..d23aea80cc 100644
--- a/wpinet/src/main/native/include/wpi/net/SocketError.hpp
+++ b/wpinet/src/main/native/include/wpi/net/SocketError.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_SOCKETERROR_H_
-#define WPINET_SOCKETERROR_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_SOCKETERROR_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_SOCKETERROR_HPP_
 
 #include <string>
 
@@ -19,4 +19,4 @@ inline std::string SocketStrerror() {
 
 }  // namespace wpi
 
-#endif  // WPINET_SOCKETERROR_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_SOCKETERROR_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/UDPClient.hpp b/wpinet/src/main/native/include/wpi/net/UDPClient.hpp
index 45f9fe46fc..8c139b430a 100644
--- a/wpinet/src/main/native/include/wpi/net/UDPClient.hpp
+++ b/wpinet/src/main/native/include/wpi/net/UDPClient.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UDPCLIENT_H_
-#define WPINET_UDPCLIENT_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UDPCLIENT_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UDPCLIENT_HPP_
 
 #include <span>
 #include <string>
@@ -46,4 +46,4 @@ class UDPClient {
 
 }  // namespace wpi
 
-#endif  // WPINET_UDPCLIENT_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UDPCLIENT_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/UrlParser.hpp b/wpinet/src/main/native/include/wpi/net/UrlParser.hpp
index 0f2cef8a4e..5f0faa09da 100644
--- a/wpinet/src/main/native/include/wpi/net/UrlParser.hpp
+++ b/wpinet/src/main/native/include/wpi/net/UrlParser.hpp
@@ -2,14 +2,13 @@
 // 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.
 
-#ifndef WPINET_URLPARSER_H_
-#define WPINET_URLPARSER_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_URLPARSER_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_URLPARSER_HPP_
 
 #include <string_view>
 
-#include "wpi/util/StringExtras.hpp"
-
 #include "wpi/net/http_parser.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 namespace wpi {
 
@@ -93,4 +92,4 @@ class UrlParser {
 
 }  // namespace wpi
 
-#endif  // WPINET_URLPARSER_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_URLPARSER_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/WebServer.hpp b/wpinet/src/main/native/include/wpi/net/WebServer.hpp
index ebfb9a36b2..59e066b84c 100644
--- a/wpinet/src/main/native/include/wpi/net/WebServer.hpp
+++ b/wpinet/src/main/native/include/wpi/net/WebServer.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_WEBSERVER_H_
-#define WPINET_WEBSERVER_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSERVER_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSERVER_HPP_
 
 #pragma once
 
@@ -55,4 +55,4 @@ class WebServer {
 
 }  // namespace wpi
 
-#endif  // WPINET_WEBSERVER_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSERVER_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/WebSocket.hpp b/wpinet/src/main/native/include/wpi/net/WebSocket.hpp
index b7f1785f1a..bd5b33ace9 100644
--- a/wpinet/src/main/native/include/wpi/net/WebSocket.hpp
+++ b/wpinet/src/main/native/include/wpi/net/WebSocket.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_WEBSOCKET_H_
-#define WPINET_WEBSOCKET_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKET_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKET_HPP_
 
 #include <stdint.h>
 
@@ -15,12 +15,11 @@
 #include <string_view>
 #include <utility>
 
-#include "wpi/util/Signal.h"
-#include "wpi/util/SmallVector.hpp"
-
 #include "wpi/net/uv/Buffer.hpp"
 #include "wpi/net/uv/Error.hpp"
 #include "wpi/net/uv/Timer.hpp"
+#include "wpi/util/Signal.h"
+#include "wpi/util/SmallVector.hpp"
 
 namespace wpi {
 
@@ -562,4 +561,4 @@ class WebSocket : public std::enable_shared_from_this<WebSocket> {
 
 }  // namespace wpi
 
-#endif  // WPINET_WEBSOCKET_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKET_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/WebSocketServer.hpp b/wpinet/src/main/native/include/wpi/net/WebSocketServer.hpp
index 242847b2ee..f873c22a27 100644
--- a/wpinet/src/main/native/include/wpi/net/WebSocketServer.hpp
+++ b/wpinet/src/main/native/include/wpi/net/WebSocketServer.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_WEBSOCKETSERVER_H_
-#define WPINET_WEBSOCKETSERVER_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKETSERVER_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKETSERVER_HPP_
 
 #include <functional>
 #include <initializer_list>
@@ -13,13 +13,12 @@
 #include <string_view>
 #include <utility>
 
+#include "wpi/net/HttpParser.hpp"
+#include "wpi/net/WebSocket.hpp"
 #include "wpi/util/Signal.h"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/SmallVector.hpp"
 
-#include "wpi/net/HttpParser.hpp"
-#include "wpi/net/WebSocket.hpp"
-
 namespace wpi {
 
 namespace uv {
@@ -188,4 +187,4 @@ class WebSocketServer : public std::enable_shared_from_this<WebSocketServer> {
 
 }  // namespace wpi
 
-#endif  // WPINET_WEBSOCKETSERVER_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WEBSOCKETSERVER_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/WorkerThread.hpp b/wpinet/src/main/native/include/wpi/net/WorkerThread.hpp
index 6fcb248895..6a4293f774 100644
--- a/wpinet/src/main/native/include/wpi/net/WorkerThread.hpp
+++ b/wpinet/src/main/native/include/wpi/net/WorkerThread.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_WORKERTHREAD_H_
-#define WPINET_WORKERTHREAD_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WORKERTHREAD_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WORKERTHREAD_HPP_
 
 #include <functional>
 #include <memory>
@@ -11,11 +11,10 @@
 #include <utility>
 #include <vector>
 
+#include "wpi/net/uv/Async.hpp"
 #include "wpi/util/SafeThread.hpp"
 #include "wpi/util/future.hpp"
 
-#include "wpi/net/uv/Async.hpp"
-
 namespace wpi {
 
 namespace detail {
@@ -283,4 +282,4 @@ class WorkerThread<R(T...)> final {
 
 }  // namespace wpi
 
-#endif  // WPINET_WORKERTHREAD_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_WORKERTHREAD_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/hostname.hpp b/wpinet/src/main/native/include/wpi/net/hostname.hpp
index e356fb40ac..30b4ae6773 100644
--- a/wpinet/src/main/native/include/wpi/net/hostname.hpp
+++ b/wpinet/src/main/native/include/wpi/net/hostname.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_HOSTNAME_H_
-#define WPINET_HOSTNAME_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HOSTNAME_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HOSTNAME_HPP_
 
 #include <string>
 #include <string_view>
@@ -16,4 +16,4 @@ std::string GetHostname();
 std::string_view GetHostname(SmallVectorImpl<char>& name);
 }  // namespace wpi
 
-#endif  // WPINET_HOSTNAME_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_HOSTNAME_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/raw_socket_istream.hpp b/wpinet/src/main/native/include/wpi/net/raw_socket_istream.hpp
index 485b9c4c88..0866b402ef 100644
--- a/wpinet/src/main/native/include/wpi/net/raw_socket_istream.hpp
+++ b/wpinet/src/main/native/include/wpi/net/raw_socket_istream.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_RAW_SOCKET_ISTREAM_H_
-#define WPINET_RAW_SOCKET_ISTREAM_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_ISTREAM_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_ISTREAM_HPP_
 
 #include "wpi/util/raw_istream.hpp"
 
@@ -28,4 +28,4 @@ class raw_socket_istream : public raw_istream {
 
 }  // namespace wpi
 
-#endif  // WPINET_RAW_SOCKET_ISTREAM_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_ISTREAM_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/raw_socket_ostream.hpp b/wpinet/src/main/native/include/wpi/net/raw_socket_ostream.hpp
index 1ef1b6c7b1..bd013fc1d4 100644
--- a/wpinet/src/main/native/include/wpi/net/raw_socket_ostream.hpp
+++ b/wpinet/src/main/native/include/wpi/net/raw_socket_ostream.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_RAW_SOCKET_OSTREAM_H_
-#define WPINET_RAW_SOCKET_OSTREAM_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_OSTREAM_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_OSTREAM_HPP_
 
 #include "wpi/util/raw_ostream.hpp"
 
@@ -36,4 +36,4 @@ class raw_socket_ostream : public raw_ostream {
 
 }  // namespace wpi
 
-#endif  // WPINET_RAW_SOCKET_OSTREAM_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_SOCKET_OSTREAM_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/raw_uv_ostream.hpp b/wpinet/src/main/native/include/wpi/net/raw_uv_ostream.hpp
index 4fc82db61a..44818e0474 100644
--- a/wpinet/src/main/native/include/wpi/net/raw_uv_ostream.hpp
+++ b/wpinet/src/main/native/include/wpi/net/raw_uv_ostream.hpp
@@ -2,18 +2,17 @@
 // 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.
 
-#ifndef WPINET_RAW_UV_OSTREAM_H_
-#define WPINET_RAW_UV_OSTREAM_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_UV_OSTREAM_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_UV_OSTREAM_HPP_
 
 #include <functional>
 #include <span>
 #include <utility>
 
+#include "wpi/net/uv/Buffer.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/raw_ostream.hpp"
 
-#include "wpi/net/uv/Buffer.hpp"
-
 namespace wpi {
 
 /**
@@ -72,4 +71,4 @@ class raw_uv_ostream : public raw_ostream {
 
 }  // namespace wpi
 
-#endif  // WPINET_RAW_UV_OSTREAM_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_RAW_UV_OSTREAM_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Async.hpp b/wpinet/src/main/native/include/wpi/net/uv/Async.hpp
index 1cc95fc8e7..619975c481 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Async.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Async.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_ASYNC_H_
-#define WPINET_UV_ASYNC_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNC_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNC_HPP_
 
 #include <uv.h>
 
@@ -13,11 +13,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/Signal.h"
-#include "wpi/util/mutex.hpp"
-
 #include "wpi/net/uv/Handle.hpp"
 #include "wpi/net/uv/Loop.hpp"
+#include "wpi/util/Signal.h"
+#include "wpi/util/mutex.hpp"
 
 namespace wpi::uv {
 
@@ -199,4 +198,4 @@ class Async<> final : public HandleImpl<Async<>, uv_async_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_ASYNC_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNC_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/AsyncFunction.hpp b/wpinet/src/main/native/include/wpi/net/uv/AsyncFunction.hpp
index 2d8ec65e50..9ee8818d74 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/AsyncFunction.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/AsyncFunction.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_ASYNCFUNCTION_H_
-#define WPINET_UV_ASYNCFUNCTION_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNCFUNCTION_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNCFUNCTION_HPP_
 
 #include <stdint.h>
 #include <uv.h>
@@ -16,11 +16,10 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/future.hpp"
-#include "wpi/util/mutex.hpp"
-
 #include "wpi/net/uv/Handle.hpp"
 #include "wpi/net/uv/Loop.hpp"
+#include "wpi/util/future.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace wpi::uv {
 
@@ -176,4 +175,4 @@ class AsyncFunction<R(T...)> final
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_ASYNCFUNCTION_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ASYNCFUNCTION_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Buffer.hpp b/wpinet/src/main/native/include/wpi/net/uv/Buffer.hpp
index 6baadb7c0d..bb187695ab 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Buffer.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Buffer.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_BUFFER_H_
-#define WPINET_UV_BUFFER_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_BUFFER_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_BUFFER_HPP_
 
 #include <uv.h>
 
@@ -173,4 +173,4 @@ class SimpleBufferPool {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_BUFFER_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_BUFFER_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Check.hpp b/wpinet/src/main/native/include/wpi/net/uv/Check.hpp
index d68f8ab4aa..0144079b90 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Check.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Check.hpp
@@ -2,16 +2,15 @@
 // 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.
 
-#ifndef WPINET_UV_CHECK_H_
-#define WPINET_UV_CHECK_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_CHECK_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_CHECK_HPP_
 
 #include <uv.h>
 
 #include <memory>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Handle.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -63,4 +62,4 @@ class Check final : public HandleImpl<Check, uv_check_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_CHECK_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_CHECK_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Error.hpp b/wpinet/src/main/native/include/wpi/net/uv/Error.hpp
index f3f8d24b23..51216a0257 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Error.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Error.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_ERROR_H_
-#define WPINET_UV_ERROR_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ERROR_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ERROR_HPP_
 
 #include <uv.h>
 
@@ -43,4 +43,4 @@ class Error {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_ERROR_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_ERROR_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/FsEvent.hpp b/wpinet/src/main/native/include/wpi/net/uv/FsEvent.hpp
index 89014c77ef..b5ae73deb5 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/FsEvent.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/FsEvent.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_FSEVENT_H_
-#define WPINET_UV_FSEVENT_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_FSEVENT_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_FSEVENT_HPP_
 
 #include <uv.h>
 
@@ -11,9 +11,8 @@
 #include <string>
 #include <string_view>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Handle.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -77,4 +76,4 @@ class FsEvent final : public HandleImpl<FsEvent, uv_fs_event_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_FSEVENT_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_FSEVENT_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/GetAddrInfo.hpp b/wpinet/src/main/native/include/wpi/net/uv/GetAddrInfo.hpp
index 91176831af..dbd44e33e3 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/GetAddrInfo.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/GetAddrInfo.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_GETADDRINFO_H_
-#define WPINET_UV_GETADDRINFO_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETADDRINFO_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETADDRINFO_HPP_
 
 #include <uv.h>
 
@@ -13,9 +13,8 @@
 #include <string_view>
 #include <utility>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Request.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -118,4 +117,4 @@ inline void GetAddrInfo(const std::shared_ptr<Loop>& loop,
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_GETADDRINFO_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETADDRINFO_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/GetNameInfo.hpp b/wpinet/src/main/native/include/wpi/net/uv/GetNameInfo.hpp
index 062626c55c..46a1499010 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/GetNameInfo.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/GetNameInfo.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_GETNAMEINFO_H_
-#define WPINET_UV_GETNAMEINFO_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETNAMEINFO_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETNAMEINFO_HPP_
 
 #include <uv.h>
 
@@ -12,9 +12,8 @@
 #include <string_view>
 #include <utility>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Request.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -225,4 +224,4 @@ inline void GetNameInfo6(const std::shared_ptr<Loop>& loop,
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_GETNAMEINFO_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_GETNAMEINFO_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Handle.hpp b/wpinet/src/main/native/include/wpi/net/uv/Handle.hpp
index f98cf36def..fbc3d95631 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Handle.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Handle.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_HANDLE_H_
-#define WPINET_UV_HANDLE_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_HANDLE_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_HANDLE_HPP_
 
 #include <uv.h>
 
@@ -13,11 +13,10 @@
 #include <string_view>
 #include <utility>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Buffer.hpp"
 #include "wpi/net/uv/Error.hpp"
 #include "wpi/net/uv/Loop.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi {
 class Logger;
@@ -312,4 +311,4 @@ class HandleImpl : public Handle {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_HANDLE_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_HANDLE_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Idle.hpp b/wpinet/src/main/native/include/wpi/net/uv/Idle.hpp
index 58e69470e5..d4a6c79d0f 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Idle.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Idle.hpp
@@ -2,16 +2,15 @@
 // 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.
 
-#ifndef WPINET_UV_IDLE_H_
-#define WPINET_UV_IDLE_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_IDLE_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_IDLE_HPP_
 
 #include <uv.h>
 
 #include <memory>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Handle.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -72,4 +71,4 @@ class Idle final : public HandleImpl<Idle, uv_idle_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_IDLE_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_IDLE_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Loop.hpp b/wpinet/src/main/native/include/wpi/net/uv/Loop.hpp
index d9f270bffc..bce2a7e5cd 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Loop.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Loop.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_LOOP_H_
-#define WPINET_UV_LOOP_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_LOOP_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_LOOP_HPP_
 
 #include <uv.h>
 
@@ -14,11 +14,10 @@
 #include <thread>
 #include <utility>
 
+#include "wpi/net/uv/Error.hpp"
 #include "wpi/util/Signal.h"
 #include "wpi/util/function_ref.hpp"
 
-#include "wpi/net/uv/Error.hpp"
-
 namespace wpi::uv {
 
 class Handle;
@@ -266,4 +265,4 @@ class Loop final : public std::enable_shared_from_this<Loop> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_LOOP_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_LOOP_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/NetworkStream.hpp b/wpinet/src/main/native/include/wpi/net/uv/NetworkStream.hpp
index 55b37e45ab..720caabd6c 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/NetworkStream.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/NetworkStream.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_NETWORKSTREAM_H_
-#define WPINET_UV_NETWORKSTREAM_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_NETWORKSTREAM_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_NETWORKSTREAM_HPP_
 
 #include <uv.h>
 
@@ -11,9 +11,8 @@
 #include <functional>
 #include <memory>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Stream.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -151,4 +150,4 @@ class NetworkStreamImpl : public NetworkStream {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_NETWORKSTREAM_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_NETWORKSTREAM_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Pipe.hpp b/wpinet/src/main/native/include/wpi/net/uv/Pipe.hpp
index 82983e7e75..be5543ca02 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Pipe.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Pipe.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_PIPE_H_
-#define WPINET_UV_PIPE_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PIPE_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PIPE_HPP_
 
 #include <uv.h>
 
@@ -205,4 +205,4 @@ class PipeConnectReq : public ConnectReq {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_PIPE_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PIPE_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Poll.hpp b/wpinet/src/main/native/include/wpi/net/uv/Poll.hpp
index 29d3854f53..db95635e45 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Poll.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Poll.hpp
@@ -2,17 +2,16 @@
 // 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.
 
-#ifndef WPINET_UV_POLL_H_
-#define WPINET_UV_POLL_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_POLL_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_POLL_HPP_
 
 #include <uv.h>
 
 #include <functional>
 #include <memory>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Handle.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -120,4 +119,4 @@ class Poll final : public HandleImpl<Poll, uv_poll_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_POLL_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_POLL_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Prepare.hpp b/wpinet/src/main/native/include/wpi/net/uv/Prepare.hpp
index 1ada073849..d0864260ee 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Prepare.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Prepare.hpp
@@ -2,16 +2,15 @@
 // 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.
 
-#ifndef WPINET_UV_PREPARE_H_
-#define WPINET_UV_PREPARE_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PREPARE_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PREPARE_HPP_
 
 #include <uv.h>
 
 #include <memory>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Handle.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -63,4 +62,4 @@ class Prepare final : public HandleImpl<Prepare, uv_prepare_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_PREPARE_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PREPARE_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Process.hpp b/wpinet/src/main/native/include/wpi/net/uv/Process.hpp
index c3581ee8e7..15d6cbf621 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Process.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Process.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_PROCESS_H_
-#define WPINET_UV_PROCESS_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PROCESS_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PROCESS_HPP_
 
 #include <uv.h>
 
@@ -13,11 +13,10 @@
 #include <string>
 #include <string_view>
 
+#include "wpi/net/uv/Handle.hpp"
 #include "wpi/util/Signal.h"
 #include "wpi/util/SmallVector.hpp"
 
-#include "wpi/net/uv/Handle.hpp"
-
 namespace wpi::uv {
 
 class Loop;
@@ -308,4 +307,4 @@ class Process final : public HandleImpl<Process, uv_process_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_PROCESS_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_PROCESS_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Request.hpp b/wpinet/src/main/native/include/wpi/net/uv/Request.hpp
index 15ed28f3b1..fe6d1f0867 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Request.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Request.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_REQUEST_H_
-#define WPINET_UV_REQUEST_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_REQUEST_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_REQUEST_HPP_
 
 #include <uv.h>
 
@@ -168,4 +168,4 @@ class RequestImpl : public Request {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_REQUEST_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_REQUEST_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Signal.hpp b/wpinet/src/main/native/include/wpi/net/uv/Signal.hpp
index ab8acc912b..98deaec801 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Signal.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Signal.hpp
@@ -2,16 +2,15 @@
 // 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.
 
-#ifndef WPINET_UV_SIGNAL_H_
-#define WPINET_UV_SIGNAL_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_SIGNAL_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_SIGNAL_HPP_
 
 #include <uv.h>
 
 #include <memory>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Handle.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -77,4 +76,4 @@ class Signal final : public HandleImpl<Signal, uv_signal_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_SIGNAL_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_SIGNAL_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Stream.hpp b/wpinet/src/main/native/include/wpi/net/uv/Stream.hpp
index aa14d0d316..3def693db8 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Stream.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Stream.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_STREAM_H_
-#define WPINET_UV_STREAM_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_STREAM_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_STREAM_HPP_
 
 #include <uv.h>
 
@@ -14,11 +14,10 @@
 #include <span>
 #include <utility>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Buffer.hpp"
 #include "wpi/net/uv/Handle.hpp"
 #include "wpi/net/uv/Request.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -332,4 +331,4 @@ class StreamImpl : public Stream {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_STREAM_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_STREAM_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Tcp.hpp b/wpinet/src/main/native/include/wpi/net/uv/Tcp.hpp
index c7fc764766..f68b184452 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Tcp.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Tcp.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_TCP_H_
-#define WPINET_UV_TCP_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TCP_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TCP_HPP_
 
 #include <uv.h>
 
@@ -368,4 +368,4 @@ class TcpConnectReq : public ConnectReq {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_TCP_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TCP_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Timer.hpp b/wpinet/src/main/native/include/wpi/net/uv/Timer.hpp
index 7592c6ca7d..6e39043455 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Timer.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Timer.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_TIMER_H_
-#define WPINET_UV_TIMER_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TIMER_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TIMER_HPP_
 
 #include <uv.h>
 
@@ -12,9 +12,8 @@
 #include <memory>
 #include <utility>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Handle.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -142,4 +141,4 @@ class Timer final : public HandleImpl<Timer, uv_timer_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_TIMER_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TIMER_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Tty.hpp b/wpinet/src/main/native/include/wpi/net/uv/Tty.hpp
index 55773a87ef..06a21bf3c1 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Tty.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Tty.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_TTY_H_
-#define WPINET_UV_TTY_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TTY_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TTY_HPP_
 
 #include <uv.h>
 
@@ -82,4 +82,4 @@ class Tty final : public StreamImpl<Tty, uv_tty_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_TTY_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_TTY_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Udp.hpp b/wpinet/src/main/native/include/wpi/net/uv/Udp.hpp
index 91115ddf34..6a7b32e08b 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Udp.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Udp.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_UDP_H_
-#define WPINET_UV_UDP_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UDP_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UDP_HPP_
 
 #include <uv.h>
 
@@ -13,10 +13,9 @@
 #include <string_view>
 #include <utility>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Handle.hpp"
 #include "wpi/net/uv/Request.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -396,4 +395,4 @@ class Udp final : public HandleImpl<Udp, uv_udp_t> {
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_UDP_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UDP_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/Work.hpp b/wpinet/src/main/native/include/wpi/net/uv/Work.hpp
index 3fb89eb42a..645bc220ff 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/Work.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/Work.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_WORK_H_
-#define WPINET_UV_WORK_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_WORK_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_WORK_HPP_
 
 #include <uv.h>
 
@@ -11,9 +11,8 @@
 #include <memory>
 #include <utility>
 
-#include "wpi/util/Signal.h"
-
 #include "wpi/net/uv/Request.hpp"
+#include "wpi/util/Signal.h"
 
 namespace wpi::uv {
 
@@ -91,4 +90,4 @@ inline void QueueWork(const std::shared_ptr<Loop>& loop,
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_WORK_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_WORK_HPP_
diff --git a/wpinet/src/main/native/include/wpi/net/uv/util.hpp b/wpinet/src/main/native/include/wpi/net/uv/util.hpp
index 642f8e9618..08cc844928 100644
--- a/wpinet/src/main/native/include/wpi/net/uv/util.hpp
+++ b/wpinet/src/main/native/include/wpi/net/uv/util.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPINET_UV_UTIL_H_
-#define WPINET_UV_UTIL_H_
+#ifndef WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UTIL_HPP_
+#define WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UTIL_HPP_
 
 #include <uv.h>
 
@@ -155,4 +155,4 @@ int NameToAddr(std::string_view ip, in6_addr* addr);
 
 }  // namespace wpi::uv
 
-#endif  // WPINET_UV_UTIL_H_
+#endif  // WPINET_WPINET_SRC_MAIN_NATIVE_INCLUDE_WPI_NET_UV_UTIL_HPP_
diff --git a/wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp
index 0365055222..9d944c11fa 100644
--- a/wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp
+++ b/wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp
@@ -10,9 +10,9 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include "wpi/util/mutex.hpp"
 
 #include "AvahiClient.hpp"
+#include "wpi/util/mutex.hpp"
 
 using namespace wpi;
 
diff --git a/wpinet/src/main/native/linux/MulticastServiceResolver.cpp b/wpinet/src/main/native/linux/MulticastServiceResolver.cpp
index 8709298793..dfe921fb5f 100644
--- a/wpinet/src/main/native/linux/MulticastServiceResolver.cpp
+++ b/wpinet/src/main/native/linux/MulticastServiceResolver.cpp
@@ -10,12 +10,11 @@
 #include <string>
 #include <utility>
 
+#include "AvahiClient.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/mutex.hpp"
 
-#include "AvahiClient.hpp"
-
 using namespace wpi;
 
 struct MulticastServiceResolver::Impl {
diff --git a/wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp
index 9ad32e0891..043dae19fd 100644
--- a/wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp
+++ b/wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp
@@ -10,9 +10,8 @@
 #include <string>
 #include <utility>
 
-#include "wpi/util/SmallString.hpp"
-
 #include "dns_sd.h"
+#include "wpi/util/SmallString.hpp"
 
 using namespace wpi;
 
diff --git a/wpinet/src/main/native/macOS/MulticastServiceResolver.cpp b/wpinet/src/main/native/macOS/MulticastServiceResolver.cpp
index d4781fdfd7..2b668a6478 100644
--- a/wpinet/src/main/native/macOS/MulticastServiceResolver.cpp
+++ b/wpinet/src/main/native/macOS/MulticastServiceResolver.cpp
@@ -16,10 +16,9 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/SmallVector.hpp"
-
 #include "ResolverThread.hpp"
 #include "dns_sd.h"
+#include "wpi/util/SmallVector.hpp"
 
 using namespace wpi;
 
diff --git a/wpinet/src/main/native/macOS/ResolverThread.hpp b/wpinet/src/main/native/macOS/ResolverThread.hpp
index 657326bc83..d141854d6c 100644
--- a/wpinet/src/main/native/macOS/ResolverThread.hpp
+++ b/wpinet/src/main/native/macOS/ResolverThread.hpp
@@ -15,11 +15,10 @@
 #include <utility>
 #include <vector>
 
+#include "dns_sd.h"
 #include "wpi/util/Synchronization.h"
 #include "wpi/util/mutex.hpp"
 
-#include "dns_sd.h"
-
 namespace wpi {
 class ResolverThread {
  private:
diff --git a/wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp
index e0a8103322..ecdf1d7c87 100644
--- a/wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp
+++ b/wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp
@@ -13,14 +13,13 @@
 #include <utility>
 #include <vector>
 
+#include "DynamicDns.hpp"
+#include "wpi/net/hostname.hpp"
 #include "wpi/util/ConvertUTF.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/StringExtras.hpp"
 
-#include "DynamicDns.hpp"
-#include "wpi/net/hostname.hpp"
-
 using namespace wpi;
 
 struct ImplBase {
diff --git a/wpinet/src/main/native/windows/MulticastServiceResolver.cpp b/wpinet/src/main/native/windows/MulticastServiceResolver.cpp
index d11a016d77..8826e3fa43 100644
--- a/wpinet/src/main/native/windows/MulticastServiceResolver.cpp
+++ b/wpinet/src/main/native/windows/MulticastServiceResolver.cpp
@@ -12,13 +12,12 @@
 #include <string>
 #include <utility>
 
+#include "DynamicDns.hpp"
 #include "wpi/util/ConvertUTF.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/StringExtras.hpp"
 
-#include "DynamicDns.hpp"
-
 #pragma comment(lib, "dnsapi")
 
 using namespace wpi;
diff --git a/wpinet/src/netconsoleServer/native/cpp/main.cpp b/wpinet/src/netconsoleServer/native/cpp/main.cpp
index 520784c38f..42f4065bfc 100644
--- a/wpinet/src/netconsoleServer/native/cpp/main.cpp
+++ b/wpinet/src/netconsoleServer/native/cpp/main.cpp
@@ -14,10 +14,6 @@
 #include <string>
 
 #include <fmt/format.h>
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/print.hpp"
-#include "wpi/util/timestamp.h"
 
 #include "wpi/net/raw_uv_ostream.hpp"
 #include "wpi/net/uv/Loop.hpp"
@@ -28,6 +24,10 @@
 #include "wpi/net/uv/Tty.hpp"
 #include "wpi/net/uv/Udp.hpp"
 #include "wpi/net/uv/util.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 namespace uv = wpi::uv;
 
diff --git a/wpinet/src/netconsoleTee/native/cpp/main.cpp b/wpinet/src/netconsoleTee/native/cpp/main.cpp
index 8130d0a49a..54fd6078fe 100644
--- a/wpinet/src/netconsoleTee/native/cpp/main.cpp
+++ b/wpinet/src/netconsoleTee/native/cpp/main.cpp
@@ -8,10 +8,6 @@
 #include <string>
 
 #include <fmt/format.h>
-#include "wpi/util/SmallVector.hpp"
-#include "wpi/util/StringExtras.hpp"
-#include "wpi/util/print.hpp"
-#include "wpi/util/timestamp.h"
 
 #include "wpi/net/raw_uv_ostream.hpp"
 #include "wpi/net/uv/Loop.hpp"
@@ -19,6 +15,10 @@
 #include "wpi/net/uv/Tty.hpp"
 #include "wpi/net/uv/Udp.hpp"
 #include "wpi/net/uv/util.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 namespace uv = wpi::uv;
 
diff --git a/wpinet/src/test/native/cpp/MulticastTest.cpp b/wpinet/src/test/native/cpp/MulticastTest.cpp
index 40e1acd19a..78c4474166 100644
--- a/wpinet/src/test/native/cpp/MulticastTest.cpp
+++ b/wpinet/src/test/native/cpp/MulticastTest.cpp
@@ -2,9 +2,6 @@
 // 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 "wpi/net/MulticastServiceAnnouncer.h"
-#include "wpi/net/MulticastServiceResolver.h"
-
 #include <array>
 #include <chrono>
 #include <string>
@@ -13,6 +10,9 @@
 #include <utility>
 
 #include <gtest/gtest.h>
+
+#include "wpi/net/MulticastServiceAnnouncer.h"
+#include "wpi/net/MulticastServiceResolver.h"
 #include "wpi/util/timestamp.h"
 
 TEST(MulticastServiceAnnouncerTest, EmptyText) {
diff --git a/wpinet/src/test/native/cpp/WebSocketClientTest.cpp b/wpinet/src/test/native/cpp/WebSocketClientTest.cpp
index ead8af3a3f..1f231058ce 100644
--- a/wpinet/src/test/native/cpp/WebSocketClientTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketClientTest.cpp
@@ -9,15 +9,14 @@
 #include <string>
 #include <vector>
 
+#include "WebSocketTest.hpp"
+#include "wpi/net/HttpParser.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
 #include "wpi/util/Base64.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/sha1.hpp"
 
-#include "WebSocketTest.hpp"
-#include "wpi/net/HttpParser.hpp"
-#include "wpi/net/raw_uv_ostream.hpp"
-
 namespace wpi {
 
 class WebSocketClientTest : public WebSocketTest {
diff --git a/wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp b/wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp
index 0b0e10206f..238a950b85 100644
--- a/wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp
@@ -6,9 +6,8 @@
 
 #include <vector>
 
-#include "wpi/util/SmallString.hpp"
-
 #include "WebSocketTest.hpp"
+#include "wpi/util/SmallString.hpp"
 
 namespace wpi {
 
diff --git a/wpinet/src/test/native/cpp/WebSocketSerializerTest.cpp b/wpinet/src/test/native/cpp/WebSocketSerializerTest.cpp
index c108f76422..2fad23b827 100644
--- a/wpinet/src/test/native/cpp/WebSocketSerializerTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketSerializerTest.cpp
@@ -14,10 +14,10 @@
 #include <vector>
 
 #include <gmock/gmock.h>
-#include "wpi/util/SpanMatcher.hpp"
 
 #include "WebSocketTest.hpp"
 #include "wpi/net/uv/Buffer.hpp"
+#include "wpi/util/SpanMatcher.hpp"
 
 using ::testing::_;
 using ::testing::AnyOf;
diff --git a/wpinet/src/test/native/cpp/WebSocketServerTest.cpp b/wpinet/src/test/native/cpp/WebSocketServerTest.cpp
index 44ab4f529d..526f3f4576 100644
--- a/wpinet/src/test/native/cpp/WebSocketServerTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketServerTest.cpp
@@ -8,13 +8,12 @@
 #include <memory>
 #include <vector>
 
+#include "WebSocketTest.hpp"
+#include "wpi/net/HttpParser.hpp"
 #include "wpi/util/Base64.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/sha1.hpp"
 
-#include "WebSocketTest.hpp"
-#include "wpi/net/HttpParser.hpp"
-
 namespace wpi {
 
 class WebSocketServerTest : public WebSocketTest {
diff --git a/wpinet/src/test/native/cpp/WebSocketTest.cpp b/wpinet/src/test/native/cpp/WebSocketTest.cpp
index 17f30a75f9..f8f6584672 100644
--- a/wpinet/src/test/native/cpp/WebSocketTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketTest.cpp
@@ -9,9 +9,8 @@
 #include <utility>
 #include <vector>
 
-#include "wpi/util/StringExtras.hpp"
-
 #include "wpi/net/HttpParser.hpp"
+#include "wpi/util/StringExtras.hpp"
 
 namespace wpi {
 
diff --git a/wpinet/src/test/native/cpp/WorkerThreadTest.cpp b/wpinet/src/test/native/cpp/WorkerThreadTest.cpp
index ae3b0b24c0..4f134f00a4 100644
--- a/wpinet/src/test/native/cpp/WorkerThreadTest.cpp
+++ b/wpinet/src/test/native/cpp/WorkerThreadTest.cpp
@@ -7,11 +7,11 @@
 #include <thread>
 
 #include <gtest/gtest.h>
-#include "wpi/util/condition_variable.hpp"
-#include "wpi/util/mutex.hpp"
 
 #include "wpi/net/EventLoopRunner.hpp"
 #include "wpi/net/uv/Loop.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace wpi {
 
diff --git a/wpinet/src/test/native/cpp/hostname.cpp b/wpinet/src/test/native/cpp/hostname.cpp
index 803835e11a..8a678fa64a 100644
--- a/wpinet/src/test/native/cpp/hostname.cpp
+++ b/wpinet/src/test/native/cpp/hostname.cpp
@@ -5,6 +5,7 @@
 #include "wpi/net/hostname.hpp"
 
 #include <gtest/gtest.h>
+
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/SmallVector.hpp"
 
diff --git a/wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp b/wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp
index 40c1e332fc..babbfc637b 100644
--- a/wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp
+++ b/wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp
@@ -30,10 +30,10 @@
 #include <thread>
 
 #include <gtest/gtest.h>
-#include "wpi/util/mutex.hpp"
 
 #include "wpi/net/uv/Loop.hpp"
 #include "wpi/net/uv/Prepare.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace wpi::uv {
 
diff --git a/wpiutil/src/dev/native/cpp/main.cpp b/wpiutil/src/dev/native/cpp/main.cpp
index ecbcf497ba..74f17fbfea 100644
--- a/wpiutil/src/dev/native/cpp/main.cpp
+++ b/wpiutil/src/dev/native/cpp/main.cpp
@@ -2,9 +2,8 @@
 // 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 "wpi/util/print.hpp"
-
 #include "wpi/util/SmallString.hpp"
+#include "wpi/util/print.hpp"
 
 int main() {
   wpi::SmallString<128> v1("Hello");
diff --git a/wpiutil/src/main/native/cpp/RawFrame.cpp b/wpiutil/src/main/native/cpp/RawFrame.cpp
index fdd0bb3398..513db1c07b 100644
--- a/wpiutil/src/main/native/cpp/RawFrame.cpp
+++ b/wpiutil/src/main/native/cpp/RawFrame.cpp
@@ -4,10 +4,10 @@
 
 #include "wpi/util/RawFrame.h"
 
-#include "wpi/util/MemAlloc.hpp"
-
 #include <cstring>
 
+#include "wpi/util/MemAlloc.hpp"
+
 extern "C" {
 int WPI_AllocateRawFrameData(WPI_RawFrame* frame, size_t requestedSize) {
   if (frame->capacity >= requestedSize) {
diff --git a/wpiutil/src/main/native/cpp/string.cpp b/wpiutil/src/main/native/cpp/string.cpp
index 602624820e..dc9dab9e6b 100644
--- a/wpiutil/src/main/native/cpp/string.cpp
+++ b/wpiutil/src/main/native/cpp/string.cpp
@@ -5,10 +5,10 @@
 #include "string"
 #include "wpi/util/string.h"
 
-#include "wpi/util/MemAlloc.hpp"
-
 #include <string_view>
 
+#include "wpi/util/MemAlloc.hpp"
+
 extern "C" {
 
 void WPI_InitString(struct WPI_String* wpiString, const char* utf8String) {
diff --git a/wpiutil/src/main/native/include/wpi/util/Base64.hpp b/wpiutil/src/main/native/include/wpi/util/Base64.hpp
index 858ff73fff..7bd09cd674 100644
--- a/wpiutil/src/main/native/include/wpi/util/Base64.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/Base64.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_BASE64_H_
-#define WPIUTIL_WPI_BASE64_H_
+#ifndef WPIUTIL_WPI_UTIL_BASE64_HPP_
+#define WPIUTIL_WPI_UTIL_BASE64_HPP_
 
 #include <stdint.h>
 
@@ -46,4 +46,4 @@ std::string_view Base64Encode(std::span<const uint8_t> plain,
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_BASE64_H_
+#endif  // WPIUTIL_WPI_UTIL_BASE64_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp b/wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp
index 1875dc0b28..993fcdd500 100644
--- a/wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/CallbackManager.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_CALLBACKMANAGER_H_
-#define WPIUTIL_WPI_CALLBACKMANAGER_H_
+#ifndef WPIUTIL_WPI_UTIL_CALLBACKMANAGER_HPP_
+#define WPIUTIL_WPI_UTIL_CALLBACKMANAGER_HPP_
 
 #include <atomic>
 #include <climits>
@@ -392,4 +392,4 @@ class CallbackManager {
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_CALLBACKMANAGER_H_
+#endif  // WPIUTIL_WPI_UTIL_CALLBACKMANAGER_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/Demangle.hpp b/wpiutil/src/main/native/include/wpi/util/Demangle.hpp
index 8514be3fe2..273b5e688e 100644
--- a/wpiutil/src/main/native/include/wpi/util/Demangle.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/Demangle.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_DEMANGLE_H_
-#define WPIUTIL_WPI_DEMANGLE_H_
+#ifndef WPIUTIL_WPI_UTIL_DEMANGLE_HPP_
+#define WPIUTIL_WPI_UTIL_DEMANGLE_HPP_
 
 #include <string>
 #include <string_view>
@@ -30,4 +30,4 @@ std::string GetTypeName(const T& type) {
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_DEMANGLE_H_
+#endif  // WPIUTIL_WPI_UTIL_DEMANGLE_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/Logger.hpp b/wpiutil/src/main/native/include/wpi/util/Logger.hpp
index 45b576d2dd..f17482f44a 100644
--- a/wpiutil/src/main/native/include/wpi/util/Logger.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/Logger.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_LOGGER_H_
-#define WPIUTIL_WPI_LOGGER_H_
+#ifndef WPIUTIL_WPI_UTIL_LOGGER_HPP_
+#define WPIUTIL_WPI_UTIL_LOGGER_HPP_
 
 #include <functional>
 #include <utility>
@@ -91,4 +91,4 @@ class Logger {
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_LOGGER_H_
+#endif  // WPIUTIL_WPI_UTIL_LOGGER_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/RawFrame.h b/wpiutil/src/main/native/include/wpi/util/RawFrame.h
index c164751db0..ce44698e92 100644
--- a/wpiutil/src/main/native/include/wpi/util/RawFrame.h
+++ b/wpiutil/src/main/native/include/wpi/util/RawFrame.h
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_RAWFRAME_H_
-#define WPIUTIL_WPI_RAWFRAME_H_
+#ifndef WPIUTIL_WPI_UTIL_RAWFRAME_H_
+#define WPIUTIL_WPI_UTIL_RAWFRAME_H_
 
 #include <stdint.h>
 
@@ -163,4 +163,4 @@ void SetFrameData(JNIEnv* env, jclass rawFrameCls, jobject jframe,
 }  // namespace wpi
 #endif
 
-#endif  // WPIUTIL_WPI_RAWFRAME_H_
+#endif  // WPIUTIL_WPI_UTIL_RAWFRAME_H_
diff --git a/wpiutil/src/main/native/include/wpi/util/SafeThread.hpp b/wpiutil/src/main/native/include/wpi/util/SafeThread.hpp
index 3b1123cfac..bd86803e41 100644
--- a/wpiutil/src/main/native/include/wpi/util/SafeThread.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/SafeThread.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_SAFETHREAD_H_
-#define WPIUTIL_WPI_SAFETHREAD_H_
+#ifndef WPIUTIL_WPI_UTIL_SAFETHREAD_HPP_
+#define WPIUTIL_WPI_UTIL_SAFETHREAD_HPP_
 
 #include <atomic>
 #include <memory>
@@ -142,4 +142,4 @@ class SafeThreadOwner : public detail::SafeThreadOwnerBase {
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_SAFETHREAD_H_
+#endif  // WPIUTIL_WPI_UTIL_SAFETHREAD_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/StackTrace.hpp b/wpiutil/src/main/native/include/wpi/util/StackTrace.hpp
index 44e0b21d7b..98dfbdbde1 100644
--- a/wpiutil/src/main/native/include/wpi/util/StackTrace.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/StackTrace.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_STACKTRACE_H_
-#define WPIUTIL_WPI_STACKTRACE_H_
+#ifndef WPIUTIL_WPI_UTIL_STACKTRACE_HPP_
+#define WPIUTIL_WPI_UTIL_STACKTRACE_HPP_
 
 #include <string>
 
@@ -32,4 +32,4 @@ void SetGetStackTraceImpl(std::string (*func)(int offset));
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_STACKTRACE_H_
+#endif  // WPIUTIL_WPI_UTIL_STACKTRACE_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/UidVector.hpp b/wpiutil/src/main/native/include/wpi/util/UidVector.hpp
index 3ffd4c39c7..c84921d419 100644
--- a/wpiutil/src/main/native/include/wpi/util/UidVector.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/UidVector.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_UIDVECTOR_H_
-#define WPIUTIL_WPI_UIDVECTOR_H_
+#ifndef WPIUTIL_WPI_UTIL_UIDVECTOR_HPP_
+#define WPIUTIL_WPI_UTIL_UIDVECTOR_HPP_
 
 #include <iterator>
 #include <utility>
@@ -156,4 +156,4 @@ class UidVector {
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_UIDVECTOR_H_
+#endif  // WPIUTIL_WPI_UTIL_UIDVECTOR_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/deprecated.hpp b/wpiutil/src/main/native/include/wpi/util/deprecated.hpp
index 7947010aaf..9517a0f8ab 100644
--- a/wpiutil/src/main/native/include/wpi/util/deprecated.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/deprecated.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_DEPRECATED_H_
-#define WPIUTIL_WPI_DEPRECATED_H_
+#ifndef WPIUTIL_WPI_UTIL_DEPRECATED_HPP_
+#define WPIUTIL_WPI_UTIL_DEPRECATED_HPP_
 
 #ifndef WPI_IGNORE_DEPRECATED
 #ifdef __GNUC__
@@ -28,4 +28,4 @@
 #endif
 #endif
 
-#endif  // WPIUTIL_WPI_DEPRECATED_H_
+#endif  // WPIUTIL_WPI_UTIL_DEPRECATED_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp b/wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp
index 78faae6b65..61d24a4242 100644
--- a/wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/fmt/raw_ostream.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_FMT_RAW_OSTREAM_H_
-#define WPIUTIL_WPI_FMT_RAW_OSTREAM_H_
+#ifndef WPIUTIL_WPI_UTIL_FMT_RAW_OSTREAM_HPP_
+#define WPIUTIL_WPI_UTIL_FMT_RAW_OSTREAM_HPP_
 
 #include <fmt/format.h>
 
@@ -28,4 +28,4 @@ void print(wpi::raw_ostream& os, const S& format_str, Args&&... args) {
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_FMT_RAW_OSTREAM_H_
+#endif  // WPIUTIL_WPI_UTIL_FMT_RAW_OSTREAM_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/future.hpp b/wpiutil/src/main/native/include/wpi/util/future.hpp
index 20c98b8445..44edc088f9 100644
--- a/wpiutil/src/main/native/include/wpi/util/future.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/future.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_FUTURE_H_
-#define WPIUTIL_WPI_FUTURE_H_
+#ifndef WPIUTIL_WPI_UTIL_FUTURE_HPP_
+#define WPIUTIL_WPI_UTIL_FUTURE_HPP_
 
 #include <stdint.h>
 
@@ -940,4 +940,4 @@ future<void> detail::FutureThen<void, void>::Create(
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_FUTURE_H_
+#endif  // WPIUTIL_WPI_UTIL_FUTURE_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/jni_util.hpp b/wpiutil/src/main/native/include/wpi/util/jni_util.hpp
index 52d4792420..75fecb0dc1 100644
--- a/wpiutil/src/main/native/include/wpi/util/jni_util.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/jni_util.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_JNI_UTIL_H_
-#define WPIUTIL_WPI_JNI_UTIL_H_
+#ifndef WPIUTIL_WPI_UTIL_JNI_UTIL_HPP_
+#define WPIUTIL_WPI_UTIL_JNI_UTIL_HPP_
 
 #include <jni.h>
 
@@ -977,4 +977,4 @@ struct JExceptionInit {
 
 }  // namespace wpi::java
 
-#endif  // WPIUTIL_WPI_JNI_UTIL_H_
+#endif  // WPIUTIL_WPI_UTIL_JNI_UTIL_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/nodiscard.h b/wpiutil/src/main/native/include/wpi/util/nodiscard.h
index d9240363bd..f1c280f0fc 100644
--- a/wpiutil/src/main/native/include/wpi/util/nodiscard.h
+++ b/wpiutil/src/main/native/include/wpi/util/nodiscard.h
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_NODISCARD_H_
-#define WPIUTIL_WPI_NODISCARD_H_
+#ifndef WPIUTIL_WPI_UTIL_NODISCARD_H_
+#define WPIUTIL_WPI_UTIL_NODISCARD_H_
 
 // This should only be used on APIs that can be compiled as C or C++. If the API
 // is C++ only, use [[nodiscard]] instead.
@@ -18,4 +18,4 @@
 
 #endif
 
-#endif  // WPIUTIL_WPI_NODISCARD_H_
+#endif  // WPIUTIL_WPI_UTIL_NODISCARD_H_
diff --git a/wpiutil/src/main/native/include/wpi/util/priority_queue.hpp b/wpiutil/src/main/native/include/wpi/util/priority_queue.hpp
index af683747c2..0447bc8433 100644
--- a/wpiutil/src/main/native/include/wpi/util/priority_queue.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/priority_queue.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_PRIORITY_QUEUE_H_
-#define WPIUTIL_WPI_PRIORITY_QUEUE_H_
+#ifndef WPIUTIL_WPI_UTIL_PRIORITY_QUEUE_HPP_
+#define WPIUTIL_WPI_UTIL_PRIORITY_QUEUE_HPP_
 
 #include <algorithm>
 #include <concepts>
@@ -113,4 +113,4 @@ class priority_queue {
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_PRIORITY_QUEUE_H_
+#endif  // WPIUTIL_WPI_UTIL_PRIORITY_QUEUE_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/raw_istream.hpp b/wpiutil/src/main/native/include/wpi/util/raw_istream.hpp
index 26d8b70b8b..42c39dcfe8 100644
--- a/wpiutil/src/main/native/include/wpi/util/raw_istream.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/raw_istream.hpp
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_RAW_ISTREAM_H_
-#define WPIUTIL_WPI_RAW_ISTREAM_H_
+#ifndef WPIUTIL_WPI_UTIL_RAW_ISTREAM_HPP_
+#define WPIUTIL_WPI_UTIL_RAW_ISTREAM_HPP_
 
 #include <stdint.h>
 
@@ -173,4 +173,4 @@ class raw_fd_istream : public raw_istream {
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_RAW_ISTREAM_H_
+#endif  // WPIUTIL_WPI_UTIL_RAW_ISTREAM_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/sha1.hpp b/wpiutil/src/main/native/include/wpi/util/sha1.hpp
index 75464bfdf6..611782dcfd 100644
--- a/wpiutil/src/main/native/include/wpi/util/sha1.hpp
+++ b/wpiutil/src/main/native/include/wpi/util/sha1.hpp
@@ -17,8 +17,8 @@
         -- Eugene Hopkinson <slowriot at voxelstorm dot com>
 */
 
-#ifndef WPIUTIL_WPI_SHA1_H_
-#define WPIUTIL_WPI_SHA1_H_
+#ifndef WPIUTIL_WPI_UTIL_SHA1_HPP_
+#define WPIUTIL_WPI_UTIL_SHA1_HPP_
 
 #include <stdint.h>
 
@@ -49,4 +49,4 @@ class SHA1 {
 
 }  // namespace wpi
 
-#endif  // WPIUTIL_WPI_SHA1_H_
+#endif  // WPIUTIL_WPI_UTIL_SHA1_HPP_
diff --git a/wpiutil/src/main/native/include/wpi/util/timestamp.h b/wpiutil/src/main/native/include/wpi/util/timestamp.h
index e9156ca37c..6ea7af37f0 100644
--- a/wpiutil/src/main/native/include/wpi/util/timestamp.h
+++ b/wpiutil/src/main/native/include/wpi/util/timestamp.h
@@ -2,8 +2,8 @@
 // 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.
 
-#ifndef WPIUTIL_WPI_TIMESTAMP_H_
-#define WPIUTIL_WPI_TIMESTAMP_H_
+#ifndef WPIUTIL_WPI_UTIL_TIMESTAMP_H_
+#define WPIUTIL_WPI_UTIL_TIMESTAMP_H_
 
 #include <stdint.h>
 
@@ -86,4 +86,4 @@ uint64_t GetSystemTime();
 }  // namespace wpi
 #endif
 
-#endif  // WPIUTIL_WPI_TIMESTAMP_H_
+#endif  // WPIUTIL_WPI_UTIL_TIMESTAMP_H_
diff --git a/wpiutil/src/test/native/cpp/proto/TestProtoInner.hpp b/wpiutil/src/test/native/cpp/proto/TestProtoInner.hpp
index 5ab0573eb4..f1d203ea8f 100644
--- a/wpiutil/src/test/native/cpp/proto/TestProtoInner.hpp
+++ b/wpiutil/src/test/native/cpp/proto/TestProtoInner.hpp
@@ -4,10 +4,9 @@
 
 #pragma once
 
-#include "wpi/util/protobuf/Protobuf.hpp"
-
 #include <string>
 
+#include "wpi/util/protobuf/Protobuf.hpp"
 #include "wpiutil.npb.h"
 
 struct TestProtoInner {
diff --git a/xrpVendordep/src/main/native/cpp/xrp/XRPMotor.cpp b/xrpVendordep/src/main/native/cpp/xrp/XRPMotor.cpp
index b3b96c022d..916d9867ca 100644
--- a/xrpVendordep/src/main/native/cpp/xrp/XRPMotor.cpp
+++ b/xrpVendordep/src/main/native/cpp/xrp/XRPMotor.cpp
@@ -4,12 +4,12 @@
 
 #include "wpi/xrp/XRPMotor.hpp"
 
-#include "wpi/system/Errors.hpp"
-
 #include <map>
 #include <set>
 #include <string>
 
+#include "wpi/system/Errors.hpp"
+
 using namespace frc;
 
 std::map<int, std::string> XRPMotor::s_simDeviceMap = {
diff --git a/xrpVendordep/src/main/native/cpp/xrp/XRPServo.cpp b/xrpVendordep/src/main/native/cpp/xrp/XRPServo.cpp
index bb47c40173..a7df9cc481 100644
--- a/xrpVendordep/src/main/native/cpp/xrp/XRPServo.cpp
+++ b/xrpVendordep/src/main/native/cpp/xrp/XRPServo.cpp
@@ -4,13 +4,12 @@
 
 #include "wpi/xrp/XRPServo.hpp"
 
-#include "wpi/system/Errors.hpp"
-
 #include <map>
 #include <numbers>
 #include <set>
 #include <string>
 
+#include "wpi/system/Errors.hpp"
 #include "wpi/units/angle.hpp"
 
 using namespace frc;
diff --git a/xrpVendordep/src/main/native/include/wpi/xrp/XRPGyro.hpp b/xrpVendordep/src/main/native/include/wpi/xrp/XRPGyro.hpp
index f28e8f6acd..ff954033a9 100644
--- a/xrpVendordep/src/main/native/include/wpi/xrp/XRPGyro.hpp
+++ b/xrpVendordep/src/main/native/include/wpi/xrp/XRPGyro.hpp
@@ -4,9 +4,8 @@
 
 #pragma once
 
-#include "wpi/math/geometry/Rotation2d.hpp"
-
 #include "wpi/hal/SimDevice.h"
+#include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/units/angle.hpp"
 #include "wpi/units/angular_velocity.hpp"
 
diff --git a/xrpVendordep/src/main/native/include/wpi/xrp/XRPMotor.hpp b/xrpVendordep/src/main/native/include/wpi/xrp/XRPMotor.hpp
index 8d06d59f8d..79b020e43a 100644
--- a/xrpVendordep/src/main/native/include/wpi/xrp/XRPMotor.hpp
+++ b/xrpVendordep/src/main/native/include/wpi/xrp/XRPMotor.hpp
@@ -4,14 +4,13 @@
 
 #pragma once
 
-#include "wpi/hardware/motor/MotorSafety.hpp"
-#include "wpi/hardware/motor/MotorController.hpp"
-
 #include <map>
 #include <set>
 #include <string>
 
 #include "wpi/hal/SimDevice.h"
+#include "wpi/hardware/motor/MotorController.hpp"
+#include "wpi/hardware/motor/MotorSafety.hpp"
 #include "wpi/util/deprecated.hpp"
 
 namespace frc {
diff --git a/xrpVendordep/src/main/native/include/wpi/xrp/XRPOnBoardIO.hpp b/xrpVendordep/src/main/native/include/wpi/xrp/XRPOnBoardIO.hpp
index e5cb17529b..a0c6b4a160 100644
--- a/xrpVendordep/src/main/native/include/wpi/xrp/XRPOnBoardIO.hpp
+++ b/xrpVendordep/src/main/native/include/wpi/xrp/XRPOnBoardIO.hpp
@@ -4,11 +4,10 @@
 
 #pragma once
 
-#include "wpi/hardware/discrete/DigitalInput.hpp"
-#include "wpi/hardware/discrete/DigitalOutput.hpp"
-
 #include <memory>
 
+#include "wpi/hardware/discrete/DigitalInput.hpp"
+#include "wpi/hardware/discrete/DigitalOutput.hpp"
 #include "wpi/units/time.hpp"
 
 namespace frc {
diff --git a/xrpVendordep/src/main/native/include/wpi/xrp/XRPRangefinder.hpp b/xrpVendordep/src/main/native/include/wpi/xrp/XRPRangefinder.hpp
index ae343750cd..69d76b517f 100644
--- a/xrpVendordep/src/main/native/include/wpi/xrp/XRPRangefinder.hpp
+++ b/xrpVendordep/src/main/native/include/wpi/xrp/XRPRangefinder.hpp
@@ -5,7 +5,6 @@
 #pragma once
 
 #include "wpi/hardware/discrete/AnalogInput.hpp"
-
 #include "wpi/units/length.hpp"
 
 namespace frc {