SCRIPT Run cc include replacements

glass/src/lib/native/cpp/Context.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 "glass/Context.h"
+#include "wpi/glass/Context.hpp"
 
 #include <filesystem>
 #include <memory>
@@ -13,16 +13,16 @@
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <imgui_stdlib.h>
-#include <wpi/MemoryBuffer.h>
-#include <wpi/StringExtras.h>
-#include <wpi/fs.h>
-#include <wpi/json.h>
-#include <wpi/raw_ostream.h>
-#include <wpi/timestamp.h>
-#include <wpigui.h>
-#include <wpigui_internal.h>
+#include "wpi/util/MemoryBuffer.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/fs.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/raw_ostream.hpp"
+#include "wpi/util/timestamp.h"
+#include "wpi/gui/wpigui.hpp"
+#include "wpi/gui/wpigui_internal.hpp"
 
-#include "glass/ContextInternal.h"
+#include "wpi/glass/ContextInternal.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/DataSource.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 "glass/DataSource.h"
+#include "wpi/glass/DataSource.hpp"
 
 #include <cstdio>
 #include <string>
@@ -10,7 +10,7 @@
 #include <fmt/format.h>
 #include <imgui.h>
 
-#include "glass/ContextInternal.h"
+#include "wpi/glass/ContextInternal.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/MainMenuBar.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 "glass/MainMenuBar.h"
+#include "wpi/glass/MainMenuBar.hpp"
 
 #include <memory>
 #include <utility>
 
 #include <imgui.h>
-#include <wpi/StringExtras.h>
-#include <wpigui.h>
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/gui/wpigui.hpp"
 
-#include "glass/Context.h"
-#include "glass/ContextInternal.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/ContextInternal.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/Model.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 "glass/Model.h"
+#include "wpi/glass/Model.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/Storage.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 "glass/Storage.h"
+#include "wpi/glass/Storage.hpp"
 
 #include <concepts>
 #include <memory>
@@ -11,8 +11,8 @@
 #include <vector>
 
 #include <imgui.h>
-#include <wpi/StringExtras.h>
-#include <wpi/json.h>
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/json.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/View.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 "glass/View.h"
+#include "wpi/glass/View.hpp"
 
 #include <memory>
 #include <utility>

glass/src/lib/native/cpp/Window.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 "glass/Window.h"
+#include "wpi/glass/Window.hpp"
 
 #include <string>
 
@@ -10,9 +10,9 @@
 #include <imgui.h>
 #include <imgui_internal.h>
 
-#include "glass/Context.h"
-#include "glass/Storage.h"
-#include "glass/support/ExtraGuiWidgets.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/support/ExtraGuiWidgets.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/WindowManager.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 "glass/WindowManager.h"
+#include "wpi/glass/WindowManager.hpp"
 
 #include <algorithm>
 #include <cstdio>
@@ -10,11 +10,11 @@
 #include <utility>
 
 #include <fmt/format.h>
-#include <wpi/print.h>
-#include <wpigui.h>
+#include "wpi/util/print.hpp"
+#include "wpi/gui/wpigui.hpp"
 
-#include "glass/Context.h"
-#include "glass/Storage.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/hardware/AnalogInput.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 "glass/hardware/AnalogInput.h"
+#include "wpi/glass/hardware/AnalogInput.hpp"
 
 #include <string>
 
 #include <imgui.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
-#include "glass/Storage.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/Storage.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/hardware/DIO.cpp

@@ -2,13 +2,13 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "glass/hardware/DIO.h"
+#include "wpi/glass/hardware/DIO.hpp"
 
 #include <imgui.h>
 
-#include "glass/DataSource.h"
-#include "glass/hardware/Encoder.h"
-#include "glass/support/NameSetting.h"
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/hardware/Encoder.hpp"
+#include "wpi/glass/support/NameSetting.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/hardware/Encoder.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 "glass/hardware/Encoder.h"
+#include "wpi/glass/hardware/Encoder.hpp"
 
 #include <string>
 
 #include <fmt/format.h>
 #include <imgui.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
