SCRIPT: wpiformat

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

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 {

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

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

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 {
 

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 {
 

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;
 

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;
 

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"

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

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";

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)

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

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;
 

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 {

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;
 

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;
 

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"
 

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

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;
 

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;

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;

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

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"

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;

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

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

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

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

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

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

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

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

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 {
 

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;

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

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

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

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

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

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

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

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.

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

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

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 {
 

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

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;
 

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

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

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

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

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;
 

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 {
 

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 {
 

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;

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

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;

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"

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;

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"

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"
 

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;

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

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;

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;
 

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;

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

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) \

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;

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"};

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",

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};

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

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;
 

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

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;
 

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_

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_

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_

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;
 

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_

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_

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"
 

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_

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_

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_

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;
 

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_

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_

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_

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_

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_

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_

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;
 

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_

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;
 

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_

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;
 

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_