diff --git a/CalibMuon/DTDigiSync/BuildFile.xml b/CalibMuon/DTDigiSync/BuildFile.xml
index 6a6a31a2e8e80..930081092d6b5 100644
--- a/CalibMuon/DTDigiSync/BuildFile.xml
+++ b/CalibMuon/DTDigiSync/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/PluginManager"/>
-<use name="Geometry/DTGeometry"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DQM/Physics/BuildFile.xml b/DQM/Physics/BuildFile.xml
index 5d68d7f2833d8..5fda1b5441f7b 100644
--- a/DQM/Physics/BuildFile.xml
+++ b/DQM/Physics/BuildFile.xml
@@ -24,5 +24,4 @@
 <use name="TrackingTools/TransientTrack"/>
 <use name="TrackingTools/Records"/>
 <use name="TrackingTools/PatternTools"/>
-<use name="CommonTools/RecoAlgos"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/DataFormats/L1THGCal/BuildFile.xml b/DataFormats/L1THGCal/BuildFile.xml
index a81d1b9fd188b..aaba3b9a72339 100644
--- a/DataFormats/L1THGCal/BuildFile.xml
+++ b/DataFormats/L1THGCal/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="DataFormats/ForwardDetId"/>
 <use name="DataFormats/GeometryVector"/>
 <use name="FWCore/Utilities"/>
-<use name="DataFormats/HcalDetId"/>
 <use name="FWCore/MessageLogger"/>
 <use name="rootrflx"/>
 <use name="boost"/>
diff --git a/FastSimulation/Utilities/BuildFile.xml b/FastSimulation/Utilities/BuildFile.xml
index 6cf11edfdbbda..13a0ff56a36dd 100644
--- a/FastSimulation/Utilities/BuildFile.xml
+++ b/FastSimulation/Utilities/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
-<use name="IOMC/RandomEngine"/>
 <use name="clhep"/>
 <use name="root"/>
 <use name="rootmath"/>
diff --git a/L1Trigger/L1THGCal/BuildFile.xml b/L1Trigger/L1THGCal/BuildFile.xml
index 1e9dbfa2bc3a8..ac1f64cda7e43 100644
--- a/L1Trigger/L1THGCal/BuildFile.xml
+++ b/L1Trigger/L1THGCal/BuildFile.xml
@@ -1,9 +1,9 @@
+<use name="DataFormats/L1Trigger"/>
 <use name="FWCore/Framework"/>
 <use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/CaloTopology"/>
 <use name="Geometry/Records"/>
 <use name="DataFormats/L1THGCal"/>
-<use name="Geometry/HcalTowerAlgo"/>
 <use name="SimDataFormats/CaloTest"/>
 <use name="PhysicsTools/TensorFlow" />
 <use name="json" />
diff --git a/L1Trigger/L1THGCal/test/BuildFile.xml b/L1Trigger/L1THGCal/test/BuildFile.xml
index 70a9e12ee8810..57bd9e315cde6 100644
--- a/L1Trigger/L1THGCal/test/BuildFile.xml
+++ b/L1Trigger/L1THGCal/test/BuildFile.xml
@@ -2,8 +2,6 @@
 <use name="L1Trigger/L1THGCal"/>
 <use name="Geometry/Records"/>
 <use name="CommonTools/UtilAlgos"/>
-<use name="DataFormats/L1Trigger"/>
-<use name="SimDataFormats/CaloTest"/>
 <library name="testL1TriggerL1THGCal" file="HGCalTriggerGeomTesterV9Imp2.cc,HGCalTriggerGeomTesterV9Imp3.cc">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml b/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
index 9df04b788760c..577495943b1e0 100644
--- a/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
+++ b/L1Trigger/L1TTrackMatch/plugins/BuildFile.xml
@@ -7,7 +7,7 @@
 <use   name="SimTracker/TrackTriggerAssociation"/>
 <use   name="DataFormats/L1TrackTrigger"/>
 <use   name="FWCore/Utilities"/>
-<use   name="RecoJets/JetProducers"/>
+<use   name="fastjet"/>
 <use   name="root"/>
 <flags   EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiPixelDigiReProducers/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelDigiReProducers/plugins/BuildFile.xml
index 14f9cb309eb7b..601e368ae04d0 100644
--- a/RecoLocalTracker/SiPixelDigiReProducers/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiPixelDigiReProducers/plugins/BuildFile.xml
@@ -1,7 +1,10 @@
 <use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
 <use name="DataFormats/SiPixelDigi"/>
-<use name="CalibTracker/SiPixelESProducers"/>
 <library file="*.cc" name="RecoLocalTrackerSiPixelDigiReProducersPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoMuon/GlobalMuonProducer/test/BuildFile.xml b/RecoMuon/GlobalMuonProducer/test/BuildFile.xml
index 6706c613eebf5..95c39e7b4a41e 100644
--- a/RecoMuon/GlobalMuonProducer/test/BuildFile.xml
+++ b/RecoMuon/GlobalMuonProducer/test/BuildFile.xml
@@ -1,10 +1,8 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/Utilities"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="RecoMuon/TrackingTools"/>
 <use name="TrackingTools/TransientTrack"/>
