From 554024767e058fe88bf1f59f1c1ed66780d3c470 Mon Sep 17 00:00:00 2001
From: Tyler Veness <calcmogul@gmail.com>
Date: Fri, 20 Sep 2024 17:43:39 -0700
Subject: [PATCH] Fix errors from new cpplint.py (#7105)

---
 .styleguide                                       |  3 ++-
 apriltag/src/main/native/cpp/AprilTagDetector.cpp |  2 +-
 .../src/main/native/cpp/AprilTagFieldLayout.cpp   |  2 ++
 apriltag/src/test/native/cpp/LoadConfigTest.cpp   |  2 ++
 .../src/main/native/cpp/main.cpp                  |  1 +
 .../main/native/cpp/cameraserver/CameraServer.cpp |  3 +++
 .../cpp/cameraserver/CameraServerShared.cpp       |  3 +++
 .../src/main/native/cpp/vision/VisionRunner.cpp   |  1 +
 .../src/main/native/cpp/PWMTest.cpp               |  1 +
 .../main/native/cpp/ConfigurableSourceImpl.cpp    |  4 +++-
 cscore/src/main/native/cpp/Frame.cpp              |  2 +-
 cscore/src/main/native/cpp/HttpCameraImpl.cpp     |  6 +++++-
 cscore/src/main/native/cpp/Instance.cpp           |  3 +++
 cscore/src/main/native/cpp/JpegUtil.cpp           |  2 ++
 cscore/src/main/native/cpp/MjpegServerImpl.cpp    |  4 +++-
 cscore/src/main/native/cpp/Notifier.cpp           |  2 --
 cscore/src/main/native/cpp/PropertyContainer.cpp  |  4 ++++
 cscore/src/main/native/cpp/RawSinkImpl.cpp        |  4 +++-
 cscore/src/main/native/cpp/RawSourceImpl.cpp      |  4 ++--
 cscore/src/main/native/cpp/SinkImpl.cpp           |  2 ++
 cscore/src/main/native/cpp/SourceImpl.cpp         |  3 +++
 cscore/src/main/native/cpp/Telemetry.cpp          |  3 +--
 cscore/src/main/native/cpp/cscore_c.cpp           |  4 +++-
 cscore/src/main/native/cpp/cscore_cpp.cpp         |  5 ++++-
 cscore/src/main/native/cpp/cscore_oo.cpp          |  3 +++
 .../src/main/native/cpp/jni/CameraServerJNI.cpp   |  3 ++-
 cscore/src/main/native/linux/NetworkListener.cpp  |  1 +
 cscore/src/main/native/linux/NetworkUtil.cpp      |  3 +++
 cscore/src/main/native/linux/UsbCameraImpl.cpp    |  4 +++-
 .../src/main/native/linux/UsbCameraListener.cpp   |  2 ++
 .../src/main/native/linux/UsbCameraProperty.cpp   |  4 ++++
 cscore/src/main/native/linux/UsbUtil.cpp          |  3 ++-
 cscore/src/main/native/osx/NetworkUtil.cpp        |  3 +++
 cscore/src/main/native/windows/COMCreators.cpp    |  4 ++--
 cscore/src/main/native/windows/NetworkUtil.cpp    |  3 +++
 cscore/src/main/native/windows/UsbCameraImpl.cpp  |  1 +
 .../src/main/native/windows/UsbCameraListener.cpp |  2 ++
 datalogtool/src/main/native/cpp/Downloader.cpp    |  3 +++
 datalogtool/src/main/native/cpp/Exporter.cpp      |  2 ++
 datalogtool/src/main/native/cpp/Sftp.cpp          |  4 ++++
 glass/src/app/native/cpp/main.cpp                 |  2 +-
 glass/src/lib/native/cpp/Context.cpp              |  5 +++--
 glass/src/lib/native/cpp/MainMenuBar.cpp          |  3 +++
 glass/src/lib/native/cpp/Storage.cpp              |  4 ++++
 glass/src/lib/native/cpp/View.cpp                 |  3 +++
 glass/src/lib/native/cpp/WindowManager.cpp        |  2 ++
 glass/src/lib/native/cpp/hardware/AnalogInput.cpp |  2 ++
 .../src/lib/native/cpp/hardware/AnalogOutput.cpp  |  2 ++
 glass/src/lib/native/cpp/hardware/Encoder.cpp     |  2 ++
 glass/src/lib/native/cpp/hardware/LEDDisplay.cpp  |  2 ++
 glass/src/lib/native/cpp/hardware/PWM.cpp         |  2 ++
 glass/src/lib/native/cpp/hardware/Pneumatic.cpp   |  1 +
 glass/src/lib/native/cpp/hardware/Relay.cpp       |  2 ++
 glass/src/lib/native/cpp/other/DeviceTree.cpp     |  1 +
 glass/src/lib/native/cpp/other/FMS.cpp            |  2 ++
 glass/src/lib/native/cpp/other/Field2D.cpp        |  2 ++
 glass/src/lib/native/cpp/other/Log.cpp            |  2 ++
 glass/src/lib/native/cpp/other/Mechanism2D.cpp    |  2 ++
 glass/src/lib/native/cpp/other/Plot.cpp           |  2 +-
 glass/src/lib/native/cpp/other/Subsystem.cpp      |  5 ++---
 .../native/cpp/support/DataLogReaderThread.cpp    |  1 +
 glass/src/lib/native/cpp/support/EnumSetting.cpp  |  2 ++
 .../lib/native/cpp/support/ExpressionParser.cpp   |  1 +
 glass/src/libnt/native/cpp/NTCommandScheduler.cpp |  2 ++
 glass/src/libnt/native/cpp/NTCommandSelector.cpp  |  2 ++
 .../src/libnt/native/cpp/NTDifferentialDrive.cpp  |  2 ++
 glass/src/libnt/native/cpp/NTDigitalInput.cpp     |  2 ++
 glass/src/libnt/native/cpp/NTDigitalOutput.cpp    |  2 ++
 glass/src/libnt/native/cpp/NTField2D.cpp          |  3 +++
 glass/src/libnt/native/cpp/NTGyro.cpp             |  2 ++
 glass/src/libnt/native/cpp/NTMecanumDrive.cpp     |  2 ++
 glass/src/libnt/native/cpp/NTMechanism2D.cpp      |  2 ++
 glass/src/libnt/native/cpp/NTMotorController.cpp  |  2 ++
 glass/src/libnt/native/cpp/NTPIDController.cpp    |  2 ++
 .../libnt/native/cpp/NTProfiledPIDController.cpp  |  2 ++
 glass/src/libnt/native/cpp/NTStringChooser.cpp    |  2 ++
 glass/src/libnt/native/cpp/NTSubsystem.cpp        |  2 ++
 glass/src/libnt/native/cpp/NetworkTables.cpp      |  5 +++++
 .../libnt/native/cpp/NetworkTablesProvider.cpp    |  2 ++
 .../libnt/native/cpp/NetworkTablesSettings.cpp    |  1 +
 .../libnt/native/cpp/StandardNetworkTables.cpp    |  2 ++
 hal/src/main/native/athena/AddressableLED.cpp     |  1 +
 hal/src/main/native/athena/AnalogInternal.cpp     |  1 +
 hal/src/main/native/athena/AnalogTrigger.cpp      |  2 ++
 hal/src/main/native/athena/CANAPI.cpp             |  1 +
 hal/src/main/native/athena/CTREPCM.cpp            |  2 ++
 hal/src/main/native/athena/CTREPDP.cpp            |  2 ++
 hal/src/main/native/athena/Counter.cpp            |  1 +
 hal/src/main/native/athena/DigitalInternal.cpp    |  1 +
 hal/src/main/native/athena/Encoder.cpp            |  2 ++
 hal/src/main/native/athena/FRCDriverStation.cpp   |  1 +
 hal/src/main/native/athena/HAL.cpp                |  2 ++
 hal/src/main/native/athena/REVPDH.cpp             |  1 +
 hal/src/main/native/athena/REVPH.cpp              |  1 +
 hal/src/main/native/athena/SPI.cpp                |  1 +
 hal/src/main/native/athena/cpp/SerialHelper.cpp   |  2 ++
 hal/src/main/native/cpp/jni/CANJNI.cpp            |  1 -
 hal/src/main/native/cpp/jni/SimDeviceJNI.cpp      |  3 +++
 .../cpp/jni/simulation/AddressableLEDDataJNI.cpp  |  2 ++
 .../cpp/jni/simulation/BufferCallbackStore.cpp    |  3 +--
 .../native/cpp/jni/simulation/CallbackStore.cpp   |  2 +-
 .../jni/simulation/ConstBufferCallbackStore.cpp   |  3 +--
 .../cpp/jni/simulation/SimDeviceDataJNI.cpp       |  4 +++-
 .../SpiReadAutoReceiveBufferCallbackStore.cpp     |  3 +--
 hal/src/main/native/sim/CANAPI.cpp                |  2 ++
 hal/src/main/native/sim/CTREPCM.cpp               |  3 ++-
 hal/src/main/native/sim/Encoder.cpp               |  2 ++
 hal/src/main/native/sim/Extensions.cpp            |  2 ++
 hal/src/main/native/sim/HAL.cpp                   |  2 +-
 hal/src/main/native/sim/Notifier.cpp              |  2 ++
 hal/src/main/native/sim/REVPH.cpp                 |  3 ++-
 .../native/sim/mockdata/DriverStationData.cpp     |  1 -
 hal/src/main/native/sim/mockdata/EncoderData.cpp  |  2 ++
 hal/src/main/native/sim/mockdata/RoboRioData.cpp  |  3 ++-
 .../main/native/sim/mockdata/SimDeviceData.cpp    |  2 ++
 hal/src/test/native/cpp/can/CANTest.cpp           |  3 ++-
 hal/src/test/native/cpp/handles/HandleTest.cpp    |  3 ++-
 .../test/native/cpp/mockdata/AnalogInDataTest.cpp |  2 ++
 .../native/cpp/mockdata/AnalogOutDataTest.cpp     |  2 ++
 hal/src/test/native/cpp/mockdata/DIODataTest.cpp  |  2 ++
 .../native/cpp/mockdata/DriverStationDataTest.cpp |  1 +
 hal/src/test/native/cpp/mockdata/I2CDataTest.cpp  |  4 ++--
 hal/src/test/native/cpp/mockdata/PCMDataTest.cpp  |  2 ++
 hal/src/test/native/cpp/mockdata/PDPDataTest.cpp  |  4 ++--
 hal/src/test/native/cpp/mockdata/PWMDataTest.cpp  |  2 ++
 .../test/native/cpp/mockdata/RelayDataTest.cpp    |  2 ++
 hal/src/test/native/cpp/mockdata/SPIDataTest.cpp  |  4 ++--
 ntcore/src/dev/native/cpp/main.cpp                |  2 ++
 ntcore/src/main/native/cpp/ConnectionList.cpp     |  3 +++
 ntcore/src/main/native/cpp/InstanceImpl.cpp       |  4 ++++
 ntcore/src/main/native/cpp/ListenerStorage.cpp    |  2 ++
 ntcore/src/main/native/cpp/LocalStorage.cpp       |  4 ++++
 ntcore/src/main/native/cpp/LoggerImpl.cpp         |  2 ++
 ntcore/src/main/native/cpp/NetworkClient.cpp      |  2 ++
 ntcore/src/main/native/cpp/NetworkServer.cpp      |  3 +++
 ntcore/src/main/native/cpp/Value.cpp              |  4 ++++
 .../src/main/native/cpp/ValueCircularBuffer.cpp   |  3 +++
 .../src/main/native/cpp/jni/NetworkTablesJNI.cpp  |  3 +++
 ntcore/src/main/native/cpp/net/ClientImpl.cpp     |  2 ++
 ntcore/src/main/native/cpp/net/ServerImpl.cpp     |  4 ++--
 ntcore/src/main/native/cpp/net/WireDecoder.cpp    |  3 +++
 ntcore/src/main/native/cpp/net/WireEncoder.cpp    |  1 +
 ntcore/src/main/native/cpp/net3/ClientImpl3.cpp   |  2 ++
 ntcore/src/main/native/cpp/net3/WireDecoder3.cpp  |  1 +
 .../native/cpp/networktables/NetworkTable.cpp     |  4 ++++
 .../cpp/networktables/NetworkTableInstance.cpp    |  5 +++++
 ntcore/src/main/native/cpp/ntcore_c.cpp           |  2 ++
 ntcore/src/main/native/cpp/ntcore_cpp.cpp         |  3 +++
 ntcore/src/main/native/cpp/ntcore_meta.cpp        |  4 ++++
 .../test/native/cpp/ConnectionListenerTest.cpp    |  1 +
 ntcore/src/test/native/cpp/LocalStorageTest.cpp   |  3 +++
 ntcore/src/test/native/cpp/LoggerTest.cpp         |  2 ++
 ntcore/src/test/native/cpp/NetworkTableTest.cpp   |  3 +++
 ntcore/src/test/native/cpp/TopicListenerTest.cpp  |  2 ++
 ntcore/src/test/native/cpp/ValueTest.cpp          |  5 ++++-
 ntcore/src/test/native/cpp/main.cpp               |  1 +
 ntcore/src/test/native/cpp/net/ServerImplTest.cpp |  1 +
 .../src/test/native/cpp/net/WireDecoderTest.cpp   |  2 ++
 .../src/test/native/cpp/net3/WireDecoder3Test.cpp |  2 ++
 .../src/test/native/cpp/net3/WireEncoder3Test.cpp |  1 +
 ntcoreffi/src/main/native/cpp/DataLogManager.cpp  |  2 +-
 outlineviewer/src/main/native/cpp/main.cpp        |  1 +
 processstarter/src/main/native/linux/main.cpp     |  1 +
 .../src/main/native/cpp/App.cpp                   |  2 ++
 .../src/main/native/cpp/DeploySession.cpp         |  2 ++
 .../src/main/native/cpp/SshSession.cpp            |  2 +-
 .../src/main/native/cpp/romi/OnBoardIO.cpp        |  2 ++
 .../halsim_ds_socket/src/main/native/cpp/main.cpp |  1 +
 .../src/main/native/cpp/AccelerometerSimGui.cpp   |  5 ++---
 .../src/main/native/cpp/AddressableLEDGui.cpp     |  4 +++-
 .../src/main/native/cpp/AnalogGyroSimGui.cpp      |  5 ++---
 .../src/main/native/cpp/AnalogInputSimGui.cpp     |  5 ++---
 .../src/main/native/cpp/AnalogOutputSimGui.cpp    |  5 ++---
 .../halsim_gui/src/main/native/cpp/DIOSimGui.cpp  |  5 ++---
 .../src/main/native/cpp/DriverStationGui.cpp      | 11 +++++------
 .../src/main/native/cpp/DriverStationGui.h        |  4 ++--
 .../src/main/native/cpp/EncoderSimGui.cpp         |  2 +-
 .../src/main/native/cpp/HALProvider.cpp           |  7 +++----
 .../halsim_gui/src/main/native/cpp/HALSimGui.cpp  |  4 +++-
 .../src/main/native/cpp/NetworkTablesSimGui.cpp   |  3 ++-
 .../halsim_gui/src/main/native/cpp/PCMSimGui.cpp  |  5 ++---
 .../halsim_gui/src/main/native/cpp/PCMSimGui.h    |  4 ++--
 .../halsim_gui/src/main/native/cpp/PHSimGui.cpp   |  5 ++---
 .../halsim_gui/src/main/native/cpp/PHSimGui.h     |  4 ++--
 .../halsim_gui/src/main/native/cpp/PWMSimGui.cpp  |  3 +--
 .../main/native/cpp/PowerDistributionSimGui.cpp   |  3 +--
 .../src/main/native/cpp/RelaySimGui.cpp           |  3 +--
 .../src/main/native/cpp/RoboRioSimGui.cpp         |  3 +--
 .../src/main/native/cpp/SimDeviceGui.cpp          |  5 ++++-
 .../halsim_gui/src/main/native/cpp/TimingGui.cpp  |  6 +++---
 .../halsim_gui/src/main/native/cpp/main.cpp       |  8 ++++----
 .../src/main/native/include/HALProvider.h         |  6 +++---
 .../src/main/native/include/HALSimGui.h           |  6 +++---
 .../src/main/native/cpp/HALSimWS.cpp              |  2 ++
 .../src/main/native/cpp/HALSimWSClient.cpp        |  2 ++
 .../main/native/cpp/HALSimWSClientConnection.cpp  |  1 +
 .../src/main/native/cpp/WSHalProviders.cpp        |  2 ++
 .../main/native/cpp/WSProvider_AddressableLED.cpp |  2 ++
 .../cpp/WSProvider_BuiltInAccelerometer.cpp       |  2 ++
 .../main/native/cpp/WSProvider_DriverStation.cpp  |  2 +-
 .../src/main/native/cpp/WSProvider_Joystick.cpp   |  2 ++
 .../src/main/native/cpp/WSProvider_SimDevice.cpp  |  3 +++
 .../src/main/native/cpp/WSProvider_Solenoid.cpp   |  4 ++++
 .../src/main/native/cpp/HALSimHttpConnection.cpp  |  2 ++
 .../src/main/native/cpp/HALSimWSServer.cpp        |  2 ++
 .../src/main/native/cpp/HALSimWeb.cpp             |  3 +++
 .../src/test/native/cpp/WebServerClientTest.cpp   |  2 ++
 .../halsim_ws_server/src/test/native/cpp/main.cpp |  2 ++
 .../halsim_xrp/src/main/native/cpp/HALSimXRP.cpp  |  1 +
 .../src/main/native/cpp/HALSimXRPClient.cpp       |  2 ++
 simulation/halsim_xrp/src/main/native/cpp/XRP.cpp |  5 ++++-
 sysid/src/main/native/cpp/App.cpp                 |  2 ++
 sysid/src/main/native/cpp/Util.cpp                |  1 +
 .../main/native/cpp/analysis/AnalysisManager.cpp  |  4 +++-
 .../native/cpp/analysis/FeedforwardAnalysis.cpp   |  4 ++--
 .../main/native/cpp/analysis/FilteringUtils.cpp   |  5 ++++-
 sysid/src/main/native/cpp/view/Analyzer.cpp       |  2 ++
 sysid/src/main/native/cpp/view/AnalyzerPlot.cpp   |  3 +++
 sysid/src/main/native/cpp/view/DataSelector.cpp   |  5 +++++
 sysid/src/main/native/cpp/view/LogLoader.cpp      |  3 +++
 upstream_utils/sleipnir.py                        |  4 ++--
 .../sleipnir_patches/0002-Use-fmtlib.patch        |  6 +++---
 .../0004-Use-wpi-SmallVector.patch                |  2 +-
 wpigui/src/main/native/cpp/wpigui.cpp             |  2 ++
 wpigui/src/main/native/cpp/wpigui_openurl.cpp     |  2 ++
 .../src/main/native/cpp/frc2/command/Command.cpp  | 15 ++++-----------
 .../main/native/cpp/frc2/command/CommandPtr.cpp   |  5 ++++-
 .../native/cpp/frc2/command/CommandScheduler.cpp  |  4 ++++
 .../src/main/native/cpp/frc2/command/Commands.cpp |  3 +++
 .../cpp/frc2/command/ConditionalCommand.cpp       |  4 ++++
 .../native/cpp/frc2/command/DeferredCommand.cpp   |  2 ++
 .../native/cpp/frc2/command/FunctionalCommand.cpp |  2 ++
 .../native/cpp/frc2/command/InstantCommand.cpp    |  2 ++
 .../cpp/frc2/command/MecanumControllerCommand.cpp |  1 +
 .../native/cpp/frc2/command/NotifierCommand.cpp   |  2 ++
 .../cpp/frc2/command/ParallelCommandGroup.cpp     |  3 +++
 .../cpp/frc2/command/ParallelDeadlineGroup.cpp    |  4 ++++
 .../native/cpp/frc2/command/ParallelRaceGroup.cpp |  3 +++
 .../main/native/cpp/frc2/command/PrintCommand.cpp |  2 ++
 .../main/native/cpp/frc2/command/ProxyCommand.cpp |  3 +++
 .../native/cpp/frc2/command/RepeatCommand.cpp     |  3 +++
 .../main/native/cpp/frc2/command/RunCommand.cpp   |  2 ++
 .../cpp/frc2/command/SequentialCommandGroup.cpp   |  3 +++
 .../native/cpp/frc2/command/StartEndCommand.cpp   |  2 ++
 .../main/native/cpp/frc2/command/Subsystem.cpp    |  3 +++
 .../native/cpp/frc2/command/SubsystemBase.cpp     |  2 ++
 .../native/cpp/frc2/command/WaitUntilCommand.cpp  |  2 ++
 .../native/cpp/frc2/command/WrapperCommand.cpp    |  2 ++
 .../cpp/frc2/command/button/NetworkButton.cpp     |  3 +++
 .../native/cpp/frc2/command/button/Trigger.cpp    |  4 +++-
 .../cpp/frc2/command/CommandDecoratorTest.cpp     |  3 +++
 .../native/cpp/frc2/command/CommandPtrTest.cpp    |  2 ++
 .../cpp/frc2/command/CommandRequirementsTest.cpp  |  8 ++------
 .../cpp/frc2/command/ConditionalCommandTest.cpp   |  3 +++
 .../cpp/frc2/command/DefaultCommandTest.cpp       |  2 ++
 .../cpp/frc2/command/ParallelCommandGroupTest.cpp |  3 +++
 .../frc2/command/ParallelDeadlineGroupTest.cpp    |  4 ++++
 .../cpp/frc2/command/ParallelRaceGroupTest.cpp    |  3 +++
 .../cpp/frc2/command/SchedulingRecursionTest.cpp  |  2 ++
 .../native/cpp/frc2/command/SelectCommandTest.cpp |  5 ++++-
 .../frc2/command/SequentialCommandGroupTest.cpp   |  3 +++
 .../cpp/frc2/command/button/TriggerTest.cpp       |  2 ++
 .../cpp/frc2/command/sysid/SysIdRoutineTest.cpp   |  3 ++-
 wpilibc/src/main/native/cpp/ADIS16448_IMU.cpp     | 12 +++++-------
 wpilibc/src/main/native/cpp/ADIS16470_IMU.cpp     |  7 ++-----
 wpilibc/src/main/native/cpp/Alert.cpp             |  8 ++++++--
 wpilibc/src/main/native/cpp/AnalogEncoder.cpp     |  3 ++-
 wpilibc/src/main/native/cpp/AnalogGyro.cpp        |  4 ++--
 wpilibc/src/main/native/cpp/AnalogInput.cpp       |  2 ++
 wpilibc/src/main/native/cpp/AnalogOutput.cpp      |  3 +--
 .../src/main/native/cpp/AnalogPotentiometer.cpp   |  1 +
 wpilibc/src/main/native/cpp/AnalogTrigger.cpp     |  1 +
 .../src/main/native/cpp/AsynchronousInterrupt.cpp |  3 +++
 wpilibc/src/main/native/cpp/Counter.cpp           |  2 +-
 wpilibc/src/main/native/cpp/DMA.cpp               |  5 -----
 wpilibc/src/main/native/cpp/DataLogManager.cpp    |  2 ++
 wpilibc/src/main/native/cpp/DigitalInput.cpp      |  2 +-
 wpilibc/src/main/native/cpp/DigitalOutput.cpp     |  2 +-
 wpilibc/src/main/native/cpp/DriverStation.cpp     |  5 +----
 wpilibc/src/main/native/cpp/DutyCycle.cpp         |  2 ++
 wpilibc/src/main/native/cpp/DutyCycleEncoder.cpp  |  4 +++-
 wpilibc/src/main/native/cpp/Encoder.cpp           |  1 +
 wpilibc/src/main/native/cpp/Errors.cpp            |  3 ++-
 wpilibc/src/main/native/cpp/Filesystem.cpp        |  2 ++
 wpilibc/src/main/native/cpp/GenericHID.cpp        |  2 ++
 wpilibc/src/main/native/cpp/LEDPattern.cpp        |  1 +
 wpilibc/src/main/native/cpp/PneumaticHub.cpp      |  3 +++
 wpilibc/src/main/native/cpp/PneumaticsBase.cpp    |  2 ++
 .../main/native/cpp/PneumaticsControlModule.cpp   |  3 +++
 wpilibc/src/main/native/cpp/PowerDistribution.cpp |  3 ++-
 wpilibc/src/main/native/cpp/Preferences.cpp       |  4 +++-
 wpilibc/src/main/native/cpp/Relay.cpp             |  2 +-
 wpilibc/src/main/native/cpp/Resource.cpp          |  5 +++++
 wpilibc/src/main/native/cpp/RobotController.cpp   |  2 +-
 wpilibc/src/main/native/cpp/SerialPort.cpp        |  2 +-
 wpilibc/src/main/native/cpp/SharpIR.cpp           |  2 ++
 .../src/main/native/cpp/SynchronousInterrupt.cpp  |  2 ++
 wpilibc/src/main/native/cpp/Ultrasonic.cpp        |  2 ++
 wpilibc/src/main/native/cpp/Watchdog.cpp          |  1 +
 .../cpp/counter/ExternalDirectionCounter.cpp      |  2 ++
 .../src/main/native/cpp/counter/UpDownCounter.cpp |  2 ++
 .../main/native/cpp/drive/DifferentialDrive.cpp   |  2 ++
 .../src/main/native/cpp/drive/MecanumDrive.cpp    |  2 ++
 .../src/main/native/cpp/event/BooleanEvent.cpp    |  3 +++
 wpilibc/src/main/native/cpp/event/EventLoop.cpp   |  2 ++
 .../main/native/cpp/event/NetworkBooleanEvent.cpp |  3 +++
 .../src/main/native/cpp/livewindow/LiveWindow.cpp |  2 ++
 .../cpp/motorcontrol/MotorControllerGroup.cpp     |  3 +++
 .../native/cpp/motorcontrol/NidecBrushless.cpp    |  2 ++
 .../cpp/motorcontrol/PWMMotorController.cpp       |  2 ++
 .../native/cpp/shuffleboard/ComplexWidget.cpp     |  2 ++
 .../cpp/shuffleboard/RecordingController.cpp      |  2 ++
 .../main/native/cpp/shuffleboard/Shuffleboard.cpp |  2 ++
 .../shuffleboard/ShuffleboardComponentBase.cpp    |  3 +++
 .../cpp/shuffleboard/ShuffleboardContainer.cpp    |  5 +++++
 .../cpp/shuffleboard/ShuffleboardInstance.cpp     |  3 +++
 .../cpp/shuffleboard/ShuffleboardLayout.cpp       |  2 ++
 .../native/cpp/shuffleboard/ShuffleboardTab.cpp   |  2 ++
 .../main/native/cpp/shuffleboard/SimpleWidget.cpp |  2 ++
 .../native/cpp/simulation/DoubleSolenoidSim.cpp   |  3 +++
 .../native/cpp/simulation/PneumaticsBaseSim.cpp   |  2 ++
 .../src/main/native/cpp/simulation/RoboRioSim.cpp |  2 +-
 .../main/native/cpp/simulation/SolenoidSim.cpp    |  3 +++
 .../main/native/cpp/smartdashboard/Field2d.cpp    |  3 +++
 .../native/cpp/smartdashboard/FieldObject2d.cpp   |  1 +
 .../cpp/smartdashboard/ListenerExecutor.cpp       |  2 ++
 .../native/cpp/smartdashboard/Mechanism2d.cpp     |  1 +
 .../cpp/smartdashboard/MechanismLigament2d.cpp    |  3 +++
 .../cpp/smartdashboard/MechanismObject2d.cpp      |  2 ++
 .../cpp/smartdashboard/SendableBuilderImpl.cpp    |  6 ++++--
 .../cpp/smartdashboard/SendableChooserBase.cpp    |  2 ++
 .../native/cpp/smartdashboard/SmartDashboard.cpp  |  5 +++++
 .../src/main/native/cpp/sysid/SysIdRoutineLog.cpp |  2 ++
 wpilibc/src/main/native/cppcs/RobotBase.cpp       |  3 ++-
 wpilibc/src/test/native/cpp/ScopedTracerTest.cpp  |  2 +-
 .../cpp/shuffleboard/ShuffleboardInstanceTest.cpp |  1 -
 .../cpp/shuffleboard/SuppliedValueWidgetTest.cpp  |  3 +++
 .../native/cpp/simulation/AnalogGyroSimTest.cpp   |  2 ++
 .../src/test/native/cpp/simulation/PDPSimTest.cpp |  2 ++
 .../test/native/cpp/simulation/RoboRioSimTest.cpp |  2 ++
 .../cpp/examples/AprilTagsVision/cpp/Robot.cpp    |  2 +-
 .../cpp/subsystems/DriveSubsystem.cpp             |  2 ++
 .../cpp/Drivetrain.cpp                            |  2 +-
 .../examples/Frisbeebot/cpp/RobotContainer.cpp    |  2 ++
 .../cpp/examples/I2CCommunication/cpp/Robot.cpp   |  2 ++
 .../src/main/native/cpp/AnalogLoopTest.cpp        |  2 ++
 .../src/main/native/cpp/DMATest.cpp               | 11 ++++++-----
 .../src/main/native/cpp/FakeEncoderTest.cpp       |  2 ++
 .../src/main/native/cpp/PreferencesTest.cpp       |  1 +
 wpimath/src/main/native/cpp/MathShared.cpp        |  3 +++
 .../main/native/cpp/controller/ArmFeedforward.cpp |  1 +
 .../estimator/DifferentialDrivePoseEstimator.cpp  |  2 ++
 wpimath/src/main/native/cpp/geometry/Pose3d.cpp   |  1 +
 .../src/main/native/cpp/geometry/Rotation3d.cpp   |  1 +
 .../src/main/native/cpp/geometry/Transform3d.cpp  |  2 ++
 .../main/native/cpp/geometry/Translation2d.cpp    |  2 ++
 .../src/main/native/cpp/jni/TrajectoryUtilJNI.cpp |  1 +
 .../src/main/native/cpp/spline/SplineHelper.cpp   |  1 +
 .../src/main/native/cpp/trajectory/Trajectory.cpp |  1 +
 .../native/cpp/trajectory/TrajectoryGenerator.cpp |  1 +
 .../cpp/trajectory/TrajectoryParameterizer.cpp    |  2 ++
 .../main/native/cpp/trajectory/TrajectoryUtil.cpp |  1 +
 .../DifferentialDriveKinematicsConstraint.cpp     |  2 ++
 .../DifferentialDriveVoltageConstraint.cpp        |  1 +
 .../cpp/trajectory/proto/TrajectoryProto.cpp      |  2 ++
 .../sleipnir/include/sleipnir/util/Print.hpp      |  1 +
 .../src/optimization/solver/InteriorPoint.cpp     |  9 +++++++--
 .../DifferentialDrivePoseEstimatorTest.cpp        |  1 +
 .../cpp/estimator/ExtendedKalmanFilterTest.cpp    |  2 +-
 .../estimator/MecanumDrivePoseEstimatorTest.cpp   |  1 +
 .../estimator/SwerveDrivePoseEstimatorTest.cpp    |  2 +-
 .../cpp/estimator/UnscentedKalmanFilterTest.cpp   |  2 +-
 .../test/native/cpp/system/LinearSystemIDTest.cpp |  1 -
 wpinet/examples/dsclient/dsclient.cpp             |  2 +-
 .../examples/parallelconnect/parallelconnect.cpp  |  1 +
 wpinet/examples/webserver/webserver.cpp           |  1 +
 wpinet/src/main/native/cpp/DsClient.cpp           |  2 ++
 wpinet/src/main/native/cpp/EventLoopRunner.cpp    |  3 +++
 .../src/main/native/cpp/HttpServerConnection.cpp  |  2 ++
 wpinet/src/main/native/cpp/HttpUtil.cpp           |  4 ++--
 .../main/native/cpp/MulticastServiceAnnouncer.cpp |  3 +++
 .../main/native/cpp/MulticastServiceResolver.cpp  |  4 ++++
 .../src/main/native/cpp/ParallelTcpConnector.cpp  |  4 ++++
 wpinet/src/main/native/cpp/PortForwarder.cpp      |  3 +++
 wpinet/src/main/native/cpp/SocketError.cpp        |  2 ++
 wpinet/src/main/native/cpp/UDPClient.cpp          |  2 ++
 wpinet/src/main/native/cpp/WebSocket.cpp          |  3 +++
 wpinet/src/main/native/cpp/WebSocketServer.cpp    |  1 +
 wpinet/src/main/native/cpp/jni/WPINetJNI.cpp      |  5 +++++
 wpinet/src/main/native/cpp/uv/Async.cpp           |  2 ++
 wpinet/src/main/native/cpp/uv/Check.cpp           |  2 ++
 wpinet/src/main/native/cpp/uv/FsEvent.cpp         |  2 ++
 wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp     |  5 ++++-
 wpinet/src/main/native/cpp/uv/GetNameInfo.cpp     |  4 ++++
 wpinet/src/main/native/cpp/uv/Idle.cpp            |  2 ++
 wpinet/src/main/native/cpp/uv/Loop.cpp            |  2 ++
 wpinet/src/main/native/cpp/uv/NetworkStream.cpp   |  3 +++
 wpinet/src/main/native/cpp/uv/Pipe.cpp            |  4 ++++
 wpinet/src/main/native/cpp/uv/Poll.cpp            |  4 ++++
 wpinet/src/main/native/cpp/uv/Prepare.cpp         |  2 ++
 wpinet/src/main/native/cpp/uv/Process.cpp         |  2 ++
 wpinet/src/main/native/cpp/uv/Signal.cpp          |  2 ++
 wpinet/src/main/native/cpp/uv/Stream.cpp          |  5 +++++
 wpinet/src/main/native/cpp/uv/Tcp.cpp             |  3 +++
 wpinet/src/main/native/cpp/uv/Timer.cpp           |  4 ++++
 wpinet/src/main/native/cpp/uv/Tty.cpp             |  2 ++
 wpinet/src/main/native/cpp/uv/Udp.cpp             |  3 +++
 wpinet/src/main/native/cpp/uv/Work.cpp            |  4 ++++
 .../native/linux/MulticastServiceAnnouncer.cpp    |  3 +++
 .../native/linux/MulticastServiceResolver.cpp     |  4 ++++
 .../native/macOS/MulticastServiceAnnouncer.cpp    |  4 ++++
 .../native/macOS/MulticastServiceResolver.cpp     |  3 +++
 wpinet/src/main/native/macOS/ResolverThread.cpp   |  3 +++
 .../native/windows/MulticastServiceAnnouncer.cpp  |  2 ++
 .../native/windows/MulticastServiceResolver.cpp   |  2 ++
 wpinet/src/netconsoleServer/native/cpp/main.cpp   |  2 ++
 wpinet/src/netconsoleTee/native/cpp/main.cpp      |  2 ++
 .../cpp/HttpWebSocketServerConnectionTest.cpp     |  2 ++
 .../src/test/native/cpp/WebSocketClientTest.cpp   |  5 +++++
 .../test/native/cpp/WebSocketIntegrationTest.cpp  |  3 ++-
 .../test/native/cpp/WebSocketSerializerTest.cpp   |  4 ++++
 .../src/test/native/cpp/WebSocketServerTest.cpp   |  5 ++++-
 wpinet/src/test/native/cpp/WebSocketTest.cpp      |  3 +++
 .../test/native/cpp/uv/UvAsyncFunctionTest.cpp    |  2 ++
 wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp     |  1 +
 wpiutil/examples/printlog/printlog.cpp            |  2 ++
 wpiutil/examples/writelog/writelog.cpp            |  2 +-
 wpiutil/src/main/native/cpp/Base64.cpp            |  3 +++
 wpiutil/src/main/native/cpp/DataLog.cpp           |  2 ++
 .../main/native/cpp/DataLogBackgroundWriter.cpp   |  3 +++
 wpiutil/src/main/native/cpp/DataLogReader.cpp     |  2 ++
 wpiutil/src/main/native/cpp/DataLogWriter.cpp     |  4 ++++
 wpiutil/src/main/native/cpp/MessagePack.cpp       |  2 ++
 wpiutil/src/main/native/cpp/SafeThread.cpp        |  2 ++
 wpiutil/src/main/native/cpp/StackTraceWrap.cpp    |  1 +
 wpiutil/src/main/native/cpp/future.cpp            |  2 ++
 wpiutil/src/main/native/cpp/jni/DataLogJNI.cpp    |  1 +
 wpiutil/src/main/native/cpp/protobuf/Protobuf.cpp |  3 +++
 .../cpp/protobuf/ProtobufMessageDatabase.cpp      |  3 +++
 .../main/native/cpp/sendable/SendableRegistry.cpp |  2 ++
 wpiutil/src/main/native/cpp/sha1.cpp              |  2 ++
 wpiutil/src/main/native/cpp/string.cpp            |  1 +
 .../src/main/native/cpp/struct/DynamicStruct.cpp  |  3 +++
 .../src/main/native/cpp/struct/SchemaParser.cpp   |  3 +++
 wpiutil/src/main/native/cpp/timestamp.cpp         |  4 +++-
 wpiutil/src/main/native/include/wpi/RawFrame.h    |  2 +-
 wpiutil/src/main/native/include/wpi/mutex.h       |  2 +-
 wpiutil/src/main/native/include/wpi/print.h       |  1 +
 wpiutil/src/main/native/unix/Demangle.cpp         |  1 +
 wpiutil/src/main/native/unix/StackTrace.cpp       |  2 ++
 wpiutil/src/main/native/windows/Demangle.cpp      |  2 ++
 wpiutil/src/main/native/windows/StackTrace.cpp    |  2 ++
 wpiutil/src/test/native/cpp/Base64Test.cpp        |  2 ++
 wpiutil/src/test/native/cpp/DataLogTest.cpp       |  2 ++
 wpiutil/src/test/native/cpp/FileLoggerTest.cpp    |  1 +
 wpiutil/src/test/native/cpp/ScopeExitTest.cpp     |  2 ++
 wpiutil/src/test/native/cpp/UidVectorTest.cpp     |  2 ++
 .../src/test/native/cpp/expected/ExpectedTest.cpp |  1 +
 wpiutil/src/test/native/cpp/future_test.cpp       |  2 +-
 .../test/native/cpp/sigslot/signal-tracking.cpp   |  1 +
 wpiutil/src/test/native/cpp/sigslot/signal.cpp    |  1 +
 .../test/native/cpp/struct/DynamicStructTest.cpp  |  2 ++
 xrpVendordep/src/main/native/cpp/xrp/XRPMotor.cpp |  4 ++++
 xrpVendordep/src/main/native/cpp/xrp/XRPServo.cpp |  4 ++++
 464 files changed, 1026 insertions(+), 218 deletions(-)

diff --git a/.styleguide b/.styleguide
index f1e32ce536f..feb5dc3e00e 100644
--- a/.styleguide
+++ b/.styleguide
@@ -33,8 +33,9 @@ includeOtherLibs {
   ^cameraserver/
   ^cscore
   ^fmt/
-  ^gtest/
+  ^glass/
   ^google/
+  ^gtest/
   ^hal/
   ^imgui
   ^implot
diff --git a/apriltag/src/main/native/cpp/AprilTagDetector.cpp b/apriltag/src/main/native/cpp/AprilTagDetector.cpp
index ca06c2b9477..08046d16dca 100644
--- a/apriltag/src/main/native/cpp/AprilTagDetector.cpp
+++ b/apriltag/src/main/native/cpp/AprilTagDetector.cpp
@@ -5,7 +5,7 @@
 #include "frc/apriltag/AprilTagDetector.h"
 
 #include <cmath>
-#include <numbers>
+#include <utility>
 
 #ifdef _WIN32
 #pragma warning(disable : 4200)
diff --git a/apriltag/src/main/native/cpp/AprilTagFieldLayout.cpp b/apriltag/src/main/native/cpp/AprilTagFieldLayout.cpp
index a205c0ffe6e..c90fad3626d 100644
--- a/apriltag/src/main/native/cpp/AprilTagFieldLayout.cpp
+++ b/apriltag/src/main/native/cpp/AprilTagFieldLayout.cpp
@@ -5,6 +5,8 @@
 #include "frc/apriltag/AprilTagFieldLayout.h"
 
 #include <system_error>
+#include <utility>
+#include <vector>
 
 #include <units/angle.h>
 #include <units/length.h>
diff --git a/apriltag/src/test/native/cpp/LoadConfigTest.cpp b/apriltag/src/test/native/cpp/LoadConfigTest.cpp
index ba6fe81ff96..9cf5b6fa105 100644
--- a/apriltag/src/test/native/cpp/LoadConfigTest.cpp
+++ b/apriltag/src/test/native/cpp/LoadConfigTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <vector>
+
 #include <gtest/gtest.h>
 
 #include "frc/apriltag/AprilTagFieldLayout.h"
diff --git a/cameraserver/multiCameraServer/src/main/native/cpp/main.cpp b/cameraserver/multiCameraServer/src/main/native/cpp/main.cpp
index a794bbc1425..f3e0a7b72e3 100644
--- a/cameraserver/multiCameraServer/src/main/native/cpp/main.cpp
+++ b/cameraserver/multiCameraServer/src/main/native/cpp/main.cpp
@@ -6,6 +6,7 @@
 #include <string>
 #include <string_view>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include <networktables/NetworkTableInstance.h>
diff --git a/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
index c13c113c563..69293bbaac9 100644
--- a/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
+++ b/cameraserver/src/main/native/cpp/cameraserver/CameraServer.cpp
@@ -5,6 +5,9 @@
 #include "cameraserver/CameraServer.h"
 
 #include <atomic>
+#include <memory>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include <fmt/format.h>
diff --git a/cameraserver/src/main/native/cpp/cameraserver/CameraServerShared.cpp b/cameraserver/src/main/native/cpp/cameraserver/CameraServerShared.cpp
index 6d1ebc2c17a..4b6c9cf5af1 100644
--- a/cameraserver/src/main/native/cpp/cameraserver/CameraServerShared.cpp
+++ b/cameraserver/src/main/native/cpp/cameraserver/CameraServerShared.cpp
@@ -4,6 +4,9 @@
 
 #include "cameraserver/CameraServerShared.h"
 
+#include <memory>
+#include <utility>
+
 #include <wpi/mutex.h>
 
 namespace {
diff --git a/cameraserver/src/main/native/cpp/vision/VisionRunner.cpp b/cameraserver/src/main/native/cpp/vision/VisionRunner.cpp
index b55325a7df1..1458db502bf 100644
--- a/cameraserver/src/main/native/cpp/vision/VisionRunner.cpp
+++ b/cameraserver/src/main/native/cpp/vision/VisionRunner.cpp
@@ -4,6 +4,7 @@
 
 #include "vision/VisionRunner.h"
 
+#include <memory>
 #include <thread>
 
 #include <opencv2/core/mat.hpp>
diff --git a/crossConnIntegrationTests/src/main/native/cpp/PWMTest.cpp b/crossConnIntegrationTests/src/main/native/cpp/PWMTest.cpp
index d209658c9ce..49ff7b0e45d 100644
--- a/crossConnIntegrationTests/src/main/native/cpp/PWMTest.cpp
+++ b/crossConnIntegrationTests/src/main/native/cpp/PWMTest.cpp
@@ -4,6 +4,7 @@
 
 #include <atomic>
 #include <thread>
+#include <utility>
 
 #include <gtest/gtest.h>
 #include <hal/DMA.h>
diff --git a/cscore/src/main/native/cpp/ConfigurableSourceImpl.cpp b/cscore/src/main/native/cpp/ConfigurableSourceImpl.cpp
index e7e8721d9f4..0244c28bfe3 100644
--- a/cscore/src/main/native/cpp/ConfigurableSourceImpl.cpp
+++ b/cscore/src/main/native/cpp/ConfigurableSourceImpl.cpp
@@ -4,11 +4,13 @@
 
 #include "ConfigurableSourceImpl.h"
 
+#include <memory>
+#include <string>
+
 #include <wpi/timestamp.h>
 
 #include "Handle.h"
 #include "Instance.h"
-#include "Log.h"
 #include "Notifier.h"
 
 using namespace cs;
diff --git a/cscore/src/main/native/cpp/Frame.cpp b/cscore/src/main/native/cpp/Frame.cpp
index af108f46a72..759086f4e07 100644
--- a/cscore/src/main/native/cpp/Frame.cpp
+++ b/cscore/src/main/native/cpp/Frame.cpp
@@ -5,13 +5,13 @@
 #include "Frame.h"
 
 #include <cstdlib>
+#include <memory>
 
 #include <opencv2/core/core.hpp>
 #include <opencv2/highgui/highgui.hpp>
 #include <opencv2/imgproc/imgproc.hpp>
 
 #include "Instance.h"
-#include "Log.h"
 #include "SourceImpl.h"
 
 using namespace cs;
diff --git a/cscore/src/main/native/cpp/HttpCameraImpl.cpp b/cscore/src/main/native/cpp/HttpCameraImpl.cpp
index 05a5c90cafe..8c463d0408a 100644
--- a/cscore/src/main/native/cpp/HttpCameraImpl.cpp
+++ b/cscore/src/main/native/cpp/HttpCameraImpl.cpp
@@ -4,12 +4,16 @@
 
 #include "HttpCameraImpl.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <wpi/MemAlloc.h>
 #include <wpi/StringExtras.h>
 #include <wpi/timestamp.h>
 #include <wpinet/TCPConnector.h>
 
-#include "Handle.h"
 #include "Instance.h"
 #include "JpegUtil.h"
 #include "Log.h"
diff --git a/cscore/src/main/native/cpp/Instance.cpp b/cscore/src/main/native/cpp/Instance.cpp
index 979c80adcfb..33ee5968d92 100644
--- a/cscore/src/main/native/cpp/Instance.cpp
+++ b/cscore/src/main/native/cpp/Instance.cpp
@@ -4,7 +4,9 @@
 
 #include "Instance.h"
 
+#include <memory>
 #include <string_view>
+#include <utility>
 
 #include <fmt/format.h>
 #include <wpi/fs.h>
@@ -30,6 +32,7 @@ static void def_log_func(unsigned int level, const char* file,
     return;
   }
   wpi::print(stderr, "CS: {}: {} ({}:{})\n", levelmsg, msg,
+             // NOLINTNEXTLINE(build/include_what_you_use)
              fs::path{file}.filename().string(), line);
 }
 
diff --git a/cscore/src/main/native/cpp/JpegUtil.cpp b/cscore/src/main/native/cpp/JpegUtil.cpp
index 1abc01979c3..18bcf8c8faf 100644
--- a/cscore/src/main/native/cpp/JpegUtil.cpp
+++ b/cscore/src/main/native/cpp/JpegUtil.cpp
@@ -4,6 +4,8 @@
 
 #include "JpegUtil.h"
 
+#include <string>
+
 #include <wpi/StringExtras.h>
 #include <wpi/raw_istream.h>
 
diff --git a/cscore/src/main/native/cpp/MjpegServerImpl.cpp b/cscore/src/main/native/cpp/MjpegServerImpl.cpp
index f6f63d6673d..5ce5c39a528 100644
--- a/cscore/src/main/native/cpp/MjpegServerImpl.cpp
+++ b/cscore/src/main/native/cpp/MjpegServerImpl.cpp
@@ -5,6 +5,9 @@
 #include "MjpegServerImpl.h"
 
 #include <chrono>
+#include <memory>
+#include <string>
+#include <utility>
 
 #include <wpi/SmallString.h>
 #include <wpi/StringExtras.h>
@@ -15,7 +18,6 @@
 #include <wpinet/raw_socket_istream.h>
 #include <wpinet/raw_socket_ostream.h>
 
-#include "Handle.h"
 #include "Instance.h"
 #include "JpegUtil.h"
 #include "Log.h"
diff --git a/cscore/src/main/native/cpp/Notifier.cpp b/cscore/src/main/native/cpp/Notifier.cpp
index 371189634d3..f9127ed41ea 100644
--- a/cscore/src/main/native/cpp/Notifier.cpp
+++ b/cscore/src/main/native/cpp/Notifier.cpp
@@ -4,9 +4,7 @@
 
 #include "Notifier.h"
 
-#include <queue>
 #include <utility>
-#include <vector>
 
 #include "Handle.h"
 #include "Instance.h"
diff --git a/cscore/src/main/native/cpp/PropertyContainer.cpp b/cscore/src/main/native/cpp/PropertyContainer.cpp
index 0b8474f7241..5fdbd6899b9 100644
--- a/cscore/src/main/native/cpp/PropertyContainer.cpp
+++ b/cscore/src/main/native/cpp/PropertyContainer.cpp
@@ -4,6 +4,10 @@
 
 #include "PropertyContainer.h"
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include <wpi/Logger.h>
 #include <wpi/SmallString.h>
 #include <wpi/SmallVector.h>
diff --git a/cscore/src/main/native/cpp/RawSinkImpl.cpp b/cscore/src/main/native/cpp/RawSinkImpl.cpp
index bdbf2c1a9a6..3e38cb81c3b 100644
--- a/cscore/src/main/native/cpp/RawSinkImpl.cpp
+++ b/cscore/src/main/native/cpp/RawSinkImpl.cpp
@@ -4,8 +4,10 @@
 
 #include "RawSinkImpl.h"
 
+#include <algorithm>
+#include <memory>
+
 #include "Instance.h"
-#include "cscore.h"
 #include "cscore_raw.h"
 
 using namespace cs;
diff --git a/cscore/src/main/native/cpp/RawSourceImpl.cpp b/cscore/src/main/native/cpp/RawSourceImpl.cpp
index aad27b240ef..d06cecdb412 100644
--- a/cscore/src/main/native/cpp/RawSourceImpl.cpp
+++ b/cscore/src/main/native/cpp/RawSourceImpl.cpp
@@ -4,11 +4,11 @@
 
 #include "RawSourceImpl.h"
 
+#include <memory>
+
 #include <wpi/timestamp.h>
 
-#include "Handle.h"
 #include "Instance.h"
-#include "Log.h"
 #include "Notifier.h"
 #include "cscore_raw.h"
 
diff --git a/cscore/src/main/native/cpp/SinkImpl.cpp b/cscore/src/main/native/cpp/SinkImpl.cpp
index 0897bb8d6a5..32d86adf163 100644
--- a/cscore/src/main/native/cpp/SinkImpl.cpp
+++ b/cscore/src/main/native/cpp/SinkImpl.cpp
@@ -4,6 +4,8 @@
 
 #include "SinkImpl.h"
 
+#include <string>
+
 #include <wpi/SmallString.h>
 #include <wpi/json.h>
 
diff --git a/cscore/src/main/native/cpp/SourceImpl.cpp b/cscore/src/main/native/cpp/SourceImpl.cpp
index e30821064ae..6bdee5bab98 100644
--- a/cscore/src/main/native/cpp/SourceImpl.cpp
+++ b/cscore/src/main/native/cpp/SourceImpl.cpp
@@ -7,6 +7,9 @@
 #include <algorithm>
 #include <cstring>
 #include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <wpi/StringExtras.h>
 #include <wpi/json.h>
diff --git a/cscore/src/main/native/cpp/Telemetry.cpp b/cscore/src/main/native/cpp/Telemetry.cpp
index 751ef44cf5f..a3e8e5b7144 100644
--- a/cscore/src/main/native/cpp/Telemetry.cpp
+++ b/cscore/src/main/native/cpp/Telemetry.cpp
@@ -5,7 +5,7 @@
 #include "Telemetry.h"
 
 #include <chrono>
-#include <limits>
+#include <utility>
 
 #include <wpi/DenseMap.h>
 #include <wpi/timestamp.h>
@@ -14,7 +14,6 @@
 #include "Instance.h"
 #include "Notifier.h"
 #include "SourceImpl.h"
-#include "cscore_cpp.h"
 
 using namespace cs;
 
diff --git a/cscore/src/main/native/cpp/cscore_c.cpp b/cscore/src/main/native/cpp/cscore_c.cpp
index 521a1ffa501..b55d6979955 100644
--- a/cscore/src/main/native/cpp/cscore_c.cpp
+++ b/cscore/src/main/native/cpp/cscore_c.cpp
@@ -4,15 +4,17 @@
 
 #include "cscore_c.h"
 
+#include <algorithm>
 #include <cstddef>
 #include <cstdlib>
+#include <utility>
+#include <vector>
 
 #include <wpi/MemAlloc.h>
 #include <wpi/SmallString.h>
 
 #include "c_util.h"
 #include "cscore_cpp.h"
-#include "cscore_raw.h"
 
 static CS_Event ConvertToC(const cs::RawEvent& rawEvent) {
   CS_Event event;
diff --git a/cscore/src/main/native/cpp/cscore_cpp.cpp b/cscore/src/main/native/cpp/cscore_cpp.cpp
index a46b805c01f..f0414f40100 100644
--- a/cscore/src/main/native/cpp/cscore_cpp.cpp
+++ b/cscore/src/main/native/cpp/cscore_cpp.cpp
@@ -4,13 +4,16 @@
 
 #include "cscore_cpp.h"
 
+#include <memory>
+#include <string>
+#include <vector>
+
 #include <wpi/SmallString.h>
 #include <wpi/json.h>
 #include <wpinet/hostname.h>
 
 #include "Handle.h"
 #include "Instance.h"
-#include "Log.h"
 #include "NetworkListener.h"
 #include "Notifier.h"
 #include "PropertyContainer.h"
diff --git a/cscore/src/main/native/cpp/cscore_oo.cpp b/cscore/src/main/native/cpp/cscore_oo.cpp
index cca5ba73dde..457fb1870c3 100644
--- a/cscore/src/main/native/cpp/cscore_oo.cpp
+++ b/cscore/src/main/native/cpp/cscore_oo.cpp
@@ -4,6 +4,9 @@
 
 #include "cscore_oo.h"
 
+#include <string>
+#include <vector>
+
 #include <fmt/format.h>
 #include <wpi/json.h>
 
diff --git a/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp b/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp
index 6c133762122..b000894310b 100644
--- a/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp
+++ b/cscore/src/main/native/cpp/jni/CameraServerJNI.cpp
@@ -2,8 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <exception>
+#include <memory>
 #include <span>
+#include <string>
 
 #include <fmt/format.h>
 
diff --git a/cscore/src/main/native/linux/NetworkListener.cpp b/cscore/src/main/native/linux/NetworkListener.cpp
index 9771cfa20f8..e84ae8f4ac0 100644
--- a/cscore/src/main/native/linux/NetworkListener.cpp
+++ b/cscore/src/main/native/linux/NetworkListener.cpp
@@ -13,6 +13,7 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <algorithm>
 #include <cerrno>
 
 #include <wpi/SafeThread.h>
diff --git a/cscore/src/main/native/linux/NetworkUtil.cpp b/cscore/src/main/native/linux/NetworkUtil.cpp
index 43e0fa8cd1f..7a7b1ef2cec 100644
--- a/cscore/src/main/native/linux/NetworkUtil.cpp
+++ b/cscore/src/main/native/linux/NetworkUtil.cpp
@@ -9,6 +9,9 @@
 #include <sys/types.h>
 #include <unistd.h>
 
+#include <string>
+#include <vector>
+
 namespace cs {
 
 std::vector<std::string> GetNetworkInterfaces() {
diff --git a/cscore/src/main/native/linux/UsbCameraImpl.cpp b/cscore/src/main/native/linux/UsbCameraImpl.cpp
index eca6ab77975..e46bb1402ff 100644
--- a/cscore/src/main/native/linux/UsbCameraImpl.cpp
+++ b/cscore/src/main/native/linux/UsbCameraImpl.cpp
@@ -21,6 +21,9 @@
 
 #include <algorithm>
 #include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <fmt/format.h>
 #include <wpi/MemAlloc.h>
@@ -30,7 +33,6 @@
 #include <wpi/raw_ostream.h>
 #include <wpi/timestamp.h>
 
-#include "Handle.h"
 #include "Instance.h"
 #include "JpegUtil.h"
 #include "Log.h"
diff --git a/cscore/src/main/native/linux/UsbCameraListener.cpp b/cscore/src/main/native/linux/UsbCameraListener.cpp
index c5a993470c4..70aac34bb9e 100644
--- a/cscore/src/main/native/linux/UsbCameraListener.cpp
+++ b/cscore/src/main/native/linux/UsbCameraListener.cpp
@@ -4,6 +4,8 @@
 
 #include "UsbCameraListener.h"
 
+#include <memory>
+
 #include <wpi/StringExtras.h>
 #include <wpinet/EventLoopRunner.h>
 #include <wpinet/uv/FsEvent.h>
diff --git a/cscore/src/main/native/linux/UsbCameraProperty.cpp b/cscore/src/main/native/linux/UsbCameraProperty.cpp
index d6bb9804f6e..d8847d17657 100644
--- a/cscore/src/main/native/linux/UsbCameraProperty.cpp
+++ b/cscore/src/main/native/linux/UsbCameraProperty.cpp
@@ -4,6 +4,10 @@
 
 #include "UsbCameraProperty.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/SmallString.h>
 #include <wpi/StringExtras.h>
diff --git a/cscore/src/main/native/linux/UsbUtil.cpp b/cscore/src/main/native/linux/UsbUtil.cpp
index fc6cbd29712..620871db0bd 100644
--- a/cscore/src/main/native/linux/UsbUtil.cpp
+++ b/cscore/src/main/native/linux/UsbUtil.cpp
@@ -8,6 +8,8 @@
 #include <libgen.h>
 #include <sys/ioctl.h>
 
+#include <string>
+
 #include <fmt/format.h>
 #include <wpi/SmallString.h>
 #include <wpi/StringExtras.h>
@@ -16,7 +18,6 @@
 #include <wpi/raw_ostream.h>
 
 #include "Instance.h"
-#include "Log.h"
 
 namespace cs {
 
diff --git a/cscore/src/main/native/osx/NetworkUtil.cpp b/cscore/src/main/native/osx/NetworkUtil.cpp
index 0aaf53537fc..f45e0b5964d 100644
--- a/cscore/src/main/native/osx/NetworkUtil.cpp
+++ b/cscore/src/main/native/osx/NetworkUtil.cpp
@@ -2,6 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+#include <vector>
+
 #include "cscore_cpp.h"
 
 namespace cs {
diff --git a/cscore/src/main/native/windows/COMCreators.cpp b/cscore/src/main/native/windows/COMCreators.cpp
index 5ccddff2671..f3a1e56e5ca 100644
--- a/cscore/src/main/native/windows/COMCreators.cpp
+++ b/cscore/src/main/native/windows/COMCreators.cpp
@@ -13,13 +13,13 @@
 
 // https://github.com/opencv/opencv/blob/master/modules/videoio/src/cap_msmf.cpp
 
-#include <mfidl.h>
-#include <mfapi.h>
 #include <Dbt.h>
 #include <ks.h>
 #include <ksmedia.h>
 #include <mfreadwrite.h>
 
+#include <memory>
+
 #include "COMCreators.h"
 #include "ComPtr.h"
 
diff --git a/cscore/src/main/native/windows/NetworkUtil.cpp b/cscore/src/main/native/windows/NetworkUtil.cpp
index 86b99bc2493..f3ab681470c 100644
--- a/cscore/src/main/native/windows/NetworkUtil.cpp
+++ b/cscore/src/main/native/windows/NetworkUtil.cpp
@@ -5,6 +5,9 @@
 #include <uv.h>
 #include <ws2tcpip.h>
 
+#include <string>
+#include <vector>
+
 #include "cscore_cpp.h"
 
 #pragma comment(lib, "Ws2_32.lib")
diff --git a/cscore/src/main/native/windows/UsbCameraImpl.cpp b/cscore/src/main/native/windows/UsbCameraImpl.cpp
index 606ceb2145d..1f180a142ca 100644
--- a/cscore/src/main/native/windows/UsbCameraImpl.cpp
+++ b/cscore/src/main/native/windows/UsbCameraImpl.cpp
@@ -16,6 +16,7 @@
 #include <cmath>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <Dbt.h>
diff --git a/cscore/src/main/native/windows/UsbCameraListener.cpp b/cscore/src/main/native/windows/UsbCameraListener.cpp
index be33771ab82..ec2d07617ad 100644
--- a/cscore/src/main/native/windows/UsbCameraListener.cpp
+++ b/cscore/src/main/native/windows/UsbCameraListener.cpp
@@ -9,6 +9,8 @@
 
 #include <dbt.h>  // NOLINT(build/include_order)
 
+#include <memory>
+
 #define IDT_TIMER1 1001
 
 using namespace cs;
diff --git a/datalogtool/src/main/native/cpp/Downloader.cpp b/datalogtool/src/main/native/cpp/Downloader.cpp
index 0a8b90dceeb..84b186db2bf 100644
--- a/datalogtool/src/main/native/cpp/Downloader.cpp
+++ b/datalogtool/src/main/native/cpp/Downloader.cpp
@@ -13,6 +13,9 @@
 
 #include <algorithm>
 #include <filesystem>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include <fmt/format.h>
 #include <glass/Storage.h>
diff --git a/datalogtool/src/main/native/cpp/Exporter.cpp b/datalogtool/src/main/native/cpp/Exporter.cpp
index 188473d4e22..a1213f40b62 100644
--- a/datalogtool/src/main/native/cpp/Exporter.cpp
+++ b/datalogtool/src/main/native/cpp/Exporter.cpp
@@ -6,12 +6,14 @@
 
 #include <atomic>
 #include <ctime>
+#include <functional>
 #include <future>
 #include <map>
 #include <memory>
 #include <set>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include <fmt/chrono.h>
diff --git a/datalogtool/src/main/native/cpp/Sftp.cpp b/datalogtool/src/main/native/cpp/Sftp.cpp
index 3a33d13afe3..42f2d039ac5 100644
--- a/datalogtool/src/main/native/cpp/Sftp.cpp
+++ b/datalogtool/src/main/native/cpp/Sftp.cpp
@@ -4,6 +4,10 @@
 
 #include "Sftp.h"
 
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <fmt/format.h>
 
 using namespace sftp;
diff --git a/glass/src/app/native/cpp/main.cpp b/glass/src/app/native/cpp/main.cpp
index ec0c2c0ddd6..63715b25780 100644
--- a/glass/src/app/native/cpp/main.cpp
+++ b/glass/src/app/native/cpp/main.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <memory>
+#include <string>
 
 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
@@ -14,7 +15,6 @@
 
 #include "glass/Context.h"
 #include "glass/MainMenuBar.h"
-#include "glass/Model.h"
 #include "glass/Storage.h"
 #include "glass/View.h"
 #include "glass/networktables/NetworkTables.h"
diff --git a/glass/src/lib/native/cpp/Context.cpp b/glass/src/lib/native/cpp/Context.cpp
index 1e4f2aa551a..be837e64b55 100644
--- a/glass/src/lib/native/cpp/Context.cpp
+++ b/glass/src/lib/native/cpp/Context.cpp
@@ -4,9 +4,10 @@
 
 #include "glass/Context.h"
 
-#include <algorithm>
-#include <cinttypes>
 #include <filesystem>
+#include <memory>
+#include <string>
+#include <utility>
 
 #include <fmt/format.h>
 #include <imgui.h>
diff --git a/glass/src/lib/native/cpp/MainMenuBar.cpp b/glass/src/lib/native/cpp/MainMenuBar.cpp
index b426df40fcb..97da26a9afd 100644
--- a/glass/src/lib/native/cpp/MainMenuBar.cpp
+++ b/glass/src/lib/native/cpp/MainMenuBar.cpp
@@ -4,6 +4,9 @@
 
 #include "glass/MainMenuBar.h"
 
+#include <memory>
+#include <utility>
+
 #include <imgui.h>
 #include <wpi/StringExtras.h>
 #include <wpigui.h>
diff --git a/glass/src/lib/native/cpp/Storage.cpp b/glass/src/lib/native/cpp/Storage.cpp
index 6cab4430b7a..f455212f61b 100644
--- a/glass/src/lib/native/cpp/Storage.cpp
+++ b/glass/src/lib/native/cpp/Storage.cpp
@@ -5,6 +5,10 @@
 #include "glass/Storage.h"
 
 #include <concepts>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <imgui.h>
 #include <wpi/StringExtras.h>
diff --git a/glass/src/lib/native/cpp/View.cpp b/glass/src/lib/native/cpp/View.cpp
index 3f28200d7d7..1007603a5c3 100644
--- a/glass/src/lib/native/cpp/View.cpp
+++ b/glass/src/lib/native/cpp/View.cpp
@@ -4,6 +4,9 @@
 
 #include "glass/View.h"
 
+#include <memory>
+#include <utility>
+
 using namespace glass;
 
 namespace {
diff --git a/glass/src/lib/native/cpp/WindowManager.cpp b/glass/src/lib/native/cpp/WindowManager.cpp
index 8e76b5f87a4..3d90be5624b 100644
--- a/glass/src/lib/native/cpp/WindowManager.cpp
+++ b/glass/src/lib/native/cpp/WindowManager.cpp
@@ -6,6 +6,8 @@
 
 #include <algorithm>
 #include <cstdio>
+#include <memory>
+#include <utility>
 
 #include <fmt/format.h>
 #include <wpi/print.h>
diff --git a/glass/src/lib/native/cpp/hardware/AnalogInput.cpp b/glass/src/lib/native/cpp/hardware/AnalogInput.cpp
index a2051cf6b49..8c45f011386 100644
--- a/glass/src/lib/native/cpp/hardware/AnalogInput.cpp
+++ b/glass/src/lib/native/cpp/hardware/AnalogInput.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/hardware/AnalogInput.h"
 
+#include <string>
+
 #include <imgui.h>
 #include <wpi/StringExtras.h>
 
diff --git a/glass/src/lib/native/cpp/hardware/AnalogOutput.cpp b/glass/src/lib/native/cpp/hardware/AnalogOutput.cpp
index 2436dd28f41..11790f8ca8d 100644
--- a/glass/src/lib/native/cpp/hardware/AnalogOutput.cpp
+++ b/glass/src/lib/native/cpp/hardware/AnalogOutput.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/hardware/AnalogOutput.h"
 
+#include <string>
+
 #include <wpi/StringExtras.h>
 
 #include "glass/Context.h"
diff --git a/glass/src/lib/native/cpp/hardware/Encoder.cpp b/glass/src/lib/native/cpp/hardware/Encoder.cpp
index b359274e5a4..b74547c735a 100644
--- a/glass/src/lib/native/cpp/hardware/Encoder.cpp
+++ b/glass/src/lib/native/cpp/hardware/Encoder.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/hardware/Encoder.h"
 
+#include <string>
+
 #include <fmt/format.h>
 #include <imgui.h>
 #include <wpi/StringExtras.h>
diff --git a/glass/src/lib/native/cpp/hardware/LEDDisplay.cpp b/glass/src/lib/native/cpp/hardware/LEDDisplay.cpp
index c3c2406dbcb..6ad7fc54a74 100644
--- a/glass/src/lib/native/cpp/hardware/LEDDisplay.cpp
+++ b/glass/src/lib/native/cpp/hardware/LEDDisplay.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/hardware/LEDDisplay.h"
 
+#include <vector>
+
 #include <wpi/SmallVector.h>
 
 #include "glass/Context.h"
diff --git a/glass/src/lib/native/cpp/hardware/PWM.cpp b/glass/src/lib/native/cpp/hardware/PWM.cpp
index f719a2b15aa..6f58fbaff02 100644
--- a/glass/src/lib/native/cpp/hardware/PWM.cpp
+++ b/glass/src/lib/native/cpp/hardware/PWM.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/hardware/PWM.h"
 
+#include <string>
+
 #include <imgui.h>
 #include <wpi/StringExtras.h>
 
diff --git a/glass/src/lib/native/cpp/hardware/Pneumatic.cpp b/glass/src/lib/native/cpp/hardware/Pneumatic.cpp
index 10ec61e142b..bc39860dbb4 100644
--- a/glass/src/lib/native/cpp/hardware/Pneumatic.cpp
+++ b/glass/src/lib/native/cpp/hardware/Pneumatic.cpp
@@ -6,6 +6,7 @@
 
 #include <cstdio>
 #include <cstring>
+#include <string>
 
 #include <imgui.h>
 #include <wpi/SmallVector.h>
diff --git a/glass/src/lib/native/cpp/hardware/Relay.cpp b/glass/src/lib/native/cpp/hardware/Relay.cpp
index e071de7d3ca..ff383d0fa5f 100644
--- a/glass/src/lib/native/cpp/hardware/Relay.cpp
+++ b/glass/src/lib/native/cpp/hardware/Relay.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/hardware/Relay.h"
 
+#include <string>
+
 #include <imgui.h>
 
 #include "glass/Context.h"
diff --git a/glass/src/lib/native/cpp/other/DeviceTree.cpp b/glass/src/lib/native/cpp/other/DeviceTree.cpp
index b242c07b46c..2360d83386a 100644
--- a/glass/src/lib/native/cpp/other/DeviceTree.cpp
+++ b/glass/src/lib/native/cpp/other/DeviceTree.cpp
@@ -5,6 +5,7 @@
 #include "glass/other/DeviceTree.h"
 
 #include <cinttypes>
+#include <string>
 
 #include <imgui.h>
 #include <wpi/StringExtras.h>
diff --git a/glass/src/lib/native/cpp/other/FMS.cpp b/glass/src/lib/native/cpp/other/FMS.cpp
index 4e702e5b481..86ed0205a7a 100644
--- a/glass/src/lib/native/cpp/other/FMS.cpp
+++ b/glass/src/lib/native/cpp/other/FMS.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/other/FMS.h"
 
+#include <string>
+
 #include <imgui.h>
 #include <imgui_stdlib.h>
 #include <wpi/SmallString.h>
diff --git a/glass/src/lib/native/cpp/other/Field2D.cpp b/glass/src/lib/native/cpp/other/Field2D.cpp
index efa80eab616..505a9d60550 100644
--- a/glass/src/lib/native/cpp/other/Field2D.cpp
+++ b/glass/src/lib/native/cpp/other/Field2D.cpp
@@ -8,8 +8,10 @@
 #include <cmath>
 #include <cstdio>
 #include <memory>
+#include <string>
 #include <string_view>
 #include <utility>
+#include <vector>
 
 #include <fields/fields.h>
 #include <frc/geometry/Pose2d.h>
diff --git a/glass/src/lib/native/cpp/other/Log.cpp b/glass/src/lib/native/cpp/other/Log.cpp
index accf024063e..4209338526f 100644
--- a/glass/src/lib/native/cpp/other/Log.cpp
+++ b/glass/src/lib/native/cpp/other/Log.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/other/Log.h"
 
+#include <string>
+
 #include <imgui.h>
 
 using namespace glass;
diff --git a/glass/src/lib/native/cpp/other/Mechanism2D.cpp b/glass/src/lib/native/cpp/other/Mechanism2D.cpp
index 0592910d049..b09acf81d30 100644
--- a/glass/src/lib/native/cpp/other/Mechanism2D.cpp
+++ b/glass/src/lib/native/cpp/other/Mechanism2D.cpp
@@ -8,8 +8,10 @@
 #include <cmath>
 #include <cstdio>
 #include <memory>
+#include <string>
 #include <string_view>
 #include <utility>
+#include <vector>
 
 #include <frc/geometry/Pose2d.h>
 #include <frc/geometry/Rotation2d.h>
diff --git a/glass/src/lib/native/cpp/other/Plot.cpp b/glass/src/lib/native/cpp/other/Plot.cpp
index 0b617098541..56fc04d099d 100644
--- a/glass/src/lib/native/cpp/other/Plot.cpp
+++ b/glass/src/lib/native/cpp/other/Plot.cpp
@@ -12,6 +12,7 @@
 #include <memory>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include <fmt/format.h>
@@ -29,7 +30,6 @@
 #include <wpi/Signal.h>
 #include <wpi/SmallString.h>
 #include <wpi/SmallVector.h>
-#include <wpi/StringExtras.h>
 #include <wpi/timestamp.h>
 
 #include "glass/Context.h"
diff --git a/glass/src/lib/native/cpp/other/Subsystem.cpp b/glass/src/lib/native/cpp/other/Subsystem.cpp
index c4ed4746deb..b8bbb5b06d0 100644
--- a/glass/src/lib/native/cpp/other/Subsystem.cpp
+++ b/glass/src/lib/native/cpp/other/Subsystem.cpp
@@ -4,10 +4,9 @@
 
 #include "glass/other/Subsystem.h"
 
-#include <imgui.h>
+#include <string>
 
-#include "glass/Context.h"
-#include "glass/DataSource.h"
+#include <imgui.h>
 
 using namespace glass;
 
diff --git a/glass/src/lib/native/cpp/support/DataLogReaderThread.cpp b/glass/src/lib/native/cpp/support/DataLogReaderThread.cpp
index bdbfec77abf..c4336f65567 100644
--- a/glass/src/lib/native/cpp/support/DataLogReaderThread.cpp
+++ b/glass/src/lib/native/cpp/support/DataLogReaderThread.cpp
@@ -4,6 +4,7 @@
 
 #include "glass/support/DataLogReaderThread.h"
 
+#include <string>
 #include <utility>
 
 #include <wpi/StringExtras.h>
diff --git a/glass/src/lib/native/cpp/support/EnumSetting.cpp b/glass/src/lib/native/cpp/support/EnumSetting.cpp
index b863b70ab89..167cf1b7d25 100644
--- a/glass/src/lib/native/cpp/support/EnumSetting.cpp
+++ b/glass/src/lib/native/cpp/support/EnumSetting.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/support/EnumSetting.h"
 
+#include <string>
+
 #include <imgui.h>
 
 using namespace glass;
diff --git a/glass/src/lib/native/cpp/support/ExpressionParser.cpp b/glass/src/lib/native/cpp/support/ExpressionParser.cpp
index 6522b3cf8be..c7bb1a72eb2 100644
--- a/glass/src/lib/native/cpp/support/ExpressionParser.cpp
+++ b/glass/src/lib/native/cpp/support/ExpressionParser.cpp
@@ -6,6 +6,7 @@
 
 #include <cmath>
 #include <stack>
+#include <string>
 #include <type_traits>
 
 #include <wpi/StringExtras.h>
diff --git a/glass/src/libnt/native/cpp/NTCommandScheduler.cpp b/glass/src/libnt/native/cpp/NTCommandScheduler.cpp
index 26a5740c78a..eef0c1a40cf 100644
--- a/glass/src/libnt/native/cpp/NTCommandScheduler.cpp
+++ b/glass/src/libnt/native/cpp/NTCommandScheduler.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTCommandScheduler.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/StringExtras.h>
 
diff --git a/glass/src/libnt/native/cpp/NTCommandSelector.cpp b/glass/src/libnt/native/cpp/NTCommandSelector.cpp
index 64c616e4b18..ce8f8a2e48f 100644
--- a/glass/src/libnt/native/cpp/NTCommandSelector.cpp
+++ b/glass/src/libnt/native/cpp/NTCommandSelector.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTCommandSelector.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/StringExtras.h>
 
diff --git a/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp b/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp
index 57d1fa837c1..58de26f392c 100644
--- a/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp
+++ b/glass/src/libnt/native/cpp/NTDifferentialDrive.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTDifferentialDrive.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <imgui.h>
 #include <wpi/MathExtras.h>
diff --git a/glass/src/libnt/native/cpp/NTDigitalInput.cpp b/glass/src/libnt/native/cpp/NTDigitalInput.cpp
index 28b916cfbba..e96a041e5fa 100644
--- a/glass/src/libnt/native/cpp/NTDigitalInput.cpp
+++ b/glass/src/libnt/native/cpp/NTDigitalInput.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTDigitalInput.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/StringExtras.h>
 
diff --git a/glass/src/libnt/native/cpp/NTDigitalOutput.cpp b/glass/src/libnt/native/cpp/NTDigitalOutput.cpp
index aa9200dc705..fe9021f97ef 100644
--- a/glass/src/libnt/native/cpp/NTDigitalOutput.cpp
+++ b/glass/src/libnt/native/cpp/NTDigitalOutput.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTDigitalOutput.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 
 using namespace glass;
diff --git a/glass/src/libnt/native/cpp/NTField2D.cpp b/glass/src/libnt/native/cpp/NTField2D.cpp
index 1fd87377570..a9ed6f650e1 100644
--- a/glass/src/libnt/native/cpp/NTField2D.cpp
+++ b/glass/src/libnt/native/cpp/NTField2D.cpp
@@ -5,6 +5,9 @@
 #include "glass/networktables/NTField2D.h"
 
 #include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include <fmt/format.h>
diff --git a/glass/src/libnt/native/cpp/NTGyro.cpp b/glass/src/libnt/native/cpp/NTGyro.cpp
index a036b39c53d..1a078f57a25 100644
--- a/glass/src/libnt/native/cpp/NTGyro.cpp
+++ b/glass/src/libnt/native/cpp/NTGyro.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTGyro.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/StringExtras.h>
 
diff --git a/glass/src/libnt/native/cpp/NTMecanumDrive.cpp b/glass/src/libnt/native/cpp/NTMecanumDrive.cpp
index cb564e81689..f090cfcf6f4 100644
--- a/glass/src/libnt/native/cpp/NTMecanumDrive.cpp
+++ b/glass/src/libnt/native/cpp/NTMecanumDrive.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTMecanumDrive.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <imgui.h>
 #include <wpi/MathExtras.h>
diff --git a/glass/src/libnt/native/cpp/NTMechanism2D.cpp b/glass/src/libnt/native/cpp/NTMechanism2D.cpp
index 3954936d2ca..d98da48d47a 100644
--- a/glass/src/libnt/native/cpp/NTMechanism2D.cpp
+++ b/glass/src/libnt/native/cpp/NTMechanism2D.cpp
@@ -5,6 +5,8 @@
 #include "glass/networktables/NTMechanism2D.h"
 
 #include <algorithm>
+#include <memory>
+#include <string>
 #include <string_view>
 #include <vector>
 
diff --git a/glass/src/libnt/native/cpp/NTMotorController.cpp b/glass/src/libnt/native/cpp/NTMotorController.cpp
index 1de6714fbf2..d28b8dd983b 100644
--- a/glass/src/libnt/native/cpp/NTMotorController.cpp
+++ b/glass/src/libnt/native/cpp/NTMotorController.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTMotorController.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/StringExtras.h>
 
diff --git a/glass/src/libnt/native/cpp/NTPIDController.cpp b/glass/src/libnt/native/cpp/NTPIDController.cpp
index 9796f6d4471..49037abab4a 100644
--- a/glass/src/libnt/native/cpp/NTPIDController.cpp
+++ b/glass/src/libnt/native/cpp/NTPIDController.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTPIDController.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/StringExtras.h>
 
diff --git a/glass/src/libnt/native/cpp/NTProfiledPIDController.cpp b/glass/src/libnt/native/cpp/NTProfiledPIDController.cpp
index 798864c313c..2beb829a4f7 100644
--- a/glass/src/libnt/native/cpp/NTProfiledPIDController.cpp
+++ b/glass/src/libnt/native/cpp/NTProfiledPIDController.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTProfiledPIDController.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/StringExtras.h>
 
diff --git a/glass/src/libnt/native/cpp/NTStringChooser.cpp b/glass/src/libnt/native/cpp/NTStringChooser.cpp
index f0fad43843a..92c2a4bd035 100644
--- a/glass/src/libnt/native/cpp/NTStringChooser.cpp
+++ b/glass/src/libnt/native/cpp/NTStringChooser.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTStringChooser.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/json.h>
 
diff --git a/glass/src/libnt/native/cpp/NTSubsystem.cpp b/glass/src/libnt/native/cpp/NTSubsystem.cpp
index 3078f87fc40..28a8e7bf482 100644
--- a/glass/src/libnt/native/cpp/NTSubsystem.cpp
+++ b/glass/src/libnt/native/cpp/NTSubsystem.cpp
@@ -4,6 +4,8 @@
 
 #include "glass/networktables/NTSubsystem.h"
 
+#include <utility>
+
 #include <fmt/format.h>
 
 using namespace glass;
diff --git a/glass/src/libnt/native/cpp/NetworkTables.cpp b/glass/src/libnt/native/cpp/NetworkTables.cpp
index 5430a50d583..179de1fad21 100644
--- a/glass/src/libnt/native/cpp/NetworkTables.cpp
+++ b/glass/src/libnt/native/cpp/NetworkTables.cpp
@@ -4,13 +4,18 @@
 
 #include "glass/networktables/NetworkTables.h"
 
+#include <algorithm>
 #include <cinttypes>
 #include <concepts>
 #include <cstring>
+#include <functional>
 #include <initializer_list>
+#include <map>
 #include <memory>
 #include <span>
+#include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include <fmt/format.h>
diff --git a/glass/src/libnt/native/cpp/NetworkTablesProvider.cpp b/glass/src/libnt/native/cpp/NetworkTablesProvider.cpp
index 414c2a331d4..36e892ecaa0 100644
--- a/glass/src/libnt/native/cpp/NetworkTablesProvider.cpp
+++ b/glass/src/libnt/native/cpp/NetworkTablesProvider.cpp
@@ -5,6 +5,8 @@
 #include "glass/networktables/NetworkTablesProvider.h"
 
 #include <algorithm>
+#include <memory>
+#include <utility>
 
 #include <fmt/format.h>
 #include <ntcore_cpp.h>
diff --git a/glass/src/libnt/native/cpp/NetworkTablesSettings.cpp b/glass/src/libnt/native/cpp/NetworkTablesSettings.cpp
index 33c4f02e4c5..bca067f779d 100644
--- a/glass/src/libnt/native/cpp/NetworkTablesSettings.cpp
+++ b/glass/src/libnt/native/cpp/NetworkTablesSettings.cpp
@@ -7,6 +7,7 @@
 #include <optional>
 #include <string_view>
 #include <utility>
+#include <vector>
 
 #include <imgui.h>
 #include <imgui_stdlib.h>
diff --git a/glass/src/libnt/native/cpp/StandardNetworkTables.cpp b/glass/src/libnt/native/cpp/StandardNetworkTables.cpp
index 4cc21212690..05796c39a76 100644
--- a/glass/src/libnt/native/cpp/StandardNetworkTables.cpp
+++ b/glass/src/libnt/native/cpp/StandardNetworkTables.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <memory>
+
 #include "glass/networktables/NTCommandScheduler.h"
 #include "glass/networktables/NTCommandSelector.h"
 #include "glass/networktables/NTDifferentialDrive.h"
diff --git a/hal/src/main/native/athena/AddressableLED.cpp b/hal/src/main/native/athena/AddressableLED.cpp
index 05fe5def2b4..8aaa2f33b78 100644
--- a/hal/src/main/native/athena/AddressableLED.cpp
+++ b/hal/src/main/native/athena/AddressableLED.cpp
@@ -5,6 +5,7 @@
 #include "hal/AddressableLED.h"
 
 #include <cstring>
+#include <memory>
 
 #include <fmt/format.h>
 
diff --git a/hal/src/main/native/athena/AnalogInternal.cpp b/hal/src/main/native/athena/AnalogInternal.cpp
index 7ae6adc2b50..47dd1bdbb58 100644
--- a/hal/src/main/native/athena/AnalogInternal.cpp
+++ b/hal/src/main/native/athena/AnalogInternal.cpp
@@ -5,6 +5,7 @@
 #include "AnalogInternal.h"
 
 #include <atomic>
+#include <memory>
 
 #include <wpi/mutex.h>
 
diff --git a/hal/src/main/native/athena/AnalogTrigger.cpp b/hal/src/main/native/athena/AnalogTrigger.cpp
index 2e72a43a395..e90b55e3f5f 100644
--- a/hal/src/main/native/athena/AnalogTrigger.cpp
+++ b/hal/src/main/native/athena/AnalogTrigger.cpp
@@ -4,6 +4,8 @@
 
 #include "hal/AnalogTrigger.h"
 
+#include <memory>
+
 #include "AnalogInternal.h"
 #include "ConstantsInternal.h"
 #include "DutyCycleInternal.h"
diff --git a/hal/src/main/native/athena/CANAPI.cpp b/hal/src/main/native/athena/CANAPI.cpp
index c69bc748269..751b0253f55 100644
--- a/hal/src/main/native/athena/CANAPI.cpp
+++ b/hal/src/main/native/athena/CANAPI.cpp
@@ -5,6 +5,7 @@
 #include "hal/CANAPI.h"
 
 #include <ctime>
+#include <memory>
 
 #include <wpi/DenseMap.h>
 #include <wpi/mutex.h>
diff --git a/hal/src/main/native/athena/CTREPCM.cpp b/hal/src/main/native/athena/CTREPCM.cpp
index 79c1ae39833..ba3da88bbfb 100644
--- a/hal/src/main/native/athena/CTREPCM.cpp
+++ b/hal/src/main/native/athena/CTREPCM.cpp
@@ -4,6 +4,8 @@
 
 #include "hal/CTREPCM.h"
 
+#include <string>
+
 #include <fmt/format.h>
 
 #include "HALInitializer.h"
diff --git a/hal/src/main/native/athena/CTREPDP.cpp b/hal/src/main/native/athena/CTREPDP.cpp
index 21896ec7785..571240d62e5 100644
--- a/hal/src/main/native/athena/CTREPDP.cpp
+++ b/hal/src/main/native/athena/CTREPDP.cpp
@@ -4,6 +4,8 @@
 
 #include "CTREPDP.h"
 
+#include <string>
+
 #include <fmt/format.h>
 #include <wpi/mutex.h>
 
diff --git a/hal/src/main/native/athena/Counter.cpp b/hal/src/main/native/athena/Counter.cpp
index bb8da37098e..5259cbff99b 100644
--- a/hal/src/main/native/athena/Counter.cpp
+++ b/hal/src/main/native/athena/Counter.cpp
@@ -5,6 +5,7 @@
 #include "hal/Counter.h"
 
 #include <limits>
+#include <memory>
 
 #include <fmt/format.h>
 
diff --git a/hal/src/main/native/athena/DigitalInternal.cpp b/hal/src/main/native/athena/DigitalInternal.cpp
index 13fa560d197..dc41fc81814 100644
--- a/hal/src/main/native/athena/DigitalInternal.cpp
+++ b/hal/src/main/native/athena/DigitalInternal.cpp
@@ -6,6 +6,7 @@
 
 #include <atomic>
 #include <cmath>
+#include <memory>
 #include <thread>
 
 #include <FRC_NetworkCommunication/LoadOut.h>
diff --git a/hal/src/main/native/athena/Encoder.cpp b/hal/src/main/native/athena/Encoder.cpp
index 1f50eb8b244..055ad163fa6 100644
--- a/hal/src/main/native/athena/Encoder.cpp
+++ b/hal/src/main/native/athena/Encoder.cpp
@@ -4,6 +4,8 @@
 
 #include "hal/Encoder.h"
 
+#include <memory>
+
 #include <fmt/format.h>
 
 #include "EncoderInternal.h"
diff --git a/hal/src/main/native/athena/FRCDriverStation.cpp b/hal/src/main/native/athena/FRCDriverStation.cpp
index e3080782b55..9891033039a 100644
--- a/hal/src/main/native/athena/FRCDriverStation.cpp
+++ b/hal/src/main/native/athena/FRCDriverStation.cpp
@@ -4,6 +4,7 @@
 
 #include <atomic>
 #include <chrono>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <limits>
diff --git a/hal/src/main/native/athena/HAL.cpp b/hal/src/main/native/athena/HAL.cpp
index 7d04027133b..d91d976fd53 100644
--- a/hal/src/main/native/athena/HAL.cpp
+++ b/hal/src/main/native/athena/HAL.cpp
@@ -13,7 +13,9 @@
 #include <cstdio>
 #include <cstdlib>
 #include <fstream>
+#include <memory>
 #include <thread>
+#include <utility>
 
 #include <FRC_NetworkCommunication/FRCComm.h>
 #include <FRC_NetworkCommunication/LoadOut.h>
diff --git a/hal/src/main/native/athena/REVPDH.cpp b/hal/src/main/native/athena/REVPDH.cpp
index 053f6d06db9..86f2e34dc68 100644
--- a/hal/src/main/native/athena/REVPDH.cpp
+++ b/hal/src/main/native/athena/REVPDH.cpp
@@ -12,6 +12,7 @@
 #include <hal/handles/IndexedHandleResource.h>
 
 #include <cstring>
+#include <string>
 #include <thread>
 
 #include <fmt/format.h>
diff --git a/hal/src/main/native/athena/REVPH.cpp b/hal/src/main/native/athena/REVPH.cpp
index a7a6bb87bd9..bb3784c5c30 100644
--- a/hal/src/main/native/athena/REVPH.cpp
+++ b/hal/src/main/native/athena/REVPH.cpp
@@ -4,6 +4,7 @@
 
 #include "hal/REVPH.h"
 
+#include <string>
 #include <thread>
 
 #include <fmt/format.h>
diff --git a/hal/src/main/native/athena/SPI.cpp b/hal/src/main/native/athena/SPI.cpp
index 6c277a93ea3..8654af947d4 100644
--- a/hal/src/main/native/athena/SPI.cpp
+++ b/hal/src/main/native/athena/SPI.cpp
@@ -13,6 +13,7 @@
 #include <atomic>
 #include <cstdio>
 #include <cstring>
+#include <memory>
 
 #include <fmt/format.h>
 #include <wpi/mutex.h>
diff --git a/hal/src/main/native/athena/cpp/SerialHelper.cpp b/hal/src/main/native/athena/cpp/SerialHelper.cpp
index 71e747c070c..11d61872c74 100644
--- a/hal/src/main/native/athena/cpp/SerialHelper.cpp
+++ b/hal/src/main/native/athena/cpp/SerialHelper.cpp
@@ -7,7 +7,9 @@
 #include <algorithm>
 #include <cstdio>
 #include <cstring>
+#include <string>
 #include <string_view>
+#include <vector>
 
 #include <wpi/StringExtras.h>
 #include <wpi/fs.h>
diff --git a/hal/src/main/native/cpp/jni/CANJNI.cpp b/hal/src/main/native/cpp/jni/CANJNI.cpp
index 40838d3892c..40f77ddd5cc 100644
--- a/hal/src/main/native/cpp/jni/CANJNI.cpp
+++ b/hal/src/main/native/cpp/jni/CANJNI.cpp
@@ -176,7 +176,6 @@ Java_edu_wpi_first_hal_can_CANJNI_readCANStreamSession
       // OOM, just return
       elem = JLocal<jobject>{env, CreateCANStreamMessage(env)};
       if (elem) {
-        std::printf("Allocated and set object\n");
         env->SetObjectArrayElement(messages, i, elem);
       } else {
         return 0;
diff --git a/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp b/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp
index d489bdd36e3..c001c2c5a1f 100644
--- a/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp
+++ b/hal/src/main/native/cpp/jni/SimDeviceJNI.cpp
@@ -4,6 +4,9 @@
 
 #include <jni.h>
 
+#include <string>
+#include <vector>
+
 #include <wpi/jni_util.h>
 
 #include "HALUtil.h"
diff --git a/hal/src/main/native/cpp/jni/simulation/AddressableLEDDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/AddressableLEDDataJNI.cpp
index 38d9ce7ca42..00335b67be0 100644
--- a/hal/src/main/native/cpp/jni/simulation/AddressableLEDDataJNI.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/AddressableLEDDataJNI.cpp
@@ -4,6 +4,8 @@
 
 #include <jni.h>
 
+#include <memory>
+
 #include "CallbackStore.h"
 #include "ConstBufferCallbackStore.h"
 #include "edu_wpi_first_hal_simulation_AddressableLEDDataJNI.h"
diff --git a/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp b/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp
index f83ab625887..54fb3ecaba1 100644
--- a/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/BufferCallbackStore.cpp
@@ -7,14 +7,13 @@
 #include <jni.h>
 
 #include <cstdio>
+#include <memory>
 
 #include <wpi/jni_util.h>
 
 #include "SimulatorJNI.h"
 #include "hal/Types.h"
-#include "hal/Value.h"
 #include "hal/handles/UnlimitedHandleResource.h"
-#include "hal/simulation/NotifyListener.h"
 
 using namespace hal;
 using namespace hal::sim;
diff --git a/hal/src/main/native/cpp/jni/simulation/CallbackStore.cpp b/hal/src/main/native/cpp/jni/simulation/CallbackStore.cpp
index f57dfb35418..f36478aaf2c 100644
--- a/hal/src/main/native/cpp/jni/simulation/CallbackStore.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/CallbackStore.cpp
@@ -7,6 +7,7 @@
 #include <jni.h>
 
 #include <cstdio>
+#include <memory>
 
 #include <wpi/jni_util.h>
 
@@ -14,7 +15,6 @@
 #include "hal/Types.h"
 #include "hal/Value.h"
 #include "hal/handles/UnlimitedHandleResource.h"
-#include "hal/simulation/NotifyListener.h"
 
 using namespace hal;
 using namespace hal::sim;
diff --git a/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp b/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp
index af57803ebd4..e8c8b3161d2 100644
--- a/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/ConstBufferCallbackStore.cpp
@@ -7,14 +7,13 @@
 #include <jni.h>
 
 #include <cstdio>
+#include <memory>
 
 #include <wpi/jni_util.h>
 
 #include "SimulatorJNI.h"
 #include "hal/Types.h"
-#include "hal/Value.h"
 #include "hal/handles/UnlimitedHandleResource.h"
-#include "hal/simulation/NotifyListener.h"
 
 using namespace hal;
 using namespace hal::sim;
diff --git a/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp b/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp
index 98dab720b10..3d9e2cb1468 100644
--- a/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/SimDeviceDataJNI.cpp
@@ -7,13 +7,15 @@
 #include <jni.h>
 
 #include <cstdio>
+#include <memory>
+#include <string>
 #include <utility>
+#include <vector>
 
 #include <wpi/jni_util.h>
 
 #include "SimulatorJNI.h"
 #include "edu_wpi_first_hal_simulation_SimDeviceDataJNI.h"
-#include "hal/SimDevice.h"
 #include "hal/handles/UnlimitedHandleResource.h"
 #include "hal/simulation/SimDeviceData.h"
 
diff --git a/hal/src/main/native/cpp/jni/simulation/SpiReadAutoReceiveBufferCallbackStore.cpp b/hal/src/main/native/cpp/jni/simulation/SpiReadAutoReceiveBufferCallbackStore.cpp
index 5b2ff2bfcfe..3c58c945753 100644
--- a/hal/src/main/native/cpp/jni/simulation/SpiReadAutoReceiveBufferCallbackStore.cpp
+++ b/hal/src/main/native/cpp/jni/simulation/SpiReadAutoReceiveBufferCallbackStore.cpp
@@ -7,14 +7,13 @@
 #include <jni.h>
 
 #include <cstdio>
+#include <memory>
 
 #include <wpi/jni_util.h>
 
 #include "SimulatorJNI.h"
 #include "hal/Types.h"
-#include "hal/Value.h"
 #include "hal/handles/UnlimitedHandleResource.h"
-#include "hal/simulation/NotifyListener.h"
 
 using namespace hal;
 using namespace hal::sim;
diff --git a/hal/src/main/native/sim/CANAPI.cpp b/hal/src/main/native/sim/CANAPI.cpp
index 4689d1f4e4e..eaa42fa2a16 100644
--- a/hal/src/main/native/sim/CANAPI.cpp
+++ b/hal/src/main/native/sim/CANAPI.cpp
@@ -4,6 +4,8 @@
 
 #include "hal/CANAPI.h"
 
+#include <memory>
+
 #include <wpi/DenseMap.h>
 
 #include "CANAPIInternal.h"
diff --git a/hal/src/main/native/sim/CTREPCM.cpp b/hal/src/main/native/sim/CTREPCM.cpp
index 93f91356b91..9d06ecb6364 100644
--- a/hal/src/main/native/sim/CTREPCM.cpp
+++ b/hal/src/main/native/sim/CTREPCM.cpp
@@ -4,10 +4,11 @@
 
 #include "hal/CTREPCM.h"
 
+#include <string>
+
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/CANAPI.h"
 #include "hal/Errors.h"
 #include "hal/handles/IndexedHandleResource.h"
 #include "mockdata/CTREPCMDataInternal.h"
diff --git a/hal/src/main/native/sim/Encoder.cpp b/hal/src/main/native/sim/Encoder.cpp
index 66ad87d2743..f7be2bdd9bd 100644
--- a/hal/src/main/native/sim/Encoder.cpp
+++ b/hal/src/main/native/sim/Encoder.cpp
@@ -4,6 +4,8 @@
 
 #include "hal/Encoder.h"
 
+#include <limits>
+
 #include "CounterInternal.h"
 #include "HALInitializer.h"
 #include "HALInternal.h"
diff --git a/hal/src/main/native/sim/Extensions.cpp b/hal/src/main/native/sim/Extensions.cpp
index 95495c645d5..7d22f41fe55 100644
--- a/hal/src/main/native/sim/Extensions.cpp
+++ b/hal/src/main/native/sim/Extensions.cpp
@@ -5,7 +5,9 @@
 #include "hal/Extensions.h"
 
 #include <cstdio>
+#include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include <wpi/SmallVector.h>
diff --git a/hal/src/main/native/sim/HAL.cpp b/hal/src/main/native/sim/HAL.cpp
index 5960452be02..1754f5f215f 100644
--- a/hal/src/main/native/sim/HAL.cpp
+++ b/hal/src/main/native/sim/HAL.cpp
@@ -6,6 +6,7 @@
 
 #include <cstdio>
 #include <cstring>
+#include <utility>
 #include <vector>
 
 #include <wpi/mutex.h>
@@ -25,7 +26,6 @@ NtQueryTimerResolution(PULONG MinimumResolution, PULONG MaximumResolution,
 #include "ErrorsInternal.h"
 #include "HALInitializer.h"
 #include "MockHooksInternal.h"
-#include "hal/DriverStation.h"
 #include "hal/Errors.h"
 #include "hal/Extensions.h"
 #include "hal/handles/HandlesInternal.h"
diff --git a/hal/src/main/native/sim/Notifier.cpp b/hal/src/main/native/sim/Notifier.cpp
index 225798c0775..8ec58858a43 100644
--- a/hal/src/main/native/sim/Notifier.cpp
+++ b/hal/src/main/native/sim/Notifier.cpp
@@ -8,7 +8,9 @@
 #include <chrono>
 #include <cstdio>
 #include <cstring>
+#include <memory>
 #include <string>
+#include <utility>
 
 #include <wpi/SmallVector.h>
 #include <wpi/StringExtras.h>
diff --git a/hal/src/main/native/sim/REVPH.cpp b/hal/src/main/native/sim/REVPH.cpp
index 957aed73f8a..e09deeaea5f 100644
--- a/hal/src/main/native/sim/REVPH.cpp
+++ b/hal/src/main/native/sim/REVPH.cpp
@@ -4,10 +4,11 @@
 
 #include "hal/REVPH.h"
 
+#include <string>
+
 #include "HALInitializer.h"
 #include "HALInternal.h"
 #include "PortsInternal.h"
-#include "hal/CANAPI.h"
 #include "hal/Errors.h"
 #include "hal/handles/IndexedHandleResource.h"
 #include "mockdata/REVPHDataInternal.h"
diff --git a/hal/src/main/native/sim/mockdata/DriverStationData.cpp b/hal/src/main/native/sim/mockdata/DriverStationData.cpp
index d7b8a087fa4..b46e0e81d62 100644
--- a/hal/src/main/native/sim/mockdata/DriverStationData.cpp
+++ b/hal/src/main/native/sim/mockdata/DriverStationData.cpp
@@ -5,7 +5,6 @@
 #include <cstring>
 
 #include "DriverStationDataInternal.h"
-#include "hal/DriverStation.h"
 
 using namespace hal;
 
diff --git a/hal/src/main/native/sim/mockdata/EncoderData.cpp b/hal/src/main/native/sim/mockdata/EncoderData.cpp
index 62ff7440993..8b012ed9d06 100644
--- a/hal/src/main/native/sim/mockdata/EncoderData.cpp
+++ b/hal/src/main/native/sim/mockdata/EncoderData.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <limits>
+
 #include "../PortsInternal.h"
 #include "EncoderDataInternal.h"
 
diff --git a/hal/src/main/native/sim/mockdata/RoboRioData.cpp b/hal/src/main/native/sim/mockdata/RoboRioData.cpp
index 94d61f8972b..613d89d4fdc 100644
--- a/hal/src/main/native/sim/mockdata/RoboRioData.cpp
+++ b/hal/src/main/native/sim/mockdata/RoboRioData.cpp
@@ -2,7 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include "../PortsInternal.h"
+#include <string>
+
 #include "RoboRioDataInternal.h"
 
 using namespace hal;
diff --git a/hal/src/main/native/sim/mockdata/SimDeviceData.cpp b/hal/src/main/native/sim/mockdata/SimDeviceData.cpp
index 5b60cbb264a..b849957f68c 100644
--- a/hal/src/main/native/sim/mockdata/SimDeviceData.cpp
+++ b/hal/src/main/native/sim/mockdata/SimDeviceData.cpp
@@ -5,6 +5,8 @@
 #include "hal/simulation/SimDeviceData.h"  // NOLINT(build/include_order)
 
 #include <algorithm>
+#include <memory>
+#include <utility>
 
 #include <wpi/StringExtras.h>
 
diff --git a/hal/src/test/native/cpp/can/CANTest.cpp b/hal/src/test/native/cpp/can/CANTest.cpp
index 72a81cd9c17..4a0ad691d3f 100644
--- a/hal/src/test/native/cpp/can/CANTest.cpp
+++ b/hal/src/test/native/cpp/can/CANTest.cpp
@@ -2,10 +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 <utility>
+
 #include <gtest/gtest.h>
 
 #include "hal/CANAPI.h"
-#include "hal/HAL.h"
 #include "hal/simulation/CanData.h"
 
 namespace hal {
diff --git a/hal/src/test/native/cpp/handles/HandleTest.cpp b/hal/src/test/native/cpp/handles/HandleTest.cpp
index d230a06bbd5..d3fd1c72658 100644
--- a/hal/src/test/native/cpp/handles/HandleTest.cpp
+++ b/hal/src/test/native/cpp/handles/HandleTest.cpp
@@ -2,9 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <memory>
+
 #include <gtest/gtest.h>
 
-#include "hal/HAL.h"
 #include "hal/handles/IndexedClassedHandleResource.h"
 
 #define HAL_TestHandle HAL_Handle
diff --git a/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp b/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp
index e823375545e..965565cbb40 100644
--- a/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/AnalogInDataTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+
 #include <gtest/gtest.h>
 
 #include "hal/AnalogInput.h"
diff --git a/hal/src/test/native/cpp/mockdata/AnalogOutDataTest.cpp b/hal/src/test/native/cpp/mockdata/AnalogOutDataTest.cpp
index 11dad057975..56ed8ba053c 100644
--- a/hal/src/test/native/cpp/mockdata/AnalogOutDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/AnalogOutDataTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+
 #include <gtest/gtest.h>
 
 #include "hal/AnalogOutput.h"
diff --git a/hal/src/test/native/cpp/mockdata/DIODataTest.cpp b/hal/src/test/native/cpp/mockdata/DIODataTest.cpp
index 35bfac5a37e..fba657df087 100644
--- a/hal/src/test/native/cpp/mockdata/DIODataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/DIODataTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+
 #include <gtest/gtest.h>
 
 #include "hal/DIO.h"
diff --git a/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp b/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp
index ffab223b18a..5ff1a316e6a 100644
--- a/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/DriverStationDataTest.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <cstring>
+#include <string>
 
 #include <gtest/gtest.h>
 #include <wpi/StringExtras.h>
diff --git a/hal/src/test/native/cpp/mockdata/I2CDataTest.cpp b/hal/src/test/native/cpp/mockdata/I2CDataTest.cpp
index af4499b88f7..ef6cc042968 100644
--- a/hal/src/test/native/cpp/mockdata/I2CDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/I2CDataTest.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 <string>
+
 #include <gtest/gtest.h>
 
-#include "hal/HAL.h"
 #include "hal/I2C.h"
-#include "hal/handles/HandlesInternal.h"
 #include "hal/simulation/I2CData.h"
 
 namespace hal {
diff --git a/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp b/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp
index 70a36a9b35d..d3c5a8021b9 100644
--- a/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/PCMDataTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+
 #include <gtest/gtest.h>
 
 #include "hal/CTREPCM.h"
diff --git a/hal/src/test/native/cpp/mockdata/PDPDataTest.cpp b/hal/src/test/native/cpp/mockdata/PDPDataTest.cpp
index 2e9977f0ae7..14a36843eda 100644
--- a/hal/src/test/native/cpp/mockdata/PDPDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/PDPDataTest.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 <string>
+
 #include <gtest/gtest.h>
 
-#include "hal/HAL.h"
 #include "hal/PowerDistribution.h"
-#include "hal/handles/HandlesInternal.h"
 #include "hal/simulation/PowerDistributionData.h"
 
 namespace hal {
diff --git a/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp b/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp
index b32e0a03c54..1054589af3b 100644
--- a/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/PWMDataTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+
 #include <gtest/gtest.h>
 
 #include "hal/HAL.h"
diff --git a/hal/src/test/native/cpp/mockdata/RelayDataTest.cpp b/hal/src/test/native/cpp/mockdata/RelayDataTest.cpp
index e4017ca4549..3815b89c964 100644
--- a/hal/src/test/native/cpp/mockdata/RelayDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/RelayDataTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+
 #include <gtest/gtest.h>
 
 #include "hal/HAL.h"
diff --git a/hal/src/test/native/cpp/mockdata/SPIDataTest.cpp b/hal/src/test/native/cpp/mockdata/SPIDataTest.cpp
index 1ae626072f5..18e8ab3fbb6 100644
--- a/hal/src/test/native/cpp/mockdata/SPIDataTest.cpp
+++ b/hal/src/test/native/cpp/mockdata/SPIDataTest.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 <string>
+
 #include <gtest/gtest.h>
 
-#include "hal/HAL.h"
 #include "hal/SPI.h"
-#include "hal/handles/HandlesInternal.h"
 #include "hal/simulation/SPIData.h"
 
 namespace hal {
diff --git a/ntcore/src/dev/native/cpp/main.cpp b/ntcore/src/dev/native/cpp/main.cpp
index 49cae5be4a1..c37949a2951 100644
--- a/ntcore/src/dev/native/cpp/main.cpp
+++ b/ntcore/src/dev/native/cpp/main.cpp
@@ -7,10 +7,12 @@
 #include <chrono>
 #include <cmath>
 #include <cstdlib>
+#include <limits>
 #include <numeric>
 #include <random>
 #include <string_view>
 #include <thread>
+#include <vector>
 
 #include <fmt/format.h>
 #include <fmt/ranges.h>
diff --git a/ntcore/src/main/native/cpp/ConnectionList.cpp b/ntcore/src/main/native/cpp/ConnectionList.cpp
index 8dfca216cad..f4ae7475a14 100644
--- a/ntcore/src/main/native/cpp/ConnectionList.cpp
+++ b/ntcore/src/main/native/cpp/ConnectionList.cpp
@@ -4,6 +4,9 @@
 
 #include "ConnectionList.h"
 
+#include <string>
+#include <vector>
+
 #include <wpi/SmallVector.h>
 #include <wpi/json.h>
 #include <wpi/raw_ostream.h>
diff --git a/ntcore/src/main/native/cpp/InstanceImpl.cpp b/ntcore/src/main/native/cpp/InstanceImpl.cpp
index b34db7323df..fd442ccb8a0 100644
--- a/ntcore/src/main/native/cpp/InstanceImpl.cpp
+++ b/ntcore/src/main/native/cpp/InstanceImpl.cpp
@@ -4,6 +4,10 @@
 
 #include "InstanceImpl.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 using namespace nt;
 
 std::atomic<int> InstanceImpl::s_default{-1};
diff --git a/ntcore/src/main/native/cpp/ListenerStorage.cpp b/ntcore/src/main/native/cpp/ListenerStorage.cpp
index 4270d0b919e..da06d6192e0 100644
--- a/ntcore/src/main/native/cpp/ListenerStorage.cpp
+++ b/ntcore/src/main/native/cpp/ListenerStorage.cpp
@@ -5,6 +5,8 @@
 #include "ListenerStorage.h"
 
 #include <algorithm>
+#include <utility>
+#include <vector>
 
 #include <wpi/SmallVector.h>
 
diff --git a/ntcore/src/main/native/cpp/LocalStorage.cpp b/ntcore/src/main/native/cpp/LocalStorage.cpp
index 7bc931f5345..e34139b12c2 100644
--- a/ntcore/src/main/native/cpp/LocalStorage.cpp
+++ b/ntcore/src/main/native/cpp/LocalStorage.cpp
@@ -5,6 +5,10 @@
 #include "LocalStorage.h"
 
 #include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <fmt/ranges.h>
 #include <wpi/DataLog.h>
diff --git a/ntcore/src/main/native/cpp/LoggerImpl.cpp b/ntcore/src/main/native/cpp/LoggerImpl.cpp
index 4e49070b3d4..90a655a64ab 100644
--- a/ntcore/src/main/native/cpp/LoggerImpl.cpp
+++ b/ntcore/src/main/native/cpp/LoggerImpl.cpp
@@ -4,6 +4,8 @@
 
 #include "LoggerImpl.h"
 
+#include <string>
+
 #include <wpi/Logger.h>
 #include <wpi/SmallVector.h>
 #include <wpi/fs.h>
diff --git a/ntcore/src/main/native/cpp/NetworkClient.cpp b/ntcore/src/main/native/cpp/NetworkClient.cpp
index 477ade1a72d..0fd9d37a7a0 100644
--- a/ntcore/src/main/native/cpp/NetworkClient.cpp
+++ b/ntcore/src/main/native/cpp/NetworkClient.cpp
@@ -8,6 +8,8 @@
 
 #include <atomic>
 #include <memory>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include <fmt/format.h>
diff --git a/ntcore/src/main/native/cpp/NetworkServer.cpp b/ntcore/src/main/native/cpp/NetworkServer.cpp
index 6158f264df3..b6d8e0d79fd 100644
--- a/ntcore/src/main/native/cpp/NetworkServer.cpp
+++ b/ntcore/src/main/native/cpp/NetworkServer.cpp
@@ -7,8 +7,11 @@
 #include <stdint.h>
 
 #include <atomic>
+#include <memory>
 #include <span>
+#include <string>
 #include <system_error>
+#include <utility>
 #include <vector>
 
 #include <wpi/MemoryBuffer.h>
diff --git a/ntcore/src/main/native/cpp/Value.cpp b/ntcore/src/main/native/cpp/Value.cpp
index 28765487ae2..c54a2ac63ea 100644
--- a/ntcore/src/main/native/cpp/Value.cpp
+++ b/ntcore/src/main/native/cpp/Value.cpp
@@ -6,8 +6,12 @@
 
 #include <algorithm>
 #include <cstring>
+#include <memory>
 #include <numeric>
 #include <span>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <wpi/MemAlloc.h>
 #include <wpi/timestamp.h>
diff --git a/ntcore/src/main/native/cpp/ValueCircularBuffer.cpp b/ntcore/src/main/native/cpp/ValueCircularBuffer.cpp
index 55c2968616e..b9a449f54fd 100644
--- a/ntcore/src/main/native/cpp/ValueCircularBuffer.cpp
+++ b/ntcore/src/main/native/cpp/ValueCircularBuffer.cpp
@@ -4,6 +4,9 @@
 
 #include "ValueCircularBuffer.h"
 
+#include <utility>
+#include <vector>
+
 using namespace nt;
 
 std::vector<Value> ValueCircularBuffer::ReadValue(unsigned int types) {
diff --git a/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp b/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp
index ae10656bb99..4d58d2ec4a0 100644
--- a/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp
+++ b/ntcore/src/main/native/cpp/jni/NetworkTablesJNI.cpp
@@ -5,6 +5,9 @@
 #include <jni.h>
 
 #include <cassert>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <fmt/format.h>
 #include <wpi/ConvertUTF.h>
diff --git a/ntcore/src/main/native/cpp/net/ClientImpl.cpp b/ntcore/src/main/native/cpp/net/ClientImpl.cpp
index 0352ef91e48..abcf3e77b98 100644
--- a/ntcore/src/main/native/cpp/net/ClientImpl.cpp
+++ b/ntcore/src/main/native/cpp/net/ClientImpl.cpp
@@ -4,9 +4,11 @@
 
 #include "ClientImpl.h"
 
+#include <memory>
 #include <numeric>
 #include <optional>
 #include <string>
+#include <utility>
 #include <variant>
 
 #include <fmt/format.h>
diff --git a/ntcore/src/main/native/cpp/net/ServerImpl.cpp b/ntcore/src/main/native/cpp/net/ServerImpl.cpp
index 4dbb3e82a21..bbbc85d0a05 100644
--- a/ntcore/src/main/native/cpp/net/ServerImpl.cpp
+++ b/ntcore/src/main/native/cpp/net/ServerImpl.cpp
@@ -6,11 +6,11 @@
 
 #include <stdint.h>
 
-#include <algorithm>
 #include <cmath>
-#include <numeric>
+#include <memory>
 #include <optional>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <fmt/ranges.h>
diff --git a/ntcore/src/main/native/cpp/net/WireDecoder.cpp b/ntcore/src/main/native/cpp/net/WireDecoder.cpp
index 48bf5ad4130..1add69325a7 100644
--- a/ntcore/src/main/native/cpp/net/WireDecoder.cpp
+++ b/ntcore/src/main/native/cpp/net/WireDecoder.cpp
@@ -6,6 +6,9 @@
 
 #include <algorithm>
 #include <concepts>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <fmt/format.h>
 #include <wpi/Logger.h>
diff --git a/ntcore/src/main/native/cpp/net/WireEncoder.cpp b/ntcore/src/main/native/cpp/net/WireEncoder.cpp
index 42de91cfea6..62cf4c01d8a 100644
--- a/ntcore/src/main/native/cpp/net/WireEncoder.cpp
+++ b/ntcore/src/main/native/cpp/net/WireEncoder.cpp
@@ -5,6 +5,7 @@
 #include "WireEncoder.h"
 
 #include <optional>
+#include <string>
 
 #include <wpi/json.h>
 #include <wpi/mpack.h>
diff --git a/ntcore/src/main/native/cpp/net3/ClientImpl3.cpp b/ntcore/src/main/native/cpp/net3/ClientImpl3.cpp
index a65dd89c871..b97d7e65918 100644
--- a/ntcore/src/main/native/cpp/net3/ClientImpl3.cpp
+++ b/ntcore/src/main/native/cpp/net3/ClientImpl3.cpp
@@ -5,8 +5,10 @@
 #include "ClientImpl3.h"
 
 #include <algorithm>
+#include <memory>
 #include <numeric>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <fmt/format.h>
diff --git a/ntcore/src/main/native/cpp/net3/WireDecoder3.cpp b/ntcore/src/main/native/cpp/net3/WireDecoder3.cpp
index 51180279b54..03bc9c11c9c 100644
--- a/ntcore/src/main/native/cpp/net3/WireDecoder3.cpp
+++ b/ntcore/src/main/native/cpp/net3/WireDecoder3.cpp
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <string>
+#include <utility>
 
 #include <fmt/format.h>
 #include <wpi/MathExtras.h>
diff --git a/ntcore/src/main/native/cpp/networktables/NetworkTable.cpp b/ntcore/src/main/native/cpp/networktables/NetworkTable.cpp
index c81f33ca492..815d5166375 100644
--- a/ntcore/src/main/native/cpp/networktables/NetworkTable.cpp
+++ b/ntcore/src/main/native/cpp/networktables/NetworkTable.cpp
@@ -5,6 +5,10 @@
 #include "networktables/NetworkTable.h"
 
 #include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <fmt/format.h>
 #include <wpi/SmallString.h>
diff --git a/ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp b/ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp
index d2cac1ce6a3..19c1ebfb3e0 100644
--- a/ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp
+++ b/ntcore/src/main/native/cpp/networktables/NetworkTableInstance.cpp
@@ -4,6 +4,11 @@
 
 #include "networktables/NetworkTableInstance.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <wpi/SmallVector.h>
 #include <wpi/print.h>
 
diff --git a/ntcore/src/main/native/cpp/ntcore_c.cpp b/ntcore/src/main/native/cpp/ntcore_c.cpp
index ee8b45eeb1e..83227928118 100644
--- a/ntcore/src/main/native/cpp/ntcore_c.cpp
+++ b/ntcore/src/main/native/cpp/ntcore_c.cpp
@@ -10,6 +10,8 @@
 #include <cstdlib>
 #include <cstring>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 #include <wpi/MemAlloc.h>
 #include <wpi/SmallVector.h>
diff --git a/ntcore/src/main/native/cpp/ntcore_cpp.cpp b/ntcore/src/main/native/cpp/ntcore_cpp.cpp
index 75f20a6db5c..3cb3ce4fd77 100644
--- a/ntcore/src/main/native/cpp/ntcore_cpp.cpp
+++ b/ntcore/src/main/native/cpp/ntcore_cpp.cpp
@@ -8,6 +8,9 @@
 #include <cassert>
 #include <cstdio>
 #include <cstdlib>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <fmt/format.h>
 #include <wpi/json.h>
diff --git a/ntcore/src/main/native/cpp/ntcore_meta.cpp b/ntcore/src/main/native/cpp/ntcore_meta.cpp
index 3b947a01fde..05933914190 100644
--- a/ntcore/src/main/native/cpp/ntcore_meta.cpp
+++ b/ntcore/src/main/native/cpp/ntcore_meta.cpp
@@ -2,6 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <fmt/format.h>
 #include <wpi/MessagePack.h>
 #include <wpi/mpack.h>
diff --git a/ntcore/src/test/native/cpp/ConnectionListenerTest.cpp b/ntcore/src/test/native/cpp/ConnectionListenerTest.cpp
index 3e4dd24fcb6..b5ae9daf868 100644
--- a/ntcore/src/test/native/cpp/ConnectionListenerTest.cpp
+++ b/ntcore/src/test/native/cpp/ConnectionListenerTest.cpp
@@ -4,6 +4,7 @@
 
 #include <chrono>
 #include <thread>
+#include <vector>
 
 #include <gtest/gtest.h>
 #include <wpi/Synchronization.h>
diff --git a/ntcore/src/test/native/cpp/LocalStorageTest.cpp b/ntcore/src/test/native/cpp/LocalStorageTest.cpp
index 5ea4ec5c8ee..30aa9b2051b 100644
--- a/ntcore/src/test/native/cpp/LocalStorageTest.cpp
+++ b/ntcore/src/test/native/cpp/LocalStorageTest.cpp
@@ -2,6 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+#include <vector>
+
 #include <gtest/gtest.h>
 #include <wpi/SpanMatcher.h>
 
diff --git a/ntcore/src/test/native/cpp/LoggerTest.cpp b/ntcore/src/test/native/cpp/LoggerTest.cpp
index 9e974c3fa73..38aaab1901b 100644
--- a/ntcore/src/test/native/cpp/LoggerTest.cpp
+++ b/ntcore/src/test/native/cpp/LoggerTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <vector>
+
 #include <gtest/gtest.h>
 #include <wpi/Synchronization.h>
 
diff --git a/ntcore/src/test/native/cpp/NetworkTableTest.cpp b/ntcore/src/test/native/cpp/NetworkTableTest.cpp
index 4429c8979cc..db856a5d871 100644
--- a/ntcore/src/test/native/cpp/NetworkTableTest.cpp
+++ b/ntcore/src/test/native/cpp/NetworkTableTest.cpp
@@ -2,6 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+#include <vector>
+
 #include <gtest/gtest.h>
 
 #include "TestPrinters.h"
diff --git a/ntcore/src/test/native/cpp/TopicListenerTest.cpp b/ntcore/src/test/native/cpp/TopicListenerTest.cpp
index 8f46742a85c..8511b3b4da7 100644
--- a/ntcore/src/test/native/cpp/TopicListenerTest.cpp
+++ b/ntcore/src/test/native/cpp/TopicListenerTest.cpp
@@ -3,7 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <chrono>
+#include <cstdio>
 #include <thread>
+#include <vector>
 
 #include <gtest/gtest.h>
 #include <wpi/Synchronization.h>
diff --git a/ntcore/src/test/native/cpp/ValueTest.cpp b/ntcore/src/test/native/cpp/ValueTest.cpp
index abb0dd5ece9..c45d5aafa5c 100644
--- a/ntcore/src/test/native/cpp/ValueTest.cpp
+++ b/ntcore/src/test/native/cpp/ValueTest.cpp
@@ -3,7 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <algorithm>
+#include <string>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 #include <gtest/gtest.h>
 
@@ -13,7 +16,7 @@
 
 using namespace std::string_view_literals;
 
-namespace std {  // NOLINT(clang-tidy.cert-dcl58-cpp)
+namespace std {  // NOLINT (clang-tidy.cert-dcl58-cpp)
 template <typename T, typename U>
 inline bool operator==(std::span<T> lhs, std::span<U> rhs) {
   if (lhs.size() != rhs.size()) {
diff --git a/ntcore/src/test/native/cpp/main.cpp b/ntcore/src/test/native/cpp/main.cpp
index 20bd583d2d4..1e832b84cec 100644
--- a/ntcore/src/test/native/cpp/main.cpp
+++ b/ntcore/src/test/native/cpp/main.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <climits>
+#include <cstdio>
 
 #include <wpi/timestamp.h>
 
diff --git a/ntcore/src/test/native/cpp/net/ServerImplTest.cpp b/ntcore/src/test/native/cpp/net/ServerImplTest.cpp
index 13488acac3d..b21c6e11a27 100644
--- a/ntcore/src/test/native/cpp/net/ServerImplTest.cpp
+++ b/ntcore/src/test/native/cpp/net/ServerImplTest.cpp
@@ -6,6 +6,7 @@
 
 #include <concepts>
 #include <span>
+#include <string>
 #include <string_view>
 #include <vector>
 
diff --git a/ntcore/src/test/native/cpp/net/WireDecoderTest.cpp b/ntcore/src/test/native/cpp/net/WireDecoderTest.cpp
index fe5c469f1c8..5d74c61e370 100644
--- a/ntcore/src/test/native/cpp/net/WireDecoderTest.cpp
+++ b/ntcore/src/test/native/cpp/net/WireDecoderTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+
 #include <gtest/gtest.h>
 #include <wpi/SmallString.h>
 #include <wpi/raw_ostream.h>
diff --git a/ntcore/src/test/native/cpp/net3/WireDecoder3Test.cpp b/ntcore/src/test/native/cpp/net3/WireDecoder3Test.cpp
index 74f0d5462b8..af40483db02 100644
--- a/ntcore/src/test/native/cpp/net3/WireDecoder3Test.cpp
+++ b/ntcore/src/test/native/cpp/net3/WireDecoder3Test.cpp
@@ -8,6 +8,8 @@
 #include <climits>
 #include <string>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 #include <gtest/gtest.h>
 #include <wpi/SpanMatcher.h>
diff --git a/ntcore/src/test/native/cpp/net3/WireEncoder3Test.cpp b/ntcore/src/test/native/cpp/net3/WireEncoder3Test.cpp
index de0593467e5..96c39a12438 100644
--- a/ntcore/src/test/native/cpp/net3/WireEncoder3Test.cpp
+++ b/ntcore/src/test/native/cpp/net3/WireEncoder3Test.cpp
@@ -6,6 +6,7 @@
 #include <climits>
 #include <string>
 #include <string_view>
+#include <utility>
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
index 71c9ee04fdb..462069f3825 100644
--- a/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
+++ b/ntcoreffi/src/main/native/cpp/DataLogManager.cpp
@@ -8,7 +8,7 @@
 #include <ctime>
 #include <random>
 #include <string>
-#include <string_view>
+#include <vector>
 
 #include <fmt/chrono.h>
 #include <fmt/format.h>
diff --git a/outlineviewer/src/main/native/cpp/main.cpp b/outlineviewer/src/main/native/cpp/main.cpp
index 36801ee3dac..72c2b647424 100644
--- a/outlineviewer/src/main/native/cpp/main.cpp
+++ b/outlineviewer/src/main/native/cpp/main.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <memory>
+#include <string>
 
 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
diff --git a/processstarter/src/main/native/linux/main.cpp b/processstarter/src/main/native/linux/main.cpp
index 1ddf1cdc6db..7663292dea5 100644
--- a/processstarter/src/main/native/linux/main.cpp
+++ b/processstarter/src/main/native/linux/main.cpp
@@ -12,6 +12,7 @@
 #include <cstdio>
 #include <cstring>
 #include <filesystem>
+#include <string>
 
 int main(int argc, char* argv[]) {
   char path[PATH_MAX];
diff --git a/roborioteamnumbersetter/src/main/native/cpp/App.cpp b/roborioteamnumbersetter/src/main/native/cpp/App.cpp
index 62b493c4af2..4394b3d841b 100644
--- a/roborioteamnumbersetter/src/main/native/cpp/App.cpp
+++ b/roborioteamnumbersetter/src/main/native/cpp/App.cpp
@@ -3,8 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <memory>
+#include <string>
 #include <string_view>
 #include <unordered_map>
+#include <utility>
 
 #ifndef _WIN32
 #include <arpa/inet.h>
diff --git a/roborioteamnumbersetter/src/main/native/cpp/DeploySession.cpp b/roborioteamnumbersetter/src/main/native/cpp/DeploySession.cpp
index f831e5f28ba..84a950b4838 100644
--- a/roborioteamnumbersetter/src/main/native/cpp/DeploySession.cpp
+++ b/roborioteamnumbersetter/src/main/native/cpp/DeploySession.cpp
@@ -4,8 +4,10 @@
 
 #include "DeploySession.h"
 
+#include <string>
 #include <string_view>
 #include <unordered_map>
+#include <utility>
 
 #include <fmt/format.h>
 #include <wpi/SmallString.h>
diff --git a/roborioteamnumbersetter/src/main/native/cpp/SshSession.cpp b/roborioteamnumbersetter/src/main/native/cpp/SshSession.cpp
index 84fbd6cc188..e20da94d455 100644
--- a/roborioteamnumbersetter/src/main/native/cpp/SshSession.cpp
+++ b/roborioteamnumbersetter/src/main/native/cpp/SshSession.cpp
@@ -9,7 +9,7 @@
 #include <sys/stat.h>
 
 #include <algorithm>
-#include <stdexcept>
+#include <string>
 
 #include <fmt/format.h>
 #include <libssh/libssh.h>
diff --git a/romiVendordep/src/main/native/cpp/romi/OnBoardIO.cpp b/romiVendordep/src/main/native/cpp/romi/OnBoardIO.cpp
index cefe9ff2e4c..bba2901f923 100644
--- a/romiVendordep/src/main/native/cpp/romi/OnBoardIO.cpp
+++ b/romiVendordep/src/main/native/cpp/romi/OnBoardIO.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <memory>
+
 #include <frc/DigitalInput.h>
 #include <frc/DigitalOutput.h>
 #include <frc/Errors.h>
diff --git a/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp b/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp
index 7bb86d71c59..3686d3affdb 100644
--- a/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp
+++ b/simulation/halsim_ds_socket/src/main/native/cpp/main.cpp
@@ -17,6 +17,7 @@
 #include <cstdio>
 #include <cstring>
 #include <exception>
+#include <memory>
 #include <string_view>
 
 #include <DSCommPacket.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/AccelerometerSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AccelerometerSimGui.cpp
index 22676569f68..115b4ecef50 100644
--- a/simulation/halsim_gui/src/main/native/cpp/AccelerometerSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AccelerometerSimGui.cpp
@@ -4,11 +4,10 @@
 
 #include "AccelerometerSimGui.h"
 
-#include <glass/hardware/Accelerometer.h>
-#include <glass/other/DeviceTree.h>
-
 #include <memory>
 
+#include <glass/hardware/Accelerometer.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/Value.h>
 #include <hal/simulation/AccelerometerData.h>
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp
index 2528185516a..d7049362c8a 100644
--- a/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AddressableLEDGui.cpp
@@ -4,8 +4,10 @@
 
 #include "AddressableLEDGui.h"
 
-#include <glass/hardware/LEDDisplay.h>
+#include <memory>
+#include <vector>
 
+#include <glass/hardware/LEDDisplay.h>
 #include <hal/Ports.h>
 #include <hal/simulation/AddressableLEDData.h>
 #include <imgui.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/AnalogGyroSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AnalogGyroSimGui.cpp
index 12149ec69cc..4bd328f4e46 100644
--- a/simulation/halsim_gui/src/main/native/cpp/AnalogGyroSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AnalogGyroSimGui.cpp
@@ -4,12 +4,11 @@
 
 #include "AnalogGyroSimGui.h"
 
-#include <glass/hardware/AnalogGyro.h>
-#include <glass/other/DeviceTree.h>
-
 #include <memory>
 #include <vector>
 
+#include <glass/hardware/AnalogGyro.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/Ports.h>
 #include <hal/Value.h>
 #include <hal/simulation/AnalogGyroData.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp
index e100d5dd32e..4a428b602ab 100644
--- a/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AnalogInputSimGui.cpp
@@ -4,12 +4,11 @@
 
 #include "AnalogInputSimGui.h"
 
-#include <glass/View.h>
-#include <glass/hardware/AnalogInput.h>
-
 #include <memory>
 #include <vector>
 
+#include <glass/View.h>
+#include <glass/hardware/AnalogInput.h>
 #include <hal/Ports.h>
 #include <hal/simulation/AnalogGyroData.h>
 #include <hal/simulation/AnalogInData.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/AnalogOutputSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/AnalogOutputSimGui.cpp
index 8e02fb69ef7..7a98bed575c 100644
--- a/simulation/halsim_gui/src/main/native/cpp/AnalogOutputSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/AnalogOutputSimGui.cpp
@@ -4,12 +4,11 @@
 
 #include "AnalogOutputSimGui.h"
 
-#include <glass/hardware/AnalogOutput.h>
-#include <glass/other/DeviceTree.h>
-
 #include <memory>
 #include <vector>
 
+#include <glass/hardware/AnalogOutput.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/Ports.h>
 #include <hal/simulation/AnalogOutData.h>
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp
index 150e4bf436a..13ec169406b 100644
--- a/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/DIOSimGui.cpp
@@ -4,12 +4,11 @@
 
 #include "DIOSimGui.h"
 
-#include <glass/hardware/DIO.h>
-#include <glass/hardware/Encoder.h>
-
 #include <memory>
 #include <vector>
 
+#include <glass/hardware/DIO.h>
+#include <glass/hardware/Encoder.h>
 #include <hal/Ports.h>
 #include <hal/simulation/DIOData.h>
 #include <hal/simulation/DigitalPWMData.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
index 119075642dd..cb238d87e6a 100644
--- a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.cpp
@@ -4,12 +4,6 @@
 
 #include "DriverStationGui.h"
 
-#include <glass/Context.h>
-#include <glass/Storage.h>
-#include <glass/other/FMS.h>
-#include <glass/support/ExtraGuiWidgets.h>
-#include <glass/support/NameSetting.h>
-
 #include <algorithm>
 #include <atomic>
 #include <cstring>
@@ -20,6 +14,11 @@
 
 #include <GLFW/glfw3.h>
 #include <fmt/format.h>
+#include <glass/Context.h>
+#include <glass/Storage.h>
+#include <glass/other/FMS.h>
+#include <glass/support/ExtraGuiWidgets.h>
+#include <glass/support/NameSetting.h>
 #include <hal/DriverStationTypes.h>
 #include <hal/simulation/DriverStationData.h>
 #include <hal/simulation/MockHooks.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.h b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.h
index cb086c839d4..55c90a39f61 100644
--- a/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.h
+++ b/simulation/halsim_gui/src/main/native/cpp/DriverStationGui.h
@@ -4,11 +4,11 @@
 
 #pragma once
 
-#include <glass/WindowManager.h>
-
 #include <memory>
 #include <string_view>
 
+#include <glass/WindowManager.h>
+
 namespace halsimgui {
 
 class DSManager : public glass::WindowManager {
diff --git a/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.cpp
index 6a1be270cee..8e53c864d6f 100644
--- a/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/EncoderSimGui.cpp
@@ -4,7 +4,6 @@
 
 #include "EncoderSimGui.h"
 
-#include <glass/hardware/Encoder.h>
 #include <stdint.h>
 
 #include <limits>
@@ -13,6 +12,7 @@
 #include <vector>
 
 #include <fmt/format.h>
+#include <glass/hardware/Encoder.h>
 #include <hal/Ports.h>
 #include <hal/simulation/EncoderData.h>
 #include <hal/simulation/SimDeviceData.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/HALProvider.cpp b/simulation/halsim_gui/src/main/native/cpp/HALProvider.cpp
index dffcd00b700..7d36478b8f0 100644
--- a/simulation/halsim_gui/src/main/native/cpp/HALProvider.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/HALProvider.cpp
@@ -4,12 +4,11 @@
 
 #include "HALProvider.h"
 
-#include <glass/Model.h>
-#include <glass/Storage.h>
-
-#include <algorithm>
 #include <string>
+#include <utility>
 
+#include <glass/Model.h>
+#include <glass/Storage.h>
 #include <hal/simulation/DriverStationData.h>
 
 using namespace halsimgui;
diff --git a/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
index 4d005ad0d49..e6329c3b6e8 100644
--- a/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/HALSimGui.cpp
@@ -4,9 +4,11 @@
 
 #include "HALSimGui.h"
 
+#include <memory>
+#include <utility>
+
 #include <glass/Context.h>
 #include <glass/Storage.h>
-
 #include <imgui.h>
 #include <wpigui.h>
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.cpp
index 30f123259e9..763d28e8aab 100644
--- a/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/NetworkTablesSimGui.cpp
@@ -4,10 +4,11 @@
 
 #include "NetworkTablesSimGui.h"
 
+#include <memory>
+
 #include <glass/Context.h>
 #include <glass/Storage.h>
 #include <glass/networktables/NetworkTables.h>
-
 #include <wpigui.h>
 
 #include "HALSimGui.h"
diff --git a/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.cpp
index d5a3f3604e4..019a86c76cf 100644
--- a/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.cpp
@@ -4,13 +4,12 @@
 
 #include "PCMSimGui.h"
 
-#include <glass/hardware/Pneumatic.h>
-#include <glass/other/DeviceTree.h>
-
 #include <cstdio>
 #include <memory>
 #include <vector>
 
+#include <glass/hardware/Pneumatic.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/Ports.h>
 #include <hal/Value.h>
 #include <hal/simulation/CTREPCMData.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.h b/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.h
index da20022ef14..d4842492671 100644
--- a/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.h
+++ b/simulation/halsim_gui/src/main/native/cpp/PCMSimGui.h
@@ -3,10 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #pragma once
-#include <glass/hardware/Pneumatic.h>
-
 #include <memory>
 
+#include <glass/hardware/Pneumatic.h>
+
 namespace halsimgui {
 
 class PCMSimGui {
diff --git a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp
index 47e65e1e5b2..0fc66914c7b 100644
--- a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.cpp
@@ -4,13 +4,12 @@
 
 #include "PHSimGui.h"
 
-#include <glass/hardware/Pneumatic.h>
-#include <glass/other/DeviceTree.h>
-
 #include <cstdio>
 #include <memory>
 #include <vector>
 
+#include <glass/hardware/Pneumatic.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/Ports.h>
 #include <hal/Value.h>
 #include <hal/simulation/REVPHData.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.h b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.h
index 84fe9d76ac7..348f6df963f 100644
--- a/simulation/halsim_gui/src/main/native/cpp/PHSimGui.h
+++ b/simulation/halsim_gui/src/main/native/cpp/PHSimGui.h
@@ -3,10 +3,10 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #pragma once
-#include <glass/hardware/Pneumatic.h>
-
 #include <memory>
 
+#include <glass/hardware/Pneumatic.h>
+
 namespace halsimgui {
 
 class PHSimGui {
diff --git a/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp
index 9eceabdc1c4..2a60f9f4ef0 100644
--- a/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PWMSimGui.cpp
@@ -4,11 +4,10 @@
 
 #include "PWMSimGui.h"
 
-#include <glass/hardware/PWM.h>
-
 #include <memory>
 #include <vector>
 
+#include <glass/hardware/PWM.h>
 #include <hal/Ports.h>
 #include <hal/simulation/AddressableLEDData.h>
 #include <hal/simulation/PWMData.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp
index c136c7eddea..a3d4c2b3f72 100644
--- a/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/PowerDistributionSimGui.cpp
@@ -4,13 +4,12 @@
 
 #include "PowerDistributionSimGui.h"
 
-#include <glass/hardware/PowerDistribution.h>
-
 #include <cstdio>
 #include <cstring>
 #include <memory>
 #include <vector>
 
+#include <glass/hardware/PowerDistribution.h>
 #include <hal/Ports.h>
 #include <hal/simulation/PowerDistributionData.h>
 
diff --git a/simulation/halsim_gui/src/main/native/cpp/RelaySimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/RelaySimGui.cpp
index badb4f9a32a..1d163fbb32e 100644
--- a/simulation/halsim_gui/src/main/native/cpp/RelaySimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/RelaySimGui.cpp
@@ -4,11 +4,10 @@
 
 #include "RelaySimGui.h"
 
-#include <glass/hardware/Relay.h>
-
 #include <memory>
 #include <vector>
 
+#include <glass/hardware/Relay.h>
 #include <hal/Ports.h>
 #include <hal/simulation/RelayData.h>
 #include <wpigui.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.cpp b/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.cpp
index b693569571f..29fa7b4cf24 100644
--- a/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/RoboRioSimGui.cpp
@@ -4,10 +4,9 @@
 
 #include "RoboRioSimGui.h"
 
-#include <glass/hardware/RoboRio.h>
-
 #include <memory>
 
+#include <glass/hardware/RoboRio.h>
 #include <hal/simulation/RoboRioData.h>
 
 #include "HALDataSource.h"
diff --git a/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp b/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp
index 55b83cef252..aee5130e440 100644
--- a/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/SimDeviceGui.cpp
@@ -4,10 +4,13 @@
 
 #include "SimDeviceGui.h"
 
-#include <glass/other/DeviceTree.h>
 #include <stdint.h>
 
+#include <memory>
+#include <utility>
+
 #include <fmt/format.h>
+#include <glass/other/DeviceTree.h>
 #include <hal/SimDevice.h>
 #include <hal/simulation/SimDeviceData.h>
 #include <wpi/DenseMap.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp b/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp
index 3ccf6306d18..043e360d571 100644
--- a/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/TimingGui.cpp
@@ -4,13 +4,13 @@
 
 #include "TimingGui.h"
 
-#include <glass/Model.h>
-#include <glass/View.h>
-
 #include <cstdio>
 #include <cstring>
+#include <memory>
 #include <vector>
 
+#include <glass/Model.h>
+#include <glass/View.h>
 #include <hal/HALBase.h>
 #include <hal/simulation/MockHooks.h>
 #include <hal/simulation/NotifierData.h>
diff --git a/simulation/halsim_gui/src/main/native/cpp/main.cpp b/simulation/halsim_gui/src/main/native/cpp/main.cpp
index 574090b974c..21fe17404f7 100644
--- a/simulation/halsim_gui/src/main/native/cpp/main.cpp
+++ b/simulation/halsim_gui/src/main/native/cpp/main.cpp
@@ -2,14 +2,14 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <cstdio>
+#include <memory>
+#include <string_view>
+
 #include <glass/Context.h>
 #include <glass/Storage.h>
 #include <glass/hardware/Pneumatic.h>
 #include <glass/other/Plot.h>
-
-#include <cstdio>
-#include <string_view>
-
 #include <hal/Extensions.h>
 #include <hal/Main.h>
 #include <imgui.h>
diff --git a/simulation/halsim_gui/src/main/native/include/HALProvider.h b/simulation/halsim_gui/src/main/native/include/HALProvider.h
index 0a26a09cd5f..11372b11f45 100644
--- a/simulation/halsim_gui/src/main/native/include/HALProvider.h
+++ b/simulation/halsim_gui/src/main/native/include/HALProvider.h
@@ -4,15 +4,15 @@
 
 #pragma once
 
-#include <glass/Model.h>
-#include <glass/Provider.h>
-
 #include <functional>
 #include <memory>
 #include <string>
 #include <string_view>
 #include <vector>
 
+#include <glass/Model.h>
+#include <glass/Provider.h>
+
 namespace halsimgui {
 
 class HALProvider : private glass::Provider<> {
diff --git a/simulation/halsim_gui/src/main/native/include/HALSimGui.h b/simulation/halsim_gui/src/main/native/include/HALSimGui.h
index 68597e5f672..50590e6b6cd 100644
--- a/simulation/halsim_gui/src/main/native/include/HALSimGui.h
+++ b/simulation/halsim_gui/src/main/native/include/HALSimGui.h
@@ -4,13 +4,13 @@
 
 #pragma once
 
+#include <functional>
+#include <memory>
+
 #include <glass/MainMenuBar.h>
 #include <glass/WindowManager.h>
 #include <glass/networktables/NetworkTablesProvider.h>
 
-#include <functional>
-#include <memory>
-
 #include "HALProvider.h"
 
 namespace halsimgui {
diff --git a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp
index 21742f06126..3e27d3ec943 100644
--- a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp
+++ b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWS.cpp
@@ -5,6 +5,8 @@
 #include "HALSimWS.h"
 
 #include <cstdio>
+#include <memory>
+#include <string>
 
 #include <wpi/SmallString.h>
 #include <wpi/SmallVector.h>
diff --git a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClient.cpp b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClient.cpp
index 1df7ebc7372..14896926b6b 100644
--- a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClient.cpp
+++ b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClient.cpp
@@ -4,6 +4,8 @@
 
 #include "HALSimWSClient.h"
 
+#include <memory>
+
 #include <WSProviderContainer.h>
 #include <WSProvider_AddressableLED.h>
 #include <WSProvider_Analog.h>
diff --git a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp
index 3e7305b47ad..c889d38b8a3 100644
--- a/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp
+++ b/simulation/halsim_ws_client/src/main/native/cpp/HALSimWSClientConnection.cpp
@@ -5,6 +5,7 @@
 #include "HALSimWSClientConnection.h"
 
 #include <cstdio>
+#include <string>
 
 #include <fmt/format.h>
 #include <wpi/print.h>
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSHalProviders.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSHalProviders.cpp
index 4d6c024558c..4afc6b65bc6 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSHalProviders.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSHalProviders.cpp
@@ -4,6 +4,8 @@
 
 #include "WSHalProviders.h"
 
+#include <memory>
+
 #include <fmt/format.h>
 
 namespace wpilibws {
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 d316fc17e49..78629a3dbd0 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
@@ -4,6 +4,8 @@
 
 #include "WSProvider_AddressableLED.h"
 
+#include <vector>
+
 #include <hal/Ports.h>
 #include <hal/simulation/AddressableLEDData.h>
 
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_BuiltInAccelerometer.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_BuiltInAccelerometer.cpp
index fefbcd547a3..1928b5df3ac 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_BuiltInAccelerometer.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_BuiltInAccelerometer.cpp
@@ -4,6 +4,8 @@
 
 #include "WSProvider_BuiltInAccelerometer.h"
 
+#include <memory>
+
 #include <hal/Ports.h>
 #include <hal/simulation/AccelerometerData.h>
 
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DriverStation.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DriverStation.cpp
index 27495263b92..3c3989eac10 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DriverStation.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_DriverStation.cpp
@@ -4,8 +4,8 @@
 
 #include "WSProvider_DriverStation.h"
 
-#include <algorithm>
 #include <atomic>
+#include <string>
 #include <string_view>
 
 #include <hal/DriverStation.h>
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 3c1602646b1..8e35d56b502 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
@@ -4,7 +4,9 @@
 
 #include "WSProvider_Joystick.h"
 
+#include <algorithm>
 #include <atomic>
+#include <vector>
 
 #include <hal/Ports.h>
 #include <hal/simulation/DriverStationData.h>
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 7c3d710f47c..cad7e22b9b0 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
@@ -6,6 +6,9 @@
 
 #include <algorithm>
 #include <cmath>
+#include <memory>
+#include <string>
+#include <utility>
 
 #include <fmt/format.h>
 #include <hal/Ports.h>
diff --git a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Solenoid.cpp b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Solenoid.cpp
index a26a4e59ab3..944367b7af6 100644
--- a/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Solenoid.cpp
+++ b/simulation/halsim_ws_core/src/main/native/cpp/WSProvider_Solenoid.cpp
@@ -4,6 +4,10 @@
 
 #include "WSProvider_Solenoid.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <fmt/format.h>
 #include <hal/Ports.h>
 #include <hal/simulation/CTREPCMData.h>
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 67be8967244..cb6b43715ae 100644
--- a/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp
+++ b/simulation/halsim_ws_server/src/main/native/cpp/HALSimHttpConnection.cpp
@@ -6,6 +6,8 @@
 
 #include <uv.h>
 
+#include <cstdio>
+#include <string>
 #include <string_view>
 
 #include <wpi/MemoryBuffer.h>
diff --git a/simulation/halsim_ws_server/src/main/native/cpp/HALSimWSServer.cpp b/simulation/halsim_ws_server/src/main/native/cpp/HALSimWSServer.cpp
index 9ecccb049c9..0661b975d6c 100644
--- a/simulation/halsim_ws_server/src/main/native/cpp/HALSimWSServer.cpp
+++ b/simulation/halsim_ws_server/src/main/native/cpp/HALSimWSServer.cpp
@@ -4,6 +4,8 @@
 
 #include "HALSimWSServer.h"
 
+#include <memory>
+
 #include <WSProviderContainer.h>
 #include <WSProvider_AddressableLED.h>
 #include <WSProvider_Analog.h>
diff --git a/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp b/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp
index 163af753f21..f231cf44878 100644
--- a/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp
+++ b/simulation/halsim_ws_server/src/main/native/cpp/HALSimWeb.cpp
@@ -4,6 +4,9 @@
 
 #include "HALSimWeb.h"
 
+#include <memory>
+#include <string>
+
 #include <wpi/SmallString.h>
 #include <wpi/fs.h>
 #include <wpi/print.h>
diff --git a/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp b/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp
index cd38f7b39a2..3a7429127fe 100644
--- a/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp
+++ b/simulation/halsim_ws_server/src/test/native/cpp/WebServerClientTest.cpp
@@ -5,6 +5,8 @@
 #include "WebServerClientTest.h"
 
 #include <cstdio>
+#include <memory>
+#include <string>
 
 #include <fmt/format.h>
 #include <wpi/SmallString.h>
diff --git a/simulation/halsim_ws_server/src/test/native/cpp/main.cpp b/simulation/halsim_ws_server/src/test/native/cpp/main.cpp
index 254cc092b76..2ff9a5aaf98 100644
--- a/simulation/halsim_ws_server/src/test/native/cpp/main.cpp
+++ b/simulation/halsim_ws_server/src/test/native/cpp/main.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <memory>
+#include <string>
 #include <thread>
 
 #include <gtest/gtest.h>
diff --git a/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp b/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp
index 8a85bfaac8d..704e172c828 100644
--- a/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp
+++ b/simulation/halsim_xrp/src/main/native/cpp/HALSimXRP.cpp
@@ -5,6 +5,7 @@
 #include "HALSimXRP.h"
 
 #include <cstdio>
+#include <string>
 
 #include <wpi/Endian.h>
 #include <wpi/MathExtras.h>
diff --git a/simulation/halsim_xrp/src/main/native/cpp/HALSimXRPClient.cpp b/simulation/halsim_xrp/src/main/native/cpp/HALSimXRPClient.cpp
index 2cd36c39be6..adc4e26a46c 100644
--- a/simulation/halsim_xrp/src/main/native/cpp/HALSimXRPClient.cpp
+++ b/simulation/halsim_xrp/src/main/native/cpp/HALSimXRPClient.cpp
@@ -4,6 +4,8 @@
 
 #include "HALSimXRPClient.h"
 
+#include <memory>
+
 #include <WSProviderContainer.h>
 #include <WSProvider_Analog.h>
 #include <WSProvider_BuiltInAccelerometer.h>
diff --git a/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp b/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp
index bc84b881efe..ffa1a5e56c1 100644
--- a/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp
+++ b/simulation/halsim_xrp/src/main/native/cpp/XRP.cpp
@@ -4,6 +4,8 @@
 
 #include "XRP.h"
 
+#include <string>
+
 #include <fmt/format.h>
 #include <wpi/Endian.h>
 #include <wpi/MathExtras.h>
@@ -388,8 +390,9 @@ void XRP::ReadEncoderTag(std::span<const uint8_t> packet) {
         static_cast<double>(period_numerator >> 1) / period_denominator;
 
     // If direction is not forward, return negative value for period.
-    if (!(period_numerator & 1))
+    if (!(period_numerator & 1)) {
       period = -period;
+    }
 
     encJson["data"].push_back({wpi::json(">period"), wpi::json(period)});
   }
diff --git a/sysid/src/main/native/cpp/App.cpp b/sysid/src/main/native/cpp/App.cpp
index 8b35dca2d3d..e9b058f57e3 100644
--- a/sysid/src/main/native/cpp/App.cpp
+++ b/sysid/src/main/native/cpp/App.cpp
@@ -8,6 +8,8 @@
 
 #include <filesystem>
 #include <memory>
+#include <string>
+#include <utility>
 #include <string_view>
 
 #include <glass/Context.h>
diff --git a/sysid/src/main/native/cpp/Util.cpp b/sysid/src/main/native/cpp/Util.cpp
index c4dc7803046..fcd27c49486 100644
--- a/sysid/src/main/native/cpp/Util.cpp
+++ b/sysid/src/main/native/cpp/Util.cpp
@@ -83,6 +83,7 @@ void sysid::SaveFile(std::string_view contents,
 
   // Open a fd_ostream to write to file.
   std::error_code ec;
+  // NOLINTNEXTLINE(build/include_what_you_use)
   wpi::raw_fd_ostream ostream{path.string(), ec};
 
   // Check error code.
diff --git a/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp b/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
index 4415318d52f..11137a31861 100644
--- a/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
+++ b/sysid/src/main/native/cpp/analysis/AnalysisManager.cpp
@@ -5,7 +5,9 @@
 #include "sysid/analysis/AnalysisManager.h"
 
 #include <cmath>
-#include <functional>
+#include <limits>
+#include <utility>
+#include <vector>
 
 #include <fmt/format.h>
 #include <units/angle.h>
diff --git a/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp b/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp
index 110ff9463f1..3f517d9da2d 100644
--- a/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp
+++ b/sysid/src/main/native/cpp/analysis/FeedforwardAnalysis.cpp
@@ -7,6 +7,8 @@
 #include <array>
 #include <bitset>
 #include <cmath>
+#include <string>
+#include <vector>
 
 #include <Eigen/Eigenvalues>
 #include <fmt/format.h>
@@ -14,8 +16,6 @@
 #include <units/math.h>
 #include <units/time.h>
 
-#include "sysid/analysis/AnalysisManager.h"
-#include "sysid/analysis/FilteringUtils.h"
 #include "sysid/analysis/OLS.h"
 
 namespace sysid {
diff --git a/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp b/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp
index 8432e7c8ff7..43eb8e244b0 100644
--- a/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp
+++ b/sysid/src/main/native/cpp/analysis/FilteringUtils.cpp
@@ -4,10 +4,13 @@
 
 #include "sysid/analysis/FilteringUtils.h"
 
+#include <algorithm>
+#include <functional>
 #include <limits>
 #include <numbers>
 #include <numeric>
-#include <stdexcept>
+#include <string>
+#include <tuple>
 #include <vector>
 
 #include <fmt/format.h>
diff --git a/sysid/src/main/native/cpp/view/Analyzer.cpp b/sysid/src/main/native/cpp/view/Analyzer.cpp
index 7efca4e16f5..748a1e358c8 100644
--- a/sysid/src/main/native/cpp/view/Analyzer.cpp
+++ b/sysid/src/main/native/cpp/view/Analyzer.cpp
@@ -6,7 +6,9 @@
 
 #include <algorithm>
 #include <exception>
+#include <memory>
 #include <numbers>
+#include <string>
 #include <thread>
 
 #include <fmt/format.h>
diff --git a/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp b/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp
index 6963f2c1b8f..bc640d9c7eb 100644
--- a/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp
+++ b/sysid/src/main/native/cpp/view/AnalyzerPlot.cpp
@@ -6,7 +6,10 @@
 
 #include <algorithm>
 #include <cmath>
+#include <functional>
 #include <mutex>
+#include <utility>
+#include <vector>
 
 #include <fmt/format.h>
 #include <units/math.h>
diff --git a/sysid/src/main/native/cpp/view/DataSelector.cpp b/sysid/src/main/native/cpp/view/DataSelector.cpp
index 75b12e5e3ab..ecb1c012171 100644
--- a/sysid/src/main/native/cpp/view/DataSelector.cpp
+++ b/sysid/src/main/native/cpp/view/DataSelector.cpp
@@ -4,6 +4,11 @@
 
 #include "sysid/view/DataSelector.h"
 
+#include <algorithm>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <fmt/format.h>
 #include <glass/support/DataLogReaderThread.h>
 #include <imgui.h>
diff --git a/sysid/src/main/native/cpp/view/LogLoader.cpp b/sysid/src/main/native/cpp/view/LogLoader.cpp
index 6acf00294bd..6884519a6d2 100644
--- a/sysid/src/main/native/cpp/view/LogLoader.cpp
+++ b/sysid/src/main/native/cpp/view/LogLoader.cpp
@@ -7,7 +7,10 @@
 #include <algorithm>
 #include <memory>
 #include <span>
+#include <string>
 #include <string_view>
+#include <utility>
+#include <vector>
 
 #include <glass/support/DataLogReaderThread.h>
 #include <imgui.h>
diff --git a/upstream_utils/sleipnir.py b/upstream_utils/sleipnir.py
index fba7a712924..28d2fb38e5a 100755
--- a/upstream_utils/sleipnir.py
+++ b/upstream_utils/sleipnir.py
@@ -51,8 +51,8 @@ def copy_upstream_src(wpilib_root):
 def main():
     name = "sleipnir"
     url = "https://github.com/SleipnirGroup/Sleipnir"
-    # main on 2024-08-03
-    tag = "4f182964d9bbb1c703260bddbfaa0c4435097675"
+    # main on 2024-09-18
+    tag = "8bbce85252bc351c5aacb0de9f50fa31b8b9e1ae"
 
     sleipnir = Lib(name, url, tag, copy_upstream_src)
     sleipnir.main()
diff --git a/upstream_utils/sleipnir_patches/0002-Use-fmtlib.patch b/upstream_utils/sleipnir_patches/0002-Use-fmtlib.patch
index 6a5c679c12e..e5779dc71f0 100644
--- a/upstream_utils/sleipnir_patches/0002-Use-fmtlib.patch
+++ b/upstream_utils/sleipnir_patches/0002-Use-fmtlib.patch
@@ -19,13 +19,13 @@ index 8fb61fdf9cc5ceff633d3126f0579eef25a1326f..6a7f8ed28f9cb037c9746a7e0ef5e110
 +  ^fmt/
  }
 diff --git a/include/sleipnir/util/Print.hpp b/include/sleipnir/util/Print.hpp
-index 339320bce6d017ca85025060ba445b2f025bb225..a9220cdaadcb9b88862542935bc72781d8389239 100644
+index a746cb77b70f095bb15f4c493295cb925bc74cd3..c01fd4ac679df854b885293d681ea1e0984626fa 100644
 --- a/include/sleipnir/util/Print.hpp
 +++ b/include/sleipnir/util/Print.hpp
-@@ -2,52 +2,57 @@
- 
+@@ -3,52 +3,57 @@
  #pragma once
  
+ #include <cstdio>
 -#include <print>
  #include <system_error>
  #include <utility>
diff --git a/upstream_utils/sleipnir_patches/0004-Use-wpi-SmallVector.patch b/upstream_utils/sleipnir_patches/0004-Use-wpi-SmallVector.patch
index 7dcbdf5eb60..550983549db 100644
--- a/upstream_utils/sleipnir_patches/0004-Use-wpi-SmallVector.patch
+++ b/upstream_utils/sleipnir_patches/0004-Use-wpi-SmallVector.patch
@@ -408,7 +408,7 @@ index f3b2f0cf9e60b3a86b9654ff2b381f9c48734ff6..ad739cea6dce6f6cb586f538d1d30b92
 +  ^wpi/
  }
 diff --git a/src/optimization/solver/InteriorPoint.cpp b/src/optimization/solver/InteriorPoint.cpp
-index 817e3d1dcb808c36192ea5b483eee1a08dbb5e2f..1470eb235bfdac363557c207ac0eaedb6c73d295 100644
+index dcd8b56dc08516b80f89550c43cb7002745b93d8..892d2dd20f7fe92c2c91518a4ecb487425643585 100644
 --- a/src/optimization/solver/InteriorPoint.cpp
 +++ b/src/optimization/solver/InteriorPoint.cpp
 @@ -9,6 +9,7 @@
diff --git a/wpigui/src/main/native/cpp/wpigui.cpp b/wpigui/src/main/native/cpp/wpigui.cpp
index e2e05ce0674..b50540ff6b5 100644
--- a/wpigui/src/main/native/cpp/wpigui.cpp
+++ b/wpigui/src/main/native/cpp/wpigui.cpp
@@ -10,7 +10,9 @@
 #include <chrono>
 #include <cstdio>
 #include <cstring>
+#include <string>
 #include <thread>
+#include <utility>
 
 #include <GLFW/glfw3.h>
 #include <IconsFontAwesome6.h>
diff --git a/wpigui/src/main/native/cpp/wpigui_openurl.cpp b/wpigui/src/main/native/cpp/wpigui_openurl.cpp
index f6095670fc5..0a071b17910 100644
--- a/wpigui/src/main/native/cpp/wpigui_openurl.cpp
+++ b/wpigui/src/main/native/cpp/wpigui_openurl.cpp
@@ -14,6 +14,8 @@
 #include <unistd.h>
 #endif
 
+#include <string>
+
 void wpi::gui::OpenURL(const std::string& url) {
 #ifdef _WIN32
   ShellExecuteA(nullptr, "open", url.c_str(), nullptr, nullptr, SW_SHOWNORMAL);
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp
index ff5e8f6aa51..365cf80a4ea 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/Command.cpp
@@ -4,22 +4,15 @@
 
 #include "frc2/command/Command.h"
 
+#include <string>
+#include <utility>
+
 #include <wpi/StackTrace.h>
 #include <wpi/sendable/SendableBuilder.h>
 #include <wpi/sendable/SendableRegistry.h>
 
-#include "frc2/command/CommandHelper.h"
+#include "frc2/command/CommandPtr.h"
 #include "frc2/command/CommandScheduler.h"
-#include "frc2/command/ConditionalCommand.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/ParallelCommandGroup.h"
-#include "frc2/command/ParallelDeadlineGroup.h"
-#include "frc2/command/ParallelRaceGroup.h"
-#include "frc2/command/RepeatCommand.h"
-#include "frc2/command/SequentialCommandGroup.h"
-#include "frc2/command/WaitCommand.h"
-#include "frc2/command/WaitUntilCommand.h"
-#include "frc2/command/WrapperCommand.h"
 
 using namespace frc2;
 
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandPtr.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandPtr.cpp
index ee7182a7847..298cc2e50ca 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandPtr.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandPtr.cpp
@@ -4,6 +4,10 @@
 
 #include "frc2/command/CommandPtr.h"
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 #include <frc/Errors.h>
 
 #include "frc2/command/CommandScheduler.h"
@@ -12,7 +16,6 @@
 #include "frc2/command/ParallelCommandGroup.h"
 #include "frc2/command/ParallelDeadlineGroup.h"
 #include "frc2/command/ParallelRaceGroup.h"
-#include "frc2/command/PrintCommand.h"
 #include "frc2/command/ProxyCommand.h"
 #include "frc2/command/RepeatCommand.h"
 #include "frc2/command/SequentialCommandGroup.h"
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp
index f845cbc0533..aa57bf00d08 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/CommandScheduler.cpp
@@ -5,6 +5,10 @@
 #include "frc2/command/CommandScheduler.h"
 
 #include <cstdio>
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <frc/RobotBase.h>
 #include <frc/RobotState.h>
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/Commands.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/Commands.cpp
index 15458083d69..bc4bd39da73 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/Commands.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/Commands.cpp
@@ -4,6 +4,9 @@
 
 #include "frc2/command/Commands.h"
 
+#include <utility>
+#include <vector>
+
 #include <wpi/deprecated.h>
 
 #include "frc2/command/ConditionalCommand.h"
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ConditionalCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ConditionalCommand.cpp
index 6ce33b75486..753eb85a70a 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/ConditionalCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/ConditionalCommand.cpp
@@ -4,6 +4,10 @@
 
 #include "frc2/command/ConditionalCommand.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <wpi/sendable/SendableBuilder.h>
 
 using namespace frc2;
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/DeferredCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/DeferredCommand.cpp
index 2a7f16280a9..0bb0e14176e 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/DeferredCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/DeferredCommand.cpp
@@ -4,6 +4,8 @@
 
 #include "frc2/command/DeferredCommand.h"
 
+#include <utility>
+
 #include <wpi/sendable/SendableBuilder.h>
 
 #include "frc2/command/Commands.h"
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/FunctionalCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/FunctionalCommand.cpp
index e4ff6ea4174..e28c7c4709d 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/FunctionalCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/FunctionalCommand.cpp
@@ -4,6 +4,8 @@
 
 #include "frc2/command/FunctionalCommand.h"
 
+#include <utility>
+
 using namespace frc2;
 
 FunctionalCommand::FunctionalCommand(std::function<void()> onInit,
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/InstantCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/InstantCommand.cpp
index b78d30e0e88..c8a189e99fb 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/InstantCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/InstantCommand.cpp
@@ -4,6 +4,8 @@
 
 #include "frc2/command/InstantCommand.h"
 
+#include <utility>
+
 using namespace frc2;
 
 InstantCommand::InstantCommand(std::function<void()> toRun,
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/MecanumControllerCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/MecanumControllerCommand.cpp
index c22ac99ce8a..742a37d9597 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/MecanumControllerCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/MecanumControllerCommand.cpp
@@ -4,6 +4,7 @@
 
 #include "frc2/command/MecanumControllerCommand.h"
 
+#include <memory>
 #include <utility>
 
 #include <units/velocity.h>
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/NotifierCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/NotifierCommand.cpp
index 5dc5add96f5..a49ead9eef4 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/NotifierCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/NotifierCommand.cpp
@@ -4,6 +4,8 @@
 
 #include "frc2/command/NotifierCommand.h"
 
+#include <utility>
+
 using namespace frc2;
 
 NotifierCommand::NotifierCommand(std::function<void()> toRun,
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp
index 4a234b14756..b433eb445a1 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelCommandGroup.cpp
@@ -4,6 +4,9 @@
 
 #include "frc2/command/ParallelCommandGroup.h"
 
+#include <utility>
+#include <vector>
+
 using namespace frc2;
 
 ParallelCommandGroup::ParallelCommandGroup(
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp
index 1c9b7005345..90669fe20be 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelDeadlineGroup.cpp
@@ -4,6 +4,10 @@
 
 #include "frc2/command/ParallelDeadlineGroup.h"
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 #include <wpi/sendable/SendableBuilder.h>
 
 using namespace frc2;
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp
index 334286f8e37..5896dd88aaa 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/ParallelRaceGroup.cpp
@@ -4,6 +4,9 @@
 
 #include "frc2/command/ParallelRaceGroup.h"
 
+#include <utility>
+#include <vector>
+
 using namespace frc2;
 
 ParallelRaceGroup::ParallelRaceGroup(
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/PrintCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/PrintCommand.cpp
index 8032dada7ea..d08f53ef88e 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/PrintCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/PrintCommand.cpp
@@ -4,6 +4,8 @@
 
 #include "frc2/command/PrintCommand.h"
 
+#include <string>
+
 #include <wpi/print.h>
 
 using namespace frc2;
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/ProxyCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/ProxyCommand.cpp
index fa72906b622..92999ea691e 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/ProxyCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/ProxyCommand.cpp
@@ -4,6 +4,9 @@
 
 #include "frc2/command/ProxyCommand.h"
 
+#include <string>
+#include <utility>
+
 #include <fmt/format.h>
 #include <wpi/deprecated.h>
 #include <wpi/sendable/SendableBuilder.h>
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/RepeatCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/RepeatCommand.cpp
index 2a08f1b0438..15097af843e 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/RepeatCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/RepeatCommand.cpp
@@ -4,6 +4,9 @@
 
 #include "frc2/command/RepeatCommand.h"
 
+#include <string>
+#include <utility>
+
 #include <wpi/sendable/SendableBuilder.h>
 
 using namespace frc2;
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/RunCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/RunCommand.cpp
index c3378eaf1f0..633715393d8 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/RunCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/RunCommand.cpp
@@ -4,6 +4,8 @@
 
 #include "frc2/command/RunCommand.h"
 
+#include <utility>
+
 using namespace frc2;
 
 RunCommand::RunCommand(std::function<void()> toRun, Requirements requirements)
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp
index 173b9d93c8e..fa873654589 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/SequentialCommandGroup.cpp
@@ -4,6 +4,9 @@
 
 #include "frc2/command/SequentialCommandGroup.h"
 
+#include <utility>
+#include <vector>
+
 #include <wpi/sendable/SendableBuilder.h>
 
 using namespace frc2;
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/StartEndCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/StartEndCommand.cpp
index 2d257a3bc7e..90d1961df6d 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/StartEndCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/StartEndCommand.cpp
@@ -4,6 +4,8 @@
 
 #include "frc2/command/StartEndCommand.h"
 
+#include <utility>
+
 using namespace frc2;
 
 StartEndCommand::StartEndCommand(std::function<void()> onInit,
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/Subsystem.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/Subsystem.cpp
index 5800c440692..876269a1b47 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/Subsystem.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/Subsystem.cpp
@@ -4,6 +4,9 @@
 
 #include "frc2/command/Subsystem.h"
 
+#include <string>
+#include <utility>
+
 #include <wpi/Demangle.h>
 
 #include "frc2/command/CommandPtr.h"
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/SubsystemBase.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/SubsystemBase.cpp
index e5a40388e4a..e0638263642 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/SubsystemBase.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/SubsystemBase.cpp
@@ -4,6 +4,8 @@
 
 #include "frc2/command/SubsystemBase.h"
 
+#include <string>
+
 #include <wpi/sendable/SendableBuilder.h>
 #include <wpi/sendable/SendableRegistry.h>
 
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp
index 9ccd94eda8a..9ea6fbfae9d 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/WaitUntilCommand.cpp
@@ -4,6 +4,8 @@
 
 #include "frc2/command/WaitUntilCommand.h"
 
+#include <utility>
+
 #include <frc/Timer.h>
 
 using namespace frc2;
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp
index 2e1b280d693..775e84a30c5 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/WrapperCommand.cpp
@@ -4,6 +4,8 @@
 
 #include "frc2/command/WrapperCommand.h"
 
+#include <utility>
+
 #include "frc2/command/Command.h"
 
 using namespace frc2;
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/NetworkButton.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/button/NetworkButton.cpp
index a0923a3ba50..a5234c92a65 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/NetworkButton.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/button/NetworkButton.cpp
@@ -4,6 +4,9 @@
 
 #include "frc2/command/button/NetworkButton.h"
 
+#include <memory>
+#include <utility>
+
 using namespace frc2;
 
 NetworkButton::NetworkButton(nt::BooleanTopic topic)
diff --git a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp b/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp
index 78fd0b3f769..a3b02d18f3a 100644
--- a/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp
+++ b/wpilibNewCommands/src/main/native/cpp/frc2/command/button/Trigger.cpp
@@ -4,9 +4,11 @@
 
 #include "frc2/command/button/Trigger.h"
 
+#include <utility>
+
 #include <frc/filter/Debouncer.h>
 
-#include "frc2/command/InstantCommand.h"
+#include "frc2/command/CommandPtr.h"
 
 using namespace frc;
 using namespace frc2;
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp
index a5059b16e11..3a31308a3f0 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandDecoratorTest.cpp
@@ -2,6 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+#include <utility>
+
 #include <frc/simulation/SimHooks.h>
 
 #include "CommandTestBase.h"
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandPtrTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandPtrTest.cpp
index 75ec0409649..1dae951bea7 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandPtrTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandPtrTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <utility>
+
 #include <frc/Errors.h>
 
 #include "CommandTestBase.h"
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp
index b46bb8bbde9..e8d3c16ff4f 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/CommandRequirementsTest.cpp
@@ -2,17 +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 <utility>
+
 #include <frc/Errors.h>
 
 #include "CommandTestBase.h"
 #include "frc2/command/CommandScheduler.h"
-#include "frc2/command/ConditionalCommand.h"
 #include "frc2/command/FunctionalCommand.h"
-#include "frc2/command/InstantCommand.h"
-#include "frc2/command/ParallelCommandGroup.h"
-#include "frc2/command/ParallelDeadlineGroup.h"
-#include "frc2/command/ParallelRaceGroup.h"
-#include "frc2/command/SequentialCommandGroup.h"
 
 using namespace frc2;
 class CommandRequirementsTest : public CommandTestBase {};
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp
index d7bbd26b20c..7896a1aa326 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/ConditionalCommandTest.cpp
@@ -2,6 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <memory>
+#include <utility>
+
 #include "CommandTestBase.h"
 #include "frc2/command/Commands.h"
 #include "frc2/command/ConditionalCommand.h"
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp
index a9e3fc681ca..a024a2f1955 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/DefaultCommandTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <utility>
+
 #include "CommandTestBase.h"
 #include "frc2/command/RunCommand.h"
 
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp
index ff5384c8f98..21457d024cd 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelCommandGroupTest.cpp
@@ -2,6 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <memory>
+#include <utility>
+
 #include "CommandTestBase.h"
 #include "CompositionTestBase.h"
 #include "frc2/command/InstantCommand.h"
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp
index f35bd000c28..d36b97ad6c6 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelDeadlineGroupTest.cpp
@@ -2,6 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 #include "CommandTestBase.h"
 #include "CompositionTestBase.h"
 #include "frc2/command/InstantCommand.h"
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp
index be18fc30490..032c3c1dd33 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/ParallelRaceGroupTest.cpp
@@ -2,6 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <memory>
+#include <utility>
+
 #include "CommandTestBase.h"
 #include "CompositionTestBase.h"
 #include "frc2/command/InstantCommand.h"
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp
index 37353032a12..52436b97ac6 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/SchedulingRecursionTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <utility>
+
 #include <gtest/gtest.h>
 
 #include "CommandTestBase.h"
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/SelectCommandTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/SelectCommandTest.cpp
index dfea0d336ac..eb05034da28 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/SelectCommandTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/SelectCommandTest.cpp
@@ -2,9 +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 <memory>
+#include <utility>
+#include <vector>
+
 #include "CommandTestBase.h"
 #include "CompositionTestBase.h"
-#include "frc2/command/ConditionalCommand.h"
 #include "frc2/command/InstantCommand.h"
 #include "frc2/command/SelectCommand.h"
 
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp
index e1283136e8f..b8920c733f9 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/SequentialCommandGroupTest.cpp
@@ -2,6 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <memory>
+#include <utility>
+
 #include "CommandTestBase.h"
 #include "CompositionTestBase.h"
 #include "frc2/command/InstantCommand.h"
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/button/TriggerTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/button/TriggerTest.cpp
index a97b4f566c3..9b0899edb78 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/button/TriggerTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/button/TriggerTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <utility>
+
 #include <frc/simulation/SimHooks.h>
 #include <gtest/gtest.h>
 
diff --git a/wpilibNewCommands/src/test/native/cpp/frc2/command/sysid/SysIdRoutineTest.cpp b/wpilibNewCommands/src/test/native/cpp/frc2/command/sysid/SysIdRoutineTest.cpp
index 1cfe39c6ee8..ae0b9a2241e 100644
--- a/wpilibNewCommands/src/test/native/cpp/frc2/command/sysid/SysIdRoutineTest.cpp
+++ b/wpilibNewCommands/src/test/native/cpp/frc2/command/sysid/SysIdRoutineTest.cpp
@@ -5,7 +5,8 @@
 #include <frc2/command/Subsystem.h>
 #include <frc2/command/sysid/SysIdRoutine.h>
 
-#include <numbers>
+#include <utility>
+#include <vector>
 
 #include <frc/Timer.h>
 #include <frc/simulation/SimHooks.h>
diff --git a/wpilibc/src/main/native/cpp/ADIS16448_IMU.cpp b/wpilibc/src/main/native/cpp/ADIS16448_IMU.cpp
index 74a3e420662..ea768e3120a 100644
--- a/wpilibc/src/main/native/cpp/ADIS16448_IMU.cpp
+++ b/wpilibc/src/main/native/cpp/ADIS16448_IMU.cpp
@@ -13,23 +13,21 @@
 
 #include "frc/ADIS16448_IMU.h"
 
-#include <frc/DigitalInput.h>
-#include <frc/DigitalOutput.h>
-#include <frc/DigitalSource.h>
-#include <frc/DriverStation.h>
-#include <frc/SPI.h>
-#include <frc/Timer.h>
-
 #include <algorithm>
 #include <cmath>
 #include <numbers>
+#include <utility>
 
 #include <hal/HAL.h>
 #include <wpi/sendable/SendableBuilder.h>
 #include <wpi/sendable/SendableRegistry.h>
 
+#include "frc/DigitalInput.h"
+#include "frc/DigitalOutput.h"
 #include "frc/Errors.h"
 #include "frc/MathUtil.h"
+#include "frc/SPI.h"
+#include "frc/Timer.h"
 
 /* Helpful conversion functions */
 static inline uint16_t BuffToUShort(const uint32_t* buf) {
diff --git a/wpilibc/src/main/native/cpp/ADIS16470_IMU.cpp b/wpilibc/src/main/native/cpp/ADIS16470_IMU.cpp
index b29c498ad17..5f99e300c08 100644
--- a/wpilibc/src/main/native/cpp/ADIS16470_IMU.cpp
+++ b/wpilibc/src/main/native/cpp/ADIS16470_IMU.cpp
@@ -13,11 +13,6 @@
 
 #include "frc/ADIS16470_IMU.h"
 
-#include <frc/DigitalInput.h>
-#include <frc/DigitalSource.h>
-#include <frc/DriverStation.h>
-#include <frc/Timer.h>
-
 #include <cmath>
 #include <numbers>
 #include <utility>
@@ -26,8 +21,10 @@
 #include <wpi/sendable/SendableBuilder.h>
 #include <wpi/sendable/SendableRegistry.h>
 
+#include "frc/DigitalInput.h"
 #include "frc/Errors.h"
 #include "frc/MathUtil.h"
+#include "frc/Timer.h"
 
 /* Helpful conversion functions */
 static inline int32_t ToInt(const uint32_t* buf) {
diff --git a/wpilibc/src/main/native/cpp/Alert.cpp b/wpilibc/src/main/native/cpp/Alert.cpp
index 86bfd68cb92..c9523fab555 100644
--- a/wpilibc/src/main/native/cpp/Alert.cpp
+++ b/wpilibc/src/main/native/cpp/Alert.cpp
@@ -4,11 +4,15 @@
 
 #include "frc/Alert.h"
 
-#include <frc/Timer.h>
-#include <frc/smartdashboard/SmartDashboard.h>
+#include <algorithm>
+#include <string>
+#include <vector>
 
 #include <networktables/NTSendableBuilder.h>
 
+#include "frc/Timer.h"
+#include "frc/smartdashboard/SmartDashboard.h"
+
 using namespace frc;
 
 Alert::Alert(std::string_view text, AlertType type)
diff --git a/wpilibc/src/main/native/cpp/AnalogEncoder.cpp b/wpilibc/src/main/native/cpp/AnalogEncoder.cpp
index 152b34f98c5..13a788788cb 100644
--- a/wpilibc/src/main/native/cpp/AnalogEncoder.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogEncoder.cpp
@@ -4,11 +4,12 @@
 
 #include "frc/AnalogEncoder.h"
 
+#include <utility>
+
 #include <wpi/NullDeleter.h>
 #include <wpi/sendable/SendableBuilder.h>
 
 #include "frc/AnalogInput.h"
-#include "frc/Errors.h"
 #include "frc/MathUtil.h"
 #include "frc/RobotController.h"
 
diff --git a/wpilibc/src/main/native/cpp/AnalogGyro.cpp b/wpilibc/src/main/native/cpp/AnalogGyro.cpp
index 36d70b9daad..6362b45b41a 100644
--- a/wpilibc/src/main/native/cpp/AnalogGyro.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogGyro.cpp
@@ -5,7 +5,8 @@
 #include "frc/AnalogGyro.h"
 
 #include <climits>
-#include <utility>
+#include <memory>
+#include <string>
 
 #include <hal/AnalogGyro.h>
 #include <hal/Errors.h>
@@ -17,7 +18,6 @@
 
 #include "frc/AnalogInput.h"
 #include "frc/Errors.h"
-#include "frc/Timer.h"
 
 using namespace frc;
 
diff --git a/wpilibc/src/main/native/cpp/AnalogInput.cpp b/wpilibc/src/main/native/cpp/AnalogInput.cpp
index 9960d3704af..15e28ceeffc 100644
--- a/wpilibc/src/main/native/cpp/AnalogInput.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogInput.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/AnalogInput.h"
 
+#include <string>
+
 #include <hal/AnalogAccumulator.h>
 #include <hal/AnalogInput.h>
 #include <hal/FRCUsageReporting.h>
diff --git a/wpilibc/src/main/native/cpp/AnalogOutput.cpp b/wpilibc/src/main/native/cpp/AnalogOutput.cpp
index d5857abded2..ca7dec1f397 100644
--- a/wpilibc/src/main/native/cpp/AnalogOutput.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogOutput.cpp
@@ -4,8 +4,7 @@
 
 #include "frc/AnalogOutput.h"
 
-#include <limits>
-#include <utility>
+#include <string>
 
 #include <hal/AnalogOutput.h>
 #include <hal/FRCUsageReporting.h>
diff --git a/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp b/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
index d8b8b1e0a88..31432e9681c 100644
--- a/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogPotentiometer.cpp
@@ -4,6 +4,7 @@
 
 #include "frc/AnalogPotentiometer.h"
 
+#include <memory>
 #include <utility>
 
 #include <wpi/NullDeleter.h>
diff --git a/wpilibc/src/main/native/cpp/AnalogTrigger.cpp b/wpilibc/src/main/native/cpp/AnalogTrigger.cpp
index 81bd3c5f8e9..6759b61dde6 100644
--- a/wpilibc/src/main/native/cpp/AnalogTrigger.cpp
+++ b/wpilibc/src/main/native/cpp/AnalogTrigger.cpp
@@ -4,6 +4,7 @@
 
 #include "frc/AnalogTrigger.h"
 
+#include <memory>
 #include <utility>
 
 #include <hal/AnalogTrigger.h>
diff --git a/wpilibc/src/main/native/cpp/AsynchronousInterrupt.cpp b/wpilibc/src/main/native/cpp/AsynchronousInterrupt.cpp
index d45d5e4a5cf..20fc761c278 100644
--- a/wpilibc/src/main/native/cpp/AsynchronousInterrupt.cpp
+++ b/wpilibc/src/main/native/cpp/AsynchronousInterrupt.cpp
@@ -6,6 +6,9 @@
 
 #include <frc/DigitalSource.h>
 
+#include <memory>
+#include <utility>
+
 using namespace frc;
 
 AsynchronousInterrupt::AsynchronousInterrupt(
diff --git a/wpilibc/src/main/native/cpp/Counter.cpp b/wpilibc/src/main/native/cpp/Counter.cpp
index f6506b98fb3..1c35923969a 100644
--- a/wpilibc/src/main/native/cpp/Counter.cpp
+++ b/wpilibc/src/main/native/cpp/Counter.cpp
@@ -4,7 +4,7 @@
 
 #include "frc/Counter.h"
 
-#include <utility>
+#include <memory>
 
 #include <hal/Counter.h>
 #include <hal/FRCUsageReporting.h>
diff --git a/wpilibc/src/main/native/cpp/DMA.cpp b/wpilibc/src/main/native/cpp/DMA.cpp
index 806e18b4071..5661af28820 100644
--- a/wpilibc/src/main/native/cpp/DMA.cpp
+++ b/wpilibc/src/main/native/cpp/DMA.cpp
@@ -15,11 +15,6 @@
 #include <hal/DMA.h>
 #include <hal/HALBase.h>
 
-#include "frc/AnalogInput.h"
-#include "frc/Counter.h"
-#include "frc/DigitalSource.h"
-#include "frc/DutyCycle.h"
-#include "frc/Encoder.h"
 #include "frc/Errors.h"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/DataLogManager.cpp b/wpilibc/src/main/native/cpp/DataLogManager.cpp
index 1c7c84929d0..9ab1211c0ec 100644
--- a/wpilibc/src/main/native/cpp/DataLogManager.cpp
+++ b/wpilibc/src/main/native/cpp/DataLogManager.cpp
@@ -9,6 +9,8 @@
 #include <algorithm>
 #include <ctime>
 #include <random>
+#include <string>
+#include <vector>
 
 #include <fmt/chrono.h>
 #include <networktables/NetworkTableInstance.h>
diff --git a/wpilibc/src/main/native/cpp/DigitalInput.cpp b/wpilibc/src/main/native/cpp/DigitalInput.cpp
index b3c110875ea..f6c2d8b03c6 100644
--- a/wpilibc/src/main/native/cpp/DigitalInput.cpp
+++ b/wpilibc/src/main/native/cpp/DigitalInput.cpp
@@ -4,7 +4,7 @@
 
 #include "frc/DigitalInput.h"
 
-#include <limits>
+#include <string>
 
 #include <hal/DIO.h>
 #include <hal/FRCUsageReporting.h>
diff --git a/wpilibc/src/main/native/cpp/DigitalOutput.cpp b/wpilibc/src/main/native/cpp/DigitalOutput.cpp
index 01d3ef74fd2..6cac8e8f064 100644
--- a/wpilibc/src/main/native/cpp/DigitalOutput.cpp
+++ b/wpilibc/src/main/native/cpp/DigitalOutput.cpp
@@ -4,7 +4,7 @@
 
 #include "frc/DigitalOutput.h"
 
-#include <limits>
+#include <string>
 
 #include <hal/DIO.h>
 #include <hal/FRCUsageReporting.h>
diff --git a/wpilibc/src/main/native/cpp/DriverStation.cpp b/wpilibc/src/main/native/cpp/DriverStation.cpp
index 16032a17d38..862b2464eb4 100644
--- a/wpilibc/src/main/native/cpp/DriverStation.cpp
+++ b/wpilibc/src/main/native/cpp/DriverStation.cpp
@@ -8,12 +8,10 @@
 
 #include <array>
 #include <atomic>
-#include <chrono>
+#include <memory>
 #include <span>
 #include <string>
 #include <string_view>
-#include <thread>
-#include <type_traits>
 
 #include <fmt/format.h>
 #include <hal/DriverStation.h>
@@ -33,7 +31,6 @@
 #include <wpi/timestamp.h>
 
 #include "frc/Errors.h"
-#include "frc/MotorSafety.h"
 #include "frc/Timer.h"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/DutyCycle.cpp b/wpilibc/src/main/native/cpp/DutyCycle.cpp
index 943baa8b1bf..6ac7a37c8e2 100644
--- a/wpilibc/src/main/native/cpp/DutyCycle.cpp
+++ b/wpilibc/src/main/native/cpp/DutyCycle.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/DutyCycle.h"
 
+#include <utility>
+
 #include <hal/DutyCycle.h>
 #include <hal/FRCUsageReporting.h>
 #include <wpi/NullDeleter.h>
diff --git a/wpilibc/src/main/native/cpp/DutyCycleEncoder.cpp b/wpilibc/src/main/native/cpp/DutyCycleEncoder.cpp
index f127cf2ed1b..41a1b4b987d 100644
--- a/wpilibc/src/main/native/cpp/DutyCycleEncoder.cpp
+++ b/wpilibc/src/main/native/cpp/DutyCycleEncoder.cpp
@@ -4,13 +4,15 @@
 
 #include "frc/DutyCycleEncoder.h"
 
+#include <memory>
+#include <utility>
+
 #include <wpi/NullDeleter.h>
 #include <wpi/sendable/SendableBuilder.h>
 
 #include "frc/DigitalInput.h"
 #include "frc/DigitalSource.h"
 #include "frc/DutyCycle.h"
-#include "frc/Errors.h"
 #include "frc/MathUtil.h"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/Encoder.cpp b/wpilibc/src/main/native/cpp/Encoder.cpp
index 795183f3ab8..b7eda548fea 100644
--- a/wpilibc/src/main/native/cpp/Encoder.cpp
+++ b/wpilibc/src/main/native/cpp/Encoder.cpp
@@ -4,6 +4,7 @@
 
 #include "frc/Encoder.h"
 
+#include <memory>
 #include <utility>
 
 #include <hal/Encoder.h>
diff --git a/wpilibc/src/main/native/cpp/Errors.cpp b/wpilibc/src/main/native/cpp/Errors.cpp
index 0ff4dc1699a..f29a420e4a4 100644
--- a/wpilibc/src/main/native/cpp/Errors.cpp
+++ b/wpilibc/src/main/native/cpp/Errors.cpp
@@ -4,7 +4,8 @@
 
 #include "frc/Errors.h"
 
-#include <exception>
+#include <string>
+#include <utility>
 
 #include <hal/DriverStation.h>
 #include <hal/HALBase.h>
diff --git a/wpilibc/src/main/native/cpp/Filesystem.cpp b/wpilibc/src/main/native/cpp/Filesystem.cpp
index 7947d750733..7add0e8f8e6 100644
--- a/wpilibc/src/main/native/cpp/Filesystem.cpp
+++ b/wpilibc/src/main/native/cpp/Filesystem.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/Filesystem.h"
 
+#include <string>
+
 #include <wpi/fs.h>
 
 #include "frc/RobotBase.h"
diff --git a/wpilibc/src/main/native/cpp/GenericHID.cpp b/wpilibc/src/main/native/cpp/GenericHID.cpp
index f4d26b64def..6e9e0e0b0db 100644
--- a/wpilibc/src/main/native/cpp/GenericHID.cpp
+++ b/wpilibc/src/main/native/cpp/GenericHID.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/GenericHID.h"
 
+#include <string>
+
 #include <hal/DriverStation.h>
 
 #include "frc/DriverStation.h"
diff --git a/wpilibc/src/main/native/cpp/LEDPattern.cpp b/wpilibc/src/main/native/cpp/LEDPattern.cpp
index c5ce8a7754f..537b459603c 100644
--- a/wpilibc/src/main/native/cpp/LEDPattern.cpp
+++ b/wpilibc/src/main/native/cpp/LEDPattern.cpp
@@ -8,6 +8,7 @@
 #include <cmath>
 #include <numbers>
 #include <unordered_map>
+#include <utility>
 #include <vector>
 
 #include <wpi/MathExtras.h>
diff --git a/wpilibc/src/main/native/cpp/PneumaticHub.cpp b/wpilibc/src/main/native/cpp/PneumaticHub.cpp
index 06e37a4a3aa..7169438d9e2 100644
--- a/wpilibc/src/main/native/cpp/PneumaticHub.cpp
+++ b/wpilibc/src/main/native/cpp/PneumaticHub.cpp
@@ -5,6 +5,9 @@
 #include "frc/PneumaticHub.h"
 
 #include <array>
+#include <cstdio>
+#include <memory>
+#include <string>
 
 #include <fmt/format.h>
 #include <hal/REVPH.h>
diff --git a/wpilibc/src/main/native/cpp/PneumaticsBase.cpp b/wpilibc/src/main/native/cpp/PneumaticsBase.cpp
index bd9e033bda2..78c5f0dd72a 100644
--- a/wpilibc/src/main/native/cpp/PneumaticsBase.cpp
+++ b/wpilibc/src/main/native/cpp/PneumaticsBase.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/PneumaticsBase.h"
 
+#include <memory>
+
 #include <hal/REVPH.h>
 
 #include "frc/Errors.h"
diff --git a/wpilibc/src/main/native/cpp/PneumaticsControlModule.cpp b/wpilibc/src/main/native/cpp/PneumaticsControlModule.cpp
index e34e85097d2..e743e5e6f43 100644
--- a/wpilibc/src/main/native/cpp/PneumaticsControlModule.cpp
+++ b/wpilibc/src/main/native/cpp/PneumaticsControlModule.cpp
@@ -4,6 +4,9 @@
 
 #include "frc/PneumaticsControlModule.h"
 
+#include <memory>
+#include <string>
+
 #include <hal/CTREPCM.h>
 #include <wpi/NullDeleter.h>
 #include <wpi/StackTrace.h>
diff --git a/wpilibc/src/main/native/cpp/PowerDistribution.cpp b/wpilibc/src/main/native/cpp/PowerDistribution.cpp
index df5f6ddeed0..14a4cec49d8 100644
--- a/wpilibc/src/main/native/cpp/PowerDistribution.cpp
+++ b/wpilibc/src/main/native/cpp/PowerDistribution.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/PowerDistribution.h"
 
+#include <vector>
+
 #include <fmt/format.h>
 #include <hal/FRCUsageReporting.h>
 #include <hal/Ports.h>
@@ -13,7 +15,6 @@
 #include <wpi/sendable/SendableRegistry.h>
 
 #include "frc/Errors.h"
-#include "frc/SensorUtil.h"
 
 static_assert(static_cast<HAL_PowerDistributionType>(
                   frc::PowerDistribution::ModuleType::kCTRE) ==
diff --git a/wpilibc/src/main/native/cpp/Preferences.cpp b/wpilibc/src/main/native/cpp/Preferences.cpp
index 07d79cb57c5..9706f90b019 100644
--- a/wpilibc/src/main/native/cpp/Preferences.cpp
+++ b/wpilibc/src/main/native/cpp/Preferences.cpp
@@ -4,7 +4,9 @@
 
 #include "frc/Preferences.h"
 
-#include <algorithm>
+#include <memory>
+#include <string>
+#include <vector>
 
 #include <fmt/format.h>
 #include <hal/FRCUsageReporting.h>
diff --git a/wpilibc/src/main/native/cpp/Relay.cpp b/wpilibc/src/main/native/cpp/Relay.cpp
index 7c523711a50..0cd2dac86b1 100644
--- a/wpilibc/src/main/native/cpp/Relay.cpp
+++ b/wpilibc/src/main/native/cpp/Relay.cpp
@@ -4,7 +4,7 @@
 
 #include "frc/Relay.h"
 
-#include <utility>
+#include <string>
 
 #include <fmt/format.h>
 #include <hal/FRCUsageReporting.h>
diff --git a/wpilibc/src/main/native/cpp/Resource.cpp b/wpilibc/src/main/native/cpp/Resource.cpp
index de32e11631f..34aeba5861f 100644
--- a/wpilibc/src/main/native/cpp/Resource.cpp
+++ b/wpilibc/src/main/native/cpp/Resource.cpp
@@ -4,6 +4,11 @@
 
 #include "frc/Resource.h"
 
+#include <limits>
+#include <memory>
+#include <string>
+#include <vector>
+
 #include <wpi/deprecated.h>
 
 #include "frc/Errors.h"
diff --git a/wpilibc/src/main/native/cpp/RobotController.cpp b/wpilibc/src/main/native/cpp/RobotController.cpp
index 5c0f7fd7826..31258f1234e 100644
--- a/wpilibc/src/main/native/cpp/RobotController.cpp
+++ b/wpilibc/src/main/native/cpp/RobotController.cpp
@@ -4,7 +4,7 @@
 
 #include "frc/RobotController.h"
 
-#include <cstddef>
+#include <string>
 
 #include <hal/CAN.h>
 #include <hal/HALBase.h>
diff --git a/wpilibc/src/main/native/cpp/SerialPort.cpp b/wpilibc/src/main/native/cpp/SerialPort.cpp
index 0d96a9e9e64..8c6fdb380ca 100644
--- a/wpilibc/src/main/native/cpp/SerialPort.cpp
+++ b/wpilibc/src/main/native/cpp/SerialPort.cpp
@@ -4,7 +4,7 @@
 
 #include "frc/SerialPort.h"
 
-#include <utility>
+#include <string>
 
 #include <hal/FRCUsageReporting.h>
 #include <hal/SerialPort.h>
diff --git a/wpilibc/src/main/native/cpp/SharpIR.cpp b/wpilibc/src/main/native/cpp/SharpIR.cpp
index db9b9b9a89d..67e00f6a67e 100644
--- a/wpilibc/src/main/native/cpp/SharpIR.cpp
+++ b/wpilibc/src/main/native/cpp/SharpIR.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/SharpIR.h"
 
+#include <algorithm>
+
 #include <wpi/sendable/SendableBuilder.h>
 #include <wpi/sendable/SendableRegistry.h>
 
diff --git a/wpilibc/src/main/native/cpp/SynchronousInterrupt.cpp b/wpilibc/src/main/native/cpp/SynchronousInterrupt.cpp
index 298ecdd864b..084efd9d1f1 100644
--- a/wpilibc/src/main/native/cpp/SynchronousInterrupt.cpp
+++ b/wpilibc/src/main/native/cpp/SynchronousInterrupt.cpp
@@ -4,7 +4,9 @@
 
 #include "frc/SynchronousInterrupt.h"
 
+#include <memory>
 #include <type_traits>
+#include <utility>
 
 #include <hal/Interrupts.h>
 #include <wpi/NullDeleter.h>
diff --git a/wpilibc/src/main/native/cpp/Ultrasonic.cpp b/wpilibc/src/main/native/cpp/Ultrasonic.cpp
index ec4c9c3c140..640a56c4f41 100644
--- a/wpilibc/src/main/native/cpp/Ultrasonic.cpp
+++ b/wpilibc/src/main/native/cpp/Ultrasonic.cpp
@@ -4,7 +4,9 @@
 
 #include "frc/Ultrasonic.h"
 
+#include <memory>
 #include <utility>
+#include <vector>
 
 #include <hal/FRCUsageReporting.h>
 #include <wpi/NullDeleter.h>
diff --git a/wpilibc/src/main/native/cpp/Watchdog.cpp b/wpilibc/src/main/native/cpp/Watchdog.cpp
index 91d999d6c41..063ed5a09b0 100644
--- a/wpilibc/src/main/native/cpp/Watchdog.cpp
+++ b/wpilibc/src/main/native/cpp/Watchdog.cpp
@@ -7,6 +7,7 @@
 #include <atomic>
 #include <thread>
 #include <utility>
+#include <vector>
 
 #include <fmt/format.h>
 #include <hal/Notifier.h>
diff --git a/wpilibc/src/main/native/cpp/counter/ExternalDirectionCounter.cpp b/wpilibc/src/main/native/cpp/counter/ExternalDirectionCounter.cpp
index 3bea166ec66..d518a2f0fc5 100644
--- a/wpilibc/src/main/native/cpp/counter/ExternalDirectionCounter.cpp
+++ b/wpilibc/src/main/native/cpp/counter/ExternalDirectionCounter.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/counter/ExternalDirectionCounter.h"
 
+#include <memory>
+
 #include <hal/Counter.h>
 #include <hal/FRCUsageReporting.h>
 #include <wpi/NullDeleter.h>
diff --git a/wpilibc/src/main/native/cpp/counter/UpDownCounter.cpp b/wpilibc/src/main/native/cpp/counter/UpDownCounter.cpp
index 30b9ea6afea..7da57924777 100644
--- a/wpilibc/src/main/native/cpp/counter/UpDownCounter.cpp
+++ b/wpilibc/src/main/native/cpp/counter/UpDownCounter.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/counter/UpDownCounter.h"
 
+#include <memory>
+
 #include <hal/Counter.h>
 #include <hal/FRCUsageReporting.h>
 #include <wpi/NullDeleter.h>
diff --git a/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp b/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
index e3a0a8c4945..85232193a41 100644
--- a/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
+++ b/wpilibc/src/main/native/cpp/drive/DifferentialDrive.cpp
@@ -6,6 +6,8 @@
 
 #include <algorithm>
 #include <cmath>
+#include <string>
+#include <utility>
 
 #include <hal/FRCUsageReporting.h>
 #include <wpi/sendable/SendableBuilder.h>
diff --git a/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp b/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
index aeec27d0ded..d40d02c6343 100644
--- a/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
+++ b/wpilibc/src/main/native/cpp/drive/MecanumDrive.cpp
@@ -5,6 +5,8 @@
 #include "frc/drive/MecanumDrive.h"
 
 #include <algorithm>
+#include <string>
+#include <utility>
 
 #include <hal/FRCUsageReporting.h>
 #include <wpi/sendable/SendableBuilder.h>
diff --git a/wpilibc/src/main/native/cpp/event/BooleanEvent.cpp b/wpilibc/src/main/native/cpp/event/BooleanEvent.cpp
index 0f6cdfe22cc..d108a0fd141 100644
--- a/wpilibc/src/main/native/cpp/event/BooleanEvent.cpp
+++ b/wpilibc/src/main/native/cpp/event/BooleanEvent.cpp
@@ -4,6 +4,9 @@
 
 #include "frc/event/BooleanEvent.h"
 
+#include <memory>
+#include <utility>
+
 using namespace frc;
 
 BooleanEvent::BooleanEvent(EventLoop* loop, std::function<bool()> condition)
diff --git a/wpilibc/src/main/native/cpp/event/EventLoop.cpp b/wpilibc/src/main/native/cpp/event/EventLoop.cpp
index c85286ba371..cf2b3f3d7c8 100644
--- a/wpilibc/src/main/native/cpp/event/EventLoop.cpp
+++ b/wpilibc/src/main/native/cpp/event/EventLoop.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/event/EventLoop.h"
 
+#include <utility>
+
 #include "frc/Errors.h"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/event/NetworkBooleanEvent.cpp b/wpilibc/src/main/native/cpp/event/NetworkBooleanEvent.cpp
index d910361b64b..0f8576d8ff9 100644
--- a/wpilibc/src/main/native/cpp/event/NetworkBooleanEvent.cpp
+++ b/wpilibc/src/main/native/cpp/event/NetworkBooleanEvent.cpp
@@ -4,6 +4,9 @@
 
 #include "frc/event/NetworkBooleanEvent.h"
 
+#include <memory>
+#include <utility>
+
 #include <networktables/BooleanTopic.h>
 #include <networktables/NetworkTable.h>
 #include <networktables/NetworkTableInstance.h>
diff --git a/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp b/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp
index aff42a4efc6..04f66c723e5 100644
--- a/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp
+++ b/wpilibc/src/main/native/cpp/livewindow/LiveWindow.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/livewindow/LiveWindow.h"
 
+#include <memory>
+
 #include <networktables/BooleanTopic.h>
 #include <networktables/NetworkTable.h>
 #include <networktables/NetworkTableInstance.h>
diff --git a/wpilibc/src/main/native/cpp/motorcontrol/MotorControllerGroup.cpp b/wpilibc/src/main/native/cpp/motorcontrol/MotorControllerGroup.cpp
index cf57f7c55b2..c5a0e0316f4 100644
--- a/wpilibc/src/main/native/cpp/motorcontrol/MotorControllerGroup.cpp
+++ b/wpilibc/src/main/native/cpp/motorcontrol/MotorControllerGroup.cpp
@@ -4,6 +4,9 @@
 
 #include "frc/motorcontrol/MotorControllerGroup.h"
 
+#include <utility>
+#include <vector>
+
 #include <wpi/sendable/SendableBuilder.h>
 #include <wpi/sendable/SendableRegistry.h>
 
diff --git a/wpilibc/src/main/native/cpp/motorcontrol/NidecBrushless.cpp b/wpilibc/src/main/native/cpp/motorcontrol/NidecBrushless.cpp
index a05b7cc8416..5acf3c818d0 100644
--- a/wpilibc/src/main/native/cpp/motorcontrol/NidecBrushless.cpp
+++ b/wpilibc/src/main/native/cpp/motorcontrol/NidecBrushless.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/motorcontrol/NidecBrushless.h"
 
+#include <string>
+
 #include <fmt/format.h>
 #include <hal/FRCUsageReporting.h>
 #include <wpi/sendable/SendableBuilder.h>
diff --git a/wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.cpp b/wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.cpp
index 1f1d2628ab3..28ef00fbef5 100644
--- a/wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.cpp
+++ b/wpilibc/src/main/native/cpp/motorcontrol/PWMMotorController.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/motorcontrol/PWMMotorController.h"
 
+#include <string>
+
 #include <fmt/format.h>
 #include <wpi/sendable/SendableBuilder.h>
 #include <wpi/sendable/SendableRegistry.h>
diff --git a/wpilibc/src/main/native/cpp/shuffleboard/ComplexWidget.cpp b/wpilibc/src/main/native/cpp/shuffleboard/ComplexWidget.cpp
index eaac17366f5..adc015c914f 100644
--- a/wpilibc/src/main/native/cpp/shuffleboard/ComplexWidget.cpp
+++ b/wpilibc/src/main/native/cpp/shuffleboard/ComplexWidget.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/shuffleboard/ComplexWidget.h"
 
+#include <memory>
+
 #include <wpi/sendable/Sendable.h>
 
 #include "frc/smartdashboard/SendableBuilderImpl.h"
diff --git a/wpilibc/src/main/native/cpp/shuffleboard/RecordingController.cpp b/wpilibc/src/main/native/cpp/shuffleboard/RecordingController.cpp
index fb1ef9c6ac0..90adca62085 100644
--- a/wpilibc/src/main/native/cpp/shuffleboard/RecordingController.cpp
+++ b/wpilibc/src/main/native/cpp/shuffleboard/RecordingController.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/shuffleboard/RecordingController.h"
 
+#include <string>
+
 #include "frc/Errors.h"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/shuffleboard/Shuffleboard.cpp b/wpilibc/src/main/native/cpp/shuffleboard/Shuffleboard.cpp
index 913501278fd..0fff070d50a 100644
--- a/wpilibc/src/main/native/cpp/shuffleboard/Shuffleboard.cpp
+++ b/wpilibc/src/main/native/cpp/shuffleboard/Shuffleboard.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/shuffleboard/Shuffleboard.h"
 
+#include <memory>
+
 #include <networktables/NetworkTableInstance.h>
 
 #include "frc/shuffleboard/ShuffleboardTab.h"
diff --git a/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardComponentBase.cpp b/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardComponentBase.cpp
index c43fc90890f..4ef59fdd56b 100644
--- a/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardComponentBase.cpp
+++ b/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardComponentBase.cpp
@@ -4,6 +4,9 @@
 
 #include "frc/shuffleboard/ShuffleboardComponentBase.h"
 
+#include <memory>
+#include <string>
+
 using namespace frc;
 
 ShuffleboardComponentBase::ShuffleboardComponentBase(
diff --git a/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardContainer.cpp b/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardContainer.cpp
index ca3c6d69dee..b8f4ccae341 100644
--- a/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardContainer.cpp
+++ b/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardContainer.cpp
@@ -4,6 +4,11 @@
 
 #include "frc/shuffleboard/ShuffleboardContainer.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <ntcore_cpp.h>
 #include <wpi/sendable/SendableRegistry.h>
 
diff --git a/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardInstance.cpp b/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardInstance.cpp
index 8c0880a5884..e443e82e8c6 100644
--- a/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardInstance.cpp
+++ b/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardInstance.cpp
@@ -4,6 +4,9 @@
 
 #include "frc/shuffleboard/ShuffleboardInstance.h"
 
+#include <memory>
+#include <string>
+
 #include <hal/FRCUsageReporting.h>
 #include <networktables/NetworkTable.h>
 #include <networktables/NetworkTableInstance.h>
diff --git a/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardLayout.cpp b/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardLayout.cpp
index fb7d35bfe4b..da2f71460cc 100644
--- a/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardLayout.cpp
+++ b/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardLayout.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/shuffleboard/ShuffleboardLayout.h"
 
+#include <memory>
+
 #include <wpi/json.h>
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardTab.cpp b/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardTab.cpp
index 6cd1c3878bb..359a63c753b 100644
--- a/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardTab.cpp
+++ b/wpilibc/src/main/native/cpp/shuffleboard/ShuffleboardTab.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/shuffleboard/ShuffleboardTab.h"
 
+#include <memory>
+
 #include <wpi/json.h>
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/shuffleboard/SimpleWidget.cpp b/wpilibc/src/main/native/cpp/shuffleboard/SimpleWidget.cpp
index c62b76de929..5550136d6d3 100644
--- a/wpilibc/src/main/native/cpp/shuffleboard/SimpleWidget.cpp
+++ b/wpilibc/src/main/native/cpp/shuffleboard/SimpleWidget.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/shuffleboard/SimpleWidget.h"
 
+#include <memory>
+
 #include "frc/shuffleboard/Shuffleboard.h"
 #include "frc/shuffleboard/ShuffleboardLayout.h"
 #include "frc/shuffleboard/ShuffleboardTab.h"
diff --git a/wpilibc/src/main/native/cpp/simulation/DoubleSolenoidSim.cpp b/wpilibc/src/main/native/cpp/simulation/DoubleSolenoidSim.cpp
index da99867b2e4..c6a8d55e59f 100644
--- a/wpilibc/src/main/native/cpp/simulation/DoubleSolenoidSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/DoubleSolenoidSim.cpp
@@ -4,6 +4,9 @@
 
 #include "frc/simulation/DoubleSolenoidSim.h"
 
+#include <memory>
+#include <utility>
+
 #include "frc/PneumaticsBase.h"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/simulation/PneumaticsBaseSim.cpp b/wpilibc/src/main/native/cpp/simulation/PneumaticsBaseSim.cpp
index 04aef3a6699..88fed272771 100644
--- a/wpilibc/src/main/native/cpp/simulation/PneumaticsBaseSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/PneumaticsBaseSim.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/simulation/PneumaticsBaseSim.h"
 
+#include <memory>
+
 #include "frc/Errors.h"
 #include "frc/PneumaticsModuleType.h"
 #include "frc/simulation/CTREPCMSim.h"
diff --git a/wpilibc/src/main/native/cpp/simulation/RoboRioSim.cpp b/wpilibc/src/main/native/cpp/simulation/RoboRioSim.cpp
index 3717128d99e..4973080b546 100644
--- a/wpilibc/src/main/native/cpp/simulation/RoboRioSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/RoboRioSim.cpp
@@ -5,7 +5,7 @@
 #include "frc/simulation/RoboRioSim.h"
 
 #include <memory>
-#include <utility>
+#include <string>
 
 #include <hal/simulation/RoboRioData.h>
 
diff --git a/wpilibc/src/main/native/cpp/simulation/SolenoidSim.cpp b/wpilibc/src/main/native/cpp/simulation/SolenoidSim.cpp
index 29d820783e5..5ad5c20a344 100644
--- a/wpilibc/src/main/native/cpp/simulation/SolenoidSim.cpp
+++ b/wpilibc/src/main/native/cpp/simulation/SolenoidSim.cpp
@@ -4,6 +4,9 @@
 
 #include "frc/simulation/SolenoidSim.h"
 
+#include <memory>
+#include <utility>
+
 #include "frc/PneumaticsBase.h"
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/smartdashboard/Field2d.cpp b/wpilibc/src/main/native/cpp/smartdashboard/Field2d.cpp
index ec52e9ccee1..5decef99e23 100644
--- a/wpilibc/src/main/native/cpp/smartdashboard/Field2d.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/Field2d.cpp
@@ -4,6 +4,9 @@
 
 #include "frc/smartdashboard/Field2d.h"
 
+#include <memory>
+#include <utility>
+
 #include <networktables/DoubleArrayTopic.h>
 #include <networktables/NTSendableBuilder.h>
 #include <wpi/sendable/SendableRegistry.h>
diff --git a/wpilibc/src/main/native/cpp/smartdashboard/FieldObject2d.cpp b/wpilibc/src/main/native/cpp/smartdashboard/FieldObject2d.cpp
index 3895e870f96..10a027024e3 100644
--- a/wpilibc/src/main/native/cpp/smartdashboard/FieldObject2d.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/FieldObject2d.cpp
@@ -4,6 +4,7 @@
 
 #include "frc/smartdashboard/FieldObject2d.h"
 
+#include <utility>
 #include <vector>
 
 #include "frc/trajectory/Trajectory.h"
diff --git a/wpilibc/src/main/native/cpp/smartdashboard/ListenerExecutor.cpp b/wpilibc/src/main/native/cpp/smartdashboard/ListenerExecutor.cpp
index 2a531969355..0e19026b47f 100644
--- a/wpilibc/src/main/native/cpp/smartdashboard/ListenerExecutor.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/ListenerExecutor.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/smartdashboard/ListenerExecutor.h"
 
+#include <utility>
+
 using namespace frc::detail;
 
 void ListenerExecutor::Execute(std::function<void()> task) {
diff --git a/wpilibc/src/main/native/cpp/smartdashboard/Mechanism2d.cpp b/wpilibc/src/main/native/cpp/smartdashboard/Mechanism2d.cpp
index 1bee916c91c..e060e49bf64 100644
--- a/wpilibc/src/main/native/cpp/smartdashboard/Mechanism2d.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/Mechanism2d.cpp
@@ -4,6 +4,7 @@
 
 #include "frc/smartdashboard/Mechanism2d.h"
 
+#include <memory>
 #include <string_view>
 
 #include <networktables/NTSendableBuilder.h>
diff --git a/wpilibc/src/main/native/cpp/smartdashboard/MechanismLigament2d.cpp b/wpilibc/src/main/native/cpp/smartdashboard/MechanismLigament2d.cpp
index 85f112d86a5..bd44a723e32 100644
--- a/wpilibc/src/main/native/cpp/smartdashboard/MechanismLigament2d.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/MechanismLigament2d.cpp
@@ -4,6 +4,9 @@
 
 #include "frc/smartdashboard/MechanismLigament2d.h"
 
+#include <cstdio>
+#include <memory>
+
 #include <wpi/StringExtras.h>
 #include <wpi/json.h>
 
diff --git a/wpilibc/src/main/native/cpp/smartdashboard/MechanismObject2d.cpp b/wpilibc/src/main/native/cpp/smartdashboard/MechanismObject2d.cpp
index 15d24a38c17..c6419d14031 100644
--- a/wpilibc/src/main/native/cpp/smartdashboard/MechanismObject2d.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/MechanismObject2d.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/smartdashboard/MechanismObject2d.h"
 
+#include <string>
+
 using namespace frc;
 
 MechanismObject2d::MechanismObject2d(std::string_view name) : m_name{name} {}
diff --git a/wpilibc/src/main/native/cpp/smartdashboard/SendableBuilderImpl.cpp b/wpilibc/src/main/native/cpp/smartdashboard/SendableBuilderImpl.cpp
index a49689b81dc..0098eae7367 100644
--- a/wpilibc/src/main/native/cpp/smartdashboard/SendableBuilderImpl.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/SendableBuilderImpl.cpp
@@ -4,6 +4,10 @@
 
 #include "frc/smartdashboard/SendableBuilderImpl.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <networktables/BooleanArrayTopic.h>
 #include <networktables/BooleanTopic.h>
 #include <networktables/DoubleArrayTopic.h>
@@ -18,8 +22,6 @@
 #include <wpi/SmallVector.h>
 #include <wpi/json.h>
 
-#include "frc/smartdashboard/SmartDashboard.h"
-
 using namespace frc;
 
 template <typename Topic>
diff --git a/wpilibc/src/main/native/cpp/smartdashboard/SendableChooserBase.cpp b/wpilibc/src/main/native/cpp/smartdashboard/SendableChooserBase.cpp
index f19d9e4612a..5375346321b 100644
--- a/wpilibc/src/main/native/cpp/smartdashboard/SendableChooserBase.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/SendableChooserBase.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/smartdashboard/SendableChooserBase.h"
 
+#include <utility>
+
 #include <wpi/sendable/SendableRegistry.h>
 
 using namespace frc;
diff --git a/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp b/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
index d57473fbe04..30b542b81b4 100644
--- a/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
+++ b/wpilibc/src/main/native/cpp/smartdashboard/SmartDashboard.cpp
@@ -4,6 +4,11 @@
 
 #include "frc/smartdashboard/SmartDashboard.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <hal/FRCUsageReporting.h>
 #include <networktables/NetworkTable.h>
 #include <networktables/NetworkTableInstance.h>
diff --git a/wpilibc/src/main/native/cpp/sysid/SysIdRoutineLog.cpp b/wpilibc/src/main/native/cpp/sysid/SysIdRoutineLog.cpp
index 1ee35b8863b..594aeb76c77 100644
--- a/wpilibc/src/main/native/cpp/sysid/SysIdRoutineLog.cpp
+++ b/wpilibc/src/main/native/cpp/sysid/SysIdRoutineLog.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/sysid/SysIdRoutineLog.h"
 
+#include <string>
+
 #include <fmt/format.h>
 
 #include "frc/DataLogManager.h"
diff --git a/wpilibc/src/main/native/cppcs/RobotBase.cpp b/wpilibc/src/main/native/cppcs/RobotBase.cpp
index da75ad4c87d..04af2fe3a4c 100644
--- a/wpilibc/src/main/native/cppcs/RobotBase.cpp
+++ b/wpilibc/src/main/native/cppcs/RobotBase.cpp
@@ -9,6 +9,8 @@
 #endif
 
 #include <cstdio>
+#include <memory>
+#include <utility>
 
 #include <cameraserver/CameraServerShared.h>
 #include <hal/FRCUsageReporting.h>
@@ -22,7 +24,6 @@
 #include "frc/DriverStation.h"
 #include "frc/Errors.h"
 #include "frc/Notifier.h"
-#include "frc/RobotState.h"
 #include "frc/livewindow/LiveWindow.h"
 #include "frc/smartdashboard/SmartDashboard.h"
 
diff --git a/wpilibc/src/test/native/cpp/ScopedTracerTest.cpp b/wpilibc/src/test/native/cpp/ScopedTracerTest.cpp
index f4107e72fec..4899a4a63d8 100644
--- a/wpilibc/src/test/native/cpp/ScopedTracerTest.cpp
+++ b/wpilibc/src/test/native/cpp/ScopedTracerTest.cpp
@@ -24,5 +24,5 @@ TEST(ScopedTracerTest, Timing) {
   frc::sim::ResumeTiming();
 
   std::string_view out = os.str();
-  EXPECT_TRUE(wpi::starts_with(out, "	timing_test: 1.5"));
+  EXPECT_TRUE(wpi::starts_with(out, "\ttiming_test: 1.5"));
 }
diff --git a/wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardInstanceTest.cpp b/wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardInstanceTest.cpp
index cb2e0023e86..6354713d5d4 100644
--- a/wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardInstanceTest.cpp
+++ b/wpilibc/src/test/native/cpp/shuffleboard/ShuffleboardInstanceTest.cpp
@@ -11,7 +11,6 @@
 #include <networktables/NetworkTableListener.h>
 #include <networktables/StringTopic.h>
 
-#include "frc/shuffleboard/ShuffleboardInstance.h"
 #include "shuffleboard/MockActuatorSendable.h"
 
 class NTWrapper {
diff --git a/wpilibc/src/test/native/cpp/shuffleboard/SuppliedValueWidgetTest.cpp b/wpilibc/src/test/native/cpp/shuffleboard/SuppliedValueWidgetTest.cpp
index 37185dd27a8..91c68db79aa 100644
--- a/wpilibc/src/test/native/cpp/shuffleboard/SuppliedValueWidgetTest.cpp
+++ b/wpilibc/src/test/native/cpp/shuffleboard/SuppliedValueWidgetTest.cpp
@@ -2,6 +2,9 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+#include <vector>
+
 #include <gtest/gtest.h>
 #include <networktables/NetworkTableEntry.h>
 #include <networktables/NetworkTableInstance.h>
diff --git a/wpilibc/src/test/native/cpp/simulation/AnalogGyroSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/AnalogGyroSimTest.cpp
index e82fa0480f0..6352491d36e 100644
--- a/wpilibc/src/test/native/cpp/simulation/AnalogGyroSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/AnalogGyroSimTest.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/simulation/AnalogGyroSim.h"  // NOLINT(build/include_order)
 
+#include <memory>
+
 #include <gtest/gtest.h>
 #include <hal/HAL.h>
 
diff --git a/wpilibc/src/test/native/cpp/simulation/PDPSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/PDPSimTest.cpp
index fc61ebfe613..99652a94968 100644
--- a/wpilibc/src/test/native/cpp/simulation/PDPSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/PDPSimTest.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/simulation/PowerDistributionSim.h"  // NOLINT(build/include_order)
 
+#include <vector>
+
 #include <gtest/gtest.h>
 #include <hal/HAL.h>
 
diff --git a/wpilibc/src/test/native/cpp/simulation/RoboRioSimTest.cpp b/wpilibc/src/test/native/cpp/simulation/RoboRioSimTest.cpp
index 3b74a9157a8..c713005659a 100644
--- a/wpilibc/src/test/native/cpp/simulation/RoboRioSimTest.cpp
+++ b/wpilibc/src/test/native/cpp/simulation/RoboRioSimTest.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/simulation/RoboRioSim.h"  // NOLINT(build/include_order)
 
+#include <string>
+
 #include <gtest/gtest.h>
 #include <hal/HAL.h>
 #include <hal/HALBase.h>
diff --git a/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp
index b5df25d5973..9d060712929 100644
--- a/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/AprilTagsVision/cpp/Robot.cpp
@@ -4,9 +4,9 @@
 
 #include <cstdio>
 #include <span>
-#include <sstream>
 #include <string>
 #include <thread>
+#include <vector>
 
 #include <cameraserver/CameraServer.h>
 #include <fmt/format.h>
diff --git a/wpilibcExamples/src/main/cpp/examples/ArmBotOffboard/cpp/subsystems/DriveSubsystem.cpp b/wpilibcExamples/src/main/cpp/examples/ArmBotOffboard/cpp/subsystems/DriveSubsystem.cpp
index 236d4682357..e5705f1b704 100644
--- a/wpilibcExamples/src/main/cpp/examples/ArmBotOffboard/cpp/subsystems/DriveSubsystem.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/ArmBotOffboard/cpp/subsystems/DriveSubsystem.cpp
@@ -4,6 +4,8 @@
 
 #include "subsystems/DriveSubsystem.h"
 
+#include <utility>
+
 using namespace DriveConstants;
 
 DriveSubsystem::DriveSubsystem()
diff --git a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Drivetrain.cpp b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Drivetrain.cpp
index caba17d9e93..3683e9cf422 100644
--- a/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Drivetrain.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/DifferentialDrivePoseEstimator/cpp/Drivetrain.cpp
@@ -4,7 +4,7 @@
 
 #include "Drivetrain.h"
 
-#include "ExampleGlobalMeasurementSensor.h"
+#include <vector>
 
 Drivetrain::Drivetrain() {
   m_leftLeader.AddFollower(m_leftFollower);
diff --git a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/RobotContainer.cpp b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/RobotContainer.cpp
index 3841118cc59..449defdb28d 100644
--- a/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/RobotContainer.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/Frisbeebot/cpp/RobotContainer.cpp
@@ -4,6 +4,8 @@
 
 #include "RobotContainer.h"
 
+#include <utility>
+
 RobotContainer::RobotContainer() {
   // Initialize all of your commands and subsystems here
 
diff --git a/wpilibcExamples/src/main/cpp/examples/I2CCommunication/cpp/Robot.cpp b/wpilibcExamples/src/main/cpp/examples/I2CCommunication/cpp/Robot.cpp
index ecfb4802f84..5f4a1a892f9 100644
--- a/wpilibcExamples/src/main/cpp/examples/I2CCommunication/cpp/Robot.cpp
+++ b/wpilibcExamples/src/main/cpp/examples/I2CCommunication/cpp/Robot.cpp
@@ -4,6 +4,8 @@
 
 #include "Robot.h"
 
+#include <string>
+
 #include <fmt/format.h>
 #include <frc/DriverStation.h>
 #include <frc/Timer.h>
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/AnalogLoopTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/AnalogLoopTest.cpp
index cf3f30fb241..7a7af84f6e2 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/AnalogLoopTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/AnalogLoopTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <memory>
+
 #include <gtest/gtest.h>
 #include <units/time.h>
 
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/DMATest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/DMATest.cpp
index 30a1caf558a..35d94b5549e 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/DMATest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/DMATest.cpp
@@ -2,17 +2,18 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <frc/AnalogInput.h>
-#include <frc/AnalogOutput.h>
-#include <frc/DigitalOutput.h>
-#include <frc/Timer.h>
-#include <frc/motorcontrol/Jaguar.h>
+#include <vector>
 
 #include <gtest/gtest.h>
 
 #include "TestBench.h"
+#include "frc/AnalogInput.h"
+#include "frc/AnalogOutput.h"
 #include "frc/DMA.h"
 #include "frc/DMASample.h"
+#include "frc/DigitalOutput.h"
+#include "frc/Timer.h"
+#include "frc/motorcontrol/Jaguar.h"
 
 using namespace frc;
 
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/FakeEncoderTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/FakeEncoderTest.cpp
index 0d4999fe19b..44033fe515c 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/FakeEncoderTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/FakeEncoderTest.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/Encoder.h"  // NOLINT(build/include_order)
 
+#include <memory>
+
 #include <gtest/gtest.h>
 #include <units/time.h>
 
diff --git a/wpilibcIntegrationTests/src/main/native/cpp/PreferencesTest.cpp b/wpilibcIntegrationTests/src/main/native/cpp/PreferencesTest.cpp
index cdc8ecbd42a..03c6819185b 100644
--- a/wpilibcIntegrationTests/src/main/native/cpp/PreferencesTest.cpp
+++ b/wpilibcIntegrationTests/src/main/native/cpp/PreferencesTest.cpp
@@ -6,6 +6,7 @@
 
 #include <cstdio>
 #include <fstream>
+#include <string>
 
 #include <gtest/gtest.h>
 #include <networktables/MultiSubscriber.h>
diff --git a/wpimath/src/main/native/cpp/MathShared.cpp b/wpimath/src/main/native/cpp/MathShared.cpp
index b53d080ac06..5b2d14671f6 100644
--- a/wpimath/src/main/native/cpp/MathShared.cpp
+++ b/wpimath/src/main/native/cpp/MathShared.cpp
@@ -4,6 +4,9 @@
 
 #include "wpimath/MathShared.h"
 
+#include <memory>
+#include <utility>
+
 #include <wpi/mutex.h>
 #include <wpi/timestamp.h>
 
diff --git a/wpimath/src/main/native/cpp/controller/ArmFeedforward.cpp b/wpimath/src/main/native/cpp/controller/ArmFeedforward.cpp
index 57a7f45ed4f..4cfaf89157b 100644
--- a/wpimath/src/main/native/cpp/controller/ArmFeedforward.cpp
+++ b/wpimath/src/main/native/cpp/controller/ArmFeedforward.cpp
@@ -4,6 +4,7 @@
 
 #include "frc/controller/ArmFeedforward.h"
 
+#include <algorithm>
 #include <limits>
 
 #include <sleipnir/autodiff/Gradient.hpp>
diff --git a/wpimath/src/main/native/cpp/estimator/DifferentialDrivePoseEstimator.cpp b/wpimath/src/main/native/cpp/estimator/DifferentialDrivePoseEstimator.cpp
index 213ba991760..bf844a12aa8 100644
--- a/wpimath/src/main/native/cpp/estimator/DifferentialDrivePoseEstimator.cpp
+++ b/wpimath/src/main/native/cpp/estimator/DifferentialDrivePoseEstimator.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/estimator/DifferentialDrivePoseEstimator.h"
 
+#include <vector>
+
 using namespace frc;
 
 DifferentialDrivePoseEstimator::DifferentialDrivePoseEstimator(
diff --git a/wpimath/src/main/native/cpp/geometry/Pose3d.cpp b/wpimath/src/main/native/cpp/geometry/Pose3d.cpp
index be290625966..66c5bab910b 100644
--- a/wpimath/src/main/native/cpp/geometry/Pose3d.cpp
+++ b/wpimath/src/main/native/cpp/geometry/Pose3d.cpp
@@ -5,6 +5,7 @@
 #include "frc/geometry/Pose3d.h"
 
 #include <cmath>
+#include <utility>
 
 #include <Eigen/Core>
 #include <wpi/json.h>
diff --git a/wpimath/src/main/native/cpp/geometry/Rotation3d.cpp b/wpimath/src/main/native/cpp/geometry/Rotation3d.cpp
index b4dce35a5d6..b8c4063eb73 100644
--- a/wpimath/src/main/native/cpp/geometry/Rotation3d.cpp
+++ b/wpimath/src/main/native/cpp/geometry/Rotation3d.cpp
@@ -6,6 +6,7 @@
 
 #include <cmath>
 #include <numbers>
+#include <string>
 
 #include <Eigen/Core>
 #include <Eigen/LU>
diff --git a/wpimath/src/main/native/cpp/geometry/Transform3d.cpp b/wpimath/src/main/native/cpp/geometry/Transform3d.cpp
index 4879bb12ad5..34dad68f277 100644
--- a/wpimath/src/main/native/cpp/geometry/Transform3d.cpp
+++ b/wpimath/src/main/native/cpp/geometry/Transform3d.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/geometry/Transform3d.h"
 
+#include <utility>
+
 #include "frc/geometry/Pose3d.h"
 
 using namespace frc;
diff --git a/wpimath/src/main/native/cpp/geometry/Translation2d.cpp b/wpimath/src/main/native/cpp/geometry/Translation2d.cpp
index 72365a100bf..3d7d5d7d0bb 100644
--- a/wpimath/src/main/native/cpp/geometry/Translation2d.cpp
+++ b/wpimath/src/main/native/cpp/geometry/Translation2d.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/geometry/Translation2d.h"
 
+#include <algorithm>
+
 #include <wpi/json.h>
 
 #include "units/math.h"
diff --git a/wpimath/src/main/native/cpp/jni/TrajectoryUtilJNI.cpp b/wpimath/src/main/native/cpp/jni/TrajectoryUtilJNI.cpp
index 1066e037c8c..62abc36e8ed 100644
--- a/wpimath/src/main/native/cpp/jni/TrajectoryUtilJNI.cpp
+++ b/wpimath/src/main/native/cpp/jni/TrajectoryUtilJNI.cpp
@@ -5,6 +5,7 @@
 #include <jni.h>
 
 #include <exception>
+#include <vector>
 
 #include <wpi/jni_util.h>
 
diff --git a/wpimath/src/main/native/cpp/spline/SplineHelper.cpp b/wpimath/src/main/native/cpp/spline/SplineHelper.cpp
index c78a54f4645..cd47ab03834 100644
--- a/wpimath/src/main/native/cpp/spline/SplineHelper.cpp
+++ b/wpimath/src/main/native/cpp/spline/SplineHelper.cpp
@@ -5,6 +5,7 @@
 #include "frc/spline/SplineHelper.h"
 
 #include <cstddef>
+#include <vector>
 
 using namespace frc;
 
diff --git a/wpimath/src/main/native/cpp/trajectory/Trajectory.cpp b/wpimath/src/main/native/cpp/trajectory/Trajectory.cpp
index 5393f8318ce..467c3a89d09 100644
--- a/wpimath/src/main/native/cpp/trajectory/Trajectory.cpp
+++ b/wpimath/src/main/native/cpp/trajectory/Trajectory.cpp
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <stdexcept>
+#include <vector>
 
 #include <wpi/MathExtras.h>
 #include <wpi/json.h>
diff --git a/wpimath/src/main/native/cpp/trajectory/TrajectoryGenerator.cpp b/wpimath/src/main/native/cpp/trajectory/TrajectoryGenerator.cpp
index daf6670385a..e12157a43c9 100644
--- a/wpimath/src/main/native/cpp/trajectory/TrajectoryGenerator.cpp
+++ b/wpimath/src/main/native/cpp/trajectory/TrajectoryGenerator.cpp
@@ -5,6 +5,7 @@
 #include "frc/trajectory/TrajectoryGenerator.h"
 
 #include <utility>
+#include <vector>
 
 #include <wpi/print.h>
 
diff --git a/wpimath/src/main/native/cpp/trajectory/TrajectoryParameterizer.cpp b/wpimath/src/main/native/cpp/trajectory/TrajectoryParameterizer.cpp
index 4c0a55e4702..fb2d6cdb6bb 100644
--- a/wpimath/src/main/native/cpp/trajectory/TrajectoryParameterizer.cpp
+++ b/wpimath/src/main/native/cpp/trajectory/TrajectoryParameterizer.cpp
@@ -28,6 +28,8 @@
 
 #include "frc/trajectory/TrajectoryParameterizer.h"
 
+#include <vector>
+
 #include <fmt/format.h>
 
 #include "units/math.h"
diff --git a/wpimath/src/main/native/cpp/trajectory/TrajectoryUtil.cpp b/wpimath/src/main/native/cpp/trajectory/TrajectoryUtil.cpp
index a78bae641fd..644af1beb37 100644
--- a/wpimath/src/main/native/cpp/trajectory/TrajectoryUtil.cpp
+++ b/wpimath/src/main/native/cpp/trajectory/TrajectoryUtil.cpp
@@ -4,6 +4,7 @@
 
 #include "frc/trajectory/TrajectoryUtil.h"
 
+#include <string>
 #include <system_error>
 
 #include <fmt/format.h>
diff --git a/wpimath/src/main/native/cpp/trajectory/constraint/DifferentialDriveKinematicsConstraint.cpp b/wpimath/src/main/native/cpp/trajectory/constraint/DifferentialDriveKinematicsConstraint.cpp
index 460ff8b5d7f..8e4093ca70e 100644
--- a/wpimath/src/main/native/cpp/trajectory/constraint/DifferentialDriveKinematicsConstraint.cpp
+++ b/wpimath/src/main/native/cpp/trajectory/constraint/DifferentialDriveKinematicsConstraint.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/trajectory/constraint/DifferentialDriveKinematicsConstraint.h"
 
+#include <utility>
+
 using namespace frc;
 
 DifferentialDriveKinematicsConstraint::DifferentialDriveKinematicsConstraint(
diff --git a/wpimath/src/main/native/cpp/trajectory/constraint/DifferentialDriveVoltageConstraint.cpp b/wpimath/src/main/native/cpp/trajectory/constraint/DifferentialDriveVoltageConstraint.cpp
index 46c306e09f7..f18012804c5 100644
--- a/wpimath/src/main/native/cpp/trajectory/constraint/DifferentialDriveVoltageConstraint.cpp
+++ b/wpimath/src/main/native/cpp/trajectory/constraint/DifferentialDriveVoltageConstraint.cpp
@@ -6,6 +6,7 @@
 
 #include <algorithm>
 #include <limits>
+#include <utility>
 
 #include <wpi/MathExtras.h>
 
diff --git a/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryProto.cpp b/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryProto.cpp
index f4f5eb92d14..3190719d597 100644
--- a/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryProto.cpp
+++ b/wpimath/src/main/native/cpp/trajectory/proto/TrajectoryProto.cpp
@@ -4,6 +4,8 @@
 
 #include "frc/trajectory/proto/TrajectoryProto.h"
 
+#include <vector>
+
 #include <wpi/ProtoHelper.h>
 
 #include "trajectory.pb.h"
diff --git a/wpimath/src/main/native/thirdparty/sleipnir/include/sleipnir/util/Print.hpp b/wpimath/src/main/native/thirdparty/sleipnir/include/sleipnir/util/Print.hpp
index a9220cdaadc..c01fd4ac679 100644
--- a/wpimath/src/main/native/thirdparty/sleipnir/include/sleipnir/util/Print.hpp
+++ b/wpimath/src/main/native/thirdparty/sleipnir/include/sleipnir/util/Print.hpp
@@ -2,6 +2,7 @@
 
 #pragma once
 
+#include <cstdio>
 #include <system_error>
 #include <utility>
 
diff --git a/wpimath/src/main/native/thirdparty/sleipnir/src/optimization/solver/InteriorPoint.cpp b/wpimath/src/main/native/thirdparty/sleipnir/src/optimization/solver/InteriorPoint.cpp
index 1470eb235bf..892d2dd20f7 100644
--- a/wpimath/src/main/native/thirdparty/sleipnir/src/optimization/solver/InteriorPoint.cpp
+++ b/wpimath/src/main/native/thirdparty/sleipnir/src/optimization/solver/InteriorPoint.cpp
@@ -240,11 +240,16 @@ void InteriorPoint(std::span<Variable> decisionVariables,
   // Error estimate
   double E_0 = std::numeric_limits<double>::infinity();
 
-  iterationsStartTime = std::chrono::system_clock::now();
+  if (config.diagnostics) {
+    iterationsStartTime = std::chrono::system_clock::now();
+  }
 
   while (E_0 > config.tolerance &&
          acceptableIterCounter < config.maxAcceptableIterations) {
-    auto innerIterStartTime = std::chrono::system_clock::now();
+    std::chrono::system_clock::time_point innerIterStartTime;
+    if (config.diagnostics) {
+      innerIterStartTime = std::chrono::system_clock::now();
+    }
 
     // Check for local equality constraint infeasibility
     if (IsEqualityLocallyInfeasible(A_e, c_e)) {
diff --git a/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimatorTest.cpp b/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimatorTest.cpp
index fbc2d212331..f6d229ec653 100644
--- a/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimatorTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/DifferentialDrivePoseEstimatorTest.cpp
@@ -6,6 +6,7 @@
 #include <random>
 #include <tuple>
 #include <utility>
+#include <vector>
 
 #include <gtest/gtest.h>
 #include <wpi/print.h>
diff --git a/wpimath/src/test/native/cpp/estimator/ExtendedKalmanFilterTest.cpp b/wpimath/src/test/native/cpp/estimator/ExtendedKalmanFilterTest.cpp
index d631cfc7f8c..362de8b699e 100644
--- a/wpimath/src/test/native/cpp/estimator/ExtendedKalmanFilterTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/ExtendedKalmanFilterTest.cpp
@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <array>
 #include <cmath>
+#include <vector>
 
 #include <Eigen/QR>
 #include <gtest/gtest.h>
diff --git a/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimatorTest.cpp b/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimatorTest.cpp
index 8ba38c23256..ae2f573874d 100644
--- a/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimatorTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/MecanumDrivePoseEstimatorTest.cpp
@@ -5,6 +5,7 @@
 #include <limits>
 #include <random>
 #include <tuple>
+#include <vector>
 
 #include <gtest/gtest.h>
 #include <wpi/print.h>
diff --git a/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp b/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp
index 9619e6a30f3..11938246981 100644
--- a/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/SwerveDrivePoseEstimatorTest.cpp
@@ -3,9 +3,9 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <limits>
-#include <numbers>
 #include <random>
 #include <tuple>
+#include <vector>
 
 #include <fmt/format.h>
 #include <gtest/gtest.h>
diff --git a/wpimath/src/test/native/cpp/estimator/UnscentedKalmanFilterTest.cpp b/wpimath/src/test/native/cpp/estimator/UnscentedKalmanFilterTest.cpp
index 66be5083098..c2c6f824d8d 100644
--- a/wpimath/src/test/native/cpp/estimator/UnscentedKalmanFilterTest.cpp
+++ b/wpimath/src/test/native/cpp/estimator/UnscentedKalmanFilterTest.cpp
@@ -2,8 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <array>
 #include <cmath>
+#include <vector>
 
 #include <Eigen/QR>
 #include <gtest/gtest.h>
diff --git a/wpimath/src/test/native/cpp/system/LinearSystemIDTest.cpp b/wpimath/src/test/native/cpp/system/LinearSystemIDTest.cpp
index 7b59f59f70c..39e8a8c2564 100644
--- a/wpimath/src/test/native/cpp/system/LinearSystemIDTest.cpp
+++ b/wpimath/src/test/native/cpp/system/LinearSystemIDTest.cpp
@@ -8,7 +8,6 @@
 
 #include <gtest/gtest.h>
 
-#include "frc/system/plant/LinearSystemId.h"
 #include "units/length.h"
 #include "units/mass.h"
 
diff --git a/wpinet/examples/dsclient/dsclient.cpp b/wpinet/examples/dsclient/dsclient.cpp
index 596f617ac32..7f8b74e36d3 100644
--- a/wpinet/examples/dsclient/dsclient.cpp
+++ b/wpinet/examples/dsclient/dsclient.cpp
@@ -3,13 +3,13 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <cstdio>
+#include <memory>
 
 #include <wpi/Logger.h>
 #include <wpi/print.h>
 
 #include "wpinet/DsClient.h"
 #include "wpinet/EventLoopRunner.h"
-#include "wpinet/uv/Error.h"
 
 namespace uv = wpi::uv;
 
diff --git a/wpinet/examples/parallelconnect/parallelconnect.cpp b/wpinet/examples/parallelconnect/parallelconnect.cpp
index fecdac84737..adcc74e4621 100644
--- a/wpinet/examples/parallelconnect/parallelconnect.cpp
+++ b/wpinet/examples/parallelconnect/parallelconnect.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <cstdio>
+#include <memory>
 
 #include <wpi/Logger.h>
 
diff --git a/wpinet/examples/webserver/webserver.cpp b/wpinet/examples/webserver/webserver.cpp
index 53dd6ea1b47..0579c3fd653 100644
--- a/wpinet/examples/webserver/webserver.cpp
+++ b/wpinet/examples/webserver/webserver.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <cstdio>
+#include <memory>
 
 #include <wpi/print.h>
 
diff --git a/wpinet/src/main/native/cpp/DsClient.cpp b/wpinet/src/main/native/cpp/DsClient.cpp
index 97509cb323a..02a19c60088 100644
--- a/wpinet/src/main/native/cpp/DsClient.cpp
+++ b/wpinet/src/main/native/cpp/DsClient.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/DsClient.h"
 
+#include <memory>
+
 #include <fmt/format.h>
 #include <wpi/Logger.h>
 #include <wpi/StringExtras.h>
diff --git a/wpinet/src/main/native/cpp/EventLoopRunner.cpp b/wpinet/src/main/native/cpp/EventLoopRunner.cpp
index 6c143ac674f..8ee976c0d66 100644
--- a/wpinet/src/main/native/cpp/EventLoopRunner.cpp
+++ b/wpinet/src/main/native/cpp/EventLoopRunner.cpp
@@ -4,6 +4,9 @@
 
 #include "wpinet/EventLoopRunner.h"
 
+#include <memory>
+#include <utility>
+
 #include <wpi/SmallVector.h>
 #include <wpi/condition_variable.h>
 #include <wpi/mutex.h>
diff --git a/wpinet/src/main/native/cpp/HttpServerConnection.cpp b/wpinet/src/main/native/cpp/HttpServerConnection.cpp
index 765173e2ce2..8e8b5d0ffe0 100644
--- a/wpinet/src/main/native/cpp/HttpServerConnection.cpp
+++ b/wpinet/src/main/native/cpp/HttpServerConnection.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/HttpServerConnection.h"
 
+#include <memory>
+
 #include <wpi/SmallString.h>
 #include <wpi/SmallVector.h>
 #include <wpi/SpanExtras.h>
diff --git a/wpinet/src/main/native/cpp/HttpUtil.cpp b/wpinet/src/main/native/cpp/HttpUtil.cpp
index 12ff0841bfe..c17f68288f3 100644
--- a/wpinet/src/main/native/cpp/HttpUtil.cpp
+++ b/wpinet/src/main/native/cpp/HttpUtil.cpp
@@ -5,14 +5,14 @@
 #include "wpinet/HttpUtil.h"
 
 #include <cctype>
+#include <string>
+#include <utility>
 
 #include <fmt/format.h>
 #include <wpi/Base64.h>
 #include <wpi/StringExtras.h>
 #include <wpi/raw_ostream.h>
 
-#include "wpinet/TCPConnector.h"
-
 namespace wpi {
 
 std::string_view UnescapeURI(std::string_view str, SmallVectorImpl<char>& buf,
diff --git a/wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp
index daa7e8df038..3885d93f283 100644
--- a/wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp
+++ b/wpinet/src/main/native/cpp/MulticastServiceAnnouncer.cpp
@@ -4,6 +4,9 @@
 
 #include "wpinet/MulticastServiceAnnouncer.h"
 
+#include <memory>
+#include <utility>
+
 #include <wpi/SmallVector.h>
 
 #include "MulticastHandleManager.h"
diff --git a/wpinet/src/main/native/cpp/MulticastServiceResolver.cpp b/wpinet/src/main/native/cpp/MulticastServiceResolver.cpp
index c16db2e2e80..4a320899452 100644
--- a/wpinet/src/main/native/cpp/MulticastServiceResolver.cpp
+++ b/wpinet/src/main/native/cpp/MulticastServiceResolver.cpp
@@ -4,6 +4,10 @@
 
 #include "wpinet/MulticastServiceResolver.h"
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 #include <wpi/MemAlloc.h>
 
 #include "MulticastHandleManager.h"
diff --git a/wpinet/src/main/native/cpp/ParallelTcpConnector.cpp b/wpinet/src/main/native/cpp/ParallelTcpConnector.cpp
index 5fb1dd5ea29..30663fc7325 100644
--- a/wpinet/src/main/native/cpp/ParallelTcpConnector.cpp
+++ b/wpinet/src/main/native/cpp/ParallelTcpConnector.cpp
@@ -5,6 +5,10 @@
 #include "wpinet/ParallelTcpConnector.h"
 
 #include <cstring>
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
 
 #include <fmt/format.h>
 #include <wpi/Logger.h>
diff --git a/wpinet/src/main/native/cpp/PortForwarder.cpp b/wpinet/src/main/native/cpp/PortForwarder.cpp
index 7ba9ac485d6..d0e085df031 100644
--- a/wpinet/src/main/native/cpp/PortForwarder.cpp
+++ b/wpinet/src/main/native/cpp/PortForwarder.cpp
@@ -4,6 +4,9 @@
 
 #include "wpinet/PortForwarder.h"
 
+#include <memory>
+#include <string>
+
 #include <fmt/format.h>
 #include <wpi/DenseMap.h>
 #include <wpi/print.h>
diff --git a/wpinet/src/main/native/cpp/SocketError.cpp b/wpinet/src/main/native/cpp/SocketError.cpp
index 233c5de366c..26a43efe2a2 100644
--- a/wpinet/src/main/native/cpp/SocketError.cpp
+++ b/wpinet/src/main/native/cpp/SocketError.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/SocketError.h"
 
+#include <string>
+
 #ifdef _WIN32
 #include <winsock2.h>
 #else
diff --git a/wpinet/src/main/native/cpp/UDPClient.cpp b/wpinet/src/main/native/cpp/UDPClient.cpp
index 1e9bc872ddf..6a438b15f3c 100644
--- a/wpinet/src/main/native/cpp/UDPClient.cpp
+++ b/wpinet/src/main/native/cpp/UDPClient.cpp
@@ -16,6 +16,8 @@
 #include <unistd.h>
 #endif
 
+#include <utility>
+
 #include <wpi/Logger.h>
 #include <wpi/SmallString.h>
 
diff --git a/wpinet/src/main/native/cpp/WebSocket.cpp b/wpinet/src/main/native/cpp/WebSocket.cpp
index 3a6c346ba4d..142369c1da9 100644
--- a/wpinet/src/main/native/cpp/WebSocket.cpp
+++ b/wpinet/src/main/native/cpp/WebSocket.cpp
@@ -4,10 +4,13 @@
 
 #include "wpinet/WebSocket.h"
 
+#include <functional>
+#include <memory>
 #include <random>
 #include <span>
 #include <string>
 #include <string_view>
+#include <utility>
 
 #include <wpi/Base64.h>
 #include <wpi/SmallString.h>
diff --git a/wpinet/src/main/native/cpp/WebSocketServer.cpp b/wpinet/src/main/native/cpp/WebSocketServer.cpp
index 383d8559cc7..9b75aabaeda 100644
--- a/wpinet/src/main/native/cpp/WebSocketServer.cpp
+++ b/wpinet/src/main/native/cpp/WebSocketServer.cpp
@@ -4,6 +4,7 @@
 
 #include "wpinet/WebSocketServer.h"
 
+#include <memory>
 #include <utility>
 
 #include <wpi/StringExtras.h>
diff --git a/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp b/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp
index 1528001ea5c..fb59c4d9598 100644
--- a/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp
+++ b/wpinet/src/main/native/cpp/jni/WPINetJNI.cpp
@@ -4,6 +4,11 @@
 
 #include <jni.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+#include <vector>
+
 #include <wpi/jni_util.h>
 
 #include "../MulticastHandleManager.h"
diff --git a/wpinet/src/main/native/cpp/uv/Async.cpp b/wpinet/src/main/native/cpp/uv/Async.cpp
index 58ef5f392b3..17f7c57f694 100644
--- a/wpinet/src/main/native/cpp/uv/Async.cpp
+++ b/wpinet/src/main/native/cpp/uv/Async.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/uv/Async.h"
 
+#include <memory>
+
 #include "wpinet/uv/Loop.h"
 
 namespace wpi::uv {
diff --git a/wpinet/src/main/native/cpp/uv/Check.cpp b/wpinet/src/main/native/cpp/uv/Check.cpp
index 75ff47c7a47..25c3ed41586 100644
--- a/wpinet/src/main/native/cpp/uv/Check.cpp
+++ b/wpinet/src/main/native/cpp/uv/Check.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/uv/Check.h"
 
+#include <memory>
+
 #include "wpinet/uv/Loop.h"
 
 namespace wpi::uv {
diff --git a/wpinet/src/main/native/cpp/uv/FsEvent.cpp b/wpinet/src/main/native/cpp/uv/FsEvent.cpp
index d77bf37c4be..65d1af57036 100644
--- a/wpinet/src/main/native/cpp/uv/FsEvent.cpp
+++ b/wpinet/src/main/native/cpp/uv/FsEvent.cpp
@@ -5,6 +5,8 @@
 #include "wpinet/uv/FsEvent.h"
 
 #include <cstdlib>
+#include <memory>
+#include <string>
 
 #include <wpi/SmallString.h>
 
diff --git a/wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp b/wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp
index c3ec00010e4..0b547e6ff52 100644
--- a/wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp
+++ b/wpinet/src/main/native/cpp/uv/GetAddrInfo.cpp
@@ -4,10 +4,13 @@
 
 #include "wpinet/uv/GetAddrInfo.h"
 
+#include <functional>
+#include <memory>
+#include <utility>
+
 #include <wpi/SmallString.h>
 
 #include "wpinet/uv/Loop.h"
-#include "wpinet/uv/util.h"
 
 namespace wpi::uv {
 
diff --git a/wpinet/src/main/native/cpp/uv/GetNameInfo.cpp b/wpinet/src/main/native/cpp/uv/GetNameInfo.cpp
index 9720cc3be7e..0a4b4a4d0e6 100644
--- a/wpinet/src/main/native/cpp/uv/GetNameInfo.cpp
+++ b/wpinet/src/main/native/cpp/uv/GetNameInfo.cpp
@@ -4,6 +4,10 @@
 
 #include "wpinet/uv/GetNameInfo.h"
 
+#include <functional>
+#include <memory>
+#include <utility>
+
 #include "wpinet/uv/Loop.h"
 #include "wpinet/uv/util.h"
 
diff --git a/wpinet/src/main/native/cpp/uv/Idle.cpp b/wpinet/src/main/native/cpp/uv/Idle.cpp
index 7b94b3f4a88..665f4f2e2be 100644
--- a/wpinet/src/main/native/cpp/uv/Idle.cpp
+++ b/wpinet/src/main/native/cpp/uv/Idle.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/uv/Idle.h"
 
+#include <memory>
+
 #include "wpinet/uv/Loop.h"
 
 namespace wpi::uv {
diff --git a/wpinet/src/main/native/cpp/uv/Loop.cpp b/wpinet/src/main/native/cpp/uv/Loop.cpp
index d48e230dab9..2aee216ed01 100644
--- a/wpinet/src/main/native/cpp/uv/Loop.cpp
+++ b/wpinet/src/main/native/cpp/uv/Loop.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/uv/Loop.h"
 
+#include <memory>
+
 using namespace wpi::uv;
 
 Loop::Loop(const private_init&) noexcept {
diff --git a/wpinet/src/main/native/cpp/uv/NetworkStream.cpp b/wpinet/src/main/native/cpp/uv/NetworkStream.cpp
index 12750b2b769..8dc7e544570 100644
--- a/wpinet/src/main/native/cpp/uv/NetworkStream.cpp
+++ b/wpinet/src/main/native/cpp/uv/NetworkStream.cpp
@@ -4,6 +4,9 @@
 
 #include "wpinet/uv/NetworkStream.h"
 
+#include <functional>
+#include <utility>
+
 namespace wpi::uv {
 
 ConnectReq::ConnectReq() {
diff --git a/wpinet/src/main/native/cpp/uv/Pipe.cpp b/wpinet/src/main/native/cpp/uv/Pipe.cpp
index 799360409e7..ad93687e89e 100644
--- a/wpinet/src/main/native/cpp/uv/Pipe.cpp
+++ b/wpinet/src/main/native/cpp/uv/Pipe.cpp
@@ -5,6 +5,10 @@
 #include "wpinet/uv/Pipe.h"
 
 #include <cstdlib>
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
 
 #include <wpi/SmallString.h>
 
diff --git a/wpinet/src/main/native/cpp/uv/Poll.cpp b/wpinet/src/main/native/cpp/uv/Poll.cpp
index 7d356151182..5967bbd298b 100644
--- a/wpinet/src/main/native/cpp/uv/Poll.cpp
+++ b/wpinet/src/main/native/cpp/uv/Poll.cpp
@@ -4,6 +4,10 @@
 
 #include "wpinet/uv/Poll.h"
 
+#include <functional>
+#include <memory>
+#include <utility>
+
 #include "wpinet/uv/Loop.h"
 
 namespace wpi::uv {
diff --git a/wpinet/src/main/native/cpp/uv/Prepare.cpp b/wpinet/src/main/native/cpp/uv/Prepare.cpp
index aa1a89d6e13..88e146e7f0a 100644
--- a/wpinet/src/main/native/cpp/uv/Prepare.cpp
+++ b/wpinet/src/main/native/cpp/uv/Prepare.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/uv/Prepare.h"
 
+#include <memory>
+
 #include "wpinet/uv/Loop.h"
 
 namespace wpi::uv {
diff --git a/wpinet/src/main/native/cpp/uv/Process.cpp b/wpinet/src/main/native/cpp/uv/Process.cpp
index c872ff9b85d..7a653078e9d 100644
--- a/wpinet/src/main/native/cpp/uv/Process.cpp
+++ b/wpinet/src/main/native/cpp/uv/Process.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/uv/Process.h"
 
+#include <memory>
+
 #include <wpi/SmallString.h>
 
 #include "wpinet/uv/Loop.h"
diff --git a/wpinet/src/main/native/cpp/uv/Signal.cpp b/wpinet/src/main/native/cpp/uv/Signal.cpp
index 8f998e2b486..c8fde756b02 100644
--- a/wpinet/src/main/native/cpp/uv/Signal.cpp
+++ b/wpinet/src/main/native/cpp/uv/Signal.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/uv/Signal.h"
 
+#include <memory>
+
 #include "wpinet/uv/Loop.h"
 
 namespace wpi::uv {
diff --git a/wpinet/src/main/native/cpp/uv/Stream.cpp b/wpinet/src/main/native/cpp/uv/Stream.cpp
index 164b30ac2e1..79c333d5e7e 100644
--- a/wpinet/src/main/native/cpp/uv/Stream.cpp
+++ b/wpinet/src/main/native/cpp/uv/Stream.cpp
@@ -4,6 +4,11 @@
 
 #include "wpinet/uv/Stream.h"
 
+#include <functional>
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <wpi/Logger.h>
 #include <wpi/SmallVector.h>
 #include <wpi/raw_ostream.h>
diff --git a/wpinet/src/main/native/cpp/uv/Tcp.cpp b/wpinet/src/main/native/cpp/uv/Tcp.cpp
index b163a0efbaa..5b54edd4f16 100644
--- a/wpinet/src/main/native/cpp/uv/Tcp.cpp
+++ b/wpinet/src/main/native/cpp/uv/Tcp.cpp
@@ -5,6 +5,9 @@
 #include "wpinet/uv/Tcp.h"
 
 #include <cstring>
+#include <functional>
+#include <memory>
+#include <utility>
 
 #include "wpinet/uv/util.h"
 
diff --git a/wpinet/src/main/native/cpp/uv/Timer.cpp b/wpinet/src/main/native/cpp/uv/Timer.cpp
index e9b33fc7c7d..fa5e3bce6e8 100644
--- a/wpinet/src/main/native/cpp/uv/Timer.cpp
+++ b/wpinet/src/main/native/cpp/uv/Timer.cpp
@@ -4,6 +4,10 @@
 
 #include "wpinet/uv/Timer.h"
 
+#include <functional>
+#include <memory>
+#include <utility>
+
 #include "wpinet/uv/Loop.h"
 
 namespace wpi::uv {
diff --git a/wpinet/src/main/native/cpp/uv/Tty.cpp b/wpinet/src/main/native/cpp/uv/Tty.cpp
index 5e5756cacc8..58f3a072c02 100644
--- a/wpinet/src/main/native/cpp/uv/Tty.cpp
+++ b/wpinet/src/main/native/cpp/uv/Tty.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/uv/Tty.h"
 
+#include <memory>
+
 #include "wpinet/uv/Loop.h"
 
 namespace wpi::uv {
diff --git a/wpinet/src/main/native/cpp/uv/Udp.cpp b/wpinet/src/main/native/cpp/uv/Udp.cpp
index 1922c57596f..f9b9896379e 100644
--- a/wpinet/src/main/native/cpp/uv/Udp.cpp
+++ b/wpinet/src/main/native/cpp/uv/Udp.cpp
@@ -5,6 +5,9 @@
 #include "wpinet/uv/Udp.h"
 
 #include <cstring>
+#include <functional>
+#include <memory>
+#include <utility>
 
 #include <wpi/SmallString.h>
 #include <wpi/SmallVector.h>
diff --git a/wpinet/src/main/native/cpp/uv/Work.cpp b/wpinet/src/main/native/cpp/uv/Work.cpp
index d94619fd211..c19f2f4db05 100644
--- a/wpinet/src/main/native/cpp/uv/Work.cpp
+++ b/wpinet/src/main/native/cpp/uv/Work.cpp
@@ -4,6 +4,10 @@
 
 #include "wpinet/uv/Work.h"
 
+#include <functional>
+#include <memory>
+#include <utility>
+
 #include "wpinet/uv/Loop.h"
 
 namespace wpi::uv {
diff --git a/wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp
index d04711fa57c..d6cbcb83a25 100644
--- a/wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp
+++ b/wpinet/src/main/native/linux/MulticastServiceAnnouncer.cpp
@@ -4,6 +4,9 @@
 
 #include "wpinet/MulticastServiceAnnouncer.h"
 
+#include <memory>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include <fmt/format.h>
diff --git a/wpinet/src/main/native/linux/MulticastServiceResolver.cpp b/wpinet/src/main/native/linux/MulticastServiceResolver.cpp
index a408639138b..e0598a03681 100644
--- a/wpinet/src/main/native/linux/MulticastServiceResolver.cpp
+++ b/wpinet/src/main/native/linux/MulticastServiceResolver.cpp
@@ -4,6 +4,10 @@
 
 #include "wpinet/MulticastServiceResolver.h"
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <wpi/SmallString.h>
 #include <wpi/StringExtras.h>
 #include <wpi/mutex.h>
diff --git a/wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp
index 8c31a3b22fe..3fcb585f8c1 100644
--- a/wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp
+++ b/wpinet/src/main/native/macOS/MulticastServiceAnnouncer.cpp
@@ -6,6 +6,10 @@
 
 #include <arpa/inet.h>
 
+#include <memory>
+#include <string>
+#include <utility>
+
 #include <wpi/SmallString.h>
 
 #include "dns_sd.h"
diff --git a/wpinet/src/main/native/macOS/MulticastServiceResolver.cpp b/wpinet/src/main/native/macOS/MulticastServiceResolver.cpp
index eecf819814f..dc18dab7399 100644
--- a/wpinet/src/main/native/macOS/MulticastServiceResolver.cpp
+++ b/wpinet/src/main/native/macOS/MulticastServiceResolver.cpp
@@ -10,7 +10,10 @@
 #include <poll.h>
 
 #include <atomic>
+#include <memory>
+#include <string>
 #include <thread>
+#include <utility>
 #include <vector>
 
 #include <wpi/SmallVector.h>
diff --git a/wpinet/src/main/native/macOS/ResolverThread.cpp b/wpinet/src/main/native/macOS/ResolverThread.cpp
index 14526709e1d..b113fd817d9 100644
--- a/wpinet/src/main/native/macOS/ResolverThread.cpp
+++ b/wpinet/src/main/native/macOS/ResolverThread.cpp
@@ -7,6 +7,9 @@
 #include "ResolverThread.h"
 
 #include <algorithm>
+#include <memory>
+#include <utility>
+#include <vector>
 
 #include <wpi/mutex.h>
 
diff --git a/wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp b/wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp
index c1ed58d480a..21a103d712b 100644
--- a/wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp
+++ b/wpinet/src/main/native/windows/MulticastServiceAnnouncer.cpp
@@ -8,7 +8,9 @@
 
 #include "wpinet/MulticastServiceAnnouncer.h"
 
+#include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <wpi/ConvertUTF.h>
diff --git a/wpinet/src/main/native/windows/MulticastServiceResolver.cpp b/wpinet/src/main/native/windows/MulticastServiceResolver.cpp
index 79fc7b5ef71..c8a3d793e13 100644
--- a/wpinet/src/main/native/windows/MulticastServiceResolver.cpp
+++ b/wpinet/src/main/native/windows/MulticastServiceResolver.cpp
@@ -8,7 +8,9 @@
 
 #include "wpinet/MulticastServiceResolver.h"
 
+#include <memory>
 #include <string>
+#include <utility>
 
 #include <wpi/ConvertUTF.h>
 #include <wpi/SmallString.h>
diff --git a/wpinet/src/netconsoleServer/native/cpp/main.cpp b/wpinet/src/netconsoleServer/native/cpp/main.cpp
index 4092e7d5f86..f65ada535a0 100644
--- a/wpinet/src/netconsoleServer/native/cpp/main.cpp
+++ b/wpinet/src/netconsoleServer/native/cpp/main.cpp
@@ -9,6 +9,8 @@
 #endif
 
 #include <cstdio>
+#include <memory>
+#include <string>
 
 #include <fmt/format.h>
 #include <wpi/MathExtras.h>
diff --git a/wpinet/src/netconsoleTee/native/cpp/main.cpp b/wpinet/src/netconsoleTee/native/cpp/main.cpp
index da1210d9b2a..bd3da809e9a 100644
--- a/wpinet/src/netconsoleTee/native/cpp/main.cpp
+++ b/wpinet/src/netconsoleTee/native/cpp/main.cpp
@@ -3,6 +3,8 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <cstdio>
+#include <memory>
+#include <string>
 
 #include <fmt/format.h>
 #include <wpi/MathExtras.h>
diff --git a/wpinet/src/test/native/cpp/HttpWebSocketServerConnectionTest.cpp b/wpinet/src/test/native/cpp/HttpWebSocketServerConnectionTest.cpp
index 9c2d8749c9c..d6b10633b1f 100644
--- a/wpinet/src/test/native/cpp/HttpWebSocketServerConnectionTest.cpp
+++ b/wpinet/src/test/native/cpp/HttpWebSocketServerConnectionTest.cpp
@@ -4,6 +4,8 @@
 
 #include "wpinet/HttpWebSocketServerConnection.h"  // NOLINT(build/include_order)
 
+#include <memory>
+
 #include <gtest/gtest.h>
 
 namespace wpi {
diff --git a/wpinet/src/test/native/cpp/WebSocketClientTest.cpp b/wpinet/src/test/native/cpp/WebSocketClientTest.cpp
index a603d9c05ab..c5bff34ff24 100644
--- a/wpinet/src/test/native/cpp/WebSocketClientTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketClientTest.cpp
@@ -4,6 +4,11 @@
 
 #include "wpinet/WebSocket.h"  // NOLINT(build/include_order)
 
+#include <functional>
+#include <memory>
+#include <string>
+#include <vector>
+
 #include <wpi/Base64.h>
 #include <wpi/SmallString.h>
 #include <wpi/StringExtras.h>
diff --git a/wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp b/wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp
index 6b74d822d22..1105a23076e 100644
--- a/wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketIntegrationTest.cpp
@@ -4,10 +4,11 @@
 
 #include "wpinet/WebSocketServer.h"  // NOLINT(build/include_order)
 
+#include <vector>
+
 #include <wpi/SmallString.h>
 
 #include "WebSocketTest.h"
-#include "wpinet/HttpParser.h"
 
 namespace wpi {
 
diff --git a/wpinet/src/test/native/cpp/WebSocketSerializerTest.cpp b/wpinet/src/test/native/cpp/WebSocketSerializerTest.cpp
index f1e2629331a..e82f8875511 100644
--- a/wpinet/src/test/native/cpp/WebSocketSerializerTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketSerializerTest.cpp
@@ -6,8 +6,12 @@
 
 #include <algorithm>
 #include <array>
+#include <functional>
+#include <memory>
 #include <ostream>
 #include <span>
+#include <utility>
+#include <vector>
 
 #include <gmock/gmock.h>
 #include <wpi/SpanMatcher.h>
diff --git a/wpinet/src/test/native/cpp/WebSocketServerTest.cpp b/wpinet/src/test/native/cpp/WebSocketServerTest.cpp
index a051e553111..51b6f3d0808 100644
--- a/wpinet/src/test/native/cpp/WebSocketServerTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketServerTest.cpp
@@ -4,13 +4,16 @@
 
 #include "wpinet/WebSocket.h"  // NOLINT(build/include_order)
 
+#include <functional>
+#include <memory>
+#include <vector>
+
 #include <wpi/Base64.h>
 #include <wpi/SmallString.h>
 #include <wpi/sha1.h>
 
 #include "WebSocketTest.h"
 #include "wpinet/HttpParser.h"
-#include "wpinet/raw_uv_ostream.h"
 
 namespace wpi {
 
diff --git a/wpinet/src/test/native/cpp/WebSocketTest.cpp b/wpinet/src/test/native/cpp/WebSocketTest.cpp
index e5f03de2254..fad6b3660b2 100644
--- a/wpinet/src/test/native/cpp/WebSocketTest.cpp
+++ b/wpinet/src/test/native/cpp/WebSocketTest.cpp
@@ -6,6 +6,9 @@
 
 #include "WebSocketTest.h"
 
+#include <utility>
+#include <vector>
+
 #include <wpi/StringExtras.h>
 
 #include "wpinet/HttpParser.h"
diff --git a/wpinet/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp b/wpinet/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp
index 4369dc0fc0f..0f488f8d046 100644
--- a/wpinet/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp
+++ b/wpinet/src/test/native/cpp/uv/UvAsyncFunctionTest.cpp
@@ -4,7 +4,9 @@
 
 #include "wpinet/uv/AsyncFunction.h"  // NOLINT(build/include_order)
 
+#include <memory>
 #include <thread>
+#include <utility>
 
 #include <gtest/gtest.h>
 
diff --git a/wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp b/wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp
index ed4324c0f11..bfecb7594c5 100644
--- a/wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp
+++ b/wpinet/src/test/native/cpp/uv/UvAsyncTest.cpp
@@ -26,6 +26,7 @@
 #include "wpinet/uv/Async.h"  // NOLINT(build/include_order)
 
 #include <atomic>
+#include <functional>
 #include <thread>
 
 #include <gtest/gtest.h>
diff --git a/wpiutil/examples/printlog/printlog.cpp b/wpiutil/examples/printlog/printlog.cpp
index 11bed9015b2..a17d30b3852 100644
--- a/wpiutil/examples/printlog/printlog.cpp
+++ b/wpiutil/examples/printlog/printlog.cpp
@@ -3,6 +3,8 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <ctime>
+#include <utility>
+#include <vector>
 
 #include <fmt/chrono.h>
 #include <fmt/format.h>
diff --git a/wpiutil/examples/writelog/writelog.cpp b/wpiutil/examples/writelog/writelog.cpp
index 0d8283ca121..dd9f8fa33da 100644
--- a/wpiutil/examples/writelog/writelog.cpp
+++ b/wpiutil/examples/writelog/writelog.cpp
@@ -2,10 +2,10 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
-#include <array>
 #include <chrono>
 #include <numeric>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include "wpi/DataLogBackgroundWriter.h"
diff --git a/wpiutil/src/main/native/cpp/Base64.cpp b/wpiutil/src/main/native/cpp/Base64.cpp
index bc1d3bae696..b70298d12d1 100644
--- a/wpiutil/src/main/native/cpp/Base64.cpp
+++ b/wpiutil/src/main/native/cpp/Base64.cpp
@@ -57,6 +57,9 @@
 
 #include "wpi/Base64.h"
 
+#include <string>
+#include <vector>
+
 #include "wpi/SmallVector.h"
 #include "wpi/raw_ostream.h"
 
diff --git a/wpiutil/src/main/native/cpp/DataLog.cpp b/wpiutil/src/main/native/cpp/DataLog.cpp
index dd717cc6c0a..45c1844b11d 100644
--- a/wpiutil/src/main/native/cpp/DataLog.cpp
+++ b/wpiutil/src/main/native/cpp/DataLog.cpp
@@ -9,6 +9,8 @@
 #include <cstdio>
 #include <cstdlib>
 #include <cstring>
+#include <string>
+#include <utility>
 #include <vector>
 
 #include "wpi/Endian.h"
diff --git a/wpiutil/src/main/native/cpp/DataLogBackgroundWriter.cpp b/wpiutil/src/main/native/cpp/DataLogBackgroundWriter.cpp
index ec01346ef03..b20d4b73908 100644
--- a/wpiutil/src/main/native/cpp/DataLogBackgroundWriter.cpp
+++ b/wpiutil/src/main/native/cpp/DataLogBackgroundWriter.cpp
@@ -18,6 +18,9 @@
 #endif
 
 #include <random>
+#include <string>
+#include <utility>
+#include <vector>
 
 #include <fmt/format.h>
 
diff --git a/wpiutil/src/main/native/cpp/DataLogReader.cpp b/wpiutil/src/main/native/cpp/DataLogReader.cpp
index c2e1192e14a..17b2c9fa018 100644
--- a/wpiutil/src/main/native/cpp/DataLogReader.cpp
+++ b/wpiutil/src/main/native/cpp/DataLogReader.cpp
@@ -4,6 +4,8 @@
 
 #include "wpi/DataLogReader.h"
 
+#include <utility>
+
 #include "wpi/DataLog.h"
 #include "wpi/Endian.h"
 #include "wpi/MathExtras.h"
diff --git a/wpiutil/src/main/native/cpp/DataLogWriter.cpp b/wpiutil/src/main/native/cpp/DataLogWriter.cpp
index c4e4a501d4b..371a2bf901b 100644
--- a/wpiutil/src/main/native/cpp/DataLogWriter.cpp
+++ b/wpiutil/src/main/native/cpp/DataLogWriter.cpp
@@ -4,6 +4,10 @@
 
 #include "wpi/DataLogWriter.h"
 
+#include <memory>
+#include <utility>
+#include <vector>
+
 #include "wpi/raw_ostream.h"
 
 using namespace wpi::log;
diff --git a/wpiutil/src/main/native/cpp/MessagePack.cpp b/wpiutil/src/main/native/cpp/MessagePack.cpp
index 60a2f013ce7..192476bfdc5 100644
--- a/wpiutil/src/main/native/cpp/MessagePack.cpp
+++ b/wpiutil/src/main/native/cpp/MessagePack.cpp
@@ -4,6 +4,8 @@
 
 #include "wpi/MessagePack.h"
 
+#include <string>
+
 using namespace mpack;
 
 mpack_error_t mpack::mpack_expect_str(mpack_reader_t* reader, std::string* out,
diff --git a/wpiutil/src/main/native/cpp/SafeThread.cpp b/wpiutil/src/main/native/cpp/SafeThread.cpp
index ba1eba3131e..aefbd231c29 100644
--- a/wpiutil/src/main/native/cpp/SafeThread.cpp
+++ b/wpiutil/src/main/native/cpp/SafeThread.cpp
@@ -5,6 +5,8 @@
 #include "wpi/SafeThread.h"
 
 #include <atomic>
+#include <memory>
+#include <utility>
 
 using namespace wpi;
 
diff --git a/wpiutil/src/main/native/cpp/StackTraceWrap.cpp b/wpiutil/src/main/native/cpp/StackTraceWrap.cpp
index 37a83f7ef04..4d52a593987 100644
--- a/wpiutil/src/main/native/cpp/StackTraceWrap.cpp
+++ b/wpiutil/src/main/native/cpp/StackTraceWrap.cpp
@@ -3,6 +3,7 @@
 // the WPILib BSD license file in the root directory of this project.
 
 #include <atomic>
+#include <string>
 
 #include "wpi/StackTrace.h"
 
diff --git a/wpiutil/src/main/native/cpp/future.cpp b/wpiutil/src/main/native/cpp/future.cpp
index 109eeb93ca3..df26872ce1a 100644
--- a/wpiutil/src/main/native/cpp/future.cpp
+++ b/wpiutil/src/main/native/cpp/future.cpp
@@ -4,6 +4,8 @@
 
 #include "wpi/future.h"
 
+#include <utility>
+
 namespace wpi {
 namespace detail {
 
diff --git a/wpiutil/src/main/native/cpp/jni/DataLogJNI.cpp b/wpiutil/src/main/native/cpp/jni/DataLogJNI.cpp
index e98c13f8dfa..782266874d0 100644
--- a/wpiutil/src/main/native/cpp/jni/DataLogJNI.cpp
+++ b/wpiutil/src/main/native/cpp/jni/DataLogJNI.cpp
@@ -5,6 +5,7 @@
 #include <jni.h>
 
 #include <algorithm>
+#include <string>
 #include <vector>
 
 #include <fmt/format.h>
diff --git a/wpiutil/src/main/native/cpp/protobuf/Protobuf.cpp b/wpiutil/src/main/native/cpp/protobuf/Protobuf.cpp
index 4dd747098f3..4fc10b26a67 100644
--- a/wpiutil/src/main/native/cpp/protobuf/Protobuf.cpp
+++ b/wpiutil/src/main/native/cpp/protobuf/Protobuf.cpp
@@ -4,6 +4,9 @@
 
 #include "wpi/protobuf/Protobuf.h"
 
+#include <string>
+#include <vector>
+
 #include <fmt/format.h>
 #include <google/protobuf/descriptor.h>
 #include <google/protobuf/descriptor.pb.h>
diff --git a/wpiutil/src/main/native/cpp/protobuf/ProtobufMessageDatabase.cpp b/wpiutil/src/main/native/cpp/protobuf/ProtobufMessageDatabase.cpp
index 7583f675f6c..17a22db809d 100644
--- a/wpiutil/src/main/native/cpp/protobuf/ProtobufMessageDatabase.cpp
+++ b/wpiutil/src/main/native/cpp/protobuf/ProtobufMessageDatabase.cpp
@@ -4,6 +4,9 @@
 
 #include "wpi/protobuf/ProtobufMessageDatabase.h"
 
+#include <memory>
+#include <string>
+
 #include <google/protobuf/descriptor.h>
 
 #include "wpi/ProtoHelper.h"
diff --git a/wpiutil/src/main/native/cpp/sendable/SendableRegistry.cpp b/wpiutil/src/main/native/cpp/sendable/SendableRegistry.cpp
index 7a1e0b0b10a..c2b6b8ede77 100644
--- a/wpiutil/src/main/native/cpp/sendable/SendableRegistry.cpp
+++ b/wpiutil/src/main/native/cpp/sendable/SendableRegistry.cpp
@@ -5,6 +5,8 @@
 #include "wpi/sendable/SendableRegistry.h"
 
 #include <memory>
+#include <string>
+#include <utility>
 
 #include <fmt/format.h>
 
diff --git a/wpiutil/src/main/native/cpp/sha1.cpp b/wpiutil/src/main/native/cpp/sha1.cpp
index 98dc5433cb6..82041144922 100644
--- a/wpiutil/src/main/native/cpp/sha1.cpp
+++ b/wpiutil/src/main/native/cpp/sha1.cpp
@@ -19,6 +19,8 @@
 
 #include "wpi/sha1.h"
 
+#include <string>
+
 #include "wpi/SmallVector.h"
 #include "wpi/StringExtras.h"
 #include "wpi/raw_istream.h"
diff --git a/wpiutil/src/main/native/cpp/string.cpp b/wpiutil/src/main/native/cpp/string.cpp
index e7a7ea3597b..3c5d47067f5 100644
--- a/wpiutil/src/main/native/cpp/string.cpp
+++ b/wpiutil/src/main/native/cpp/string.cpp
@@ -2,6 +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 "string"
 #include "wpi/string.h"
 
 #include <wpi/MemAlloc.h>
diff --git a/wpiutil/src/main/native/cpp/struct/DynamicStruct.cpp b/wpiutil/src/main/native/cpp/struct/DynamicStruct.cpp
index 8d43f537444..b2e667b5ad3 100644
--- a/wpiutil/src/main/native/cpp/struct/DynamicStruct.cpp
+++ b/wpiutil/src/main/native/cpp/struct/DynamicStruct.cpp
@@ -5,6 +5,9 @@
 #include "wpi/struct/DynamicStruct.h"
 
 #include <algorithm>
+#include <memory>
+#include <string>
+#include <utility>
 
 #include <fmt/format.h>
 
diff --git a/wpiutil/src/main/native/cpp/struct/SchemaParser.cpp b/wpiutil/src/main/native/cpp/struct/SchemaParser.cpp
index 347019e9d30..ffce8e62e8a 100644
--- a/wpiutil/src/main/native/cpp/struct/SchemaParser.cpp
+++ b/wpiutil/src/main/native/cpp/struct/SchemaParser.cpp
@@ -4,6 +4,9 @@
 
 #include "wpi/struct/SchemaParser.h"
 
+#include <string>
+#include <utility>
+
 #include <fmt/format.h>
 
 #include "wpi/StringExtras.h"
diff --git a/wpiutil/src/main/native/cpp/timestamp.cpp b/wpiutil/src/main/native/cpp/timestamp.cpp
index 3f9e1f3e741..64725eb7fa3 100644
--- a/wpiutil/src/main/native/cpp/timestamp.cpp
+++ b/wpiutil/src/main/native/cpp/timestamp.cpp
@@ -6,6 +6,7 @@
 
 #include <atomic>
 #include <optional>
+#include <utility>
 
 #ifdef __FRC_ROBORIO__
 #include <stdint.h>
@@ -21,7 +22,8 @@ using namespace nRoboRIO_FPGANamespace;
 }  // namespace fpga
 #include <memory>
 
-#include "dlfcn.h"
+#include "dlfcn.h"  // NOLINT(build/include_subdir)
+
 #endif
 
 #ifdef _WIN32
diff --git a/wpiutil/src/main/native/include/wpi/RawFrame.h b/wpiutil/src/main/native/include/wpi/RawFrame.h
index 2e925b1e0ba..420f8199792 100644
--- a/wpiutil/src/main/native/include/wpi/RawFrame.h
+++ b/wpiutil/src/main/native/include/wpi/RawFrame.h
@@ -17,7 +17,7 @@
 #endif
 
 #ifdef WPI_RAWFRAME_JNI
-#include "jni_util.h"
+#include "wpi/jni_util.h"
 #endif
 
 // NOLINT
diff --git a/wpiutil/src/main/native/include/wpi/mutex.h b/wpiutil/src/main/native/include/wpi/mutex.h
index c29509a915b..4bb1377b75d 100644
--- a/wpiutil/src/main/native/include/wpi/mutex.h
+++ b/wpiutil/src/main/native/include/wpi/mutex.h
@@ -6,7 +6,7 @@
 
 #include <mutex>
 
-#include "priority_mutex.h"
+#include "wpi/priority_mutex.h"
 
 namespace wpi {
 
diff --git a/wpiutil/src/main/native/include/wpi/print.h b/wpiutil/src/main/native/include/wpi/print.h
index 36bc966f140..422e65dc639 100644
--- a/wpiutil/src/main/native/include/wpi/print.h
+++ b/wpiutil/src/main/native/include/wpi/print.h
@@ -4,6 +4,7 @@
 
 #pragma once
 
+#include <cstdio>
 #include <system_error>
 #include <utility>
 
diff --git a/wpiutil/src/main/native/unix/Demangle.cpp b/wpiutil/src/main/native/unix/Demangle.cpp
index 69404ed792b..d376879b4c3 100644
--- a/wpiutil/src/main/native/unix/Demangle.cpp
+++ b/wpiutil/src/main/native/unix/Demangle.cpp
@@ -7,6 +7,7 @@
 #include <cxxabi.h>
 
 #include <cstdio>
+#include <string>
 
 #include "wpi/SmallString.h"
 
diff --git a/wpiutil/src/main/native/unix/StackTrace.cpp b/wpiutil/src/main/native/unix/StackTrace.cpp
index 3b6606533b7..c0d9e546581 100644
--- a/wpiutil/src/main/native/unix/StackTrace.cpp
+++ b/wpiutil/src/main/native/unix/StackTrace.cpp
@@ -6,6 +6,8 @@
 
 #include <execinfo.h>
 
+#include <string>
+
 #include "wpi/Demangle.h"
 #include "wpi/SmallString.h"
 #include "wpi/StringExtras.h"
diff --git a/wpiutil/src/main/native/windows/Demangle.cpp b/wpiutil/src/main/native/windows/Demangle.cpp
index 18be3711f5b..f5a51bb3bd2 100644
--- a/wpiutil/src/main/native/windows/Demangle.cpp
+++ b/wpiutil/src/main/native/windows/Demangle.cpp
@@ -8,6 +8,8 @@
 
 #include <dbghelp.h>
 
+#include <string>
+
 #include "wpi/SmallString.h"
 #include "wpi/mutex.h"
 
diff --git a/wpiutil/src/main/native/windows/StackTrace.cpp b/wpiutil/src/main/native/windows/StackTrace.cpp
index 5df8a6af7ac..db17bf8e83c 100644
--- a/wpiutil/src/main/native/windows/StackTrace.cpp
+++ b/wpiutil/src/main/native/windows/StackTrace.cpp
@@ -4,6 +4,8 @@
 
 #include "wpi/StackTrace.h"
 
+#include <string>
+
 #include "StackWalker.h"
 #include "wpi/ConvertUTF.h"
 #include "wpi/SmallString.h"
diff --git a/wpiutil/src/test/native/cpp/Base64Test.cpp b/wpiutil/src/test/native/cpp/Base64Test.cpp
index 9db43495033..b7ce945c58e 100644
--- a/wpiutil/src/test/native/cpp/Base64Test.cpp
+++ b/wpiutil/src/test/native/cpp/Base64Test.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <string>
+
 #include <gtest/gtest.h>
 
 #include "wpi/Base64.h"
diff --git a/wpiutil/src/test/native/cpp/DataLogTest.cpp b/wpiutil/src/test/native/cpp/DataLogTest.cpp
index cc94adf88fa..149d3a36b78 100644
--- a/wpiutil/src/test/native/cpp/DataLogTest.cpp
+++ b/wpiutil/src/test/native/cpp/DataLogTest.cpp
@@ -4,6 +4,8 @@
 
 #include <array>
 #include <memory>
+#include <string>
+#include <vector>
 
 #include <gtest/gtest.h>
 
diff --git a/wpiutil/src/test/native/cpp/FileLoggerTest.cpp b/wpiutil/src/test/native/cpp/FileLoggerTest.cpp
index 6b301ccd384..0fbb54f160e 100644
--- a/wpiutil/src/test/native/cpp/FileLoggerTest.cpp
+++ b/wpiutil/src/test/native/cpp/FileLoggerTest.cpp
@@ -2,6 +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 <string>
 #include <string_view>
 #include <vector>
 
diff --git a/wpiutil/src/test/native/cpp/ScopeExitTest.cpp b/wpiutil/src/test/native/cpp/ScopeExitTest.cpp
index d6f99cabbab..14cad45b8ca 100644
--- a/wpiutil/src/test/native/cpp/ScopeExitTest.cpp
+++ b/wpiutil/src/test/native/cpp/ScopeExitTest.cpp
@@ -2,6 +2,8 @@
 // Open Source Software; you can modify and/or share it under the terms of
 // the WPILib BSD license file in the root directory of this project.
 
+#include <utility>
+
 #include <gtest/gtest.h>
 
 #include "wpi/scope"
diff --git a/wpiutil/src/test/native/cpp/UidVectorTest.cpp b/wpiutil/src/test/native/cpp/UidVectorTest.cpp
index dda7d79c3f7..724afced522 100644
--- a/wpiutil/src/test/native/cpp/UidVectorTest.cpp
+++ b/wpiutil/src/test/native/cpp/UidVectorTest.cpp
@@ -4,6 +4,8 @@
 
 #include "wpi/UidVector.h"  // NOLINT(build/include_order)
 
+#include <vector>
+
 #include <gtest/gtest.h>
 
 namespace wpi {
diff --git a/wpiutil/src/test/native/cpp/expected/ExpectedTest.cpp b/wpiutil/src/test/native/cpp/expected/ExpectedTest.cpp
index f3c9150586d..8d7bc583b5d 100644
--- a/wpiutil/src/test/native/cpp/expected/ExpectedTest.cpp
+++ b/wpiutil/src/test/native/cpp/expected/ExpectedTest.cpp
@@ -4,6 +4,7 @@
 
 #include <initializer_list>
 #include <tuple>
+#include <utility>
 #include <vector>
 
 #include <gtest/gtest.h>
diff --git a/wpiutil/src/test/native/cpp/future_test.cpp b/wpiutil/src/test/native/cpp/future_test.cpp
index 97e5e608cd9..aad45ea4901 100644
--- a/wpiutil/src/test/native/cpp/future_test.cpp
+++ b/wpiutil/src/test/native/cpp/future_test.cpp
@@ -4,7 +4,7 @@
 
 #include "wpi/future.h"  // NOLINT(build/include_order)
 
-#include <thread>
+#include <utility>
 
 #include <gtest/gtest.h>
 
diff --git a/wpiutil/src/test/native/cpp/sigslot/signal-tracking.cpp b/wpiutil/src/test/native/cpp/sigslot/signal-tracking.cpp
index b77f5a47492..956f4660e5f 100644
--- a/wpiutil/src/test/native/cpp/sigslot/signal-tracking.cpp
+++ b/wpiutil/src/test/native/cpp/sigslot/signal-tracking.cpp
@@ -34,6 +34,7 @@ SOFTWARE.
 #include "wpi/Signal.h"  // NOLINT(build/include_order)
 
 #include <cmath>
+#include <memory>
 #include <sstream>
 #include <string>
 
diff --git a/wpiutil/src/test/native/cpp/sigslot/signal.cpp b/wpiutil/src/test/native/cpp/sigslot/signal.cpp
index 34d149e7621..5886ae931a7 100644
--- a/wpiutil/src/test/native/cpp/sigslot/signal.cpp
+++ b/wpiutil/src/test/native/cpp/sigslot/signal.cpp
@@ -36,6 +36,7 @@ SOFTWARE.
 #include <cmath>
 #include <sstream>
 #include <string>
+#include <utility>
 
 #include <gtest/gtest.h>
 
diff --git a/wpiutil/src/test/native/cpp/struct/DynamicStructTest.cpp b/wpiutil/src/test/native/cpp/struct/DynamicStructTest.cpp
index b0d43ffd069..9741667be06 100644
--- a/wpiutil/src/test/native/cpp/struct/DynamicStructTest.cpp
+++ b/wpiutil/src/test/native/cpp/struct/DynamicStructTest.cpp
@@ -6,6 +6,8 @@
 
 #include <stdint.h>
 
+#include <string>
+
 #include <gtest/gtest.h>
 
 using namespace wpi;
diff --git a/xrpVendordep/src/main/native/cpp/xrp/XRPMotor.cpp b/xrpVendordep/src/main/native/cpp/xrp/XRPMotor.cpp
index 91740798ae1..4e63f496102 100644
--- a/xrpVendordep/src/main/native/cpp/xrp/XRPMotor.cpp
+++ b/xrpVendordep/src/main/native/cpp/xrp/XRPMotor.cpp
@@ -6,6 +6,10 @@
 
 #include <frc/Errors.h>
 
+#include <map>
+#include <set>
+#include <string>
+
 using namespace frc;
 
 std::map<int, std::string> XRPMotor::s_simDeviceMap = {
diff --git a/xrpVendordep/src/main/native/cpp/xrp/XRPServo.cpp b/xrpVendordep/src/main/native/cpp/xrp/XRPServo.cpp
index 01635cdcc65..f7233de22a7 100644
--- a/xrpVendordep/src/main/native/cpp/xrp/XRPServo.cpp
+++ b/xrpVendordep/src/main/native/cpp/xrp/XRPServo.cpp
@@ -6,6 +6,10 @@
 
 #include <frc/Errors.h>
 
+#include <map>
+#include <set>
+#include <string>
+
 using namespace frc;
 
 std::map<int, std::string> XRPServo::s_simDeviceMap = {{4, "servo1"},