SCRIPT Run cc include replacements

commandsv2/src/test/native/cpp/wpi/command/AddRequirementsTest.cpp

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

commandsv2/src/test/native/cpp/wpi/command/CommandDecoratorTest.cpp

@@ -5,14 +5,14 @@
 #include <string>
 #include <utility>
 
-#include <frc/simulation/SimHooks.h>
+#include "wpi/simulation/SimHooks.hpp"
 
-#include "CommandTestBase.h"
-#include "frc2/command/Commands.h"
-#include "frc2/command/FunctionalCommand.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/RunCommand.h"
-#include "frc2/command/WaitUntilCommand.h"
+#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"
 
 using namespace frc2;
 class CommandDecoratorTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/CommandPtrTest.cpp

@@ -4,12 +4,12 @@
 
 #include <utility>
 
-#include <frc/Errors.h>
+#include "wpi/system/Errors.hpp"
 
-#include "CommandTestBase.h"
-#include "frc2/command/CommandPtr.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/Commands.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/Commands.hpp"
 
 using namespace frc2;
 class CommandPtrTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/CommandRequirementsTest.cpp

@@ -4,11 +4,11 @@
 
 #include <utility>
 
-#include <frc/Errors.h>
+#include "wpi/system/Errors.hpp"
 
-#include "CommandTestBase.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/FunctionalCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/FunctionalCommand.hpp"
 
 using namespace frc2;
 class CommandRequirementsTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/CommandScheduleTest.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 <frc/smartdashboard/SmartDashboard.h>
-#include <networktables/NetworkTableInstance.h>
+#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
 
-#include "CommandTestBase.h"
-#include "frc2/command/FunctionalCommand.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/RunCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/FunctionalCommand.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/RunCommand.hpp"
 
 using namespace frc2;
 class CommandScheduleTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/CommandSendableButtonTest.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/Commands.h>
+#include "wpi/commands2/Commands.hpp"
 
-#include <frc/smartdashboard/SmartDashboard.h>
-#include <networktables/BooleanTopic.h>
-#include <networktables/NetworkTableInstance.h>
+#include "wpi/smartdashboard/SmartDashboard.hpp"
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
 
-#include "CommandTestBase.h"
+#include "CommandTestBase.hpp"
 
 using namespace frc2;
 

commandsv2/src/test/native/cpp/wpi/command/CommandTestBase.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 "CommandTestBase.h"
+#include "CommandTestBase.hpp"
 
 using namespace frc2;
 

commandsv2/src/test/native/cpp/wpi/command/CommandTestBase.hpp

@@ -7,13 +7,13 @@
 #include <functional>
 #include <utility>
 
-#include <frc/simulation/DriverStationSim.h>
+#include "wpi/simulation/DriverStationSim.hpp"
 #include <gtest/gtest.h>
 
