diff --git a/src/algorithms/pid/MergeParticleID.cc b/src/algorithms/pid/MergeParticleID.cc
index 2d4bb9dbbf..630751b756 100644
--- a/src/algorithms/pid/MergeParticleID.cc
+++ b/src/algorithms/pid/MergeParticleID.cc
@@ -11,6 +11,7 @@
 #include <podio/RelationRange.h>
 #include <spdlog/common.h>
 #include <stddef.h>
+#include <gsl/pointers>
 #include <stdexcept>
 #include <unordered_map>
 #include <utility>
diff --git a/src/algorithms/pid/MergeParticleID.h b/src/algorithms/pid/MergeParticleID.h
index 62b8429e95..1ac68c6f0d 100644
--- a/src/algorithms/pid/MergeParticleID.h
+++ b/src/algorithms/pid/MergeParticleID.h
@@ -8,8 +8,10 @@
 // data model
 #include <algorithms/algorithm.h>
 #include <edm4eic/CherenkovParticleIDCollection.h>
-#include <memory>
 #include <spdlog/logger.h>
+#include <memory>
+#include <string>
+#include <string_view>
 #include <vector>
 
 // EICrecon
diff --git a/src/algorithms/pid/MergeTracks.cc b/src/algorithms/pid/MergeTracks.cc
index a4b327af18..ebad8ec945 100644
--- a/src/algorithms/pid/MergeTracks.cc
+++ b/src/algorithms/pid/MergeTracks.cc
@@ -3,13 +3,14 @@
 
 #include "MergeTracks.h"
 
-#include <algorithm>
-#include <cstddef>
 #include <edm4eic/TrackPoint.h>
 #include <fmt/core.h>
 #include <fmt/format.h>
-#include <iterator>
 #include <podio/RelationRange.h>
+#include <algorithm>
+#include <cstddef>
+#include <gsl/pointers>
+#include <iterator>
 #include <unordered_map>
 #include <utility>
 
diff --git a/src/algorithms/pid/MergeTracks.h b/src/algorithms/pid/MergeTracks.h
index 89a26877a6..3cb158f088 100644
--- a/src/algorithms/pid/MergeTracks.h
+++ b/src/algorithms/pid/MergeTracks.h
@@ -12,8 +12,10 @@
 // data model
 #include <algorithms/algorithm.h>
 #include <edm4eic/TrackSegmentCollection.h>
-#include <memory>
 #include <spdlog/logger.h>
