diff --git a/src/algorithms/calorimetry/CalorimeterHitToTrackerHit.cc b/src/algorithms/calorimetry/CalorimeterHitToTrackerHit.cc
index a531571a5..cfad3cfd3 100644
--- a/src/algorithms/calorimetry/CalorimeterHitToTrackerHit.cc
+++ b/src/algorithms/calorimetry/CalorimeterHitToTrackerHit.cc
@@ -3,34 +3,9 @@
 
 #include "algorithms/calorimetry/CalorimeterHitToTrackerHit.h"
 
-#include <DD4hep/Alignments.h>
-#include <DD4hep/IDDescriptor.h>
-#include <DD4hep/Objects.h>
-#include <DD4hep/Readout.h>
-#include <DD4hep/Segmentations.h>
-#include <DD4hep/Shapes.h>
-#include <DD4hep/VolumeManager.h>
-#include <DD4hep/Volumes.h>
 #include <DD4hep/config.h>
-#include <DDSegmentation/BitFieldCoder.h>
-#include <Evaluator/DD4hepUnits.h>
-#include <Math/GenVector/Cartesian3D.h>
-#include <Math/GenVector/DisplacementVector3D.h>
-#include <algorithms/service.h>
-#include <edm4eic/EDM4eicVersion.h>
-#include <fmt/core.h>
-#include <fmt/format.h>
-#include <algorithm>
-#include <cctype>
+#include <edm4eic/CovDiag3f.h>
 #include <gsl/pointers>
-#include <map>
-#include <ostream>
-#include <string>
-#include <unordered_map>
-#include <utility>
-#include <vector>
-
-#include "services/evaluator/EvaluatorSvc.h"
 
 using namespace dd4hep;
 
diff --git a/src/algorithms/calorimetry/CalorimeterHitToTrackerHit.h b/src/algorithms/calorimetry/CalorimeterHitToTrackerHit.h
index 8af9de391..69c989091 100644
--- a/src/algorithms/calorimetry/CalorimeterHitToTrackerHit.h
+++ b/src/algorithms/calorimetry/CalorimeterHitToTrackerHit.h
@@ -8,17 +8,12 @@
 
 #pragma once
 
-#include <DD4hep/DetElement.h>
 #include <DD4hep/Detector.h>
-#include <DD4hep/IDDescriptor.h>
-#include <DDRec/CellIDPositionConverter.h>
-#include <Parsers/Primitives.h>
+#include <DD4hep/VolumeManager.h>
 #include <algorithms/algorithm.h>
 #include <algorithms/geo.h>
 #include <edm4eic/CalorimeterHitCollection.h>
 #include <edm4eic/TrackerHitCollection.h>
-#include <stddef.h>
-#include <stdint.h>
 #include <gsl/pointers>
 #include <string>
 #include <string_view>
diff --git a/src/detectors/BEMC/BEMC.cc b/src/detectors/BEMC/BEMC.cc
index da7641136..2bc0f6399 100644
--- a/src/detectors/BEMC/BEMC.cc
+++ b/src/detectors/BEMC/BEMC.cc
@@ -6,10 +6,13 @@
 #include <edm4eic/EDM4eicVersion.h>
 #include <Evaluator/DD4hepUnits.h>
 #include <JANA/JApplication.h>
+#include <edm4eic/CalorimeterHit.h>
 #include <math.h>
-#include <string>
+#include <map>
+#include <vector>
 
 #include "algorithms/calorimetry/CalorimeterHitDigiConfig.h"
+#include "algorithms/meta/SubDivideFunctors.h"
 #include "extensions/jana/JOmniFactoryGeneratorT.h"
 #include "factories/calorimetry/CalorimeterClusterRecoCoG_factory.h"
 #include "factories/calorimetry/CalorimeterHitDigi_factory.h"
@@ -21,7 +24,6 @@
 #include "factories/calorimetry/ImagingTopoCluster_factory.h"
 #include "factories/calorimetry/TruthEnergyPositionClusterMerger_factory.h"
 #include "factories/meta/SubDivideCollection_factory.h"
-#include "algorithms/meta/SubDivideFunctors.h"
 
 
 extern "C" {