Fix errors from new cpplint.py (#7105)

.styleguide

@@ -33,8 +33,9 @@ includeOtherLibs {
   ^cameraserver/
   ^cscore
   ^fmt/
-  ^gtest/
+  ^glass/
   ^google/
+  ^gtest/
   ^hal/
   ^imgui
   ^implot

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)

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>

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"

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>

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>

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 {

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>

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>

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;

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;

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"

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);
 }
 

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>
 

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"

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"

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>

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;

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"
 

cscore/src/main/native/cpp/SinkImpl.cpp

@@ -4,6 +4,8 @@
 
 #include "SinkImpl.h"
 
+#include <string>
+
 #include <wpi/SmallString.h>
 #include <wpi/json.h>
 

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>

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;
 

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;

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"

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>
 

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>
 

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>

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() {

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"

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>

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>

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 {
 

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 {

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"
 

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")

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

@@ -16,6 +16,7 @@
 #include <cmath>
 #include <memory>
 #include <string>
+#include <utility>
 #include <vector>
 
 #include <Dbt.h>

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;

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>

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>

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;

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"

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>

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>

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>

glass/src/lib/native/cpp/View.cpp

@@ -4,6 +4,9 @@
 
 #include "glass/View.h"
 
+#include <memory>
+#include <utility>
+
 using namespace glass;
 
 namespace {

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>

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>
 

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"

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>

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"

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>
 

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>

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"

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>

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>

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>

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;

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>

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"

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;
 

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>

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;

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>

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>
 

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>
 

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>

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>
 

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;

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>

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>
 

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>

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>
 

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>
 

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>
 

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>
 

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>
 

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;

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>

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>

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>

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"

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

@@ -5,6 +5,7 @@
 #include "hal/AddressableLED.h"
 
 #include <cstring>
+#include <memory>
 
 #include <fmt/format.h>
 

hal/src/main/native/athena/AnalogInternal.cpp

@@ -5,6 +5,7 @@
 #include "AnalogInternal.h"
 
 #include <atomic>
+#include <memory>
 
 #include <wpi/mutex.h>
 

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"

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>

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

@@ -4,6 +4,8 @@
 
 #include "hal/CTREPCM.h"
 
+#include <string>
+
 #include <fmt/format.h>
 
 #include "HALInitializer.h"

hal/src/main/native/athena/CTREPDP.cpp

@@ -4,6 +4,8 @@
 
 #include "CTREPDP.h"
 
+#include <string>
+
 #include <fmt/format.h>
 #include <wpi/mutex.h>
 

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

@@ -5,6 +5,7 @@
 #include "hal/Counter.h"
 
 #include <limits>
+#include <memory>
 
 #include <fmt/format.h>
 

hal/src/main/native/athena/DigitalInternal.cpp

@@ -6,6 +6,7 @@
 
 #include <atomic>
 #include <cmath>
+#include <memory>
 #include <thread>
 
 #include <FRC_NetworkCommunication/LoadOut.h>

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

@@ -4,6 +4,8 @@
 
 #include "hal/Encoder.h"
 
+#include <memory>
+
 #include <fmt/format.h>
 
 #include "EncoderInternal.h"

hal/src/main/native/athena/FRCDriverStation.cpp

@@ -4,6 +4,7 @@
 
 #include <atomic>
 #include <chrono>
+#include <cstdio>
 #include <cstdlib>
 #include <cstring>
 #include <limits>

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>

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>

hal/src/main/native/athena/REVPH.cpp

@@ -4,6 +4,7 @@
 
 #include "hal/REVPH.h"
 
+#include <string>
 #include <thread>
 
 #include <fmt/format.h>

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>

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>

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;

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"

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"

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;