+#include <memory>
+#include <string>
+#include <string_view>
 #include <vector>
 
 namespace eicrecon {
diff --git a/src/algorithms/reco/JetReconstruction.cc b/src/algorithms/reco/JetReconstruction.cc
index ca581ce07a..2bd8dbbea0 100644
--- a/src/algorithms/reco/JetReconstruction.cc
+++ b/src/algorithms/reco/JetReconstruction.cc
@@ -9,6 +9,7 @@
 #include <edm4hep/MCParticleCollection.h> // IWYU pragma: keep
 #include <edm4hep/Vector3f.h>
 #include <edm4hep/utils/vector_utils.h>
+#include <fastjet/ClusterSequenceArea.hh>
 #include <fastjet/GhostedAreaSpec.hh>
 // for fastjet objects
 #include <fastjet/PseudoJet.hh>
diff --git a/src/algorithms/reco/JetReconstruction.h b/src/algorithms/reco/JetReconstruction.h
index 43c26099f9..6066b34eee 100644
--- a/src/algorithms/reco/JetReconstruction.h
+++ b/src/algorithms/reco/JetReconstruction.h
@@ -6,11 +6,10 @@
 #include <algorithms/algorithm.h>
 #include <edm4eic/ReconstructedParticleCollection.h>
 #include <fastjet/AreaDefinition.hh>
-#include <fastjet/ClusterSequenceArea.hh>
 #include <fastjet/JetDefinition.hh>
+#include <spdlog/logger.h>
 #include <map>
 #include <memory>
-#include <spdlog/logger.h>
 #include <string>
 #include <string_view>
 
diff --git a/src/algorithms/tracking/IterativeVertexFinder.cc b/src/algorithms/tracking/IterativeVertexFinder.cc
index 2421808664..0da3a12938 100644
--- a/src/algorithms/tracking/IterativeVertexFinder.cc
+++ b/src/algorithms/tracking/IterativeVertexFinder.cc
@@ -25,14 +25,14 @@
 #include <Acts/Vertexing/VertexingOptions.hpp>
 #include <Acts/Vertexing/ZScanVertexFinder.hpp>
 #include <ActsExamples/EventData/Trajectories.hpp>
+#include <boost/container/vector.hpp>
+#include <edm4eic/Cov4f.h>
+#include <edm4eic/EDM4eicVersion.h>
+#include <math.h>
 #include <Eigen/Core>
 #include <Eigen/Geometry>
 #include <Eigen/LU>
 #include <algorithm>
-#include <boost/container/vector.hpp>
-#include <edm4eic/Cov3f.h>
-#include <edm4eic/EDM4eicVersion.h>
-#include <math.h>
 #include <optional>
 #include <tuple>
 #include <utility>
diff --git a/src/algorithms/tracking/TrackProjector.h b/src/algorithms/tracking/TrackProjector.h
index 2b7105d26a..07c811db0f 100644
--- a/src/algorithms/tracking/TrackProjector.h
+++ b/src/algorithms/tracking/TrackProjector.h
@@ -6,12 +6,11 @@
 
 #include <ActsExamples/EventData/Trajectories.hpp>
 #include <edm4eic/TrackSegmentCollection.h>
-#include <memory>
 #include <spdlog/logger.h>
+#include <memory>
 #include <vector>
 
 #include "ActsGeometryProvider.h"
-#include "algorithms/interfaces/WithPodConfig.h"
 
 namespace eicrecon {
 
diff --git a/src/tests/algorithms_test/calorimetry_CalorimeterHitDigi.cc b/src/tests/algorithms_test/calorimetry_CalorimeterHitDigi.cc
index 36511ed382..7ae095cbd2 100644
--- a/src/tests/algorithms_test/calorimetry_CalorimeterHitDigi.cc
+++ b/src/tests/algorithms_test/calorimetry_CalorimeterHitDigi.cc
@@ -3,7 +3,9 @@
 
 #include <DD4hep/Detector.h>
 #include <DD4hep/IDDescriptor.h>
+#include <DD4hep/Readout.h>
 #include <Evaluator/DD4hepUnits.h>
+#include <algorithms/geo.h>
 #include <algorithms/logger.h>
 #include <catch2/catch_test_macros.hpp>
 #include <edm4hep/CaloHitContributionCollection.h>
@@ -11,11 +13,12 @@
 #include <edm4hep/SimCalorimeterHitCollection.h>
 #include <edm4hep/Vector3f.h>
 #include <math.h>
-#include <memory>
 #include <spdlog/common.h>
 #include <spdlog/logger.h>
 #include <spdlog/spdlog.h>
-#include <string>
+#include <gsl/pointers>
+#include <memory>
+#include <utility>
 #include <vector>
 
 #include "algorithms/calorimetry/CalorimeterHitDigi.h"
diff --git a/src/tests/algorithms_test/pid_MergeParticleID.cc b/src/tests/algorithms_test/pid_MergeParticleID.cc
index b0b3fa626b..9038f2568e 100644
--- a/src/tests/algorithms_test/pid_MergeParticleID.cc
+++ b/src/tests/algorithms_test/pid_MergeParticleID.cc
@@ -4,16 +4,17 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
-#include <cmath>
 #include <edm4eic/CherenkovParticleIDCollection.h>
 #include <edm4eic/CherenkovParticleIDHypothesis.h>
 #include <edm4eic/TrackSegmentCollection.h>
 #include <edm4hep/Vector2f.h>
-#include <memory>
 #include <podio/RelationRange.h>
 #include <spdlog/common.h>
 #include <spdlog/logger.h>
 #include <spdlog/spdlog.h>
+#include <cmath>
+#include <gsl/pointers>
+#include <memory>
 #include <stdexcept>
 #include <vector>
 
diff --git a/src/tests/algorithms_test/pid_MergeTracks.cc b/src/tests/algorithms_test/pid_MergeTracks.cc
index 9383e809f6..87b620e6d7 100644
--- a/src/tests/algorithms_test/pid_MergeTracks.cc
+++ b/src/tests/algorithms_test/pid_MergeTracks.cc
@@ -4,14 +4,15 @@
 #include <catch2/catch_test_macros.hpp>
 #include <catch2/matchers/catch_matchers.hpp>
 #include <catch2/matchers/catch_matchers_floating_point.hpp>
-#include <cmath>
 #include <edm4eic/TrackPoint.h>
 #include <edm4eic/TrackSegmentCollection.h>
 #include <edm4hep/Vector3f.h>
-#include <memory>
 #include <spdlog/common.h>
 #include <spdlog/logger.h>
 #include <spdlog/spdlog.h>
+#include <cmath>
+#include <gsl/pointers>
+#include <memory>
 #include <vector>
 
 #include "algorithms/pid/MergeTracks.h"