SCRIPT Run cc include replacements

wpilibc/src/main/native/cpp/ExpansionHub.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/ExpansionHub.h"
+#include "wpi/ExpansionHub.hpp"
 
 #include <memory>
 
-#include <hal/UsageReporting.h>
-#include <networktables/BooleanTopic.h>
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/nt/BooleanTopic.hpp"
 
-#include "frc/Errors.h"
-#include "frc/ExpansionHubMotor.h"
-#include "frc/ExpansionHubServo.h"
-#include "frc/SystemServer.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/ExpansionHubMotor.hpp"
+#include "wpi/ExpansionHubServo.hpp"
+#include "wpi/system/SystemServer.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/ExpansionHubMotor.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/ExpansionHubMotor.h"
+#include "wpi/ExpansionHubMotor.hpp"
 
-#include "frc/Errors.h"
-#include "frc/SystemServer.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/SystemServer.hpp"
 
 static constexpr int kPercentageMode = 0;
 static constexpr int kVoltageMode = 1;

wpilibc/src/main/native/cpp/ExpansionHubPidConstants.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/ExpansionHubPidConstants.h"
+#include "wpi/ExpansionHubPidConstants.hpp"
 
 #include <string>
 
-#include "frc/Errors.h"
-#include "frc/SystemServer.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/SystemServer.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/ExpansionHubServo.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/ExpansionHubServo.h"
+#include "wpi/ExpansionHubServo.hpp"
 
-#include "frc/Errors.h"
-#include "frc/SystemServer.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/SystemServer.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/counter/Tachometer.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/counter/Tachometer.h"
+#include "wpi/counter/Tachometer.hpp"
 
 #include <string>
 
-#include <hal/Counter.h>
-#include <hal/UsageReporting.h>
-#include <wpi/StackTrace.h>
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/hal/Counter.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/StackTrace.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/counter/UpDownCounter.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/counter/UpDownCounter.h"
+#include "wpi/counter/UpDownCounter.hpp"
 
 #include <memory>
 #include <string>
 
-#include <hal/Counter.h>
-#include <hal/UsageReporting.h>
-#include <wpi/StackTrace.h>
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/hal/Counter.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/StackTrace.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp

@@ -2,19 +2,19 @@
 // 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/drive/DifferentialDrive.h"
+#include "wpi/drive/DifferentialDrive.hpp"
 
 #include <algorithm>
 #include <cmath>
 #include <string>
 #include <utility>
 
-#include <hal/UsageReporting.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/MathUtil.h"
-#include "frc/motorcontrol/MotorController.h"
+#include "wpi/math/util/MathUtil.hpp"
+#include "wpi/hardware/motor/MotorController.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp

@@ -2,19 +2,19 @@
 // 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/drive/MecanumDrive.h"
+#include "wpi/drive/MecanumDrive.hpp"
 
 #include <algorithm>
 #include <string>
 #include <utility>
 
-#include <hal/UsageReporting.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/MathUtil.h"
-#include "frc/geometry/Translation2d.h"
-#include "frc/motorcontrol/MotorController.h"
+#include "wpi/math/util/MathUtil.hpp"
+#include "wpi/math/geometry/Translation2d.hpp"
+#include "wpi/hardware/motor/MotorController.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/drive/RobotDriveBase.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/drive/RobotDriveBase.h"
+#include "wpi/drive/RobotDriveBase.hpp"
 
 #include <algorithm>
 #include <cmath>
 #include <cstddef>
 
-#include "frc/motorcontrol/MotorController.h"
+#include "wpi/hardware/motor/MotorController.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/driverstation/DSControlWord.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 "frc/DSControlWord.h"
+#include "wpi/driverstation/DSControlWord.hpp"
 
-#include <hal/DriverStation.h>
+#include "wpi/hal/DriverStation.h"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/driverstation/DriverStation.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/DriverStation.h"
+#include "wpi/driverstation/DriverStation.hpp"
 
 #include <stdint.h>
 
@@ -14,24 +14,24 @@
 #include <string_view>
 
 #include <fmt/format.h>
-#include <hal/DriverStation.h>
-#include <hal/DriverStationTypes.h>
-#include <hal/HALBase.h>
-#include <hal/Power.h>
-#include <networktables/BooleanTopic.h>
-#include <networktables/IntegerTopic.h>
-#include <networktables/NetworkTable.h>
-#include <networktables/NetworkTableInstance.h>
-#include <networktables/StringTopic.h>
-#include <wpi/EventVector.h>
-#include <wpi/condition_variable.h>
-#include <wpi/datalog/DataLog.h>
-#include <wpi/json.h>
-#include <wpi/mutex.h>
-#include <wpi/timestamp.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/DriverStationTypes.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Power.h"
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/nt/IntegerTopic.hpp"
+#include "wpi/nt/NetworkTable.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/StringTopic.hpp"
+#include "wpi/util/EventVector.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/datalog/DataLog.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/timestamp.h"
 
-#include "frc/Errors.h"
-#include "frc/Timer.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/Timer.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/driverstation/Gamepad.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/Gamepad.h"
+#include "wpi/driverstation/Gamepad.hpp"
 
-#include <hal/UsageReporting.h>
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "frc/event/BooleanEvent.h"
+#include "wpi/event/BooleanEvent.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/driverstation/GenericHID.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 "frc/GenericHID.h"
+#include "wpi/driverstation/GenericHID.hpp"
 
 #include <string>
 