-#include "glass/Storage.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/Storage.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/hardware/Gyro.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 "glass/hardware/Gyro.h"
+#include "wpi/glass/hardware/Gyro.hpp"
 
 #include <cmath>
 #include <numbers>
 
 #include <imgui.h>
 #include <imgui_internal.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/hardware/LEDDisplay.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 "glass/hardware/LEDDisplay.h"
+#include "wpi/glass/hardware/LEDDisplay.hpp"
 
 #include <vector>
 
-#include <wpi/SmallVector.h>
+#include "wpi/util/SmallVector.hpp"
 
-#include "glass/Context.h"
-#include "glass/Storage.h"
-#include "glass/support/ExtraGuiWidgets.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/support/ExtraGuiWidgets.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/hardware/MotorController.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 "glass/hardware/MotorController.h"
+#include "wpi/glass/hardware/MotorController.hpp"
 
 #include <imgui.h>
 #include <imgui_internal.h>
 
-#include "glass/DataSource.h"
+#include "wpi/glass/DataSource.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/hardware/PWM.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 "glass/hardware/PWM.h"
+#include "wpi/glass/hardware/PWM.hpp"
 
 #include <string>
 
 #include <imgui.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
-#include "glass/Storage.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/Storage.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/hardware/Pneumatic.cpp

@@ -2,22 +2,22 @@
 // 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 "glass/hardware/Pneumatic.h"
+#include "wpi/glass/hardware/Pneumatic.hpp"
 
 #include <cstdio>
 #include <cstring>
 #include <string>
 
 #include <imgui.h>
-#include <wpi/SmallVector.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/StringExtras.hpp"
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
-#include "glass/Storage.h"
-#include "glass/other/DeviceTree.h"
-#include "glass/support/ExtraGuiWidgets.h"
-#include "glass/support/NameSetting.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/other/DeviceTree.hpp"
+#include "wpi/glass/support/ExtraGuiWidgets.hpp"
+#include "wpi/glass/support/NameSetting.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/hardware/PowerDistribution.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 "glass/hardware/PowerDistribution.h"
+#include "wpi/glass/hardware/PowerDistribution.hpp"
 
 #include <algorithm>
 
 #include <imgui.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
-#include "glass/support/NameSetting.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/support/NameSetting.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/hardware/RoboRio.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 "glass/hardware/RoboRio.h"
+#include "wpi/glass/hardware/RoboRio.hpp"
 
 #include <imgui.h>
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/Alerts.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 "glass/other/Alerts.h"
+#include "wpi/glass/other/Alerts.hpp"
 
 #include <IconsFontAwesome6.h>
 #include <imgui.h>

glass/src/lib/native/cpp/other/CommandScheduler.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 "glass/other/CommandScheduler.h"
+#include "wpi/glass/other/CommandScheduler.hpp"
 
 #include <imgui.h>
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/CommandSelector.cpp

@@ -2,11 +2,11 @@
 // 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 "glass/other/CommandSelector.h"
+#include "wpi/glass/other/CommandSelector.hpp"
 
 #include <imgui.h>
 
-#include "glass/DataSource.h"
+#include "wpi/glass/DataSource.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/DeviceTree.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 "glass/other/DeviceTree.h"
+#include "wpi/glass/other/DeviceTree.hpp"
 
 #include <cinttypes>
 #include <string>
 
 #include <imgui.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
-#include "glass/Context.h"
-#include "glass/ContextInternal.h"
-#include "glass/DataSource.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/ContextInternal.hpp"
+#include "wpi/glass/DataSource.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/Drive.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 "glass/other/Drive.h"
+#include "wpi/glass/other/Drive.hpp"
 
 #include <array>
 #include <cmath>
