diff --git a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
index 77617fc58ce2c..161071cf2de59 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
+++ b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
@@ -38,16 +38,16 @@
 
 <library file="NearbyPixelClustersProducer.cc" name="NearbyPixelClustersProducer">
   <use name="TrackingTools/PatternTools"/>
+  <use name="RecoLocalTracker/ClusterParameterEstimator"/>
   <use name="RecoLocalTracker/Records"/>
-  <use name="RecoTracker/MeasurementDet"/>
   <use name="TrackingTools/TrackFitters"/>
   <flags EDM_PLUGIN="1"/>
 </library>
 
 <library file="NearbyPixelClustersAnalyzer.cc" name="NearbyPixelClustersAnalyzer">
   <use name="TrackingTools/PatternTools"/>
+  <use name="RecoLocalTracker/ClusterParameterEstimator"/>
   <use name="RecoLocalTracker/Records"/>
-  <use name="RecoTracker/MeasurementDet"/>
   <use name="TrackingTools/TrackFitters"/>
   <use name="CondFormats/SiPixelObjects"/>
   <use name="CalibTracker/SiPixelESProducers"/>
diff --git a/L1Trigger/CSCTriggerPrimitives/plugins/BuildFile.xml b/L1Trigger/CSCTriggerPrimitives/plugins/BuildFile.xml
index a844fba67b58a..9298a544ac1de 100644
--- a/L1Trigger/CSCTriggerPrimitives/plugins/BuildFile.xml
+++ b/L1Trigger/CSCTriggerPrimitives/plugins/BuildFile.xml
@@ -8,9 +8,6 @@
 <use name="FWCore/Utilities"/>
 <use name="Geometry/CSCGeometry"/>
 <use name="L1Trigger/CSCTriggerPrimitives"/>
-<use name="SimDataFormats/TrackingHit"/>
-<use name="SimDataFormats/GeneratorProducts"/>
-<use name="CommonTools/UtilAlgos"/>
 <use name="rootgraphics"/>
 <library file="*.cc" name="CSCTriggerPrimitivesPlugins">
   <flags EDM_PLUGIN="1"/>
diff --git a/L1Trigger/L1TTrackMatch/BuildFile.xml b/L1Trigger/L1TTrackMatch/BuildFile.xml
index 7b5913dda03b6..4fd94f3fd8b79 100644
--- a/L1Trigger/L1TTrackMatch/BuildFile.xml
+++ b/L1Trigger/L1TTrackMatch/BuildFile.xml
@@ -8,11 +8,8 @@
 <use   name="DataFormats/Math"/>
 <use   name="L1Trigger/L1TMuon"/>
 <use   name="L1Trigger/L1TMuonEndCap"/>
-<use   name="RecoJets/JetAlgorithms"/>
 <use   name="boost"/>
 <use   name="xerces-c"/>
-<use   name="FWCore/Utilities"/>
-<use   name="L1Trigger/TrackFindingTMTT"/>
 <use   name="clhep"/>
 <use   name="root"/>
 <use   name="rootrflx"/>
diff --git a/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml b/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
index bac9fd17e3121..9df04b788760c 100644
--- a/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
+++ b/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
@@ -1,10 +1,13 @@
 <library   file="*.cc" name="L1TrackTriggerPlugins">
+<use   name="CommonTools/UtilAlgos"/>
 <use   name="Geometry/TrackerGeometryBuilder"/>
 <use   name="Geometry/Records"/>
 <use   name="L1Trigger/L1TTrackMatch"/>
 <use   name="SimDataFormats/GeneratorProducts"/>
+<use   name="SimTracker/TrackTriggerAssociation"/>
 <use   name="DataFormats/L1TrackTrigger"/>
-<use   name="hepmc"/>
+<use   name="FWCore/Utilities"/>
+<use   name="RecoJets/JetProducers"/>
 <use   name="root"/>
 <flags   EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/Phase2L1Taus/BuildFile.xml b/L1Trigger/Phase2L1Taus/BuildFile.xml
index fe08b469b894c..7ec14fe3e2ff3 100644
--- a/L1Trigger/Phase2L1Taus/BuildFile.xml
+++ b/L1Trigger/Phase2L1Taus/BuildFile.xml
@@ -1,4 +1,4 @@
-<use name="CommonTools/UtilAlgos"/>
+<use name="CommonTools/Utils"/>
 <use name="DataFormats/L1TParticleFlow"/>
 <export>
   <lib name="1"/>
diff --git a/L1Trigger/VertexFinder/BuildFile.xml b/L1Trigger/VertexFinder/BuildFile.xml
index 1b036afae3a2e..82b4a81c0ce38 100644
--- a/L1Trigger/VertexFinder/BuildFile.xml
+++ b/L1Trigger/VertexFinder/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="CommonTools/UtilAlgos"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/L1TrackTrigger"/>
 <use name="DataFormats/L1Trigger"/>