-#include "frc2/command/CommandHelper.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/Requirements.h"
-#include "frc2/command/SubsystemBase.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"
 
 namespace frc2 {

commandsv2/src/test/native/cpp/wpi/command/CompositionTestBase.hpp

@@ -9,9 +9,9 @@
 
 #include <gtest/gtest.h>
 
-#include "CommandTestBase.h"
-#include "frc2/command/Commands.h"
-#include "make_vector.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
+#include "make_vector.hpp"
 
 namespace frc2 {
 

commandsv2/src/test/native/cpp/wpi/command/ConditionalCommandTest.cpp

@@ -5,10 +5,10 @@
 #include <memory>
 #include <utility>
 
-#include "CommandTestBase.h"
-#include "frc2/command/Commands.h"
-#include "frc2/command/ConditionalCommand.h"
-#include "frc2/command/InstantCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
+#include "wpi/commands2/ConditionalCommand.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
 
 using namespace frc2;
 class ConditionalCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/DefaultCommandTest.cpp

@@ -4,9 +4,9 @@
 
 #include <utility>
 
-#include "CommandTestBase.h"
-#include "frc2/command/Commands.h"
-#include "frc2/command/RunCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
+#include "wpi/commands2/RunCommand.hpp"
 
 using namespace frc2;
 class DefaultCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/DeferredCommandTest.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 "CommandTestBase.h"
-#include "frc2/command/Commands.h"
-#include "frc2/command/DeferredCommand.h"
-#include "frc2/command/FunctionalCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
+#include "wpi/commands2/DeferredCommand.hpp"
+#include "wpi/commands2/FunctionalCommand.hpp"
 
 using namespace frc2;
 

commandsv2/src/test/native/cpp/wpi/command/FunctionalCommandTest.cpp

@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "CommandTestBase.h"
-#include "frc2/command/FunctionalCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/FunctionalCommand.hpp"
 
 using namespace frc2;
 class FunctionalCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/InstantCommandTest.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 "CommandTestBase.h"
-#include "frc2/command/Commands.h"
-#include "frc2/command/InstantCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/Commands.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
 
 using namespace frc2;
 class InstantCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/NotifierCommandTest.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 <frc/simulation/SimHooks.h>
+#include "wpi/simulation/SimHooks.hpp"
 
-#include "CommandTestBase.h"
-#include "frc2/command/NotifierCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/NotifierCommand.hpp"
 
 using namespace frc2;
 using namespace std::chrono_literals;

commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp

@@ -2,16 +2,16 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <frc/DriverStation.h>
-#include <frc/Joystick.h>
-#include <frc/simulation/JoystickSim.h>
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/driverstation/Joystick.hpp"
+#include "wpi/simulation/JoystickSim.hpp"
 #include <gtest/gtest.h>
 
-#include "CommandTestBase.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/RunCommand.h"
-#include "frc2/command/WaitUntilCommand.h"
-#include "frc2/command/button/POVButton.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/RunCommand.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
+#include "wpi/commands2/button/POVButton.hpp"
 
 using namespace frc2;
 class POVButtonTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/ParallelCommandGroupTest.cpp

@@ -5,11 +5,11 @@
 #include <memory>
 #include <utility>
 
-#include "CommandTestBase.h"
-#include "CompositionTestBase.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/ParallelCommandGroup.h"
-#include "frc2/command/WaitUntilCommand.h"
+#include "CommandTestBase.hpp"
+#include "CompositionTestBase.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/ParallelCommandGroup.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
 
 using namespace frc2;
 class ParallelCommandGroupTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/ParallelDeadlineGroupTest.cpp

@@ -6,11 +6,11 @@
 #include <utility>
 #include <vector>
 
-#include "CommandTestBase.h"
-#include "CompositionTestBase.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/ParallelDeadlineGroup.h"
-#include "frc2/command/WaitUntilCommand.h"
+#include "CommandTestBase.hpp"
+#include "CompositionTestBase.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/ParallelDeadlineGroup.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
 
 using namespace frc2;
 class ParallelDeadlineGroupTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/ParallelRaceGroupTest.cpp

@@ -5,12 +5,12 @@
 #include <memory>
 #include <utility>
 
-#include "CommandTestBase.h"
-#include "CompositionTestBase.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/ParallelRaceGroup.h"
-#include "frc2/command/SequentialCommandGroup.h"
-#include "frc2/command/WaitUntilCommand.h"
+#include "CommandTestBase.hpp"
+#include "CompositionTestBase.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/ParallelRaceGroup.hpp"
+#include "wpi/commands2/SequentialCommandGroup.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
 
 using namespace frc2;
 class ParallelRaceGroupTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/PrintCommandTest.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/Commands.h>
+#include "wpi/commands2/Commands.hpp"
 
 #include <regex>
 
-#include "CommandTestBase.h"
-#include "frc2/command/PrintCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/PrintCommand.hpp"
 
 using namespace frc2;
 class PrintCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.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/Commands.h>
+#include "wpi/commands2/Commands.hpp"
 
 #include <memory>
 
-#include "CommandTestBase.h"
-#include "frc2/command/CommandPtr.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/ProxyCommand.h"
-#include "frc2/command/WaitUntilCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/ProxyCommand.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
 
 using namespace frc2;
 class ProxyCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/RepeatCommandTest.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 "CommandTestBase.h"
-#include "CompositionTestBase.h"
-#include "frc2/command/FunctionalCommand.h"
-#include "frc2/command/RepeatCommand.h"
+#include "CommandTestBase.hpp"
+#include "CompositionTestBase.hpp"
+#include "wpi/commands2/FunctionalCommand.hpp"
+#include "wpi/commands2/RepeatCommand.hpp"
 
 using namespace frc2;
 class RepeatCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/RobotDisabledCommandTest.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 "CommandTestBase.h"
-#include "frc2/command/ConditionalCommand.h"
-#include "frc2/command/ParallelCommandGroup.h"
-#include "frc2/command/ParallelDeadlineGroup.h"
-#include "frc2/command/ParallelRaceGroup.h"
-#include "frc2/command/SelectCommand.h"
-#include "frc2/command/SequentialCommandGroup.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/ConditionalCommand.hpp"
+#include "wpi/commands2/ParallelCommandGroup.hpp"
+#include "wpi/commands2/ParallelDeadlineGroup.hpp"
+#include "wpi/commands2/ParallelRaceGroup.hpp"
+#include "wpi/commands2/SelectCommand.hpp"
+#include "wpi/commands2/SequentialCommandGroup.hpp"
 
 using namespace frc2;
 class RobotDisabledCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.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/Commands.h>
+#include "wpi/commands2/Commands.hpp"
 
-#include "CommandTestBase.h"
-#include "frc2/command/RunCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/RunCommand.hpp"
 
 using namespace frc2;
 class RunCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/ScheduleCommandTest.cpp

@@ -4,10 +4,10 @@
 
 #include <regex>
 
-#include "CommandTestBase.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/ScheduleCommand.h"
-#include "frc2/command/SequentialCommandGroup.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/ScheduleCommand.hpp"
+#include "wpi/commands2/SequentialCommandGroup.hpp"
 
 using namespace frc2;
 class ScheduleCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.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/Commands.h>
+#include "wpi/commands2/Commands.hpp"
 
 #include <utility>
 
-#include "CommandTestBase.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/RunCommand.h"
-#include "frc2/command/StartEndCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/RunCommand.hpp"
+#include "wpi/commands2/StartEndCommand.hpp"
 
 using namespace frc2;
 class SchedulerTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/SchedulingRecursionTest.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/Commands.h>
+#include "wpi/commands2/Commands.hpp"
 
 #include <utility>
 
 #include <gtest/gtest.h>
 
-#include "CommandTestBase.h"
-#include "frc2/command/Command.h"
-#include "frc2/command/CommandHelper.h"
-#include "frc2/command/FunctionalCommand.h"
-#include "frc2/command/RunCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/Command.hpp"
+#include "wpi/commands2/CommandHelper.hpp"
+#include "wpi/commands2/FunctionalCommand.hpp"
+#include "wpi/commands2/RunCommand.hpp"
 
 using namespace frc2;
 

commandsv2/src/test/native/cpp/wpi/command/SelectCommandTest.cpp

@@ -6,10 +6,10 @@
 #include <utility>
 #include <vector>
 
-#include "CommandTestBase.h"
-#include "CompositionTestBase.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/SelectCommand.h"
+#include "CommandTestBase.hpp"
+#include "CompositionTestBase.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/SelectCommand.hpp"
 
 using namespace frc2;
 class SelectCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/SequentialCommandGroupTest.cpp

@@ -5,11 +5,11 @@
 #include <memory>
 #include <utility>
 
-#include "CommandTestBase.h"
-#include "CompositionTestBase.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/SequentialCommandGroup.h"
-#include "frc2/command/WaitUntilCommand.h"
+#include "CommandTestBase.hpp"
+#include "CompositionTestBase.hpp"
+#include "wpi/commands2/InstantCommand.hpp"
+#include "wpi/commands2/SequentialCommandGroup.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
 
 using namespace frc2;
 class SequentialCommandGroupTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.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/Commands.h>
+#include "wpi/commands2/Commands.hpp"
 
-#include "CommandTestBase.h"
-#include "frc2/command/StartEndCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/StartEndCommand.hpp"
 
 using namespace frc2;
 class StartEndCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.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/Commands.h>
+#include "wpi/commands2/Commands.hpp"
 
-#include <frc/simulation/SimHooks.h>
+#include "wpi/simulation/SimHooks.hpp"
 
-#include "CommandTestBase.h"
-#include "frc2/command/WaitCommand.h"
-#include "frc2/command/WaitUntilCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/WaitCommand.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
 
 using namespace frc2;
 class WaitCommandTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.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/Commands.h>
+#include "wpi/commands2/Commands.hpp"
 
-#include "CommandTestBase.h"
-#include "frc2/command/WaitUntilCommand.h"
+#include "CommandTestBase.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
 
 using namespace frc2;
 class WaitUntilCommandTest : public CommandTestBase {};

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 <networktables/NetworkTableInstance.h>
+#include "wpi/nt/NetworkTableInstance.hpp"
 
-#include "../CommandTestBase.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/RunCommand.h"
-#include "frc2/command/WaitUntilCommand.h"
-#include "frc2/command/button/NetworkButton.h"
+#include "../CommandTestBase.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/RunCommand.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
+#include "wpi/commands2/button/NetworkButton.hpp"
 
 using namespace frc2;
 

commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.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 <frc/DriverStation.h>
-#include <frc/simulation/DriverStationSim.h>
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/simulation/DriverStationSim.hpp"
 
-#include "../CommandTestBase.h"
-#include "frc2/command/button/RobotModeTriggers.h"
-#include "frc2/command/button/Trigger.h"
+#include "../CommandTestBase.hpp"
+#include "wpi/commands2/button/RobotModeTriggers.hpp"
+#include "wpi/commands2/button/Trigger.hpp"
 
 using namespace frc2;
 using namespace frc::sim;

commandsv2/src/test/native/cpp/wpi/command/button/TriggerTest.cpp

@@ -4,16 +4,16 @@
 
 #include <utility>
 
-#include <frc/simulation/SimHooks.h>
+#include "wpi/simulation/SimHooks.hpp"
 #include <gtest/gtest.h>
 
-#include "../CommandTestBase.h"
-#include "frc2/command/CommandPtr.h"
-#include "frc2/command/CommandScheduler.h"
-#include "frc2/command/Commands.h"
-#include "frc2/command/RunCommand.h"
-#include "frc2/command/WaitUntilCommand.h"
-#include "frc2/command/button/Trigger.h"
+#include "../CommandTestBase.hpp"
+#include "wpi/commands2/CommandPtr.hpp"
+#include "wpi/commands2/CommandScheduler.hpp"
+#include "wpi/commands2/Commands.hpp"
+#include "wpi/commands2/RunCommand.hpp"
+#include "wpi/commands2/WaitUntilCommand.hpp"
+#include "wpi/commands2/button/Trigger.hpp"
 
 using namespace frc2;
 class TriggerTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/sysid/SysIdRoutineTest.cpp

@@ -2,16 +2,16 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <frc2/command/Subsystem.h>
-#include <frc2/command/sysid/SysIdRoutine.h>
+#include "wpi/commands2/Subsystem.hpp"
+#include "wpi/commands2/sysid/SysIdRoutine.hpp"
 
 #include <utility>
 #include <vector>
 
-#include <frc/Timer.h>
-#include <frc/simulation/SimHooks.h>
+#include "wpi/system/Timer.hpp"
+#include "wpi/simulation/SimHooks.hpp"
 #include <gtest/gtest.h>
-#include <units/math.h>
+#include "wpi/units/math.hpp"
 
 #define EXPECT_NEAR_UNITS(val1, val2, eps) \
   EXPECT_LE(units::math::abs(val1 - val2), eps)