diff --git a/CUDADataFormats/TrackingRecHit/BuildFile.xml b/CUDADataFormats/TrackingRecHit/BuildFile.xml
index b2035d2be0558..b2b7862e2830d 100644
--- a/CUDADataFormats/TrackingRecHit/BuildFile.xml
+++ b/CUDADataFormats/TrackingRecHit/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="CUDADataFormats/Common"/>
 <use name="CUDADataFormats/SiPixelCluster"/>
 <use name="DataFormats/Common"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="HeterogeneousCore/CUDAUtilities"/>
 <export>
     <lib name="1"/>
diff --git a/CalibTracker/SiStripDCS/test/BuildFile.xml b/CalibTracker/SiStripDCS/test/BuildFile.xml
index b26f5aa2a39ef..e3fa9479b2943 100644
--- a/CalibTracker/SiStripDCS/test/BuildFile.xml
+++ b/CalibTracker/SiStripDCS/test/BuildFile.xml
@@ -1,8 +1,6 @@
 <library file="Synchronization/*.cc" name="SyncCalibTrackerSiStripDCSPlugins">
   <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/ServiceRegistry"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CoralCommon"/>
diff --git a/CalibTracker/SiStripHitEfficiency/BuildFile.xml b/CalibTracker/SiStripHitEfficiency/BuildFile.xml
index 086edc9ec70d9..deb712bc91362 100644
--- a/CalibTracker/SiStripHitEfficiency/BuildFile.xml
+++ b/CalibTracker/SiStripHitEfficiency/BuildFile.xml
@@ -1,10 +1,5 @@
-<use name="CommonTools/UtilAlgos"/>
-<use name="DataFormats/DetId"/>
-<use name="DataFormats/Scalers"/>
 <use name="DataFormats/SiStripDetId"/>
-<use name="DataFormats/TrackingRecHit"/>
 <use name="Geometry/CommonDetUnit" source_only="1"/>
-<use name="RecoLocalTracker/SiStripClusterizer"/>
 <use name="RecoTracker/TransientTrackingRecHit"/>
 <use name="TrackingTools/TrackFitters"/>
 <export>
diff --git a/CalibTracker/SiStripQuality/plugins/BuildFile.xml b/CalibTracker/SiStripQuality/plugins/BuildFile.xml
index 8fe3f15ec9e6b..79523f698a04f 100644
--- a/CalibTracker/SiStripQuality/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripQuality/plugins/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="Geometry/Records"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="CalibFormats/SiStripObjects"/>
 <use name="CalibTracker/Records"/>
diff --git a/Calibration/EcalCalibAlgos/BuildFile.xml b/Calibration/EcalCalibAlgos/BuildFile.xml
index 7faf1c5460886..1c3bd55d9b46d 100644
--- a/Calibration/EcalCalibAlgos/BuildFile.xml
+++ b/Calibration/EcalCalibAlgos/BuildFile.xml
@@ -18,7 +18,6 @@
 <use name="xerces-c"/>
 <use name="Calibration/Tools"/>
 <use name="CalibCalorimetry/CaloMiscalibTools"/>
-<use name="CondTools/Ecal"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="DQMServices/Core"/>
 <use name="CondCore/DBOutputService"/>
diff --git a/Calibration/EcalCalibAlgos/plugins/BuildFile.xml b/Calibration/EcalCalibAlgos/plugins/BuildFile.xml
index 0ff87c65acf13..ce58642cb664e 100644
--- a/Calibration/EcalCalibAlgos/plugins/BuildFile.xml
+++ b/Calibration/EcalCalibAlgos/plugins/BuildFile.xml
@@ -1,19 +1,11 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/Utilities"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
-<use name="SimDataFormats/GeneratorProducts"/>
 <use name="DataFormats/EcalRecHit"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="CondFormats/EcalObjects"/>
 <use name="CondFormats/RunInfo"/>
 <use name="CondFormats/DataRecord"/>
 <use name="Geometry/CaloGeometry"/>
-<use name="Geometry/CaloTopology"/>
-<use name="Geometry/EcalAlgo"/>
-<use name="RecoEcal/EgammaCoreTools"/>
-<use name="RecoLocalCalo/EcalRecAlgos"/>
-<use name="CalibCalorimetry/CaloMiscalibTools"/>
 <use name="Calibration/Tools"/>
 <use name="PhysicsTools/NanoAOD"/>
 <use name="Calibration/EcalCalibAlgos"/>
