diff --git a/Alignment/LaserAlignment/BuildFile.xml b/Alignment/LaserAlignment/BuildFile.xml
index fedafb9bdac8f..9b1e6ad9c934c 100644
--- a/Alignment/LaserAlignment/BuildFile.xml
+++ b/Alignment/LaserAlignment/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="Alignment/CommonAlignment"/>
 <use name="Alignment/TrackerAlignment"/>
 <use name="DataFormats/Common"/>
-<use name="DataFormats/TrackingRecHit"/>
 <use name="TrackingTools/TrajectoryState"/>
 <use name="clhepheader"/>
 <use name="rootcore"/>
diff --git a/CommonTools/CandAlgos/plugins/BuildFile.xml b/CommonTools/CandAlgos/plugins/BuildFile.xml
index 6ffafad1a1bf3..003f0e0b1d21e 100644
--- a/CommonTools/CandAlgos/plugins/BuildFile.xml
+++ b/CommonTools/CandAlgos/plugins/BuildFile.xml
@@ -8,5 +8,4 @@
   <use name="CommonTools/UtilAlgos"/>
   <use name="CommonTools/Utils"/>
   <use name="CommonTools/CandAlgos"/>
-  <use name="SimGeneral/HepPDTRecord"/>
 </library>
diff --git a/Configuration/Skimming/BuildFile.xml b/Configuration/Skimming/BuildFile.xml
index ccef0059d56f2..44376092763be 100644
--- a/Configuration/Skimming/BuildFile.xml
+++ b/Configuration/Skimming/BuildFile.xml
@@ -15,7 +15,6 @@
 <use name="RecoVertex/KalmanVertexFit"/>
 <use name="TrackingTools/IPTools"/>
 <use name="MagneticField/Engine"/>
-<use name="MagneticField/ParametrizedEngine"/>
 <use name="TrackingTools/TransientTrack"/>
 <use name="TrackingTools/Records"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/DQM/GEM/plugins/BuildFile.xml b/DQM/GEM/plugins/BuildFile.xml
index a469275194e23..b811f938f2f7d 100644
--- a/DQM/GEM/plugins/BuildFile.xml
+++ b/DQM/GEM/plugins/BuildFile.xml
@@ -2,10 +2,6 @@
   <flags EDM_PLUGIN="1"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/Utilities"/>
   <use name="DQM/GEM"/>
   <use name="DQMServices/Core"/>
-  <use name="DataFormats/GEMDigi"/>
-  <use name="DataFormats/GEMRecHit"/>
-  <use name="Validation/MuonGEMHits"/>
 </library>
diff --git a/IOMC/EventVertexGenerators/test/BuildFile.xml b/IOMC/EventVertexGenerators/test/BuildFile.xml
index ae538e4126d8e..d0e3d4cfa3028 100644
--- a/IOMC/EventVertexGenerators/test/BuildFile.xml
+++ b/IOMC/EventVertexGenerators/test/BuildFile.xml
@@ -1,11 +1,11 @@
 <environment>
+  <use name="CommonTools/UtilAlgos"/>
   <use name="DataFormats/Common"/>
   <use name="FWCore/Framework"/>
   <use name="SimDataFormats/GeneratorProducts"/>
   <use name="clhep"/>
   <use name="root"/>
   <library file="VtxTester.cc" name="VtxSmearingTest">
-    <use name="PhysicsTools/UtilAlgos"/>
     <use name="FWCore/ServiceRegistry"/>
     <flags EDM_PLUGIN="1"/>
   </library>
diff --git a/L1Trigger/L1TGEM/test/BuildFile.xml b/L1Trigger/L1TGEM/test/BuildFile.xml
index 30c126414009d..fc512bbf34a72 100644
--- a/L1Trigger/L1TGEM/test/BuildFile.xml
+++ b/L1Trigger/L1TGEM/test/BuildFile.xml
@@ -1,7 +1,3 @@
-<use name="Geometry/GEMGeometry"/>
-<use name="DataFormats/GEMDigi"/>
-<use name="Geometry/Records"/>
-<use name="CondFormats/DataRecord"/>
 <use name="FWCore/Framework"/>
 <use name="rootgraphics"/>
 <library file="*.cc" name="GEMTriggerPrimitivesTest">
diff --git a/PhysicsTools/HepMCCandAlgos/test/BuildFile.xml b/PhysicsTools/HepMCCandAlgos/test/BuildFile.xml
index dd250949ce54d..bb1ec8d810b3f 100644
--- a/PhysicsTools/HepMCCandAlgos/test/BuildFile.xml
+++ b/PhysicsTools/HepMCCandAlgos/test/BuildFile.xml
@@ -1,6 +1,4 @@
 <library file="DummyHepMCAnalyzer.cc">
-  <use name="PhysicsTools/UtilAlgos"/>
-  <use name="FWCore/ServiceRegistry"/>
   <use name="PhysicsTools/HepMCCandAlgos"/>
   <use name="SimDataFormats/GeneratorProducts"/>
   <use name="FWCore/Framework"/>
