diff --git a/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp b/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp
index 0a8809c36..c363c1295 100644
--- a/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp
+++ b/photon-lib/src/main/native/cpp/photon/PhotonCamera.cpp
@@ -26,7 +26,9 @@
 
 #include <hal/FRCUsageReporting.h>
 
+#include <string>
 #include <string_view>
+#include <vector>
 
 #include <frc/Errors.h>
 #include <frc/RobotController.h>
diff --git a/photon-lib/src/main/native/cpp/photon/PhotonPoseEstimator.cpp b/photon-lib/src/main/native/cpp/photon/PhotonPoseEstimator.cpp
index 2571eafe2..5ecacba29 100644
--- a/photon-lib/src/main/native/cpp/photon/PhotonPoseEstimator.cpp
+++ b/photon-lib/src/main/native/cpp/photon/PhotonPoseEstimator.cpp
@@ -30,6 +30,7 @@
 #include <iostream>
 #include <limits>
 #include <map>
+#include <memory>
 #include <span>
 #include <string>
 #include <utility>
diff --git a/photon-lib/src/test/native/cpp/SimVisionSystemTest.cpp b/photon-lib/src/test/native/cpp/SimVisionSystemTest.cpp
index 2c985c6e5..f2a24a2a2 100644
--- a/photon-lib/src/test/native/cpp/SimVisionSystemTest.cpp
+++ b/photon-lib/src/test/native/cpp/SimVisionSystemTest.cpp
@@ -22,6 +22,8 @@
  * SOFTWARE.
  */
 
+#include <tuple>
+
 #include "gtest/gtest.h"
 #include "photon/PhotonUtils.h"
 #include "photon/simulation/SimVisionSystem.h"
diff --git a/photon-lib/src/test/native/cpp/VisionSystemSimTest.cpp b/photon-lib/src/test/native/cpp/VisionSystemSimTest.cpp
index e3db87318..179c617aa 100644
--- a/photon-lib/src/test/native/cpp/VisionSystemSimTest.cpp
+++ b/photon-lib/src/test/native/cpp/VisionSystemSimTest.cpp
@@ -24,6 +24,8 @@
 
 #include <chrono>
 #include <thread>
+#include <tuple>
+#include <vector>
 
 #include "gtest/gtest.h"
 #include "photon/PhotonUtils.h"
diff --git a/photon-targeting/src/main/native/cpp/photon/dataflow/structures/Packet.cpp b/photon-targeting/src/main/native/cpp/photon/dataflow/structures/Packet.cpp
index a69427a48..d364c6024 100644
--- a/photon-targeting/src/main/native/cpp/photon/dataflow/structures/Packet.cpp
+++ b/photon-targeting/src/main/native/cpp/photon/dataflow/structures/Packet.cpp
@@ -17,6 +17,8 @@
 
 #include "photon/dataflow/structures/Packet.h"
 
+#include <vector>
+
 using namespace photon;
 
 Packet::Packet(std::vector<uint8_t> data) : packetData(data) {}
diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp
index 2e3367d0c..c94e55b73 100644
--- a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp
+++ b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonPipelineResult.cpp
@@ -17,6 +17,8 @@
 
 #include "photon/targeting/PhotonPipelineResult.h"
 
+#include <vector>
+
 namespace photon {
 PhotonPipelineResult::PhotonPipelineResult(
     int64_t sequenceID, units::microsecond_t captureTimestamp,
diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonTrackedTarget.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonTrackedTarget.cpp
index c0200615e..6a4e367d1 100644
--- a/photon-targeting/src/main/native/cpp/photon/targeting/PhotonTrackedTarget.cpp
+++ b/photon-targeting/src/main/native/cpp/photon/targeting/PhotonTrackedTarget.cpp
@@ -17,8 +17,10 @@
 
 #include "photon/targeting/PhotonTrackedTarget.h"
 
+#include <algorithm>
 #include <iostream>
 #include <utility>
+#include <vector>
 
 #include <frc/geometry/Translation2d.h>
 #include <wpi/SmallVector.h>
diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonPipelineResultProto.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonPipelineResultProto.cpp
index 6beeccaab..da4323482 100644
--- a/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonPipelineResultProto.cpp
+++ b/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonPipelineResultProto.cpp
@@ -17,6 +17,8 @@
 
 #include "photon/targeting/proto/PhotonPipelineResultProto.h"
 
+#include <vector>
+
 #include "photon.pb.h"
 #include "photon/targeting/proto/MultiTargetPNPResultProto.h"
 #include "photon/targeting/proto/PhotonTrackedTargetProto.h"
diff --git a/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonTrackedTargetProto.cpp b/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonTrackedTargetProto.cpp
index 9e13181ab..952996376 100644
--- a/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonTrackedTargetProto.cpp
+++ b/photon-targeting/src/main/native/cpp/photon/targeting/proto/PhotonTrackedTargetProto.cpp
@@ -17,6 +17,9 @@
 
 #include "photon/targeting/proto/PhotonTrackedTargetProto.h"
 
+#include <utility>
+#include <vector>
+
 #include "photon.pb.h"
 
 google::protobuf::Message* wpi::Protobuf<photon::PhotonTrackedTarget>::New(
diff --git a/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveDrive.cpp b/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveDrive.cpp
index bf33d7189..54c39b1d5 100644
--- a/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveDrive.cpp
+++ b/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveDrive.cpp
@@ -25,6 +25,7 @@
 #include "subsystems/SwerveDrive.h"
 
 #include <iostream>
+#include <string>
 
 #include <frc/TimedRobot.h>
 #include <frc/smartdashboard/SmartDashboard.h>
diff --git a/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveModule.cpp b/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveModule.cpp
index 781c28a33..785d9ca7d 100644
--- a/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveModule.cpp
+++ b/photonlib-cpp-examples/swervedriveposeestsim/src/main/cpp/subsystems/SwerveModule.cpp
@@ -25,6 +25,7 @@
 #include "subsystems/SwerveModule.h"
 
 #include <iostream>
+#include <string>
 
 #include <frc/MathUtil.h>
 #include <frc/RobotController.h>