SCRIPT Run cc include replacements

hal/src/main/native/cpp/ErrorHandling.cpp

@@ -3,10 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <fmt/format.h>
-#include <wpi/SmallString.h>
+#include "wpi/util/SmallString.hpp"
 
-#include "hal/Errors.h"
-#include "hal/HALBase.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/HALBase.h"
 
 namespace {
 struct LastErrorStorage {

hal/src/main/native/cpp/Main.cpp

@@ -2,10 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "hal/Main.h"
+#include "wpi/hal/Main.h"
 
-#include <wpi/condition_variable.h>
-#include <wpi/mutex.h>
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
 
 static void DefaultMain(void*);
 static void DefaultExit(void*);

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

hal/src/main/native/cpp/cpp/fpga_clock.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/cpp/fpga_clock.h"
+#include "wpi/hal/cpp/fpga_clock.h"
 
 #include <cstdio>
 #include <limits>
 
-#include <wpi/print.h>
+#include "wpi/util/print.hpp"
 
-#include "hal/HALBase.h"
+#include "wpi/hal/HALBase.h"
 
 namespace hal {
 const fpga_clock::time_point fpga_clock::min_time =

hal/src/main/native/cpp/handles/HandlesInternal.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 "hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 #include <algorithm>
 
-#include <wpi/SmallVector.h>
-#include <wpi/mutex.h>
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/mutex.hpp"
 
 namespace hal {
 static wpi::SmallVector<HandleBase*, 32>* globalHandles = nullptr;

hal/src/main/native/cpp/jni/AddressableLEDJNI.cpp

@@ -4,11 +4,11 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_AddressableLEDJNI.h"
-#include "hal/AddressableLED.h"
+#include "wpi/hal/AddressableLED.h"
 
 using namespace hal;
 using namespace wpi::java;

hal/src/main/native/cpp/jni/AnalogJNI.cpp

@@ -6,13 +6,13 @@
 
 #include <cassert>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_AnalogJNI.h"
-#include "hal/AnalogInput.h"
-#include "hal/Ports.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/AnalogInput.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/CANAPIJNI.cpp

@@ -6,13 +6,13 @@
 
 #include <cassert>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_CANAPIJNI.h"
-#include "hal/CAN.h"
-#include "hal/CANAPI.h"
-#include "hal/Errors.h"
+#include "wpi/hal/CAN.h"
+#include "wpi/hal/CANAPI.h"
+#include "wpi/hal/Errors.h"
 
 using namespace hal;
 using namespace wpi::java;

hal/src/main/native/cpp/jni/CANJNI.cpp

@@ -6,12 +6,12 @@
 
 #include <cassert>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_can_CANJNI.h"
-#include "hal/CAN.h"
-#include "hal/Errors.h"
+#include "wpi/hal/CAN.h"
+#include "wpi/hal/Errors.h"
 
 using namespace hal;
 using namespace wpi::java;

hal/src/main/native/cpp/jni/CTREPCMJNI.cpp

@@ -4,13 +4,13 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_CTREPCMJNI.h"
-#include "hal/CTREPCM.h"
-#include "hal/Ports.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/CTREPCM.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/ConstantsJNI.cpp

@@ -8,7 +8,7 @@
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_ConstantsJNI.h"
-#include "hal/Constants.h"
+#include "wpi/hal/Constants.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/CounterJNI.cpp

@@ -6,12 +6,12 @@
 
 #include <cassert>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_CounterJNI.h"
-#include "hal/Counter.h"
-#include "hal/Errors.h"
+#include "wpi/hal/Counter.h"
+#include "wpi/hal/Errors.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/DIOJNI.cpp

@@ -6,14 +6,14 @@
 
 #include <cassert>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_DIOJNI.h"
-#include "hal/DIO.h"
-#include "hal/PWM.h"
-#include "hal/Ports.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/DIO.h"
+#include "wpi/hal/PWM.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/DriverStationJNI.cpp

@@ -7,12 +7,12 @@
 #include <cassert>
 
 #include <fmt/format.h>
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_DriverStationJNI.h"
-#include "hal/DriverStation.h"
-#include "hal/HALBase.h"
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/HALBase.h"
 
 static_assert(org_wpilib_hardware_hal_DriverStationJNI_kUnknownAllianceStation ==
               HAL_AllianceStationID_kUnknown);

hal/src/main/native/cpp/jni/DutyCycleJNI.cpp

@@ -4,11 +4,11 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_DutyCycleJNI.h"
-#include "hal/DutyCycle.h"
+#include "wpi/hal/DutyCycle.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/EncoderJNI.cpp

@@ -8,8 +8,8 @@
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_EncoderJNI.h"
-#include "hal/Encoder.h"
-#include "hal/Errors.h"
+#include "wpi/hal/Encoder.h"
+#include "wpi/hal/Errors.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/HAL.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/HAL.h"
+#include "wpi/hal/HAL.h"
 
 #include <jni.h>
 
@@ -14,12 +14,12 @@
 #include <cstring>
 
 #include <fmt/format.h>
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_HAL.h"
-#include "hal/DriverStation.h"
-#include "hal/Main.h"
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/Main.h"
 
 using namespace hal;
 using namespace wpi::java;

hal/src/main/native/cpp/jni/HALUtil.cpp

@@ -13,13 +13,13 @@
 #include <string>
 
 #include <fmt/format.h>
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "org_wpilib_hardware_hal_HALUtil.h"
-#include "hal/CAN.h"
-#include "hal/DriverStation.h"
-#include "hal/Errors.h"
-#include "hal/HAL.h"
+#include "wpi/hal/CAN.h"
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/HAL.h"
 
 using namespace wpi::java;
 

hal/src/main/native/cpp/jni/I2CJNI.cpp

@@ -6,11 +6,11 @@
 
 #include <cassert>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_I2CJNI.h"
-#include "hal/I2C.h"
+#include "wpi/hal/I2C.h"
 
 using namespace hal;
 using namespace wpi::java;

hal/src/main/native/cpp/jni/IMUJNI.cpp

@@ -10,7 +10,7 @@
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_IMUJNI.h"
-#include "hal/IMU.h"
+#include "wpi/hal/IMU.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/NotifierJNI.cpp

@@ -7,11 +7,11 @@
 #include <cassert>
 #include <cstdio>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_NotifierJNI.h"
-#include "hal/Notifier.h"
+#include "wpi/hal/Notifier.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/PWMJNI.cpp

@@ -6,14 +6,14 @@
 
 #include <cassert>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_PWMJNI.h"
-#include "hal/DIO.h"
-#include "hal/PWM.h"
-#include "hal/Ports.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/DIO.h"
+#include "wpi/hal/PWM.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/PortsJNI.cpp

@@ -8,7 +8,7 @@
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_PortsJNI.h"
-#include "hal/Ports.h"
+#include "wpi/hal/Ports.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp

@@ -4,12 +4,12 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_PowerDistributionJNI.h"
-#include "hal/Ports.h"
-#include "hal/PowerDistribution.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/PowerDistribution.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/PowerJNI.cpp

@@ -6,7 +6,7 @@
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_PowerJNI.h"
-#include "hal/Power.h"
+#include "wpi/hal/Power.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/REVPHJNI.cpp

@@ -4,13 +4,13 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_REVPHJNI.h"
-#include "hal/Ports.h"
-#include "hal/REVPH.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/REVPH.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 static_assert(
     org_wpilib_hardware_hal_REVPHJNI_COMPRESSOR_CONFIG_TYPE_DISABLED ==

hal/src/main/native/cpp/jni/SerialPortJNI.cpp

@@ -6,11 +6,11 @@
 
 #include <cassert>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_SerialPortJNI.h"
-#include "hal/SerialPort.h"
+#include "wpi/hal/SerialPort.h"
 
 using namespace hal;
 using namespace wpi::java;

hal/src/main/native/cpp/jni/SimDeviceJNI.cpp

@@ -7,11 +7,11 @@
 #include <string>
 #include <vector>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_SimDeviceJNI.h"
-#include "hal/SimDevice.h"
+#include "wpi/hal/SimDevice.h"
 
 using namespace wpi::java;
 

hal/src/main/native/cpp/jni/SystemServerJNI.cpp

@@ -5,7 +5,7 @@
 #include <jni.h>
 
 #include "org_wpilib_hardware_hal_SystemServerJNI.h"
-#include "hal/SystemServer.h"
+#include "wpi/hal/SystemServer.h"
 
 extern "C" {
 

hal/src/main/native/cpp/jni/ThreadsJNI.cpp

@@ -8,7 +8,7 @@
 
 #include "HALUtil.h"
 #include "org_wpilib_hardware_hal_ThreadsJNI.h"
-#include "hal/Threads.h"
+#include "wpi/hal/Threads.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/UsageReportingJNI.cpp

@@ -6,11 +6,11 @@
 
 #include <cassert>
 
-#include <wpi/jni_util.h>
-#include <wpi/string.h>
+#include "wpi/util/jni_util.hpp"
+#include "wpi/util/string.h"
 
 #include "org_wpilib_hardware_hal_UsageReportingJNI.h"
-#include "hal/UsageReporting.h"
+#include "wpi/hal/UsageReporting.h"
 
 using namespace wpi::java;
 

hal/src/main/native/cpp/jni/simulation/AddressableLEDDataJNI.cpp

@@ -9,7 +9,7 @@
 #include "CallbackStore.h"
 #include "ConstBufferCallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_AddressableLEDDataJNI.h"
-#include "hal/simulation/AddressableLEDData.h"
+#include "wpi/hal/simulation/AddressableLEDData.h"
 
 static_assert(sizeof(jbyte) * 3 == sizeof(HAL_AddressableLEDData));
 

hal/src/main/native/cpp/jni/simulation/AnalogInDataJNI.cpp

@@ -6,7 +6,7 @@
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_AnalogInDataJNI.h"
-#include "hal/simulation/AnalogInData.h"
+#include "wpi/hal/simulation/AnalogInData.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp

@@ -9,11 +9,11 @@
 #include <cstdio>
 #include <memory>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "SimulatorJNI.h"
-#include "hal/Types.h"
-#include "hal/handles/UnlimitedHandleResource.h"
+#include "wpi/hal/Types.h"
+#include "wpi/hal/handles/UnlimitedHandleResource.h"
 
 using namespace hal;
 using namespace hal::sim;

hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.h

@@ -6,13 +6,13 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "SimulatorJNI.h"
-#include "hal/Types.h"
-#include "hal/Value.h"
-#include "hal/handles/UnlimitedHandleResource.h"
-#include "hal/simulation/NotifyListener.h"
+#include "wpi/hal/Types.h"
+#include "wpi/hal/Value.h"
+#include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/hal/simulation/NotifyListener.h"
 
 namespace hal::sim {
 class BufferCallbackStore {

hal/src/main/native/cpp/jni/simulation/CTREPCMDataJNI.cpp

@@ -6,7 +6,7 @@
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_CTREPCMDataJNI.h"
-#include "hal/simulation/CTREPCMData.h"
+#include "wpi/hal/simulation/CTREPCMData.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/simulation/CallbackStore.cpp

@@ -9,12 +9,12 @@
 #include <cstdio>
 #include <memory>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "SimulatorJNI.h"
-#include "hal/Types.h"
-#include "hal/Value.h"
-#include "hal/handles/UnlimitedHandleResource.h"
+#include "wpi/hal/Types.h"
+#include "wpi/hal/Value.h"
+#include "wpi/hal/handles/UnlimitedHandleResource.h"
 
 using namespace hal;
 using namespace hal::sim;

hal/src/main/native/cpp/jni/simulation/CallbackStore.h

@@ -6,13 +6,13 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "SimulatorJNI.h"
-#include "hal/Types.h"
-#include "hal/Value.h"
-#include "hal/handles/UnlimitedHandleResource.h"
-#include "hal/simulation/NotifyListener.h"
+#include "wpi/hal/Types.h"
+#include "wpi/hal/Value.h"
+#include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/hal/simulation/NotifyListener.h"
 
 namespace hal::sim {
 class CallbackStore {

hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp

@@ -9,11 +9,11 @@
 #include <cstdio>
 #include <memory>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "SimulatorJNI.h"
-#include "hal/Types.h"
-#include "hal/handles/UnlimitedHandleResource.h"
+#include "wpi/hal/Types.h"
+#include "wpi/hal/handles/UnlimitedHandleResource.h"
 
 using namespace hal;
 using namespace hal::sim;

hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.h

@@ -6,13 +6,13 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "SimulatorJNI.h"
-#include "hal/Types.h"
-#include "hal/Value.h"
-#include "hal/handles/UnlimitedHandleResource.h"
-#include "hal/simulation/NotifyListener.h"
+#include "wpi/hal/Types.h"
+#include "wpi/hal/Value.h"
+#include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/hal/simulation/NotifyListener.h"
 
 namespace hal::sim {
 class ConstBufferCallbackStore {

hal/src/main/native/cpp/jni/simulation/DIODataJNI.cpp

@@ -6,7 +6,7 @@
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_DIODataJNI.h"
-#include "hal/simulation/DIOData.h"
+#include "wpi/hal/simulation/DIOData.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/simulation/DigitalPWMDataJNI.cpp

@@ -6,7 +6,7 @@
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_DigitalPWMDataJNI.h"
-#include "hal/simulation/DigitalPWMData.h"
+#include "wpi/hal/simulation/DigitalPWMData.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/simulation/DriverStationDataJNI.cpp

@@ -4,13 +4,13 @@
 
 #include <jni.h>
 
-#include <wpi/StringExtras.h>
-#include <wpi/jni_util.h>
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/jni_util.hpp"
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_DriverStationDataJNI.h"
-#include "hal/simulation/DriverStationData.h"
-#include "hal/simulation/MockHooks.h"
+#include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/hal/simulation/MockHooks.h"
 
 using namespace hal;
 using namespace wpi::java;

hal/src/main/native/cpp/jni/simulation/DutyCycleDataJNI.cpp

@@ -6,7 +6,7 @@
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_DutyCycleDataJNI.h"
-#include "hal/simulation/DutyCycleData.h"
+#include "wpi/hal/simulation/DutyCycleData.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/simulation/EncoderDataJNI.cpp

@@ -6,7 +6,7 @@
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_EncoderDataJNI.h"
-#include "hal/simulation/EncoderData.h"
+#include "wpi/hal/simulation/EncoderData.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/simulation/I2CDataJNI.cpp

@@ -8,7 +8,7 @@
 #include "CallbackStore.h"
 #include "ConstBufferCallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_I2CDataJNI.h"
-#include "hal/simulation/I2CData.h"
+#include "wpi/hal/simulation/I2CData.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/simulation/NotifierDataJNI.cpp

@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include "org_wpilib_hardware_hal_simulation_NotifierDataJNI.h"
-#include "hal/simulation/NotifierData.h"
+#include "wpi/hal/simulation/NotifierData.h"
 
 extern "C" {
 

hal/src/main/native/cpp/jni/simulation/PWMDataJNI.cpp

@@ -6,7 +6,7 @@
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_PWMDataJNI.h"
-#include "hal/simulation/PWMData.h"
+#include "wpi/hal/simulation/PWMData.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/simulation/PowerDistributionDataJNI.cpp

@@ -6,7 +6,7 @@
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_PowerDistributionDataJNI.h"
-#include "hal/simulation/PowerDistributionData.h"
+#include "wpi/hal/simulation/PowerDistributionData.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/simulation/REVPHDataJNI.cpp

@@ -6,7 +6,7 @@
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_REVPHDataJNI.h"
-#include "hal/simulation/REVPHData.h"
+#include "wpi/hal/simulation/REVPHData.h"
 
 using namespace hal;
 

hal/src/main/native/cpp/jni/simulation/RoboRioDataJNI.cpp

@@ -4,11 +4,11 @@
 
 #include <jni.h>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "CallbackStore.h"
 #include "org_wpilib_hardware_hal_simulation_RoboRioDataJNI.h"
-#include "hal/simulation/RoboRioData.h"
+#include "wpi/hal/simulation/RoboRioData.h"
 
 using namespace hal;
 using namespace wpi::java;

hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp

@@ -12,12 +12,12 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "SimulatorJNI.h"
 #include "org_wpilib_hardware_hal_simulation_SimDeviceDataJNI.h"
-#include "hal/handles/UnlimitedHandleResource.h"
-#include "hal/simulation/SimDeviceData.h"
+#include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 
 using namespace hal;
 using namespace wpi::java;

hal/src/main/native/cpp/jni/simulation/SimulatorJNI.cpp

@@ -4,16 +4,16 @@
 
 #include "SimulatorJNI.h"
 
-#include <wpi/jni_util.h>
+#include "wpi/util/jni_util.hpp"
 
 #include "BufferCallbackStore.h"
 #include "CallbackStore.h"
 #include "ConstBufferCallbackStore.h"
 #include "SimDeviceDataJNI.h"
 #include "org_wpilib_hardware_hal_simulation_SimulatorJNI.h"
-#include "hal/HAL.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/simulation/MockHooks.h"
+#include "wpi/hal/HAL.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/simulation/MockHooks.h"
 
 using namespace wpi::java;
 

hal/src/main/native/cpp/jni/simulation/SimulatorJNI.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "hal/Types.h"
+#include "wpi/hal/Types.h"
 #include "jni.h"
 
 using SIM_JniHandle = HAL_Handle;  // NOLINT

hal/src/main/native/cpp/proto/ControlDataProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
-#include "hal/proto/ControlData.h"
+#include "wpi/hal/proto/ControlData.h"
 
 static_assert(sizeof(mrc::ControlFlags) == sizeof(uint32_t));
 

hal/src/main/native/cpp/proto/ErrorInfoProto.cpp

@@ -5,9 +5,9 @@
 #include <string>
 #include <utility>
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
-#include "hal/proto/ErrorInfo.h"
+#include "wpi/hal/proto/ErrorInfo.h"
 
 std::optional<mrc::ErrorInfo> wpi::Protobuf<mrc::ErrorInfo>::Unpack(
     InputStream& Stream) {

hal/src/main/native/cpp/proto/JoystickDescriptorProto.cpp

@@ -5,9 +5,9 @@
 #include <string>
 #include <utility>
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
-#include "hal/proto/JoystickDescriptor.h"
+#include "wpi/hal/proto/JoystickDescriptor.h"
 
 std::optional<mrc::JoystickDescriptor>
 wpi::Protobuf<mrc::JoystickDescriptor>::Unpack(InputStream& Stream) {

hal/src/main/native/cpp/proto/JoystickRumbleDataProto.cpp

@@ -2,9 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
-#include "hal/proto/JoystickRumbleData.h"
+#include "wpi/hal/proto/JoystickRumbleData.h"
 
 std::optional<mrc::JoystickRumbleData>
 wpi::Protobuf<mrc::JoystickRumbleData>::Unpack(InputStream& Stream) {

hal/src/main/native/cpp/proto/MatchInfoProto.cpp

@@ -5,9 +5,9 @@
 #include <string>
 #include <utility>
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
-#include "hal/proto/MatchInfo.h"
+#include "wpi/hal/proto/MatchInfo.h"
 
 std::optional<mrc::MatchInfo> wpi::Protobuf<mrc::MatchInfo>::Unpack(
     InputStream& Stream) {

hal/src/main/native/cpp/proto/OpModeProto.cpp

@@ -6,9 +6,9 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/protobuf/ProtobufCallbacks.h>
+#include "wpi/util/protobuf/ProtobufCallbacks.hpp"
 
-#include "hal/proto/OpMode.h"
+#include "wpi/hal/proto/OpMode.h"
 
 std::optional<mrc::OpMode> wpi::Protobuf<mrc::OpMode>::Unpack(
     InputStream& Stream) {