diff --git a/SimG4CMS/Calo/BuildFile.xml b/SimG4CMS/Calo/BuildFile.xml
index b6bda3c62bb7a..7b5daa8b441ab 100644
--- a/SimG4CMS/Calo/BuildFile.xml
+++ b/SimG4CMS/Calo/BuildFile.xml
@@ -8,13 +8,13 @@
 <use name="DataFormats/Math"/>
 <use name="CondFormats/GeometryObjects"/>
 <use name="CondFormats/HcalObjects"/>
-<use name="CondFormats/DataRecord"/>
 <use name="SimDataFormats/SimHitMaker"/>
 <use name="SimDataFormats/CaloHit"/>
 <use name="SimDataFormats/CaloTest"/>
 <use name="Geometry/HcalCommonData"/>
 <use name="Geometry/EcalCommonData"/>
 <use name="Geometry/HGCalCommonData"/>
+<use name="Geometry/Records"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ServiceRegistry"/>
diff --git a/SimG4CMS/Calo/plugins/BuildFile.xml b/SimG4CMS/Calo/plugins/BuildFile.xml
index f75182a06fe4b..041a8a5ec0472 100644
--- a/SimG4CMS/Calo/plugins/BuildFile.xml
+++ b/SimG4CMS/Calo/plugins/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="CommonTools/UtilAlgos"/>
+<use name="CondFormats/DataRecord"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="DataFormats/HcalDetId"/>
 <use name="FWCore/Framework"/>
@@ -10,6 +11,7 @@
 <use name="Geometry/HcalTowerAlgo"/>
 <use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/CaloTopology"/>
+<use name="Geometry/Records"/>
 <use name="SimDataFormats/CaloHit"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/Vertex"/>
diff --git a/SimG4CMS/HGCalTestBeam/BuildFile.xml b/SimG4CMS/HGCalTestBeam/BuildFile.xml
index 21c10d355c932..e46b057df6df2 100644
--- a/SimG4CMS/HGCalTestBeam/BuildFile.xml
+++ b/SimG4CMS/HGCalTestBeam/BuildFile.xml
@@ -1,15 +1,8 @@
 <use name="DataFormats/HcalDetId"/>
-<use name="DataFormats/ForwardDetId"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="SimDataFormats/CaloTest"/>
-<use name="SimDataFormats/GeneratorProducts"/>
-<use name="SimDataFormats/HcalTestBeam"/>
-<use name="SimDataFormats/Track"/>
-<use name="SimDataFormats/Vertex"/>
 <use name="SimG4CMS/Calo"/>
 <use name="SimG4Core/Notification"/>
-<use name="SimG4Core/Watcher"/>
 <use name="geant4core"/>
 <use name="clhep"/>
 <use name="rootphysics"/>
diff --git a/SimG4CMS/HGCalTestBeam/plugins/BuildFile.xml b/SimG4CMS/HGCalTestBeam/plugins/BuildFile.xml
index 34d2dbe586930..33208bd8480a8 100644
--- a/SimG4CMS/HGCalTestBeam/plugins/BuildFile.xml
+++ b/SimG4CMS/HGCalTestBeam/plugins/BuildFile.xml
@@ -12,7 +12,6 @@
 <use name="SimDataFormats/HcalTestBeam"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/Vertex"/>
-<use name="SimG4CMS/Calo"/>
 <use name="SimG4CMS/HGCalTestBeam"/>
 <use name="SimG4Core/Notification"/>
 <use name="SimG4Core/Watcher"/>
diff --git a/SimG4CMS/HcalTestBeam/BuildFile.xml b/SimG4CMS/HcalTestBeam/BuildFile.xml
index 2ab4eeeb62169..d1629d382a63e 100644
--- a/SimG4CMS/HcalTestBeam/BuildFile.xml
+++ b/SimG4CMS/HcalTestBeam/BuildFile.xml
@@ -1,10 +1,8 @@
 <use name="DataFormats/HcalDetId"/>
-<use name="DataFormats/Math"/>
 <use name="Geometry/EcalCommonData"/>
 <use name="Geometry/HcalTestBeamData"/>
 <use name="SimDataFormats/HcalTestBeam"/>
 <use name="SimG4Core/Notification"/>
-<use name="SimG4Core/Watcher"/>
 <use name="SimG4CMS/Calo"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
diff --git a/SimG4CMS/HcalTestBeam/plugins/BuildFile.xml b/SimG4CMS/HcalTestBeam/plugins/BuildFile.xml
index f7945b9cafa03..90b56df11fe71 100644
--- a/SimG4CMS/HcalTestBeam/plugins/BuildFile.xml
+++ b/SimG4CMS/HcalTestBeam/plugins/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="DataFormats/HcalDetId"/>
 <use name="DataFormats/Math"/>