-#include <hal/DriverStation.h>
+#include "wpi/hal/DriverStation.h"
 
-#include "frc/DriverStation.h"
-#include "frc/Errors.h"
-#include "frc/event/BooleanEvent.h"
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/event/BooleanEvent.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/driverstation/Joystick.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/Joystick.h"
+#include "wpi/driverstation/Joystick.hpp"
 
 #include <cmath>
 
-#include <hal/UsageReporting.h>
+#include "wpi/hal/UsageReporting.h"
 
-#include "frc/event/BooleanEvent.h"
+#include "wpi/event/BooleanEvent.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/event/BooleanEvent.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/event/BooleanEvent.h"
+#include "wpi/event/BooleanEvent.hpp"
 
 #include <memory>
 #include <utility>

wpilibc/src/main/native/cpp/event/EventLoop.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/event/EventLoop.h"
+#include "wpi/event/EventLoop.hpp"
 
 #include <utility>
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/event/NetworkBooleanEvent.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 "frc/event/NetworkBooleanEvent.h"
+#include "wpi/event/NetworkBooleanEvent.hpp"
 
 #include <memory>
 #include <utility>
 
-#include <networktables/BooleanTopic.h>
-#include <networktables/NetworkTable.h>
-#include <networktables/NetworkTableInstance.h>
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/nt/NetworkTable.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/accelerometer/ADXL345_I2C.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/ADXL345_I2C.h"
+#include "wpi/hardware/accelerometer/ADXL345_I2C.hpp"
 
-#include <hal/UsageReporting.h>
-#include <networktables/DoubleTopic.h>
-#include <networktables/NTSendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/nt/DoubleTopic.hpp"
+#include "wpi/nt/NTSendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/accelerometer/AnalogAccelerometer.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 "frc/AnalogAccelerometer.h"
+#include "wpi/hardware/accelerometer/AnalogAccelerometer.hpp"
 
-#include <hal/UsageReporting.h>
-#include <wpi/NullDeleter.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/bus/CAN.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/CAN.h"
+#include "wpi/hardware/bus/CAN.hpp"
 
 #include <utility>
 
-#include <hal/CAN.h>
-#include <hal/CANAPI.h>
-#include <hal/Errors.h>
-#include <hal/UsageReporting.h>
+#include "wpi/hal/CAN.h"
+#include "wpi/hal/CANAPI.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/UsageReporting.h"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/bus/I2C.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 "frc/I2C.h"
+#include "wpi/hardware/bus/I2C.hpp"
 
 #include <algorithm>
 
-#include <hal/I2C.h>
-#include <hal/UsageReporting.h>
+#include "wpi/hal/I2C.h"
+#include "wpi/hal/UsageReporting.h"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/bus/SerialPort.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 "frc/SerialPort.h"
+#include "wpi/hardware/bus/SerialPort.hpp"
 
 #include <string>
 
-#include <hal/SerialPort.h>
-#include <hal/UsageReporting.h>
+#include "wpi/hal/SerialPort.h"
+#include "wpi/hal/UsageReporting.h"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/discrete/AnalogInput.cpp

@@ -2,21 +2,21 @@
 // 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/AnalogInput.h"
+#include "wpi/hardware/discrete/AnalogInput.hpp"
 
 #include <string>
 
-#include <hal/AnalogInput.h>
-#include <hal/HALBase.h>
-#include <hal/Ports.h>
-#include <hal/UsageReporting.h>
-#include <wpi/StackTrace.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/AnalogInput.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/StackTrace.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/Errors.h"
-#include "frc/SensorUtil.h"
-#include "frc/Timer.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
+#include "wpi/system/Timer.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/discrete/DigitalInput.cpp

@@ -2,20 +2,20 @@
 // 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/DigitalInput.h"
+#include "wpi/hardware/discrete/DigitalInput.hpp"
 
 #include <string>
 
-#include <hal/DIO.h>
-#include <hal/HALBase.h>
-#include <hal/Ports.h>
-#include <hal/UsageReporting.h>
-#include <wpi/StackTrace.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/DIO.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/StackTrace.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/Errors.h"
-#include "frc/SensorUtil.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/discrete/DigitalOutput.cpp

@@ -2,20 +2,20 @@
 // 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/DigitalOutput.h"
+#include "wpi/hardware/discrete/DigitalOutput.hpp"
 
 #include <string>
 
-#include <hal/DIO.h>
-#include <hal/HALBase.h>
-#include <hal/Ports.h>
-#include <hal/UsageReporting.h>
-#include <wpi/StackTrace.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/DIO.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/StackTrace.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/Errors.h"
-#include "frc/SensorUtil.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/discrete/PWM.cpp

@@ -2,20 +2,20 @@
 // 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/PWM.h"
+#include "wpi/hardware/discrete/PWM.hpp"
 
 #include <utility>
 
-#include <hal/HALBase.h>
-#include <hal/PWM.h>
-#include <hal/Ports.h>
-#include <hal/UsageReporting.h>
-#include <wpi/StackTrace.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/PWM.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/StackTrace.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/Errors.h"
-#include "frc/SensorUtil.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/imu/OnboardIMU.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/OnboardIMU.h"
+#include "wpi/hardware/imu/OnboardIMU.hpp"
 
-#include <hal/IMU.h>
+#include "wpi/hal/IMU.h"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/led/AddressableLED.cpp

