SCRIPT Run cc include replacements

simulation/halsim_ds_socket/src/dev/native/cpp/main.cpp

@@ -4,8 +4,8 @@
 
 #include <thread>
 
-#include <hal/DriverStation.h>
-#include <hal/HALBase.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/HALBase.h"
 
 extern "C" int HALSIM_InitExtension(void);
 

simulation/halsim_ds_socket/src/main/native/cpp/DSCommPacket.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 "DSCommPacket.h"
+#include "wpi/halsim/ds_socket/DSCommPacket.hpp"
 
 #include <algorithm>
 #include <chrono>
@@ -11,8 +11,8 @@
 #include <thread>
 #include <vector>
 
-#include <hal/simulation/DriverStationData.h>
-#include <hal/simulation/MockHooks.h>
+#include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/hal/simulation/MockHooks.h"
 
 using namespace halsim;
 

simulation/halsim_ds_socket/src/main/native/cpp/main.cpp

@@ -20,15 +20,15 @@
 #include <memory>
 #include <string_view>
 
-#include <DSCommPacket.h>
-#include <hal/Extensions.h>
-#include <wpi/print.h>
-#include <wpinet/EventLoopRunner.h>
-#include <wpinet/raw_uv_ostream.h>
-#include <wpinet/uv/Tcp.h>
-#include <wpinet/uv/Timer.h>
-#include <wpinet/uv/Udp.h>
-#include <wpinet/uv/util.h>
+#include "wpi/halsim/ds_socket/DSCommPacket.hpp"
+#include "wpi/hal/Extensions.h"
+#include "wpi/util/print.hpp"
+#include "wpi/net/EventLoopRunner.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
+#include "wpi/net/uv/Tcp.hpp"
+#include "wpi/net/uv/Timer.hpp"
+#include "wpi/net/uv/Udp.hpp"
+#include "wpi/net/uv/util.hpp"
 
 #if defined(Win32) || defined(_WIN32)
 #pragma comment(lib, "Ws2_32.lib")

simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommJoystickPacket.hpp

@@ -6,7 +6,7 @@
 
 #include <cstring>
 