-<use name="FWCore/PluginManager"/>
 <use name="DataFormats/TrackReco"/>
 <use name="SimDataFormats/Track"/>
 <use name="CLHEP"/>
diff --git a/SimCalorimetry/HcalZeroSuppressionProducers/BuildFile.xml b/SimCalorimetry/HcalZeroSuppressionProducers/BuildFile.xml
index e395591715b27..5c34f82bdabf5 100644
--- a/SimCalorimetry/HcalZeroSuppressionProducers/BuildFile.xml
+++ b/SimCalorimetry/HcalZeroSuppressionProducers/BuildFile.xml
@@ -1,8 +1,5 @@
 <use name="CalibFormats/HcalObjects"/>
 <use name="DataFormats/HcalDigi"/>
-<use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
-<use name="FWCore/PluginManager"/>
 <use name="boost"/>
 <export>
   <lib name="1"/>
diff --git a/SimG4CMS/EcalTestBeam/BuildFile.xml b/SimG4CMS/EcalTestBeam/BuildFile.xml
index 0c6f2559656a3..492c09a7d7d2a 100644
--- a/SimG4CMS/EcalTestBeam/BuildFile.xml
+++ b/SimG4CMS/EcalTestBeam/BuildFile.xml
@@ -1,16 +1,10 @@
-<use name="DataFormats/Common"/>
 <use name="DetectorDescription/Core"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="Geometry/EcalCommonData"/>
 <use name="Geometry/EcalTestBeam"/>
-<use name="SimDataFormats/EcalTestBeam"/>
-<use name="SimDataFormats/GeneratorProducts"/>
-<use name="SimG4Core/Notification"/>
-<use name="SimG4Core/Watcher"/>
 <use name="SimG4CMS/Calo"/>
-<use name="TBDataFormats/EcalTBObjects"/>
 <use name="clhep"/>
 <use name="rootmath"/>
 <use name="geant4core"/>
diff --git a/SimG4CMS/EcalTestBeam/plugins/BuildFile.xml b/SimG4CMS/EcalTestBeam/plugins/BuildFile.xml
index 44aeab43798e7..27bfa2587adf8 100644
--- a/SimG4CMS/EcalTestBeam/plugins/BuildFile.xml
+++ b/SimG4CMS/EcalTestBeam/plugins/BuildFile.xml
@@ -1,3 +1,9 @@
+<use name="DataFormats/Common"/>
 <use name="FWCore/Framework"/>
+<use name="SimDataFormats/EcalTestBeam"/>
+<use name="SimDataFormats/GeneratorProducts"/>
 <use name="SimG4CMS/EcalTestBeam"/>
+<use name="SimG4Core/Notification"/>
+<use name="SimG4Core/Watcher"/>
+<use name="TBDataFormats/EcalTBObjects"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/SimG4CMS/FP420/BuildFile.xml b/SimG4CMS/FP420/BuildFile.xml
index 6bb0f469ff4a7..633f4f1a1a3dd 100644
--- a/SimG4CMS/FP420/BuildFile.xml
+++ b/SimG4CMS/FP420/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="SimG4Core/Watcher"/>
 <use name="SimG4Core/SensitiveDetector"/>
 <use name="SimG4Core/Notification"/>
 <use name="SimDataFormats/SimHitMaker"/>
diff --git a/SimG4CMS/FP420/plugins/BuildFile.xml b/SimG4CMS/FP420/plugins/BuildFile.xml
index 846f06ba29668..cf50783837342 100644
--- a/SimG4CMS/FP420/plugins/BuildFile.xml
+++ b/SimG4CMS/FP420/plugins/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="SimG4CMS/FP420"/>
+<use name="SimG4Core/Watcher"/>
 <library file="*.cc" name="SimG4CMSFP420Plugins">
   <flags EDM_PLUGIN="1"/>
   <!--
diff --git a/SimG4CMS/Forward/BuildFile.xml b/SimG4CMS/Forward/BuildFile.xml
index 72fed9a1ae1c3..d7e856506a070 100644
--- a/SimG4CMS/Forward/BuildFile.xml
+++ b/SimG4CMS/Forward/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/MessageLogger"/>
-<use name="SimG4Core/Watcher"/>
 <use name="SimG4Core/SensitiveDetector"/>
 <use name="SimG4Core/Notification"/>
 <use name="SimG4Core/Physics"/>
@@ -10,7 +9,6 @@
 <use name="DataFormats/Math"/>
 <use name="SimDataFormats/SimHitMaker"/>
 <use name="SimDataFormats/CaloHit"/>
-<use name="SimDataFormats/Forward"/>
 <use name="Geometry/MTDCommonData"/>
 <use name="boost"/>
 <use name="clhep"/>
diff --git a/SimG4CMS/Forward/plugins/BuildFile.xml b/SimG4CMS/Forward/plugins/BuildFile.xml
index b4fdb0c835f9e..52b4f9f6fd0e9 100644
--- a/SimG4CMS/Forward/plugins/BuildFile.xml
+++ b/SimG4CMS/Forward/plugins/BuildFile.xml
@@ -4,6 +4,7 @@
 <use name="SimG4Core/Notification"/>
 <use name="SimG4CMS/Forward"/>
 <use name="SimDataFormats/CaloTest"/>
