diff --git a/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.cc b/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.cc
index 307832e825..6d5a8e6973 100644
--- a/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.cc
+++ b/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.cc
@@ -8,6 +8,9 @@
  *  Author: Chao Peng (ANL), 09/27/2020
  */
 
+#include <DD4hep/IDDescriptor.h>
+#include <DD4hep/Readout.h>
+#include <DDSegmentation/BitFieldCoder.h>
 #include <Evaluator/DD4hepUnits.h>
 #include <boost/algorithm/string/join.hpp>
 #include <boost/range/adaptor/map.hpp>
@@ -27,16 +30,12 @@
 #include <limits>
 #include <map>
 #include <optional>
+#include <stdexcept>
 #include <tuple>
 #include <vector>
 
-#include <DD4hep/Readout.h>
-#include <DD4hep/IDDescriptor.h>
-#include <algorithms/service.h>
-
 #include "algorithms/calorimetry/CalorimeterClusterRecoCoG.h"
 #include "algorithms/calorimetry/CalorimeterClusterRecoCoGConfig.h"
-#include "services/evaluator/EvaluatorSvc.h"
 
 namespace eicrecon {
 
diff --git a/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.h b/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.h
index 52191c8968..9c658b64fa 100644
--- a/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.h
+++ b/src/algorithms/calorimetry/CalorimeterClusterRecoCoG.h
@@ -10,6 +10,8 @@
 
 #pragma once
 
+#include <DD4hep/Detector.h>
+#include <DD4hep/IDDescriptor.h>
 #include <algorithms/algorithm.h>
 #include <algorithms/geo.h>
 #include <edm4eic/ClusterCollection.h>
@@ -24,14 +26,13 @@
 #include <algorithm>
 #include <cmath>
 #include <functional>
+#include <gsl/pointers>
 #include <map>
 #include <memory>
 #include <optional>
 #include <string>
 #include <string_view>
 #include <utility>
-#include <DD4hep/Detector.h>
-#include <DD4hep/IDDescriptor.h>
 
 #include "CalorimeterClusterRecoCoGConfig.h"
 #include "algorithms/interfaces/WithPodConfig.h"
diff --git a/src/algorithms/calorimetry/ImagingTopoCluster.cc b/src/algorithms/calorimetry/ImagingTopoCluster.cc
index 8b05c4f4a1..6988e92c0a 100644
--- a/src/algorithms/calorimetry/ImagingTopoCluster.cc
+++ b/src/algorithms/calorimetry/ImagingTopoCluster.cc
@@ -22,14 +22,16 @@
 #include "algorithms/calorimetry/ImagingTopoCluster.h"
 
 #include <DD4hep/Handle.h>
-#include <DD4hep/Readout.h>
 #include <DD4hep/IDDescriptor.h>
-#include <algorithms/service.h>
+#include <DD4hep/Readout.h>
 #include <Evaluator/DD4hepUnits.h>
 #include <edm4hep/Vector3f.h>
 #include <edm4hep/utils/vector_utils.h>
+#include <podio/ObjectID.h>
+#include <algorithm>
 #include <cmath>
 #include <cstdlib>
+#include <map>
 #include <stdexcept>
 #include <tuple>
 #include <utility>
diff --git a/src/algorithms/calorimetry/ImagingTopoCluster.h b/src/algorithms/calorimetry/ImagingTopoCluster.h
index 59829fd620..78da4d33ec 100644
--- a/src/algorithms/calorimetry/ImagingTopoCluster.h
+++ b/src/algorithms/calorimetry/ImagingTopoCluster.h
@@ -21,9 +21,9 @@
 
 #pragma once
 
-#include <algorithms/algorithm.h>
 #include <DD4hep/Detector.h>
 #include <DD4hep/IDDescriptor.h>
+#include <DDSegmentation/BitFieldCoder.h>
 #include <algorithms/algorithm.h>
 #include <algorithms/geo.h>
 // Event Model related classes
@@ -31,10 +31,13 @@
 #include <edm4eic/ProtoClusterCollection.h>
 #include <array>
 #include <cstddef>
+#include <gsl/pointers>
+#include <iterator>
 #include <list>
 #include <set>
 #include <string>
 #include <string_view>
+#include <vector>
 
 #include "ImagingTopoClusterConfig.h"
 #include "algorithms/interfaces/WithPodConfig.h"
diff --git a/src/detectors/BEMC/BEMC.cc b/src/detectors/BEMC/BEMC.cc
index a8c2c0c24f..f4aad232a7 100644
--- a/src/detectors/BEMC/BEMC.cc
+++ b/src/detectors/BEMC/BEMC.cc
@@ -5,9 +5,14 @@
 #include <JANA/JApplication.h>
 #include <JANA/JApplicationFwd.h>
 #include <JANA/Utils/JTypeInfo.h>
+#include <edm4eic/CalorimeterHit.h>
+#include <edm4eic/MCRecoCalorimeterHitAssociation.h>
+#include <edm4eic/MCRecoCalorimeterHitLinkCollection.h>
 #include <edm4eic/unit_system.h>
 #include <edm4hep/SimCalorimeterHit.h>
+#include <podio/detail/Link.h>
 #include <cmath>
+#include <deque>
 #include <map>
 #include <memory>
 #include <string>