SCRIPT Run cc include replacements

apriltag/src/dev/native/cpp/main.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/apriltag/AprilTagDetector.h"
+#include "wpi/apriltag/AprilTagDetector.hpp"
 
 int main() {
   frc::AprilTagDetector detector;

apriltag/src/main/native/cpp/AprilTag.cpp

@@ -2,11 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/apriltag/AprilTag.h"
+#include "wpi/apriltag/AprilTag.hpp"
 
 #include <cstring>
 
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
 #ifdef _WIN32
 #pragma warning(disable : 4200)

apriltag/src/main/native/cpp/AprilTagDetection.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/apriltag/AprilTagDetection.h"
+#include "wpi/apriltag/AprilTagDetection.hpp"
 
 #include <type_traits>
 

apriltag/src/main/native/cpp/AprilTagDetector.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/apriltag/AprilTagDetector.h"
+#include "wpi/apriltag/AprilTagDetector.hpp"
 
 #include <cmath>
 #include <utility>

apriltag/src/main/native/cpp/AprilTagFieldLayout.cpp

@@ -2,17 +2,17 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/apriltag/AprilTagFieldLayout.h"
+#include "wpi/apriltag/AprilTagFieldLayout.hpp"
 
 #include <system_error>
 #include <utility>
 #include <vector>
 
-#include <units/angle.h>
-#include <units/length.h>
-#include <wpi/MemoryBuffer.h>
-#include <wpi/json.h>
-#include <wpi/raw_ostream.h>
+#include "wpi/units/angle.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/util/MemoryBuffer.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
 using namespace frc;
 

apriltag/src/main/native/cpp/AprilTagPoseEstimate.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/apriltag/AprilTagPoseEstimate.h"
+#include "wpi/apriltag/AprilTagPoseEstimate.hpp"
 
 #include <algorithm>
 

apriltag/src/main/native/cpp/AprilTagPoseEstimator.cpp

@@ -2,11 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc/apriltag/AprilTagPoseEstimator.h"
+#include "wpi/apriltag/AprilTagPoseEstimator.hpp"
 
 #include <Eigen/QR>
 
-#include "frc/apriltag/AprilTagDetection.h"
+#include "wpi/apriltag/AprilTagDetection.hpp"
 
 #ifdef _WIN32
 #pragma warning(disable : 4200)

apriltag/src/main/native/cpp/jni/AprilTagJNI.cpp

@@ -8,13 +8,13 @@
 #include <cstring>
 
 #define WPI_RAWFRAME_JNI
-#include <wpi/RawFrame.h>
-#include <wpi/jni_util.h>
+#include "wpi/util/RawFrame.h"
+#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_vision_apriltag_jni_AprilTagJNI.h"
-#include "frc/apriltag/AprilTag.h"
-#include "frc/apriltag/AprilTagDetector.h"
-#include "frc/apriltag/AprilTagPoseEstimator.h"
+#include "wpi/apriltag/AprilTag.hpp"
+#include "wpi/apriltag/AprilTagDetector.hpp"
+#include "wpi/apriltag/AprilTagPoseEstimator.hpp"
 
 using namespace frc;
 using namespace wpi::java;

apriltag/src/main/native/include/wpi/apriltag/AprilTag.hpp

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <wpi/RawFrame.h>
-#include <wpi/SymbolExports.h>
-#include <wpi/json_fwd.h>
+#include "wpi/util/RawFrame.h"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/json_fwd.hpp"
 
-#include "frc/geometry/Pose3d.h"
+#include "wpi/math/geometry/Pose3d.hpp"
 
 namespace frc {
 

apriltag/src/main/native/include/wpi/apriltag/AprilTagDetection.hpp

@@ -10,7 +10,7 @@
 #include <string_view>
 
 #include <Eigen/Core>
-#include <wpi/SymbolExports.h>
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 

apriltag/src/main/native/include/wpi/apriltag/AprilTagDetector.hpp

@@ -11,11 +11,11 @@
 #include <string_view>
 #include <utility>
 
-#include <units/angle.h>
-#include <wpi/StringMap.h>
-#include <wpi/SymbolExports.h>
+#include "wpi/units/angle.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
-#include "frc/apriltag/AprilTagDetection.h"
+#include "wpi/apriltag/AprilTagDetection.hpp"
 
 namespace frc {
 

apriltag/src/main/native/include/wpi/apriltag/AprilTagDetector_cv.hpp

@@ -6,7 +6,7 @@
 
 #include <opencv2/core/mat.hpp>
 
-#include "frc/apriltag/AprilTagDetector.h"
+#include "wpi/apriltag/AprilTagDetector.hpp"
 
 namespace frc {
 

apriltag/src/main/native/include/wpi/apriltag/AprilTagFieldLayout.hpp

@@ -9,13 +9,13 @@
 #include <unordered_map>
 #include <vector>
 
-#include <units/length.h>
-#include <wpi/SymbolExports.h>
-#include <wpi/json_fwd.h>
+#include "wpi/units/length.hpp"
+#include "wpi/util/SymbolExports.hpp"
+#include "wpi/util/json_fwd.hpp"
 
-#include "frc/apriltag/AprilTag.h"
-#include "frc/apriltag/AprilTagFields.h"
-#include "frc/geometry/Pose3d.h"
+#include "wpi/apriltag/AprilTag.hpp"
+#include "wpi/apriltag/AprilTagFields.hpp"
+#include "wpi/math/geometry/Pose3d.hpp"
 
 namespace frc {
 /**

apriltag/src/main/native/include/wpi/apriltag/AprilTagFields.hpp

@@ -6,7 +6,7 @@
 
 #include <string_view>
 
-#include <wpi/SymbolExports.h>
+#include "wpi/util/SymbolExports.hpp"
 
 namespace frc {
 

apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimate.hpp

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include <wpi/SymbolExports.h>
+#include "wpi/util/SymbolExports.hpp"
 
-#include "frc/geometry/Transform3d.h"
+#include "wpi/math/geometry/Transform3d.hpp"
 
 namespace frc {
 

apriltag/src/main/native/include/wpi/apriltag/AprilTagPoseEstimator.hpp

@@ -6,11 +6,11 @@
 
 #include <span>
 
-#include <units/length.h>
-#include <wpi/SymbolExports.h>
+#include "wpi/units/length.hpp"
+#include "wpi/util/SymbolExports.hpp"
 
-#include "frc/apriltag/AprilTagPoseEstimate.h"
-#include "frc/geometry/Transform3d.h"
+#include "wpi/apriltag/AprilTagPoseEstimate.hpp"
+#include "wpi/math/geometry/Transform3d.hpp"
 
 namespace frc {
 

apriltag/src/main/python/pyproject.toml

@@ -51,7 +51,7 @@ scan_headers_ignore = [
   "apriltag_math.h",
   "apriltag_pose.h",
 
-  "frc/apriltag/AprilTagDetector_cv.h",
+  "wpi/apriltag/AprilTagDetector_cv.hpp",
 
   "tag16h5.h",
   "tag36h11.h",
@@ -64,11 +64,11 @@ depends = ["wpiutil", "wpimath"]
 
 [tool.semiwrap.extension_modules."robotpy_apriltag._apriltag".headers]
 # frc/apriltag
-AprilTag = "frc/apriltag/AprilTag.h"
-AprilTagDetection = "frc/apriltag/AprilTagDetection.h"
-AprilTagDetector = "frc/apriltag/AprilTagDetector.h"
-# AprilTagDetector_cv = "frc/apriltag/AprilTagDetector_cv.h"
-AprilTagFieldLayout = "frc/apriltag/AprilTagFieldLayout.h"
-AprilTagFields = "frc/apriltag/AprilTagFields.h"
-AprilTagPoseEstimate = "frc/apriltag/AprilTagPoseEstimate.h"
-AprilTagPoseEstimator = "frc/apriltag/AprilTagPoseEstimator.h"
+AprilTag = "wpi/apriltag/AprilTag.hpp"
+AprilTagDetection = "wpi/apriltag/AprilTagDetection.hpp"
+AprilTagDetector = "wpi/apriltag/AprilTagDetector.hpp"
+# AprilTagDetector_cv = "wpi/apriltag/AprilTagDetector_cv.hpp"
+AprilTagFieldLayout = "wpi/apriltag/AprilTagFieldLayout.hpp"
+AprilTagFields = "wpi/apriltag/AprilTagFields.hpp"
+AprilTagPoseEstimate = "wpi/apriltag/AprilTagPoseEstimate.hpp"
+AprilTagPoseEstimator = "wpi/apriltag/AprilTagPoseEstimator.hpp"

apriltag/src/main/python/semiwrap/AprilTagPoseEstimator.yml

@@ -1,5 +1,5 @@
 extra_includes:
-- frc/apriltag/AprilTagDetection.h
+- wpi/apriltag/AprilTagDetection.hpp
 
 classes:
   frc::AprilTagPoseEstimator:

apriltag/src/test/native/cpp/AprilTagDetectorTest.cpp

@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 
-#include "frc/apriltag/AprilTagDetector.h"
+#include "wpi/apriltag/AprilTagDetector.hpp"
 
 using namespace frc;
 

apriltag/src/test/native/cpp/AprilTagJsonTest.cpp

@@ -5,11 +5,11 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
-#include "frc/apriltag/AprilTag.h"
-#include "frc/apriltag/AprilTagFieldLayout.h"
-#include "frc/geometry/Pose3d.h"
+#include "wpi/apriltag/AprilTag.hpp"
+#include "wpi/apriltag/AprilTagFieldLayout.hpp"
+#include "wpi/math/geometry/Pose3d.hpp"
 
 using namespace frc;
 

apriltag/src/test/native/cpp/AprilTagPoseSetOriginTest.cpp

@@ -5,11 +5,11 @@
 #include <vector>
 
 #include <gtest/gtest.h>
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
-#include "frc/apriltag/AprilTag.h"
-#include "frc/apriltag/AprilTagFieldLayout.h"
-#include "frc/geometry/Pose3d.h"
+#include "wpi/apriltag/AprilTag.hpp"
+#include "wpi/apriltag/AprilTagFieldLayout.hpp"
+#include "wpi/math/geometry/Pose3d.hpp"
 
 using namespace frc;
 

apriltag/src/test/native/cpp/LoadConfigTest.cpp

@@ -6,8 +6,8 @@
 
 #include <gtest/gtest.h>
 
-#include "frc/apriltag/AprilTagFieldLayout.h"
-#include "frc/apriltag/AprilTagFields.h"
+#include "wpi/apriltag/AprilTagFieldLayout.hpp"
+#include "wpi/apriltag/AprilTagFields.hpp"
 
 namespace frc {
 

benchmark/src/main/native/cpp/Main.cpp

@@ -3,12 +3,12 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <benchmark/benchmark.h>
-#include <frc/geometry/Pose2d.h>
-#include <frc/path/TravelingSalesman.h>
+#include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/path/TravelingSalesman.hpp"
 
-#include <units/angle.h>
-#include <units/length.h>
-#include <wpi/array.h>
+#include "wpi/units/angle.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/util/array.hpp"
 
 static constexpr wpi::array<frc::Pose2d, 6> poses{
     frc::Pose2d{-1_m, 1_m, -90_deg}, frc::Pose2d{-1_m, 2_m, 90_deg},

cameraserver/multiCameraServer/src/main/native/cpp/main.cpp

@@ -9,15 +9,15 @@
 #include <utility>
 #include <vector>
 
-#include <networktables/NetworkTableInstance.h>
-#include <wpi/MemoryBuffer.h>
-#include <wpi/StringExtras.h>
-#include <wpi/fmt/raw_ostream.h>
-#include <wpi/json.h>
-#include <wpi/print.h>
-#include <wpi/raw_ostream.h>
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/util/MemoryBuffer.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fmt/raw_ostream.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/raw_ostream.hpp"
 
-#include "cameraserver/CameraServer.h"
+#include "wpi/cameraserver/CameraServer.hpp"
 
 /*
    JSON format:

cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "cameraserver/CameraServer.h"
+#include "wpi/cameraserver/CameraServer.hpp"
 
 #include <atomic>
 #include <memory>
@@ -11,20 +11,20 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include <networktables/BooleanTopic.h>
-#include <networktables/IntegerTopic.h>
-#include <networktables/NetworkTable.h>
-#include <networktables/NetworkTableInstance.h>
-#include <networktables/StringArrayTopic.h>
-#include <networktables/StringTopic.h>
-#include <wpi/DenseMap.h>
-#include <wpi/SmallString.h>
-#include <wpi/StringExtras.h>
-#include <wpi/StringMap.h>
-#include <wpi/mutex.h>
+#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/util/DenseMap.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "cameraserver/CameraServerShared.h"
-#include "ntcore_cpp.h"
+#include "wpi/cameraserver/CameraServerShared.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
 
 using namespace frc;
 

cameraserver/src/main/native/cpp/cameraserver/CameraServerShared.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "cameraserver/CameraServerShared.h"
+#include "wpi/cameraserver/CameraServerShared.hpp"
 
 #include <memory>
 #include <utility>
 
-#include <wpi/mutex.h>
+#include "wpi/util/mutex.hpp"
 
 namespace {
 class DefaultCameraServerShared : public frc::CameraServerShared {

cameraserver/src/main/native/cpp/vision/VisionRunner.cpp

@@ -2,14 +2,14 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "vision/VisionRunner.h"
+#include "wpi/vision/VisionRunner.hpp"
 
 #include <memory>
 #include <thread>
 
 #include <opencv2/core/mat.hpp>
 
-#include "cameraserver/CameraServerShared.h"
+#include "wpi/cameraserver/CameraServerShared.hpp"
 
 using namespace frc;
 

cameraserver/src/main/native/include/wpi/cameraserver/CameraServer.hpp

@@ -11,7 +11,7 @@
 #include <string_view>
 #include <vector>
 
-#include "cscore_cv.h"
+#include "wpi/cs/cscore_cv.hpp"
 
 namespace frc {
 

cameraserver/src/main/native/include/wpi/vision/VisionRunner.hpp

@@ -8,8 +8,8 @@
 #include <functional>
 #include <memory>
 
-#include "cscore_cv.h"
-#include "vision/VisionPipeline.h"
+#include "wpi/cs/cscore_cv.hpp"
+#include "wpi/vision/VisionPipeline.hpp"
 
 namespace frc {
 

commandsv2/src/generate/main/native/include/wpi/commands2/button/commandhid.hpp.jinja

@@ -9,9 +9,9 @@
 #pragma once
 #include <frc/{{ ConsoleName }}Controller.h>
 
-#include "frc2/command/button/Trigger.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/button/CommandGenericHID.h"
+#include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/button/CommandGenericHID.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandPS4Controller.cpp

@@ -4,7 +4,7 @@
 
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
-#include "frc2/command/button/CommandPS4Controller.h"
+#include "wpi/commands2/button/CommandPS4Controller.hpp"
 
 using namespace frc2;
 

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandPS5Controller.cpp

@@ -4,7 +4,7 @@
 
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
-#include "frc2/command/button/CommandPS5Controller.h"
+#include "wpi/commands2/button/CommandPS5Controller.hpp"
 
 using namespace frc2;
 

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandStadiaController.cpp

@@ -4,7 +4,7 @@
 
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
-#include "frc2/command/button/CommandStadiaController.h"
+#include "wpi/commands2/button/CommandStadiaController.hpp"
 
 using namespace frc2;
 

commandsv2/src/generated/main/native/cpp/wpi/commands2/button/CommandXboxController.cpp

@@ -4,7 +4,7 @@
 
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
-#include "frc2/command/button/CommandXboxController.h"
+#include "wpi/commands2/button/CommandXboxController.hpp"
 
 using namespace frc2;
 

commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS4Controller.hpp

@@ -5,11 +5,11 @@
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
 #pragma once
-#include <frc/PS4Controller.h>
+#include "wpi/driverstation/PS4Controller.hpp"
 
-#include "frc2/command/button/Trigger.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/button/CommandGenericHID.h"
+#include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/button/CommandGenericHID.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandPS5Controller.hpp

@@ -5,11 +5,11 @@
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
 #pragma once
-#include <frc/PS5Controller.h>
+#include "wpi/driverstation/PS5Controller.hpp"
 
-#include "frc2/command/button/Trigger.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/button/CommandGenericHID.h"
+#include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/button/CommandGenericHID.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandStadiaController.hpp

@@ -5,11 +5,11 @@
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
 #pragma once
-#include <frc/StadiaController.h>
+#include "wpi/driverstation/StadiaController.hpp"
 
-#include "frc2/command/button/Trigger.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/button/CommandGenericHID.h"
+#include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/button/CommandGenericHID.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/generated/main/native/include/wpi/commands2/button/CommandXboxController.hpp

@@ -5,11 +5,11 @@
 // THIS FILE WAS AUTO-GENERATED BY ./commandsv2/generate_hids.py. DO NOT MODIFY
 
 #pragma once
-#include <frc/XboxController.h>
+#include "wpi/driverstation/XboxController.hpp"
 
-#include "frc2/command/button/Trigger.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/button/CommandGenericHID.h"
+#include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/button/CommandGenericHID.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/cpp/frc2/command/Command.cpp

@@ -2,17 +2,17 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/Command.h"
+#include "wpi/commands2/Command.hpp"
 
 #include <string>
 #include <utility>
 
-#include <wpi/StackTrace.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/util/StackTrace.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc2/command/CommandPtr.h"
-#include "frc2/command/CommandScheduler.h"
+#include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/CommandPtr.cpp

@@ -2,26 +2,26 @@
 // 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 "frc2/command/CommandPtr.h"
+#include "wpi/commands2/CommandPtr.hpp"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
-#include <frc/Errors.h>
+#include "wpi/system/Errors.hpp"
 
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/ConditionalCommand.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/ParallelCommandGroup.h"
-#include "frc2/command/ParallelDeadlineGroup.h"
-#include "frc2/command/ParallelRaceGroup.h"
-#include "frc2/command/ProxyCommand.h"
-#include "frc2/command/RepeatCommand.h"
-#include "frc2/command/SequentialCommandGroup.h"
-#include "frc2/command/WaitCommand.h"
-#include "frc2/command/WaitUntilCommand.h"
-#include "frc2/command/WrapperCommand.h"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/ConditionalCommand.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/ParallelCommandGroup.hpp"
+#include "wpi/commands2/ParallelDeadlineGroup.hpp"
+#include "wpi/commands2/ParallelRaceGroup.hpp"
+#include "wpi/commands2/ProxyCommand.hpp"
+#include "wpi/commands2/RepeatCommand.hpp"
+#include "wpi/commands2/SequentialCommandGroup.hpp"
+#include "wpi/commands2/WaitCommand.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
+#include "wpi/commands2/WrapperCommand.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/CommandScheduler.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/CommandScheduler.h"
+#include "wpi/commands2/CommandScheduler.hpp"
 
 #include <cstdio>
 #include <memory>
@@ -10,20 +10,20 @@
 #include <utility>
 #include <vector>
 
-#include <frc/RobotBase.h>
-#include <frc/RobotState.h>
-#include <frc/TimedRobot.h>
-#include <hal/HALBase.h>
-#include <hal/UsageReporting.h>
-#include <networktables/IntegerArrayTopic.h>
-#include <networktables/StringArrayTopic.h>
-#include <wpi/DenseMap.h>
-#include <wpi/SmallVector.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/opmode/RobotBase.hpp"
+#include "wpi/opmode/RobotState.hpp"
+#include "wpi/opmode/TimedRobot.hpp"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/nt/IntegerArrayTopic.hpp"
+#include "wpi/nt/StringArrayTopic.hpp"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc2/command/CommandPtr.h"
-#include "frc2/command/Subsystem.h"
+#include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/commands2/Subsystem.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/Commands.cpp

@@ -2,27 +2,27 @@
 // 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 "frc2/command/Commands.h"
+#include "wpi/commands2/Commands.hpp"
 
 #include <utility>
 #include <vector>
 
-#include <wpi/FunctionExtras.h>
-#include <wpi/deprecated.h>
+#include "wpi/util/FunctionExtras.hpp"
+#include "wpi/util/deprecated.hpp"
 
-#include "frc2/command/ConditionalCommand.h"
-#include "frc2/command/DeferredCommand.h"
-#include "frc2/command/FunctionalCommand.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/ParallelCommandGroup.h"
-#include "frc2/command/ParallelDeadlineGroup.h"
-#include "frc2/command/ParallelRaceGroup.h"
-#include "frc2/command/PrintCommand.h"
-#include "frc2/command/ProxyCommand.h"
-#include "frc2/command/RunCommand.h"
-#include "frc2/command/SequentialCommandGroup.h"
-#include "frc2/command/WaitCommand.h"
-#include "frc2/command/WaitUntilCommand.h"
+#include "wpi/commands2/ConditionalCommand.hpp"
+#include "wpi/commands2/DeferredCommand.hpp"
+#include "wpi/commands2/FunctionalCommand.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/ParallelCommandGroup.hpp"
+#include "wpi/commands2/ParallelDeadlineGroup.hpp"
+#include "wpi/commands2/ParallelRaceGroup.hpp"
+#include "wpi/commands2/PrintCommand.hpp"
+#include "wpi/commands2/ProxyCommand.hpp"
+#include "wpi/commands2/RunCommand.hpp"
+#include "wpi/commands2/SequentialCommandGroup.hpp"
+#include "wpi/commands2/WaitCommand.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/ConditionalCommand.cpp

@@ -2,13 +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.
 
-#include "frc2/command/ConditionalCommand.h"
+#include "wpi/commands2/ConditionalCommand.hpp"
 
 #include <memory>
 #include <string>
 #include <utility>
 
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/DeferredCommand.cpp

@@ -2,13 +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.
 
-#include "frc2/command/DeferredCommand.h"
+#include "wpi/commands2/DeferredCommand.hpp"
 
 #include <utility>
 
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "frc2/command/Commands.h"
+#include "wpi/commands2/Commands.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/FunctionalCommand.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/FunctionalCommand.h"
+#include "wpi/commands2/FunctionalCommand.hpp"
 
 #include <utility>
 

commandsv2/src/main/native/cpp/frc2/command/InstantCommand.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/InstantCommand.h"
+#include "wpi/commands2/InstantCommand.hpp"
 
 #include <utility>
 

commandsv2/src/main/native/cpp/frc2/command/NotifierCommand.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/NotifierCommand.h"
+#include "wpi/commands2/NotifierCommand.hpp"
 
 #include <utility>
 

commandsv2/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/ParallelCommandGroup.h"
+#include "wpi/commands2/ParallelCommandGroup.hpp"
 
 #include <utility>
 #include <vector>

commandsv2/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp

@@ -2,13 +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.
 
-#include "frc2/command/ParallelDeadlineGroup.h"
+#include "wpi/commands2/ParallelDeadlineGroup.hpp"
 
 #include <memory>
 #include <utility>
 #include <vector>
 
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/ParallelRaceGroup.h"
+#include "wpi/commands2/ParallelRaceGroup.hpp"
 
 #include <utility>
 #include <vector>

commandsv2/src/main/native/cpp/frc2/command/PrintCommand.cpp

@@ -2,11 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/PrintCommand.h"
+#include "wpi/commands2/PrintCommand.hpp"
 
 #include <string>
 
-#include <wpi/print.h>
+#include "wpi/util/print.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/ProxyCommand.cpp

@@ -2,14 +2,14 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/ProxyCommand.h"
+#include "wpi/commands2/ProxyCommand.hpp"
 
 #include <string>
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/deprecated.h>
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/deprecated.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/RepeatCommand.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/RepeatCommand.h"
+#include "wpi/commands2/RepeatCommand.hpp"
 
 #include <string>
 #include <utility>
 
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/RunCommand.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/RunCommand.h"
+#include "wpi/commands2/RunCommand.hpp"
 
 #include <utility>
 

commandsv2/src/main/native/cpp/frc2/command/ScheduleCommand.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/ScheduleCommand.h"
+#include "wpi/commands2/ScheduleCommand.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp

@@ -2,12 +2,12 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/SequentialCommandGroup.h"
+#include "wpi/commands2/SequentialCommandGroup.hpp"
 
 #include <utility>
 #include <vector>
 
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/StartEndCommand.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/StartEndCommand.h"
+#include "wpi/commands2/StartEndCommand.hpp"
 
 #include <utility>
 

commandsv2/src/main/native/cpp/frc2/command/Subsystem.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 "frc2/command/Subsystem.h"
+#include "wpi/commands2/Subsystem.hpp"
 
 #include <string>
 #include <utility>
 
-#include <wpi/Demangle.h>
+#include "wpi/util/Demangle.hpp"
 
-#include "frc2/command/CommandPtr.h"
-#include "frc2/command/Commands.h"
+#include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/commands2/Commands.hpp"
 
 using namespace frc2;
 Subsystem::~Subsystem() {

commandsv2/src/main/native/cpp/frc2/command/SubsystemBase.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 "frc2/command/SubsystemBase.h"
+#include "wpi/commands2/SubsystemBase.hpp"
 
 #include <string>
 
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandScheduler.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/WaitCommand.cpp

@@ -2,10 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/WaitCommand.h"
+#include "wpi/commands2/WaitCommand.hpp"
 
 #include <fmt/format.h>
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp

@@ -2,11 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/WaitUntilCommand.h"
+#include "wpi/commands2/WaitUntilCommand.hpp"
 
 #include <utility>
 
-#include <frc/Timer.h>
+#include "wpi/system/Timer.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/WrapperCommand.cpp

@@ -2,11 +2,11 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/WrapperCommand.h"
+#include "wpi/commands2/WrapperCommand.hpp"
 
 #include <utility>
 
-#include "frc2/command/Command.h"
+#include "wpi/commands2/Command.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/button/CommandGamepad.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/button/CommandGamepad.h"
+#include "wpi/commands2/button/CommandGamepad.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/button/CommandGenericHID.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/button/CommandGenericHID.h"
+#include "wpi/commands2/button/CommandGenericHID.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/button/CommandJoystick.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/button/CommandJoystick.h"
+#include "wpi/commands2/button/CommandJoystick.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/button/NetworkButton.cpp

@@ -2,7 +2,7 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/button/NetworkButton.h"
+#include "wpi/commands2/button/NetworkButton.hpp"
 
 #include <memory>
 #include <utility>

commandsv2/src/main/native/cpp/frc2/command/button/RobotModeTriggers.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/button/RobotModeTriggers.h"
+#include "wpi/commands2/button/RobotModeTriggers.hpp"
 
-#include <frc/DriverStation.h>
+#include "wpi/driverstation/DriverStation.hpp"
 
 using namespace frc2;
 

commandsv2/src/main/native/cpp/frc2/command/button/Trigger.cpp

@@ -2,13 +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.
 
-#include "frc2/command/button/Trigger.h"
+#include "wpi/commands2/button/Trigger.hpp"
 
 #include <utility>
 
-#include <frc/filter/Debouncer.h>
+#include "wpi/math/filter/Debouncer.hpp"
 
-#include "frc2/command/CommandPtr.h"
+#include "wpi/commands2/CommandPtr.hpp"
 
 using namespace frc;
 using namespace frc2;

commandsv2/src/main/native/cpp/frc2/command/sysid/SysIdRoutine.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "frc2/command/sysid/SysIdRoutine.h"
+#include "wpi/commands2/sysid/SysIdRoutine.hpp"
 
-#include <frc/sysid/SysIdRoutineLog.h>
+#include "wpi/sysid/SysIdRoutineLog.hpp"
 
 using namespace frc2::sysid;
 

commandsv2/src/main/native/include/wpi/commands2/Command.hpp

@@ -9,14 +9,14 @@
 #include <optional>
 #include <string>
 
-#include <units/time.h>
-#include <wpi/Demangle.h>
-#include <wpi/SmallSet.h>
-#include <wpi/StackTrace.h>
-#include <wpi/sendable/Sendable.h>
+#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 "frc2/command/Requirements.h"
-#include "frc2/command/Subsystem.h"
+#include "wpi/commands2/Requirements.hpp"
+#include "wpi/commands2/Subsystem.hpp"
 
 namespace frc2 {
 

commandsv2/src/main/native/include/wpi/commands2/CommandHelper.hpp

@@ -8,8 +8,8 @@
 #include <memory>
 #include <utility>
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandPtr.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandPtr.hpp"
 
 namespace frc2 {
 

commandsv2/src/main/native/include/wpi/commands2/CommandPtr.hpp

@@ -11,8 +11,8 @@
 #include <utility>
 #include <vector>
 
-#include "frc2/command/Command.h"
-#include "frc2/command/Requirements.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/Requirements.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/CommandScheduler.hpp

@@ -12,13 +12,13 @@
 #include <span>
 #include <utility>
 
-#include <frc/Errors.h>
-#include <frc/Watchdog.h>
-#include <frc/event/EventLoop.h>
-#include <units/time.h>
-#include <wpi/FunctionExtras.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#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"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc2 {
 class Command;

commandsv2/src/main/native/include/wpi/commands2/Commands.hpp

@@ -12,11 +12,11 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/deprecated.h>
+#include "wpi/util/deprecated.hpp"
 
-#include "frc2/command/CommandPtr.h"
-#include "frc2/command/Requirements.h"
-#include "frc2/command/SelectCommand.h"
+#include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/commands2/Requirements.hpp"
+#include "wpi/commands2/SelectCommand.hpp"
 
 namespace frc2 {
 class Subsystem;

commandsv2/src/main/native/include/wpi/commands2/ConditionalCommand.hpp

@@ -9,8 +9,8 @@
 #include <memory>
 #include <utility>
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/DeferredCommand.hpp

@@ -6,11 +6,11 @@
 
 #include <memory>
 
-#include <wpi/FunctionExtras.h>
+#include "wpi/util/FunctionExtras.hpp"
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
-#include "frc2/command/Requirements.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/commands2/Requirements.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/FunctionalCommand.hpp

@@ -6,9 +6,9 @@
 
 #include <functional>
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
-#include "frc2/command/Requirements.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/commands2/Requirements.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/InstantCommand.hpp

@@ -6,9 +6,9 @@
 
 #include <functional>
 
-#include "frc2/command/CommandHelper.h"
-#include "frc2/command/FunctionalCommand.h"
-#include "frc2/command/Requirements.h"
+#include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/commands2/FunctionalCommand.hpp"
+#include "wpi/commands2/Requirements.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/NotifierCommand.hpp

@@ -6,12 +6,12 @@
 
 #include <functional>
 
-#include <frc/Notifier.h>
-#include <units/time.h>
+#include "wpi/system/Notifier.hpp"
+#include "wpi/units/time.hpp"
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
-#include "frc2/command/Requirements.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/commands2/Requirements.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/ParallelCommandGroup.hpp

@@ -14,9 +14,9 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/DecayedDerivedFrom.h>
+#include "wpi/util/DecayedDerivedFrom.hpp"
 
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/ParallelDeadlineGroup.hpp

@@ -14,9 +14,9 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/DecayedDerivedFrom.h>
+#include "wpi/util/DecayedDerivedFrom.hpp"
 
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/ParallelRaceGroup.hpp

@@ -14,9 +14,9 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/DecayedDerivedFrom.h>
+#include "wpi/util/DecayedDerivedFrom.hpp"
 
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/PrintCommand.hpp

@@ -6,8 +6,8 @@
 
 #include <string_view>
 
-#include "frc2/command/CommandHelper.h"
-#include "frc2/command/InstantCommand.h"
+#include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/ProxyCommand.hpp

@@ -6,11 +6,11 @@
 
 #include <memory>
 
-#include <wpi/FunctionExtras.h>
-#include <wpi/deprecated.h>
+#include "wpi/util/FunctionExtras.hpp"
+#include "wpi/util/deprecated.hpp"
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/RepeatCommand.hpp

@@ -13,8 +13,8 @@
 #include <memory>
 #include <utility>
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/Requirements.hpp

@@ -8,7 +8,7 @@
 #include <span>
 #include <vector>
 
-#include "frc2/command/Subsystem.h"
+#include "wpi/commands2/Subsystem.hpp"
 
 namespace frc2 {
 

commandsv2/src/main/native/include/wpi/commands2/RunCommand.hpp

@@ -6,9 +6,9 @@
 
 #include <functional>
 
-#include "frc2/command/CommandHelper.h"
-#include "frc2/command/FunctionalCommand.h"
-#include "frc2/command/Requirements.h"
+#include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/commands2/FunctionalCommand.hpp"
+#include "wpi/commands2/Requirements.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/ScheduleCommand.hpp

@@ -6,10 +6,10 @@
 
 #include <span>
 
-#include <wpi/SmallSet.h>
+#include "wpi/util/SmallSet.hpp"
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/SelectCommand.hpp

@@ -17,10 +17,10 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "frc2/command/Command.h"
-#include "frc2/command/PrintCommand.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/PrintCommand.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/SequentialCommandGroup.hpp

@@ -15,9 +15,9 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/DecayedDerivedFrom.h>
+#include "wpi/util/DecayedDerivedFrom.hpp"
 
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 

commandsv2/src/main/native/include/wpi/commands2/StartEndCommand.hpp

@@ -6,9 +6,9 @@
 
 #include <functional>
 
-#include "frc2/command/CommandHelper.h"
-#include "frc2/command/FunctionalCommand.h"
-#include "frc2/command/Requirements.h"
+#include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/commands2/FunctionalCommand.hpp"
+#include "wpi/commands2/Requirements.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/Subsystem.hpp

@@ -9,9 +9,9 @@
 #include <string>
 #include <utility>
 
-#include <wpi/FunctionExtras.h>
+#include "wpi/util/FunctionExtras.hpp"
 
-#include "frc2/command/CommandScheduler.h"
+#include "wpi/commands2/CommandScheduler.hpp"
 
 namespace frc2 {
 class Command;

commandsv2/src/main/native/include/wpi/commands2/SubsystemBase.hpp

@@ -7,10 +7,10 @@
 #include <string>
 #include <string_view>
 
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc2/command/Subsystem.h"
+#include "wpi/commands2/Subsystem.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/WaitCommand.hpp

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <frc/Timer.h>
-#include <units/time.h>
+#include "wpi/system/Timer.hpp"
+#include "wpi/units/time.hpp"
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/WaitUntilCommand.hpp

@@ -6,10 +6,10 @@
 
 #include <functional>
 
-#include <units/time.h>
+#include "wpi/units/time.hpp"
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/WrapperCommand.hpp

@@ -13,8 +13,8 @@
 #include <memory>
 #include <utility>
 
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/button/CommandGamepad.hpp

@@ -3,11 +3,11 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #pragma once
-#include <frc/Gamepad.h>
+#include "wpi/driverstation/Gamepad.hpp"
 
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/button/CommandGenericHID.h"
-#include "frc2/command/button/Trigger.h"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/button/CommandGenericHID.hpp"
+#include "wpi/commands2/button/Trigger.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/button/CommandGenericHID.hpp

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <frc/DriverStation.h>
-#include <frc/GenericHID.h>
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/driverstation/GenericHID.hpp"
 
-#include "Trigger.h"
-#include "frc2/command/CommandScheduler.h"
+#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,11 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #pragma once
-#include <frc/Joystick.h>
+#include "wpi/driverstation/Joystick.hpp"
 
-#include "Trigger.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/button/CommandGenericHID.h"
+#include "wpi/commands2/button/Trigger.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/button/CommandGenericHID.hpp"
 
 namespace frc2 {
 /**

commandsv2/src/main/native/include/wpi/commands2/button/JoystickButton.hpp

@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #pragma once
-#include <frc/GenericHID.h>
+#include "wpi/driverstation/GenericHID.hpp"
 
-#include "Trigger.h"
+#include "wpi/commands2/button/Trigger.hpp"
 
 namespace frc2 {
 /**