@@ -6,14 +5,12 @@
 <use name="DataFormats/Phase2TrackerDigi"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="SimDataFormats/EncodedEventId"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/TrackingAnalysis"/>
-<use name="SimGeneral/TrackingAnalysis"/>
 <use name="SimTracker/TrackTriggerAssociation"/>
 <use name="boost"/>
 <use name="roothistmatrix"/>
diff --git a/L1Trigger/VertexFinder/plugins/BuildFile.xml b/L1Trigger/VertexFinder/plugins/BuildFile.xml
index 6a321175db620..57406256ee311 100644
--- a/L1Trigger/VertexFinder/plugins/BuildFile.xml
+++ b/L1Trigger/VertexFinder/plugins/BuildFile.xml
@@ -1,26 +1,16 @@
-<use name="DataFormats/Common"/>
 <use name="DataFormats/L1TrackTrigger"/>
 <use name="DataFormats/L1Trigger"/>
-<use name="DataFormats/Math"/>
 <use name="DataFormats/Phase2TrackerDigi"/>
 <use name="Geometry/Records"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
-<use name="MagneticField/Engine"/>
-<use name="MagneticField/Records"/>
-<use name="SimDataFormats/EncodedEventId"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/TrackingAnalysis"/>
-<use name="SimGeneral/TrackingAnalysis"/>
 <use name="SimTracker/TrackTriggerAssociation"/>
 <use name="boost"/>
 <use name="roothistmatrix"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/Utilities"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="CommonTools/UtilAlgos"/>
-<use name="CondFormats/DataRecord"/>
 <use name="L1Trigger/VertexFinder"/>
 <library file="*.cc" name="L1TriggerVertexFinderPlugins">
   <flags EDM_PLUGIN="1"/>
diff --git a/RecoHGCal/TICL/plugins/BuildFile.xml b/RecoHGCal/TICL/plugins/BuildFile.xml
index dd228bbb87d1d..e23f331607ef8 100644
--- a/RecoHGCal/TICL/plugins/BuildFile.xml
+++ b/RecoHGCal/TICL/plugins/BuildFile.xml
@@ -1,11 +1,9 @@
 <use name="CommonTools/Utils"/>
 <use name="DataFormats/CaloRecHit"/>
-<use name="DataFormats/Candidate"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/GeometrySurface"/>
 <use name="DataFormats/HGCalReco"/>
 <use name="DataFormats/L1TCorrelator"/>
-<use name="DataFormats/L1Trigger"/>
 <use name="DataFormats/Math"/>
 <use name="DataFormats/ParticleFlowCandidate"/>
 <use name="DataFormats/ParticleFlowReco"/>
diff --git a/RecoLocalTracker/SiStripClusterizer/BuildFile.xml b/RecoLocalTracker/SiStripClusterizer/BuildFile.xml
index 67361b25d730c..205bdbd9de298 100644
--- a/RecoLocalTracker/SiStripClusterizer/BuildFile.xml
+++ b/RecoLocalTracker/SiStripClusterizer/BuildFile.xml
@@ -4,15 +4,12 @@
 <use name="FWCore/Utilities"/>
 <use name="DataFormats/SiStripDigi"/>
 <use name="DataFormats/SiStripCluster"/>
-<use name="DataFormats/Common"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="CalibFormats/SiStripObjects"/>
 <use name="CalibTracker/Records"/>
 <use name="RecoLocalTracker/Records"/>
-<use name="CommonTools/UtilAlgos"/>
-<use name="CommonTools/Utils"/>
 <use name="root"/>
 <export>
   <lib name="1"/>
-</export>
\ No newline at end of file
+</export>
diff --git a/RecoLocalTracker/SiStripClusterizer/test/BuildFile.xml b/RecoLocalTracker/SiStripClusterizer/test/BuildFile.xml
index ed003eaf391a8..fbace042cffb0 100644
--- a/RecoLocalTracker/SiStripClusterizer/test/BuildFile.xml
+++ b/RecoLocalTracker/SiStripClusterizer/test/BuildFile.xml
@@ -1,4 +1,6 @@
 <library name="RecoLocalTrackerSiStripClusterizerTestPlugins" file="*.cc">
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="CommonTools/Utils"/>
   <use name="RecoLocalTracker/SiStripClusterizer"/>
   <use name="SimTracker/TrackerHitAssociation"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/RecoParticleFlow/PFClusterTools/BuildFile.xml b/RecoParticleFlow/PFClusterTools/BuildFile.xml
index bf28c48d22a6c..265d866ebef39 100644
--- a/RecoParticleFlow/PFClusterTools/BuildFile.xml
+++ b/RecoParticleFlow/PFClusterTools/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="CondFormats/PhysicsToolsObjects"/>
 <use name="DataFormats/ParticleFlowReco"/>
 <use name="DataFormats/Math"/>
-<use name="DataFormats/EcalDetId"/>
 <use name="boost"/>
 <use name="rootphysics"/>
 <export>
