diff --git a/Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml b/Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml
index 028d026f1e675..76fd64b3c4fbd 100644
--- a/Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml
+++ b/Alignment/MillePedeAlignmentAlgorithm/test/BuildFile.xml
@@ -2,9 +2,7 @@
   <use name="CondFormats/AlignmentRecord"/>
   <use name="DataFormats/DetId"/>
   <use name="FWCore/Framework"/>
-  <use name="FWCore/ParameterSet"/>
   <use name="CondFormats/Alignment"/>
-  <use name="Alignment/CommonAlignment"/>
   <flags EDM_PLUGIN="1"/>
 </library>
 <test name="test_PrepareInputDb" command="mps_prepare_input_db.py -g auto:run2_data -r 1 -o ${LOCALTOP}/tmp/test_input.db"/>
diff --git a/Alignment/OfflineValidation/plugins/BuildFile.xml b/Alignment/OfflineValidation/plugins/BuildFile.xml
index ecf920508f66e..8e8611256d7b8 100644
--- a/Alignment/OfflineValidation/plugins/BuildFile.xml
+++ b/Alignment/OfflineValidation/plugins/BuildFile.xml
@@ -39,13 +39,12 @@
 <use name="Geometry/TrackerNumberingBuilder"/>
 <use name="HLTrigger/HLTcore"/>
 <use name="MagneticField/Records"/>
+<use name="RecoEcal/EgammaCoreTools"/>
 <use name="RecoMuon/TrackingTools"/>
 <use name="RecoVertex/PrimaryVertexProducer"/>
-<use name="RecoEcal/EgammaClusterAlgos"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimTracker/TrackerHitAssociation"/>
-<use name="SimTracker/TrackAssociation"/>
 <use name="TrackPropagation/SteppingHelixPropagator"/>
 <use name="TrackingTools/IPTools"/>
 <use name="TrackingTools/TrackAssociator"/>
diff --git a/CommonTools/ConditionDBWriter/plugins/BuildFile.xml b/CommonTools/ConditionDBWriter/plugins/BuildFile.xml
index 7e1fed503317a..97b8f1ed45ab0 100644
--- a/CommonTools/ConditionDBWriter/plugins/BuildFile.xml
+++ b/CommonTools/ConditionDBWriter/plugins/BuildFile.xml
@@ -1,9 +1,9 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="CondCore/Utilities"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="CondCore/DBOutputService"/>
+<use name="CondFormats/DataRecord"/>
 <library file="PCLMetadataWriter.cc" name="PCLMetadataWriter">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DQMOffline/Alignment/BuildFile.xml b/DQMOffline/Alignment/BuildFile.xml
index 40bf762dc0dfb..37b7586a729c7 100644
--- a/DQMOffline/Alignment/BuildFile.xml
+++ b/DQMOffline/Alignment/BuildFile.xml
@@ -10,8 +10,5 @@
 <use name="RecoVertex/VertexTools"/>
 <use name="TrackingTools/IPTools"/>
 <use name="TrackingTools/Records"/>
-<use name="TrackingTools/TrackAssociator"/>
-<use name="TrackingTools/TrackFitters"/>
-<use name="TrackingTools/TrajectoryState"/>
 <use name="TrackingTools/TransientTrack"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/HeavyFlavorAnalysis/SpecificDecay/BuildFile.xml b/HeavyFlavorAnalysis/SpecificDecay/BuildFile.xml
index e16228ce8b7dc..e54f79d7dfb1d 100644
--- a/HeavyFlavorAnalysis/SpecificDecay/BuildFile.xml
+++ b/HeavyFlavorAnalysis/SpecificDecay/BuildFile.xml
@@ -4,8 +4,6 @@
 <use name="FWCore/Framework"/>
 <use name="RecoVertex/KinematicFit"/>
 <use name="RecoVertex/KinematicFitPrimitives"/>
-<use name="TrackingTools/Records"/>
-<use name="TrackingTools/TransientTrack"/>
 <export>
   <flags SEAL_PLUGIN="1"/>
   <use name="DataFormats/PatCandidates"/>