+<use name="SimDataFormats/Forward"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/MessageLogger"/>
diff --git a/SimG4CMS/ShowerLibraryProducer/BuildFile.xml b/SimG4CMS/ShowerLibraryProducer/BuildFile.xml
index b649149ea5f34..201a425a376b5 100644
--- a/SimG4CMS/ShowerLibraryProducer/BuildFile.xml
+++ b/SimG4CMS/ShowerLibraryProducer/BuildFile.xml
@@ -1,8 +1,6 @@
-<use name="SimG4Core/Watcher"/>
 <use name="SimG4Core/SensitiveDetector"/>
 <use name="SimG4Core/Notification"/>
 <use name="SimG4CMS/Calo"/>
-<use name="SimG4CMS/Forward"/>
 <use name="DataFormats/Math"/>
 <use name="SimDataFormats/CaloHit"/>
 <use name="FWCore/Framework"/>
diff --git a/SimG4CMS/ShowerLibraryProducer/plugins/BuildFile.xml b/SimG4CMS/ShowerLibraryProducer/plugins/BuildFile.xml
index b54e90835c576..31b7cbe15be03 100644
--- a/SimG4CMS/ShowerLibraryProducer/plugins/BuildFile.xml
+++ b/SimG4CMS/ShowerLibraryProducer/plugins/BuildFile.xml
@@ -4,8 +4,10 @@
 <use name="FWCore/PluginManager"/>
 <use name="Geometry/HcalCommonData"/>
 <use name="Geometry/Records"/>
+<use name="SimG4CMS/Forward"/>
 <use name="SimG4CMS/ShowerLibraryProducer"/>
 <use name="SimG4Core/SensitiveDetector"/>
+<use name="SimG4Core/Watcher"/>
 <flags EDM_PLUGIN="1"/>
 <library name="SimG4CMSHcalForwardLibWriter" file="HcalForwardLibWriter.cc"></library>
 <library name="SimG4CMSShowerLibraryProducerPlugins" file="HFWedgeSensitiveDetectorBuilder.cc,FiberSensitiveDetectorBuilder.cc,HFChamberSensitiveDetectorBuilder.cc"></library>
diff --git a/SimGeneral/TrackingAnalysis/BuildFile.xml b/SimGeneral/TrackingAnalysis/BuildFile.xml
index 8f25f84142224..303b0c7b87042 100644
--- a/SimGeneral/TrackingAnalysis/BuildFile.xml
+++ b/SimGeneral/TrackingAnalysis/BuildFile.xml
@@ -15,7 +15,6 @@
 <use name="DataFormats/L1TrackTrigger"/>
 <use name="DataFormats/TrackerCommon"/>
 <use name="FWCore/Utilities"/>
-<use name="Geometry/Records"/>
 <use name="SimDataFormats/CrossingFrame"/>
 <use name="SimDataFormats/EncodedEventId"/>
 <export>
diff --git a/SimGeneral/TrackingAnalysis/plugins/BuildFile.xml b/SimGeneral/TrackingAnalysis/plugins/BuildFile.xml
index 5015309f1c6a5..0c5df8c0d0ec9 100644
--- a/SimGeneral/TrackingAnalysis/plugins/BuildFile.xml
+++ b/SimGeneral/TrackingAnalysis/plugins/BuildFile.xml
@@ -1,6 +1,7 @@
 <use name="SimGeneral/TrackingAnalysis"/>
 <use name="DataFormats/TrackerCommon"/>
 <use name="DataFormats/HepMCCandidate"/>
+<use name="Geometry/Records"/>
 <use name="SimDataFormats/TrackerDigiSimLink"/>
 <use name="SimGeneral/MixingModule"/>
 <use name="SimGeneral/PreMixingModule"/>
diff --git a/SimMuon/MCTruth/test/BuildFile.xml b/SimMuon/MCTruth/test/BuildFile.xml
index 25633ab5e59bd..c49a86113305d 100644
--- a/SimMuon/MCTruth/test/BuildFile.xml
+++ b/SimMuon/MCTruth/test/BuildFile.xml
@@ -3,7 +3,6 @@
   <use name="FWCore/ParameterSet"/>
   <use name="SimDataFormats/Track"/>
   <use name="DataFormats/TrackReco"/>
-  <use name="DataFormats/MuonReco"/>
   <use name="SimDataFormats/TrackingAnalysis"/>
   <use name="SimMuon/MCTruth"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/SimTracker/TrackAssociation/BuildFile.xml b/SimTracker/TrackAssociation/BuildFile.xml
index c5221961b06c2..7697e57337923 100644
--- a/SimTracker/TrackAssociation/BuildFile.xml
+++ b/SimTracker/TrackAssociation/BuildFile.xml
@@ -8,7 +8,6 @@
 <use name="TrackingTools/PatternTools"/>
 <use name="SimDataFormats/TrackingAnalysis"/>
 <use name="Geometry/Records"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="MagneticField/Records"/>
 <use name="clhep"/>
 <export>