@@ -2,19 +2,19 @@
 // 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/AddressableLED.h"
+#include "wpi/hardware/led/AddressableLED.hpp"
 
 #include <algorithm>
 
-#include <hal/AddressableLED.h>
-#include <hal/HALBase.h>
-#include <hal/PWM.h>
-#include <hal/Ports.h>
-#include <hal/UsageReporting.h>
-#include <wpi/StackTrace.h>
+#include "wpi/hal/AddressableLED.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/PWM.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/StackTrace.hpp"
 
-#include "frc/Errors.h"
-#include "frc/SensorUtil.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/led/LEDPattern.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/LEDPattern.h"
+#include "wpi/hardware/led/LEDPattern.hpp"
 
 #include <algorithm>
 #include <cmath>
@@ -11,10 +11,10 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/MathExtras.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/timestamp.h"
 
-#include "frc/MathUtil.h"
+#include "wpi/math/util/MathUtil.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/motor/MotorSafety.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/MotorSafety.h"
+#include "wpi/hardware/motor/MotorSafety.hpp"
 
 #include <algorithm>
 #include <utility>
 
-#include <hal/DriverStation.h>
-#include <wpi/SafeThread.h>
-#include <wpi/SmallPtrSet.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/util/SafeThread.hpp"
+#include "wpi/util/SmallPtrSet.hpp"
 
-#include "frc/DriverStation.h"
-#include "frc/Errors.h"
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/pneumatic/Compressor.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 "frc/Compressor.h"
+#include "wpi/hardware/pneumatic/Compressor.hpp"
 
-#include <frc/PneumaticHub.h>
+#include "wpi/hardware/pneumatic/PneumaticHub.hpp"
 
-#include <hal/Ports.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/pneumatic/DoubleSolenoid.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/DoubleSolenoid.h"
+#include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 
 #include <utility>
 
-#include <hal/Ports.h>
-#include <wpi/NullDeleter.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/Errors.h"
-#include "frc/SensorUtil.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.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/PneumaticHub.h"
+#include "wpi/hardware/pneumatic/PneumaticHub.hpp"
 
 #include <array>
 #include <cstdio>
@@ -10,18 +10,18 @@
 #include <string>
 
 #include <fmt/format.h>
-#include <hal/Ports.h>
-#include <hal/REVPH.h>
-#include <hal/UsageReporting.h>
-#include <wpi/NullDeleter.h>
-#include <wpi/StackTrace.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/REVPH.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/StackTrace.hpp"
 
-#include "frc/Compressor.h"
-#include "frc/DoubleSolenoid.h"
-#include "frc/Errors.h"
-#include "frc/RobotBase.h"
-#include "frc/SensorUtil.h"
-#include "frc/Solenoid.h"
+#include "wpi/hardware/pneumatic/Compressor.hpp"
+#include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/opmode/RobotBase.hpp"
+#include "wpi/util/SensorUtil.hpp"
+#include "wpi/hardware/pneumatic/Solenoid.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsBase.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/PneumaticsBase.h"
+#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
 
 #include <memory>
 
-#include <hal/REVPH.h>
+#include "wpi/hal/REVPH.h"
 
-#include "frc/Errors.h"
-#include "frc/PneumaticHub.h"
-#include "frc/PneumaticsControlModule.h"
-#include "frc/SensorUtil.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/hardware/pneumatic/PneumaticHub.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
+#include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp

@@ -2,23 +2,23 @@
 // 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/PneumaticsControlModule.h"
+#include "wpi/hardware/pneumatic/PneumaticsControlModule.hpp"
 
 #include <memory>
 #include <string>
 
 #include <fmt/format.h>
-#include <hal/CTREPCM.h>
-#include <hal/Ports.h>
-#include <hal/UsageReporting.h>
-#include <wpi/NullDeleter.h>
-#include <wpi/StackTrace.h>
+#include "wpi/hal/CTREPCM.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/StackTrace.hpp"
 
-#include "frc/Compressor.h"
-#include "frc/DoubleSolenoid.h"
-#include "frc/Errors.h"
-#include "frc/SensorUtil.h"
-#include "frc/Solenoid.h"
+#include "wpi/hardware/pneumatic/Compressor.hpp"
+#include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
+#include "wpi/hardware/pneumatic/Solenoid.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/pneumatic/Solenoid.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/Solenoid.h"
+#include "wpi/hardware/pneumatic/Solenoid.hpp"
 
 #include <utility>
 
-#include <wpi/NullDeleter.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/Errors.h"
-#include "frc/SensorUtil.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/power/PowerDistribution.cpp

@@ -2,19 +2,19 @@
 // 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/PowerDistribution.h"
+#include "wpi/hardware/power/PowerDistribution.hpp"
 
 #include <vector>
 
 #include <fmt/format.h>
-#include <hal/Ports.h>
-#include <hal/PowerDistribution.h>
-#include <hal/UsageReporting.h>
-#include <wpi/StackTrace.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/PowerDistribution.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/StackTrace.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 static_assert(static_cast<HAL_PowerDistributionType>(
                   frc::PowerDistribution::ModuleType::kCTRE) ==

wpilibc/src/main/native/cpp/hardware/range/SharpIR.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/SharpIR.h"
+#include "wpi/hardware/range/SharpIR.hpp"
 
 #include <algorithm>
 