-#include <hal/DriverStationTypes.h>
+#include "wpi/hal/DriverStationTypes.h"
 
 namespace halsim {
 

simulation/halsim_ds_socket/src/main/native/include/wpi/halsim/ds_socket/DSCommPacket.hpp

@@ -7,9 +7,9 @@
 #include <array>
 #include <span>
 
-#include <DSCommJoystickPacket.h>
-#include <hal/simulation/DriverStationData.h>
-#include <wpinet/raw_uv_ostream.h>
+#include "wpi/halsim/ds_socket/DSCommJoystickPacket.hpp"
+#include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/net/raw_uv_ostream.hpp"
 
 class DSCommPacketTest;
 

simulation/halsim_ds_socket/src/test/native/cpp/DSCommPacketTest.cpp

@@ -4,7 +4,7 @@
 
 #include <gtest/gtest.h>
 
-#include "DSCommPacket.h"
+#include "wpi/halsim/ds_socket/DSCommPacket.hpp"
 
 class DSCommPacketTest : public ::testing::Test {
  public:

simulation/halsim_ds_socket/src/test/native/cpp/main.cpp

@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include <hal/HALBase.h>
+#include "wpi/hal/HALBase.h"
 
 int main(int argc, char** argv) {
   HAL_Initialize(500, 0);

simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.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 "AddressableLEDGui.h"
+#include "AddressableLEDGui.hpp"
 
 #include <memory>
 #include <vector>
 
-#include <glass/hardware/LEDDisplay.h>
-#include <hal/Ports.h>
-#include <hal/simulation/AddressableLEDData.h>
+#include "wpi/glass/hardware/LEDDisplay.hpp"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/AddressableLEDData.h"
 #include <imgui.h>
 
-#include "HALSimGui.h"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp

@@ -2,19 +2,19 @@
 // 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 "AnalogInputSimGui.h"
+#include "AnalogInputSimGui.hpp"
 
 #include <memory>
 #include <vector>
 
-#include <glass/View.h>
-#include <glass/hardware/AnalogInput.h>
-#include <hal/Ports.h>
-#include <hal/simulation/AnalogInData.h>
-#include <hal/simulation/SimDeviceData.h>
+#include "wpi/glass/View.hpp"
+#include "wpi/glass/hardware/AnalogInput.hpp"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/AnalogInData.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 
-#include "HALDataSource.h"
-#include "HALSimGui.h"
+#include "wpi/halsim/gui/HALDataSource.hpp"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp

@@ -2,23 +2,23 @@
 // 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 "DIOSimGui.h"
+#include "DIOSimGui.hpp"
 
 #include <memory>
 #include <vector>
 
-#include <glass/hardware/DIO.h>
-#include <glass/hardware/Encoder.h>
-#include <hal/Ports.h>
-#include <hal/simulation/DIOData.h>
-#include <hal/simulation/DigitalPWMData.h>
-#include <hal/simulation/DutyCycleData.h>
-#include <hal/simulation/EncoderData.h>
-#include <hal/simulation/SimDeviceData.h>
+#include "wpi/glass/hardware/DIO.hpp"
+#include "wpi/glass/hardware/Encoder.hpp"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/DIOData.h"
+#include "wpi/hal/simulation/DigitalPWMData.h"
+#include "wpi/hal/simulation/DutyCycleData.h"
+#include "wpi/hal/simulation/EncoderData.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 
-#include "EncoderSimGui.h"
-#include "HALDataSource.h"
-#include "HALSimGui.h"
+#include "EncoderSimGui.hpp"
+#include "wpi/halsim/gui/HALDataSource.hpp"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/DriverStationGui.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 "DriverStationGui.h"
+#include "DriverStationGui.hpp"
 
 #include <algorithm>
 #include <atomic>
@@ -14,22 +14,22 @@
 
 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
-#include <glass/Context.h>
-#include <glass/Storage.h>
-#include <glass/other/FMS.h>
-#include <glass/support/ExtraGuiWidgets.h>
-#include <glass/support/NameSetting.h>
-#include <hal/DriverStationTypes.h>
-#include <hal/simulation/DriverStationData.h>
-#include <hal/simulation/MockHooks.h>
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/other/FMS.hpp"
+#include "wpi/glass/support/ExtraGuiWidgets.hpp"
+#include "wpi/glass/support/NameSetting.hpp"
+#include "wpi/hal/DriverStationTypes.h"
+#include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/hal/simulation/MockHooks.h"
 #include <imgui.h>
 #include <imgui_internal.h>
-#include <wpi/SmallVector.h>
-#include <wpi/StringExtras.h>
-#include <wpigui.h>
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/gui/wpigui.hpp"
 
-#include "HALDataSource.h"
-#include "HALSimGui.h"
+#include "wpi/halsim/gui/HALDataSource.hpp"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/DriverStationGui.hpp

@@ -7,7 +7,7 @@
 #include <memory>
 #include <string_view>
 
-#include <glass/WindowManager.h>
+#include "wpi/glass/WindowManager.hpp"
 
 namespace halsimgui {
 

simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.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 "EncoderSimGui.h"
+#include "EncoderSimGui.hpp"
 
 #include <stdint.h>
 
@@ -12,13 +12,13 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include <glass/DataSource.h>
-#include <glass/hardware/Encoder.h>
-#include <hal/Ports.h>
-#include <hal/simulation/EncoderData.h>
-#include <hal/simulation/SimDeviceData.h>
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/hardware/Encoder.hpp"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/EncoderData.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 
-#include "HALSimGui.h"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/HALProvider.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 "HALProvider.h"
+#include "wpi/halsim/gui/HALProvider.hpp"
 
 #include <string>
 #include <utility>
 
-#include <glass/Model.h>
-#include <glass/Storage.h>
-#include <hal/simulation/DriverStationData.h>
+#include "wpi/glass/Model.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/hal/simulation/DriverStationData.h"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/HALSimGui.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 "HALSimGui.h"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 #include <memory>
 #include <utility>
 
-#include <glass/Context.h>
-#include <glass/Storage.h>
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
 #include <imgui.h>
-#include <wpigui.h>
+#include "wpi/gui/wpigui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.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 "NetworkTablesSimGui.h"
+#include "NetworkTablesSimGui.hpp"
 
 #include <memory>
 
-#include <glass/Context.h>
-#include <glass/Storage.h>
-#include <glass/networktables/NetworkTables.h>
-#include <wpigui.h>
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/networktables/NetworkTables.hpp"
+#include "wpi/gui/wpigui.hpp"
 
-#include "HALSimGui.h"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/PCMSimGui.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 "PCMSimGui.h"
+#include "PCMSimGui.hpp"
 
 #include <cstdio>
 #include <memory>
 #include <vector>
 
-#include <glass/hardware/Pneumatic.h>
-#include <glass/other/DeviceTree.h>
-#include <hal/Ports.h>
-#include <hal/Value.h>
-#include <hal/simulation/CTREPCMData.h>
+#include "wpi/glass/hardware/Pneumatic.hpp"
+#include "wpi/glass/other/DeviceTree.hpp"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/Value.h"
+#include "wpi/hal/simulation/CTREPCMData.h"
 
-#include "HALDataSource.h"
-#include "HALSimGui.h"
-#include "SimDeviceGui.h"
+#include "wpi/halsim/gui/HALDataSource.hpp"
+#include "wpi/halsim/gui/HALSimGui.hpp"
+#include "wpi/halsim/gui/SimDeviceGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/PCMSimGui.hpp

@@ -5,7 +5,7 @@
 #pragma once
 #include <memory>
 
-#include <glass/hardware/Pneumatic.h>
+#include "wpi/glass/hardware/Pneumatic.hpp"
 
 namespace halsimgui {
 

simulation/halsim_gui/src/main/native/cpp/PHSimGui.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 "PHSimGui.h"
+#include "PHSimGui.hpp"
 
 #include <cstdio>
 #include <memory>
 #include <vector>
 
-#include <glass/hardware/Pneumatic.h>
-#include <glass/other/DeviceTree.h>
-#include <hal/Ports.h>
-#include <hal/Value.h>
-#include <hal/simulation/REVPHData.h>
+#include "wpi/glass/hardware/Pneumatic.hpp"
+#include "wpi/glass/other/DeviceTree.hpp"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/Value.h"
+#include "wpi/hal/simulation/REVPHData.h"
 
-#include "HALDataSource.h"
-#include "HALSimGui.h"
-#include "SimDeviceGui.h"
+#include "wpi/halsim/gui/HALDataSource.hpp"
+#include "wpi/halsim/gui/HALSimGui.hpp"
+#include "wpi/halsim/gui/SimDeviceGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/PHSimGui.hpp

@@ -5,7 +5,7 @@
 #pragma once
 #include <memory>
 
-#include <glass/hardware/Pneumatic.h>
+#include "wpi/glass/hardware/Pneumatic.hpp"
 
 namespace halsimgui {
 

simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp

@@ -2,18 +2,18 @@
 // 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 "PWMSimGui.h"
+#include "PWMSimGui.hpp"
 
 #include <memory>
 #include <vector>
 
-#include <glass/hardware/PWM.h>
-#include <hal/Ports.h>
-#include <hal/simulation/AddressableLEDData.h>
-#include <hal/simulation/PWMData.h>
+#include "wpi/glass/hardware/PWM.hpp"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/AddressableLEDData.h"
+#include "wpi/hal/simulation/PWMData.h"
 
-#include "HALDataSource.h"
-#include "HALSimGui.h"
+#include "wpi/halsim/gui/HALDataSource.hpp"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp

@@ -2,19 +2,19 @@
 // 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 "PowerDistributionSimGui.h"
+#include "PowerDistributionSimGui.hpp"
 
 #include <cstdio>
 #include <cstring>
 #include <memory>
 #include <vector>
 
-#include <glass/hardware/PowerDistribution.h>
-#include <hal/Ports.h>
-#include <hal/simulation/PowerDistributionData.h>
+#include "wpi/glass/hardware/PowerDistribution.hpp"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/PowerDistributionData.h"
 
-#include "HALDataSource.h"
-#include "HALSimGui.h"
+#include "wpi/halsim/gui/HALDataSource.hpp"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.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 "RoboRioSimGui.h"
+#include "RoboRioSimGui.hpp"
 
 #include <memory>
 
-#include <glass/hardware/RoboRio.h>
-#include <hal/simulation/RoboRioData.h>
+#include "wpi/glass/hardware/RoboRio.hpp"
+#include "wpi/hal/simulation/RoboRioData.h"
 
-#include "HALDataSource.h"
-#include "HALSimGui.h"
+#include "wpi/halsim/gui/HALDataSource.hpp"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.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 "SimDeviceGui.h"
+#include "wpi/halsim/gui/SimDeviceGui.hpp"
 
 #include <stdint.h>
 
@@ -10,14 +10,14 @@
 #include <utility>
 
 #include <fmt/format.h>
-#include <glass/other/DeviceTree.h>
-#include <hal/SimDevice.h>
-#include <hal/simulation/SimDeviceData.h>
-#include <wpi/DenseMap.h>
-#include <wpi/StringExtras.h>
+#include "wpi/glass/other/DeviceTree.hpp"
+#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
+#include "wpi/util/DenseMap.hpp"
+#include "wpi/util/StringExtras.hpp"
 
-#include "HALDataSource.h"
-#include "HALSimGui.h"
+#include "wpi/halsim/gui/HALDataSource.hpp"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/TimingGui.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 "TimingGui.h"
+#include "TimingGui.hpp"
 
 #include <cstdio>
 #include <cstring>
 #include <memory>
 #include <vector>
 
-#include <glass/Model.h>
-#include <glass/View.h>
-#include <hal/HALBase.h>
-#include <hal/simulation/MockHooks.h>
-#include <hal/simulation/NotifierData.h>
+#include "wpi/glass/Model.hpp"
+#include "wpi/glass/View.hpp"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/simulation/MockHooks.h"
+#include "wpi/hal/simulation/NotifierData.h"
 #include <imgui.h>
 
-#include "HALSimGui.h"
+#include "wpi/halsim/gui/HALSimGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/cpp/main.cpp

@@ -6,30 +6,30 @@
 #include <memory>
 #include <string_view>
 
-#include <glass/Context.h>
-#include <glass/Storage.h>
-#include <glass/hardware/Pneumatic.h>
-#include <glass/other/Plot.h>
-#include <hal/Extensions.h>
-#include <hal/Main.h>
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/hardware/Pneumatic.hpp"
+#include "wpi/glass/other/Plot.hpp"
+#include "wpi/hal/Extensions.h"
+#include "wpi/hal/Main.h"
 #include <imgui.h>
-#include <wpigui.h>
+#include "wpi/gui/wpigui.hpp"
 
-#include "AddressableLEDGui.h"
-#include "AnalogInputSimGui.h"
-#include "DIOSimGui.h"
-#include "DriverStationGui.h"
-#include "EncoderSimGui.h"
-#include "HALSimGui.h"
-#include "HALSimGuiExt.h"
-#include "NetworkTablesSimGui.h"
-#include "PCMSimGui.h"
-#include "PHSimGui.h"
-#include "PWMSimGui.h"
-#include "PowerDistributionSimGui.h"
-#include "RoboRioSimGui.h"
-#include "SimDeviceGui.h"
-#include "TimingGui.h"
+#include "AddressableLEDGui.hpp"
+#include "AnalogInputSimGui.hpp"
+#include "DIOSimGui.hpp"
+#include "DriverStationGui.hpp"
+#include "EncoderSimGui.hpp"
+#include "wpi/halsim/gui/HALSimGui.hpp"
+#include "wpi/halsim/gui/HALSimGuiExt.hpp"
+#include "NetworkTablesSimGui.hpp"
+#include "PCMSimGui.hpp"
+#include "PHSimGui.hpp"
+#include "PWMSimGui.hpp"
+#include "PowerDistributionSimGui.hpp"
+#include "RoboRioSimGui.hpp"
+#include "wpi/halsim/gui/SimDeviceGui.hpp"
+#include "TimingGui.hpp"
 
 using namespace halsimgui;
 

simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALDataSource.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include <glass/DataSource.h>
+#include "wpi/glass/DataSource.hpp"
 
 #define HALSIMGUI_DATASOURCE(cbname, id, TYPE, Type, vtype)                   \
   class cbname##Source : public ::glass::Type##Source {                       \

simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALProvider.hpp

@@ -10,8 +10,8 @@
 #include <string_view>
 #include <vector>
 
-#include <glass/Model.h>
-#include <glass/Provider.h>
+#include "wpi/glass/Model.hpp"
+#include "wpi/glass/Provider.hpp"
 
 namespace halsimgui {
 

simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/HALSimGui.hpp

@@ -7,11 +7,11 @@
 #include <functional>
 #include <memory>
 
-#include <glass/MainMenuBar.h>
-#include <glass/WindowManager.h>
-#include <glass/networktables/NetworkTablesProvider.h>
+#include "wpi/glass/MainMenuBar.hpp"
+#include "wpi/glass/WindowManager.hpp"
+#include "wpi/glass/networktables/NetworkTablesProvider.hpp"
 
-#include "HALProvider.h"
+#include "wpi/halsim/gui/HALProvider.hpp"
 
 namespace halsimgui {
 

simulation/halsim_gui/src/main/native/include/wpi/halsim/gui/SimDeviceGui.hpp

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

simulation/halsim_gui/src/test/native/cpp/main.cpp

@@ -3,7 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <gtest/gtest.h>
-#include <hal/HALBase.h>
+#include "wpi/hal/HALBase.h"
 
 int main(int argc, char** argv) {
   HAL_Initialize(500, 0);

simulation/halsim_ws_client/src/dev/native/cpp/main.cpp

@@ -4,10 +4,10 @@
 
 #include <thread>
 
-#include <hal/DriverStation.h>
-#include <hal/HALBase.h>
-#include <hal/Main.h>
-#include <wpi/print.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Main.h"
+#include "wpi/util/print.hpp"
 
 extern "C" int HALSIM_InitExtension(void);
 

simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp

@@ -2,18 +2,18 @@
 // 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 "HALSimWS.h"
+#include "wpi/halsim/ws_client/HALSimWS.hpp"
 
 #include <cstdio>
 #include <memory>
 #include <string>
 
-#include <wpi/SmallString.h>
-#include <wpi/StringExtras.h>
-#include <wpi/print.h>
-#include <wpinet/uv/util.h>
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/net/uv/util.hpp"
 
-#include "HALSimWSClientConnection.h"
+#include "wpi/halsim/ws_client/HALSimWSClientConnection.hpp"
 
 static constexpr int kTcpConnectAttemptTimeout = 1000;
 

simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClient.cpp

@@ -2,24 +2,24 @@
 // 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 "HALSimWSClient.h"
+#include "wpi/halsim/ws_client/HALSimWSClient.hpp"
 
 #include <memory>
 
-#include <WSProviderContainer.h>
-#include <WSProvider_AddressableLED.h>
-#include <WSProvider_Analog.h>
-#include <WSProvider_DIO.h>
-#include <WSProvider_DriverStation.h>
-#include <WSProvider_Encoder.h>
-#include <WSProvider_Joystick.h>
-#include <WSProvider_PCM.h>
-#include <WSProvider_PWM.h>
-#include <WSProvider_RoboRIO.h>
-#include <WSProvider_SimDevice.h>
-#include <WSProvider_Solenoid.h>
-#include <WSProvider_dPWM.h>
-#include <wpinet/EventLoopRunner.h>
+#include "wpi/halsim/ws_core/WSProviderContainer.hpp"
+#include "wpi/halsim/ws_core/WSProvider_AddressableLED.hpp"
+#include "wpi/halsim/ws_core/WSProvider_Analog.hpp"
+#include "wpi/halsim/ws_core/WSProvider_DIO.hpp"
+#include "wpi/halsim/ws_core/WSProvider_DriverStation.hpp"
+#include "wpi/halsim/ws_core/WSProvider_Encoder.hpp"
+#include "wpi/halsim/ws_core/WSProvider_Joystick.hpp"
+#include "wpi/halsim/ws_core/WSProvider_PCM.hpp"
+#include "wpi/halsim/ws_core/WSProvider_PWM.hpp"
+#include "wpi/halsim/ws_core/WSProvider_RoboRIO.hpp"
+#include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
+#include "wpi/halsim/ws_core/WSProvider_Solenoid.hpp"
+#include "wpi/halsim/ws_core/WSProvider_dPWM.hpp"
+#include "wpi/net/EventLoopRunner.hpp"
 
 using namespace wpilibws;
 

simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.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 "HALSimWSClientConnection.h"
+#include "wpi/halsim/ws_client/HALSimWSClientConnection.hpp"
 
 #include <cstdio>
 #include <string>
 
 #include <fmt/format.h>
-#include <wpi/print.h>
-#include <wpinet/raw_uv_ostream.h>
+#include "wpi/util/print.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
 
-#include "HALSimWS.h"
+#include "wpi/halsim/ws_client/HALSimWS.hpp"
 
 namespace uv = wpi::uv;
 

simulation/halsim_ws_client/src/main/native/cpp/main.cpp

@@ -5,9 +5,9 @@
 #include <cstdio>
 #include <memory>
 
-#include <hal/Extensions.h>
+#include "wpi/hal/Extensions.h"
 
-#include "HALSimWSClient.h"
+#include "wpi/halsim/ws_client/HALSimWSClient.hpp"
 
 using namespace wpilibws;
 

simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWS.hpp

@@ -9,14 +9,14 @@
 #include <string>
 #include <string_view>
 
-#include <WSProviderContainer.h>
-#include <WSProvider_SimDevice.h>
-#include <wpi/StringMap.h>
-#include <wpi/json_fwd.h>
-#include <wpinet/uv/Async.h>
-#include <wpinet/uv/Loop.h>
-#include <wpinet/uv/Tcp.h>
-#include <wpinet/uv/Timer.h>
+#include "wpi/halsim/ws_core/WSProviderContainer.hpp"
+#include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/net/uv/Async.hpp"
+#include "wpi/net/uv/Loop.hpp"
+#include "wpi/net/uv/Tcp.hpp"
+#include "wpi/net/uv/Timer.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClient.hpp

@@ -6,11 +6,11 @@
 
 #include <memory>
 
-#include <WSProviderContainer.h>
-#include <WSProvider_SimDevice.h>
-#include <wpinet/EventLoopRunner.h>
+#include "wpi/halsim/ws_core/WSProviderContainer.hpp"
+#include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
+#include "wpi/net/EventLoopRunner.hpp"
 
-#include "HALSimWS.h"
+#include "wpi/halsim/ws_client/HALSimWS.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_client/src/main/native/include/wpi/halsim/ws_client/HALSimWSClientConnection.hpp

@@ -7,14 +7,14 @@
 #include <memory>
 #include <utility>
 
-#include <HALSimBaseWebSocketConnection.h>
-#include <wpi/json_fwd.h>
-#include <wpi/mutex.h>
-#include <wpinet/WebSocket.h>
-#include <wpinet/uv/Buffer.h>
-#include <wpinet/uv/Stream.h>
+#include "wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/net/WebSocket.hpp"
+#include "wpi/net/uv/Buffer.hpp"
+#include "wpi/net/uv/Stream.hpp"
 
-#include "HALSimWS.h"
+#include "wpi/halsim/ws_client/HALSimWS.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/cpp/WSBaseProvider.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 "WSBaseProvider.h"
+#include "wpi/halsim/ws_core/WSBaseProvider.hpp"
 
 #include <utility>
 

simulation/halsim_ws_core/src/main/native/cpp/WSHalProviders.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 "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 #include <memory>
 

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_AddressableLED.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 "WSProvider_AddressableLED.h"
+#include "wpi/halsim/ws_core/WSProvider_AddressableLED.hpp"
 
 #include <vector>
 
-#include <hal/Ports.h>
-#include <hal/simulation/AddressableLEDData.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/AddressableLEDData.h"
 
 #define REGISTER(halsim, jsonid, ctype, haltype)                          \
   HALSIM_RegisterAddressableLED##halsim##Callback(                        \

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Analog.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 "WSProvider_Analog.h"
+#include "wpi/halsim/ws_core/WSProvider_Analog.hpp"
 
-#include <hal/Ports.h>
-#include <hal/simulation/AnalogInData.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/AnalogInData.h"
 
 #define REGISTER_AIN(halsim, jsonid, ctype, haltype)                       \
   HALSIM_RegisterAnalogIn##halsim##Callback(                               \

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DIO.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 "WSProvider_DIO.h"
+#include "wpi/halsim/ws_core/WSProvider_DIO.hpp"
 
-#include <hal/Ports.h>
-#include <hal/simulation/DIOData.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/DIOData.h"
 
 #define REGISTER(halsim, jsonid, ctype, haltype)                         \
   HALSIM_RegisterDIO##halsim##Callback(                                  \

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DriverStation.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 "WSProvider_DriverStation.h"
+#include "wpi/halsim/ws_core/WSProvider_DriverStation.hpp"
 
 #include <atomic>
 #include <string>
 #include <string_view>
 
-#include <hal/DriverStation.h>
-#include <hal/Extensions.h>
-#include <hal/Ports.h>
-#include <hal/simulation/DriverStationData.h>
-#include <wpi/raw_ostream.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/Extensions.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/DriverStationData.h"
+#include "wpi/util/raw_ostream.hpp"
 
 #define REGISTER(halsim, jsonid, ctype, haltype)                          \
   HALSIM_RegisterDriverStation##halsim##Callback(                         \

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Encoder.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 "WSProvider_Encoder.h"
+#include "wpi/halsim/ws_core/WSProvider_Encoder.hpp"
 
-#include <hal/Ports.h>
-#include <hal/simulation/EncoderData.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/EncoderData.h"
 
 #define REGISTER(halsim, jsonid, ctype, haltype)                          \
   HALSIM_RegisterEncoder##halsim##Callback(                               \

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_HAL.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 "WSProvider_HAL.h"
+#include "wpi/halsim/ws_core/WSProvider_HAL.hpp"
 
 #include <algorithm>
 #include <atomic>
 #include <string_view>
 
-#include <hal/Extensions.h>
-#include <hal/HAL.h>
-#include <hal/Ports.h>
-#include <hal/simulation/MockHooks.h>
-#include <wpi/raw_ostream.h>
+#include "wpi/hal/Extensions.h"
+#include "wpi/hal/HAL.h"
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/MockHooks.h"
+#include "wpi/util/raw_ostream.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Joystick.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 "WSProvider_Joystick.h"
+#include "wpi/halsim/ws_core/WSProvider_Joystick.hpp"
 
 #include <algorithm>
 #include <atomic>
 #include <vector>
 
-#include <hal/Ports.h>
-#include <hal/simulation/DriverStationData.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/DriverStationData.h"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_PCM.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 "WSProvider_PCM.h"
+#include "wpi/halsim/ws_core/WSProvider_PCM.hpp"
 
-#include <hal/Ports.h>
-#include <hal/simulation/CTREPCMData.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/CTREPCMData.h"
 
 #define REGISTER_CTREPCM(halsim, jsonid, ctype, haltype)                 \
   HALSIM_RegisterCTREPCM##halsim##Callback(                              \

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_PWM.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 "WSProvider_PWM.h"
+#include "wpi/halsim/ws_core/WSProvider_PWM.hpp"
 
-#include <hal/Ports.h>
-#include <hal/simulation/PWMData.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/PWMData.h"
 
 #define REGISTER(halsim, jsonid, ctype, haltype)                         \
   HALSIM_RegisterPWM##halsim##Callback(                                  \

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_RoboRIO.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 "WSProvider_RoboRIO.h"
+#include "wpi/halsim/ws_core/WSProvider_RoboRIO.hpp"
 
-#include <hal/Ports.h>
-#include <hal/simulation/RoboRioData.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/RoboRioData.h"
 
 #define REGISTER(halsim, jsonid, ctype, haltype)                          \
   HALSIM_RegisterRoboRio##halsim##Callback(                               \

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_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 "WSProvider_SimDevice.h"
+#include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
 
 #include <algorithm>
 #include <cmath>
@@ -11,8 +11,8 @@
 #include <utility>
 
 #include <fmt/format.h>
-#include <hal/Ports.h>
-#include <wpi/StringExtras.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/util/StringExtras.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Solenoid.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 "WSProvider_Solenoid.h"
+#include "wpi/halsim/ws_core/WSProvider_Solenoid.hpp"
 
 #include <memory>
 #include <string>
 #include <utility>
 
 #include <fmt/format.h>
-#include <hal/Ports.h>
-#include <hal/simulation/CTREPCMData.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/CTREPCMData.h"
 
 #define REGISTER_SOLENOID(halsim, jsonid, ctype, haltype)                  \
   HALSIM_RegisterCTREPCMSolenoid##halsim##Callback(                        \

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_dPWM.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 "WSProvider_dPWM.h"
+#include "wpi/halsim/ws_core/WSProvider_dPWM.hpp"
 
-#include <hal/Ports.h>
-#include <hal/simulation/DigitalPWMData.h>
+#include "wpi/hal/Ports.h"
+#include "wpi/hal/simulation/DigitalPWMData.h"
 
 #define REGISTER(halsim, jsonid, ctype, haltype)                             \
   HALSIM_RegisterDigitalPWM##halsim##Callback(                               \

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include <wpi/json_fwd.h>
+#include "wpi/util/json_fwd.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp

@@ -9,9 +9,9 @@
 #include <string>
 #include <string_view>
 
-#include <wpi/json.h>
+#include "wpi/util/json.hpp"
 
-#include "HALSimBaseWebSocketConnection.h"
+#include "wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSHalProviders.hpp

@@ -10,11 +10,11 @@
 #include <utility>
 
 #include <fmt/format.h>
-#include <hal/simulation/NotifyListener.h>
-#include <wpi/json_fwd.h>
-#include <wpi/mutex.h>
+#include "wpi/hal/simulation/NotifyListener.h"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/mutex.hpp"
 
-#include "WSBaseProvider.h"
+#include "wpi/halsim/ws_core/WSBaseProvider.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProviderContainer.hpp

@@ -10,9 +10,9 @@
 #include <shared_mutex>
 #include <string_view>
 
-#include <wpi/StringMap.h>
+#include "wpi/util/StringMap.hpp"
 
-#include "WSBaseProvider.h"
+#include "wpi/halsim/ws_core/WSBaseProvider.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_AddressableLED.hpp

@@ -4,7 +4,7 @@
 
 #pragma once
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 class HALSimWSProviderAddressableLED : public HALSimWSHalChanProvider {

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Analog.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DIO.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DriverStation.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Encoder.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_HAL.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Joystick.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PCM.hpp

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 class HALSimWSProviderPCM : public HALSimWSHalChanProvider {

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PWM.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_RoboRIO.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp

@@ -10,13 +10,13 @@
 #include <string_view>
 #include <vector>
 
-#include <hal/SimDevice.h>
-#include <hal/simulation/SimDeviceData.h>
-#include <wpi/StringMap.h>
-#include <wpinet/uv/AsyncFunction.h>
+#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/net/uv/AsyncFunction.hpp"
 
-#include "WSBaseProvider.h"
-#include "WSProviderContainer.h"
+#include "wpi/halsim/ws_core/WSBaseProvider.hpp"
+#include "wpi/halsim/ws_core/WSProviderContainer.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Solenoid.hpp

@@ -6,7 +6,7 @@
 
 #include <string>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 class HALSimWSProviderSolenoid : public HALSimWSHalProvider {

simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_dPWM.hpp

@@ -6,7 +6,7 @@
 
 #include <memory>
 
-#include "WSHalProviders.h"
+#include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_server/src/dev/native/cpp/main.cpp

@@ -5,10 +5,10 @@
 #include <cstdio>
 #include <thread>
 
-#include <hal/DriverStation.h>
-#include <hal/HALBase.h>
-#include <hal/Main.h>
-#include <wpi/print.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Main.h"
+#include "wpi/util/print.hpp"
 
 extern "C" int HALSIM_InitExtension(void);
 

simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.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 "HALSimHttpConnection.h"
+#include "wpi/halsim/ws_server/HALSimHttpConnection.hpp"
 
 #include <uv.h>
 
@@ -10,15 +10,15 @@
 #include <string>
 #include <string_view>
 
-#include <wpi/MemoryBuffer.h>
-#include <wpi/SmallVector.h>
-#include <wpi/StringExtras.h>
-#include <wpi/fs.h>
-#include <wpi/print.h>
-#include <wpinet/MimeTypes.h>
-#include <wpinet/UrlParser.h>
-#include <wpinet/raw_uv_ostream.h>
-#include <wpinet/uv/Request.h>
+#include "wpi/util/MemoryBuffer.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fs.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/net/MimeTypes.hpp"
+#include "wpi/net/UrlParser.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
+#include "wpi/net/uv/Request.hpp"
 
 namespace uv = wpi::uv;
 

simulation/halsim_ws_server/src/main/native/cpp/HALSimWSServer.cpp

@@ -2,23 +2,23 @@
 // 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 "HALSimWSServer.h"
+#include "wpi/halsim/ws_server/HALSimWSServer.hpp"
 
 #include <memory>
 
-#include <WSProviderContainer.h>
-#include <WSProvider_AddressableLED.h>
-#include <WSProvider_Analog.h>
-#include <WSProvider_DIO.h>
-#include <WSProvider_DriverStation.h>
-#include <WSProvider_Encoder.h>
-#include <WSProvider_Joystick.h>
-#include <WSProvider_PCM.h>
-#include <WSProvider_PWM.h>
-#include <WSProvider_RoboRIO.h>
-#include <WSProvider_SimDevice.h>
-#include <WSProvider_Solenoid.h>
-#include <WSProvider_dPWM.h>
+#include "wpi/halsim/ws_core/WSProviderContainer.hpp"
+#include "wpi/halsim/ws_core/WSProvider_AddressableLED.hpp"
+#include "wpi/halsim/ws_core/WSProvider_Analog.hpp"
+#include "wpi/halsim/ws_core/WSProvider_DIO.hpp"
+#include "wpi/halsim/ws_core/WSProvider_DriverStation.hpp"
+#include "wpi/halsim/ws_core/WSProvider_Encoder.hpp"
+#include "wpi/halsim/ws_core/WSProvider_Joystick.hpp"
+#include "wpi/halsim/ws_core/WSProvider_PCM.hpp"
+#include "wpi/halsim/ws_core/WSProvider_PWM.hpp"
+#include "wpi/halsim/ws_core/WSProvider_RoboRIO.hpp"
+#include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
+#include "wpi/halsim/ws_core/WSProvider_Solenoid.hpp"
+#include "wpi/halsim/ws_core/WSProvider_dPWM.hpp"
 
 using namespace wpilibws;
 

simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.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 "HALSimWeb.h"
+#include "wpi/halsim/ws_server/HALSimWeb.hpp"
 
 #include <memory>
 #include <string>
 
-#include <wpi/SmallString.h>
-#include <wpi/fs.h>
-#include <wpi/print.h>
-#include <wpinet/UrlParser.h>
-#include <wpinet/WebSocketServer.h>
-#include <wpinet/raw_uv_ostream.h>
-#include <wpinet/uv/Loop.h>
-#include <wpinet/uv/Tcp.h>
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/fs.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/net/UrlParser.hpp"
+#include "wpi/net/WebSocketServer.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
+#include "wpi/net/uv/Loop.hpp"
+#include "wpi/net/uv/Tcp.hpp"
 
-#include "HALSimHttpConnection.h"
+#include "wpi/halsim/ws_server/HALSimHttpConnection.hpp"
 
 namespace uv = wpi::uv;
 

simulation/halsim_ws_server/src/main/native/cpp/main.cpp

@@ -5,9 +5,9 @@
 #include <cstdio>
 #include <memory>
 
-#include <hal/Extensions.h>
+#include "wpi/hal/Extensions.h"
 
-#include "HALSimWSServer.h"
+#include "wpi/halsim/ws_server/HALSimWSServer.hpp"
 
 using namespace std::placeholders;
 using namespace wpilibws;

simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimHttpConnection.hpp

@@ -9,14 +9,14 @@
 #include <string_view>
 #include <utility>
 
-#include <HALSimBaseWebSocketConnection.h>
-#include <wpi/json_fwd.h>
-#include <wpi/mutex.h>
-#include <wpinet/HttpWebSocketServerConnection.h>
-#include <wpinet/uv/AsyncFunction.h>
-#include <wpinet/uv/Buffer.h>
+#include "wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/util/mutex.hpp"
+#include "wpi/net/HttpWebSocketServerConnection.hpp"
+#include "wpi/net/uv/AsyncFunction.hpp"
+#include "wpi/net/uv/Buffer.hpp"
 
-#include "HALSimWeb.h"
+#include "wpi/halsim/ws_server/HALSimWeb.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWSServer.hpp

@@ -6,11 +6,11 @@
 
 #include <memory>
 
-#include <WSProviderContainer.h>
-#include <WSProvider_SimDevice.h>
-#include <wpinet/EventLoopRunner.h>
+#include "wpi/halsim/ws_core/WSProviderContainer.hpp"
+#include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
+#include "wpi/net/EventLoopRunner.hpp"
 
-#include "HALSimWeb.h"
+#include "wpi/halsim/ws_server/HALSimWeb.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp

@@ -9,14 +9,14 @@
 #include <string>
 #include <string_view>
 
-#include <WSBaseProvider.h>
-#include <WSProviderContainer.h>
-#include <WSProvider_SimDevice.h>
-#include <wpi/StringMap.h>
-#include <wpi/json_fwd.h>
-#include <wpinet/uv/Async.h>
-#include <wpinet/uv/Loop.h>
-#include <wpinet/uv/Tcp.h>
+#include "wpi/halsim/ws_core/WSBaseProvider.hpp"
+#include "wpi/halsim/ws_core/WSProviderContainer.hpp"
+#include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/net/uv/Async.hpp"
+#include "wpi/net/uv/Loop.hpp"
+#include "wpi/net/uv/Tcp.hpp"
 
 namespace wpilibws {
 

simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.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 "WebServerClientTest.h"
+#include "WebServerClientTest.hpp"
 
 #include <cstdio>
 #include <memory>
 #include <string>
 
 #include <fmt/format.h>
-#include <wpi/SmallString.h>
-#include <wpi/print.h>
-#include <wpinet/raw_uv_ostream.h>
-#include <wpinet/uv/util.h>
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
+#include "wpi/net/uv/util.hpp"
 
 static constexpr int kTcpConnectAttemptTimeout = 1000;
 

simulation/halsim_ws_server/src/test/native/cpp/main.cpp

@@ -7,15 +7,15 @@
 #include <thread>
 
 #include <gtest/gtest.h>
-#include <hal/DriverStation.h>
-#include <hal/HALBase.h>
-#include <hal/Main.h>
-#include <hal/simulation/DIOData.h>
-#include <wpi/print.h>
-#include <wpinet/uv/Loop.h>
+#include "wpi/hal/DriverStation.h"
+#include "wpi/hal/HALBase.h"
+#include "wpi/hal/Main.h"
+#include "wpi/hal/simulation/DIOData.h"
+#include "wpi/util/print.hpp"
+#include "wpi/net/uv/Loop.hpp"
 
-#include "HALSimWSServer.h"
-#include "WebServerClientTest.h"
+#include "wpi/halsim/ws_server/HALSimWSServer.hpp"
+#include "WebServerClientTest.hpp"
 
 namespace uv = wpi::uv;
 

simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.hpp

@@ -8,14 +8,14 @@
 #include <memory>
 #include <string>
 
-#include <wpi/json.h>
-#include <wpinet/WebSocket.h>
-#include <wpinet/uv/AsyncFunction.h>
-#include <wpinet/uv/Buffer.h>
-#include <wpinet/uv/Loop.h>
-#include <wpinet/uv/Stream.h>
-#include <wpinet/uv/Tcp.h>
-#include <wpinet/uv/Timer.h>
+#include "wpi/util/json.hpp"
+#include "wpi/net/WebSocket.hpp"
+#include "wpi/net/uv/AsyncFunction.hpp"
+#include "wpi/net/uv/Buffer.hpp"
+#include "wpi/net/uv/Loop.hpp"
+#include "wpi/net/uv/Stream.hpp"
+#include "wpi/net/uv/Tcp.hpp"
+#include "wpi/net/uv/Timer.hpp"
 
 namespace wpilibws {
 

simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.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 "HALSimXRP.h"
+#include "wpi/halsim/xrp/HALSimXRP.hpp"
 
 #include <cstdio>
 #include <string>
 
-#include <wpi/Endian.h>
-#include <wpi/MathExtras.h>
-#include <wpi/SmallString.h>
-#include <wpi/print.h>
-#include <wpinet/raw_uv_ostream.h>
-#include <wpinet/uv/util.h>
+#include "wpi/util/Endian.hpp"
+#include "wpi/util/MathExtras.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
+#include "wpi/net/uv/util.hpp"
 
 namespace uv = wpi::uv;
 

simulation/halsim_xrp/src/main/native/cpp/HALSimXRPClient.cpp

@@ -2,18 +2,18 @@
 // 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 "HALSimXRPClient.h"
+#include "wpi/halsim/xrp/HALSimXRPClient.hpp"
 
 #include <memory>
 
-#include <WSProviderContainer.h>
-#include <WSProvider_Analog.h>
-#include <WSProvider_DIO.h>
-#include <WSProvider_DriverStation.h>
-#include <WSProvider_Encoder.h>
-#include <WSProvider_HAL.h>
-#include <WSProvider_SimDevice.h>
-#include <wpinet/EventLoopRunner.h>
+#include "wpi/halsim/ws_core/WSProviderContainer.hpp"
+#include "wpi/halsim/ws_core/WSProvider_Analog.hpp"
+#include "wpi/halsim/ws_core/WSProvider_DIO.hpp"
+#include "wpi/halsim/ws_core/WSProvider_DriverStation.hpp"
+#include "wpi/halsim/ws_core/WSProvider_Encoder.hpp"
+#include "wpi/halsim/ws_core/WSProvider_HAL.hpp"
+#include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
+#include "wpi/net/EventLoopRunner.hpp"
 
 using namespace wpilibxrp;
 using namespace wpilibws;

simulation/halsim_xrp/src/main/native/cpp/XRP.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 "XRP.h"
+#include "wpi/halsim/xrp/XRP.hpp"
 
 #include <bit>
 #include <string>
 
 #include <fmt/format.h>
-#include <wpi/Endian.h>
-#include <wpi/json.h>
+#include "wpi/util/Endian.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace wpilibxrp;
 

simulation/halsim_xrp/src/main/native/cpp/main.cpp

@@ -5,9 +5,9 @@
 #include <cstdio>
 #include <memory>
 
-#include <hal/Extensions.h>
+#include "wpi/hal/Extensions.h"
 
-#include "HALSimXRPClient.h"
+#include "wpi/halsim/xrp/HALSimXRPClient.hpp"
 
 #if defined(Win32) || defined(_WIN32)
 #pragma comment(lib, "Ws2_32.lib")

simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRP.hpp

@@ -9,17 +9,17 @@
 #include <span>
 #include <string>
 
-#include <HALSimBaseWebSocketConnection.h>
-#include <WSProviderContainer.h>
-#include <WSProvider_SimDevice.h>
-#include <wpi/json_fwd.h>
-#include <wpinet/uv/Async.h>
-#include <wpinet/uv/Buffer.h>
-#include <wpinet/uv/Loop.h>
-#include <wpinet/uv/Timer.h>
-#include <wpinet/uv/Udp.h>
+#include "wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp"
+#include "wpi/halsim/ws_core/WSProviderContainer.hpp"
+#include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/net/uv/Async.hpp"
+#include "wpi/net/uv/Buffer.hpp"
+#include "wpi/net/uv/Loop.hpp"
+#include "wpi/net/uv/Timer.hpp"
+#include "wpi/net/uv/Udp.hpp"
 
-#include "XRP.h"
+#include "wpi/halsim/xrp/XRP.hpp"
 
 namespace wpilibxrp {
 

simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/HALSimXRPClient.hpp

@@ -6,11 +6,11 @@
 
 #include <memory>
 
-#include <WSProviderContainer.h>
-#include <WSProvider_SimDevice.h>
-#include <wpinet/EventLoopRunner.h>
+#include "wpi/halsim/ws_core/WSProviderContainer.hpp"
+#include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
+#include "wpi/net/EventLoopRunner.hpp"
 
-#include "HALSimXRP.h"
+#include "wpi/halsim/xrp/HALSimXRP.hpp"
 
 namespace wpilibxrp {
 

simulation/halsim_xrp/src/main/native/include/wpi/halsim/xrp/XRP.hpp

@@ -9,8 +9,8 @@
 #include <span>
 #include <string>
 
-#include <wpi/json_fwd.h>
-#include <wpinet/raw_uv_ostream.h>
+#include "wpi/util/json_fwd.hpp"
+#include "wpi/net/raw_uv_ostream.hpp"
 
 #define XRP_TAG_MOTOR 0x12
 #define XRP_TAG_SERVO 0x13