diff --git a/HeavyFlavorAnalysis/SpecificDecay/plugins/BuildFile.xml b/HeavyFlavorAnalysis/SpecificDecay/plugins/BuildFile.xml
index 31123c41c44f3..94a57dd789033 100644
--- a/HeavyFlavorAnalysis/SpecificDecay/plugins/BuildFile.xml
+++ b/HeavyFlavorAnalysis/SpecificDecay/plugins/BuildFile.xml
@@ -9,6 +9,8 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="CommonTools/UtilAlgos"/>
+<use name="TrackingTools/Records"/>
+<use name="TrackingTools/TransientTrack"/>
 <library file="*.cc" name="HeavyFlavorSpecificDecaysPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/HeavyFlavorAnalysis/SpecificDecay/test/BuildFile.xml b/HeavyFlavorAnalysis/SpecificDecay/test/BuildFile.xml
index 584132d470d47..cba05ede19987 100644
--- a/HeavyFlavorAnalysis/SpecificDecay/test/BuildFile.xml
+++ b/HeavyFlavorAnalysis/SpecificDecay/test/BuildFile.xml
@@ -6,6 +6,8 @@
 <use name="DataFormats/TrackReco"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
+<use name="TrackingTools/Records"/>
+<use name="TrackingTools/TransientTrack"/>
 <library file="stubs/*.cc" name="HeavyFlavorAnalysisSpecificDecayTest">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/Phase2L1ParticleFlow/BuildFile.xml b/L1Trigger/Phase2L1ParticleFlow/BuildFile.xml
index 28ac6a5e6e71c..fb670d5dde520 100644
--- a/L1Trigger/Phase2L1ParticleFlow/BuildFile.xml
+++ b/L1Trigger/Phase2L1ParticleFlow/BuildFile.xml
@@ -1,13 +1,11 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
+<use name="DataFormats/L1THGCal"/>
 <use name="DataFormats/L1TParticleFlow"/>
 <use name="DataFormats/L1TCorrelator"/>
 <use name="CommonTools/BaseParticlePropagator"/>
-<use name="FastSimulation/Particle"/>
 <use name="DataFormats/ParticleFlowReco"/>
-<use name="L1Trigger/L1THGCal"/>
-<use name="L1Trigger/DemonstratorTools"/>
 <use name="CommonTools/Utils"/>
 <use name="CommonTools/MVAUtils"/>
 <use name="PhysicsTools/TensorFlow"/>
diff --git a/L1Trigger/Phase2L1ParticleFlow/plugins/BuildFile.xml b/L1Trigger/Phase2L1ParticleFlow/plugins/BuildFile.xml
index 3d1223a3526e1..ec5fc6332c496 100644
--- a/L1Trigger/Phase2L1ParticleFlow/plugins/BuildFile.xml
+++ b/L1Trigger/Phase2L1ParticleFlow/plugins/BuildFile.xml
@@ -2,7 +2,7 @@
 <use name="DataFormats/HcalDetId"/>
 <use name="DataFormats/HcalDigi"/>
 <use name="DataFormats/JetReco"/>
-<use name="FWCore/PluginManager"/>
+<use name="L1Trigger/DemonstratorTools"/>
 <use name="L1Trigger/L1TCalorimeter"/>
 <use name="L1Trigger/Phase2L1ParticleFlow"/>
 <use name="MagneticField/Engine"/>
diff --git a/PhysicsTools/TensorFlow/plugins/BuildFile.xml b/PhysicsTools/TensorFlow/plugins/BuildFile.xml
index a005aba128cf6..5f966016c8704 100644
--- a/PhysicsTools/TensorFlow/plugins/BuildFile.xml
+++ b/PhysicsTools/TensorFlow/plugins/BuildFile.xml
@@ -1,9 +1,6 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
-<use name="FWCore/ParameterSet"/>
 <use name="FWCore/PluginManager"/>
 <use name="PhysicsTools/TensorFlow"/>
-<use name="TrackingTools/Records"/>
 <library file="*.cc" name="PhysicsToolsTensorFlowPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoHGCal/TICL/plugins/BuildFile.xml b/RecoHGCal/TICL/plugins/BuildFile.xml
