SCRIPT Run cc include replacements

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;