SCRIPT Run cc include replacements

hal/src/main/native/systemcore/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 <stdint.h>
 
@@ -12,8 +12,8 @@
 #include <thread>
 
 #include <fmt/format.h>
-#include <networktables/NetworkTableInstance.h>
-#include <networktables/RawTopic.h>
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/RawTopic.hpp"
 
 #include "AddressableLEDSimd.h"
 #include "HALInitializer.h"
@@ -21,9 +21,9 @@
 #include "PortsInternal.h"
 #include "SmartIo.h"
 #include "SystemServerInternal.h"
-#include "hal/AddressableLEDTypes.h"
-#include "hal/Errors.h"
-#include "hal/cpp/fpga_clock.h"
+#include "wpi/hal/AddressableLEDTypes.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/cpp/fpga_clock.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/AddressableLEDSimd.h

@@ -5,7 +5,7 @@
 #pragma once
 #include <utility>
 
-#include "hal/AddressableLEDTypes.h"
+#include "wpi/hal/AddressableLEDTypes.h"
 #include "simd/simd.h"
 
 namespace hal::detail {

hal/src/main/native/systemcore/AnalogInput.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/AnalogInput.h"
+#include "wpi/hal/AnalogInput.h"
 
 #include <cstdio>
 #include <thread>
 
-#include <wpi/mutex.h>
+#include "wpi/util/mutex.hpp"
 
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
 #include "SmartIo.h"
-#include "hal/Errors.h"
-#include "hal/cpp/fpga_clock.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/cpp/fpga_clock.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 namespace hal::init {
 void InitializeAnalogInput() {}

hal/src/main/native/systemcore/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 <linux/can.h>
 #include <linux/can/raw.h>
@@ -17,19 +17,19 @@
 #include <utility>
 #include <vector>
 
-#include <wpi/DenseMap.h>
-#include <wpi/circular_buffer.h>
-#include <wpi/mutex.h>
-#include <wpi/print.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/circular_buffer.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 #include "PortsInternal.h"
-#include "hal/Errors.h"
-#include "hal/Threads.h"
-#include "hal/handles/UnlimitedHandleResource.h"
-#include "wpinet/EventLoopRunner.h"
-#include "wpinet/uv/Poll.h"
-#include "wpinet/uv/Timer.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/Threads.h"
+#include "wpi/hal/handles/UnlimitedHandleResource.h"
+#include "wpi/net/EventLoopRunner.hpp"
+#include "wpi/net/uv/Poll.hpp"
+#include "wpi/net/uv/Timer.hpp"
 
 using namespace hal;
 

hal/src/main/native/systemcore/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/systemcore/CTREPCM.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/CTREPCM.h"
+#include "wpi/hal/CTREPCM.h"
 
 #include <string>
 
@@ -11,9 +11,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/CANAPI.h"
-#include "hal/Errors.h"
-#include "hal/handles/IndexedHandleResource.h"
+#include "wpi/hal/CANAPI.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/CTREPDP.cpp

@@ -7,15 +7,15 @@
 #include <string>
 
 #include <fmt/format.h>
-#include <wpi/mutex.h>
+#include "wpi/util/mutex.hpp"
 
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/CAN.h"
-#include "hal/CANAPI.h"
-#include "hal/Errors.h"
-#include "hal/handles/IndexedHandleResource.h"
+#include "wpi/hal/CAN.h"
+#include "wpi/hal/CANAPI.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/CTREPDP.h

@@ -6,8 +6,8 @@
 
 #include <stdint.h>
 
-#include "hal/PowerDistribution.h"
-#include "hal/Types.h"
+#include "wpi/hal/PowerDistribution.h"
+#include "wpi/hal/Types.h"
 
 /**
  * @defgroup hal_pdp PDP Functions

hal/src/main/native/systemcore/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/systemcore/Counter.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/Counter.h"
+#include "wpi/hal/Counter.h"
 
 #include <cstdio>
 #include <limits>
@@ -15,9 +15,9 @@
 #include "HALInternal.h"
 #include "PortsInternal.h"
 #include "SmartIo.h"
-#include "hal/HAL.h"
-#include "hal/cpp/fpga_clock.h"
-#include "hal/handles/LimitedHandleResource.h"
+#include "wpi/hal/HAL.h"
+#include "wpi/hal/cpp/fpga_clock.h"
+#include "wpi/hal/handles/LimitedHandleResource.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/DIO.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/DIO.h"
+#include "wpi/hal/DIO.h"
 
 #include <cmath>
 #include <cstdio>
@@ -12,10 +12,10 @@
 #include "HALInternal.h"
 #include "PortsInternal.h"
 #include "SmartIo.h"
-#include "hal/Errors.h"
-#include "hal/cpp/fpga_clock.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/handles/LimitedHandleResource.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/cpp/fpga_clock.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/LimitedHandleResource.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/DutyCycle.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/DutyCycle.h"
+#include "wpi/hal/DutyCycle.h"
 
 #include <cstdio>
 #include <memory>
@@ -12,10 +12,10 @@
 #include "HALInternal.h"
 #include "PortsInternal.h"
 #include "SmartIo.h"
-#include "hal/Errors.h"
-#include "hal/cpp/fpga_clock.h"
-#include "hal/handles/HandlesInternal.h"
-#include "hal/handles/LimitedHandleResource.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/cpp/fpga_clock.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/LimitedHandleResource.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/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 <memory>
 
@@ -11,9 +11,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/Counter.h"
-#include "hal/Errors.h"
-#include "hal/handles/LimitedClassedHandleResource.h"
+#include "wpi/hal/Counter.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/LimitedClassedHandleResource.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/FRCDriverStation.cpp

@@ -14,29 +14,29 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include <networktables/BooleanTopic.h>
-#include <networktables/IntegerTopic.h>
-#include <networktables/NetworkTableInstance.h>
-#include <networktables/ProtobufTopic.h>
-#include <networktables/StringArrayTopic.h>
-#include <networktables/StringTopic.h>
-#include <wpi/EventVector.h>
-#include <wpi/SafeThread.h>
-#include <wpi/SmallVector.h>
-#include <wpi/condition_variable.h>
-#include <wpi/mutex.h>
-#include <wpi/timestamp.h>
+#include "wpi/nt/BooleanTopic.hpp"
+#include "wpi/nt/IntegerTopic.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/ProtobufTopic.hpp"
+#include "wpi/nt/StringArrayTopic.hpp"
+#include "wpi/nt/StringTopic.hpp"
+#include "wpi/util/EventVector.hpp"
+#include "wpi/util/SafeThread.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/condition_variable.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/timestamp.h"
 
 #include "HALInitializer.h"
 #include "SystemServerInternal.h"
-#include "hal/DriverStation.h"
-#include "hal/Errors.h"
-#include "hal/proto/ControlData.h"
-#include "hal/proto/ErrorInfo.h"
-#include "hal/proto/JoystickDescriptor.h"
-#include "hal/proto/JoystickRumbleData.h"
-#include "hal/proto/MatchInfo.h"
-#include "hal/proto/OpMode.h"
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/proto/ControlData.h"
+#include "wpi/hal/proto/ErrorInfo.h"
+#include "wpi/hal/proto/JoystickDescriptor.h"
+#include "wpi/hal/proto/JoystickRumbleData.h"
+#include "wpi/hal/proto/MatchInfo.h"
+#include "wpi/hal/proto/OpMode.h"
 #include "mrc/NtNetComm.h"
 
 static_assert(sizeof(int32_t) >= sizeof(int),

hal/src/main/native/systemcore/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 <dlfcn.h>
 #include <signal.h>  // linux for kill
@@ -17,21 +17,21 @@
 #include <thread>
 #include <utility>
 
-#include <wpi/MemoryBuffer.h>
-#include <wpi/StringExtras.h>
-#include <wpi/fs.h>
-#include <wpi/mutex.h>
-#include <wpi/print.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/MemoryBuffer.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fs.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/util/timestamp.h"
 
 #include "CANInternal.h"
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "SystemServerInternal.h"
-#include "hal/DriverStation.h"
-#include "hal/Errors.h"
-#include "hal/Notifier.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/Notifier.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/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/systemcore/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 <fcntl.h>
 #include <linux/i2c-dev.h>
@@ -13,14 +13,14 @@
 #include <cstring>
 
 #include <fmt/format.h>
-#include <wpi/mutex.h>
-#include <wpi/print.h>
+#include "wpi/util/mutex.hpp"
+#include "wpi/util/print.hpp"
 
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/DIO.h"
-#include "hal/HAL.h"
+#include "wpi/hal/DIO.h"
+#include "wpi/hal/HAL.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/IMU.cpp

@@ -2,17 +2,17 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "hal/IMU.h"
+#include "wpi/hal/IMU.h"
 
 #include <numbers>
 
-#include <networktables/DoubleArrayTopic.h>
-#include <networktables/DoubleTopic.h>
-#include <networktables/NetworkTableInstance.h>
+#include "wpi/nt/DoubleArrayTopic.hpp"
+#include "wpi/nt/DoubleTopic.hpp"
+#include "wpi/nt/NetworkTableInstance.hpp"
 
 #include "HALInitializer.h"
 #include "SystemServerInternal.h"
-#include "hal/Errors.h"
+#include "wpi/hal/Errors.h"
 
 #define IMU_PREFIX "/imu/"
 

hal/src/main/native/systemcore/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,17 +12,17 @@
 #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 "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/systemcore/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>
@@ -10,15 +10,15 @@
 #include <thread>
 
 #include <fmt/format.h>
-#include <wpi/print.h>
+#include "wpi/util/print.hpp"
 
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
 #include "SmartIo.h"
-#include "hal/Errors.h"
-#include "hal/cpp/fpga_clock.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/cpp/fpga_clock.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/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/systemcore/Power.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/Power.h"
+#include "wpi/hal/Power.h"
 
 #include <memory>
 
-#include <networktables/DoubleTopic.h>
+#include "wpi/nt/DoubleTopic.hpp"
 
 #include "HALInitializer.h"
 #include "SystemServerInternal.h"
-#include "hal/Errors.h"
+#include "wpi/hal/Errors.h"
 #include "mrc/NtNetComm.h"
 
 using namespace hal;

hal/src/main/native/systemcore/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 <cstring>
 #include <thread>
@@ -11,9 +11,9 @@
 #include "HALInternal.h"
 #include "PortsInternal.h"
 #include "REVPDH.h"
-#include "hal/Errors.h"
-#include "hal/HALBase.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 using namespace hal;
 

hal/src/main/native/systemcore/REVPDH.cpp

@@ -4,12 +4,12 @@
 
 #include "REVPDH.h"
 
-#include <hal/CAN.h>
-#include <hal/CANAPI.h>
-#include <hal/CANAPITypes.h>
-#include <hal/Errors.h>
-#include <hal/handles/HandlesInternal.h>
-#include <hal/handles/IndexedHandleResource.h>
+#include "wpi/hal/CAN.h"
+#include "wpi/hal/CANAPI.h"
+#include "wpi/hal/CANAPITypes.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 
 #include <cstring>
 #include <string>

hal/src/main/native/systemcore/REVPDH.h

@@ -6,8 +6,8 @@
 
 #include <stdint.h>
 
-#include "hal/PowerDistribution.h"
-#include "hal/Types.h"
+#include "wpi/hal/PowerDistribution.h"
+#include "wpi/hal/Types.h"
 
 /**
  * @defgroup hal_rev_pdh REV Power Distribution Hub API Functions

hal/src/main/native/systemcore/REVPH.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/REVPH.h"
+#include "wpi/hal/REVPH.h"
 
 #include <string>
 #include <thread>
@@ -12,9 +12,9 @@
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/CANAPI.h"
-#include "hal/Errors.h"
-#include "hal/handles/IndexedHandleResource.h"
+#include "wpi/hal/CANAPI.h"
+#include "wpi/hal/Errors.h"
+#include "wpi/hal/handles/IndexedHandleResource.h"
 #include "rev/PHFrames.h"
 
 using namespace hal;

hal/src/main/native/systemcore/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 <fcntl.h>
 #include <sys/ioctl.h>
@@ -21,8 +21,8 @@
 #include <fmt/format.h>
 
 #include "HALInternal.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::init {
 void InitializeSerialPort() {}

hal/src/main/native/systemcore/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"
 
 extern "C" {
 

hal/src/main/native/systemcore/SmartIo.cpp

@@ -8,8 +8,8 @@
 
 #include "HALInitializer.h"
 #include "SystemServerInternal.h"
-#include "hal/AddressableLEDTypes.h"
-#include "hal/Errors.h"
+#include "wpi/hal/AddressableLEDTypes.h"
+#include "wpi/hal/Errors.h"
 
 namespace hal {
 

hal/src/main/native/systemcore/SmartIo.h

@@ -6,11 +6,11 @@
 
 #include <string>
 
-#include <networktables/IntegerTopic.h>
+#include "wpi/nt/IntegerTopic.hpp"
 
 #include "PortsInternal.h"
-#include "hal/handles/DigitalHandleResource.h"
-#include "hal/handles/HandlesInternal.h"
+#include "wpi/hal/handles/DigitalHandleResource.h"
+#include "wpi/hal/handles/HandlesInternal.h"
 
 namespace hal {
 

hal/src/main/native/systemcore/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"
 
 #include "SystemServerInternal.h"
 #include "mrc/NtNetComm.h"

hal/src/main/native/systemcore/SystemServerInternal.h

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <networktables/NetworkTableInstance.h>
+#include "wpi/nt/NetworkTableInstance.hpp"
 
 namespace hal {
 void InitializeSystemServer();

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

hal/src/main/native/systemcore/UsageReporting.cpp

@@ -5,10 +5,10 @@
 #include <stdint.h>
 
 #include <fmt/format.h>
-#include <networktables/NetworkTableInstance.h>
-#include <networktables/StringTopic.h>
-#include <wpi/StringMap.h>
-#include <wpi/string.h>
+#include "wpi/nt/NetworkTableInstance.hpp"
+#include "wpi/nt/StringTopic.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/string.h"
 
 #include "SystemServerInternal.h"
 

hal/src/main/native/systemcore/mockdata/AddressableLEDData.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 "hal/simulation/AddressableLEDData.h"
+#include "wpi/hal/simulation/AddressableLEDData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 

hal/src/main/native/systemcore/mockdata/AnalogInData.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 "hal/simulation/AnalogInData.h"
+#include "wpi/hal/simulation/AnalogInData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 void HALSIM_ResetAnalogInData(int32_t index) {}

hal/src/main/native/systemcore/mockdata/CTREPCMData.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 "hal/simulation/CTREPCMData.h"
+#include "wpi/hal/simulation/CTREPCMData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 void HALSIM_ResetCTREPCMData(int32_t index) {}

hal/src/main/native/systemcore/mockdata/CanDataInternal.cpp

@@ -2,8 +2,8 @@
 // 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/CanData.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/CanData.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 

hal/src/main/native/systemcore/mockdata/DIOData.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 "hal/simulation/DIOData.h"
+#include "wpi/hal/simulation/DIOData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 void HALSIM_ResetDIOData(int32_t index) {}

hal/src/main/native/systemcore/mockdata/DigitalPWMData.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 "hal/simulation/DigitalPWMData.h"
+#include "wpi/hal/simulation/DigitalPWMData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 int32_t HALSIM_FindDigitalPWMForChannel(int32_t channel) {

hal/src/main/native/systemcore/mockdata/DriverStationData.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 "hal/simulation/DriverStationData.h"
+#include "wpi/hal/simulation/DriverStationData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 void HALSIM_ResetDriverStationData(void) {}

hal/src/main/native/systemcore/mockdata/DutyCycleData.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 "hal/simulation/DutyCycleData.h"
+#include "wpi/hal/simulation/DutyCycleData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 

hal/src/main/native/systemcore/mockdata/EncoderData.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 "hal/simulation/EncoderData.h"
+#include "wpi/hal/simulation/EncoderData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 int32_t HALSIM_FindEncoderForChannel(int32_t channel) {

hal/src/main/native/systemcore/mockdata/I2CData.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 "hal/simulation/I2CData.h"
+#include "wpi/hal/simulation/I2CData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 void HALSIM_ResetI2CData(int32_t index) {}

hal/src/main/native/systemcore/mockdata/MockHooks.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/simulation/MockHooks.h"
+#include "wpi/hal/simulation/MockHooks.h"
 
 extern "C" {
 

hal/src/main/native/systemcore/mockdata/NotifierData.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/simulation/NotifierData.h"
+#include "wpi/hal/simulation/NotifierData.h"
 
 extern "C" {
 

hal/src/main/native/systemcore/mockdata/PWMData.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 "hal/simulation/PWMData.h"
+#include "wpi/hal/simulation/PWMData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 void HALSIM_ResetPWMData(int32_t index) {}

hal/src/main/native/systemcore/mockdata/PowerDistributionData.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/simulation/PowerDistributionData.h"
+#include "wpi/hal/simulation/PowerDistributionData.h"
 
 #include "../PortsInternal.h"
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 void HALSIM_ResetPowerDistributionData(int32_t index) {}

hal/src/main/native/systemcore/mockdata/REVPHData.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 "hal/simulation/REVPHData.h"
+#include "wpi/hal/simulation/REVPHData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 void HALSIM_ResetREVPHData(int32_t index) {}

hal/src/main/native/systemcore/mockdata/RoboRioData.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 "hal/simulation/RoboRioData.h"
+#include "wpi/hal/simulation/RoboRioData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {
 void HALSIM_ResetRoboRioData(void) {}

hal/src/main/native/systemcore/mockdata/SimDeviceData.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 "hal/simulation/SimDeviceData.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 
-#include "hal/simulation/SimDataValue.h"
+#include "wpi/hal/simulation/SimDataValue.h"
 
 extern "C" {