-#include <hal/UsageReporting.h>
-#include <units/length.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/units/length.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/AnalogInput.h"
+#include "wpi/hardware/discrete/AnalogInput.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/rotation/AnalogEncoder.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/AnalogEncoder.h"
+#include "wpi/hardware/rotation/AnalogEncoder.hpp"
 
 #include <utility>
 
-#include <hal/UsageReporting.h>
-#include <wpi/NullDeleter.h>
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "frc/AnalogInput.h"
-#include "frc/MathUtil.h"
-#include "frc/RobotController.h"
+#include "wpi/hardware/discrete/AnalogInput.hpp"
+#include "wpi/math/util/MathUtil.hpp"
+#include "wpi/system/RobotController.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/rotation/AnalogPotentiometer.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/AnalogPotentiometer.h"
+#include "wpi/hardware/rotation/AnalogPotentiometer.hpp"
 
 #include <memory>
 #include <utility>
 
-#include <wpi/NullDeleter.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/RobotController.h"
+#include "wpi/system/RobotController.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/rotation/DutyCycle.cpp

@@ -2,20 +2,20 @@
 // 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/DutyCycle.h"
+#include "wpi/hardware/rotation/DutyCycle.hpp"
 
 #include <string>
 #include <utility>
 
-#include <hal/DutyCycle.h>
-#include <hal/HALBase.h>
-#include <hal/UsageReporting.h>
-#include <wpi/NullDeleter.h>
-#include <wpi/StackTrace.h>
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/hal/DutyCycle.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/StackTrace.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "frc/Errors.h"
-#include "frc/SensorUtil.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/rotation/DutyCycleEncoder.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/DutyCycleEncoder.h"
+#include "wpi/hardware/rotation/DutyCycleEncoder.hpp"
 
 #include <memory>
 #include <utility>
 
-#include <wpi/NullDeleter.h>
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "frc/DigitalInput.h"
-#include "frc/DutyCycle.h"
-#include "frc/MathUtil.h"
+#include "wpi/hardware/discrete/DigitalInput.hpp"
+#include "wpi/hardware/rotation/DutyCycle.hpp"
+#include "wpi/math/util/MathUtil.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/hardware/rotation/Encoder.cpp

@@ -2,19 +2,19 @@
 // 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/Encoder.h"
+#include "wpi/hardware/rotation/Encoder.hpp"
 
 #include <memory>
 #include <utility>
 
-#include <hal/Encoder.h>
-#include <hal/UsageReporting.h>
-#include <wpi/NullDeleter.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/Encoder.h"
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/util/NullDeleter.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/DigitalInput.h"
-#include "frc/Errors.h"
+#include "wpi/hardware/discrete/DigitalInput.hpp"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/internal/DriverStationModeThread.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/internal/DriverStationModeThread.h"
+#include "wpi/internal/DriverStationModeThread.hpp"
 
-#include <hal/DriverStation.h>
-#include <wpi/Synchronization.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/util/Synchronization.h"
 
-#include "frc/DriverStation.h"
+#include "wpi/driverstation/DriverStation.hpp"
 
 using namespace frc::internal;
 

wpilibc/src/main/native/cpp/motorcontrol/MotorController.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 "frc/motorcontrol/MotorController.h"
+#include "wpi/hardware/motor/MotorController.hpp"
 
-#include <frc/RobotController.h>
+#include "wpi/system/RobotController.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/motorcontrol/MotorControllerGroup.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/motorcontrol/MotorControllerGroup.h"
+#include "wpi/hardware/motor/MotorControllerGroup.hpp"
 
 #include <utility>
 #include <vector>
 
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.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 "frc/motorcontrol/PWMMotorController.h"
+#include "wpi/hardware/motor/PWMMotorController.hpp"
 
 #include <string>
 
 #include <fmt/format.h>
-#include <wpi/sendable/SendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/util/sendable/SendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/RobotController.h"
+#include "wpi/system/RobotController.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/opmode/IterativeRobotBase.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/IterativeRobotBase.h"
+#include "wpi/opmode/IterativeRobotBase.hpp"
 
-#include <frc/DriverStation.h>
+#include "wpi/driverstation/DriverStation.hpp"
 
-#include <hal/DriverStation.h>
-#include <networktables/NetworkTableInstance.h>
-#include <wpi/print.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/util/print.hpp"
 
-#include "frc/DSControlWord.h"
-#include "frc/Errors.h"
-#include "frc/smartdashboard/SmartDashboard.h"
+#include "wpi/driverstation/DSControlWord.hpp"
+#include "wpi/system/Errors.hpp"
+#include "wpi/smartdashboard/SmartDashboard.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/opmode/RobotState.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 "frc/RobotState.h"
+#include "wpi/opmode/RobotState.hpp"
 
-#include "frc/DriverStation.h"
+#include "wpi/driverstation/DriverStation.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/opmode/TimedRobot.cpp

@@ -2,18 +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.
 
-#include "frc/TimedRobot.h"
+#include "wpi/opmode/TimedRobot.hpp"
 
 #include <stdint.h>
 
 #include <cstdio>
 #include <utility>
 
-#include <hal/DriverStation.h>
-#include <hal/Notifier.h>
-#include <hal/UsageReporting.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/Notifier.h"
+#include "wpi/hal/UsageReporting.h"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/opmode/TimesliceRobot.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 "frc/TimesliceRobot.h"
+#include "wpi/opmode/TimesliceRobot.hpp"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/simulation/ADXL345Sim.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/ADXL345Sim.h"
+#include "wpi/simulation/ADXL345Sim.hpp"
 
