SCRIPT Run cc include replacements

wpilibc/src/main/native/include/wpi/ExpansionHub.hpp

@@ -7,7 +7,7 @@
 #include <memory>
 #include <string_view>
 
-#include <wpi/mutex.h>
+#include "wpi/util/mutex.hpp"
 
 namespace frc {
 class ExpansionHubServo;

wpilibc/src/main/native/include/wpi/ExpansionHubMotor.hpp

@@ -6,16 +6,16 @@
 
 #include <memory>
 
-#include <networktables/BooleanTopic.h>
-#include <networktables/DoubleTopic.h>
-#include <networktables/IntegerTopic.h>
-#include <units/angle.h>
-#include <units/current.h>
-#include <units/time.h>
-#include <units/voltage.h>
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/nt/DoubleTopic.hpp"
+#include "wpi/nt/IntegerTopic.hpp"
+#include "wpi/units/angle.hpp"
+#include "wpi/units/current.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/units/voltage.hpp"
 
-#include "frc/ExpansionHub.h"
-#include "frc/ExpansionHubPidConstants.h"
+#include "wpi/ExpansionHub.hpp"
+#include "wpi/ExpansionHubPidConstants.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/ExpansionHubPidConstants.hpp

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include <networktables/BooleanTopic.h>
-#include <networktables/DoubleTopic.h>
-#include <networktables/IntegerTopic.h>
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/nt/DoubleTopic.hpp"
+#include "wpi/nt/IntegerTopic.hpp"
 
 namespace frc {
 class ExpansionHubMotor;

wpilibc/src/main/native/include/wpi/ExpansionHubServo.hpp

@@ -6,12 +6,12 @@
 
 #include <memory>
 
-#include <networktables/BooleanTopic.h>
-#include <networktables/IntegerTopic.h>
-#include <units/angle.h>
-#include <units/time.h>
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/nt/IntegerTopic.hpp"
+#include "wpi/units/angle.hpp"
+#include "wpi/units/time.hpp"
 
-#include "frc/ExpansionHub.h"
+#include "wpi/ExpansionHub.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/counter/Tachometer.hpp

@@ -6,15 +6,15 @@
 
 #include <memory>
 
-#include <hal/Counter.h>
-#include <hal/Types.h>
-#include <units/angular_velocity.h>
-#include <units/frequency.h>
-#include <units/time.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/Counter.h"
+#include "wpi/hal/Types.h"
+#include "wpi/units/angular_velocity.hpp"
+#include "wpi/units/frequency.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "EdgeConfiguration.h"
+#include "EdgeConfiguration.hpp"
 
 namespace frc {
 /**

wpilibc/src/main/native/include/wpi/counter/UpDownCounter.hpp

@@ -6,12 +6,12 @@
 
 #include <memory>
 
-#include <hal/Counter.h>
-#include <hal/Types.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/Counter.h"
+#include "wpi/hal/Types.h"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "EdgeConfiguration.h"
+#include "EdgeConfiguration.hpp"
 
 namespace frc {
 /** Up Down Counter.

wpilibc/src/main/native/include/wpi/drive/DifferentialDrive.hpp

@@ -7,11 +7,11 @@
 #include <functional>
 #include <string>
 
-#include <wpi/deprecated.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/util/deprecated.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/drive/RobotDriveBase.h"
+#include "wpi/drive/RobotDriveBase.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/drive/MecanumDrive.hpp

@@ -8,13 +8,13 @@
 #include <memory>
 #include <string>
 
-#include <units/angle.h>
-#include <wpi/deprecated.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/units/angle.hpp"
+#include "wpi/util/deprecated.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/drive/RobotDriveBase.h"
-#include "frc/geometry/Rotation2d.h"
+#include "wpi/drive/RobotDriveBase.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/drive/RobotDriveBase.hpp

@@ -8,7 +8,7 @@
 #include <span>
 #include <string>
 
-#include "frc/MotorSafety.h"
+#include "wpi/hardware/motor/MotorSafety.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/driverstation/DSControlWord.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <hal/DriverStationTypes.h>
+#include "wpi/hal/DriverStationTypes.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/driverstation/DriverStation.hpp

@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include <frc/geometry/Rotation2d.h>
+#include "wpi/math/geometry/Rotation2d.hpp"
 
 #include <optional>
 #include <string>
 
-#include <hal/DriverStationTypes.h>
-#include <units/time.h>
-#include <wpi/Synchronization.h>
+#include "wpi/hal/DriverStationTypes.h"
+#include "wpi/units/time.hpp"
+#include "wpi/util/Synchronization.h"
 
 namespace wpi::log {
 class DataLog;

wpilibc/src/main/native/include/wpi/driverstation/Gamepad.hpp

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/GenericHID.h"
+#include "wpi/driverstation/GenericHID.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/driverstation/GenericHID.hpp

@@ -8,7 +8,7 @@
 
 #include <string>
 
-#include "frc/DriverStation.h"
+#include "wpi/driverstation/DriverStation.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/driverstation/Joystick.hpp

@@ -6,9 +6,9 @@
 
 #include <array>
 
-#include <units/angle.h>
+#include "wpi/units/angle.hpp"
 
-#include "frc/GenericHID.h"
+#include "wpi/driverstation/GenericHID.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/event/BooleanEvent.hpp

@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include <frc/filter/Debouncer.h>
+#include "wpi/math/filter/Debouncer.hpp"
 
 #include <functional>
 #include <memory>
 
-#include <units/time.h>
-#include <wpi/FunctionExtras.h>
+#include "wpi/units/time.hpp"
+#include "wpi/util/FunctionExtras.hpp"
 
-#include "EventLoop.h"
+#include "EventLoop.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/event/EventLoop.hpp

@@ -7,7 +7,7 @@
 #include <functional>
 #include <vector>
 
-#include <wpi/FunctionExtras.h>
+#include "wpi/util/FunctionExtras.hpp"
 
 namespace frc {
 /** A declarative way to bind a set of actions to a loop and execute them when

wpilibc/src/main/native/include/wpi/event/NetworkBooleanEvent.hpp

@@ -7,7 +7,7 @@
 #include <memory>
 #include <string_view>
 
-#include "BooleanEvent.h"
+#include "wpi/event/BooleanEvent.hpp"
 
 namespace nt {
 class BooleanSubscriber;

wpilibc/src/main/native/include/wpi/hardware/accelerometer/ADXL345_I2C.hpp

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <hal/SimDevice.h>
-#include <networktables/NTSendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/nt/NTSendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/I2C.h"
+#include "wpi/hardware/bus/I2C.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/accelerometer/AnalogAccelerometer.hpp

@@ -6,10 +6,10 @@
 
 #include <memory>
 
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/AnalogInput.h"
+#include "wpi/hardware/discrete/AnalogInput.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/bus/CAN.hpp

@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include <hal/CANAPI.h>
+#include "wpi/hal/CANAPI.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/bus/I2C.hpp

@@ -6,8 +6,8 @@
 
 #include <stdint.h>
 
-#include <hal/I2C.h>
-#include <hal/I2CTypes.h>
+#include "wpi/hal/I2C.h"
+#include "wpi/hal/I2CTypes.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/bus/SerialPort.hpp

@@ -7,9 +7,9 @@
 #include <string>
 #include <string_view>
 
-#include <hal/SerialPort.h>
-#include <hal/Types.h>
-#include <units/time.h>
+#include "wpi/hal/SerialPort.h"
+#include "wpi/hal/Types.h"
+#include "wpi/units/time.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/discrete/AnalogInput.hpp

@@ -6,10 +6,10 @@
 
 #include <stdint.h>
 
-#include <hal/AnalogInput.h>
-#include <hal/Types.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/AnalogInput.h"
+#include "wpi/hal/Types.h"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/discrete/CounterBase.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <units/time.h>
+#include "wpi/units/time.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/discrete/DigitalInput.hpp

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include <hal/DIO.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/DIO.h"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/discrete/DigitalOutput.hpp

@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <hal/DIO.h>
-#include <hal/Types.h>
-#include <units/time.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/DIO.h"
+#include "wpi/hal/Types.h"
+#include "wpi/units/time.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/discrete/PWM.hpp

@@ -6,11 +6,11 @@
 
 #include <stdint.h>
 
-#include <hal/PWM.h>
-#include <hal/Types.h>
-#include <units/time.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/PWM.h"
+#include "wpi/hal/Types.h"
+#include "wpi/units/time.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 class AddressableLED;

wpilibc/src/main/native/include/wpi/hardware/imu/OnboardIMU.hpp

@@ -3,13 +3,13 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #pragma once
-#include <frc/geometry/Quaternion.h>
-#include <frc/geometry/Rotation2d.h>
-#include <frc/geometry/Rotation3d.h>
+#include "wpi/math/geometry/Quaternion.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/math/geometry/Rotation3d.hpp"
 
-#include <units/acceleration.h>
-#include <units/angle.h>
-#include <units/angular_velocity.h>
+#include "wpi/units/acceleration.hpp"
+#include "wpi/units/angle.hpp"
+#include "wpi/units/angular_velocity.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/led/AddressableLED.hpp

@@ -7,13 +7,13 @@
 #include <initializer_list>
 #include <span>
 
-#include <hal/AddressableLED.h>
-#include <hal/AddressableLEDTypes.h>
-#include <hal/Types.h>
-#include <units/time.h>
+#include "wpi/hal/AddressableLED.h"
+#include "wpi/hal/AddressableLEDTypes.h"
+#include "wpi/hal/Types.h"
+#include "wpi/units/time.hpp"
 
-#include "util/Color.h"
-#include "util/Color8Bit.h"
+#include "wpi/util/Color.hpp"
+#include "wpi/util/Color8Bit.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/led/LEDPattern.hpp

@@ -8,13 +8,13 @@
 #include <span>
 #include <utility>
 
-#include <units/frequency.h>
-#include <units/length.h>
-#include <units/time.h>
-#include <units/velocity.h>
+#include "wpi/units/frequency.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/units/velocity.hpp"
 
-#include "frc/AddressableLED.h"
-#include "util/Color.h"
+#include "wpi/hardware/led/AddressableLED.hpp"
+#include "wpi/util/Color.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/motor/MotorController.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <units/voltage.h>
+#include "wpi/units/voltage.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/motor/MotorControllerGroup.hpp

@@ -7,11 +7,11 @@
 #include <functional>
 #include <vector>
 
-#include <wpi/deprecated.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/util/deprecated.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/motorcontrol/MotorController.h"
+#include "wpi/hardware/motor/MotorController.hpp"
 
 WPI_IGNORE_DEPRECATED
 

wpilibc/src/main/native/include/wpi/hardware/motor/MotorSafety.hpp

@@ -6,10 +6,10 @@
 
 #include <string>
 
-#include <units/time.h>
-#include <wpi/mutex.h>
+#include "wpi/units/time.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "frc/Timer.h"
+#include "wpi/system/Timer.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/motor/PWMMotorController.hpp

@@ -12,15 +12,15 @@
 #include <utility>
 #include <vector>
 
-#include <hal/SimDevice.h>
-#include <units/voltage.h>
-#include <wpi/deprecated.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/units/voltage.hpp"
+#include "wpi/util/deprecated.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/MotorSafety.h"
-#include "frc/PWM.h"
-#include "frc/motorcontrol/MotorController.h"
+#include "wpi/hardware/motor/MotorSafety.hpp"
+#include "wpi/hardware/discrete/PWM.hpp"
+#include "wpi/hardware/motor/MotorController.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/pneumatic/Compressor.hpp

@@ -6,14 +6,14 @@
 
 #include <memory>
 
-#include <hal/Types.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/Types.h"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/CompressorConfigType.h"
-#include "frc/PneumaticsBase.h"
-#include "frc/PneumaticsModuleType.h"
-#include "frc/SensorUtil.h"
+#include "wpi/hardware/pneumatic/CompressorConfigType.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
+#include "wpi/util/SensorUtil.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/pneumatic/DoubleSolenoid.hpp

@@ -6,12 +6,12 @@
 
 #include <memory>
 
-#include <hal/Types.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/Types.h"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/PneumaticsBase.h"
-#include "frc/PneumaticsModuleType.h"
+#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticHub.hpp

@@ -6,12 +6,12 @@
 
 #include <memory>
 
-#include <hal/Types.h>
-#include <units/pressure.h>
-#include <wpi/DenseMap.h>
-#include <wpi/mutex.h>
+#include "wpi/hal/Types.h"
+#include "wpi/units/pressure.hpp"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "PneumaticsBase.h"
+#include "PneumaticsBase.hpp"
 
 namespace frc {
 /** Module class for controlling a REV Robotics Pneumatic Hub. */

wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsBase.hpp

@@ -7,13 +7,13 @@
 #include <memory>
 #include <string_view>
 
-#include <units/current.h>
-#include <units/pressure.h>
-#include <units/time.h>
-#include <units/voltage.h>
+#include "wpi/units/current.hpp"
+#include "wpi/units/pressure.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/units/voltage.hpp"
 
-#include "frc/CompressorConfigType.h"
-#include "frc/PneumaticsModuleType.h"
+#include "wpi/hardware/pneumatic/CompressorConfigType.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
 
 namespace frc {
 class Solenoid;

wpilibc/src/main/native/include/wpi/hardware/pneumatic/PneumaticsControlModule.hpp

@@ -6,11 +6,11 @@
 
 #include <memory>
 
-#include <hal/Types.h>
-#include <wpi/DenseMap.h>
-#include <wpi/mutex.h>
+#include "wpi/hal/Types.h"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "PneumaticsBase.h"
+#include "PneumaticsBase.hpp"
 
 namespace frc {
 /** Module class for controlling a Cross The Road Electronics Pneumatics Control

wpilibc/src/main/native/include/wpi/hardware/pneumatic/Solenoid.hpp

@@ -6,13 +6,13 @@
 
 #include <memory>
 
-#include <hal/Types.h>
-#include <units/time.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/Types.h"
+#include "wpi/units/time.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/PneumaticsBase.h"
-#include "frc/PneumaticsModuleType.h"
+#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/power/PowerDistribution.hpp

@@ -6,10 +6,10 @@
 
 #include <vector>
 
-#include <hal/PowerDistribution.h>
-#include <hal/Types.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/PowerDistribution.h"
+#include "wpi/hal/Types.h"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/range/SharpIR.hpp

@@ -4,12 +4,12 @@
 
 #pragma once
 
-#include <hal/SimDevice.h>
-#include <units/length.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/units/length.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/AnalogInput.h"
+#include "wpi/hardware/discrete/AnalogInput.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogEncoder.hpp

@@ -6,10 +6,10 @@
 
 #include <memory>
 
-#include <hal/SimDevice.h>
-#include <hal/Types.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/Types.h"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 class AnalogInput;

wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogPotentiometer.hpp

@@ -6,10 +6,10 @@
 
 #include <memory>
 
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/AnalogInput.h"
+#include "wpi/hardware/discrete/AnalogInput.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/hardware/rotation/DutyCycle.hpp

@@ -6,12 +6,12 @@
 
 #include <memory>
 
-#include <hal/DutyCycle.h>
-#include <hal/Types.h>
-#include <units/frequency.h>
-#include <units/time.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/DutyCycle.h"
+#include "wpi/hal/Types.h"
+#include "wpi/units/frequency.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 /**

wpilibc/src/main/native/include/wpi/hardware/rotation/DutyCycleEncoder.hpp

@@ -6,12 +6,12 @@
 
 #include <memory>
 
-#include <hal/SimDevice.h>
-#include <hal/Types.h>
-#include <units/frequency.h>
-#include <units/time.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/Types.h"
+#include "wpi/units/frequency.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 class DutyCycle;

wpilibc/src/main/native/include/wpi/hardware/rotation/Encoder.hpp

@@ -6,12 +6,12 @@
 
 #include <memory>
 
-#include <hal/Encoder.h>
-#include <hal/Types.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/hal/Encoder.h"
+#include "wpi/hal/Types.h"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/CounterBase.h"
+#include "wpi/hardware/discrete/CounterBase.hpp"
 
 namespace frc {
 /**

wpilibc/src/main/native/include/wpi/opmode/IterativeRobotBase.hpp

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include <units/time.h>
+#include "wpi/units/time.hpp"
 
-#include "frc/RobotBase.h"
-#include "frc/Watchdog.h"
+#include "wpi/opmode/RobotBase.hpp"
+#include "wpi/system/Watchdog.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/opmode/RobotBase.hpp

@@ -7,17 +7,17 @@
 #include <chrono>
 #include <thread>
 
-#include <hal/DriverStation.h>
-#include <hal/HALBase.h>
-#include <hal/Main.h>
-#include <networktables/NetworkTable.h>
-#include <wpi/RuntimeCheck.h>
-#include <wpi/condition_variable.h>
-#include <wpi/mutex.h>
-#include <wpi/string.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Main.h"
+#include "wpi/nt/NetworkTable.hpp"
+#include "wpi/util/RuntimeCheck.h"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/string.h"
 
-#include "frc/Errors.h"
-#include "frc/RuntimeType.h"
+#include "wpi/system/Errors.hpp"
+#include "wpi/system/RuntimeType.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/opmode/TimedRobot.hpp

@@ -9,15 +9,15 @@
 #include <utility>
 #include <vector>
 
-#include <hal/Notifier.h>
-#include <hal/Types.h>
-#include <units/frequency.h>
-#include <units/math.h>
-#include <units/time.h>
-#include <wpi/priority_queue.h>
+#include "wpi/hal/Notifier.h"
+#include "wpi/hal/Types.h"
+#include "wpi/units/frequency.hpp"
+#include "wpi/units/math.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/priority_queue.hpp"
 
-#include "frc/IterativeRobotBase.h"
-#include "frc/RobotController.h"
+#include "wpi/opmode/IterativeRobotBase.hpp"
+#include "wpi/system/RobotController.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/opmode/TimesliceRobot.hpp

@@ -6,9 +6,9 @@
 
 #include <functional>
 
-#include <units/time.h>
+#include "wpi/units/time.hpp"
 
-#include "frc/TimedRobot.h"
+#include "wpi/opmode/TimedRobot.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/ADXL345Sim.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <hal/SimDevice.h>
+#include "wpi/hal/SimDevice.h"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/AddressableLEDSim.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/simulation/CallbackStore.hpp"
 
 struct HAL_AddressableLEDData;
 

wpilibc/src/main/native/include/wpi/simulation/AnalogEncoderSim.hpp

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include <hal/SimDevice.h>
-#include <units/angle.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/units/angle.hpp"
 
-#include "frc/geometry/Rotation2d.h"
+#include "wpi/math/geometry/Rotation2d.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/AnalogInputSim.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/BatterySim.hpp

@@ -8,9 +8,9 @@
 #include <numeric>
 #include <span>
 
-#include <units/current.h>
-#include <units/impedance.h>
-#include <units/voltage.h>
+#include "wpi/units/current.hpp"
+#include "wpi/units/impedance.hpp"
+#include "wpi/units/voltage.hpp"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/CTREPCMSim.hpp

@@ -6,9 +6,9 @@
 
 #include <memory>
 
-#include "frc/PneumaticsBase.h"
-#include "frc/simulation/CallbackStore.h"
-#include "frc/simulation/PneumaticsBaseSim.h"
+#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
+#include "wpi/simulation/CallbackStore.hpp"
+#include "wpi/simulation/PneumaticsBaseSim.hpp"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/CallbackStore.hpp

@@ -7,7 +7,7 @@
 #include <functional>
 #include <string_view>
 
-#include <hal/Value.h>
+#include "wpi/hal/Value.h"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/DCMotorSim.hpp

@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include <units/angle.h>
-#include <units/angular_acceleration.h>
-#include <units/angular_velocity.h>
-#include <units/moment_of_inertia.h>
-#include <units/torque.h>
+#include "wpi/units/angle.hpp"
+#include "wpi/units/angular_acceleration.hpp"
+#include "wpi/units/angular_velocity.hpp"
+#include "wpi/units/moment_of_inertia.hpp"
+#include "wpi/units/torque.hpp"
 
-#include "frc/simulation/LinearSystemSim.h"
-#include "frc/system/LinearSystem.h"
-#include "frc/system/plant/DCMotor.h"
+#include "wpi/simulation/LinearSystemSim.hpp"
+#include "wpi/math/system/LinearSystem.hpp"
+#include "wpi/math/system/plant/DCMotor.hpp"
 
 namespace frc::sim {
 /**

wpilibc/src/main/native/include/wpi/simulation/DIOSim.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/DifferentialDrivetrainSim.hpp

@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include <frc/EigenCore.h>
-#include <frc/kinematics/DifferentialDriveKinematics.h>
-#include <frc/system/LinearSystem.h>
-#include <frc/system/plant/DCMotor.h>
+#include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/math/kinematics/DifferentialDriveKinematics.hpp"
+#include "wpi/math/system/LinearSystem.hpp"
+#include "wpi/math/system/plant/DCMotor.hpp"
 
-#include <units/length.h>
-#include <units/moment_of_inertia.h>
-#include <units/time.h>
-#include <units/voltage.h>
+#include "wpi/units/length.hpp"
+#include "wpi/units/moment_of_inertia.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/units/voltage.hpp"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/DigitalPWMSim.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/DoubleSolenoidSim.hpp

@@ -6,9 +6,9 @@
 
 #include <memory>
 
-#include "frc/DoubleSolenoid.h"
-#include "frc/PneumaticsModuleType.h"
-#include "frc/simulation/PneumaticsBaseSim.h"
+#include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
+#include "wpi/simulation/PneumaticsBaseSim.hpp"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/DriverStationSim.hpp

@@ -6,10 +6,10 @@
 
 #include <memory>
 
-#include <hal/DriverStationTypes.h>
+#include "wpi/hal/DriverStationTypes.h"
 
-#include "frc/DriverStation.h"
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/DutyCycleEncoderSim.hpp

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include <hal/SimDevice.h>
-#include <units/angle.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/units/angle.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/DutyCycleSim.hpp

@@ -6,9 +6,9 @@
 
 #include <memory>
 
-#include <units/frequency.h>
+#include "wpi/units/frequency.hpp"
 
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/ElevatorSim.hpp

@@ -6,12 +6,12 @@
 
 #include <array>
 
-#include <units/length.h>
-#include <units/mass.h>
-#include <units/velocity.h>
+#include "wpi/units/length.hpp"
+#include "wpi/units/mass.hpp"
+#include "wpi/units/velocity.hpp"
 
-#include "frc/simulation/LinearSystemSim.h"
-#include "frc/system/plant/DCMotor.h"
+#include "wpi/simulation/LinearSystemSim.hpp"
+#include "wpi/math/system/plant/DCMotor.hpp"
 
 namespace frc::sim {
 /**

wpilibc/src/main/native/include/wpi/simulation/EncoderSim.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/FlywheelSim.hpp

@@ -4,14 +4,14 @@
 
 #pragma once
 
-#include <units/angular_acceleration.h>
-#include <units/angular_velocity.h>
-#include <units/moment_of_inertia.h>
-#include <units/torque.h>
+#include "wpi/units/angular_acceleration.hpp"
+#include "wpi/units/angular_velocity.hpp"
+#include "wpi/units/moment_of_inertia.hpp"
+#include "wpi/units/torque.hpp"
 
-#include "frc/simulation/LinearSystemSim.h"
-#include "frc/system/LinearSystem.h"
-#include "frc/system/plant/DCMotor.h"
+#include "wpi/simulation/LinearSystemSim.hpp"
+#include "wpi/math/system/LinearSystem.hpp"
+#include "wpi/math/system/plant/DCMotor.hpp"
 
 namespace frc::sim {
 /**

wpilibc/src/main/native/include/wpi/simulation/GamepadSim.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "frc/simulation/GenericHIDSim.h"
+#include "wpi/simulation/GenericHIDSim.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/GenericHIDSim.hpp

@@ -6,8 +6,8 @@
 
 #include <stdint.h>
 
-#include "frc/DriverStation.h"
-#include "frc/GenericHID.h"
+#include "wpi/driverstation/DriverStation.hpp"
+#include "wpi/driverstation/GenericHID.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/JoystickSim.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "frc/simulation/GenericHIDSim.h"
+#include "wpi/simulation/GenericHIDSim.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/LinearSystemSim.hpp

@@ -6,12 +6,12 @@
 
 #include <array>
 
-#include <units/current.h>
-#include <units/time.h>
+#include "wpi/units/current.hpp"
+#include "wpi/units/time.hpp"
 
-#include "frc/EigenCore.h"
-#include "frc/StateSpaceUtil.h"
-#include "frc/system/LinearSystem.h"
+#include "wpi/math/linalg/EigenCore.hpp"
+#include "wpi/math/util/StateSpaceUtil.hpp"
+#include "wpi/math/system/LinearSystem.hpp"
 
 namespace frc::sim {
 /**

wpilibc/src/main/native/include/wpi/simulation/PWMMotorControllerSim.hpp

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include <hal/SimDevice.h>
-#include <units/length.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/units/length.hpp"
 
-#include "frc/motorcontrol/PWMMotorController.h"
+#include "wpi/hardware/motor/PWMMotorController.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/PWMSim.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/PneumaticsBaseSim.hpp

@@ -6,9 +6,9 @@
 
 #include <memory>
 
-#include "frc/PneumaticsBase.h"
-#include "frc/PneumaticsModuleType.h"
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
+#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
+#include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/PowerDistributionSim.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/REVPHSim.hpp

@@ -6,9 +6,9 @@
 
 #include <memory>
 
-#include "frc/PneumaticsBase.h"
-#include "frc/simulation/CallbackStore.h"
-#include "frc/simulation/PneumaticsBaseSim.h"
+#include "wpi/hardware/pneumatic/PneumaticsBase.hpp"
+#include "wpi/simulation/CallbackStore.hpp"
+#include "wpi/simulation/PneumaticsBaseSim.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/RoboRioSim.hpp

@@ -7,12 +7,12 @@
 #include <memory>
 #include <string>
 
-#include <units/current.h>
-#include <units/temperature.h>
-#include <units/voltage.h>
+#include "wpi/units/current.hpp"
+#include "wpi/units/temperature.hpp"
+#include "wpi/units/voltage.hpp"
 
-#include "frc/RobotController.h"
-#include "frc/simulation/CallbackStore.h"
+#include "wpi/system/RobotController.hpp"
+#include "wpi/simulation/CallbackStore.hpp"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/SendableChooserSim.hpp

@@ -6,10 +6,10 @@
 
 #include <string_view>
 
-#include <networktables/NetworkTableInstance.h>
-#include <networktables/StringTopic.h>
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/StringTopic.hpp"
 
-#include "frc/RobotBase.h"
+#include "wpi/opmode/RobotBase.hpp"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/SharpIRSim.hpp

@@ -4,10 +4,10 @@
 
 #pragma once
 
-#include <hal/SimDevice.h>
-#include <units/length.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/units/length.hpp"
 
-#include "frc/SharpIR.h"
+#include "wpi/hardware/range/SharpIR.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/simulation/SimDeviceSim.hpp

@@ -8,8 +8,8 @@
 #include <string>
 #include <vector>
 
-#include <hal/SimDevice.h>
-#include <hal/simulation/SimDeviceData.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/SimHooks.hpp

@@ -6,8 +6,8 @@
 
 #include <stdint.h>
 
-#include <hal/HALBase.h>
-#include <units/time.h>
+#include "wpi/hal/HALBase.h"
+#include "wpi/units/time.hpp"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/simulation/SingleJointedArmSim.hpp

@@ -6,13 +6,13 @@
 
 #include <array>
 
-#include <units/angle.h>
-#include <units/length.h>
-#include <units/mass.h>
-#include <units/moment_of_inertia.h>
+#include "wpi/units/angle.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/units/mass.hpp"
+#include "wpi/units/moment_of_inertia.hpp"
 
-#include "frc/simulation/LinearSystemSim.h"
-#include "frc/system/plant/DCMotor.h"
+#include "wpi/simulation/LinearSystemSim.hpp"
+#include "wpi/math/system/plant/DCMotor.hpp"
 
 namespace frc::sim {
 /**

wpilibc/src/main/native/include/wpi/simulation/SolenoidSim.hpp

@@ -6,8 +6,8 @@
 
 #include <memory>
 
-#include "frc/PneumaticsModuleType.h"
-#include "frc/simulation/PneumaticsBaseSim.h"
+#include "wpi/hardware/pneumatic/PneumaticsModuleType.hpp"
+#include "wpi/simulation/PneumaticsBaseSim.hpp"
 
 namespace frc::sim {
 

wpilibc/src/main/native/include/wpi/smartdashboard/Field2d.hpp

@@ -8,16 +8,16 @@
 #include <string_view>
 #include <vector>
 
-#include <networktables/NTSendable.h>
-#include <networktables/NetworkTable.h>
-#include <networktables/NetworkTableEntry.h>
-#include <units/length.h>
-#include <wpi/mutex.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/nt/NTSendable.hpp"
+#include "wpi/nt/NetworkTable.hpp"
+#include "wpi/nt/NetworkTableEntry.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/geometry/Pose2d.h"
-#include "frc/geometry/Rotation2d.h"
-#include "frc/smartdashboard/FieldObject2d.h"
+#include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/smartdashboard/FieldObject2d.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/smartdashboard/FieldObject2d.hpp

@@ -10,13 +10,13 @@
 #include <string_view>
 #include <vector>
 
-#include <networktables/DoubleArrayTopic.h>
-#include <units/length.h>
-#include <wpi/SmallVector.h>
-#include <wpi/mutex.h>
+#include "wpi/nt/DoubleArrayTopic.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "frc/geometry/Pose2d.h"
-#include "frc/geometry/Rotation2d.h"
+#include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/smartdashboard/ListenerExecutor.hpp

@@ -7,7 +7,7 @@
 #include <functional>
 #include <vector>
 
-#include <wpi/mutex.h>
+#include "wpi/util/mutex.hpp"
 
 namespace frc::detail {
 /**

wpilibc/src/main/native/include/wpi/smartdashboard/Mechanism2d.hpp

@@ -7,16 +7,16 @@
 #include <memory>
 #include <string>
 
-#include <networktables/DoubleArrayTopic.h>
-#include <networktables/NTSendable.h>
-#include <networktables/NetworkTable.h>
-#include <networktables/StringTopic.h>
-#include <wpi/StringMap.h>
-#include <wpi/mutex.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/nt/DoubleArrayTopic.hpp"
+#include "wpi/nt/NTSendable.hpp"
+#include "wpi/nt/NetworkTable.hpp"
+#include "wpi/nt/StringTopic.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
-#include "frc/smartdashboard/MechanismRoot2d.h"
-#include "frc/util/Color8Bit.h"
+#include "wpi/smartdashboard/MechanismRoot2d.hpp"
+#include "wpi/util/Color8Bit.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/smartdashboard/MechanismLigament2d.hpp

@@ -7,12 +7,12 @@
 #include <memory>
 #include <string_view>
 
-#include <networktables/DoubleTopic.h>
-#include <networktables/StringTopic.h>
-#include <units/angle.h>
+#include "wpi/nt/DoubleTopic.hpp"
+#include "wpi/nt/StringTopic.hpp"
+#include "wpi/units/angle.hpp"
 
-#include "frc/smartdashboard/MechanismObject2d.h"
-#include "frc/util/Color8Bit.h"
+#include "wpi/smartdashboard/MechanismObject2d.hpp"
+#include "wpi/util/Color8Bit.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/smartdashboard/MechanismObject2d.hpp

@@ -11,10 +11,10 @@
 #include <string_view>
 #include <utility>
 
-#include <networktables/NetworkTable.h>
-#include <wpi/StringMap.h>
+#include "wpi/nt/NetworkTable.hpp"
+#include "wpi/util/StringMap.hpp"
 
-#include "frc/Errors.h"
+#include "wpi/system/Errors.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/smartdashboard/MechanismRoot2d.hpp

@@ -7,9 +7,9 @@
 #include <memory>
 #include <string_view>
 
-#include <networktables/DoubleTopic.h>
+#include "wpi/nt/DoubleTopic.hpp"
 
-#include "MechanismObject2d.h"
+#include "wpi/smartdashboard/MechanismObject2d.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/smartdashboard/SendableBuilderImpl.hpp

@@ -12,12 +12,12 @@
 #include <utility>
 #include <vector>
 
-#include <networktables/BooleanTopic.h>
-#include <networktables/NTSendableBuilder.h>
-#include <networktables/NetworkTable.h>
-#include <networktables/StringTopic.h>
-#include <wpi/FunctionExtras.h>
-#include <wpi/SmallVector.h>
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/nt/NTSendableBuilder.hpp"
+#include "wpi/nt/NetworkTable.hpp"
+#include "wpi/nt/StringTopic.hpp"
+#include "wpi/util/FunctionExtras.hpp"
+#include "wpi/util/SmallVector.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/smartdashboard/SendableChooser.hpp

@@ -13,10 +13,10 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/StringMap.h>
-#include <wpi/sendable/SendableBuilder.h>
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/sendable/SendableBuilder.hpp"
 
-#include "frc/smartdashboard/SendableChooserBase.h"
+#include "wpi/smartdashboard/SendableChooserBase.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/smartdashboard/SendableChooserBase.hpp

@@ -7,9 +7,9 @@
 #include <atomic>
 #include <string>
 
-#include <wpi/mutex.h>
-#include <wpi/sendable/Sendable.h>
-#include <wpi/sendable/SendableHelper.h>
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/sendable/Sendable.hpp"
+#include "wpi/util/sendable/SendableHelper.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/smartdashboard/SmartDashboard.hpp

@@ -11,8 +11,8 @@
 #include <string_view>
 #include <vector>
 
-#include <networktables/NetworkTableEntry.h>
-#include <networktables/NetworkTableValue.h>
+#include "wpi/nt/NetworkTableEntry.hpp"
+#include "wpi/nt/NetworkTableValue.hpp"
 
 namespace wpi {
 class Sendable;

wpilibc/src/main/native/include/wpi/sysid/SysIdRoutineLog.hpp

@@ -7,15 +7,15 @@
 #include <string>
 #include <string_view>
 
-#include <units/acceleration.h>
-#include <units/angle.h>
-#include <units/angular_acceleration.h>
-#include <units/angular_velocity.h>
-#include <units/current.h>
-#include <units/length.h>
-#include <units/velocity.h>
-#include <units/voltage.h>
-#include <wpi/datalog/DataLog.h>
+#include "wpi/units/acceleration.hpp"
+#include "wpi/units/angle.hpp"
+#include "wpi/units/angular_acceleration.hpp"
+#include "wpi/units/angular_velocity.hpp"
+#include "wpi/units/current.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/units/velocity.hpp"
+#include "wpi/units/voltage.hpp"
+#include "wpi/datalog/DataLog.hpp"
 
 namespace frc::sysid {
 

wpilibc/src/main/native/include/wpi/system/Errors.hpp

@@ -111,13 +111,13 @@ inline RuntimeError MakeError(int32_t status, const char* fileName,
 
 namespace err {
 #define S(label, offset, message) inline constexpr int label = offset;
-#include "frc/WPIErrors.mac"
+#include "wpi/system/WPIErrors.mac"
 #undef S
 }  // namespace err
 
 namespace warn {
 #define S(label, offset, message) inline constexpr int label = offset;
-#include "frc/WPIWarnings.mac"
+#include "wpi/system/WPIWarnings.mac"
 #undef S
 }  // namespace warn
 }  // namespace frc

wpilibc/src/main/native/include/wpi/system/Notifier.hpp

@@ -13,10 +13,10 @@
 #include <thread>
 #include <utility>
 
-#include <hal/Types.h>
-#include <units/frequency.h>
-#include <units/time.h>
-#include <wpi/mutex.h>
+#include "wpi/hal/Types.h"
+#include "wpi/units/frequency.hpp"
+#include "wpi/units/time.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace frc {
 

wpilibc/src/main/native/include/wpi/system/Resource.hpp

@@ -10,7 +10,7 @@
 #include <string>
 #include <vector>
 
-#include <wpi/mutex.h>
+#include "wpi/util/mutex.hpp"
 
 namespace frc {