[hal] Consistently use .hpp for C++ header content

Some headers were renamed, but others were split.
2026-07-05 03:21:42 +00:00 · 2026-01-04 00:41:53 -08:00
parent ab45819f6f
commit a7f71c9434
309 changed files with 1762 additions and 1744 deletions
--- a/wpilibc/src/main/native/cpp/counter/Tachometer.cpp
+++ b/wpilibc/src/main/native/cpp/counter/Tachometer.cpp
@@ -7,7 +7,7 @@
 #include <string>

 #include "wpi/hal/Counter.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
--- a/wpilibc/src/main/native/cpp/counter/UpDownCounter.cpp
+++ b/wpilibc/src/main/native/cpp/counter/UpDownCounter.cpp
@@ -4,11 +4,10 @@

 #include "wpi/counter/UpDownCounter.hpp"

-#include <memory>
 #include <string>

 #include "wpi/hal/Counter.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
--- a/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
+++ b/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
@@ -9,7 +9,7 @@
 #include <string>
 #include <utility>

-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/hardware/motor/MotorController.hpp"
 #include "wpi/math/util/MathUtil.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
--- a/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
+++ b/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
@@ -8,7 +8,7 @@
 #include <string>
 #include <utility>

-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/hardware/motor/MotorController.hpp"
 #include "wpi/math/geometry/Translation2d.hpp"
 #include "wpi/math/util/MathUtil.hpp"
--- a/wpilibc/src/main/native/cpp/driverstation/Gamepad.cpp
+++ b/wpilibc/src/main/native/cpp/driverstation/Gamepad.cpp
@@ -5,7 +5,7 @@
 #include "wpi/driverstation/Gamepad.hpp"

 #include "wpi/event/BooleanEvent.hpp"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"

 using namespace wpi;
--- a/wpilibc/src/main/native/cpp/driverstation/Joystick.cpp
+++ b/wpilibc/src/main/native/cpp/driverstation/Joystick.cpp
@@ -7,7 +7,7 @@
 #include <cmath>

 #include "wpi/event/BooleanEvent.hpp"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"

 using namespace wpi;

--- a/wpilibc/src/main/native/cpp/framework/OpModeRobot.cpp
+++ b/wpilibc/src/main/native/cpp/framework/OpModeRobot.cpp
@@ -16,7 +16,7 @@
 #include "wpi/hal/DriverStation.h"
 #include "wpi/hal/DriverStationTypes.h"
 #include "wpi/hal/HALBase.h"
-#include "wpi/hal/Notifier.h"
+#include "wpi/hal/Notifier.hpp"
 #include "wpi/opmode/OpMode.hpp"
 #include "wpi/util/SafeThread.hpp"
 #include "wpi/util/Synchronization.h"
--- a/wpilibc/src/main/native/cpp/framework/TimedRobot.cpp
+++ b/wpilibc/src/main/native/cpp/framework/TimedRobot.cpp
@@ -10,8 +10,8 @@
 #include <utility>

 #include "wpi/hal/DriverStation.h"
-#include "wpi/hal/Notifier.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/Notifier.hpp"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"

 using namespace wpi;
--- a/wpilibc/src/main/native/cpp/hardware/accelerometer/ADXL345_I2C.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/accelerometer/ADXL345_I2C.cpp
@@ -4,7 +4,7 @@

 #include "wpi/hardware/accelerometer/ADXL345_I2C.hpp"

-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/nt/DoubleTopic.hpp"
 #include "wpi/nt/NTSendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/accelerometer/AnalogAccelerometer.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/accelerometer/AnalogAccelerometer.cpp
@@ -4,7 +4,7 @@

 #include "wpi/hardware/accelerometer/AnalogAccelerometer.hpp"

-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/util/NullDeleter.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/bus/CAN.cpp
@@ -4,12 +4,10 @@

 #include "wpi/hardware/bus/CAN.hpp"

-#include <utility>
-
 #include "wpi/hal/CAN.h"
 #include "wpi/hal/CANAPI.h"
 #include "wpi/hal/Errors.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"

 using namespace wpi;
--- a/wpilibc/src/main/native/cpp/hardware/bus/I2C.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/bus/I2C.cpp
@@ -7,7 +7,7 @@
 #include <algorithm>

 #include "wpi/hal/I2C.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"

 using namespace wpi;
--- a/wpilibc/src/main/native/cpp/hardware/bus/SerialPort.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/bus/SerialPort.cpp
@@ -7,7 +7,7 @@
 #include <string>

 #include "wpi/hal/SerialPort.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"

 using namespace wpi;