-#include "frc/ADXL345_I2C.h"
-#include "frc/simulation/SimDeviceSim.h"
+#include "wpi/hardware/accelerometer/ADXL345_I2C.hpp"
+#include "wpi/simulation/SimDeviceSim.hpp"
 
 using namespace frc::sim;
 

wpilibc/src/main/native/cpp/simulation/AddressableLEDSim.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 "frc/simulation/AddressableLEDSim.h"
+#include "wpi/simulation/AddressableLEDSim.hpp"
 
 #include <memory>
 #include <stdexcept>
 
-#include <hal/simulation/AddressableLEDData.h>
+#include "wpi/hal/simulation/AddressableLEDData.h"
 
-#include "frc/AddressableLED.h"
+#include "wpi/hardware/led/AddressableLED.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/AnalogEncoderSim.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/AnalogEncoderSim.h"
+#include "wpi/simulation/AnalogEncoderSim.hpp"
 
-#include "frc/AnalogEncoder.h"
-#include "frc/simulation/SimDeviceSim.h"
+#include "wpi/hardware/rotation/AnalogEncoder.hpp"
+#include "wpi/simulation/SimDeviceSim.hpp"
 
 using namespace frc::sim;
 

wpilibc/src/main/native/cpp/simulation/AnalogInputSim.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/simulation/AnalogInputSim.h"
+#include "wpi/simulation/AnalogInputSim.hpp"
 
 #include <memory>
 
-#include <hal/simulation/AnalogInData.h>
+#include "wpi/hal/simulation/AnalogInData.h"
 
-#include "frc/AnalogInput.h"
+#include "wpi/hardware/discrete/AnalogInput.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/CTREPCMSim.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/simulation/CTREPCMSim.h"
+#include "wpi/simulation/CTREPCMSim.hpp"
 
 #include <memory>
 
-#include <hal/simulation/CTREPCMData.h>
+#include "wpi/hal/simulation/CTREPCMData.h"
 
-#include "frc/SensorUtil.h"
+#include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/CallbackStore.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/simulation/CallbackStore.h"
+#include "wpi/simulation/CallbackStore.hpp"
 
 #include <utility>
 

wpilibc/src/main/native/cpp/simulation/DCMotorSim.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/simulation/DCMotorSim.h"
+#include "wpi/simulation/DCMotorSim.hpp"
 
-#include <wpi/MathExtras.h>
+#include "wpi/util/MathExtras.hpp"
 
-#include "frc/RobotController.h"
+#include "wpi/system/RobotController.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/DIOSim.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 "frc/simulation/DIOSim.h"
+#include "wpi/simulation/DIOSim.hpp"
 
 #include <memory>
 
-#include <hal/simulation/DIOData.h>
+#include "wpi/hal/simulation/DIOData.h"
 
-#include "frc/DigitalInput.h"
-#include "frc/DigitalOutput.h"
+#include "wpi/hardware/discrete/DigitalInput.hpp"
+#include "wpi/hardware/discrete/DigitalOutput.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/DifferentialDrivetrainSim.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/simulation/DifferentialDrivetrainSim.h"
+#include "wpi/simulation/DifferentialDrivetrainSim.hpp"
 
-#include <frc/system/plant/LinearSystemId.h>
+#include "wpi/math/system/plant/LinearSystemId.hpp"
 
 #include <utility>
 
-#include <wpi/MathExtras.h>
+#include "wpi/util/MathExtras.hpp"
 
-#include "frc/RobotController.h"
-#include "frc/StateSpaceUtil.h"
-#include "frc/system/NumericalIntegration.h"
+#include "wpi/system/RobotController.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/math/system/NumericalIntegration.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/DigitalPWMSim.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 "frc/simulation/DigitalPWMSim.h"
+#include "wpi/simulation/DigitalPWMSim.hpp"
 
 #include <memory>
 #include <stdexcept>
 
-#include <hal/simulation/DigitalPWMData.h>
+#include "wpi/hal/simulation/DigitalPWMData.h"
 
-#include "frc/DigitalOutput.h"
+#include "wpi/hardware/discrete/DigitalOutput.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/DoubleSolenoidSim.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/simulation/DoubleSolenoidSim.h"
+#include "wpi/simulation/DoubleSolenoidSim.hpp"
 
 #include <memory>
 #include <utility>
 
-#include "frc/PneumaticsBase.h"
+#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/DriverStationSim.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 "frc/simulation/DriverStationSim.h"
+#include "wpi/simulation/DriverStationSim.hpp"
 
 #include <memory>
 
-#include <hal/DriverStation.h>
-#include <hal/simulation/DriverStationData.h>
-#include <hal/simulation/MockHooks.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/hal/simulation/MockHooks.h"
 
-#include "frc/DriverStation.h"
+#include "wpi/driverstation/DriverStation.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/DutyCycleEncoderSim.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/DutyCycleEncoderSim.h"
+#include "wpi/simulation/DutyCycleEncoderSim.hpp"
 
-#include "frc/DutyCycleEncoder.h"
-#include "frc/simulation/SimDeviceSim.h"
+#include "wpi/hardware/rotation/DutyCycleEncoder.hpp"
+#include "wpi/simulation/SimDeviceSim.hpp"
 
 using namespace frc::sim;
 

