diff --git a/src/algorithms/reco/Helix.cc b/src/algorithms/reco/Helix.cc
index 575e71da29..c59e421230 100644
--- a/src/algorithms/reco/Helix.cc
+++ b/src/algorithms/reco/Helix.cc
@@ -1,24 +1,22 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2024 Xin Dong, Rongrong Ma
 
+#include <Evaluator/DD4hepUnits.h>
+#include <edm4eic/Track.h>
+#include <edm4eic/Trajectory.h>
+#include <edm4eic/unit_system.h>
+#include <edm4hep/Vector2f.h>
+#include <edm4hep/Vector3f.h>
+#include <edm4hep/utils/vector_utils.h>
+#include <podio/RelationRange.h>
 #include <algorithm>
 #include <cmath>
-#include <exception>
+#include <iostream>
 #include <limits>
-#include <string>
-#include <vector>
 #include <utility>
-#include <iostream>
-#include <edm4hep/Vector3d.h>
-#include <edm4hep/Vector3f.h>
-#include <edm4hep/utils/vector_utils.h>
+#include <vector>
 
-#include <edm4eic/unit_system.h>
-#include <Evaluator/DD4hepUnits.h>
 #include "algorithms/reco/Helix.h"
-#include <edm4eic/Track.h>
-#include <edm4eic/TrackParameters.h>
-#include <edm4eic/Trajectory.h>
 
 namespace eicrecon {
 
diff --git a/src/algorithms/reco/Helix.h b/src/algorithms/reco/Helix.h
index 4080394f1c..ac52e49ce5 100644
--- a/src/algorithms/reco/Helix.h
+++ b/src/algorithms/reco/Helix.h
@@ -3,22 +3,14 @@
 
 #pragma once
 
-#include <algorithm>
-#include <cmath>
-#include <exception>
-#include <limits>
-#include <string>
-#include <vector>
-#include <utility>
-#include <iostream>
-#include <edm4hep/Vector3d.h>
-#include <edm4hep/Vector3f.h>
-#include <edm4hep/utils/vector_utils.h>
-
-#include <edm4eic/unit_system.h>
 #include <edm4eic/ReconstructedParticleCollection.h>
-#include <edm4eic/ReconstructedParticleData.h>
 #include <edm4eic/TrackParametersCollection.h>
+#include <edm4eic/unit_system.h>
+#include <edm4hep/Vector3f.h>
+#include <stdlib.h>
+#include <cmath>
+#include <iterator>
+#include <utility>
 
 namespace eicrecon {
 
diff --git a/src/algorithms/reco/SecondaryVerticesHelix.cc b/src/algorithms/reco/SecondaryVerticesHelix.cc
index f4fefe6b34..2f162fc3bf 100644
--- a/src/algorithms/reco/SecondaryVerticesHelix.cc
+++ b/src/algorithms/reco/SecondaryVerticesHelix.cc
@@ -1,22 +1,20 @@
 // SPDX-License-Identifier: LGPL-3.0-or-later
 // Copyright (C) 2024 Daniel Brandenburg, Xin Dong
 
-#include <edm4eic/Track.h>
-#include <edm4eic/Trajectory.h>
+#include <Evaluator/DD4hepUnits.h>
 #include <edm4eic/VertexCollection.h>
 #include <edm4eic/unit_system.h>
+#include <edm4hep/Vector3f.h>
 #include <edm4hep/Vector4f.h>
+#include <edm4hep/utils/vector_utils.h>
 #include <fmt/core.h>
-#include <podio/RelationRange.h>
 #include <cmath>
-#include <functional>
 #include <gsl/pointers>
-#include <map>
 #include <utility>
 #include <vector>
 
-#include "algorithms/reco/SecondaryVerticesHelix.h"
 #include "algorithms/reco/Helix.h"
+#include "algorithms/reco/SecondaryVerticesHelix.h"
 #include "algorithms/reco/SecondaryVerticesHelixConfig.h"
 #include "services/particle/ParticleSvc.h"