diff --git a/CondFormats/SiStripObjects/test/BuildFile.xml b/CondFormats/SiStripObjects/test/BuildFile.xml
index e0cf162ad31ab..736de92fe1b36 100644
--- a/CondFormats/SiStripObjects/test/BuildFile.xml
+++ b/CondFormats/SiStripObjects/test/BuildFile.xml
@@ -10,6 +10,5 @@
 </bin>
 
 <bin file="test_catch2_*.cpp" name="test_catch2_SiStripBadStrip_Phase2">
-  <use name="DataFormats/SiStripCommon"/>
   <use name="catch2"/>
 </bin>
diff --git a/DQM/GEM/BuildFile.xml b/DQM/GEM/BuildFile.xml
index 3426b1493c859..06c63d8b1045f 100644
--- a/DQM/GEM/BuildFile.xml
+++ b/DQM/GEM/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="boost"/>
+<use name="CondFormats/GEMObjects"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
diff --git a/DQM/GEM/plugins/BuildFile.xml b/DQM/GEM/plugins/BuildFile.xml
index fef6cc0724a03..1ce54a225d40d 100644
--- a/DQM/GEM/plugins/BuildFile.xml
+++ b/DQM/GEM/plugins/BuildFile.xml
@@ -5,8 +5,6 @@
   <use name="DQMServices/Core"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="CondFormats/DataRecord"/>
-  <use name="CondFormats/GEMObjects"/>
   <use name="RecoMuon/TrackingTools"/>
   <use name="TrackingTools/TransientTrack"/>
   <use name="Validation/MuonHits"/>
diff --git a/DataFormats/L1TMuonPhase2/BuildFile.xml b/DataFormats/L1TMuonPhase2/BuildFile.xml
index 9633dd38014e9..4f0d7a4896340 100644
--- a/DataFormats/L1TMuonPhase2/BuildFile.xml
+++ b/DataFormats/L1TMuonPhase2/BuildFile.xml
@@ -1,12 +1,6 @@
 <export>
   <lib name="1"/>
 </export>
-<use name="DataFormats/CSCDigi"/>
-<use name="DataFormats/L1DTTrackFinder"/>
-<use name="DataFormats/GEMDigi"/>
-<use name="DataFormats/MuonDetId"/>
-<use name="DataFormats/L1CSCTrackFinder"/>
 <use name="DataFormats/Common"/>
-<use name="DataFormats/Candidate"/>
 <use name="DataFormats/L1Trigger"/>
 <use name="rootrflx"/>
diff --git a/GeneratorInterface/ExternalDecays/test/BuildFile.xml b/GeneratorInterface/ExternalDecays/test/BuildFile.xml
index 473391a58abea..3c82f274647fc 100644
--- a/GeneratorInterface/ExternalDecays/test/BuildFile.xml
+++ b/GeneratorInterface/ExternalDecays/test/BuildFile.xml
@@ -6,6 +6,5 @@
   <use name="FWCore/Framework"/>
   <use name="CommonTools/UtilAlgos"/>
   <use name="FWCore/ServiceRegistry"/>
-  <use name="FWCore/Utilities"/>
   <use name="SimDataFormats/GeneratorProducts"/>
 </library>
diff --git a/GeneratorInterface/Hydjet2Interface/BuildFile.xml b/GeneratorInterface/Hydjet2Interface/BuildFile.xml
index 8ffc53eb1d3d0..c677f4925492c 100644
--- a/GeneratorInterface/Hydjet2Interface/BuildFile.xml
+++ b/GeneratorInterface/Hydjet2Interface/BuildFile.xml
@@ -9,7 +9,6 @@
 <use name="f77compiler"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
-<use name="CommonTools/UtilAlgos"/>
 <use name="pyquen"/>
 <use name="root"/>
 <use name="hydjet2"/>
diff --git a/HeterogeneousCore/MPIServices/BuildFile.xml b/HeterogeneousCore/MPIServices/BuildFile.xml
index 9c952b6592978..d6c36dff3e874 100644
--- a/HeterogeneousCore/MPIServices/BuildFile.xml
+++ b/HeterogeneousCore/MPIServices/BuildFile.xml
@@ -1,6 +1,6 @@
 <use name="openmpi"/>
-<use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/HeterogeneousCore/MPIServices/plugins/BuildFile.xml b/HeterogeneousCore/MPIServices/plugins/BuildFile.xml
index cd7923226d075..a94aea6f29aa7 100644
--- a/HeterogeneousCore/MPIServices/plugins/BuildFile.xml
+++ b/HeterogeneousCore/MPIServices/plugins/BuildFile.xml
@@ -1,6 +1,4 @@
 <use name="openmpi"/>
