diff --git a/Alignment/LaserAlignmentSimulation/plugins/BuildFile.xml b/Alignment/LaserAlignmentSimulation/plugins/BuildFile.xml
index 254ed3d401bd2..ebc3ff59a0f6d 100644
--- a/Alignment/LaserAlignmentSimulation/plugins/BuildFile.xml
+++ b/Alignment/LaserAlignmentSimulation/plugins/BuildFile.xml
@@ -19,7 +19,6 @@
 <library file="LaserOpticalPhysics.cc">
   <use name="Alignment/LaserAlignmentSimulation"/>
   <use name="SimG4Core/Physics"/>
-  <use name="SimG4Core/PhysicsLists"/>
   <use name="geant4core"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CUDADataFormats/HGCal/BuildFile.xml b/CUDADataFormats/HGCal/BuildFile.xml
index 60e10acaa6829..a833b9a64ed59 100644
--- a/CUDADataFormats/HGCal/BuildFile.xml
+++ b/CUDADataFormats/HGCal/BuildFile.xml
@@ -1,6 +1,6 @@
-<use name="FWCore/Utilities"/>
-<use name="Geometry/HGCalGeometry"/>
-<use name="HeterogeneousCore/CUDACore"/>
+<use name="CUDADataFormats/Common"/>
+<use name="DataFormats/Common"/>
+<use name="HeterogeneousCore/CUDAUtilities"/>
 <use name="cuda"/>
 
 <export>
diff --git a/DQM/TrackerRemapper/plugins/BuildFile.xml b/DQM/TrackerRemapper/plugins/BuildFile.xml
index 787a56559689d..f54686e67983b 100644
--- a/DQM/TrackerRemapper/plugins/BuildFile.xml
+++ b/DQM/TrackerRemapper/plugins/BuildFile.xml
@@ -1,14 +1,9 @@
 <use name="CalibTracker/SiStripCommon"/>
 <use name="CommonTools/UtilAlgos"/>
-<use name="DataFormats/GeometrySurface"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/TrackerCommon"/>
-<use name="DataFormats/TrackerRecHit2D"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
-<use name="Geometry/CommonTopologies"/>
 <use name="Geometry/Records"/> 
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="RecoTracker/TkDetLayers"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/RecoLocalCalo/HGCalRecProducers/BuildFile.xml b/RecoLocalCalo/HGCalRecProducers/BuildFile.xml
index caf337a1ffdd6..f00af183cc775 100644
--- a/RecoLocalCalo/HGCalRecProducers/BuildFile.xml
+++ b/RecoLocalCalo/HGCalRecProducers/BuildFile.xml
@@ -1,19 +1,9 @@
 <use name="cuda"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/Utilities"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/ServiceRegistry"/>
-<use name="FWCore/MessageLogger"/>
-<use name="HeterogeneousCore/CUDACore"/>
-<use name="HeterogeneousCore/CUDAUtilities"/>
 <use name="DataFormats/HGCRecHit"/>
-<use name="DataFormats/ForwardDetId"/>
-<use name="CommonTools/UtilAlgos"/>
 <use name="RecoLocalCalo/HGCalRecAlgos"/>
 <use name="Geometry/HGCalGeometry"/>
-<use name="Geometry/HGCalCommonData"/>
-<use name="CondFormats/DataRecord"/>
-<use name="CondFormats/HGCalObjects"/>
 <use name="clhep"/>
 <export>
   <lib name="1"/>
diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml b/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml
index ddd7b85e4f9b0..5118f4ebfdc12 100644
--- a/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml
+++ b/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml
@@ -1,9 +1,12 @@
 <use name="cuda"/>
+<use name="CommonTools/UtilAlgos"/>
 <use name="HeterogeneousCore/CUDACore"/>
 <use name="HeterogeneousCore/CUDAUtilities"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/Utilities"/>
 <use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="DataFormats/ForwardDetId"/>
 <use name="DataFormats/HGCDigi"/>
 <use name="DataFormats/HGCRecHit"/>
 <use name="DataFormats/HcalDetId"/>
@@ -13,7 +16,6 @@
 <use name="Geometry/CaloGeometry"/>
 <use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/HGCalCommonData"/>
-<use name="PhysicsTools/UtilAlgos"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/HGCalObjects"/>
 <library   file="*.cc *.cu" name="RecoLocalCaloHGCalRecProducersPlugins">
diff --git a/RecoLocalFastTime/FTLCommonAlgos/BuildFile.xml b/RecoLocalFastTime/FTLCommonAlgos/BuildFile.xml
index 65f7935c52763..3833c49c36ad3 100644
--- a/RecoLocalFastTime/FTLCommonAlgos/BuildFile.xml
+++ b/RecoLocalFastTime/FTLCommonAlgos/BuildFile.xml
@@ -1,10 +1,7 @@
 <use name="FWCore/Framework"/>
-<use name="Geometry/HGCalGeometry"/>
-<use name="Geometry/Records"/>
 <use name="Geometry/MTDGeometryBuilder"/>
 <use name="DataFormats/FTLRecHit"/>
 <use name="clhep"/>
