From 3f966aa7c61060382dd6b79ef23e2ea72a20587f Mon Sep 17 00:00:00 2001 From: Gold856 <117957790+Gold856@users.noreply.github.com> Date: Wed, 10 Jun 2026 01:16:26 -0400 Subject: [PATCH] Clean up unused includes (#8950) --- .../src/main/native/include/wpi/apriltag/AprilTagFields.hpp | 4 ---- .../src/test/native/cpp/wpi/command/POVButtonTest.cpp | 2 -- .../native/cpp/wpi/command/ParallelCommandGroupTest.cpp | 3 +-- .../test/native/cpp/wpi/command/ParallelRaceGroupTest.cpp | 4 +--- .../src/test/native/cpp/wpi/command/ProxyCommandTest.cpp | 2 -- .../src/test/native/cpp/wpi/command/RunCommandTest.cpp | 2 -- .../src/test/native/cpp/wpi/command/SchedulerTest.cpp | 2 -- .../native/cpp/wpi/command/SequentialCommandGroupTest.cpp | 1 - .../src/test/native/cpp/wpi/command/StartEndCommandTest.cpp | 2 -- .../src/test/native/cpp/wpi/command/WaitCommandTest.cpp | 1 - .../test/native/cpp/wpi/command/WaitUntilCommandTest.cpp | 2 -- .../native/cpp/wpi/command/button/NetworkButtonTest.cpp | 1 - .../native/cpp/wpi/command/button/RobotModeTriggersTest.cpp | 1 - cscore/src/main/native/cpp/Frame.cpp | 2 +- cscore/src/main/native/cpp/Image.hpp | 2 ++ cscore/src/main/native/cpp/Instance.cpp | 2 -- cscore/src/main/native/cpp/VideoSink.cpp | 2 -- cscore/src/main/native/cpp/VideoSource.cpp | 2 -- cscore/src/main/native/windows/UsbCameraImpl.cpp | 3 --- cscore/src/main/native/windows/UsbCameraImpl.hpp | 4 ---- datalog/examples/printlog/printlog.cpp | 1 - datalog/src/main/native/cpp/FileLogger.cpp | 2 -- glass/src/lib/native/cpp/WindowManager.cpp | 2 -- glass/src/lib/native/cpp/other/Plot.cpp | 2 -- glass/src/libnt/native/cpp/NTDifferentialDrive.cpp | 1 - glass/src/libnt/native/cpp/NTField2D.cpp | 2 -- glass/src/libnt/native/cpp/NTMecanumDrive.cpp | 1 - hal/src/main/native/cpp/jni/AlertJNI.cpp | 1 - hal/src/main/native/cpp/jni/AnalogInputJNI.cpp | 2 -- hal/src/main/native/cpp/jni/CTREPCMJNI.cpp | 2 -- hal/src/main/native/cpp/jni/CounterJNI.cpp | 1 - hal/src/main/native/cpp/jni/DIOJNI.cpp | 3 --- hal/src/main/native/cpp/jni/DriverStationJNI.cpp | 4 +--- hal/src/main/native/cpp/jni/EncoderJNI.cpp | 1 - hal/src/main/native/cpp/jni/HAL.cpp | 6 ------ hal/src/main/native/cpp/jni/HALUtil.cpp | 1 - hal/src/main/native/cpp/jni/PWMJNI.cpp | 3 --- hal/src/main/native/cpp/jni/PortsJNI.cpp | 3 --- hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp | 1 - hal/src/main/native/cpp/jni/REVPHJNI.cpp | 2 -- .../main/native/cpp/jni/simulation/BufferCallbackStore.hpp | 3 --- hal/src/main/native/cpp/jni/simulation/CallbackStore.hpp | 1 - hal/src/main/native/sim/CANAPI.cpp | 1 - hal/src/main/native/sim/CTREPCM.cpp | 1 - hal/src/main/native/sim/DutyCycle.cpp | 1 - hal/src/main/native/sim/Notifier.cpp | 1 - hal/src/main/native/sim/PowerDistribution.cpp | 2 -- hal/src/main/native/sim/mockdata/DriverStationData.cpp | 2 -- hal/src/main/native/systemcore/AddressableLED.cpp | 2 -- hal/src/main/native/systemcore/Counter.cpp | 2 -- hal/src/main/native/systemcore/Encoder.cpp | 2 -- hal/src/main/native/systemcore/REVPDH.cpp | 2 -- hal/src/main/native/systemcore/SerialPort.cpp | 2 -- ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp | 2 -- ntcore/src/main/native/cpp/net/ClientImpl.cpp | 2 -- ntcore/src/main/native/cpp/ntcore_meta.cpp | 2 -- simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp | 1 - .../src/main/native/cpp/PowerDistributionSimGui.cpp | 2 -- .../src/main/native/cpp/WSProvider_AddressableLED.cpp | 1 - .../halsim_ws_core/src/main/native/cpp/WSProvider_HAL.cpp | 5 ----- .../src/main/native/cpp/WSProvider_Joystick.cpp | 1 - .../src/main/native/cpp/WSProvider_RoboRIO.cpp | 1 - .../src/main/native/cpp/WSProvider_SimDevice.cpp | 3 ++- .../wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp | 2 -- .../native/include/wpi/halsim/ws_core/WSBaseProvider.hpp | 1 - .../native/include/wpi/halsim/ws_core/WSProvider_Analog.hpp | 2 -- .../native/include/wpi/halsim/ws_core/WSProvider_DIO.hpp | 2 -- .../include/wpi/halsim/ws_core/WSProvider_DriverStation.hpp | 2 -- .../include/wpi/halsim/ws_core/WSProvider_Encoder.hpp | 2 -- .../native/include/wpi/halsim/ws_core/WSProvider_HAL.hpp | 2 -- .../include/wpi/halsim/ws_core/WSProvider_Joystick.hpp | 2 -- .../native/include/wpi/halsim/ws_core/WSProvider_PCM.hpp | 2 -- .../native/include/wpi/halsim/ws_core/WSProvider_PWM.hpp | 2 -- .../include/wpi/halsim/ws_core/WSProvider_RoboRIO.hpp | 2 -- .../include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp | 4 ++-- .../native/include/wpi/halsim/ws_core/WSProvider_dPWM.hpp | 2 -- .../src/main/native/cpp/HALSimHttpConnection.cpp | 1 - .../main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp | 2 +- .../src/test/native/include/WebServerClientTest.hpp | 1 - simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp | 2 -- simulation/halsim_xrp/src/main/native/cpp/XRP.cpp | 2 -- tools/datalogtool/src/main/native/cpp/Sftp.cpp | 2 -- .../sysid/src/main/native/cpp/analysis/AnalysisManager.cpp | 2 -- tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp | 1 - tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp | 1 - tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp | 1 - tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp | 1 - tools/wpical/src/main/native/cpp/WPIcal.cpp | 1 - tools/wpical/src/main/native/cpp/cameracalibration.cpp | 3 +++ tools/wpical/src/main/native/cpp/fieldcalibration.cpp | 2 -- tools/wpical/src/main/native/include/cameracalibration.hpp | 3 +-- .../src/main/native/cpp/framework/IterativeRobotBase.cpp | 2 +- wpilibc/src/main/native/cpp/system/Watchdog.cpp | 2 -- wpilibc/src/main/python/wpilib/src/rpy/Notifier.cpp | 2 -- .../include/wpi/math/controller/ElevatorFeedforward.hpp | 2 -- .../wpi/math/interpolation/TimeInterpolatableBuffer.hpp | 1 - .../math/kinematics/proto/SwerveDriveKinematicsProto.hpp | 2 -- .../math/kinematics/struct/SwerveDriveKinematicsStruct.hpp | 2 -- .../native/include/wpi/math/linalg/proto/MatrixProto.hpp | 2 -- .../native/include/wpi/math/linalg/proto/VectorProto.hpp | 2 -- .../native/include/wpi/math/linalg/struct/StructProto.hpp | 2 -- .../native/include/wpi/math/linalg/struct/VectorStruct.hpp | 2 -- .../include/wpi/math/system/proto/LinearSystemProto.hpp | 3 --- .../include/wpi/math/system/struct/LinearSystemStruct.hpp | 2 -- .../native/cpp/estimator/SwerveDrivePoseEstimator3dTest.cpp | 1 - .../native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp | 1 - wpinet/src/main/native/cpp/DsClient.cpp | 2 -- wpinet/src/netconsoleServer/native/cpp/main.cpp | 2 -- wpinet/src/netconsoleTee/native/cpp/main.cpp | 2 -- wpinet/src/test/native/cpp/MulticastTest.cpp | 1 - wpinet/src/test/native/cpp/WorkerThreadTest.cpp | 2 -- wpiutil/src/main/native/cpp/RuntimeCheck.cpp | 1 - wpiutil/src/main/native/include/wpi/util/jni_util.hpp | 1 - .../native/include/wpi/util/protobuf/ProtobufCallbacks.hpp | 4 ++-- 114 files changed, 18 insertions(+), 204 deletions(-) diff --git a/apriltag/src/main/native/include/wpi/apriltag/AprilTagFields.hpp b/apriltag/src/main/native/include/wpi/apriltag/AprilTagFields.hpp index 2647130cef..81c38d2f42 100644 --- a/apriltag/src/main/native/include/wpi/apriltag/AprilTagFields.hpp +++ b/apriltag/src/main/native/include/wpi/apriltag/AprilTagFields.hpp @@ -4,10 +4,6 @@ #pragma once -#include - -#include "wpi/util/SymbolExports.hpp" - namespace wpi::apriltag { /** diff --git a/commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp index 8f5f8be5e9..ff95ba8ee2 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/POVButtonTest.cpp +++ b/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; diff --git a/commandsv2/src/test/native/cpp/wpi/command/ParallelCommandGroupTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/ParallelCommandGroupTest.cpp index da3a5e64ab..2c51d18ec9 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/ParallelCommandGroupTest.cpp +++ b/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 {}; diff --git a/commandsv2/src/test/native/cpp/wpi/command/ParallelRaceGroupTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/ParallelRaceGroupTest.cpp index 3d71ad60ec..2e526b9783 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/ParallelRaceGroupTest.cpp +++ b/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 {}; diff --git a/commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp index efe7f3b3e0..a2f70a613b 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp +++ b/commandsv2/src/test/native/cpp/wpi/command/ProxyCommandTest.cpp @@ -4,8 +4,6 @@ #include "wpi/commands2/ProxyCommand.hpp" -#include - #include "CommandTestBase.hpp" #include "wpi/commands2/CommandPtr.hpp" #include "wpi/commands2/Commands.hpp" diff --git a/commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.cpp index f3ba35f4e0..74273b4afb 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/RunCommandTest.cpp +++ b/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" diff --git a/commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.cpp index 9c510bafaa..fb5f82b740 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/SchedulerTest.cpp +++ b/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 {}; diff --git a/commandsv2/src/test/native/cpp/wpi/command/SequentialCommandGroupTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/SequentialCommandGroupTest.cpp index 596cec1c6e..01a4b33d38 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/SequentialCommandGroupTest.cpp +++ b/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 {}; diff --git a/commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.cpp index a60908f070..82a0957584 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/StartEndCommandTest.cpp +++ b/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" diff --git a/commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.cpp index 680bd54945..5e17f43ddf 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/WaitCommandTest.cpp +++ b/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; diff --git a/commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.cpp index 3e55423a06..ff03d40fad 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/WaitUntilCommandTest.cpp +++ b/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" diff --git a/commandsv2/src/test/native/cpp/wpi/command/button/NetworkButtonTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/button/NetworkButtonTest.cpp index f5ea250104..14e7393878 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/button/NetworkButtonTest.cpp +++ b/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" diff --git a/commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.cpp b/commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.cpp index 6ff1740a10..2a4aa10d69 100644 --- a/commandsv2/src/test/native/cpp/wpi/command/button/RobotModeTriggersTest.cpp +++ b/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" diff --git a/cscore/src/main/native/cpp/Frame.cpp b/cscore/src/main/native/cpp/Frame.cpp index b1148e474e..24971ca206 100644 --- a/cscore/src/main/native/cpp/Frame.cpp +++ b/cscore/src/main/native/cpp/Frame.cpp @@ -8,7 +8,7 @@ #include #include -#include +#include #include #include "Instance.hpp" diff --git a/cscore/src/main/native/cpp/Image.hpp b/cscore/src/main/native/cpp/Image.hpp index 95edaf9c08..7d47a6af71 100644 --- a/cscore/src/main/native/cpp/Image.hpp +++ b/cscore/src/main/native/cpp/Image.hpp @@ -9,7 +9,9 @@ #include +#ifdef __linux__ #include "default_init_allocator.hpp" +#endif #include "wpi/util/PixelFormat.hpp" namespace wpi::cs { diff --git a/cscore/src/main/native/cpp/Instance.cpp b/cscore/src/main/native/cpp/Instance.cpp index 1a69753a25..8b845f1060 100644 --- a/cscore/src/main/native/cpp/Instance.cpp +++ b/cscore/src/main/native/cpp/Instance.cpp @@ -8,8 +8,6 @@ #include #include -#include - #include "wpi/util/fs.hpp" #include "wpi/util/print.hpp" diff --git a/cscore/src/main/native/cpp/VideoSink.cpp b/cscore/src/main/native/cpp/VideoSink.cpp index 946a304b73..6e18e51bc3 100644 --- a/cscore/src/main/native/cpp/VideoSink.cpp +++ b/cscore/src/main/native/cpp/VideoSink.cpp @@ -6,8 +6,6 @@ #include -#include - #include "wpi/util/json.hpp" using namespace wpi::cs; diff --git a/cscore/src/main/native/cpp/VideoSource.cpp b/cscore/src/main/native/cpp/VideoSource.cpp index e526352743..f19ccd0b1c 100644 --- a/cscore/src/main/native/cpp/VideoSource.cpp +++ b/cscore/src/main/native/cpp/VideoSource.cpp @@ -6,8 +6,6 @@ #include -#include - #include "wpi/cs/VideoSink.hpp" #include "wpi/util/json.hpp" diff --git a/cscore/src/main/native/windows/UsbCameraImpl.cpp b/cscore/src/main/native/windows/UsbCameraImpl.cpp index a7d0cbacc1..dd6eebb703 100644 --- a/cscore/src/main/native/windows/UsbCameraImpl.cpp +++ b/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" diff --git a/cscore/src/main/native/windows/UsbCameraImpl.hpp b/cscore/src/main/native/windows/UsbCameraImpl.hpp index a3862ebd0c..234ee229fc 100644 --- a/cscore/src/main/native/windows/UsbCameraImpl.hpp +++ b/cscore/src/main/native/windows/UsbCameraImpl.hpp @@ -12,7 +12,6 @@ #include #include -#include #include #include #include @@ -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 { diff --git a/datalog/examples/printlog/printlog.cpp b/datalog/examples/printlog/printlog.cpp index c1ec2fe622..583787fd30 100644 --- a/datalog/examples/printlog/printlog.cpp +++ b/datalog/examples/printlog/printlog.cpp @@ -7,7 +7,6 @@ #include #include -#include #include #include "wpi/datalog/DataLogReader.hpp" diff --git a/datalog/src/main/native/cpp/FileLogger.cpp b/datalog/src/main/native/cpp/FileLogger.cpp index 2d0164d5b4..31f66fa7bc 100644 --- a/datalog/src/main/native/cpp/FileLogger.cpp +++ b/datalog/src/main/native/cpp/FileLogger.cpp @@ -17,8 +17,6 @@ #include #include -#include - #include "wpi/util/StringExtras.hpp" namespace wpi::log { diff --git a/glass/src/lib/native/cpp/WindowManager.cpp b/glass/src/lib/native/cpp/WindowManager.cpp index 5f05251f6b..905c3bde3a 100644 --- a/glass/src/lib/native/cpp/WindowManager.cpp +++ b/glass/src/lib/native/cpp/WindowManager.cpp @@ -9,8 +9,6 @@ #include #include -#include - #include "wpi/glass/Context.hpp" #include "wpi/glass/Storage.hpp" #include "wpi/gui/wpigui.hpp" diff --git a/glass/src/lib/native/cpp/other/Plot.cpp b/glass/src/lib/native/cpp/other/Plot.cpp index 262a809b0f..023d62badf 100644 --- a/glass/src/lib/native/cpp/other/Plot.cpp +++ b/glass/src/lib/native/cpp/other/Plot.cpp @@ -15,8 +15,6 @@ #include #include -#include - #include "wpi/util/StringExtras.hpp" #if defined(__GNUC__) diff --git a/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp b/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp index 03655ceea7..9b5ae5977b 100644 --- a/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp +++ b/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp @@ -9,7 +9,6 @@ #include #include -#include "wpi/util/MathExtras.hpp" #include "wpi/util/StringExtras.hpp" using namespace wpi::glass; diff --git a/glass/src/libnt/native/cpp/NTField2D.cpp b/glass/src/libnt/native/cpp/NTField2D.cpp index 1c56ffeb64..3370857f6e 100644 --- a/glass/src/libnt/native/cpp/NTField2D.cpp +++ b/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" diff --git a/glass/src/libnt/native/cpp/NTMecanumDrive.cpp b/glass/src/libnt/native/cpp/NTMecanumDrive.cpp index 0860630c59..274eb8ef14 100644 --- a/glass/src/libnt/native/cpp/NTMecanumDrive.cpp +++ b/glass/src/libnt/native/cpp/NTMecanumDrive.cpp @@ -9,7 +9,6 @@ #include #include -#include "wpi/util/MathExtras.hpp" #include "wpi/util/StringExtras.hpp" using namespace wpi::glass; diff --git a/hal/src/main/native/cpp/jni/AlertJNI.cpp b/hal/src/main/native/cpp/jni/AlertJNI.cpp index 61df81fee8..faae12c413 100644 --- a/hal/src/main/native/cpp/jni/AlertJNI.cpp +++ b/hal/src/main/native/cpp/jni/AlertJNI.cpp @@ -5,7 +5,6 @@ #include #include -#include #include "HALUtil.hpp" #include "org_wpilib_hardware_hal_AlertJNI.h" diff --git a/hal/src/main/native/cpp/jni/AnalogInputJNI.cpp b/hal/src/main/native/cpp/jni/AnalogInputJNI.cpp index ac58763d7d..6e9f68605e 100644 --- a/hal/src/main/native/cpp/jni/AnalogInputJNI.cpp +++ b/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; diff --git a/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp b/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp index f81c1c61dd..618ceb6a33 100644 --- a/hal/src/main/native/cpp/jni/CTREPCMJNI.cpp +++ b/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; diff --git a/hal/src/main/native/cpp/jni/CounterJNI.cpp b/hal/src/main/native/cpp/jni/CounterJNI.cpp index acd438fa88..783f8457a4 100644 --- a/hal/src/main/native/cpp/jni/CounterJNI.cpp +++ b/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; diff --git a/hal/src/main/native/cpp/jni/DIOJNI.cpp b/hal/src/main/native/cpp/jni/DIOJNI.cpp index cc82e6eec8..6836a89702 100644 --- a/hal/src/main/native/cpp/jni/DIOJNI.cpp +++ b/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; diff --git a/hal/src/main/native/cpp/jni/DriverStationJNI.cpp b/hal/src/main/native/cpp/jni/DriverStationJNI.cpp index f8eba6da89..bb39cd4e2b 100644 --- a/hal/src/main/native/cpp/jni/DriverStationJNI.cpp +++ b/hal/src/main/native/cpp/jni/DriverStationJNI.cpp @@ -8,12 +8,10 @@ #include #include -#include - #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( diff --git a/hal/src/main/native/cpp/jni/EncoderJNI.cpp b/hal/src/main/native/cpp/jni/EncoderJNI.cpp index 3ad0003175..c083fc2292 100644 --- a/hal/src/main/native/cpp/jni/EncoderJNI.cpp +++ b/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; diff --git a/hal/src/main/native/cpp/jni/HAL.cpp b/hal/src/main/native/cpp/jni/HAL.cpp index 06b8f1cbce..b9c82869f0 100644 --- a/hal/src/main/native/cpp/jni/HAL.cpp +++ b/hal/src/main/native/cpp/jni/HAL.cpp @@ -11,18 +11,12 @@ #endif #include -#include - -#include #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" { diff --git a/hal/src/main/native/cpp/jni/HALUtil.cpp b/hal/src/main/native/cpp/jni/HALUtil.cpp index 7bc5fb379d..94d6a6ce84 100644 --- a/hal/src/main/native/cpp/jni/HALUtil.cpp +++ b/hal/src/main/native/cpp/jni/HALUtil.cpp @@ -15,7 +15,6 @@ #include #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" diff --git a/hal/src/main/native/cpp/jni/PWMJNI.cpp b/hal/src/main/native/cpp/jni/PWMJNI.cpp index 96d410225b..7ba984e887 100644 --- a/hal/src/main/native/cpp/jni/PWMJNI.cpp +++ b/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; diff --git a/hal/src/main/native/cpp/jni/PortsJNI.cpp b/hal/src/main/native/cpp/jni/PortsJNI.cpp index 33f03d4f79..1aeeb80773 100644 --- a/hal/src/main/native/cpp/jni/PortsJNI.cpp +++ b/hal/src/main/native/cpp/jni/PortsJNI.cpp @@ -6,12 +6,9 @@ #include -#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 diff --git a/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp b/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp index 14ae824806..7abaad6ea9 100644 --- a/hal/src/main/native/cpp/jni/PowerDistributionJNI.cpp +++ b/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" diff --git a/hal/src/main/native/cpp/jni/REVPHJNI.cpp b/hal/src/main/native/cpp/jni/REVPHJNI.cpp index c2839b106c..3b617b3b66 100644 --- a/hal/src/main/native/cpp/jni/REVPHJNI.cpp +++ b/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( diff --git a/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.hpp b/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.hpp index 8a9907c936..c80fefafd4 100644 --- a/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.hpp +++ b/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.hpp @@ -7,9 +7,6 @@ #include #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" diff --git a/hal/src/main/native/cpp/jni/simulation/CallbackStore.hpp b/hal/src/main/native/cpp/jni/simulation/CallbackStore.hpp index 17d0b68bfd..fbcd16d1c1 100644 --- a/hal/src/main/native/cpp/jni/simulation/CallbackStore.hpp +++ b/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" diff --git a/hal/src/main/native/sim/CANAPI.cpp b/hal/src/main/native/sim/CANAPI.cpp index de30fe6b9a..6394ae3048 100644 --- a/hal/src/main/native/sim/CANAPI.cpp +++ b/hal/src/main/native/sim/CANAPI.cpp @@ -4,7 +4,6 @@ #include "wpi/hal/CANAPI.h" -#include #include #include "HALInitializer.hpp" diff --git a/hal/src/main/native/sim/CTREPCM.cpp b/hal/src/main/native/sim/CTREPCM.cpp index 0bb04f30c7..fb804539c8 100644 --- a/hal/src/main/native/sim/CTREPCM.cpp +++ b/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" diff --git a/hal/src/main/native/sim/DutyCycle.cpp b/hal/src/main/native/sim/DutyCycle.cpp index 02e6bb9280..b83a3946bc 100644 --- a/hal/src/main/native/sim/DutyCycle.cpp +++ b/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" diff --git a/hal/src/main/native/sim/Notifier.cpp b/hal/src/main/native/sim/Notifier.cpp index 89e9140747..a8e3aaa1de 100644 --- a/hal/src/main/native/sim/Notifier.cpp +++ b/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" diff --git a/hal/src/main/native/sim/PowerDistribution.cpp b/hal/src/main/native/sim/PowerDistribution.cpp index 4cba4ce563..3ce5cab54a 100644 --- a/hal/src/main/native/sim/PowerDistribution.cpp +++ b/hal/src/main/native/sim/PowerDistribution.cpp @@ -4,8 +4,6 @@ #include "wpi/hal/PowerDistribution.h" -#include - #include "CANAPIInternal.hpp" #include "HALInitializer.hpp" #include "PortsInternal.hpp" diff --git a/hal/src/main/native/sim/mockdata/DriverStationData.cpp b/hal/src/main/native/sim/mockdata/DriverStationData.cpp index aa44866234..2713aad876 100644 --- a/hal/src/main/native/sim/mockdata/DriverStationData.cpp +++ b/hal/src/main/native/sim/mockdata/DriverStationData.cpp @@ -9,8 +9,6 @@ #include #include -#include - #include "DriverStationDataInternal.hpp" #include "wpi/hal/DashboardOpMode.hpp" #include "wpi/hal/DriverStationTypes.h" diff --git a/hal/src/main/native/systemcore/AddressableLED.cpp b/hal/src/main/native/systemcore/AddressableLED.cpp index d561b9ae37..ad90059f5e 100644 --- a/hal/src/main/native/systemcore/AddressableLED.cpp +++ b/hal/src/main/native/systemcore/AddressableLED.cpp @@ -10,8 +10,6 @@ #include #include -#include - #include "AddressableLEDSimd.hpp" #include "HALInitializer.hpp" #include "PortsInternal.hpp" diff --git a/hal/src/main/native/systemcore/Counter.cpp b/hal/src/main/native/systemcore/Counter.cpp index 08f88acd49..014afd13bb 100644 --- a/hal/src/main/native/systemcore/Counter.cpp +++ b/hal/src/main/native/systemcore/Counter.cpp @@ -7,8 +7,6 @@ #include #include -#include - #include "HALInitializer.hpp" #include "PortsInternal.hpp" #include "SmartIo.hpp" diff --git a/hal/src/main/native/systemcore/Encoder.cpp b/hal/src/main/native/systemcore/Encoder.cpp index a4b2a7d9fa..89b70a5c40 100644 --- a/hal/src/main/native/systemcore/Encoder.cpp +++ b/hal/src/main/native/systemcore/Encoder.cpp @@ -4,8 +4,6 @@ #include "wpi/hal/Encoder.h" -#include - #include "HALInitializer.hpp" #include "wpi/hal/Errors.h" diff --git a/hal/src/main/native/systemcore/REVPDH.cpp b/hal/src/main/native/systemcore/REVPDH.cpp index 3960f90fb1..8a03dff042 100644 --- a/hal/src/main/native/systemcore/REVPDH.cpp +++ b/hal/src/main/native/systemcore/REVPDH.cpp @@ -8,8 +8,6 @@ #include #include -#include - #include "HALInitializer.hpp" #include "PortsInternal.hpp" #include "rev/PDHFrames.h" diff --git a/hal/src/main/native/systemcore/SerialPort.cpp b/hal/src/main/native/systemcore/SerialPort.cpp index 485eb4f68f..29e91d80b2 100644 --- a/hal/src/main/native/systemcore/SerialPort.cpp +++ b/hal/src/main/native/systemcore/SerialPort.cpp @@ -18,8 +18,6 @@ #include #include -#include - #include "wpi/hal/Errors.h" namespace wpi::hal::init { diff --git a/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp b/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp index 34426efe13..7c5ef0e778 100644 --- a/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp +++ b/ntcore/src/main/native/cpp/local/LocalStorageImpl.cpp @@ -9,7 +9,6 @@ #include #include -#include #include #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; diff --git a/ntcore/src/main/native/cpp/net/ClientImpl.cpp b/ntcore/src/main/native/cpp/net/ClientImpl.cpp index 724c0672b6..b312f875cd 100644 --- a/ntcore/src/main/native/cpp/net/ClientImpl.cpp +++ b/ntcore/src/main/native/cpp/net/ClientImpl.cpp @@ -11,8 +11,6 @@ #include #include -#include - #include "Log.hpp" #include "Message.hpp" #include "WireConnection.hpp" diff --git a/ntcore/src/main/native/cpp/ntcore_meta.cpp b/ntcore/src/main/native/cpp/ntcore_meta.cpp index d8d1f030a7..49c2052d48 100644 --- a/ntcore/src/main/native/cpp/ntcore_meta.cpp +++ b/ntcore/src/main/native/cpp/ntcore_meta.cpp @@ -6,8 +6,6 @@ #include #include -#include - #include "wpi/nt/ntcore_cpp.hpp" #include "wpi/util/MessagePack.hpp" #include "wpi/util/mpack.h" diff --git a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp index d12d027ddd..6be254cfcf 100644 --- a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp +++ b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp @@ -4,7 +4,6 @@ #include "PHSimGui.hpp" -#include #include #include diff --git a/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp index 21f3fdd135..11468fcec0 100644 --- a/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp +++ b/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp @@ -4,8 +4,6 @@ #include "PowerDistributionSimGui.hpp" -#include -#include #include #include diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_AddressableLED.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_AddressableLED.cpp index caa35f67b3..9b224f8f26 100644 --- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_AddressableLED.cpp +++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_AddressableLED.cpp @@ -5,7 +5,6 @@ #include "wpi/halsim/ws_core/WSProvider_AddressableLED.hpp" #include -#include #include "wpi/hal/Ports.h" #include "wpi/hal/simulation/AddressableLEDData.h" diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_HAL.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_HAL.cpp index 2f0214153f..e575f74cb9 100644 --- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_HAL.cpp +++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_HAL.cpp @@ -4,14 +4,9 @@ #include "wpi/halsim/ws_core/WSProvider_HAL.hpp" -#include -#include #include -#include "wpi/hal/Extensions.h" -#include "wpi/hal/Ports.h" #include "wpi/hal/simulation/MockHooks.h" -#include "wpi/util/raw_ostream.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Joystick.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Joystick.cpp index 040eab3d39..fc226bcca9 100644 --- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Joystick.cpp +++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Joystick.cpp @@ -9,7 +9,6 @@ #include #include "wpi/hal/DriverStationTypes.h" -#include "wpi/hal/Ports.h" #include "wpi/hal/simulation/DriverStationData.h" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_RoboRIO.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_RoboRIO.cpp index 55437b02c6..d1192e0eac 100644 --- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_RoboRIO.cpp +++ b/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) \ diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp index 7d21e98b31..620c26fb0c 100644 --- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp +++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_SimDevice.cpp @@ -12,7 +12,8 @@ #include -#include "wpi/hal/Ports.h" +#include "wpi/hal/SimDevice.h" +#include "wpi/hal/simulation/SimDeviceData.h" #include "wpi/util/StringExtras.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp index 701ecfca27..22918096f6 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/HALSimBaseWebSocketConnection.hpp @@ -4,8 +4,6 @@ #pragma once -#include - namespace wpi::util { class json; } // namespace wpi::util diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp index 7434385ca9..46c1a5ca74 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSBaseProvider.hpp @@ -4,7 +4,6 @@ #pragma once -#include #include #include #include diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Analog.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Analog.hpp index f8e8ebb6d4..e47d6e047d 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Analog.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Analog.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/halsim/ws_core/WSHalProviders.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DIO.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DIO.hpp index 85c27fcc90..e7a1145695 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DIO.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DIO.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/halsim/ws_core/WSHalProviders.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DriverStation.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DriverStation.hpp index f32ac0b56d..50ea86a5dc 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DriverStation.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_DriverStation.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/halsim/ws_core/WSHalProviders.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Encoder.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Encoder.hpp index 271020350c..c899a19b13 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Encoder.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Encoder.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/halsim/ws_core/WSHalProviders.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_HAL.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_HAL.hpp index 8055445f59..120ad60a09 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_HAL.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_HAL.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/halsim/ws_core/WSHalProviders.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Joystick.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Joystick.hpp index 5016185ca3..739ae9a6b9 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Joystick.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_Joystick.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/halsim/ws_core/WSHalProviders.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PCM.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PCM.hpp index 86e7d0c0c2..484698da69 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PCM.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PCM.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/halsim/ws_core/WSHalProviders.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PWM.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PWM.hpp index 7c6e260626..43028e6cd4 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PWM.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_PWM.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/halsim/ws_core/WSHalProviders.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_RoboRIO.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_RoboRIO.hpp index 1a35d3cbd8..b2c171b78e 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_RoboRIO.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_RoboRIO.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/halsim/ws_core/WSHalProviders.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp index 3e0b302954..92831dafa9 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_SimDevice.hpp @@ -10,8 +10,8 @@ #include #include -#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" diff --git a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_dPWM.hpp b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_dPWM.hpp index 151866e3bf..6f393c41b3 100644 --- a/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_dPWM.hpp +++ b/simulation/halsim_ws_core/src/main/native/include/wpi/halsim/ws_core/WSProvider_dPWM.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/halsim/ws_core/WSHalProviders.hpp" namespace wpilibws { diff --git a/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp b/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp index 2a942ae6e9..3c89c9ec6e 100644 --- a/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp +++ b/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" diff --git a/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp index cd5b9ed160..823e8701b0 100644 --- a/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp +++ b/simulation/halsim_ws_server/src/main/native/include/wpi/halsim/ws_server/HALSimWeb.hpp @@ -9,7 +9,7 @@ #include #include -#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" diff --git a/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.hpp b/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.hpp index c5d07ce630..f82cf4b9c2 100644 --- a/simulation/halsim_ws_server/src/test/native/include/WebServerClientTest.hpp +++ b/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" diff --git a/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp b/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp index 57e26ae5bd..81a9ad57c9 100644 --- a/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp +++ b/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" diff --git a/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp b/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp index 17befb327a..4fffde445f 100644 --- a/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp +++ b/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp @@ -8,8 +8,6 @@ #include #include -#include - #include "wpi/util/Endian.hpp" #include "wpi/util/json.hpp" diff --git a/tools/datalogtool/src/main/native/cpp/Sftp.cpp b/tools/datalogtool/src/main/native/cpp/Sftp.cpp index b27bfa1e2a..04f72e15c1 100644 --- a/tools/datalogtool/src/main/native/cpp/Sftp.cpp +++ b/tools/datalogtool/src/main/native/cpp/Sftp.cpp @@ -8,8 +8,6 @@ #include #include -#include - using namespace sftp; Attributes::Attributes(sftp_attributes&& attr) diff --git a/tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp b/tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp index 8e57451694..c65823e2fa 100644 --- a/tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp +++ b/tools/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp @@ -4,7 +4,6 @@ #include "wpi/sysid/analysis/AnalysisManager.hpp" -#include #include #include #include @@ -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" diff --git a/tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp b/tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp index af6075e248..d8681a45ed 100644 --- a/tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp +++ b/tools/sysid/src/main/native/cpp/analysis/ArmSim.cpp @@ -7,7 +7,6 @@ #include #include "wpi/math/system/NumericalIntegration.hpp" -#include "wpi/math/util/StateSpaceUtil.hpp" #include "wpi/util/MathExtras.hpp" using namespace sysid; diff --git a/tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp b/tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp index 0a673b2a74..0b5c4a44fa 100644 --- a/tools/sysid/src/main/native/cpp/analysis/ElevatorSim.cpp +++ b/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; diff --git a/tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp b/tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp index 12046a4257..e41dec2dc8 100644 --- a/tools/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp +++ b/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" diff --git a/tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp b/tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp index 6891b9f3a5..acd0a3cfda 100644 --- a/tools/sysid/src/main/native/cpp/analysis/SimpleMotorSim.cpp +++ b/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; diff --git a/tools/wpical/src/main/native/cpp/WPIcal.cpp b/tools/wpical/src/main/native/cpp/WPIcal.cpp index b145f66fa8..7fa130c8d4 100644 --- a/tools/wpical/src/main/native/cpp/WPIcal.cpp +++ b/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" diff --git a/tools/wpical/src/main/native/cpp/cameracalibration.cpp b/tools/wpical/src/main/native/cpp/cameracalibration.cpp index 3f7aceaa6e..d32d273859 100644 --- a/tools/wpical/src/main/native/cpp/cameracalibration.cpp +++ b/tools/wpical/src/main/native/cpp/cameracalibration.cpp @@ -7,6 +7,7 @@ #include #include #include +#include #include #include @@ -17,6 +18,8 @@ #include #include +#include "wpi/util/mutex.hpp" + static bool filter(std::vector charucoCorners, std::vector charucoIds, std::vector markerIds, int boardWidth, int boardHeight) { diff --git a/tools/wpical/src/main/native/cpp/fieldcalibration.cpp b/tools/wpical/src/main/native/cpp/fieldcalibration.cpp index 582de441b9..b72be57785 100644 --- a/tools/wpical/src/main/native/cpp/fieldcalibration.cpp +++ b/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; diff --git a/tools/wpical/src/main/native/include/cameracalibration.hpp b/tools/wpical/src/main/native/include/cameracalibration.hpp index 11046cd68c..f2d2d6b760 100644 --- a/tools/wpical/src/main/native/include/cameracalibration.hpp +++ b/tools/wpical/src/main/native/include/cameracalibration.hpp @@ -4,10 +4,10 @@ #pragma once +#include #include #include #include -#include #include #include @@ -19,7 +19,6 @@ #include #include "wpi/util/json.hpp" -#include "wpi/util/mutex.hpp" namespace wpical { struct CameraModel { diff --git a/wpilibc/src/main/native/cpp/framework/IterativeRobotBase.cpp b/wpilibc/src/main/native/cpp/framework/IterativeRobotBase.cpp index 47572256ed..d033d86880 100644 --- a/wpilibc/src/main/native/cpp/framework/IterativeRobotBase.cpp +++ b/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" diff --git a/wpilibc/src/main/native/cpp/system/Watchdog.cpp b/wpilibc/src/main/native/cpp/system/Watchdog.cpp index c2a444e439..2b31f069e7 100644 --- a/wpilibc/src/main/native/cpp/system/Watchdog.cpp +++ b/wpilibc/src/main/native/cpp/system/Watchdog.cpp @@ -9,8 +9,6 @@ #include #include -#include - #include "wpi/hal/HAL.h" #include "wpi/hal/Notifier.hpp" #include "wpi/system/Errors.hpp" diff --git a/wpilibc/src/main/python/wpilib/src/rpy/Notifier.cpp b/wpilibc/src/main/python/wpilib/src/rpy/Notifier.cpp index 1ef0098086..a541500da9 100644 --- a/wpilibc/src/main/python/wpilib/src/rpy/Notifier.cpp +++ b/wpilibc/src/main/python/wpilib/src/rpy/Notifier.cpp @@ -6,8 +6,6 @@ #include -#include - #include "wpi/hal/Notifier.hpp" #include "wpi/hal/Threads.h" #include "wpi/system/Errors.hpp" diff --git a/wpimath/src/main/native/include/wpi/math/controller/ElevatorFeedforward.hpp b/wpimath/src/main/native/include/wpi/math/controller/ElevatorFeedforward.hpp index 30a0e72c30..53ffcdc58a 100644 --- a/wpimath/src/main/native/include/wpi/math/controller/ElevatorFeedforward.hpp +++ b/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" diff --git a/wpimath/src/main/native/include/wpi/math/interpolation/TimeInterpolatableBuffer.hpp b/wpimath/src/main/native/include/wpi/math/interpolation/TimeInterpolatableBuffer.hpp index 4050893e64..7e91152cbe 100644 --- a/wpimath/src/main/native/include/wpi/math/interpolation/TimeInterpolatableBuffer.hpp +++ b/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" diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp index 11ddb47d53..c501773b85 100644 --- a/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp +++ b/wpimath/src/main/native/include/wpi/math/kinematics/proto/SwerveDriveKinematicsProto.hpp @@ -6,8 +6,6 @@ #include -#include - #include "wpi/math/kinematics/SwerveDriveKinematics.hpp" #include "wpi/util/protobuf/Protobuf.hpp" #include "wpi/util/protobuf/ProtobufCallbacks.hpp" diff --git a/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp index 6880fe3043..38c4a8aaf5 100644 --- a/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp +++ b/wpimath/src/main/native/include/wpi/math/kinematics/struct/SwerveDriveKinematicsStruct.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/math/kinematics/SwerveDriveKinematics.hpp" #include "wpi/util/ct_string.hpp" #include "wpi/util/struct/Struct.hpp" diff --git a/wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp b/wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp index 466125915b..cf659279ee 100644 --- a/wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp +++ b/wpimath/src/main/native/include/wpi/math/linalg/proto/MatrixProto.hpp @@ -6,8 +6,6 @@ #include -#include - #include "wpi/math/linalg/EigenCore.hpp" #include "wpi/util/protobuf/Protobuf.hpp" #include "wpi/util/protobuf/ProtobufCallbacks.hpp" diff --git a/wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp b/wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp index bf3582f08d..c70c0db0a5 100644 --- a/wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp +++ b/wpimath/src/main/native/include/wpi/math/linalg/proto/VectorProto.hpp @@ -6,8 +6,6 @@ #include -#include - #include "wpi/math/linalg/EigenCore.hpp" #include "wpi/util/protobuf/Protobuf.hpp" #include "wpi/util/protobuf/ProtobufCallbacks.hpp" diff --git a/wpimath/src/main/native/include/wpi/math/linalg/struct/StructProto.hpp b/wpimath/src/main/native/include/wpi/math/linalg/struct/StructProto.hpp index b71f568ab8..acb72113fb 100644 --- a/wpimath/src/main/native/include/wpi/math/linalg/struct/StructProto.hpp +++ b/wpimath/src/main/native/include/wpi/math/linalg/struct/StructProto.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/math/linalg/EigenCore.hpp" #include "wpi/util/ct_string.hpp" #include "wpi/util/struct/Struct.hpp" diff --git a/wpimath/src/main/native/include/wpi/math/linalg/struct/VectorStruct.hpp b/wpimath/src/main/native/include/wpi/math/linalg/struct/VectorStruct.hpp index a80aed0af2..f625e36706 100644 --- a/wpimath/src/main/native/include/wpi/math/linalg/struct/VectorStruct.hpp +++ b/wpimath/src/main/native/include/wpi/math/linalg/struct/VectorStruct.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/math/linalg/EigenCore.hpp" #include "wpi/util/ct_string.hpp" #include "wpi/util/struct/Struct.hpp" diff --git a/wpimath/src/main/native/include/wpi/math/system/proto/LinearSystemProto.hpp b/wpimath/src/main/native/include/wpi/math/system/proto/LinearSystemProto.hpp index 90a34e0a54..8966b85ec5 100644 --- a/wpimath/src/main/native/include/wpi/math/system/proto/LinearSystemProto.hpp +++ b/wpimath/src/main/native/include/wpi/math/system/proto/LinearSystemProto.hpp @@ -4,11 +4,8 @@ #pragma once -#include #include -#include - #include "wpi/math/linalg/proto/MatrixProto.hpp" #include "wpi/math/system/LinearSystem.hpp" #include "wpi/util/protobuf/Protobuf.hpp" diff --git a/wpimath/src/main/native/include/wpi/math/system/struct/LinearSystemStruct.hpp b/wpimath/src/main/native/include/wpi/math/system/struct/LinearSystemStruct.hpp index 9bea230c6f..ddf2e13d08 100644 --- a/wpimath/src/main/native/include/wpi/math/system/struct/LinearSystemStruct.hpp +++ b/wpimath/src/main/native/include/wpi/math/system/struct/LinearSystemStruct.hpp @@ -4,8 +4,6 @@ #pragma once -#include - #include "wpi/math/linalg/struct/StructProto.hpp" #include "wpi/math/system/LinearSystem.hpp" #include "wpi/util/ct_string.hpp" diff --git a/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimator3dTest.cpp b/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimator3dTest.cpp index e31df810ce..80eb203738 100644 --- a/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimator3dTest.cpp +++ b/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimator3dTest.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include "wpi/math/geometry/Pose2d.hpp" diff --git a/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp b/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp index f61e4e84ed..1304487f7f 100644 --- a/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp +++ b/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp @@ -10,7 +10,6 @@ #include #include -#include #include #include "wpi/math/geometry/Pose2d.hpp" diff --git a/wpinet/src/main/native/cpp/DsClient.cpp b/wpinet/src/main/native/cpp/DsClient.cpp index eb306b0a87..d1d81157f9 100644 --- a/wpinet/src/main/native/cpp/DsClient.cpp +++ b/wpinet/src/main/native/cpp/DsClient.cpp @@ -7,8 +7,6 @@ #include #include -#include - #include "wpi/net/uv/Tcp.hpp" #include "wpi/net/uv/Timer.hpp" #include "wpi/util/Logger.hpp" diff --git a/wpinet/src/netconsoleServer/native/cpp/main.cpp b/wpinet/src/netconsoleServer/native/cpp/main.cpp index ebd6ec7cbd..f5102b862d 100644 --- a/wpinet/src/netconsoleServer/native/cpp/main.cpp +++ b/wpinet/src/netconsoleServer/native/cpp/main.cpp @@ -13,8 +13,6 @@ #include #include -#include - #include "wpi/net/raw_uv_ostream.hpp" #include "wpi/net/uv/Loop.hpp" #include "wpi/net/uv/Pipe.hpp" diff --git a/wpinet/src/netconsoleTee/native/cpp/main.cpp b/wpinet/src/netconsoleTee/native/cpp/main.cpp index 44f94ed30e..3eb1db991d 100644 --- a/wpinet/src/netconsoleTee/native/cpp/main.cpp +++ b/wpinet/src/netconsoleTee/native/cpp/main.cpp @@ -7,8 +7,6 @@ #include #include -#include - #include "wpi/net/raw_uv_ostream.hpp" #include "wpi/net/uv/Loop.hpp" #include "wpi/net/uv/Tcp.hpp" diff --git a/wpinet/src/test/native/cpp/MulticastTest.cpp b/wpinet/src/test/native/cpp/MulticastTest.cpp index 79232f8502..f6ad46bde7 100644 --- a/wpinet/src/test/native/cpp/MulticastTest.cpp +++ b/wpinet/src/test/native/cpp/MulticastTest.cpp @@ -12,7 +12,6 @@ #include "wpi/net/MulticastServiceAnnouncer.h" #include "wpi/net/MulticastServiceResolver.h" -#include "wpi/util/timestamp.h" TEST(MulticastServiceAnnouncerTest, EmptyText) { const std::string_view serviceName = "TestServiceNoText"; diff --git a/wpinet/src/test/native/cpp/WorkerThreadTest.cpp b/wpinet/src/test/native/cpp/WorkerThreadTest.cpp index 061542f0dd..48550cc830 100644 --- a/wpinet/src/test/native/cpp/WorkerThreadTest.cpp +++ b/wpinet/src/test/native/cpp/WorkerThreadTest.cpp @@ -4,8 +4,6 @@ #include "wpi/net/WorkerThread.hpp" -#include - #include #include "wpi/net/EventLoopRunner.hpp" diff --git a/wpiutil/src/main/native/cpp/RuntimeCheck.cpp b/wpiutil/src/main/native/cpp/RuntimeCheck.cpp index 09c06e3b6e..2196836073 100644 --- a/wpiutil/src/main/native/cpp/RuntimeCheck.cpp +++ b/wpiutil/src/main/native/cpp/RuntimeCheck.cpp @@ -5,7 +5,6 @@ #include "wpi/util/RuntimeCheck.h" #ifdef _WIN32 -#include #include #pragma comment(lib, "version.lib") // for VerQueryValueW #include diff --git a/wpiutil/src/main/native/include/wpi/util/jni_util.hpp b/wpiutil/src/main/native/include/wpi/util/jni_util.hpp index 1fd32eb593..b16eeaf7f3 100644 --- a/wpiutil/src/main/native/include/wpi/util/jni_util.hpp +++ b/wpiutil/src/main/native/include/wpi/util/jni_util.hpp @@ -19,7 +19,6 @@ #include "wpi/util/SmallString.hpp" #include "wpi/util/SmallVector.hpp" #include "wpi/util/StringExtras.hpp" -#include "wpi/util/mutex.hpp" #include "wpi/util/print.hpp" #include "wpi/util/raw_ostream.hpp" #include "wpi/util/string.hpp" diff --git a/wpiutil/src/main/native/include/wpi/util/protobuf/ProtobufCallbacks.hpp b/wpiutil/src/main/native/include/wpi/util/protobuf/ProtobufCallbacks.hpp index 00763da8c0..a84bf3b7a1 100644 --- a/wpiutil/src/main/native/include/wpi/util/protobuf/ProtobufCallbacks.hpp +++ b/wpiutil/src/main/native/include/wpi/util/protobuf/ProtobufCallbacks.hpp @@ -4,13 +4,13 @@ #pragma once +#include #include #include +#include #include #include -#include - #include "pb.h" #include "wpi/util/SmallVector.hpp" #include "wpi/util/array.hpp"