-<use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="HeterogeneousCore/MPIServices"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/L1Trigger/DemonstratorTools/BuildFile.xml b/L1Trigger/DemonstratorTools/BuildFile.xml
index d67b1e937c499..692d3965bb994 100644
--- a/L1Trigger/DemonstratorTools/BuildFile.xml
+++ b/L1Trigger/DemonstratorTools/BuildFile.xml
@@ -1,13 +1,6 @@
 <use   name="FWCore/MessageLogger"/>
 <use   name="DataFormats/L1Trigger"/>
 <use   name="DataFormats/L1TrackTrigger"/>
-<use   name="DataFormats/L1TCorrelator"/>
-<use   name="DataFormats/L1TMuon"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/Math"/>
-<use   name="L1Trigger/L1TMuon"/>
-<use   name="L1Trigger/L1TMuonEndCap"/>
-<use   name="RecoJets/JetAlgorithms"/>
 <use   name="clhep"/>
 <use name="hls"/>
 <use   name="root"/>
diff --git a/L1Trigger/DemonstratorTools/plugins/BuildFile.xml b/L1Trigger/DemonstratorTools/plugins/BuildFile.xml
index 744d43e2b43ea..8137c56ac9497 100644
--- a/L1Trigger/DemonstratorTools/plugins/BuildFile.xml
+++ b/L1Trigger/DemonstratorTools/plugins/BuildFile.xml
@@ -1,12 +1,7 @@
 <use name="DataFormats/L1Trigger"/>
 <use name="DataFormats/L1TrackTrigger"/>
-<use name="DataFormats/L1TCorrelator"/>
-<use name="DataFormats/L1TMuon"/>
-<use name="DataFormats/GeometryVector"/>
-<use name="DataFormats/Math"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
 <use name="L1Trigger/DemonstratorTools"/>
 <!--<use name="hls/2019.08"/>-->
 <use name="hls"/>
diff --git a/L1Trigger/L1THGCalUtilities/plugins/BuildFile.xml b/L1Trigger/L1THGCalUtilities/plugins/BuildFile.xml
index 44a722e14cafc..76061421f72b4 100644
--- a/L1Trigger/L1THGCalUtilities/plugins/BuildFile.xml
+++ b/L1Trigger/L1THGCalUtilities/plugins/BuildFile.xml
@@ -11,7 +11,6 @@
   <use name="FWCore/ParameterSet"/>
   <use name="Geometry/Records"/>
   <use name="SimDataFormats/CaloAnalysis"/>
-  <use name="SimDataFormats/CaloTest"/>
   <use name="DataFormats/L1THGCal"/>
   <use name="L1Trigger/L1THGCal"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml b/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
index fdafd47595970..a07734397210c 100644
--- a/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
+++ b/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
@@ -1,11 +1,8 @@
 
 <library   file="*.cc" name="L1TrackTriggerPlugins">
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="CommonTools/BaseParticlePropagator"/>
 <use   name="CommonTools/Utils"/>
 <use   name="DataFormats/Common"/>
 <use   name="DataFormats/L1TrackTrigger"/>
-<use   name="Geometry/TrackerNumberingBuilder"/>
 <use   name="Geometry/TrackerGeometryBuilder"/>
 <use   name="Geometry/Records"/>
 <use   name="L1Trigger/L1TTrackMatch"/>
@@ -13,9 +10,6 @@
 <use   name="SimTracker/TrackTriggerAssociation"/>
 <use   name="FWCore/Utilities"/>
 <use   name="fastjet"/>
-<use   name="L1Trigger/TrackTrigger"/>
-<use   name="PhysicsTools/UtilAlgos"/>
-<use   name="SimGeneral/HepPDTRecord"/>
 <use   name="hls"/>
 <use   name="hepmc"/>
 <use   name="root"/>
diff --git a/L1Trigger/L1TTrackMatch/test/BuildFile.xml b/L1Trigger/L1TTrackMatch/test/BuildFile.xml
index f551705befad7..40911d6ba48a3 100644
--- a/L1Trigger/L1TTrackMatch/test/BuildFile.xml
+++ b/L1Trigger/L1TTrackMatch/test/BuildFile.xml
@@ -5,15 +5,11 @@
     <use   name="root"/>
     <use   name="heppdt"/>
     <use   name="CommonTools/UtilAlgos"/>
-    <use   name="CondFormats/Alignment"/>
-    <use   name="CondFormats/DataRecord"/>
-    <use   name="CondFormats/L1TObjects"/>
     <use   name="DataFormats/Common"/>
     <use   name="DataFormats/HepMCCandidate"/>
     <use   name="DataFormats/L1TrackTrigger"/>
     <use   name="DataFormats/L1Trigger"/>
     <use   name="DataFormats/Phase2TrackerDigi"/>
-    <use   name="DataFormats/TrackerRecHit2D"/>
     <use   name="FWCore/Framework"/>
     <use   name="FWCore/MessageLogger"/>
     <use   name="FWCore/PluginManager"/>
