Clean up unused includes (#8950)

apriltag/src/main/native/include/wpi/apriltag/AprilTagFields.hpp

@@ -4,10 +4,6 @@
 
 #pragma once
 
-#include <string_view>
-
-#include "wpi/util/SymbolExports.hpp"
-
 namespace wpi::apriltag {
 
 /**

commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp

@@ -8,10 +8,8 @@
 
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
-#include "wpi/commands2/RunCommand.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
 #include "wpi/driverstation/Joystick.hpp"
-#include "wpi/driverstation/internal/DriverStationBackend.hpp"
 #include "wpi/simulation/JoystickSim.hpp"
 
 using namespace wpi::cmd;

commandsv2/src/test/native/cpp/wpi/command/ParallelCommandGroupTest.cpp

@@ -9,8 +9,7 @@
 
 #include "CommandTestBase.hpp"
 #include "CompositionTestBase.hpp"
-#include "wpi/commands2/InstantCommand.hpp"
-#include "wpi/commands2/WaitUntilCommand.hpp"
+#include "wpi/commands2/Commands.hpp"
 
 using namespace wpi::cmd;
 class ParallelCommandGroupTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/ParallelRaceGroupTest.cpp

@@ -9,9 +9,7 @@
 
 #include "CommandTestBase.hpp"
 #include "CompositionTestBase.hpp"
-#include "wpi/commands2/InstantCommand.hpp"
-#include "wpi/commands2/SequentialCommandGroup.hpp"
-#include "wpi/commands2/WaitUntilCommand.hpp"
+#include "wpi/commands2/Commands.hpp"
 
 using namespace wpi::cmd;
 class ParallelRaceGroupTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp

@@ -4,8 +4,6 @@
 
 #include "wpi/commands2/ProxyCommand.hpp"
 
-#include <memory>
-
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/CommandPtr.hpp"
 #include "wpi/commands2/Commands.hpp"

commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.cpp

@@ -2,8 +2,6 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/commands2/RunCommand.hpp"
-
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/Commands.hpp"
 

commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.cpp

@@ -7,8 +7,6 @@
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/Commands.hpp"
 #include "wpi/commands2/InstantCommand.hpp"
-#include "wpi/commands2/RunCommand.hpp"
-#include "wpi/commands2/StartEndCommand.hpp"
 
 using namespace wpi::cmd;
 class SchedulerTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/SequentialCommandGroupTest.cpp

@@ -10,7 +10,6 @@
 #include "CommandTestBase.hpp"
 #include "CompositionTestBase.hpp"
 #include "wpi/commands2/InstantCommand.hpp"
-#include "wpi/commands2/WaitUntilCommand.hpp"
 
 using namespace wpi::cmd;
 class SequentialCommandGroupTest : public CommandTestBase {};

commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.cpp

@@ -2,8 +2,6 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/commands2/StartEndCommand.hpp"
-
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/Commands.hpp"
 

commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.cpp

@@ -6,7 +6,6 @@
 
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/Commands.hpp"
-#include "wpi/commands2/WaitUntilCommand.hpp"
 #include "wpi/simulation/SimHooks.hpp"
 
 using namespace wpi::cmd;

commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.cpp

@@ -2,8 +2,6 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "wpi/commands2/WaitUntilCommand.hpp"
-
 #include "CommandTestBase.hpp"
 #include "wpi/commands2/Commands.hpp"
 

commandsv2/src/test/native/cpp/wpi/command/button/NetworkButtonTest.cpp

@@ -8,7 +8,6 @@
 
 #include "../CommandTestBase.hpp"
 #include "wpi/commands2/CommandScheduler.hpp"
-#include "wpi/commands2/RunCommand.hpp"
 #include "wpi/commands2/WaitUntilCommand.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 

commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.cpp

@@ -6,7 +6,6 @@
 
 #include "../CommandTestBase.hpp"
 #include "wpi/commands2/button/Trigger.hpp"
-#include "wpi/driverstation/internal/DriverStationBackend.hpp"
 #include "wpi/hal/DriverStationTypes.h"
 #include "wpi/simulation/DriverStationSim.hpp"
 

cscore/src/main/native/cpp/Frame.cpp

@@ -8,7 +8,7 @@
 #include <memory>
 
 #include <opencv2/core/core.hpp>
-#include <opencv2/highgui/highgui.hpp>
+#include <opencv2/imgcodecs/imgcodecs.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
 #include "Instance.hpp"

cscore/src/main/native/cpp/Image.hpp

@@ -9,7 +9,9 @@
 
 #include <opencv2/core/core.hpp>
 
+#ifdef __linux__
 #include "default_init_allocator.hpp"
+#endif
 #include "wpi/util/PixelFormat.hpp"
 
 namespace wpi::cs {

cscore/src/main/native/cpp/Instance.cpp

@@ -8,8 +8,6 @@
 #include <string_view>
 #include <utility>
 
-#include <fmt/format.h>
-
 #include "wpi/util/fs.hpp"
 #include "wpi/util/print.hpp"
 

cscore/src/main/native/cpp/VideoSink.cpp

@@ -6,8 +6,6 @@
 
 #include <vector>
 
-#include <fmt/format.h>
-
 #include "wpi/util/json.hpp"
 
 using namespace wpi::cs;

cscore/src/main/native/cpp/VideoSource.cpp

@@ -6,8 +6,6 @@
 
 #include <vector>
 
-#include <fmt/format.h>
-
 #include "wpi/cs/VideoSink.hpp"
 #include "wpi/util/json.hpp"
 

cscore/src/main/native/windows/UsbCameraImpl.cpp

@@ -24,7 +24,6 @@
 
 #include "COMCreators.hpp"
 #include "ComPtr.hpp"
-#include "Handle.hpp"
 #include "Instance.hpp"
 #include "JpegUtil.hpp"
 #include "Log.hpp"
@@ -32,10 +31,8 @@
 #include "PropertyImpl.hpp"
 #include "Telemetry.hpp"
 #include "WindowsMessagePump.hpp"
-#include "c_util.hpp"
 #include "wpi/cs/cscore_cpp.hpp"
 #include "wpi/util/ConvertUTF.hpp"
-#include "wpi/util/MemAlloc.hpp"
 #include "wpi/util/PixelFormat.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/StringExtras.hpp"

cscore/src/main/native/windows/UsbCameraImpl.hpp

@@ -12,7 +12,6 @@
 #include <mfidl.h>
 #include <mfreadwrite.h>
 
-#include <atomic>
 #include <memory>
 #include <string>
 #include <string_view>
@@ -26,11 +25,8 @@
 #include "UsbCameraProperty.hpp"
 #include "WindowsMessagePump.hpp"
 #include "wpi/util/PixelFormat.hpp"
-#include "wpi/util/SmallVector.hpp"
 #include "wpi/util/condition_variable.hpp"
 #include "wpi/util/mutex.hpp"
-#include "wpi/util/raw_istream.hpp"
-#include "wpi/util/raw_ostream.hpp"
 
 namespace wpi::cs {
 

datalog/examples/printlog/printlog.cpp

@@ -7,7 +7,6 @@
 #include <vector>
 
 #include <fmt/chrono.h>
-#include <fmt/format.h>
 #include <fmt/ranges.h>
 
 #include "wpi/datalog/DataLogReader.hpp"

datalog/src/main/native/cpp/FileLogger.cpp

@@ -17,8 +17,6 @@
 #include <tuple>
 #include <utility>
 
-#include <fmt/format.h>
-
 #include "wpi/util/StringExtras.hpp"
 
 namespace wpi::log {

glass/src/lib/native/cpp/WindowManager.cpp

@@ -9,8 +9,6 @@
 #include <memory>
 #include <utility>
 
-#include <fmt/format.h>
-
 #include "wpi/glass/Context.hpp"
 #include "wpi/glass/Storage.hpp"
 #include "wpi/gui/wpigui.hpp"

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

@@ -15,8 +15,6 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
-
 #include "wpi/util/StringExtras.hpp"
 
 #if defined(__GNUC__)

glass/src/libnt/native/cpp/NTDifferentialDrive.cpp

@@ -9,7 +9,6 @@
 #include <fmt/format.h>
 #include <imgui.h>
 
-#include "wpi/util/MathExtras.hpp"
 #include "wpi/util/StringExtras.hpp"
 
 using namespace wpi::glass;

glass/src/libnt/native/cpp/NTField2D.cpp

@@ -15,8 +15,6 @@
 #include "wpi/nt/DoubleArrayTopic.hpp"
 #include "wpi/nt/MultiSubscriber.hpp"
 #include "wpi/nt/ntcore_cpp.hpp"
-#include "wpi/util/Endian.hpp"
-#include "wpi/util/MathExtras.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/StringExtras.hpp"
 

glass/src/libnt/native/cpp/NTMecanumDrive.cpp

@@ -9,7 +9,6 @@
 #include <fmt/format.h>
 #include <imgui.h>
 
-#include "wpi/util/MathExtras.hpp"
 #include "wpi/util/StringExtras.hpp"
 
 using namespace wpi::glass;

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

@@ -5,7 +5,6 @@
 #include <jni.h>
 
 #include <cassert>
-#include <cstdio>
 
 #include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_AlertJNI.h"

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

@@ -9,8 +9,6 @@
 #include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_AnalogInputJNI.h"
 #include "wpi/hal/AnalogInput.h"
-#include "wpi/hal/Ports.h"
-#include "wpi/hal/handles/HandlesInternal.hpp"
 #include "wpi/util/jni_util.hpp"
 
 using namespace wpi::hal;

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

@@ -7,8 +7,6 @@
 #include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_CTREPCMJNI.h"
 #include "wpi/hal/CTREPCM.h"
-#include "wpi/hal/Ports.h"
-#include "wpi/hal/handles/HandlesInternal.hpp"
 #include "wpi/util/jni_util.hpp"
 
 using namespace wpi::hal;

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

@@ -9,7 +9,6 @@
 #include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_CounterJNI.h"
 #include "wpi/hal/Counter.h"
-#include "wpi/hal/Errors.h"
 #include "wpi/util/jni_util.hpp"
 
 using namespace wpi::hal;

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

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

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

@@ -8,12 +8,10 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
-
 #include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_DriverStationJNI.h"
 #include "wpi/hal/DriverStation.h"
-#include "wpi/hal/HAL.h"
+#include "wpi/hal/DriverStationTypes.h"
 #include "wpi/util/jni_util.hpp"
 
 static_assert(

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

@@ -9,7 +9,6 @@
 #include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_EncoderJNI.h"
 #include "wpi/hal/Encoder.h"
-#include "wpi/hal/Errors.h"
 
 using namespace wpi::hal;
 

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

@@ -11,18 +11,12 @@
 #endif
 
 #include <cassert>
-#include <cstring>
-
-#include <fmt/format.h>
 
 #include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_HAL.h"
-#include "wpi/hal/DriverStation.h"
 #include "wpi/hal/Main.h"
-#include "wpi/util/jni_util.hpp"
 
 using namespace wpi::hal;
-using namespace wpi::util::java;
 
 extern "C" {
 

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

@@ -15,7 +15,6 @@
 #include <fmt/format.h>
 
 #include "org_wpilib_hardware_hal_HALUtil.h"
-#include "wpi/hal/CAN.h"
 #include "wpi/hal/DriverStation.h"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/HAL.h"

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

@@ -8,10 +8,7 @@
 
 #include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_PWMJNI.h"
-#include "wpi/hal/DIO.h"
 #include "wpi/hal/PWM.h"
-#include "wpi/hal/Ports.h"
-#include "wpi/hal/handles/HandlesInternal.hpp"
 #include "wpi/util/jni_util.hpp"
 
 using namespace wpi::hal;

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

@@ -6,12 +6,9 @@
 
 #include <cassert>
 
-#include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_PortsJNI.h"
 #include "wpi/hal/Ports.h"
 
-using namespace wpi::hal;
-
 extern "C" {
 /*
  * Class:     org_wpilib_hardware_hal_PortsJNI

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

@@ -6,7 +6,6 @@
 
 #include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_PowerDistributionJNI.h"
-#include "wpi/hal/Ports.h"
 #include "wpi/hal/PowerDistribution.h"
 #include "wpi/util/jni_util.hpp"
 

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

@@ -6,9 +6,7 @@
 
 #include "HALUtil.hpp"
 #include "org_wpilib_hardware_hal_REVPHJNI.h"
-#include "wpi/hal/Ports.h"
 #include "wpi/hal/REVPH.h"
-#include "wpi/hal/handles/HandlesInternal.hpp"
 #include "wpi/util/jni_util.hpp"
 
 static_assert(

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

@@ -7,9 +7,6 @@
 #include <jni.h>
 
 #include "SimulatorJNI.hpp"
-#include "wpi/hal/Types.h"
-#include "wpi/hal/Value.h"
-#include "wpi/hal/handles/UnlimitedHandleResource.hpp"
 #include "wpi/hal/simulation/NotifyListener.h"
 #include "wpi/util/jni_util.hpp"
 

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

@@ -9,7 +9,6 @@
 #include "SimulatorJNI.hpp"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/Value.h"
-#include "wpi/hal/handles/UnlimitedHandleResource.hpp"
 #include "wpi/hal/simulation/NotifyListener.h"
 #include "wpi/util/jni_util.hpp"
 

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

@@ -4,7 +4,6 @@
 
 #include "wpi/hal/CANAPI.h"
 
-#include <ctime>
 #include <memory>
 
 #include "HALInitializer.hpp"

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

@@ -9,7 +9,6 @@
 #include "HALInitializer.hpp"
 #include "PortsInternal.hpp"
 #include "mockdata/CTREPCMDataInternal.hpp"
-#include "wpi/hal/ErrorHandling.hpp"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/IndexedHandleResource.hpp"
 

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

@@ -9,7 +9,6 @@
 #include "HALInitializer.hpp"
 #include "PortsInternal.hpp"
 #include "mockdata/DutyCycleDataInternal.hpp"
-#include "wpi/hal/ErrorHandling.hpp"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/handles/HandlesInternal.hpp"
 #include "wpi/hal/handles/IndexedHandleResource.hpp"

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

@@ -19,7 +19,6 @@
 #include "NotifierInternal.hpp"
 #include "wpi/hal/Errors.h"
 #include "wpi/hal/HAL.h"
-#include "wpi/hal/Threads.h"
 #include "wpi/hal/Types.h"
 #include "wpi/hal/handles/UnlimitedHandleResource.hpp"
 #include "wpi/hal/simulation/NotifierData.h"

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

@@ -4,8 +4,6 @@
 
 #include "wpi/hal/PowerDistribution.h"
 
-#include <fmt/format.h>
-
 #include "CANAPIInternal.hpp"
 #include "HALInitializer.hpp"
 #include "PortsInternal.hpp"

hal/src/main/native/sim/mockdata/DriverStationData.cpp

@@ -9,8 +9,6 @@
 #include <string>
 #include <vector>
 
-#include <fmt/format.h>
-
 #include "DriverStationDataInternal.hpp"
 #include "wpi/hal/DashboardOpMode.hpp"
 #include "wpi/hal/DriverStationTypes.h"

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

@@ -10,8 +10,6 @@
 #include <cstring>
 #include <thread>
 
-#include <fmt/format.h>
-
 #include "AddressableLEDSimd.hpp"
 #include "HALInitializer.hpp"
 #include "PortsInternal.hpp"

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

@@ -7,8 +7,6 @@
 #include <cstdio>
 #include <thread>
 
-#include <fmt/format.h>
-
 #include "HALInitializer.hpp"
 #include "PortsInternal.hpp"
 #include "SmartIo.hpp"

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

@@ -4,8 +4,6 @@
 
 #include "wpi/hal/Encoder.h"
 
-#include <fmt/format.h>
-
 #include "HALInitializer.hpp"
 #include "wpi/hal/Errors.h"
 

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

@@ -8,8 +8,6 @@
 #include <string>
 #include <thread>
 
-#include <fmt/format.h>
-
 #include "HALInitializer.hpp"
 #include "PortsInternal.hpp"
 #include "rev/PDHFrames.h"

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

@@ -18,8 +18,6 @@
 #include <string>
 #include <thread>
 
-#include <fmt/format.h>
-
 #include "wpi/hal/Errors.h"
 
 namespace wpi::hal::init {

ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp

@@ -9,7 +9,6 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
 #include <fmt/ranges.h>
 
 #include "IListenerStorage.hpp"
@@ -17,7 +16,6 @@
 #include "net/MessageHandler.hpp"
 #include "wpi/datalog/DataLog.hpp"
 #include "wpi/util/SmallString.hpp"
-#include "wpi/util/StringExtras.hpp"
 
 using namespace wpi::nt;
 using namespace wpi::nt::local;

ntcore/src/main/native/cpp/net/ClientImpl.cpp

@@ -11,8 +11,6 @@
 #include <utility>
 #include <variant>
 
-#include <fmt/format.h>
-
 #include "Log.hpp"
 #include "Message.hpp"
 #include "WireConnection.hpp"

ntcore/src/main/native/cpp/ntcore_meta.cpp

@@ -6,8 +6,6 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
-
 #include "wpi/nt/ntcore_cpp.hpp"
 #include "wpi/util/MessagePack.hpp"
 #include "wpi/util/mpack.h"

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

@@ -4,7 +4,6 @@
 
 #include "PHSimGui.hpp"
 
-#include <cstdio>
 #include <memory>
 #include <vector>
 

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

@@ -4,8 +4,6 @@
 
 #include "PowerDistributionSimGui.hpp"
 
-#include <cstdio>
-#include <cstring>
 #include <memory>
 #include <vector>
 

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_AddressableLED.cpp

@@ -5,7 +5,6 @@
 #include "wpi/halsim/ws_core/WSProvider_AddressableLED.hpp"
 
 #include <utility>
-#include <vector>
 
 #include "wpi/hal/Ports.h"
 #include "wpi/hal/simulation/AddressableLEDData.h"

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_HAL.cpp

@@ -4,14 +4,9 @@
 
 #include "wpi/halsim/ws_core/WSProvider_HAL.hpp"
 
-#include <algorithm>
-#include <atomic>
 #include <string_view>
 
-#include "wpi/hal/Extensions.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

@@ -9,7 +9,6 @@
 #include <vector>
 
 #include "wpi/hal/DriverStationTypes.h"
-#include "wpi/hal/Ports.h"
 #include "wpi/hal/simulation/DriverStationData.h"
 
 namespace wpilibws {

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_RoboRIO.cpp

@@ -4,7 +4,6 @@
 
 #include "wpi/halsim/ws_core/WSProvider_RoboRIO.hpp"
 
-#include "wpi/hal/Ports.h"
 #include "wpi/hal/simulation/RoboRioData.h"
 
 #define REGISTER(halsim, jsonid, ctype, haltype)                          \

simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp

@@ -12,7 +12,8 @@
 
 #include <fmt/format.h>
 
-#include "wpi/hal/Ports.h"
+#include "wpi/hal/SimDevice.h"
+#include "wpi/hal/simulation/SimDeviceData.h"
 #include "wpi/util/StringExtras.hpp"
 
 namespace wpilibws {

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 namespace wpi::util {
 class json;
 }  // namespace wpi::util

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

@@ -4,7 +4,6 @@
 
 #pragma once
 
-#include <functional>
 #include <memory>
 #include <string>
 #include <string_view>

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <string>
-
 #include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 #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,8 +10,8 @@
 #include <string_view>
 #include <vector>
 
-#include "wpi/hal/SimDevice.h"
-#include "wpi/hal/simulation/SimDeviceData.h"
+#include "wpi/hal/Types.h"
+#include "wpi/hal/Value.h"
 #include "wpi/halsim/ws_core/WSBaseProvider.hpp"
 #include "wpi/halsim/ws_core/WSProviderContainer.hpp"
 #include "wpi/net/uv/AsyncFunction.hpp"

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

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <memory>
-
 #include "wpi/halsim/ws_core/WSHalProviders.hpp"
 
 namespace wpilibws {

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

@@ -13,7 +13,6 @@
 #include "wpi/net/MimeTypes.hpp"
 #include "wpi/net/UrlParser.hpp"
 #include "wpi/net/raw_uv_ostream.hpp"
-#include "wpi/net/uv/Request.hpp"
 #include "wpi/util/MemoryBuffer.hpp"
 #include "wpi/util/SmallVector.hpp"
 #include "wpi/util/StringExtras.hpp"

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

@@ -9,7 +9,7 @@
 #include <string>
 #include <string_view>
 
-#include "wpi/halsim/ws_core/WSBaseProvider.hpp"
+#include "wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp"
 #include "wpi/halsim/ws_core/WSProviderContainer.hpp"
 #include "wpi/halsim/ws_core/WSProvider_SimDevice.hpp"
 #include "wpi/net/uv/Async.hpp"

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

@@ -12,7 +12,6 @@
 #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"
 #include "wpi/util/json.hpp"

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

@@ -9,8 +9,6 @@
 
 #include "wpi/net/raw_uv_ostream.hpp"
 #include "wpi/net/uv/util.hpp"
-#include "wpi/util/Endian.hpp"
-#include "wpi/util/MathExtras.hpp"
 #include "wpi/util/SmallString.hpp"
 #include "wpi/util/print.hpp"
 

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

@@ -8,8 +8,6 @@
 #include <string>
 #include <utility>
 
-#include <fmt/format.h>
-
 #include "wpi/util/Endian.hpp"
 #include "wpi/util/json.hpp"
 

tools/datalogtool/src/main/native/cpp/Sftp.cpp

@@ -8,8 +8,6 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
-
 using namespace sftp;
 
 Attributes::Attributes(sftp_attributes&& attr)

tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp

@@ -4,7 +4,6 @@
 
 #include "wpi/sysid/analysis/AnalysisManager.hpp"
 
-#include <cmath>
 #include <limits>
 #include <utility>
 #include <vector>
@@ -13,7 +12,6 @@
 
 #include "wpi/sysid/analysis/FeedforwardAnalysis.hpp"
 #include "wpi/sysid/analysis/FilteringUtils.hpp"
-#include "wpi/units/angle.hpp"
 #include "wpi/util/MathExtras.hpp"
 #include "wpi/util/StringExtras.hpp"
 #include "wpi/util/StringMap.hpp"

tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp

@@ -7,7 +7,6 @@
 #include <cmath>
 
 #include "wpi/math/system/NumericalIntegration.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/util/MathExtras.hpp"
 
 using namespace sysid;

tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp

@@ -5,7 +5,6 @@
 #include "wpi/sysid/analysis/ElevatorSim.hpp"
 
 #include "wpi/math/system/Discretization.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/util/MathExtras.hpp"
 
 using namespace sysid;

tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp

@@ -17,7 +17,6 @@
 
 #include "wpi/math/filter/LinearFilter.hpp"
 #include "wpi/math/filter/MedianFilter.hpp"
-#include "wpi/units/math.hpp"
 #include "wpi/util/MathExtras.hpp"
 #include "wpi/util/StringExtras.hpp"
 

tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp

@@ -5,7 +5,6 @@
 #include "wpi/sysid/analysis/SimpleMotorSim.hpp"
 
 #include "wpi/math/system/Discretization.hpp"
-#include "wpi/math/util/StateSpaceUtil.hpp"
 #include "wpi/util/MathExtras.hpp"
 
 using namespace sysid;

tools/wpical/src/main/native/cpp/WPIcal.cpp

@@ -25,7 +25,6 @@
 #include "wpi/gui/portable-file-dialogs.h"
 #include "wpi/gui/wpigui.hpp"
 #include "wpi/gui/wpigui_openurl.hpp"
-#include "wpi/math/util/MathUtil.hpp"
 #include "wpi/util/MemoryBuffer.hpp"
 #include "wpi/util/fs.hpp"
 #include "wpi/util/json.hpp"

tools/wpical/src/main/native/cpp/cameracalibration.cpp

@@ -7,6 +7,7 @@
 #include <memory>
 #include <queue>
 #include <string>
+#include <thread>
 #include <utility>
 #include <vector>
 
@@ -17,6 +18,8 @@
 #include <opencv2/opencv.hpp>
 #include <opencv2/videoio.hpp>
 
+#include "wpi/util/mutex.hpp"
+
 static bool filter(std::vector<cv::Point2f> charucoCorners,
                    std::vector<int> charucoIds, std::vector<int> markerIds,
                    int boardWidth, int boardHeight) {

tools/wpical/src/main/native/cpp/fieldcalibration.cpp

@@ -27,8 +27,6 @@
 #include "wpi/apriltag/AprilTagDetector.hpp"
 #include "wpi/apriltag/AprilTagDetector_cv.hpp"
 #include "wpi/apriltag/AprilTagFieldLayout.hpp"
-#include "wpi/math/geometry/Rotation3d.hpp"
-#include "wpi/math/geometry/Translation3d.hpp"
 
 struct Pose {
   Eigen::Vector3d p;

tools/wpical/src/main/native/include/cameracalibration.hpp

@@ -4,10 +4,10 @@
 
 #pragma once
 
+#include <atomic>
 #include <memory>
 #include <optional>
 #include <string>
-#include <thread>
 #include <vector>
 
 #include <Eigen/Core>
@@ -19,7 +19,6 @@
 #include <opencv2/videoio.hpp>
 
 #include "wpi/util/json.hpp"
-#include "wpi/util/mutex.hpp"
 
 namespace wpical {
 struct CameraModel {

wpilibc/src/main/native/cpp/framework/IterativeRobotBase.cpp

@@ -7,7 +7,7 @@
 #include "wpi/driverstation/RobotState.hpp"
 #include "wpi/driverstation/internal/DriverStationBackend.hpp"
 #include "wpi/hal/DriverStation.h"
-#include "wpi/hal/DriverStationTypes.h"
+#include "wpi/hal/DriverStationTypes.hpp"
 #include "wpi/nt/NetworkTableInstance.hpp"
 #include "wpi/smartdashboard/SmartDashboard.hpp"
 #include "wpi/system/Errors.hpp"

wpilibc/src/main/native/cpp/system/Watchdog.cpp

@@ -9,8 +9,6 @@
 #include <utility>
 #include <vector>
 
-#include <fmt/format.h>
-
 #include "wpi/hal/HAL.h"
 #include "wpi/hal/Notifier.hpp"
 #include "wpi/system/Errors.hpp"

wpilibc/src/main/python/wpilib/src/rpy/Notifier.cpp

@@ -6,8 +6,6 @@
 
 #include <utility>
 
-#include <fmt/format.h>
-
 #include "wpi/hal/Notifier.hpp"
 #include "wpi/hal/Threads.h"
 #include "wpi/system/Errors.hpp"

wpimath/src/main/native/include/wpi/math/controller/ElevatorFeedforward.hpp

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include "wpi/math/controller/LinearPlantInversionFeedforward.hpp"
-#include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/math/util/MathShared.hpp"
 #include "wpi/units/length.hpp"
 #include "wpi/units/time.hpp"

wpimath/src/main/native/include/wpi/math/interpolation/TimeInterpolatableBuffer.hpp

@@ -12,7 +12,6 @@
 
 #include "wpi/math/geometry/Pose2d.hpp"
 #include "wpi/math/geometry/Pose3d.hpp"
-#include "wpi/math/geometry/Rotation3d.hpp"
 #include "wpi/units/time.hpp"
 #include "wpi/util/MathExtras.hpp"
 

wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp

@@ -6,8 +6,6 @@
 
 #include <stdexcept>
 
-#include <fmt/format.h>
-
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"

wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp

@@ -4,8 +4,6 @@
 
 #pragma once
 
-#include <fmt/format.h>
-
 #include "wpi/math/kinematics/SwerveDriveKinematics.hpp"
 #include "wpi/util/ct_string.hpp"
 #include "wpi/util/struct/Struct.hpp"

wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp

@@ -6,8 +6,6 @@
 
 #include <stdexcept>
 
-#include <fmt/format.h>
-
 #include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"

wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp

@@ -6,8 +6,6 @@
 
 #include <stdexcept>
 
-#include <fmt/format.h>
-
 #include "wpi/math/linalg/EigenCore.hpp"
 #include "wpi/util/protobuf/Protobuf.hpp"
 #include "wpi/util/protobuf/ProtobufCallbacks.hpp"