@@ -11,7 +11,7 @@
 #include <imgui.h>
 #include <imgui_internal.h>
 
-#include "glass/DataSource.h"
+#include "wpi/glass/DataSource.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/FMS.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 "glass/other/FMS.h"
+#include "wpi/glass/other/FMS.hpp"
 
 #include <string>
 
 #include <imgui.h>
 #include <imgui_stdlib.h>
-#include <wpi/SmallString.h>
+#include "wpi/util/SmallString.hpp"
 
-#include "glass/DataSource.h"
+#include "wpi/glass/DataSource.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/Field2D.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 "glass/other/Field2D.h"
+#include "wpi/glass/other/Field2D.hpp"
 
 #include <algorithm>
 #include <cmath>
@@ -13,29 +13,29 @@
 #include <utility>
 #include <vector>
 
-#include <fields/fields.h>
-#include <frc/geometry/Pose2d.h>
-#include <frc/geometry/Rotation2d.h>
-#include <frc/geometry/Translation2d.h>
+#include "wpi/fields/fields.hpp"
+#include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/math/geometry/Translation2d.hpp"
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <imgui_stdlib.h>
-#include <portable-file-dialogs.h>
-#include <units/angle.h>
-#include <units/length.h>
-#include <wpi/MemoryBuffer.h>
-#include <wpi/SmallString.h>
-#include <wpi/StringExtras.h>
-#include <wpi/StringMap.h>
-#include <wpi/fs.h>
-#include <wpi/json.h>
-#include <wpi/print.h>
-#include <wpigui.h>
+#include "wpi/gui/portable-file-dialogs.h"
+#include "wpi/units/angle.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/util/MemoryBuffer.hpp"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/StringMap.hpp"
+#include "wpi/util/fs.hpp"
+#include "wpi/util/json.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/gui/wpigui.hpp"
 
-#include "glass/Context.h"
-#include "glass/Storage.h"
-#include "glass/support/ColorSetting.h"
-#include "glass/support/EnumSetting.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/support/ColorSetting.hpp"
+#include "wpi/glass/support/EnumSetting.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/Log.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 "glass/other/Log.h"
+#include "wpi/glass/other/Log.hpp"
 
 #include <string>
 

glass/src/lib/native/cpp/other/Mechanism2D.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 "glass/other/Mechanism2D.h"
+#include "wpi/glass/other/Mechanism2D.hpp"
 
 #include <algorithm>
 #include <cmath>
@@ -13,21 +13,21 @@
 #include <utility>
 #include <vector>
 
-#include <frc/geometry/Pose2d.h>
-#include <frc/geometry/Rotation2d.h>
-#include <frc/geometry/Transform2d.h>
-#include <frc/geometry/Translation2d.h>
+#include "wpi/math/geometry/Pose2d.hpp"
+#include "wpi/math/geometry/Rotation2d.hpp"
+#include "wpi/math/geometry/Transform2d.hpp"
+#include "wpi/math/geometry/Translation2d.hpp"
 #include <imgui.h>
 #include <imgui_internal.h>
 #include <imgui_stdlib.h>
-#include <portable-file-dialogs.h>
-#include <units/angle.h>
-#include <units/length.h>
-#include <wpi/print.h>
-#include <wpigui.h>
+#include "wpi/gui/portable-file-dialogs.h"
+#include "wpi/units/angle.hpp"
+#include "wpi/units/length.hpp"
+#include "wpi/util/print.hpp"
+#include "wpi/gui/wpigui.hpp"
 
-#include "glass/Context.h"
-#include "glass/Storage.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/Storage.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/PIDController.cpp

@@ -2,11 +2,11 @@
 // 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 "glass/other/PIDController.h"
+#include "wpi/glass/other/PIDController.hpp"
 
 #include <imgui.h>
 
-#include "glass/DataSource.h"
+#include "wpi/glass/DataSource.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/Plot.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 "glass/other/Plot.h"
+#include "wpi/glass/other/Plot.hpp"
 
 #include <stdint.h>
 