--- a/wpilibc/src/main/native/cpp/hardware/discrete/AnalogInput.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/discrete/AnalogInput.cpp
@@ -7,11 +7,8 @@
 #include <string>

 #include "wpi/hal/AnalogInput.h"
-#include "wpi/hal/HALBase.h"
-#include "wpi/hal/Ports.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
-#include "wpi/system/Timer.hpp"
 #include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/discrete/DigitalInput.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/discrete/DigitalInput.cpp
@@ -7,9 +7,7 @@
 #include <string>

 #include "wpi/hal/DIO.h"
-#include "wpi/hal/HALBase.h"
-#include "wpi/hal/Ports.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/discrete/DigitalOutput.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/discrete/DigitalOutput.cpp
@@ -7,9 +7,7 @@
 #include <string>

 #include "wpi/hal/DIO.h"
-#include "wpi/hal/HALBase.h"
-#include "wpi/hal/Ports.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/discrete/PWM.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/discrete/PWM.cpp
@@ -4,12 +4,8 @@

 #include "wpi/hardware/discrete/PWM.hpp"

-#include <utility>
-
-#include "wpi/hal/HALBase.h"
 #include "wpi/hal/PWM.h"
-#include "wpi/hal/Ports.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHub.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/expansionhub/ExpansionHub.cpp
@@ -6,7 +6,7 @@

 #include <memory>

-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/hardware/expansionhub/ExpansionHubMotor.hpp"
 #include "wpi/hardware/expansionhub/ExpansionHubServo.hpp"
 #include "wpi/nt/BooleanTopic.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/led/AddressableLED.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/led/AddressableLED.cpp
@@ -7,10 +7,7 @@
 #include <algorithm>

 #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/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/led/LEDPattern.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/led/LEDPattern.cpp
@@ -11,7 +11,7 @@
 #include <utility>
 #include <vector>

-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/math/util/MathUtil.hpp"
 #include "wpi/util/MathExtras.hpp"
 #include "wpi/util/timestamp.h"
--- a/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticHub.cpp
@@ -11,10 +11,9 @@

 #include <fmt/format.h>

-#include "wpi/framework/RobotBase.hpp"
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/REVPH.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/hardware/pneumatic/Compressor.hpp"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/pneumatic/PneumaticsControlModule.cpp
@@ -11,7 +11,7 @@

 #include "wpi/hal/CTREPCM.h"
 #include "wpi/hal/Ports.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/hardware/pneumatic/Compressor.hpp"
 #include "wpi/hardware/pneumatic/DoubleSolenoid.hpp"
 #include "wpi/hardware/pneumatic/Solenoid.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/power/PowerDistribution.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/power/PowerDistribution.cpp
@@ -8,9 +8,8 @@

 #include <fmt/format.h>

-#include "wpi/hal/Ports.h"
 #include "wpi/hal/PowerDistribution.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/range/SharpIR.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/range/SharpIR.cpp
@@ -6,7 +6,7 @@

 #include <algorithm>

-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/hardware/discrete/AnalogInput.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/rotation/AnalogEncoder.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/rotation/AnalogEncoder.cpp
@@ -6,7 +6,7 @@

 #include <utility>

-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/hardware/discrete/AnalogInput.hpp"
 #include "wpi/math/util/MathUtil.hpp"
 #include "wpi/system/RobotController.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycle.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/rotation/DutyCycle.cpp
@@ -5,13 +5,10 @@
 #include "wpi/hardware/rotation/DutyCycle.hpp"

 #include <string>
-#include <utility>

 #include "wpi/hal/DutyCycle.h"
-#include "wpi/hal/HALBase.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
-#include "wpi/util/NullDeleter.hpp"
 #include "wpi/util/SensorUtil.hpp"
 #include "wpi/util/StackTrace.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
--- a/wpilibc/src/main/native/cpp/hardware/rotation/Encoder.cpp
+++ b/wpilibc/src/main/native/cpp/hardware/rotation/Encoder.cpp
@@ -4,14 +4,9 @@

 #include "wpi/hardware/rotation/Encoder.hpp"

-#include <memory>
-#include <utility>
-
 #include "wpi/hal/Encoder.h"
-#include "wpi/hal/UsageReporting.h"
-#include "wpi/hardware/discrete/DigitalInput.hpp"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/system/Errors.hpp"
-#include "wpi/util/NullDeleter.hpp"
 #include "wpi/util/sendable/SendableBuilder.hpp"
 #include "wpi/util/sendable/SendableRegistry.hpp"

