SCRIPT Run cc include replacements

hal/src/main/native/sim/AddressableLED.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 "hal/AddressableLED.h"
+#include "wpi/hal/AddressableLED.h"
 
 #include <fmt/format.h>
 
@@ -10,9 +10,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/Errors.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/handles/IndexedHandleResource.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 #include "mockdata/AddressableLEDDataInternal.h"
 
 using namespace hal;

hal/src/main/native/sim/AnalogInput.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 "hal/AnalogInput.h"
+#include "wpi/hal/AnalogInput.h"
 
 #include "AnalogInternal.h"
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 #include "mockdata/AnalogInDataInternal.h"
 
 using namespace hal;

hal/src/main/native/sim/AnalogInternal.cpp

@@ -5,7 +5,7 @@
 #include "AnalogInternal.h"
 
 #include "PortsInternal.h"
-#include "hal/handles/IndexedHandleResource.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 
 namespace hal {
 IndexedHandleResource<HAL_AnalogInputHandle, hal::AnalogPort, kNumAnalogInputs,

hal/src/main/native/sim/AnalogInternal.h

@@ -9,8 +9,8 @@
 #include <string>
 
 #include "PortsInternal.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/handles/IndexedHandleResource.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 
 namespace hal {
 constexpr int32_t kTimebase = 40000000;  ///< 40 MHz clock

hal/src/main/native/sim/CAN.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 "hal/CAN.h"
+#include "wpi/hal/CAN.h"
 
 #include "mockdata/CanDataInternal.h"
 

hal/src/main/native/sim/CANAPI.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 "hal/CANAPI.h"
+#include "wpi/hal/CANAPI.h"
 
 #include <ctime>
 #include <memory>
 
-#include <wpi/DenseMap.h>
-#include <wpi/mutex.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/timestamp.h"
 
 #include "HALInitializer.h"
 #include "PortsInternal.h"
-#include "hal/CAN.h"
-#include "hal/Errors.h"
-#include "hal/handles/UnlimitedHandleResource.h"
+#include "wpi/hal/CAN.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/UnlimitedHandleResource.h"
 
 using namespace hal;
 

hal/src/main/native/sim/CANAPIInternal.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "hal/Types.h"
+#include "wpi/hal/Types.h"
 
 namespace hal::can {
 int32_t GetCANModuleFromHandle(HAL_CANHandle handle, int32_t* status);

hal/src/main/native/sim/CTREPCM.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 "hal/CTREPCM.h"
+#include "wpi/hal/CTREPCM.h"
 
 #include <string>
 
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/Errors.h"
-#include "hal/handles/IndexedHandleResource.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 #include "mockdata/CTREPCMDataInternal.h"
 
 using namespace hal;

hal/src/main/native/sim/Constants.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 "hal/Constants.h"
+#include "wpi/hal/Constants.h"
 
 #include "ConstantsInternal.h"
 

hal/src/main/native/sim/Counter.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 "hal/Counter.h"
+#include "wpi/hal/Counter.h"
 
 #include "CounterInternal.h"
 #include "HALInitializer.h"
 #include "PortsInternal.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/handles/LimitedHandleResource.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/LimitedHandleResource.h"
 
 namespace hal {
 

hal/src/main/native/sim/CounterInternal.h

@@ -5,8 +5,8 @@
 #pragma once
 
 #include "PortsInternal.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/handles/LimitedHandleResource.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/LimitedHandleResource.h"
 
 namespace hal {
 

hal/src/main/native/sim/DIO.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 "hal/DIO.h"
+#include "wpi/hal/DIO.h"
 
 #include "DigitalInternal.h"
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/handles/LimitedHandleResource.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/LimitedHandleResource.h"
 #include "mockdata/DIODataInternal.h"
 #include "mockdata/DigitalPWMDataInternal.h"
 

hal/src/main/native/sim/DigitalInternal.cpp

@@ -5,9 +5,9 @@
 #include "DigitalInternal.h"
 
 #include "PortsInternal.h"
-#include "hal/Errors.h"
-#include "hal/handles/DigitalHandleResource.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/DigitalHandleResource.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 namespace hal {
 

hal/src/main/native/sim/DigitalInternal.h

@@ -9,7 +9,7 @@
 #include <string>
 
 #include "PortsInternal.h"
-#include "hal/handles/DigitalHandleResource.h"
+#include "wpi/hal/handles/DigitalHandleResource.h"
 
 namespace hal {
 /**

hal/src/main/native/sim/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 "hal/DriverStation.h"
+#include "wpi/hal/DriverStation.h"
 
 #ifdef __APPLE__
 #include <pthread.h>
@@ -15,14 +15,14 @@
 #include <string>
 
 #include <fmt/format.h>
-#include <wpi/EventVector.h>
-#include <wpi/condition_variable.h>
-#include <wpi/mutex.h>
+#include "wpi/util/EventVector.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
 
 #include "HALInitializer.h"
-#include "hal/Errors.h"
-#include "hal/cpp/fpga_clock.h"
-#include "hal/simulation/MockHooks.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/cpp/fpga_clock.h"
+#include "wpi/hal/simulation/MockHooks.h"
 #include "mockdata/DriverStationDataInternal.h"
 
 static wpi::mutex msgMutex;

hal/src/main/native/sim/DutyCycle.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 "hal/DutyCycle.h"
+#include "wpi/hal/DutyCycle.h"
 
 #include <string>
 
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/Errors.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/handles/IndexedHandleResource.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 #include "mockdata/DutyCycleDataInternal.h"
 
 using namespace hal;

hal/src/main/native/sim/Encoder.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 "hal/Encoder.h"
+#include "wpi/hal/Encoder.h"
 
 #include <limits>
 
@@ -10,9 +10,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/Errors.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/handles/LimitedHandleResource.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/LimitedHandleResource.h"
 #include "mockdata/EncoderDataInternal.h"
 
 using namespace hal;

hal/src/main/native/sim/Extensions.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 "hal/Extensions.h"
+#include "wpi/hal/Extensions.h"
 
 #include <cstdio>
 #include <string>
@@ -10,10 +10,10 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/StringExtras.h>
-#include <wpi/fs.h>
-#include <wpi/print.h>
-#include <wpi/spinlock.h>
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fs.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/spinlock.hpp"
 
 #if defined(WIN32) || defined(_WIN32)
 #include <windows.h>

hal/src/main/native/sim/HAL.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 "hal/HAL.h"
+#include "wpi/hal/HAL.h"
 
 #include <cstdio>
 #include <cstring>
 #include <utility>
 #include <vector>
 
-#include <wpi/mutex.h>
-#include <wpi/spinlock.h>
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/spinlock.hpp"
 
 #ifdef _WIN32
 #include <Windows.h>
@@ -26,11 +26,11 @@ NtQueryTimerResolution(PULONG MinimumResolution, PULONG MaximumResolution,
 #include "ErrorsInternal.h"
 #include "HALInitializer.h"
 #include "MockHooksInternal.h"
-#include "hal/Errors.h"
-#include "hal/Extensions.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/simulation/DriverStationData.h"
-#include "hal/simulation/SimCallbackRegistry.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/Extensions.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/hal/simulation/SimCallbackRegistry.h"
 #include "mockdata/RoboRioDataInternal.h"
 
 using namespace hal;

hal/src/main/native/sim/HALInitializer.cpp

@@ -4,7 +4,7 @@
 
 #include "HALInitializer.h"
 
-#include "hal/HALBase.h"
+#include "wpi/hal/HALBase.h"
 
 namespace hal::init {
 std::atomic_bool HAL_IsInitialized{false};

hal/src/main/native/sim/I2C.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 "hal/I2C.h"
+#include "wpi/hal/I2C.h"
 
 #include "HALInitializer.h"
 #include "mockdata/I2CDataInternal.h"

hal/src/main/native/sim/IMU.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 "hal/IMU.h"
+#include "wpi/hal/IMU.h"
 
 extern "C" {
 // TODO(Ryan) implement sim

hal/src/main/native/sim/MockHooks.cpp

@@ -8,12 +8,12 @@
 #include <cstdio>
 #include <thread>
 
-#include <wpi/print.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 #include "MockHooksInternal.h"
 #include "NotifierInternal.h"
-#include "hal/simulation/NotifierData.h"
+#include "wpi/hal/simulation/NotifierData.h"
 
 static std::atomic<bool> programStarted{false};
 

hal/src/main/native/sim/MockHooksInternal.h

@@ -6,7 +6,7 @@
 
 #include <stdint.h>
 
-#include "hal/simulation/MockHooks.h"
+#include "wpi/hal/simulation/MockHooks.h"
 
 namespace hal {
 void RestartTiming();

hal/src/main/native/sim/Notifier.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 "hal/Notifier.h"
+#include "wpi/hal/Notifier.h"
 
 #include <atomic>
 #include <chrono>
@@ -12,18 +12,18 @@
 #include <string>
 #include <utility>
 
-#include <wpi/SmallVector.h>
-#include <wpi/StringExtras.h>
-#include <wpi/condition_variable.h>
-#include <wpi/mutex.h>
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
 
 #include "HALInitializer.h"
 #include "NotifierInternal.h"
-#include "hal/Errors.h"
-#include "hal/HALBase.h"
-#include "hal/cpp/fpga_clock.h"
-#include "hal/handles/UnlimitedHandleResource.h"
-#include "hal/simulation/NotifierData.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/cpp/fpga_clock.h"
+#include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/hal/simulation/NotifierData.h"
 
 namespace {
 struct Notifier {

hal/src/main/native/sim/PWM.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 "hal/PWM.h"
+#include "wpi/hal/PWM.h"
 
 #include <algorithm>
 #include <cmath>
@@ -12,7 +12,7 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 #include "mockdata/PWMDataInternal.h"
 
 using namespace hal;

hal/src/main/native/sim/Ports.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 "hal/Ports.h"
+#include "wpi/hal/Ports.h"
 
 #include "PortsInternal.h"
 

hal/src/main/native/sim/Power.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 "hal/Power.h"
+#include "wpi/hal/Power.h"
 
 #include "mockdata/RoboRioDataInternal.h"
 

hal/src/main/native/sim/PowerDistribution.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 "hal/PowerDistribution.h"
+#include "wpi/hal/PowerDistribution.h"
 
 #include <fmt/format.h>
 
@@ -10,8 +10,8 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/CANAPI.h"
-#include "hal/Errors.h"
+#include "wpi/hal/CANAPI.h"
+#include "wpi/hal/Errors.h"
 #include "mockdata/PowerDistributionDataInternal.h"
 
 using namespace hal;

hal/src/main/native/sim/REVPH.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 "hal/REVPH.h"
+#include "wpi/hal/REVPH.h"
 
 #include <string>
 
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/Errors.h"
-#include "hal/handles/IndexedHandleResource.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 #include "mockdata/REVPHDataInternal.h"
 
 using namespace hal;

hal/src/main/native/sim/SerialPort.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 "hal/SerialPort.h"
+#include "wpi/hal/SerialPort.h"
 
 #include "HALInitializer.h"
 

hal/src/main/native/sim/SimDevice.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 "hal/SimDevice.h"
+#include "wpi/hal/SimDevice.h"
 
 #include <fmt/format.h>
 

hal/src/main/native/sim/SystemServer.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 "hal/SystemServer.h"
+#include "wpi/hal/SystemServer.h"
 
 extern "C" {
 

hal/src/main/native/sim/Threads.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 "hal/Threads.h"
+#include "wpi/hal/Threads.h"
 
 namespace hal::init {
 void InitializeThreads() {}

hal/src/main/native/sim/mockdata/AddressableLEDDataInternal.h

@@ -6,11 +6,11 @@
 
 #include <vector>
 
-#include <wpi/spinlock.h>
+#include "wpi/util/spinlock.hpp"
 
-#include "hal/simulation/AddressableLEDData.h"
-#include "hal/simulation/SimCallbackRegistry.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/AddressableLEDData.h"
+#include "wpi/hal/simulation/SimCallbackRegistry.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class AddressableLEDData {

hal/src/main/native/sim/mockdata/AnalogInDataInternal.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "hal/simulation/AnalogInData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/AnalogInData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class AnalogInData {

hal/src/main/native/sim/mockdata/CTREPCMDataInternal.h

@@ -5,8 +5,8 @@
 #pragma once
 
 #include "../PortsInternal.h"
-#include "hal/simulation/CTREPCMData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/CTREPCMData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class CTREPCMData {

hal/src/main/native/sim/mockdata/CanDataInternal.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "hal/simulation/CanData.h"
-#include "hal/simulation/SimCallbackRegistry.h"
+#include "wpi/hal/simulation/CanData.h"
+#include "wpi/hal/simulation/SimCallbackRegistry.h"
 
 namespace hal {
 

hal/src/main/native/sim/mockdata/DIODataInternal.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "hal/simulation/DIOData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/DIOData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class DIOData {

hal/src/main/native/sim/mockdata/DigitalPWMDataInternal.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "hal/simulation/DigitalPWMData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/DigitalPWMData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class DigitalPWMData {

hal/src/main/native/sim/mockdata/DriverStationDataInternal.h

@@ -6,11 +6,11 @@
 
 #include <memory>
 
-#include <wpi/spinlock.h>
+#include "wpi/util/spinlock.hpp"
 
-#include "hal/simulation/DriverStationData.h"
-#include "hal/simulation/SimCallbackRegistry.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/hal/simulation/SimCallbackRegistry.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 

hal/src/main/native/sim/mockdata/DutyCycleDataInternal.h

@@ -7,8 +7,8 @@
 #include <atomic>
 #include <limits>
 
-#include "hal/simulation/DutyCycleData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/DutyCycleData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class DutyCycleData {

hal/src/main/native/sim/mockdata/EncoderDataInternal.h

@@ -7,8 +7,8 @@
 #include <atomic>
 #include <limits>
 
-#include "hal/simulation/EncoderData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/EncoderData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class EncoderData {

hal/src/main/native/sim/mockdata/I2CDataInternal.h

@@ -4,9 +4,9 @@
 
 #pragma once
 
-#include "hal/simulation/I2CData.h"
-#include "hal/simulation/SimCallbackRegistry.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/I2CData.h"
+#include "wpi/hal/simulation/SimCallbackRegistry.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class I2CData {

hal/src/main/native/sim/mockdata/PWMDataInternal.h

@@ -4,8 +4,8 @@
 
 #pragma once
 
-#include "hal/simulation/PWMData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/PWMData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class PWMData {

hal/src/main/native/sim/mockdata/PowerDistributionDataInternal.h

@@ -5,8 +5,8 @@
 #pragma once
 
 #include "../PortsInternal.h"
-#include "hal/simulation/PowerDistributionData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/PowerDistributionData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 

hal/src/main/native/sim/mockdata/REVPHDataInternal.h

@@ -5,8 +5,8 @@
 #pragma once
 
 #include "../PortsInternal.h"
-#include "hal/simulation/REVPHData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/REVPHData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class REVPHData {

hal/src/main/native/sim/mockdata/Reset.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 <hal/simulation/AddressableLEDData.h>
-#include <hal/simulation/AnalogInData.h>
-#include <hal/simulation/CTREPCMData.h>
-#include <hal/simulation/CanData.h>
-#include <hal/simulation/DIOData.h>
-#include <hal/simulation/DigitalPWMData.h>
-#include <hal/simulation/DriverStationData.h>
-#include <hal/simulation/DutyCycleData.h>
-#include <hal/simulation/EncoderData.h>
-#include <hal/simulation/I2CData.h>
-#include <hal/simulation/PWMData.h>
-#include <hal/simulation/PowerDistributionData.h>
-#include <hal/simulation/REVPHData.h>
-#include <hal/simulation/RoboRioData.h>
-#include <hal/simulation/SimDeviceData.h>
+#include "wpi/hal/simulation/AddressableLEDData.h"
+#include "wpi/hal/simulation/AnalogInData.h"
+#include "wpi/hal/simulation/CTREPCMData.h"
+#include "wpi/hal/simulation/CanData.h"
+#include "wpi/hal/simulation/DIOData.h"
+#include "wpi/hal/simulation/DigitalPWMData.h"
+#include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/hal/simulation/DutyCycleData.h"
+#include "wpi/hal/simulation/EncoderData.h"
+#include "wpi/hal/simulation/I2CData.h"
+#include "wpi/hal/simulation/PWMData.h"
+#include "wpi/hal/simulation/PowerDistributionData.h"
+#include "wpi/hal/simulation/REVPHData.h"
+#include "wpi/hal/simulation/RoboRioData.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 
 #include "../PortsInternal.h"
 

hal/src/main/native/sim/mockdata/RoboRioDataInternal.h

@@ -7,10 +7,10 @@
 #include <cstddef>
 #include <string>
 
-#include <wpi/spinlock.h>
+#include "wpi/util/spinlock.hpp"
 
-#include "hal/simulation/RoboRioData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/RoboRioData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 namespace hal {
 class RoboRioData {

hal/src/main/native/sim/mockdata/SimDeviceData.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 "hal/simulation/SimDeviceData.h"  // NOLINT(build/include_order)
+#include "wpi/hal/simulation/SimDeviceData.h"  // NOLINT(build/include_order)
 
 #include <algorithm>
 #include <memory>
 #include <utility>
 
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 #include "SimDeviceDataInternal.h"
 

hal/src/main/native/sim/mockdata/SimDeviceDataInternal.h

@@ -11,14 +11,14 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/StringExtras.h>
-#include <wpi/StringMap.h>
-#include <wpi/UidVector.h>
-#include <wpi/spinlock.h>
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/UidVector.hpp"
+#include "wpi/util/spinlock.hpp"
 
-#include "hal/Value.h"
-#include "hal/simulation/SimCallbackRegistry.h"
-#include "hal/simulation/SimDeviceData.h"
+#include "wpi/hal/Value.h"
+#include "wpi/hal/simulation/SimCallbackRegistry.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 
 namespace hal {