@@ -16,7 +16,7 @@
 #include <vector>
 
 #include <fmt/format.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 #if defined(__GNUC__)
 #pragma GCC diagnostic ignored "-Wformat-nonliteral"
@@ -26,17 +26,17 @@
 #include <imgui_stdlib.h>
 #include <implot.h>
 #include <implot_internal.h>
-#include <wpi/Signal.h>
-#include <wpi/SmallString.h>
-#include <wpi/SmallVector.h>
-#include <wpi/timestamp.h>
+#include "wpi/util/Signal.h"
+#include "wpi/util/SmallString.hpp"
+#include "wpi/util/SmallVector.hpp"
+#include "wpi/util/timestamp.h"
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
-#include "glass/Storage.h"
-#include "glass/support/ColorSetting.h"
-#include "glass/support/EnumSetting.h"
-#include "glass/support/ExtraGuiWidgets.h"
+#include "wpi/glass/Context.hpp"
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/Storage.hpp"
+#include "wpi/glass/support/ColorSetting.hpp"
+#include "wpi/glass/support/EnumSetting.hpp"
+#include "wpi/glass/support/ExtraGuiWidgets.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/ProfiledPIDController.cpp

@@ -2,11 +2,11 @@
 // 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 "glass/other/ProfiledPIDController.h"
+#include "wpi/glass/other/ProfiledPIDController.hpp"
 
 #include <imgui.h>
 
-#include "glass/DataSource.h"
+#include "wpi/glass/DataSource.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/other/StringChooser.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 "glass/other/StringChooser.h"
+#include "wpi/glass/other/StringChooser.hpp"
 
 #include <imgui.h>
 

glass/src/lib/native/cpp/other/Subsystem.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 "glass/other/Subsystem.h"
+#include "wpi/glass/other/Subsystem.hpp"
 
 #include <string>
 

glass/src/lib/native/cpp/support/ColorSetting.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 "glass/support/ColorSetting.h"
+#include "wpi/glass/support/ColorSetting.hpp"
 
 using namespace glass;
 

glass/src/lib/native/cpp/support/EnumSetting.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 "glass/support/EnumSetting.h"
+#include "wpi/glass/support/EnumSetting.hpp"
 
 #include <string>
 

glass/src/lib/native/cpp/support/ExpressionParser.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 "glass/support/ExpressionParser.h"
+#include "wpi/glass/support/ExpressionParser.hpp"
 
 #include <cmath>
 #include <stack>
 #include <string>
 #include <type_traits>
 
-#include <wpi/StringExtras.h>
-#include <wpi/expected>
+#include "wpi/util/StringExtras.hpp"
+#include "wpi/util/expected"
 
 namespace glass::expression {
 

glass/src/lib/native/cpp/support/ExtraGuiWidgets.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 "glass/support/ExtraGuiWidgets.h"
+#include "wpi/glass/support/ExtraGuiWidgets.hpp"
 
 #include <cstdio>
 #include <cstdlib>
@@ -10,10 +10,10 @@
 
 #include <imgui.h>
 #include <imgui_internal.h>
-#include <wpi/DenseMap.h>
+#include "wpi/util/DenseMap.hpp"
 
-#include "glass/DataSource.h"
-#include "glass/support/ExpressionParser.h"
+#include "wpi/glass/DataSource.hpp"
+#include "wpi/glass/support/ExpressionParser.hpp"
 
 namespace glass {
 

glass/src/lib/native/cpp/support/NameSetting.cpp

@@ -2,11 +2,11 @@
 // 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 "glass/support/NameSetting.h"
+#include "wpi/glass/support/NameSetting.hpp"
 
 #include <imgui_internal.h>
 #include <imgui_stdlib.h>
-#include <wpi/StringExtras.h>
+#include "wpi/util/StringExtras.hpp"
 
 using namespace glass;