--- a/wpilibc/src/main/native/cpp/opmode/PeriodicOpMode.cpp
+++ b/wpilibc/src/main/native/cpp/opmode/PeriodicOpMode.cpp
@@ -8,7 +8,8 @@

 #include "wpi/driverstation/DriverStation.hpp"
 #include "wpi/hal/DriverStation.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/Notifier.hpp"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/smartdashboard/SmartDashboard.hpp"
 #include "wpi/system/Errors.hpp"
--- a/wpilibc/src/main/native/cpp/simulation/SimHooks.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/SimHooks.cpp
@@ -4,7 +4,7 @@

 #include "wpi/simulation/SimHooks.hpp"

-#include "wpi/hal/simulation/MockHooks.h"
+#include "wpi/hal/simulation/MockHooks.hpp"

 namespace wpi::sim {

--- a/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
@@ -9,7 +9,7 @@
 #include <utility>
 #include <vector>

-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/smartdashboard/ListenerExecutor.hpp"
--- a/wpilibc/src/main/native/cpp/system/Notifier.cpp
+++ b/wpilibc/src/main/native/cpp/system/Notifier.cpp
@@ -7,7 +7,7 @@
 #include <utility>

 #include "wpi/hal/DriverStation.h"
-#include "wpi/hal/Notifier.h"
+#include "wpi/hal/Notifier.hpp"
 #include "wpi/hal/Threads.h"
 #include "wpi/system/Errors.hpp"
 #include "wpi/util/Synchronization.h"
--- a/wpilibc/src/main/native/cpp/system/Watchdog.cpp
+++ b/wpilibc/src/main/native/cpp/system/Watchdog.cpp
@@ -12,7 +12,7 @@
 #include <fmt/format.h>

 #include "wpi/hal/HALBase.h"
-#include "wpi/hal/Notifier.h"
+#include "wpi/hal/Notifier.hpp"
 #include "wpi/system/Errors.hpp"
 #include "wpi/system/Timer.hpp"
 #include "wpi/util/Synchronization.h"
--- a/wpilibc/src/main/native/cpp/util/Preferences.cpp
+++ b/wpilibc/src/main/native/cpp/util/Preferences.cpp
@@ -10,7 +10,7 @@

 #include <fmt/format.h>

-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/nt/MultiSubscriber.hpp"
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
--- a/wpilibc/src/main/native/cppcs/RobotBase.cpp
+++ b/wpilibc/src/main/native/cppcs/RobotBase.cpp
@@ -18,7 +18,7 @@
 #include "wpi/cameraserver/CameraServerShared.hpp"
 #include "wpi/driverstation/DriverStation.hpp"
 #include "wpi/hal/HALBase.h"
-#include "wpi/hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.hpp"
 #include "wpi/math/util/MathShared.hpp"
 #include "wpi/nt/NetworkTable.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
--- a/wpilibc/src/main/native/include/wpi/counter/Tachometer.hpp
+++ b/wpilibc/src/main/native/include/wpi/counter/Tachometer.hpp
@@ -4,11 +4,9 @@

 #pragma once

-#include <memory>
-
 #include "EdgeConfiguration.hpp"
 #include "wpi/hal/Counter.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/units/angular_velocity.hpp"
 #include "wpi/units/frequency.hpp"
 #include "wpi/units/time.hpp"
--- a/wpilibc/src/main/native/include/wpi/counter/UpDownCounter.hpp
+++ b/wpilibc/src/main/native/include/wpi/counter/UpDownCounter.hpp
@@ -4,11 +4,9 @@

 #pragma once

-#include <memory>
-
 #include "EdgeConfiguration.hpp"
 #include "wpi/hal/Counter.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"

--- a/wpilibc/src/main/native/include/wpi/driverstation/Alert.hpp
+++ b/wpilibc/src/main/native/include/wpi/driverstation/Alert.hpp
@@ -8,7 +8,7 @@
 #include <string_view>

 #include "wpi/hal/Alert.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"

 namespace wpi {

--- a/wpilibc/src/main/native/include/wpi/driverstation/DriverStation.hpp
+++ b/wpilibc/src/main/native/include/wpi/driverstation/DriverStation.hpp
@@ -8,8 +8,8 @@
 #include <string>
 #include <string_view>

-#include "wpi/hal/DriverStation.h"
-#include "wpi/hal/DriverStationTypes.h"
+#include "wpi/hal/DriverStation.hpp"
+#include "wpi/hal/DriverStationTypes.hpp"
 #include "wpi/math/geometry/Rotation2d.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/Synchronization.h"
--- a/wpilibc/src/main/native/include/wpi/framework/OpModeRobot.hpp
+++ b/wpilibc/src/main/native/include/wpi/framework/OpModeRobot.hpp
@@ -11,8 +11,9 @@
 #include <string>

 #include "wpi/framework/RobotBase.hpp"
-#include "wpi/hal/DriverStationTypes.h"
+#include "wpi/hal/DriverStationTypes.hpp"
 #include "wpi/hal/Notifier.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/opmode/OpMode.hpp"
 #include "wpi/util/DenseMap.hpp"
 #include "wpi/util/mutex.hpp"
--- a/wpilibc/src/main/native/include/wpi/framework/TimedRobot.hpp
+++ b/wpilibc/src/main/native/include/wpi/framework/TimedRobot.hpp
@@ -11,10 +11,9 @@

 #include "wpi/framework/IterativeRobotBase.hpp"
 #include "wpi/hal/Notifier.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/system/RobotController.hpp"
 #include "wpi/units/frequency.hpp"
-#include "wpi/units/math.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/priority_queue.hpp"

--- a/wpilibc/src/main/native/include/wpi/hardware/accelerometer/ADXL345_I2C.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/accelerometer/ADXL345_I2C.hpp
@@ -4,7 +4,7 @@

 #pragma once

-#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/SimDevice.hpp"
 #include "wpi/hardware/bus/I2C.hpp"
 #include "wpi/nt/NTSendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
--- a/wpilibc/src/main/native/include/wpi/hardware/bus/CAN.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/bus/CAN.hpp
@@ -7,6 +7,7 @@
 #include <stdint.h>

 #include "wpi/hal/CANAPI.h"
+#include "wpi/hal/Types.hpp"

 namespace wpi {

--- a/wpilibc/src/main/native/include/wpi/hardware/bus/I2C.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/bus/I2C.hpp
@@ -8,6 +8,7 @@

 #include "wpi/hal/I2C.h"
 #include "wpi/hal/I2CTypes.h"
+#include "wpi/hal/Types.hpp"

 namespace wpi {

--- a/wpilibc/src/main/native/include/wpi/hardware/bus/SerialPort.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/bus/SerialPort.hpp
@@ -4,11 +4,10 @@

 #pragma once

-#include <string>
 #include <string_view>

 #include "wpi/hal/SerialPort.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/units/time.hpp"

 namespace wpi {
--- a/wpilibc/src/main/native/include/wpi/hardware/discrete/AnalogInput.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/discrete/AnalogInput.hpp
@@ -7,7 +7,7 @@
 #include <stdint.h>

 #include "wpi/hal/AnalogInput.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"

--- a/wpilibc/src/main/native/include/wpi/hardware/discrete/DigitalInput.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/discrete/DigitalInput.hpp
@@ -5,6 +5,7 @@
 #pragma once

 #include "wpi/hal/DIO.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"

--- a/wpilibc/src/main/native/include/wpi/hardware/discrete/DigitalOutput.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/discrete/DigitalOutput.hpp
@@ -5,7 +5,7 @@
 #pragma once

 #include "wpi/hal/DIO.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
--- a/wpilibc/src/main/native/include/wpi/hardware/discrete/PWM.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/discrete/PWM.hpp
@@ -7,7 +7,7 @@
 #include <stdint.h>

 #include "wpi/hal/PWM.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
--- a/wpilibc/src/main/native/include/wpi/hardware/led/AddressableLED.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/led/AddressableLED.hpp
@@ -9,8 +9,7 @@

 #include "wpi/hal/AddressableLED.h"
 #include "wpi/hal/AddressableLEDTypes.h"
-#include "wpi/hal/Types.h"
-#include "wpi/units/time.hpp"
+#include "wpi/hal/Types.hpp"
 #include "wpi/util/Color.hpp"
 #include "wpi/util/Color8Bit.hpp"

--- a/wpilibc/src/main/native/include/wpi/hardware/motor/PWMMotorController.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/motor/PWMMotorController.hpp
@@ -12,7 +12,7 @@
 #include <utility>
 #include <vector>

-#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/SimDevice.hpp"
 #include "wpi/hardware/discrete/PWM.hpp"
 #include "wpi/hardware/motor/MotorController.hpp"
 #include "wpi/hardware/motor/MotorSafety.hpp"
--- a/wpilibc/src/main/native/include/wpi/hardware/power/PowerDistribution.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/power/PowerDistribution.hpp
@@ -7,7 +7,7 @@
 #include <vector>

 #include "wpi/hal/PowerDistribution.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"

--- a/wpilibc/src/main/native/include/wpi/hardware/range/SharpIR.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/range/SharpIR.hpp
@@ -4,7 +4,7 @@

 #pragma once

-#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/SimDevice.hpp"
 #include "wpi/hardware/discrete/AnalogInput.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
--- a/wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogEncoder.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/rotation/AnalogEncoder.hpp
@@ -6,8 +6,7 @@

 #include <memory>

-#include "wpi/hal/SimDevice.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/SimDevice.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"

--- a/wpilibc/src/main/native/include/wpi/hardware/rotation/DutyCycle.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/rotation/DutyCycle.hpp
@@ -4,10 +4,8 @@

 #pragma once

-#include <memory>
-
 #include "wpi/hal/DutyCycle.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/units/frequency.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
--- a/wpilibc/src/main/native/include/wpi/hardware/rotation/DutyCycleEncoder.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/rotation/DutyCycleEncoder.hpp
@@ -6,8 +6,7 @@

 #include <memory>

-#include "wpi/hal/SimDevice.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/SimDevice.hpp"
 #include "wpi/units/frequency.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
--- a/wpilibc/src/main/native/include/wpi/hardware/rotation/Encoder.hpp
+++ b/wpilibc/src/main/native/include/wpi/hardware/rotation/Encoder.hpp
@@ -4,10 +4,8 @@

 #pragma once

-#include <memory>
-
 #include "wpi/hal/Encoder.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/hardware/discrete/CounterBase.hpp"
 #include "wpi/util/sendable/Sendable.hpp"
 #include "wpi/util/sendable/SendableHelper.hpp"
--- a/wpilibc/src/main/native/include/wpi/internal/DriverStationModeThread.hpp
+++ b/wpilibc/src/main/native/include/wpi/internal/DriverStationModeThread.hpp
@@ -7,7 +7,7 @@
 #include <atomic>
 #include <thread>

-#include "wpi/hal/DriverStationTypes.h"
+#include "wpi/hal/DriverStationTypes.hpp"
 #include "wpi/util/Synchronization.h"

 namespace wpi::internal {
--- a/wpilibc/src/main/native/include/wpi/opmode/PeriodicOpMode.hpp
+++ b/wpilibc/src/main/native/include/wpi/opmode/PeriodicOpMode.hpp
@@ -11,7 +11,7 @@
 #include <vector>

 #include "wpi/hal/Notifier.h"
-#include "wpi/hal/Types.h"
+#include "wpi/hal/Types.hpp"
 #include "wpi/opmode/OpMode.hpp"
 #include "wpi/system/Watchdog.hpp"
 #include "wpi/units/time.hpp"
--- a/wpilibc/src/main/native/include/wpi/simulation/ADXL345Sim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/ADXL345Sim.hpp
@@ -4,7 +4,7 @@

 #pragma once

-#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/SimDevice.hpp"

 namespace wpi {

--- a/wpilibc/src/main/native/include/wpi/simulation/AnalogEncoderSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/AnalogEncoderSim.hpp
@@ -4,9 +4,7 @@

 #pragma once

-#include "wpi/hal/SimDevice.h"
-#include "wpi/math/geometry/Rotation2d.hpp"
-#include "wpi/units/angle.hpp"
+#include "wpi/hal/SimDevice.hpp"

 namespace wpi {

--- a/wpilibc/src/main/native/include/wpi/simulation/DutyCycleEncoderSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/DutyCycleEncoderSim.hpp
@@ -4,8 +4,7 @@

 #pragma once

-#include "wpi/hal/SimDevice.h"
-#include "wpi/units/angle.hpp"
+#include "wpi/hal/SimDevice.hpp"

 namespace wpi {

--- a/wpilibc/src/main/native/include/wpi/simulation/SimDeviceSim.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/SimDeviceSim.hpp
@@ -8,7 +8,7 @@
 #include <string>
 #include <vector>

-#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/SimDevice.hpp"
 #include "wpi/hal/simulation/SimDeviceData.h"

 namespace wpi::sim {
--- a/wpilibc/src/main/native/include/wpi/simulation/SimHooks.hpp
+++ b/wpilibc/src/main/native/include/wpi/simulation/SimHooks.hpp
@@ -6,7 +6,7 @@

 #include <stdint.h>

-#include "wpi/hal/DriverStationTypes.h"
+#include "wpi/hal/DriverStationTypes.hpp"
 #include "wpi/hal/HALBase.h"
 #include "wpi/units/time.hpp"

--- a/wpilibc/src/main/native/include/wpi/system/Tracer.hpp
+++ b/wpilibc/src/main/native/include/wpi/system/Tracer.hpp
@@ -7,7 +7,7 @@
 #include <chrono>
 #include <string_view>

-#include "wpi/hal/cpp/fpga_clock.h"
+#include "wpi/hal/cpp/fpga_clock.hpp"
 #include "wpi/util/StringMap.hpp"

 namespace wpi::util {