-<use name="Geometry/EcalCommonData"/>
 <use name="Geometry/HcalTestBeamData"/>
 <use name="SimDataFormats/HcalTestBeam"/>
 <use name="SimG4Core/Notification"/>
@@ -9,7 +8,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="CommonTools/UtilAlgos"/>
 <use name="SimG4CMS/HcalTestBeam"/>
 <use name="geant4core"/>
diff --git a/SimG4CMS/Muon/BuildFile.xml b/SimG4CMS/Muon/BuildFile.xml
index e1a7c1c695064..8244c9f2db440 100644
--- a/SimG4CMS/Muon/BuildFile.xml
+++ b/SimG4CMS/Muon/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="CondFormats/GeometryObjects"/>
 <use name="Geometry/MuonNumbering"/>
-<use name="Geometry/Records"/>
 <use name="SimG4Core/SensitiveDetector"/>
 <use name="SimG4Core/Notification"/>
 <use name="SimG4Core/Physics"/>
diff --git a/SimG4CMS/Muon/plugins/BuildFile.xml b/SimG4CMS/Muon/plugins/BuildFile.xml
index 6165a2981f7ab..bd52343f03e4c 100644
--- a/SimG4CMS/Muon/plugins/BuildFile.xml
+++ b/SimG4CMS/Muon/plugins/BuildFile.xml
@@ -1,8 +1,7 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/MessageLogger"/>
 <use name="FWCore/PluginManager"/>
-<use name="FWCore/ServiceRegistry"/>
+<use name="Geometry/Records"/>
 <use name="SimG4CMS/Muon"/>
 <use name="boost"/>
 <use name="geant4core"/>
diff --git a/SimG4CMS/ShowerLibraryProducer/plugins/BuildFile.xml b/SimG4CMS/ShowerLibraryProducer/plugins/BuildFile.xml
index 1f5e84556a2d3..0ff22856ddeb6 100644
--- a/SimG4CMS/ShowerLibraryProducer/plugins/BuildFile.xml
+++ b/SimG4CMS/ShowerLibraryProducer/plugins/BuildFile.xml
@@ -1,8 +1,6 @@
 <use name="root"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/MessageLogger"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/PluginManager"/>
 <use name="Geometry/HcalCommonData"/>
 <use name="Geometry/Records"/>
diff --git a/SimG4CMS/Tracker/BuildFile.xml b/SimG4CMS/Tracker/BuildFile.xml
index b8e5e5086a183..7bb9545281b61 100644
--- a/SimG4CMS/Tracker/BuildFile.xml
+++ b/SimG4CMS/Tracker/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="SimG4Core/SensitiveDetector"/>
 <use name="SimG4Core/Notification"/>
 <use name="SimG4Core/Physics"/>
-<use name="Geometry/Records"/>
 <use name="Geometry/TrackerNumberingBuilder"/>
 <use name="geant4core"/>
 <use name="SimDataFormats/SimHitMaker"/>
diff --git a/SimG4CMS/Tracker/plugins/BuildFile.xml b/SimG4CMS/Tracker/plugins/BuildFile.xml
index a81e8c8cce413..7694fdb457f0f 100644
--- a/SimG4CMS/Tracker/plugins/BuildFile.xml
+++ b/SimG4CMS/Tracker/plugins/BuildFile.xml
@@ -1,3 +1,4 @@
+<use name="Geometry/Records"/>
 <use name="SimG4CMS/Tracker"/>
 <use name="SimG4Core/SensitiveDetector"/>
 <use name="geant4core"/>
diff --git a/SimG4Core/Application/test/BuildFile.xml b/SimG4Core/Application/test/BuildFile.xml
index 933807d300b68..81aa60d01aed9 100644
--- a/SimG4Core/Application/test/BuildFile.xml
+++ b/SimG4Core/Application/test/BuildFile.xml
@@ -1,7 +1,5 @@
 <environment>
   <use name="FWCore/Framework"/>
-  <use name="PhysicsTools/UtilAlgos"/>
-  <use name="FWCore/ServiceRegistry"/>
   <library file="SimHitCaloHitDumper.cc" name="SimHitCaloHitDumper">
     <use name="SimDataFormats/TrackingHit"/>
     <use name="SimDataFormats/CaloHit"/>
diff --git a/SimGeneral/Debugging/test/BuildFile.xml b/SimGeneral/Debugging/test/BuildFile.xml
index bfebb9a82fac3..1f2a46f195910 100644
--- a/SimGeneral/Debugging/test/BuildFile.xml
+++ b/SimGeneral/Debugging/test/BuildFile.xml
@@ -8,8 +8,6 @@
   <use name="DataFormats/CSCDigi"/>
   <use name="DataFormats/RPCDigi"/>
   <use name="DataFormats/FTLDigi"/>
-  <use name="PhysicsTools/UtilAlgos"/>
-  <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <library file="SimDigiDumper.cc" name="SimDigiDumper">