-<use name="CommonTools/Utils"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/RecoLocalFastTime/FTLCommonAlgos/plugins/BuildFile.xml b/RecoLocalFastTime/FTLCommonAlgos/plugins/BuildFile.xml
index 1d87fd05f6b84..4ddc8b413c325 100644
--- a/RecoLocalFastTime/FTLCommonAlgos/plugins/BuildFile.xml
+++ b/RecoLocalFastTime/FTLCommonAlgos/plugins/BuildFile.xml
@@ -1,3 +1,4 @@
+<use name="CommonTools/Utils"/>
 <use name="RecoLocalFastTime/FTLCommonAlgos"/>
 <use name="RecoLocalFastTime/Records"/>
 <use name="FWCore/Framework"/>
diff --git a/RecoMTD/DetLayers/BuildFile.xml b/RecoMTD/DetLayers/BuildFile.xml
index 5ed71cd29ee88..b64af40d3e429 100644
--- a/RecoMTD/DetLayers/BuildFile.xml
+++ b/RecoMTD/DetLayers/BuildFile.xml
@@ -5,8 +5,6 @@
 <use name="TrackingTools/DetLayers"/>
 <use name="Utilities/BinningTools"/>
 <use name="Geometry/MTDGeometryBuilder"/>
-<use name="Geometry/Records"/>
-<use name="RecoMTD/Records"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml b/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
index 65c849c69bbdf..642ab8c32202e 100644
--- a/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
+++ b/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
@@ -22,7 +22,6 @@
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="HeterogeneousCore/CUDACore"/>
 <use name="MagneticField/Engine"/>
 <use name="MagneticField/Records"/>
 <use name="MagneticField/UniformEngine"/>
diff --git a/SimCalorimetry/EcalEBTrigPrimAlgos/BuildFile.xml b/SimCalorimetry/EcalEBTrigPrimAlgos/BuildFile.xml
index 4aff1dde21a0d..eaaa6be91304c 100644
--- a/SimCalorimetry/EcalEBTrigPrimAlgos/BuildFile.xml
+++ b/SimCalorimetry/EcalEBTrigPrimAlgos/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="DataFormats/EcalRecHit"/>
 <use name="DataFormats/EcalDigi"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="CondFormats/EcalObjects"/>
@@ -7,7 +6,6 @@
 <use name="Geometry/CaloGeometry"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/EcalMapping"/>
-<use name="FWCore/Framework"/>
 <use name="clhep"/>
 <export>
   <lib name="1"/>
diff --git a/SimDataFormats/Associations/BuildFile.xml b/SimDataFormats/Associations/BuildFile.xml
index f060052c1bfd0..9c5fd58c2db6d 100644
--- a/SimDataFormats/Associations/BuildFile.xml
+++ b/SimDataFormats/Associations/BuildFile.xml
@@ -1,5 +1,6 @@
 <use name="DataFormats/CaloRecHit"/>
 <use name="DataFormats/Common"/>
+<use name="DataFormats/HGCalReco"/>
 <use name="DataFormats/HepMCCandidate"/>
 <use name="DataFormats/L1TrackTrigger"/>
 <use name="DataFormats/Math"/>
diff --git a/SimDataFormats/Associations/plugins/BuildFile.xml b/SimDataFormats/Associations/plugins/BuildFile.xml
index dc791a6f1a583..bf4fdbfe7ae3a 100644
--- a/SimDataFormats/Associations/plugins/BuildFile.xml
+++ b/SimDataFormats/Associations/plugins/BuildFile.xml
@@ -1,8 +1,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/HGCalReco"/>
-<use name="DataFormats/ForwardDetId"/>
-<use name="RecoLocalCalo/HGCalRecAlgos"/>
 <library name="CPLCAssociation_plugins" file="*.cc">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Validation/HGCalValidation/plugins/BuildFile.xml b/Validation/HGCalValidation/plugins/BuildFile.xml
index 2b68d43e229db..8a5f230cae0e2 100644
--- a/Validation/HGCalValidation/plugins/BuildFile.xml
+++ b/Validation/HGCalValidation/plugins/BuildFile.xml
@@ -19,8 +19,6 @@
 <use name="Geometry/HGCalCommonData"/>
 <use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/Records"/>
-<use name="HeterogeneousCore/CUDACore"/>
-<use name="HeterogeneousCore/CUDAUtilities"/>
 <use name="L1Trigger/L1THGCal"/>
 <use name="SimDataFormats/CaloHit"/>
 <use name="SimDataFormats/CaloTest"/>
@@ -32,7 +30,6 @@
 <use name="SimG4Core/Watcher"/>
 <use name="SimG4CMS/Calo"/>
 <use name="RecoLocalCalo/HGCalRecAlgos"/>
-<use name="RecoLocalCalo/HGCalRecProducers"/>
 <use name="Validation/HGCalValidation"/>
 <use name="geant4core"/>
 <use name="dd4hep"/>