diff --git a/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml b/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml
index 8cdef3c0101a5..9c9bf958bda12 100644
--- a/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml
+++ b/RecoTracker/FinalTrackSelectors/plugins/BuildFile.xml
@@ -27,7 +27,6 @@
 <use name="TrackingTools/TransientTrack"/>
 <use name="TrackingTools/GeomPropagators"/>
 <use name="TrackingTools/KalmanUpdators"/>
-<use name="TrackingTools/Records"/>
 <use name="CondFormats/GBRForest"/>
 <use name="CommonTools/Utils"/>
 <use name="CommonTools/Statistics"/>
diff --git a/SimDataFormats/Associations/BuildFile.xml b/SimDataFormats/Associations/BuildFile.xml
index cf2945f41c055..a36abda3c0c43 100644
--- a/SimDataFormats/Associations/BuildFile.xml
+++ b/SimDataFormats/Associations/BuildFile.xml
@@ -5,7 +5,6 @@
 <use name="DataFormats/L1TrackTrigger"/>
 <use name="DataFormats/Math"/>
 <use name="DataFormats/MuonReco"/>
-<use name="DataFormats/RecoCandidate"/>
 <use name="DataFormats/TrackCandidate"/>
 <use name="DataFormats/TrackingRecHit"/>
 <use name="DataFormats/TrajectorySeed"/>
diff --git a/SimTracker/SiStripDigitizer/BuildFile.xml b/SimTracker/SiStripDigitizer/BuildFile.xml
index e7c879bc0ff61..f5550c30d47d4 100644
--- a/SimTracker/SiStripDigitizer/BuildFile.xml
+++ b/SimTracker/SiStripDigitizer/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="CalibFormats/SiStripObjects"/>
 <use name="DataFormats/SiStripDigi"/>
-<use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="SimDataFormats/TrackingHit"/>
 <use name="SimGeneral/NoiseGenerators"/>
diff --git a/SimTracker/SiStripDigitizer/plugins/BuildFile.xml b/SimTracker/SiStripDigitizer/plugins/BuildFile.xml
index 91d7d2466808d..d85b3cdb239da 100644
--- a/SimTracker/SiStripDigitizer/plugins/BuildFile.xml
+++ b/SimTracker/SiStripDigitizer/plugins/BuildFile.xml
@@ -1,4 +1,5 @@
 <library file="*.cc" name="SimTrackerSiStripDigitizerPlugins">
+  <use name="FWCore/Framework"/>
   <use name="MagneticField/Engine"/>
   <use name="MagneticField/Records"/>
   <use name="RecoLocalTracker/SiStripZeroSuppression"/>
diff --git a/Validation/HGCalValidation/plugins/BuildFile.xml b/Validation/HGCalValidation/plugins/BuildFile.xml
index 8a5f230cae0e2..48296195a3bdf 100644
--- a/Validation/HGCalValidation/plugins/BuildFile.xml
+++ b/Validation/HGCalValidation/plugins/BuildFile.xml
@@ -1,5 +1,3 @@
-<use name="CalibFormats/HcalObjects"/>
-<use name="CondFormats/GeometryObjects"/>
 <use name="DataFormats/ForwardDetId"/>
 <use name="DataFormats/HcalDetId"/>
 <use name="DataFormats/ParticleFlowCandidate"/>
@@ -15,7 +13,6 @@
 <use name="FWCore/PluginManager"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
-<use name="Geometry/HcalCommonData"/>
 <use name="Geometry/HGCalCommonData"/>
 <use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/Records"/>
diff --git a/Validation/HGCalValidation/test/BuildFile.xml b/Validation/HGCalValidation/test/BuildFile.xml
index 16fde6ad94e1c..ed8ccbdfbd64b 100644
--- a/Validation/HGCalValidation/test/BuildFile.xml
+++ b/Validation/HGCalValidation/test/BuildFile.xml
@@ -1,11 +1,7 @@
-<use name="CalibFormats/HcalObjects"/>
 <use name="DataFormats/ForwardDetId"/>
-<use name="DataFormats/HcalDetId"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/MessageLogger"/>
-<use name="Geometry/HcalCommonData"/>
-<use name="Geometry/HcalTowerAlgo"/>
 <use name="Geometry/HGCalCommonData"/>
 <use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/Records"/>
diff --git a/Validation/RecoParticleFlow/plugins/BuildFile.xml b/Validation/RecoParticleFlow/plugins/BuildFile.xml
index df24419b486e1..e39291e40224c 100644
--- a/Validation/RecoParticleFlow/plugins/BuildFile.xml
+++ b/Validation/RecoParticleFlow/plugins/BuildFile.xml
@@ -6,7 +6,6 @@
   <use name="FWCore/ParameterSet"/>
   <use name="DQMServices/Core"/>
   <use name="DataFormats/METReco"/>
-  <use name="DataFormats/RecoCandidate"/>
   <use name="DataFormats/PatCandidates"/>
   <use name="DataFormats/ParticleFlowReco"/>
   <use name="DataFormats/ParticleFlowCandidate"/>