wpilibc/src/main/native/cpp/simulation/DutyCycleSim.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 "frc/simulation/DutyCycleSim.h"
+#include "wpi/simulation/DutyCycleSim.hpp"
 
 #include <memory>
 #include <stdexcept>
 
-#include <hal/simulation/DutyCycleData.h>
+#include "wpi/hal/simulation/DutyCycleData.h"
 
-#include "frc/DutyCycle.h"
+#include "wpi/hardware/rotation/DutyCycle.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/ElevatorSim.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/simulation/ElevatorSim.h"
+#include "wpi/simulation/ElevatorSim.hpp"
 
-#include <wpi/MathExtras.h>
+#include "wpi/util/MathExtras.hpp"
 
-#include "frc/RobotController.h"
-#include "frc/system/NumericalIntegration.h"
-#include "frc/system/plant/LinearSystemId.h"
+#include "wpi/system/RobotController.hpp"
+#include "wpi/math/system/NumericalIntegration.hpp"
+#include "wpi/math/system/plant/LinearSystemId.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/EncoderSim.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 "frc/simulation/EncoderSim.h"
+#include "wpi/simulation/EncoderSim.hpp"
 
 #include <memory>
 #include <stdexcept>
 
-#include <hal/simulation/EncoderData.h>
+#include "wpi/hal/simulation/EncoderData.h"
 
-#include "frc/Encoder.h"
+#include "wpi/hardware/rotation/Encoder.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/FlywheelSim.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/simulation/FlywheelSim.h"
+#include "wpi/simulation/FlywheelSim.hpp"
 
-#include <wpi/MathExtras.h>
+#include "wpi/util/MathExtras.hpp"
 
-#include "frc/RobotController.h"
+#include "wpi/system/RobotController.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/GamepadSim.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 "frc/simulation/GamepadSim.h"
+#include "wpi/simulation/GamepadSim.hpp"
 
-#include "frc/Gamepad.h"
+#include "wpi/driverstation/Gamepad.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/GenericHIDSim.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/simulation/GenericHIDSim.h"
+#include "wpi/simulation/GenericHIDSim.hpp"
 
-#include "frc/DriverStation.h"
-#include "frc/GenericHID.h"
-#include "frc/simulation/DriverStationSim.h"
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/driverstation/GenericHID.hpp"
+#include "wpi/simulation/DriverStationSim.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/JoystickSim.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/JoystickSim.h"
+#include "wpi/simulation/JoystickSim.hpp"
 
-#include "frc/Joystick.h"
-#include "frc/simulation/GenericHIDSim.h"
+#include "wpi/driverstation/Joystick.hpp"
+#include "wpi/simulation/GenericHIDSim.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/PWMMotorControllerSim.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/simulation/PWMMotorControllerSim.h"
+#include "wpi/simulation/PWMMotorControllerSim.hpp"
 
-#include <hal/SimDevice.h>
-#include <units/length.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/units/length.hpp"
 
-#include "frc/simulation/SimDeviceSim.h"
+#include "wpi/simulation/SimDeviceSim.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/PWMSim.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 "frc/simulation/PWMSim.h"
+#include "wpi/simulation/PWMSim.hpp"
 
 #include <memory>
 
-#include <hal/simulation/PWMData.h>
+#include "wpi/hal/simulation/PWMData.h"
 
-#include "frc/PWM.h"
-#include "frc/motorcontrol/PWMMotorController.h"
+#include "wpi/hardware/discrete/PWM.hpp"
+#include "wpi/hardware/motor/PWMMotorController.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/PneumaticsBaseSim.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 "frc/simulation/PneumaticsBaseSim.h"
+#include "wpi/simulation/PneumaticsBaseSim.hpp"
 
 #include <memory>
 
-#include "frc/Errors.h"
-#include "frc/PneumaticsModuleType.h"
-#include "frc/simulation/CTREPCMSim.h"
-#include "frc/simulation/REVPHSim.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
+#include "wpi/simulation/CTREPCMSim.hpp"
+#include "wpi/simulation/REVPHSim.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/PowerDistributionSim.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/simulation/PowerDistributionSim.h"
+#include "wpi/simulation/PowerDistributionSim.hpp"
 
 #include <memory>
 
-#include <hal/simulation/PowerDistributionData.h>
+#include "wpi/hal/simulation/PowerDistributionData.h"
 
-#include "frc/PowerDistribution.h"
+#include "wpi/hardware/power/PowerDistribution.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/REVPHSim.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/simulation/REVPHSim.h"
+#include "wpi/simulation/REVPHSim.hpp"
 
 #include <memory>
 
-#include <hal/simulation/REVPHData.h>
+#include "wpi/hal/simulation/REVPHData.h"
 
-#include "frc/SensorUtil.h"
+#include "wpi/util/SensorUtil.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/RoboRioSim.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/simulation/RoboRioSim.h"
+#include "wpi/simulation/RoboRioSim.hpp"
 
 #include <memory>
 #include <string>
 
-#include <hal/simulation/RoboRioData.h>
+#include "wpi/hal/simulation/RoboRioData.h"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/SendableChooserSim.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/simulation/SendableChooserSim.h"
+#include "wpi/simulation/SendableChooserSim.hpp"
 
 using namespace frc::sim;
 

wpilibc/src/main/native/cpp/simulation/SharpIRSim.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/simulation/SharpIRSim.h"
+#include "wpi/simulation/SharpIRSim.hpp"
 
-#include <hal/SimDevice.h>
-#include <units/length.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/units/length.hpp"
 