index 5ebee71a3509a..8c631381e21b4 100644
--- a/RecoHGCal/TICL/plugins/BuildFile.xml
+++ b/RecoHGCal/TICL/plugins/BuildFile.xml
@@ -24,7 +24,6 @@
 <use name="RecoLocalCalo/HGCalRecProducers"/>
 <use name="RecoHGCal/TICL"/>
 <use name="RecoParticleFlow/PFProducer"/>
-<use name="RecoTracker/FinalTrackSelectors"/>
 <use name="SimDataFormats/Associations"/>
 <use name="SimDataFormats/CaloAnalysis"/>
 <use name="TrackingTools/GeomPropagators"/>
diff --git a/RecoTracker/FinalTrackSelectors/BuildFile.xml b/RecoTracker/FinalTrackSelectors/BuildFile.xml
index 1560d1b669aa3..8c55683a9a67d 100644
--- a/RecoTracker/FinalTrackSelectors/BuildFile.xml
+++ b/RecoTracker/FinalTrackSelectors/BuildFile.xml
@@ -5,7 +5,6 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="CondFormats/GBRForest"/>
-<use name="PhysicsTools/TensorFlow"/>
 <use name="TrackingTools/PatternTools"/>
 <use name="roottmva"/>
 <use name="lwtnn"/>
diff --git a/RecoTracker/MkFit/plugins/BuildFile.xml b/RecoTracker/MkFit/plugins/BuildFile.xml
index 9b23a9b6b061a..126654202ce6d 100644
--- a/RecoTracker/MkFit/plugins/BuildFile.xml
+++ b/RecoTracker/MkFit/plugins/BuildFile.xml
@@ -30,9 +30,7 @@
   <use name="TrackingTools/TrajectoryState"/>
   <use name="TrackingTools/TransientTrackingRecHit"/>
   <use name="rootmath"/>
-  <use name="CondFormats/GBRForest"/>
   <use name="PhysicsTools/TensorFlow"/>
   <use name="TrackingTools/PatternTools"/>
-  <use name="RecoTracker/FinalTrackSelectors"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimG4Core/CustomPhysics/BuildFile.xml b/SimG4Core/CustomPhysics/BuildFile.xml
index f805ec2132a3f..09fb6abb87374 100644
--- a/SimG4Core/CustomPhysics/BuildFile.xml
+++ b/SimG4Core/CustomPhysics/BuildFile.xml
@@ -1,10 +1,8 @@
 <export>
   <lib name="1"/>
 </export>
-<use name="DataFormats/GeometryVector" source_only="1"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/PluginManager"/>
 <use name="SimG4Core/Notification"/>
 <use name="SimG4Core/Physics"/>
 <use name="SimG4Core/PhysicsLists"/>
diff --git a/SimG4Core/CustomPhysics/plugins/BuildFile.xml b/SimG4Core/CustomPhysics/plugins/BuildFile.xml
index b21bea5a91191..09d0248a57cd0 100644
--- a/SimG4Core/CustomPhysics/plugins/BuildFile.xml
+++ b/SimG4Core/CustomPhysics/plugins/BuildFile.xml
@@ -1,6 +1,8 @@
+<use name="DataFormats/GeometryVector" source_only="1"/>
 <use name="SimG4Core/Watcher"/>
 <use name="SimG4Core/Notification"/>
 <use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
 <use name="geant4core"/>
 <use name="clhep"/>
 <use name="boost"/>
diff --git a/Validation/CTPPS/plugins/BuildFile.xml b/Validation/CTPPS/plugins/BuildFile.xml
index 411f4a0351793..8d5624bb4f00a 100644
--- a/Validation/CTPPS/plugins/BuildFile.xml
+++ b/Validation/CTPPS/plugins/BuildFile.xml
@@ -5,7 +5,6 @@
 <use name="DataFormats/CTPPSDetId"/>
 <use name="rootcore"/>
 <use name="Geometry/VeryForwardGeometryBuilder"/>
-<use name="Geometry/VeryForwardRPTopology"/>
 <use name="DataFormats/ProtonReco"/>
 <library name="ValidationCTPPSPlugins" file="*.cc">
   <flags EDM_PLUGIN="1"/>