SCRIPT: wpiformat

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

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. */

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.

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.
  *

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;

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;

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"
 

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 {
 
 /**

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 {
 

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 {
 
 /**

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 {
 
 /**

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 {
 
 /**

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"

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"
 

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 {

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 {

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 {
 
 /**

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

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 {
 

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 {
 

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 {

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;

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. */

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 {
 
 /**

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> {

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 {
 
 /**

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.

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 {
 

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();

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 {
 
 /**

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 {
 

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 {
 

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.

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"

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 {

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 {
 

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.

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.

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

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 {
 

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 {
 
 /**

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 {

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 {
 

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.

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 {
 
 /**

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;

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 {
 
 /**

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 {

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 {
 

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 {

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 {
 
 /**

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 {
 

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 {
 

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"
 

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 {