diff --git a/wpilibcExamples/.styleguide b/wpilibcExamples/.styleguide
index d39dee7d7b..d9369fac39 100644
--- a/wpilibcExamples/.styleguide
+++ b/wpilibcExamples/.styleguide
@@ -13,6 +13,7 @@ includeOtherLibs {
   ^cameraserver/
   ^cscore
   ^frc/
+  ^frc2/
   ^networktables/
   ^ntcore
   ^opencv2/
diff --git a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/Robot.cpp
index 6c39023fef..cd19aeb7d8 100644
--- a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/Robot.cpp
@@ -7,9 +7,8 @@
 
 #include "Robot.h"
 
-#include <frc2/command/CommandScheduler.h>
-
 #include <frc/smartdashboard/SmartDashboard.h>
+#include <frc2/command/CommandScheduler.h>
 
 void Robot::RobotInit() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/RobotContainer.cpp
index 79f172ec59..729a6c6fc0 100644
--- a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/RobotContainer.cpp
@@ -7,9 +7,8 @@
 
 #include "RobotContainer.h"
 
-#include <frc2/command/button/JoystickButton.h>
-
 #include <frc/shuffleboard/Shuffleboard.h>
+#include <frc2/command/button/JoystickButton.h>
 
 RobotContainer::RobotContainer() {
   // Initialize all of your commands and subsystems here
diff --git a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/Robot.h
index 872d72a57a..fa173d39e1 100644
--- a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/Robot.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/Command.h>
-
 #include <frc/TimedRobot.h>
+#include <frc2/command/Command.h>
 
 #include "RobotContainer.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/RobotContainer.h
index 0eef0a9c29..0b33dcf203 100644
--- a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/RobotContainer.h
+++ b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/RobotContainer.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <frc/XboxController.h>
+#include <frc/smartdashboard/SendableChooser.h>
 #include <frc2/command/Command.h>
 #include <frc2/command/ConditionalCommand.h>
 #include <frc2/command/InstantCommand.h>
@@ -16,9 +18,6 @@
 #include <frc2/command/WaitCommand.h>
 #include <frc2/command/WaitUntilCommand.h>
 
-#include <frc/XboxController.h>
-#include <frc/smartdashboard/SendableChooser.h>
-
 #include "Constants.h"
 #include "subsystems/DriveSubsystem.h"
 #include "subsystems/ShooterSubsystem.h"
diff --git a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/subsystems/DriveSubsystem.h b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/subsystems/DriveSubsystem.h
index df36b81f0a..3ed1357f8f 100644
--- a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/subsystems/DriveSubsystem.h
+++ b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/subsystems/DriveSubsystem.h
@@ -7,12 +7,11 @@
 
 #pragma once
 
-#include <frc2/command/SubsystemBase.h>
-
 #include <frc/Encoder.h>
 #include <frc/PWMVictorSPX.h>
 #include <frc/SpeedControllerGroup.h>
 #include <frc/drive/DifferentialDrive.h>
+#include <frc2/command/SubsystemBase.h>
 
 #include "Constants.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/subsystems/ShooterSubsystem.h b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/subsystems/ShooterSubsystem.h
index 664c4e097d..4d30d5334e 100644
--- a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/subsystems/ShooterSubsystem.h
+++ b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/include/subsystems/ShooterSubsystem.h
@@ -7,10 +7,9 @@
 
 #pragma once
 
-#include <frc2/command/PIDSubsystem.h>
-
 #include <frc/Encoder.h>
 #include <frc/PWMVictorSPX.h>
+#include <frc2/command/PIDSubsystem.h>
 
 class ShooterSubsystem : public frc2::PIDSubsystem {
  public:
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/Robot.cpp
index 6c39023fef..cd19aeb7d8 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/Robot.cpp
@@ -7,9 +7,8 @@
 
 #include "Robot.h"
 
-#include <frc2/command/CommandScheduler.h>
-
 #include <frc/smartdashboard/SmartDashboard.h>
+#include <frc2/command/CommandScheduler.h>
 
 void Robot::RobotInit() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/RobotContainer.cpp
index c4bbe641cf..0e7c6d7614 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/cpp/RobotContainer.cpp
@@ -7,9 +7,8 @@
 
 #include "RobotContainer.h"
 
-#include <frc2/command/button/JoystickButton.h>
-
 #include <frc/smartdashboard/SmartDashboard.h>
+#include <frc2/command/button/JoystickButton.h>
 
 #include "commands/CloseClaw.h"
 #include "commands/OpenClaw.h"
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/Robot.h
index 872d72a57a..fa173d39e1 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/Robot.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/Command.h>
-
 #include <frc/TimedRobot.h>
+#include <frc2/command/Command.h>
 
 #include "RobotContainer.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/RobotContainer.h
index f201ae6544..50fc7d63c6 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/RobotContainer.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/RobotContainer.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/Command.h>
-
 #include <frc/Joystick.h>
+#include <frc2/command/Command.h>
 
 #include "commands/Autonomous.h"
 #include "subsystems/Claw.h"
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Claw.h b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Claw.h
index aa898fd2ea..063ca432c3 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Claw.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Claw.h
@@ -7,10 +7,9 @@
 
 #pragma once
 
-#include <frc2/command/SubsystemBase.h>
-
 #include <frc/DigitalInput.h>
 #include <frc/PWMVictorSPX.h>
+#include <frc2/command/SubsystemBase.h>
 
 /**
  * The claw subsystem is a simple system with a motor for opening and closing.
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/DriveTrain.h b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/DriveTrain.h
index 0556ecd522..a80429d5ff 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/DriveTrain.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/DriveTrain.h
@@ -7,14 +7,13 @@
 
 #pragma once
 
-#include <frc2/command/SubsystemBase.h>
-
 #include <frc/AnalogGyro.h>
 #include <frc/AnalogInput.h>
 #include <frc/Encoder.h>
 #include <frc/PWMVictorSPX.h>
 #include <frc/SpeedControllerGroup.h>
 #include <frc/drive/DifferentialDrive.h>
+#include <frc2/command/SubsystemBase.h>
 
 namespace frc {
 class Joystick;
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Elevator.h b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Elevator.h
index bd63610910..a2c1e87298 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Elevator.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Elevator.h
@@ -7,10 +7,9 @@
 
 #pragma once
 
-#include <frc2/command/PIDSubsystem.h>
-
 #include <frc/AnalogPotentiometer.h>
 #include <frc/PWMVictorSPX.h>
+#include <frc2/command/PIDSubsystem.h>
 
 /**
  * The elevator subsystem uses PID to go to a given height. Unfortunately, in
diff --git a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Wrist.h b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Wrist.h
index 7091f6779b..e3ecc69d98 100644
--- a/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Wrist.h
+++ b/wpilibcExamples/src/main/cpp/examples/GearsBotNew/include/subsystems/Wrist.h
@@ -7,10 +7,9 @@
 
 #pragma once
 
-#include <frc2/command/PIDSubsystem.h>
-
 #include <frc/AnalogPotentiometer.h>
 #include <frc/PWMVictorSPX.h>
+#include <frc2/command/PIDSubsystem.h>
 
 /**
  * The wrist subsystem is like the elevator, but with a rotational joint instead
diff --git a/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/cpp/Robot.cpp
index 6c39023fef..cd19aeb7d8 100644
--- a/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/cpp/Robot.cpp
@@ -7,9 +7,8 @@
 
 #include "Robot.h"
 
-#include <frc2/command/CommandScheduler.h>
-
 #include <frc/smartdashboard/SmartDashboard.h>
+#include <frc2/command/CommandScheduler.h>
 
 void Robot::RobotInit() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/cpp/RobotContainer.cpp
index c67148a310..aa1117a4a3 100644
--- a/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/cpp/RobotContainer.cpp
@@ -7,9 +7,8 @@
 
 #include "RobotContainer.h"
 
-#include <frc2/command/button/JoystickButton.h>
-
 #include <frc/shuffleboard/Shuffleboard.h>
+#include <frc2/command/button/JoystickButton.h>
 
 RobotContainer::RobotContainer() {
   // Initialize all of your commands and subsystems here
diff --git a/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/Robot.h
index 872d72a57a..fa173d39e1 100644
--- a/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/Robot.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/Command.h>
-
 #include <frc/TimedRobot.h>
+#include <frc2/command/Command.h>
 
 #include "RobotContainer.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/RobotContainer.h
index 4e622ae5c4..694627b404 100644
--- a/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/RobotContainer.h
+++ b/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/RobotContainer.h
@@ -7,16 +7,15 @@
 
 #pragma once
 
+#include <frc/XboxController.h>
+#include <frc/controller/PIDController.h>
+#include <frc/smartdashboard/SendableChooser.h>
 #include <frc2/command/Command.h>
 #include <frc2/command/InstantCommand.h>
 #include <frc2/command/PIDCommand.h>
 #include <frc2/command/ParallelRaceGroup.h>
 #include <frc2/command/RunCommand.h>
 
-#include <frc/XboxController.h>
-#include <frc/controller/PIDController.h>
-#include <frc/smartdashboard/SendableChooser.h>
-
 #include "Constants.h"
 #include "commands/TurnToAngle.h"
 #include "subsystems/DriveSubsystem.h"
diff --git a/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/subsystems/DriveSubsystem.h b/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/subsystems/DriveSubsystem.h
index 57ab4f559a..cada81669e 100644
--- a/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/subsystems/DriveSubsystem.h
+++ b/wpilibcExamples/src/main/cpp/examples/GyroDriveCommands/include/subsystems/DriveSubsystem.h
@@ -7,13 +7,12 @@
 
 #pragma once
 
-#include <frc2/command/SubsystemBase.h>
-
 #include <frc/ADXRS450_Gyro.h>
 #include <frc/Encoder.h>
 #include <frc/PWMVictorSPX.h>
 #include <frc/SpeedControllerGroup.h>
 #include <frc/drive/DifferentialDrive.h>
+#include <frc2/command/SubsystemBase.h>
 
 #include "Constants.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/Robot.cpp
index 6c39023fef..cd19aeb7d8 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/Robot.cpp
@@ -7,9 +7,8 @@
 
 #include "Robot.h"
 
-#include <frc2/command/CommandScheduler.h>
-
 #include <frc/smartdashboard/SmartDashboard.h>
+#include <frc2/command/CommandScheduler.h>
 
 void Robot::RobotInit() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/RobotContainer.cpp
index f2a9cec655..f8719c4cdd 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/cpp/RobotContainer.cpp
@@ -7,9 +7,8 @@
 
 #include "RobotContainer.h"
 
-#include <frc2/command/button/JoystickButton.h>
-
 #include <frc/shuffleboard/Shuffleboard.h>
+#include <frc2/command/button/JoystickButton.h>
 
 RobotContainer::RobotContainer() {
   // Initialize all of your commands and subsystems here
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.h
index 872d72a57a..fa173d39e1 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/Robot.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/Command.h>
-
 #include <frc/TimedRobot.h>
+#include <frc2/command/Command.h>
 
 #include "RobotContainer.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.h
index 35edc412f8..22a3dd7027 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.h
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/RobotContainer.h
@@ -7,6 +7,8 @@
 
 #pragma once
 
+#include <frc/XboxController.h>
+#include <frc/smartdashboard/SendableChooser.h>
 #include <frc2/command/Command.h>
 #include <frc2/command/InstantCommand.h>
 #include <frc2/command/ParallelRaceGroup.h>
@@ -14,9 +16,6 @@
 #include <frc2/command/SequentialCommandGroup.h>
 #include <frc2/command/StartEndCommand.h>
 
-#include <frc/XboxController.h>
-#include <frc/smartdashboard/SendableChooser.h>
-
 #include "Constants.h"
 #include "commands/ComplexAuto.h"
 #include "subsystems/DriveSubsystem.h"
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.h b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.h
index df36b81f0a..3ed1357f8f 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.h
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/DriveSubsystem.h
@@ -7,12 +7,11 @@
 
 #pragma once
 
-#include <frc2/command/SubsystemBase.h>
-
 #include <frc/Encoder.h>
 #include <frc/PWMVictorSPX.h>
 #include <frc/SpeedControllerGroup.h>
 #include <frc/drive/DifferentialDrive.h>
+#include <frc2/command/SubsystemBase.h>
 
 #include "Constants.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.h b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.h
index a41ae1b0e0..681aea8776 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.h
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotInlined/include/subsystems/HatchSubsystem.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/SubsystemBase.h>
-
 #include <frc/DoubleSolenoid.h>
+#include <frc2/command/SubsystemBase.h>
 
 #include "Constants.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/Robot.cpp
index 6c39023fef..cd19aeb7d8 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/Robot.cpp
@@ -7,9 +7,8 @@
 
 #include "Robot.h"
 
-#include <frc2/command/CommandScheduler.h>
-
 #include <frc/smartdashboard/SmartDashboard.h>
+#include <frc2/command/CommandScheduler.h>
 
 void Robot::RobotInit() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/RobotContainer.cpp
index 7c02618904..9eb917807c 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/cpp/RobotContainer.cpp
@@ -7,9 +7,8 @@
 
 #include "RobotContainer.h"
 
-#include <frc2/command/button/JoystickButton.h>
-
 #include <frc/shuffleboard/Shuffleboard.h>
+#include <frc2/command/button/JoystickButton.h>
 
 #include "commands/DefaultDrive.h"
 #include "commands/GrabHatch.h"
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.h
index 872d72a57a..fa173d39e1 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/Robot.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/Command.h>
-
 #include <frc/TimedRobot.h>
+#include <frc2/command/Command.h>
 
 #include "RobotContainer.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.h
index 3e663f9bdb..881d2f552a 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.h
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/RobotContainer.h
@@ -7,10 +7,9 @@
 
 #pragma once
 
-#include <frc2/command/Command.h>
-
 #include <frc/XboxController.h>
 #include <frc/smartdashboard/SendableChooser.h>
+#include <frc2/command/Command.h>
 
 #include "Constants.h"
 #include "commands/ComplexAuto.h"
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.h
index df36b81f0a..3ed1357f8f 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.h
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/DriveSubsystem.h
@@ -7,12 +7,11 @@
 
 #pragma once
 
-#include <frc2/command/SubsystemBase.h>
-
 #include <frc/Encoder.h>
 #include <frc/PWMVictorSPX.h>
 #include <frc/SpeedControllerGroup.h>
 #include <frc/drive/DifferentialDrive.h>
+#include <frc2/command/SubsystemBase.h>
 
 #include "Constants.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.h b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.h
index a41ae1b0e0..681aea8776 100644
--- a/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.h
+++ b/wpilibcExamples/src/main/cpp/examples/HatchbotTraditional/include/subsystems/HatchSubsystem.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/SubsystemBase.h>
-
 #include <frc/DoubleSolenoid.h>
+#include <frc2/command/SubsystemBase.h>
 
 #include "Constants.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/cpp/Robot.cpp
index 6c39023fef..cd19aeb7d8 100644
--- a/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/cpp/Robot.cpp
@@ -7,9 +7,8 @@
 
 #include "Robot.h"
 
-#include <frc2/command/CommandScheduler.h>
-
 #include <frc/smartdashboard/SmartDashboard.h>
+#include <frc2/command/CommandScheduler.h>
 
 void Robot::RobotInit() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/cpp/RobotContainer.cpp
index 7d51dc78b8..dbc9d2a116 100644
--- a/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/cpp/RobotContainer.cpp
@@ -7,11 +7,10 @@
 
 #include "RobotContainer.h"
 
+#include <frc/shuffleboard/Shuffleboard.h>
 #include <frc2/command/CommandScheduler.h>
 #include <frc2/command/button/JoystickButton.h>
 
-#include <frc/shuffleboard/Shuffleboard.h>
-
 RobotContainer::RobotContainer() {
   // Initialize all of your commands and subsystems here
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/include/Robot.h
index 872d72a57a..fa173d39e1 100644
--- a/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/include/Robot.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/Command.h>
-
 #include <frc/TimedRobot.h>
+#include <frc2/command/Command.h>
 
 #include "RobotContainer.h"
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/include/RobotContainer.h b/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/include/RobotContainer.h
index fd93be14e3..684d4a3962 100644
--- a/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/include/RobotContainer.h
+++ b/wpilibcExamples/src/main/cpp/examples/SchedulerEventLogging/include/RobotContainer.h
@@ -7,12 +7,11 @@
 
 #pragma once
 
+#include <frc/XboxController.h>
 #include <frc2/command/Command.h>
 #include <frc2/command/InstantCommand.h>
 #include <frc2/command/WaitCommand.h>
 
-#include <frc/XboxController.h>
-
 #include "Constants.h"
 
 /**
diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/Robot.cpp
index 6c39023fef..cd19aeb7d8 100644
--- a/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/SelectCommand/cpp/Robot.cpp
@@ -7,9 +7,8 @@
 
 #include "Robot.h"
 
-#include <frc2/command/CommandScheduler.h>
-
 #include <frc/smartdashboard/SmartDashboard.h>
+#include <frc2/command/CommandScheduler.h>
 
 void Robot::RobotInit() {}
 
diff --git a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.h b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.h
index 872d72a57a..fa173d39e1 100644
--- a/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/examples/SelectCommand/include/Robot.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/Command.h>
-
 #include <frc/TimedRobot.h>
+#include <frc2/command/Command.h>
 
 #include "RobotContainer.h"
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
index 6c39023fef..cd19aeb7d8 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/cpp/Robot.cpp
@@ -7,9 +7,8 @@
 
 #include "Robot.h"
 
-#include <frc2/command/CommandScheduler.h>
-
 #include <frc/smartdashboard/SmartDashboard.h>
+#include <frc2/command/CommandScheduler.h>
 
 void Robot::RobotInit() {}
 
diff --git a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h
index 872d72a57a..fa173d39e1 100644
--- a/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h
+++ b/wpilibcExamples/src/main/cpp/templates/commandbased/include/Robot.h
@@ -7,9 +7,8 @@
 
 #pragma once
 
-#include <frc2/command/Command.h>
-
 #include <frc/TimedRobot.h>
+#include <frc2/command/Command.h>
 
 #include "RobotContainer.h"