-#include "frc/simulation/SimDeviceSim.h"
+#include "wpi/simulation/SimDeviceSim.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/simulation/SimDeviceSim.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 "frc/simulation/SimDeviceSim.h"
+#include "wpi/simulation/SimDeviceSim.hpp"
 
 #include <string>
 #include <vector>
 
 #include <fmt/format.h>
-#include <hal/SimDevice.h>
-#include <hal/simulation/SimDeviceData.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/SimHooks.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 "frc/simulation/SimHooks.h"
+#include "wpi/simulation/SimHooks.hpp"
 
-#include <hal/simulation/MockHooks.h>
+#include "wpi/hal/simulation/MockHooks.h"
 
 namespace frc::sim {
 

wpilibc/src/main/native/cpp/simulation/SingleJointedArmSim.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/simulation/SingleJointedArmSim.h"
+#include "wpi/simulation/SingleJointedArmSim.hpp"
 
 #include <cmath>
 
-#include <units/voltage.h>
-#include <wpi/MathExtras.h>
+#include "wpi/units/voltage.hpp"
+#include "wpi/util/MathExtras.hpp"
 
-#include "frc/RobotController.h"
-#include "frc/system/NumericalIntegration.h"
-#include "frc/system/plant/LinearSystemId.h"
+#include "wpi/system/RobotController.hpp"
+#include "wpi/math/system/NumericalIntegration.hpp"
+#include "wpi/math/system/plant/LinearSystemId.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/simulation/SolenoidSim.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/simulation/SolenoidSim.h"
+#include "wpi/simulation/SolenoidSim.hpp"
 
 #include <memory>
 #include <utility>
 
-#include "frc/PneumaticsBase.h"
+#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
 
 using namespace frc;
 using namespace frc::sim;

wpilibc/src/main/native/cpp/smartdashboard/Field2d.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 "frc/smartdashboard/Field2d.h"
+#include "wpi/smartdashboard/Field2d.hpp"
 
 #include <memory>
 #include <utility>
 
-#include <networktables/DoubleArrayTopic.h>
-#include <networktables/NTSendableBuilder.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/nt/DoubleArrayTopic.hpp"
+#include "wpi/nt/NTSendableBuilder.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/smartdashboard/FieldObject2d.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/smartdashboard/FieldObject2d.h"
+#include "wpi/smartdashboard/FieldObject2d.hpp"
 
 #include <utility>
 #include <vector>
 
-#include "frc/trajectory/Trajectory.h"
+#include "wpi/math/trajectory/Trajectory.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/smartdashboard/ListenerExecutor.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/smartdashboard/ListenerExecutor.h"
+#include "wpi/smartdashboard/ListenerExecutor.hpp"
 
 #include <utility>
 

wpilibc/src/main/native/cpp/smartdashboard/Mechanism2d.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/smartdashboard/Mechanism2d.h"
+#include "wpi/smartdashboard/Mechanism2d.hpp"
 
 #include <memory>
 #include <string_view>
 
-#include <networktables/NTSendableBuilder.h>
+#include "wpi/nt/NTSendableBuilder.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/smartdashboard/MechanismLigament2d.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/MechanismLigament2d.h"
+#include "wpi/smartdashboard/MechanismLigament2d.hpp"
 
 #include <cstdio>
 #include <memory>
 
-#include <wpi/StringExtras.h>
-#include <wpi/json.h>
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/smartdashboard/MechanismObject2d.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/smartdashboard/MechanismObject2d.h"
+#include "wpi/smartdashboard/MechanismObject2d.hpp"
 
 #include <string>
 

wpilibc/src/main/native/cpp/smartdashboard/MechanismRoot2d.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 "frc/smartdashboard/MechanismRoot2d.h"
+#include "wpi/smartdashboard/MechanismRoot2d.hpp"
 
-#include "frc/util/Color8Bit.h"
+#include "wpi/util/Color8Bit.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/smartdashboard/SendableBuilderImpl.cpp

@@ -2,25 +2,25 @@
 // 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/SendableBuilderImpl.h"
+#include "wpi/smartdashboard/SendableBuilderImpl.hpp"
 
 #include <memory>
 #include <string>
 #include <utility>
 
-#include <networktables/BooleanArrayTopic.h>
-#include <networktables/BooleanTopic.h>
-#include <networktables/DoubleArrayTopic.h>
-#include <networktables/DoubleTopic.h>
-#include <networktables/FloatArrayTopic.h>
-#include <networktables/FloatTopic.h>
-#include <networktables/IntegerArrayTopic.h>
-#include <networktables/IntegerTopic.h>
-#include <networktables/RawTopic.h>
-#include <networktables/StringArrayTopic.h>
-#include <ntcore_cpp.h>
-#include <wpi/SmallVector.h>
-#include <wpi/json.h>
+#include "wpi/nt/BooleanArrayTopic.hpp"
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/nt/DoubleArrayTopic.hpp"
+#include "wpi/nt/DoubleTopic.hpp"
+#include "wpi/nt/FloatArrayTopic.hpp"
+#include "wpi/nt/FloatTopic.hpp"
+#include "wpi/nt/IntegerArrayTopic.hpp"
+#include "wpi/nt/IntegerTopic.hpp"
+#include "wpi/nt/RawTopic.hpp"
+#include "wpi/nt/StringArrayTopic.hpp"
+#include "wpi/nt/ntcore_cpp.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/smartdashboard/SendableChooserBase.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/smartdashboard/SendableChooserBase.h"
+#include "wpi/smartdashboard/SendableChooserBase.hpp"
 
 #include <utility>
 
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp

@@ -2,23 +2,23 @@
 // 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 "wpi/smartdashboard/SmartDashboard.hpp"
 
 #include <memory>
 #include <string>
 #include <utility>
 #include <vector>
 
-#include <hal/UsageReporting.h>
-#include <networktables/NetworkTable.h>
-#include <networktables/NetworkTableInstance.h>
-#include <wpi/StringMap.h>
-#include <wpi/mutex.h>
-#include <wpi/sendable/SendableRegistry.h>
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/nt/NetworkTable.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/sendable/SendableRegistry.hpp"
 
-#include "frc/Errors.h"
-#include "frc/smartdashboard/ListenerExecutor.h"
-#include "frc/smartdashboard/SendableBuilderImpl.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/smartdashboard/ListenerExecutor.hpp"
+#include "wpi/smartdashboard/SendableBuilderImpl.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/sysid/SysIdRoutineLog.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/sysid/SysIdRoutineLog.h"
+#include "wpi/sysid/SysIdRoutineLog.hpp"
 
 #include <string>
 
 #include <fmt/format.h>
 
-#include "frc/DataLogManager.h"
+#include "wpi/system/DataLogManager.hpp"
 
 using namespace frc::sysid;
 

wpilibc/src/main/native/cpp/system/DataLogManager.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 "frc/DataLogManager.h"
+#include "wpi/system/DataLogManager.hpp"
 
-#include <frc/Errors.h>
+#include "wpi/system/Errors.hpp"
 
 #include <algorithm>
 #include <ctime>
@@ -13,21 +13,21 @@
 #include <vector>
 
 #include <fmt/chrono.h>
-#include <hal/UsageReporting.h>
-#include <networktables/NetworkTableInstance.h>
-#include <wpi/SafeThread.h>
-#include <wpi/StringExtras.h>
-#include <wpi/datalog/DataLog.h>
-#include <wpi/datalog/DataLogBackgroundWriter.h>
-#include <wpi/datalog/FileLogger.h>
-#include <wpi/fs.h>
-#include <wpi/print.h>
-#include <wpi/timestamp.h>
+#include "wpi/hal/UsageReporting.h"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/util/SafeThread.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/datalog/DataLog.hpp"
+#include "wpi/datalog/DataLogBackgroundWriter.hpp"
+#include "wpi/datalog/FileLogger.hpp"
+#include "wpi/util/fs.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
-#include "frc/DriverStation.h"
-#include "frc/Filesystem.h"
-#include "frc/RobotBase.h"
-#include "frc/RobotController.h"
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/system/Filesystem.hpp"
+#include "wpi/opmode/RobotBase.hpp"
+#include "wpi/system/RobotController.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/system/Errors.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 "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 #include <string>
 #include <utility>
 
-#include <hal/DriverStation.h>
-#include <hal/HALBase.h>
-#include <wpi/StackTrace.h>
-#include <wpi/fs.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/util/StackTrace.hpp"
+#include "wpi/util/fs.hpp"
 
 using namespace frc;
 
@@ -41,12 +41,12 @@ const char* frc::GetErrorMessage(int32_t* code) {
 #define S(label, offset, message) \
   case err::label:                \
     return message;
-#include "frc/WPIErrors.mac"
+#include "wpi/system/WPIErrors.mac"
 #undef S
 #define S(label, offset, message) \
   case warn::label:               \
     return message;
-#include "frc/WPIWarnings.mac"
+#include "wpi/system/WPIWarnings.mac"
 #undef S
     default:
       return HAL_GetLastError(code);

wpilibc/src/main/native/cpp/system/Filesystem.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/Filesystem.h"
+#include "wpi/system/Filesystem.hpp"
 
 #include <string>
 
-#include <wpi/fs.h>
+#include "wpi/util/fs.hpp"
 
-#include "frc/RobotBase.h"
+#include "wpi/opmode/RobotBase.hpp"
 
 std::string frc::filesystem::GetLaunchDirectory() {
   return fs::current_path().string();

wpilibc/src/main/native/cpp/system/Notifier.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/Notifier.h"
+#include "wpi/system/Notifier.hpp"
 
 #include <utility>
 
 #include <fmt/format.h>
-#include <hal/DriverStation.h>
-#include <hal/Notifier.h>
-#include <hal/Threads.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/Notifier.h"
+#include "wpi/hal/Threads.h"
 
-#include "frc/Errors.h"
-#include "frc/Timer.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/Timer.hpp"
 
 using namespace frc;
 

wpilibc/src/main/native/cpp/system/Resource.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/Resource.h"
+#include "wpi/system/Resource.hpp"
 
 #include <limits>
 #include <memory>
 #include <string>
 #include <vector>
 
-#include <wpi/deprecated.h>
+#include "wpi/util/deprecated.hpp"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 WPI_IGNORE_DEPRECATED
 using namespace frc;

wpilibc/src/main/native/cpp/system/RobotController.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/RobotController.h"
+#include "wpi/system/RobotController.hpp"
 
 #include <functional>
 #include <string>
 
-#include <hal/CAN.h>
-#include <hal/HALBase.h>
-#include <hal/Power.h>
+#include "wpi/hal/CAN.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Power.h"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 using namespace frc;