@@ -22,19 +18,9 @@
     <use   name="Geometry/CommonDetUnit"/>
     <use   name="Geometry/Records"/>
     <use   name="Geometry/TrackerGeometryBuilder"/>
-    <use   name="Geometry/TrackerNumberingBuilder"/>
-    <use   name="PhysicsTools/CandUtils"/>
-    <use   name="PhysicsTools/UtilAlgos"/>
-    <use   name="SimTracker/TrackerHitAssociation"/>
-    <use   name="RecoLocalTracker/SiPixelRecHits"/>
-    <use   name="RecoTracker/TkSeedGenerator"/>
     <use   name="SimTracker/TrackTriggerAssociation"/>
-    <use   name="SimDataFormats/Vertex"/>
     <use   name="SimDataFormats/TrackingHit"/>
-    <use   name="SimDataFormats/CrossingFrame"/>
     <use   name="SimDataFormats/TrackingAnalysis"/>
-    <use   name="TrackingTools/TrackAssociator"/>
-    <use   name="TrackingTools/TrajectoryState"/>
     <use   name="hls"/>
   </library>
 </environment>
diff --git a/L1Trigger/Phase2L1GMT/BuildFile.xml b/L1Trigger/Phase2L1GMT/BuildFile.xml
index e3ce9c6b7da87..8d46e1a62eb96 100644
--- a/L1Trigger/Phase2L1GMT/BuildFile.xml
+++ b/L1Trigger/Phase2L1GMT/BuildFile.xml
@@ -1,6 +1,4 @@
-<use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/Utilities"/>
 <use name="DataFormats/L1TMuonPhase2"/>
 <use name="DataFormats/L1TMuon"/>
 <use name="DataFormats/L1Trigger"/>
diff --git a/L1Trigger/Phase2L1GMT/plugins/BuildFile.xml b/L1Trigger/Phase2L1GMT/plugins/BuildFile.xml
index 517b69ea337ab..a537e3c529f02 100644
--- a/L1Trigger/Phase2L1GMT/plugins/BuildFile.xml
+++ b/L1Trigger/Phase2L1GMT/plugins/BuildFile.xml
@@ -2,9 +2,6 @@
   <use name="DataFormats/L1TMuonPhase2"/>
   <use name="DataFormats/L1TMuon"/>
   <use name="DataFormats/L1Trigger"/>
-  <use name="SimGeneral/HepPDTRecord"/>
-  <use name="DataFormats/L1TrackTrigger"/>
-  <use name="DataFormats/L1TCorrelator"/>
   <use name="L1Trigger/Phase2L1GMT"/>
   <use name="hepmc"/>
   <use name="hls"/>
diff --git a/L1Trigger/Phase2L1Taus/BuildFile.xml b/L1Trigger/Phase2L1Taus/BuildFile.xml
index 035e9410cf0c2..7ec14fe3e2ff3 100644
--- a/L1Trigger/Phase2L1Taus/BuildFile.xml
+++ b/L1Trigger/Phase2L1Taus/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="CommonTools/Utils"/>
-<use name="CommonTools/UtilAlgos"/>
 <use name="DataFormats/L1TParticleFlow"/>
 <export>
   <lib name="1"/>
diff --git a/L1Trigger/VertexFinder/BuildFile.xml b/L1Trigger/VertexFinder/BuildFile.xml
index 2ee9f1b116ce8..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"/>
diff --git a/RecoEgamma/EgammaTools/BuildFile.xml b/RecoEgamma/EgammaTools/BuildFile.xml
index 8a5d985ab6994..33d90ff89a012 100644
--- a/RecoEgamma/EgammaTools/BuildFile.xml
+++ b/RecoEgamma/EgammaTools/BuildFile.xml
@@ -17,7 +17,6 @@
 <use name="RecoEcal/EgammaCoreTools"/>
 <use name="DataFormats/ParticleFlowReco"/>
 <use name="PhysicsTools/TensorFlow" />
-<use name="HeterogeneousCore/SonicTriton"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/RecoEgamma/EgammaTools/plugins/BuildFile.xml b/RecoEgamma/EgammaTools/plugins/BuildFile.xml
index c934ab2fe9ffd..ae7116d176e39 100644
--- a/RecoEgamma/EgammaTools/plugins/BuildFile.xml
+++ b/RecoEgamma/EgammaTools/plugins/BuildFile.xml
@@ -8,4 +8,5 @@
   <use name="CondFormats/GBRForest"/>
   <use name="DataFormats/EgammaCandidates"/>
   <use name="RecoEgamma/EgammaTools"/>
+  <use name="HeterogeneousCore/SonicTriton"/>
 </library>