diff --git a/Alignment/APEEstimation/BuildFile.xml b/Alignment/APEEstimation/BuildFile.xml
index ec4d6de7c2a22..23a775ea0aeac 100644
--- a/Alignment/APEEstimation/BuildFile.xml
+++ b/Alignment/APEEstimation/BuildFile.xml
@@ -1,38 +1,5 @@
-<use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/ServiceRegistry"/>
-<use name="FWCore/Utilities"/>
-<use name="CommonTools/UtilAlgos"/>
 <use name="CommonTools/Utils"/>
-<use name="DataFormats/Common"/>
-<use name="DataFormats/CLHEP"/>
-<use name="DataFormats/TrackReco"/>
-<use name="DataFormats/TrackingRecHit"/>
-<use name="DataFormats/DetId"/>
-<use name="DataFormats/TrackerRecHit2D"/>
-<use name="DataFormats/GeometryVector"/>
-<use name="DataFormats/GeometryCommonDetAlgo"/>
-<use name="DataFormats/SiPixelDetId"/>
-<use name="DataFormats/SiStripDetId"/>
-<use name="DataFormats/SiPixelCluster"/>
-<use name="DataFormats/SiStripCluster"/>
-<use name="TrackingTools/PatternTools"/>
-<use name="TrackingTools/TrackFitters"/>
-<use name="TrackingTools/TransientTrackingRecHit"/>
-<use name="TrackingTools/TrajectoryState"/>
-<use name="Geometry/CommonDetUnit"/>
-<use name="Geometry/CommonTopologies"/>
-<use name="CondFormats/Alignment"/>
-<use name="RecoLocalTracker/SiStripClusterizer"/>
-<use name="RecoLocalTracker/SiStripRecHitConverter"/>
-<use name="MagneticField/Engine"/>
-<use name="CondFormats/SiStripObjects"/>
-<use name="DataFormats/GeometrySurface"/>
-<use name="MagneticField/Records"/>
-<use name="CondFormats/DataRecord"/>
-<use name="DataFormats/BeamSpot"/>
-<use name="DataFormats/Math"/>
+<use name="CondFormats/AlignmentRecord"/>
 <use name="rootcore"/>
 <use name="root"/>
 <export>
diff --git a/Alignment/APEEstimation/plugins/BuildFile.xml b/Alignment/APEEstimation/plugins/BuildFile.xml
index e15c45fe5347f..bf58b745cf5a8 100644
--- a/Alignment/APEEstimation/plugins/BuildFile.xml
+++ b/Alignment/APEEstimation/plugins/BuildFile.xml
@@ -1,4 +1,9 @@
 <library file="*.cc" name="ApeEstimatorApeEstimatorPlugins">
   <use name="Alignment/APEEstimation"/>
+  <use name="DataFormats/TrackingRecHit"/>
+  <use name="DataFormats/TrackerRecHit2D"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="TrackingTools/TrackFitters"/>
+  <use name="RecoLocalTracker/SiStripClusterizer"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Alignment/CocoaApplication/bin/BuildFile.xml b/Alignment/CocoaApplication/bin/BuildFile.xml
index e05097049a08c..014dbcf06a727 100644
--- a/Alignment/CocoaApplication/bin/BuildFile.xml
+++ b/Alignment/CocoaApplication/bin/BuildFile.xml
@@ -6,6 +6,5 @@
 <use name="Alignment/CocoaFit"/>
 <use name="Alignment/CocoaUtilities"/>
 <use name="Alignment/CocoaToDDL"/>
-<use name="Alignment/CocoaDDLObjects"/>
 <bin file="cocoa.cpp" name="cocoa">
 </bin>
diff --git a/Alignment/CocoaModel/BuildFile.xml b/Alignment/CocoaModel/BuildFile.xml
index a7d0cdf443afd..172224966848d 100644
--- a/Alignment/CocoaModel/BuildFile.xml
+++ b/Alignment/CocoaModel/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="Alignment/CocoaDDLObjects"/>
 <use name="Alignment/CocoaDaq"/>
 <use name="CondFormats/OptAlignObjects"/>
-<use name="FWCore/ParameterSet"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/Alignment/CommonAlignment/BuildFile.xml b/Alignment/CommonAlignment/BuildFile.xml
index da527da60773d..ef9ee5f6f7dbf 100644
--- a/Alignment/CommonAlignment/BuildFile.xml
+++ b/Alignment/CommonAlignment/BuildFile.xml
@@ -3,10 +3,7 @@
 </export>
 <use name="CondCore/CondDB"/>
 <use name="DataFormats/GeometrySurface"/>
-<use name="DataFormats/GeometryVector"/>
 <use name="DataFormats/TrackingRecHit"/>
-<use name="DataFormats/CSCRecHit"/>
-<use name="DataFormats/DTRecHit"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
diff --git a/Alignment/CommonAlignment/plugins/BuildFile.xml b/Alignment/CommonAlignment/plugins/BuildFile.xml
index 173af9497a116..7c0ee008632e4 100644
--- a/Alignment/CommonAlignment/plugins/BuildFile.xml
+++ b/Alignment/CommonAlignment/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/RunInfo"/>
diff --git a/Alignment/CommonAlignmentProducer/BuildFile.xml b/Alignment/CommonAlignmentProducer/BuildFile.xml
index abe28aee43cda..efb979f978b42 100644
--- a/Alignment/CommonAlignmentProducer/BuildFile.xml
+++ b/Alignment/CommonAlignmentProducer/BuildFile.xml
@@ -14,9 +14,6 @@
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/TrackerRecHit2D"/>
 <use name="DataFormats/TrackingRecHit"/>
-<use name="DataFormats/CSCRecHit"/>
-<use name="DataFormats/DTRecHit"/>
-<use name="DataFormats/RPCRecHit"/>
 <use name="DataFormats/Candidate"/>
 <use name="DataFormats/RecoCandidate"/>
 <use name="DataFormats/Math"/>
diff --git a/Alignment/HIPAlignmentAlgorithm/BuildFile.xml b/Alignment/HIPAlignmentAlgorithm/BuildFile.xml
index 6a957a17a117f..53e6993109200 100644
--- a/Alignment/HIPAlignmentAlgorithm/BuildFile.xml
+++ b/Alignment/HIPAlignmentAlgorithm/BuildFile.xml
@@ -1,13 +1,8 @@
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/Utilities"/>
 <use name="FWCore/ParameterSet"/>
 <use name="CondFormats/Alignment"/>
 <use name="TrackingTools/PatternTools"/>
 <use name="TrackingTools/TrackFitters"/>
-<use name="TrackingTools/TrajectoryState"/>
-<use name="TrackingTools/TransientTrack"/>
-<use name="RecoVertex/PrimaryVertexProducer"/>
 <use name="DataFormats/Alignment"/>
 <use name="Alignment/CommonAlignment"/>
 <use name="Alignment/CommonAlignmentAlgorithm"/>
diff --git a/Alignment/HIPAlignmentAlgorithm/plugins/BuildFile.xml b/Alignment/HIPAlignmentAlgorithm/plugins/BuildFile.xml
index 565df6221c782..9e4c7d544a509 100644
--- a/Alignment/HIPAlignmentAlgorithm/plugins/BuildFile.xml
+++ b/Alignment/HIPAlignmentAlgorithm/plugins/BuildFile.xml
@@ -1,7 +1,4 @@
-<use name="FWCore/MessageLogger"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/Utilities"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="CommonTools/UtilAlgos"/>
diff --git a/Alignment/LaserAlignment/BuildFile.xml b/Alignment/LaserAlignment/BuildFile.xml
index b201d5f906343..17c5731553a10 100644
--- a/Alignment/LaserAlignment/BuildFile.xml
+++ b/Alignment/LaserAlignment/BuildFile.xml
@@ -1,9 +1,7 @@
-<use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <use name="Alignment/CommonAlignment"/>
 <use name="Alignment/TrackerAlignment"/>
-<use name="DataFormats/GeometrySurface"/>
 <use name="clhepheader"/>
 <use name="rootcore"/>
 <use name="rootminuit"/>
diff --git a/Alignment/LaserAlignmentSimulation/test/BuildFile.xml b/Alignment/LaserAlignmentSimulation/test/BuildFile.xml
index 8122d1cfba9f5..6d7ccef22f65e 100644
--- a/Alignment/LaserAlignmentSimulation/test/BuildFile.xml
+++ b/Alignment/LaserAlignmentSimulation/test/BuildFile.xml
@@ -3,8 +3,6 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/MessageLogger"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="Geometry/TrackerNumberingBuilder"/>
-<use name="Geometry/CommonTopologies"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="DataFormats/SiStripDetId"/>
 <use name="DataFormats/DetId"/>
diff --git a/Alignment/MillePedeAlignmentAlgorithm/BuildFile.xml b/Alignment/MillePedeAlignmentAlgorithm/BuildFile.xml
index 294599310e285..2df67d211e551 100644
--- a/Alignment/MillePedeAlignmentAlgorithm/BuildFile.xml
+++ b/Alignment/MillePedeAlignmentAlgorithm/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="Alignment/CommonAlignmentAlgorithm"/>
 <use name="Alignment/CommonAlignmentParametrization"/>
 <use name="Alignment/MuonAlignment"/>
-<use name="Alignment/SurveyAnalysis"/>
 <use name="Alignment/ReferenceTrajectories"/>
 <use name="CondFormats/PCLConfig"/>
 <use name="DataFormats/CLHEP"/>
diff --git a/Alignment/MillePedeAlignmentAlgorithm/plugins/BuildFile.xml b/Alignment/MillePedeAlignmentAlgorithm/plugins/BuildFile.xml
index c4fafb4a6baee..590560a8ee08c 100644
--- a/Alignment/MillePedeAlignmentAlgorithm/plugins/BuildFile.xml
+++ b/Alignment/MillePedeAlignmentAlgorithm/plugins/BuildFile.xml
@@ -1,5 +1,5 @@
+<use name="Alignment/SurveyAnalysis"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="CommonTools/UtilAlgos"/>
diff --git a/Alignment/MuonAlignment/BuildFile.xml b/Alignment/MuonAlignment/BuildFile.xml
index de4a31fd318cd..cc3c2d285a88e 100644
--- a/Alignment/MuonAlignment/BuildFile.xml
+++ b/Alignment/MuonAlignment/BuildFile.xml
@@ -7,9 +7,7 @@
 <use name="Geometry/CSCGeometry"/>
 <use name="Geometry/CSCGeometryBuilder"/>
 <use name="Geometry/CommonTopologies"/>
-<use name="DetectorDescription/Core"/>
 <use name="Geometry/Records"/>
-<use name="DataFormats/DetId"/>
 <use name="FWCore/Framework"/>
 <use name="Utilities/Xerces"/>
 <use name="CondCore/DBOutputService"/>
diff --git a/Alignment/MuonAlignmentAlgorithms/BuildFile.xml b/Alignment/MuonAlignmentAlgorithms/BuildFile.xml
index e31e0f53db373..30778aee7f57d 100644
--- a/Alignment/MuonAlignmentAlgorithms/BuildFile.xml
+++ b/Alignment/MuonAlignmentAlgorithms/BuildFile.xml
@@ -1,9 +1,7 @@
+<use name="CommonTools/UtilAlgos"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
-<use name="CommonTools/Utils"/>
 <use name="DataFormats/TrackReco"/>
 <use name="Geometry/CSCGeometry"/>
 <use name="Geometry/CommonDetUnit"/>
diff --git a/Alignment/MuonAlignmentAlgorithms/test/BuildFile.xml b/Alignment/MuonAlignmentAlgorithms/test/BuildFile.xml
index a1568925c1770..e488f23936ab8 100644
--- a/Alignment/MuonAlignmentAlgorithms/test/BuildFile.xml
+++ b/Alignment/MuonAlignmentAlgorithms/test/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="CommonTools/UtilAlgos"/>
 <use name="FWCore/ServiceRegistry"/>
diff --git a/Alignment/OfflineValidation/BuildFile.xml b/Alignment/OfflineValidation/BuildFile.xml
index fe55e51eb988b..7d804454846af 100644
--- a/Alignment/OfflineValidation/BuildFile.xml
+++ b/Alignment/OfflineValidation/BuildFile.xml
@@ -1,9 +1,7 @@
 <use name="DataFormats/TrackReco"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/Utilities"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="TrackingTools/PatternTools"/>
 <use name="TrackingTools/TrackFitters"/>
diff --git a/Alignment/OfflineValidation/plugins/BuildFile.xml b/Alignment/OfflineValidation/plugins/BuildFile.xml
index f6b6d63d79424..eece061aff4b4 100644
--- a/Alignment/OfflineValidation/plugins/BuildFile.xml
+++ b/Alignment/OfflineValidation/plugins/BuildFile.xml
@@ -8,7 +8,6 @@
 <use name="CondFormats/SiPixelObjects"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/MuonReco"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/Utilities"/>
 <use name="FWCore/ParameterSet"/>
@@ -21,8 +20,6 @@
 <use name="TrackingTools/TransientTrack"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="SimTracker/Records"/>
-<use name="SimTracker/TrackAssociation"/>
 <use name="SimTracker/TrackerHitAssociation"/>
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/MuonDetId"/>
@@ -39,11 +36,9 @@
 <use name="TrackingTools/IPTools"/>
 <use name="DataFormats/TrajectorySeed"/>
 <use name="DataFormats/VertexReco"/>
-<use name="SimDataFormats/Vertex"/>
 <use name="DataFormats/BeamSpot"/>
 <use name="RecoVertex/PrimaryVertexProducer"/>
 <use name="MagneticField/Records"/>
-<use name="DQM/SiStripCommon"/>
 <use name="DQMServices/Core"/>
 <use name="CLHEP"/>
 <use name="root"/>
diff --git a/Alignment/ReferenceTrajectories/BuildFile.xml b/Alignment/ReferenceTrajectories/BuildFile.xml
index 05c83ec067946..4b9dc0f8f8e00 100644
--- a/Alignment/ReferenceTrajectories/BuildFile.xml
+++ b/Alignment/ReferenceTrajectories/BuildFile.xml
@@ -12,7 +12,6 @@
 <use name="TrackingTools/MaterialEffects"/>
 <use name="TrackingTools/PatternTools"/>
 <use name="TrackingTools/TrajectoryState"/>
-<use name="TrackingTools/TrackFitters"/>
 <use name="TrackingTools/TransientTrackingRecHit"/>
 <use name="RecoTracker/TransientTrackingRecHit"/>
 <use name="TrackPropagation/RungeKutta"/>
diff --git a/Alignment/ReferenceTrajectories/plugins/BuildFile.xml b/Alignment/ReferenceTrajectories/plugins/BuildFile.xml
index 35799b5fba172..0d6e657fd93cb 100644
--- a/Alignment/ReferenceTrajectories/plugins/BuildFile.xml
+++ b/Alignment/ReferenceTrajectories/plugins/BuildFile.xml
@@ -4,9 +4,7 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/CLHEP"/>
-<use name="DataFormats/GeometryCommonDetAlgo"/>
 <use name="DataFormats/GeometrySurface"/>
-<use name="DataFormats/TrackingRecHit"/>
 <use name="MagneticField/Records"/>
 <use name="TrackingTools/GeomPropagators"/>
 <use name="TrackingTools/TransientTrack"/>
diff --git a/Alignment/TrackerAlignment/BuildFile.xml b/Alignment/TrackerAlignment/BuildFile.xml
index 497984f45205c..3141d86a977dc 100644
--- a/Alignment/TrackerAlignment/BuildFile.xml
+++ b/Alignment/TrackerAlignment/BuildFile.xml
@@ -7,7 +7,6 @@
 <use name="DataFormats/TrackingRecHit"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <use name="Geometry/CommonDetUnit"/>
diff --git a/Alignment/TwoBodyDecay/BuildFile.xml b/Alignment/TwoBodyDecay/BuildFile.xml
index 9d8e9e3dcd640..c9c45afa678ec 100644
--- a/Alignment/TwoBodyDecay/BuildFile.xml
+++ b/Alignment/TwoBodyDecay/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="rootmath"/>
 <use name="boost"/>
-<use name="FWCore/Framework"/>
 <use name="FWCore/Utilities"/>
 <use name="FWCore/ParameterSet"/>
 <use name="RecoVertex/VertexTools"/>
diff --git a/CalibCalorimetry/CaloMiscalibTools/BuildFile.xml b/CalibCalorimetry/CaloMiscalibTools/BuildFile.xml
index 7d319ced57736..17738689c355b 100644
--- a/CalibCalorimetry/CaloMiscalibTools/BuildFile.xml
+++ b/CalibCalorimetry/CaloMiscalibTools/BuildFile.xml
@@ -1,17 +1,13 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="Utilities/Xerces"/>
 <use name="CondFormats/DataRecord"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="DataFormats/HcalDetId"/>
 <use name="CondFormats/EcalObjects"/>
-<use name="CondFormats/HcalObjects"/>
 <use name="DataFormats/DetId"/>
-<use name="DataFormats/EcalRecHit"/>
 <use name="DataFormats/HcalRecHit"/>
 <use name="Geometry/CaloTopology"/>
-<use name="CondCore/DBOutputService"/>
 <use name="xerces-c"/>
 <export>
   <lib name="1"/>
diff --git a/CalibCalorimetry/CaloMiscalibTools/plugins/BuildFile.xml b/CalibCalorimetry/CaloMiscalibTools/plugins/BuildFile.xml
index d4edfb6386743..c2a6b0a795416 100644
--- a/CalibCalorimetry/CaloMiscalibTools/plugins/BuildFile.xml
+++ b/CalibCalorimetry/CaloMiscalibTools/plugins/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="CalibCalorimetry/CaloMiscalibTools"/>
+<use name="CondCore/DBOutputService"/>
 <library file="*.cc" name="CalibCalorimetryCaloMiscalibToolsPlugin">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CalibCalorimetry/CaloTPG/BuildFile.xml b/CalibCalorimetry/CaloTPG/BuildFile.xml
index 9463ca38dc813..2d4098996f34b 100644
--- a/CalibCalorimetry/CaloTPG/BuildFile.xml
+++ b/CalibCalorimetry/CaloTPG/BuildFile.xml
@@ -1,8 +1,5 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/ParameterSet"/>
 <use name="CalibFormats/CaloTPG"/>
-<use name="CalibFormats/HcalObjects"/>
 <use name="Geometry/CaloTopology"/>
 <use name="Geometry/HcalTowerAlgo"/>
 <use name="CalibCalorimetry/HcalTPGAlgos"/>
diff --git a/CalibCalorimetry/CastorCalib/BuildFile.xml b/CalibCalorimetry/CastorCalib/BuildFile.xml
index 552fa285037f5..702fbd93886b7 100644
--- a/CalibCalorimetry/CastorCalib/BuildFile.xml
+++ b/CalibCalorimetry/CastorCalib/BuildFile.xml
@@ -3,11 +3,8 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="DataFormats/HcalDetId"/>
-<use name="CondFormats/HcalObjects"/>
 <use name="DataFormats/HcalDigi"/>
-<use name="CalibFormats/HcalObjects"/>
 <use name="CalibFormats/CastorObjects"/>
-<use name="Geometry/ForwardGeometry"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/CalibCalorimetry/EcalCorrectionModules/BuildFile.xml b/CalibCalorimetry/EcalCorrectionModules/BuildFile.xml
index c261e0e4b1bd8..efd204bce68c1 100644
--- a/CalibCalorimetry/EcalCorrectionModules/BuildFile.xml
+++ b/CalibCalorimetry/EcalCorrectionModules/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/EcalCorrections"/>
 <use name="DataFormats/EcalDetId"/>
diff --git a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/BuildFile.xml b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/BuildFile.xml
index 479c341e2fff0..d2c8dbcfb2c86 100644
--- a/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/BuildFile.xml
+++ b/CalibCalorimetry/EcalCorrelatedNoiseAnalysisModules/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/EcalDigi"/>
 <use name="DataFormats/EcalDetId"/>
-<use name="TBDataFormats/EcalTBObjects"/>
 <use name="CalibCalorimetry/EcalCorrelatedNoiseAnalysisAlgos"/>
 <use name="root"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CalibCalorimetry/EcalLaserAnalyzer/BuildFile.xml b/CalibCalorimetry/EcalLaserAnalyzer/BuildFile.xml
index 4c18980d5b2a8..538472f4d7085 100644
--- a/CalibCalorimetry/EcalLaserAnalyzer/BuildFile.xml
+++ b/CalibCalorimetry/EcalLaserAnalyzer/BuildFile.xml
@@ -1,10 +1,5 @@
-<use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
 <use name="root"/>
 <use name="rootgraphics"/>
-<use name="DataFormats/EcalDigi"/>
-<use name="DataFormats/EcalRecHit"/>
-<use name="Geometry/EcalMapping"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/CalibCalorimetry/EcalLaserAnalyzer/plugins/BuildFile.xml b/CalibCalorimetry/EcalLaserAnalyzer/plugins/BuildFile.xml
index 7c4db33127df6..4056dce7f5ffb 100644
--- a/CalibCalorimetry/EcalLaserAnalyzer/plugins/BuildFile.xml
+++ b/CalibCalorimetry/EcalLaserAnalyzer/plugins/BuildFile.xml
@@ -1,4 +1,6 @@
-<use name="CalibCalorimetry/EcalLaserAnalyzer"/>
 <library file="*.cc" name="CalibCalorimetryEcalLaserAnalyzerPlugin">
+  <use name="CalibCalorimetry/EcalLaserAnalyzer"/>
+  <use name="FWCore/Framework"/>
+  <use name="Geometry/EcalMapping"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CalibCalorimetry/EcalLaserCorrection/BuildFile.xml b/CalibCalorimetry/EcalLaserCorrection/BuildFile.xml
index dc8f445047fd8..3df044dfd45f4 100644
--- a/CalibCalorimetry/EcalLaserCorrection/BuildFile.xml
+++ b/CalibCalorimetry/EcalLaserCorrection/BuildFile.xml
@@ -5,7 +5,6 @@
 <use name="DataFormats/EcalDetId"/>
 <use name="DataFormats/Provenance"/>
 <use name="FWCore/MessageLogger"/>
-<use name="Geometry/EcalMapping"/>
 <use name="boost"/>
 <use name="tbb"/>
 <export>
diff --git a/CalibCalorimetry/EcalLaserCorrection/test/BuildFile.xml b/CalibCalorimetry/EcalLaserCorrection/test/BuildFile.xml
index 8bc156960969a..6eb98e4cb646f 100644
--- a/CalibCalorimetry/EcalLaserCorrection/test/BuildFile.xml
+++ b/CalibCalorimetry/EcalLaserCorrection/test/BuildFile.xml
@@ -1,13 +1,7 @@
-<use name="CondFormats/DataRecord"/>
 <use name="CondFormats/EcalObjects"/>
-<use name="DataFormats/DetId"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="DataFormats/Provenance"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
-<use name="Geometry/EcalMapping"/>
 <use name="CalibCalorimetry/EcalLaserCorrection"/>
 <use name="boost"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CalibCalorimetry/EcalLaserSorting/test/BuildFile.xml b/CalibCalorimetry/EcalLaserSorting/test/BuildFile.xml
index 682920fcda3aa..f56f8403427bc 100644
--- a/CalibCalorimetry/EcalLaserSorting/test/BuildFile.xml
+++ b/CalibCalorimetry/EcalLaserSorting/test/BuildFile.xml
@@ -1,4 +1,4 @@
-<use name="FWCore/Framework"/>
 <bin file="RunThis_t.cpp" name="CalibCalorimetryEcalLaserSortingRunStreamer">
+  <use name="FWCore/Utilities"/> 
   <flags TEST_RUNNER_ARGS="/bin/bash CalibCalorimetry/EcalLaserSorting/test RunStreamer.sh"/>
 </bin>
diff --git a/CalibCalorimetry/EcalPedestalOffsets/BuildFile.xml b/CalibCalorimetry/EcalPedestalOffsets/BuildFile.xml
index 951a404602bd5..4157f84c3655f 100644
--- a/CalibCalorimetry/EcalPedestalOffsets/BuildFile.xml
+++ b/CalibCalorimetry/EcalPedestalOffsets/BuildFile.xml
@@ -1,15 +1,9 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="DataFormats/FEDRawData"/>
 <use name="DataFormats/EcalDigi"/>
-<use name="DataFormats/EcalDetId"/>
-<use name="CondFormats/EcalObjects"/>
-<use name="DataFormats/EcalRecHit"/>
 <use name="DataFormats/EcalRawData"/>
-<use name="CondFormats/DataRecord"/>
-<use name="RecoLocalCalo/EcalRecAlgos"/>
 <use name="OnlineDB/EcalCondDB"/>
 <use name="Geometry/EcalMapping"/>
-<use name="OnlineDB/Oracle"/>
 <use name="clhep"/>
+<use name="root"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CalibCalorimetry/EcalSRTools/BuildFile.xml b/CalibCalorimetry/EcalSRTools/BuildFile.xml
index d30379cae96f7..33e8e7cd1247c 100644
--- a/CalibCalorimetry/EcalSRTools/BuildFile.xml
+++ b/CalibCalorimetry/EcalSRTools/BuildFile.xml
@@ -1,12 +1,8 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/MessageLogger"/>
-<use name="DataFormats/EcalDigi"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/EcalObjects"/>
 <use name="Geometry/EcalMapping"/>
 <use name="OnlineDB/EcalCondDB"/>
-<use name="OnlineDB/Oracle"/>
 <use name="SimCalorimetry/EcalSimAlgos"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CalibCalorimetry/EcalTPGTools/BuildFile.xml b/CalibCalorimetry/EcalTPGTools/BuildFile.xml
index a8b12e0adc7bc..07af00943a026 100644
--- a/CalibCalorimetry/EcalTPGTools/BuildFile.xml
+++ b/CalibCalorimetry/EcalTPGTools/BuildFile.xml
@@ -2,10 +2,7 @@
 <use name="DataFormats/EcalDetId"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/EcalObjects"/>
-<use name="SimCalorimetry/EcalSimAlgos"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/Utilities"/>
-<use name="CondCore/DBOutputService"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/CaloTopology"/>
 <use name="Geometry/EcalMapping"/>
diff --git a/CalibCalorimetry/EcalTPGTools/plugins/BuildFile.xml b/CalibCalorimetry/EcalTPGTools/plugins/BuildFile.xml
index aa7a23c001f76..ab84b38bf83c6 100644
--- a/CalibCalorimetry/EcalTPGTools/plugins/BuildFile.xml
+++ b/CalibCalorimetry/EcalTPGTools/plugins/BuildFile.xml
@@ -1,9 +1,10 @@
+<use name="CondCore/DBOutputService"/>
 <use name="FWCore/Framework"/>
 <use name="Geometry/EcalMapping"/>
 <use name="OnlineDB/EcalCondDB"/>
-<use name="OnlineDB/Oracle"/>
 <use name="Geometry/CaloTopology"/>
 <use name="CalibCalorimetry/EcalTPGTools"/>
+<use name="SimCalorimetry/EcalSimAlgos"/>
 <library file="*.cc" name="CalibCalorimetryEcalTPGToolsPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CalibCalorimetry/EcalTPGTools/test/BuildFile.xml b/CalibCalorimetry/EcalTPGTools/test/BuildFile.xml
index 46f5076ce1a5e..fc48a4b191006 100644
--- a/CalibCalorimetry/EcalTPGTools/test/BuildFile.xml
+++ b/CalibCalorimetry/EcalTPGTools/test/BuildFile.xml
@@ -1,3 +1 @@
 <use name="CalibCalorimetry/EcalTPGTools"/>
-<use name="OnlineDB/EcalCondDB"/>
-<use name="OnlineDB/Oracle"/>
diff --git a/CalibCalorimetry/HcalAlgos/plugins/BuildFile.xml b/CalibCalorimetry/HcalAlgos/plugins/BuildFile.xml
index 602e366c2ddff..35b2dfbeb0c10 100644
--- a/CalibCalorimetry/HcalAlgos/plugins/BuildFile.xml
+++ b/CalibCalorimetry/HcalAlgos/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="CalibCalorimetry/HcalAlgos"/>
-<use name="CondFormats/HcalObjects"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <library file="HcalPulseContainmentTest.cc" name="HcalPulseContainmentTest">
diff --git a/CalibCalorimetry/HcalTPGAlgos/BuildFile.xml b/CalibCalorimetry/HcalTPGAlgos/BuildFile.xml
index 15e87ffb9ba3b..b506b070349a2 100644
--- a/CalibCalorimetry/HcalTPGAlgos/BuildFile.xml
+++ b/CalibCalorimetry/HcalTPGAlgos/BuildFile.xml
@@ -2,12 +2,9 @@
 <use name="CalibFormats/HcalObjects"/>
 <use name="Geometry/HcalTowerAlgo"/>
 <use name="CalibCalorimetry/HcalAlgos"/>
-<use name="DataFormats/DetId"/>
 <use name="DataFormats/HcalDetId"/>
 <use name="Utilities/Xerces"/>
 <use name="CondFormats/HcalObjects"/>
-<use name="CalibFormats/CaloObjects"/>
-<use name="CondFormats/DataRecord"/>
 <use name="xerces-c"/>
 <use name="md5"/>
 <export>
diff --git a/CalibCalorimetry/HcalTPGEventSetup/BuildFile.xml b/CalibCalorimetry/HcalTPGEventSetup/BuildFile.xml
index 5930d592f9221..24ec06703a5ec 100644
--- a/CalibCalorimetry/HcalTPGEventSetup/BuildFile.xml
+++ b/CalibCalorimetry/HcalTPGEventSetup/BuildFile.xml
@@ -1,6 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/ParameterSet"/>
 <use name="CalibCalorimetry/HcalTPGAlgos"/>
 <use name="CalibFormats/HcalObjects"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CalibCalorimetry/HcalTPGIO/BuildFile.xml b/CalibCalorimetry/HcalTPGIO/BuildFile.xml
index cad6fa01f9828..dca093aeebcbd 100644
--- a/CalibCalorimetry/HcalTPGIO/BuildFile.xml
+++ b/CalibCalorimetry/HcalTPGIO/BuildFile.xml
@@ -2,8 +2,6 @@
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/HcalDetId"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/Utilities"/>
 <use name="CalibFormats/HcalObjects"/>
 <use name="CalibFormats/CaloTPG"/>
-<use name="DataFormats/HcalDigi"/>
 <use name="md5"/>
diff --git a/CalibFormats/SiStripObjects/BuildFile.xml b/CalibFormats/SiStripObjects/BuildFile.xml
index ae0e25688abd3..a74360b8ce03c 100644
--- a/CalibFormats/SiStripObjects/BuildFile.xml
+++ b/CalibFormats/SiStripObjects/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="DataFormats/SiStripCommon"/>
 <use name="CondFormats/SiStripObjects"/>
diff --git a/CalibMuon/CSCCalibration/BuildFile.xml b/CalibMuon/CSCCalibration/BuildFile.xml
index 6dfa4ba384187..27a3a483193f1 100644
--- a/CalibMuon/CSCCalibration/BuildFile.xml
+++ b/CalibMuon/CSCCalibration/BuildFile.xml
@@ -2,7 +2,6 @@
 <use name="CondFormats/DataRecord"/>
 <use name="DataFormats/MuonDetId"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <export>
diff --git a/CalibMuon/CSCCalibration/plugins/BuildFile.xml b/CalibMuon/CSCCalibration/plugins/BuildFile.xml
index 004968f0b6bd2..876be4d96fdee 100644
--- a/CalibMuon/CSCCalibration/plugins/BuildFile.xml
+++ b/CalibMuon/CSCCalibration/plugins/BuildFile.xml
@@ -1,9 +1,7 @@
 <use name="CalibMuon/CSCCalibration"/>
 <use name="CondFormats/CSCObjects"/>
 <use name="CondFormats/DataRecord"/>
-<use name="DataFormats/MuonDetId"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
 <use name="FWCore/PluginManager"/>
 <use name="boost"/>
 <library name="CalibMuonCSCCalibrationPlugins" file="*.cc">
diff --git a/CalibMuon/CSCCalibration/test/BuildFile.xml b/CalibMuon/CSCCalibration/test/BuildFile.xml
index e92efb8efff2b..f9cf7431bdc4e 100644
--- a/CalibMuon/CSCCalibration/test/BuildFile.xml
+++ b/CalibMuon/CSCCalibration/test/BuildFile.xml
@@ -1,4 +1,3 @@
-<use name="CondFormats/Calibration"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondCore/PopCon"/>
 <use name="CondFormats/CSCObjects"/>
diff --git a/CalibMuon/DTCalibration/BuildFile.xml b/CalibMuon/DTCalibration/BuildFile.xml
index 490b90cd362df..51d4e8ddbdac6 100644
--- a/CalibMuon/DTCalibration/BuildFile.xml
+++ b/CalibMuon/DTCalibration/BuildFile.xml
@@ -1,7 +1,5 @@
 <use name="FWCore/Framework"/>
-<use name="DataFormats/DTDigi"/>
 <use name="DataFormats/DTRecHit"/>
-<use name="DataFormats/CSCRecHit"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/MuonReco"/>
 <use name="Geometry/DTGeometry"/>
diff --git a/CalibMuon/DTCalibration/plugins/BuildFile.xml b/CalibMuon/DTCalibration/plugins/BuildFile.xml
index 2f83da5ece6a5..c3e30ea272499 100644
--- a/CalibMuon/DTCalibration/plugins/BuildFile.xml
+++ b/CalibMuon/DTCalibration/plugins/BuildFile.xml
@@ -1,13 +1,11 @@
 <use name="FWCore/Framework"/>
 <use name="DataFormats/DTDigi"/>
 <use name="DataFormats/DTRecHit"/>
-<use name="DataFormats/MuonReco"/>
 <use name="Geometry/DTGeometry"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/MuonNumbering"/>
 <use name="CondFormats/DTObjects"/>
 <use name="CondFormats/DataRecord"/>
-<use name="CondCore/DBOutputService"/>
 <use name="CommonTools/Utils"/>
 <use name="CalibMuon/DTDigiSync"/>
 <use name="CalibMuon/DTCalibration"/>
diff --git a/CalibMuon/DTDigiSync/BuildFile.xml b/CalibMuon/DTDigiSync/BuildFile.xml
index f52b2e30a2787..09b5b5ba76949 100644
--- a/CalibMuon/DTDigiSync/BuildFile.xml
+++ b/CalibMuon/DTDigiSync/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="Geometry/Records"/>
 <use name="Geometry/DTGeometry"/>
 <use name="CondFormats/DTObjects"/>
 <use name="CondFormats/DataRecord"/>
diff --git a/CalibMuon/RPCCalibration/BuildFile.xml b/CalibMuon/RPCCalibration/BuildFile.xml
index aa532b3f1d77e..86b6a017ba922 100644
--- a/CalibMuon/RPCCalibration/BuildFile.xml
+++ b/CalibMuon/RPCCalibration/BuildFile.xml
@@ -5,12 +5,8 @@
 <use name="Geometry/Records"/>
 <use name="FWCore/PluginManager"/>
 <use name="DataFormats/Common"/>
-<use name="DQMServices/Core"/>
 <use name="DataFormats/MuonDetId"/>
-<use name="DataFormats/RPCDigi"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/RPCObjects"/>
 <use name="clhep"/>
-<use name="DataFormats/FEDRawData"/>
-<use name="CondCore/DBOutputService"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiPixelConnectivity/BuildFile.xml b/CalibTracker/SiPixelConnectivity/BuildFile.xml
index 9695c40cc5890..313447a0fc54a 100644
--- a/CalibTracker/SiPixelConnectivity/BuildFile.xml
+++ b/CalibTracker/SiPixelConnectivity/BuildFile.xml
@@ -1,10 +1,7 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondFormats/SiPixelObjects"/>
-<use name="CondFormats/DataRecord"/>
 <use name="DataFormats/SiPixelDetId"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="boost"/>
diff --git a/CalibTracker/SiPixelConnectivity/test/BuildFile.xml b/CalibTracker/SiPixelConnectivity/test/BuildFile.xml
index cf9cba60a9395..09642f62ed278 100644
--- a/CalibTracker/SiPixelConnectivity/test/BuildFile.xml
+++ b/CalibTracker/SiPixelConnectivity/test/BuildFile.xml
@@ -1,9 +1,5 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
-<use name="Geometry/Records"/>
-<use name="Geometry/CommonDetUnit"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondCore/DBOutputService"/>
 <use name="CalibTracker/SiPixelConnectivity"/>
 <library file="SiPixelFedCablingMapWriter.cc" name="SiPixelFedCablingMapWriter">
diff --git a/CalibTracker/SiPixelESProducers/BuildFile.xml b/CalibTracker/SiPixelESProducers/BuildFile.xml
index 41f653a448010..0553a995878c8 100644
--- a/CalibTracker/SiPixelESProducers/BuildFile.xml
+++ b/CalibTracker/SiPixelESProducers/BuildFile.xml
@@ -5,8 +5,6 @@
 <use name="CondFormats/SiPixelObjects"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/SiPixelDigi"/>
-<use name="CalibTracker/Records"/>
-<use name="MagneticField/VolumeBasedEngine"/>
 <use name="boost"/>
 <export>
   <lib name="1"/>
diff --git a/CalibTracker/SiPixelESProducers/plugins/BuildFile.xml b/CalibTracker/SiPixelESProducers/plugins/BuildFile.xml
index a2a67c8cb647d..5380c9d7d346b 100644
--- a/CalibTracker/SiPixelESProducers/plugins/BuildFile.xml
+++ b/CalibTracker/SiPixelESProducers/plugins/BuildFile.xml
@@ -5,7 +5,9 @@
 <use name="CondFormats/SiStripObjects"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
+<use name="CalibTracker/Records"/>
 <use name="CalibTracker/SiPixelESProducers"/>
+<use name="MagneticField/Engine"/>
 <library file="*.cc" name="CalibTrackerSiPixelESProducersPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CalibTracker/SiPixelESProducers/test/BuildFile.xml b/CalibTracker/SiPixelESProducers/test/BuildFile.xml
index ccfcd78d42bce..eca4866874276 100644
--- a/CalibTracker/SiPixelESProducers/test/BuildFile.xml
+++ b/CalibTracker/SiPixelESProducers/test/BuildFile.xml
@@ -6,8 +6,8 @@
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondFormats/SiPixelObjects"/>
-<use name="CondCore/DBOutputService"/>
 <use name="CalibTracker/SiPixelESProducers"/>
+<use name="CalibTracker/Records"/>
 <library file="*.cc" name="testCalibTrackerSiPixelESProducers">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CalibTracker/SiPixelErrorEstimation/BuildFile.xml b/CalibTracker/SiPixelErrorEstimation/BuildFile.xml
index 48a1060d434c5..f5e6542f4c1ee 100644
--- a/CalibTracker/SiPixelErrorEstimation/BuildFile.xml
+++ b/CalibTracker/SiPixelErrorEstimation/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/DetId"/>
@@ -22,7 +21,6 @@
 <use name="SimTracker/TrackerHitAssociation"/>
 <use name="TrackingTools/KalmanUpdators"/>
 <use name="TrackingTools/MaterialEffects"/>
-<use name="TrackingTools/Records"/>
 <use name="root"/>
 <use name="rootmath"/>
 <use name="clhep"/>
diff --git a/CalibTracker/SiPixelGainCalibration/test/BuildFile.xml b/CalibTracker/SiPixelGainCalibration/test/BuildFile.xml
index 67fb666499a57..15b922eead8cf 100644
--- a/CalibTracker/SiPixelGainCalibration/test/BuildFile.xml
+++ b/CalibTracker/SiPixelGainCalibration/test/BuildFile.xml
@@ -1,10 +1,5 @@
 <use name="DataFormats/SiPixelDigi"/>
-<use name="CalibFormats/SiPixelObjects"/>
-<use name="CondFormats/SiPixelObjects"/>
-<use name="CondCore/DBOutputService"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
-<use name="Geometry/Records"/>
-<use name="Geometry/CommonTopologies"/>
+<use name="FWCore/Framework"/>
 <use name="root"/>
 <library file="*.cc" name="testCalibTrackerSiPixelGainCalibration">
   <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiPixelIsAliveCalibration/BuildFile.xml b/CalibTracker/SiPixelIsAliveCalibration/BuildFile.xml
index 809c04ee54f3f..139f25a60c837 100644
--- a/CalibTracker/SiPixelIsAliveCalibration/BuildFile.xml
+++ b/CalibTracker/SiPixelIsAliveCalibration/BuildFile.xml
@@ -1,10 +1,5 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
-<use name="CalibFormats/SiPixelObjects"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="DataFormats/SiPixelDigi"/>
 <use name="CalibTracker/SiPixelTools"/>
-<use name="Geometry/Records"/>
-<use name="Geometry/CommonDetUnit"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiPixelLorentzAngle/BuildFile.xml b/CalibTracker/SiPixelLorentzAngle/BuildFile.xml
index ee6658aecc94f..ad536dcdeec60 100644
--- a/CalibTracker/SiPixelLorentzAngle/BuildFile.xml
+++ b/CalibTracker/SiPixelLorentzAngle/BuildFile.xml
@@ -2,16 +2,12 @@
 <use name="FWCore/Framework"/>
 <use name="DataFormats/Common"/>
 <use name="FWCore/ParameterSet"/>
-<use name="RecoTracker/TkSeedGenerator"/>
 <use name="TrackingTools/TrackFitters"/>
 <use name="TrackingTools/TransientTrack"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="Geometry/Records"/>
 <use name="SimTracker/TrackerHitAssociation"/>
 <use name="MagneticField/Records"/>
-<use name="MagneticField/VolumeBasedEngine"/>
 <use name="root"/>
 <use name="clhep"/>
 <use name="boost"/>
-<use name="CondCore/DBOutputService"/>
-<use name="CondFormats/SiPixelObjects"/>
diff --git a/CalibTracker/SiPixelQuality/BuildFile.xml b/CalibTracker/SiPixelQuality/BuildFile.xml
index 35c12f147f2bc..6800155f8d9a3 100644
--- a/CalibTracker/SiPixelQuality/BuildFile.xml
+++ b/CalibTracker/SiPixelQuality/BuildFile.xml
@@ -1,13 +1,6 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
-<use name="DataFormats/DetId"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
-<use name="Geometry/Records"/>
 <use name="DataFormats/SiPixelDetId"/>
-<use name="DataFormats/FEDRawData"/>
-<use name="CondFormats/DataRecord"/>
-<use name="DQM/SiPixelPhase1Common"/>
 <use name="clhep"/>
 <use name="boost"/>
 <use name="root"/>
diff --git a/CalibTracker/SiPixelQuality/plugins/BuildFile.xml b/CalibTracker/SiPixelQuality/plugins/BuildFile.xml
index bfb2db5348014..02a00e4b557b4 100644
--- a/CalibTracker/SiPixelQuality/plugins/BuildFile.xml
+++ b/CalibTracker/SiPixelQuality/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/DetId"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
diff --git a/CalibTracker/SiPixelTools/BuildFile.xml b/CalibTracker/SiPixelTools/BuildFile.xml
index 5c5cf1436b9d0..0d42698939e9e 100644
--- a/CalibTracker/SiPixelTools/BuildFile.xml
+++ b/CalibTracker/SiPixelTools/BuildFile.xml
@@ -1,18 +1,13 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/MessageLogger"/>
 <use name="FWCore/ServiceRegistry"/>
-<use name="DataFormats/FEDRawData"/>
 <use name="DataFormats/SiPixelDigi"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/SiPixelObjects"/>
-<use name="CondCore/DBOutputService"/>
 <use name="Geometry/Records"/>
 <use name="root"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="CalibFormats/SiPixelObjects"/>
 <use name="DQM/SiPixelCommon"/>
 <use name="DQMServices/Core"/>
 <export>
diff --git a/CalibTracker/SiStripChannelGain/BuildFile.xml b/CalibTracker/SiStripChannelGain/BuildFile.xml
index cfd3ab2b324fa..47f5bd897ed7e 100644
--- a/CalibTracker/SiStripChannelGain/BuildFile.xml
+++ b/CalibTracker/SiStripChannelGain/BuildFile.xml
@@ -1,12 +1,9 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DQMServices/Core"/>
-<use name="CalibTracker/SiStripCommon"/>
 <use name="CalibFormats/SiStripObjects"/>
 <use name="CalibTracker/Records"/>
 <use name="CondFormats/SiStripObjects"/>
-<use name="CondFormats/RunInfo"/>
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/FEDRawData"/>
 <use name="DataFormats/TrackerCommon"/>
@@ -15,9 +12,6 @@
 <use name="DataFormats/SiStripDetId"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/TrackerRecHit2D"/>
-<use name="DataFormats/TrajectorySeed"/>
-<use name="DataFormats/MuonReco"/>
-<use name="RecoTracker/DeDx"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/Records"/>
@@ -27,7 +21,6 @@
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
-<use name="CommonTools/UtilAlgos"/>
 <use name="CondCore/DBOutputService"/>
 <export>
   <lib name="1"/>
diff --git a/CalibTracker/SiStripChannelGain/plugins/BuildFile.xml b/CalibTracker/SiStripChannelGain/plugins/BuildFile.xml
index 23621e6383b94..1ea78c718b21d 100644
--- a/CalibTracker/SiStripChannelGain/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripChannelGain/plugins/BuildFile.xml
@@ -1,2 +1,4 @@
 <use name="CalibTracker/SiStripChannelGain"/>
+<use name="CondFormats/RunInfo"/>
+<use name="RecoTracker/DeDx"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiStripCommon/BuildFile.xml b/CalibTracker/SiStripCommon/BuildFile.xml
index 25c4d278a53ef..facef426a582e 100644
--- a/CalibTracker/SiStripCommon/BuildFile.xml
+++ b/CalibTracker/SiStripCommon/BuildFile.xml
@@ -1,3 +1,4 @@
+<use name="CommonTools/UtilAlgos"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/SiStripDetId"/>
diff --git a/CalibTracker/SiStripCommon/plugins/BuildFile.xml b/CalibTracker/SiStripCommon/plugins/BuildFile.xml
index 3c7314c497f2b..6fcda79ae69e4 100644
--- a/CalibTracker/SiStripCommon/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripCommon/plugins/BuildFile.xml
@@ -1,13 +1,10 @@
-<use name="RecoLocalTracker/SiStripClusterizer"/>
-<use name="CommonTools/UtilAlgos"/>
-<use name="SimTracker/TrackAssociation"/>
-<use name="SimTracker/Records"/>
 <use name="TrackingTools/TrackFitters"/>
 <use name="CalibTracker/SiStripCommon"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="CondFormats/L1TObjects"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/RunInfo"/>
+<use name="RecoLocalTracker/SiStripClusterizer"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
 <library file="*.cc" name="CalibTrackerSiStripCommonPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CalibTracker/SiStripDCS/BuildFile.xml b/CalibTracker/SiStripDCS/BuildFile.xml
index 3237de33f18d7..b3462f8a87561 100644
--- a/CalibTracker/SiStripDCS/BuildFile.xml
+++ b/CalibTracker/SiStripDCS/BuildFile.xml
@@ -1,4 +1,5 @@
-<use name="CalibFormats/SiStripObjects"/>
+<use name="CalibTracker/SiStripCommon"/>
+<use name="CondCore/CondDB"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="DataFormats/Common"/>
 <use name="CondFormats/Common"/>
@@ -6,17 +7,10 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
-<use name="Geometry/Records"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
-<use name="CondCore/DBOutputService"/>
-<use name="DataFormats/SiStripDetId"/>
 <use name="CoralCommon"/>
-<use name="CondCore/PopCon"/>
 <use name="OnlineDB/SiStripConfigDb"/>
-<use name="CalibTracker/Records"/>
 <use name="tkonlineswdb"/>
 <use name="boost"/>
 <use name="root"/>
diff --git a/CalibTracker/SiStripDCS/plugins/BuildFile.xml b/CalibTracker/SiStripDCS/plugins/BuildFile.xml
index c0b7681fd0949..db5831e46a15a 100644
--- a/CalibTracker/SiStripDCS/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripDCS/plugins/BuildFile.xml
@@ -3,14 +3,11 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="CondCore/PopCon"/>
-<use name="CondCore/DBOutputService"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="DQM/SiStripCommon"/>
 <use name="CommonTools/TrackerMap"/>
 <use name="FWCore/PluginManager"/>
-<use name="OnlineDB/SiStripConfigDb"/>
 <use name="CalibTracker/SiStripDCS"/>
 <library file="*.cc" name="CalibTrackerSiStripDCSPlugins">
   <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiStripESProducers/BuildFile.xml b/CalibTracker/SiStripESProducers/BuildFile.xml
index a920209952a53..8456006f6341e 100644
--- a/CalibTracker/SiStripESProducers/BuildFile.xml
+++ b/CalibTracker/SiStripESProducers/BuildFile.xml
@@ -1,15 +1,10 @@
-<use name="CalibTracker/SiStripCommon"/>
 <use name="CalibFormats/SiStripObjects"/>
-<use name="CalibTracker/Records"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="DataFormats/SiStripCommon"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="CondFormats/RunInfo"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
-<use name="Geometry/Records"/>
 <use name="DQMServices/Core"/>
 <use name="boost"/>
 <use name="classlib"/>
diff --git a/CalibTracker/SiStripESProducers/plugins/BuildFile.xml b/CalibTracker/SiStripESProducers/plugins/BuildFile.xml
index dc7499251ae8d..90e0f65db45ec 100644
--- a/CalibTracker/SiStripESProducers/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripESProducers/plugins/BuildFile.xml
@@ -1,15 +1,19 @@
 <library file="fake/*.cc" name="CalibTrackerSiStripFakeESProducersPlugins">
+  <use name="CalibTracker/Records"/>
   <use name="CalibTracker/SiStripESProducers"/>
   <use name="CondCore/DBOutputService"/>
   <flags EDM_PLUGIN="1"/>
 </library>
 
 <library file="real/*.cc" name="CalibTrackerSiStripRealESProducersPlugins">
+  <use name="CalibTracker/Records"/>
   <use name="CalibTracker/SiStripESProducers"/>
+  <use name="CondFormats/RunInfo"/>
   <flags EDM_PLUGIN="1"/>
 </library>
 
 <library file="geom/*.cc" name="CalibTrackerSiStripGeomESProducersPlugins">
+  <use name="CalibTracker/Records"/>
   <use name="CalibTracker/SiStripESProducers"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
   <use name="DataFormats/TrackerCommon"/>
@@ -17,6 +21,7 @@
 </library>
 
 <library file="DBWriter/*.cc" name="CalibTrackerSiStripESProducersDBWriterPlugins">
+  <use name="CalibTracker/Records"/>
   <use name="CalibTracker/SiStripESProducers"/>
   <use name="CondCore/DBOutputService"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiStripESProducers/test/BuildFile.xml b/CalibTracker/SiStripESProducers/test/BuildFile.xml
index 3cdf7556e2d4d..8b4315c5fc141 100644
--- a/CalibTracker/SiStripESProducers/test/BuildFile.xml
+++ b/CalibTracker/SiStripESProducers/test/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="Geometry/Records"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="CalibFormats/SiStripObjects"/>
diff --git a/CalibTracker/SiStripHitEfficiency/BuildFile.xml b/CalibTracker/SiStripHitEfficiency/BuildFile.xml
index d0f85b868a3a6..856f88a88531e 100644
--- a/CalibTracker/SiStripHitEfficiency/BuildFile.xml
+++ b/CalibTracker/SiStripHitEfficiency/BuildFile.xml
@@ -3,14 +3,10 @@
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/SiStripDetId"/>
 <use name="DataFormats/TrackingRecHit"/>
-<use name="DataFormats/CSCRecHit"/>
-<use name="DataFormats/DTRecHit"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/Common"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
@@ -18,12 +14,9 @@
 <use name="MagneticField/Records"/>
 <use name="RecoTracker/Record"/>
 <use name="RecoTracker/MeasurementDet"/>
-<use name="RecoTracker/TkSeedGenerator"/>
-<use name="SimDataFormats/TrackingAnalysis"/>
-<use name="SimTracker/TrackerHitAssociation"/>
 <use name="TrackingTools/PatternTools"/>
 <use name="TrackingTools/TrackFitters"/>
-<use name="TrackingTools/MeasurementDet"/>
 <use name="TrackingTools/KalmanUpdators"/>
+<use name="TrackingTools/MeasurementDet"/>
 <use name="RecoTracker/TransientTrackingRecHit"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml b/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml
index aae63ddbecc3a..cef56b7c60f9d 100644
--- a/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripHitEfficiency/plugins/BuildFile.xml
@@ -1,33 +1,19 @@
+<use name="CommonTools/ConditionDBWriter"/>
 <use name="CommonTools/TrackerMap"/>
 <use name="CommonTools/UtilAlgos"/>
-<use name="CondCore/DBOutputService"/>
-<use name="CondFormats/SiStripObjects"/>
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/SiStripDetId"/>
 <use name="DataFormats/TrackingRecHit"/>
-<use name="DataFormats/CSCRecHit"/>
-<use name="DataFormats/DTRecHit"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/Common"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="MagneticField/Engine"/>
-<use name="MagneticField/Records"/>
 <use name="RecoTracker/Record"/>
 <use name="RecoTracker/MeasurementDet"/>
-<use name="RecoTracker/TkSeedGenerator"/>
-<use name="SimDataFormats/TrackingAnalysis"/>
-<use name="SimTracker/TrackerHitAssociation"/>
-<use name="TrackingTools/PatternTools"/>
-<use name="TrackingTools/TrackFitters"/>
-<use name="TrackingTools/MeasurementDet"/>
-<use name="RecoTracker/TransientTrackingRecHit"/>
 <flags EDM_PLUGIN="1"/>
 <library file="*.cc" name="CalibTrackerSiStripHitEffPlugins">
   <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiStripLorentzAngle/BuildFile.xml b/CalibTracker/SiStripLorentzAngle/BuildFile.xml
index 8794bee7f0ee7..11b33f234925a 100644
--- a/CalibTracker/SiStripLorentzAngle/BuildFile.xml
+++ b/CalibTracker/SiStripLorentzAngle/BuildFile.xml
@@ -1,10 +1,7 @@
 <use name="DataFormats/SiStripDetId"/>
 <use name="root"/>
-<use name="DataFormats/SiStripCluster"/>
 <use name="DataFormats/TrackerCommon"/>
-<use name="CalibTracker/StandaloneTrackerTopology"/>
 <use name="DQMServices/Core"/>
-<use name="CondCore/DBOutputService"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/CalibTracker/SiStripLorentzAngle/plugins/BuildFile.xml b/CalibTracker/SiStripLorentzAngle/plugins/BuildFile.xml
index 84f79e845b3f5..a21787672db34 100644
--- a/CalibTracker/SiStripLorentzAngle/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripLorentzAngle/plugins/BuildFile.xml
@@ -3,21 +3,13 @@
 <use name="DQMServices/Core"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/GeometryVector"/>
-<use name="DataFormats/SiPixelDetId"/>
 <use name="DataFormats/TrackerRecHit2D"/>
-<use name="DataFormats/TrackingRecHit"/>
-<use name="DataFormats/TrajectorySeed"/>
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="MagneticField/Engine"/>
-<use name="MagneticField/Records"/>
-<use name="DataFormats/SiStripCluster"/>
-<use name="TrackingTools/TrajectoryState"/>
 <use name="clhep"/>
 <use name="rootcore"/>
 <use name="FWCore/Framework"/>
@@ -28,6 +20,9 @@
 <use name="CalibTracker/SiStripCommon"/>
 <use name="CalibFormats/SiStripObjects"/>
 <use name="CalibTracker/SiStripLorentzAngle"/>
+<use name="CalibTracker/StandaloneTrackerTopology"/>
+<use name="MagneticField/Engine"/>
+<use name="TrackingTools/PatternTools"/>
 <use name="rootgraphics"/>
 <library file="*.cc" name="CalibTrackerSiStripLorentzAnglePlugins">
   <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiStripLorentzAngle/plugins/SiStripCalibLorentzAngle.cc b/CalibTracker/SiStripLorentzAngle/plugins/SiStripCalibLorentzAngle.cc
index bbd3a44417506..83f02c75b8def 100644
--- a/CalibTracker/SiStripLorentzAngle/plugins/SiStripCalibLorentzAngle.cc
+++ b/CalibTracker/SiStripLorentzAngle/plugins/SiStripCalibLorentzAngle.cc
@@ -17,6 +17,7 @@
 #include "DQM/SiStripCommon/interface/ExtractTObject.h"
 #include "DataFormats/TrackerCommon/interface/TrackerTopology.h"
 #include "Geometry/Records/interface/TrackerTopologyRcd.h"
+#include "MagneticField/Engine/interface/MagneticField.h"
 
 SiStripCalibLorentzAngle::SiStripCalibLorentzAngle(edm::ParameterSet const& conf)
     : ConditionDBWriter<SiStripLorentzAngle>(conf), tTopo(nullptr), conf_(conf) {}
diff --git a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc
index 7211de971b2e1..35a1f3894d81e 100644
--- a/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc
+++ b/CalibTracker/SiStripLorentzAngle/plugins/SiStripLAProfileBooker.cc
@@ -36,6 +36,7 @@
 #include "DQM/SiStripCommon/interface/SiStripFolderOrganizer.h"
 #include "DQMServices/Core/interface/DQMStore.h"
 
+#include "MagneticField/Engine/interface/MagneticField.h"
 #include "TrackingTools/TransientTrackingRecHit/interface/TransientTrackingRecHit.h"
 #include "TrackingTools/PatternTools/interface/Trajectory.h"
 #include "TrackingTools/PatternTools/interface/TrajTrackAssociation.h"
diff --git a/CalibTracker/SiStripQuality/BuildFile.xml b/CalibTracker/SiStripQuality/BuildFile.xml
index 07e768204d734..fd2fa37508935 100644
--- a/CalibTracker/SiStripQuality/BuildFile.xml
+++ b/CalibTracker/SiStripQuality/BuildFile.xml
@@ -2,11 +2,8 @@
 <use name="root"/>
 <use name="DQMServices/Core"/>
 <use name="FWCore/MessageLogger"/>
-<use name="CondFormats/DataRecord"/>
-<use name="CondFormats/SiStripObjects"/>
 <use name="CalibFormats/SiStripObjects"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="Geometry/Records"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/CalibTracker/SiStripQuality/plugins/BuildFile.xml b/CalibTracker/SiStripQuality/plugins/BuildFile.xml
index 0a2e4ed966d58..d11242b1cc50d 100644
--- a/CalibTracker/SiStripQuality/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripQuality/plugins/BuildFile.xml
@@ -5,16 +5,14 @@
 <use name="FWCore/ParameterSet"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
-<use name="CondCore/DBOutputService"/>
-<use name="CondFormats/DataRecord"/>
 <use name="CondFormats/SiStripObjects"/>
 <use name="CalibFormats/SiStripObjects"/>
 <use name="CalibTracker/Records"/>
 <use name="CalibTracker/SiStripESProducers"/>
 <use name="CalibTracker/SiStripQuality"/>
-<use name="DataFormats/SiStripCluster"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/TrackerRecHit2D"/>
+<use name="CommonTools/ConditionDBWriter"/>
 <use name="CommonTools/TrackerMap"/>
 <use name="DQM/SiStripCommon"/>
 <use name="DQMServices/Core"/>
diff --git a/Calibration/EcalAlCaRecoProducers/BuildFile.xml b/Calibration/EcalAlCaRecoProducers/BuildFile.xml
index 0151673f2cd9e..31914aa1c4823 100644
--- a/Calibration/EcalAlCaRecoProducers/BuildFile.xml
+++ b/Calibration/EcalAlCaRecoProducers/BuildFile.xml
@@ -1,9 +1,5 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/EgammaCandidates"/>
-<use name="DataFormats/HLTReco"/>
-<use name="DataFormats/Math"/>
 <use name="DataFormats/EcalDetId"/>
-<use name="DataFormats/TrackReco"/>
diff --git a/Calibration/EcalCalibAlgos/BuildFile.xml b/Calibration/EcalCalibAlgos/BuildFile.xml
index 773585b29cdf1..aa1a071f278dd 100644
--- a/Calibration/EcalCalibAlgos/BuildFile.xml
+++ b/Calibration/EcalCalibAlgos/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/EcalRecHit"/>
 <use name="DataFormats/EcalDetId"/>
@@ -9,7 +8,6 @@
 <use name="DataFormats/TCDS"/>
 <use name="CondFormats/EcalObjects"/>
 <use name="CondFormats/DataRecord"/>
-<use name="RecoLocalCalo/EcalRecAlgos"/>
 <use name="Geometry/CaloGeometry"/>
 <use name="Geometry/CaloTopology"/>
 <use name="RecoEcal/EgammaClusterAlgos"/>
diff --git a/Calibration/EcalTBTools/BuildFile.xml b/Calibration/EcalTBTools/BuildFile.xml
index fee793806119c..18bf86243c4f0 100644
--- a/Calibration/EcalTBTools/BuildFile.xml
+++ b/Calibration/EcalTBTools/BuildFile.xml
@@ -1,6 +1,3 @@
-<use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/ParameterSet"/>
 <use name="root"/>
 <use name="clhep"/>
 <export>
diff --git a/Calibration/HcalAlCaRecoProducers/BuildFile.xml b/Calibration/HcalAlCaRecoProducers/BuildFile.xml
index dfbcbb53ea7ee..c47c409b0583e 100644
--- a/Calibration/HcalAlCaRecoProducers/BuildFile.xml
+++ b/Calibration/HcalAlCaRecoProducers/BuildFile.xml
@@ -1,22 +1,17 @@
-<use name="CalibFormats/HcalObjects"/>
 <use name="Calibration/IsolatedParticles"/>
 <use name="CommonTools/UtilAlgos"/>
 <use name="CondFormats/DataRecord"/>
-<use name="CondFormats/EcalObjects"/>
 <use name="CondFormats/HcalObjects"/>
 <use name="DataFormats/CaloTowers"/>
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/EcalDetId"/>
-<use name="DataFormats/EcalDigi"/>
 <use name="DataFormats/EcalRecHit"/>
 <use name="DataFormats/EgammaReco"/>
 <use name="DataFormats/FEDRawData"/>
 <use name="DataFormats/HcalCalibObjects"/>
-<use name="DataFormats/HcalDigi"/>
 <use name="DataFormats/HcalIsolatedTrack"/>
 <use name="DataFormats/HcalRecHit"/>
 <use name="DataFormats/JetReco"/>
-<use name="DataFormats/L1GlobalTrigger"/>
 <use name="DataFormats/Luminosity"/>
 <use name="DataFormats/METReco"/>
 <use name="DataFormats/RecoCandidate"/>
@@ -25,10 +20,7 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/PluginManager"/>
 <use name="RecoLocalCalo/EcalRecAlgos"/>
-<use name="RecoEcal/EgammaClusterAlgos"/>
-<use name="RecoEcal/EgammaCoreTools"/>
 <use name="RecoLocalCalo/HcalRecAlgos"/>
-<use name="TrackingTools/TrackAssociator"/>
 <use name="TrackPropagation/SteppingHelixPropagator"/>
 <use name="DataFormats/Scalers"/>
 <use name="boost"/>
diff --git a/Calibration/HcalCalibAlgos/BuildFile.xml b/Calibration/HcalCalibAlgos/BuildFile.xml
index b1c18e24973b2..477f975e55d3e 100644
--- a/Calibration/HcalCalibAlgos/BuildFile.xml
+++ b/Calibration/HcalCalibAlgos/BuildFile.xml
@@ -9,7 +9,6 @@
 <use name="DataFormats/EcalDetId"/>
 <use name="DataFormats/HcalDetId"/>
 <use name="DataFormats/DetId"/>
-<use name="DataFormats/HcalDigi"/>
 <use name="DataFormats/HcalRecHit"/>
 <use name="Geometry/HcalTowerAlgo"/>
 <use name="Geometry/Records"/>
diff --git a/Calibration/HcalCalibAlgos/plugins/BuildFile.xml b/Calibration/HcalCalibAlgos/plugins/BuildFile.xml
index d2657aed48acf..d1cce1446d49c 100644
--- a/Calibration/HcalCalibAlgos/plugins/BuildFile.xml
+++ b/Calibration/HcalCalibAlgos/plugins/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="Calibration/HcalCalibAlgos"/>
 <use name="CondFormats/HcalObjects"/>
 <use name="CondFormats/L1TObjects"/>
-<use name="DQMServices/Core"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/EcalDetId"/>
@@ -10,7 +9,6 @@
 <use name="DataFormats/HcalRecHit"/>
 <use name="DataFormats/JetReco"/>
 <use name="DataFormats/L1GlobalTrigger"/>
-<use name="DataFormats/ParticleFlowReco"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/HcalIsolatedTrack"/>
 <use name="FWCore/Framework"/>
@@ -18,19 +16,14 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <use name="Geometry/Records"/>
-<use name="JetMETCorrections/Objects"/>
-<use name="JetMETCorrections/Type1MET"/>
-<use name="CondTools/Hcal"/>
 <use name="HLTrigger/HLTcore"/>
 <use name="Calibration/IsolatedParticles"/>
 <use name="rootphysics"/>
 <use name="boost"/>
 <use name="root"/>
-<use name="DataFormats/CaloRecHit"/>
 <use name="clhep"/>
 <use name="hepmc"/>
 <use name="CommonTools/UtilAlgos"/>
-<use name="TrackPropagation/SteppingHelixPropagator"/>
 <use name="TrackingTools/TrackAssociator"/>
 <library file="*.cc" name="CalibrationHcalCalibAlgosPlugins">
   <flags EDM_PLUGIN="1"/>
diff --git a/Calibration/HcalCalibAlgos/test/BuildFile.xml b/Calibration/HcalCalibAlgos/test/BuildFile.xml
index 3e788b4147d0b..8822ab3f00833 100644
--- a/Calibration/HcalCalibAlgos/test/BuildFile.xml
+++ b/Calibration/HcalCalibAlgos/test/BuildFile.xml
@@ -20,14 +20,11 @@
 <use name="FWCore/Utilities"/>
 <use name="Geometry/Records"/>
 <use name="JetMETCorrections/Objects"/>
-<use name="JetMETCorrections/Type1MET"/>
-<use name="CondTools/Hcal"/>
 <use name="HLTrigger/HLTcore"/>
 <use name="Calibration/IsolatedParticles"/>
 <use name="rootphysics"/>
 <use name="boost"/>
 <use name="root"/>
-<use name="DataFormats/CaloRecHit"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="clhep"/>
 <use name="hepmc"/>
diff --git a/Calibration/HcalIsolatedTrackReco/BuildFile.xml b/Calibration/HcalIsolatedTrackReco/BuildFile.xml
index c05feda983100..cb6fa4600d9ba 100644
--- a/Calibration/HcalIsolatedTrackReco/BuildFile.xml
+++ b/Calibration/HcalIsolatedTrackReco/BuildFile.xml
@@ -12,15 +12,14 @@
 <use name="DataFormats/EcalDetId"/>
 <use name="Geometry/CaloGeometry"/>
 <use name="Geometry/CaloTopology"/>
-<use name="RecoPixelVertexing/PixelTrackFitting"/>
 <use name="DataFormats/HLTReco"/>
 <use name="DataFormats/VertexReco"/>
-<use name="CondFormats/EcalObjects"/>
 <use name="Geometry/EcalMapping"/>
 <use name="Geometry/EcalAlgo"/>
 <use name="DataFormats/EcalRawData"/>
 <use name="DataFormats/FEDRawData"/>
-<use name="RecoEcal/EgammaCoreTools"/>
+<use name="MagneticField/Records"/>
 <use name="MagneticField/VolumeBasedEngine"/>
+<use name="RecoTracker/TkTrackingRegions"/>
 <use name="rootmath"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/Calibration/IsolatedParticles/BuildFile.xml b/Calibration/IsolatedParticles/BuildFile.xml
index 6f8d329e2a608..6880e4bf1bc6b 100644
--- a/Calibration/IsolatedParticles/BuildFile.xml
+++ b/Calibration/IsolatedParticles/BuildFile.xml
@@ -1,16 +1,8 @@
 <use name="clhep"/>
 <use name="boost"/>
 <use name="root"/>
-<use name="FWCore/Utilities"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/ParameterSet"/>
-<use name="FWCore/Services"/>
-<use name="FWCore/ServiceRegistry"/>
-<use name="FWCore/MessageLogger"/>
-<use name="CondFormats/DataRecord"/>
 <use name="MagneticField/Engine"/>
-<use name="MagneticField/Records"/>
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="DataFormats/HcalDetId"/>
@@ -18,8 +10,6 @@
 <use name="DataFormats/HcalRecHit"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/TrackReco"/>
-<use name="DataFormats/EgammaReco"/>
-<use name="DataFormats/Provenance"/>
 <use name="SimDataFormats/CaloHit"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/GeneratorProducts"/>
@@ -28,11 +18,8 @@
 <use name="SimGeneral/HepPDTRecord"/>
 <use name="Geometry/CaloGeometry"/>
 <use name="Geometry/CaloTopology"/>
-<use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/EcalAlgo"/>
 <use name="Geometry/HcalTowerAlgo"/>
-<use name="Geometry/Records"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="RecoLocalCalo/EcalRecAlgos"/>
 <use name="TrackingTools/TrajectoryState"/>
 <use name="TrackingTools/GeomPropagators"/>
diff --git a/Calibration/IsolatedParticles/plugins/BuildFile.xml b/Calibration/IsolatedParticles/plugins/BuildFile.xml
index 4dc83f6cf8f65..c5ee2ec2d4ddc 100644
--- a/Calibration/IsolatedParticles/plugins/BuildFile.xml
+++ b/Calibration/IsolatedParticles/plugins/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="rootgraphics"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/DetId"/>
-<use name="DataFormats/EgammaReco"/>
 <use name="DataFormats/L1GlobalTrigger"/>
 <use name="DataFormats/L1Trigger"/>
 <use name="DataFormats/TrackReco"/>
@@ -17,25 +16,18 @@
 <use name="SimDataFormats/Vertex"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/L1TObjects"/>
-<use name="CondFormats/EcalObjects"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/Services"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
 <use name="CommonTools/UtilAlgos"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="Geometry/Records"/>
 <use name="MagneticField/Engine"/>
 <use name="MagneticField/Records"/>
-<use name="TrackingTools/GeomPropagators"/>
 <use name="TrackingTools/TrackAssociator"/>
-<use name="TrackPropagation/SteppingHelixPropagator"/>
 <use name="RecoJets/JetProducers"/>
 <use name="HLTrigger/HLTcore"/>
-<use name="HLTrigger/Timer"/>
 <use name="Calibration/IsolatedParticles"/>
 <use name="DataFormats/HcalIsolatedTrack"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/Calibration/IsolatedParticles/test/BuildFile.xml b/Calibration/IsolatedParticles/test/BuildFile.xml
index c3f20956d3c5a..a5a0c6c8ed424 100644
--- a/Calibration/IsolatedParticles/test/BuildFile.xml
+++ b/Calibration/IsolatedParticles/test/BuildFile.xml
@@ -4,9 +4,6 @@
 <use name="DataFormats/HcalDetId"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
-<use name="FWCore/Services"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="Geometry/CaloGeometry"/>
 <use name="Geometry/CaloTopology"/>
 <use name="Geometry/HcalTowerAlgo"/>
diff --git a/Calibration/TkAlCaRecoProducers/BuildFile.xml b/Calibration/TkAlCaRecoProducers/BuildFile.xml
index 47854c00c04d2..62a85f47b273e 100644
--- a/Calibration/TkAlCaRecoProducers/BuildFile.xml
+++ b/Calibration/TkAlCaRecoProducers/BuildFile.xml
@@ -1,24 +1,15 @@
 <use name="DataFormats/DetId"/>
-<use name="DataFormats/MuonDetId"/>
-<use name="DataFormats/MuonReco"/>
 <use name="DataFormats/SiStripDetId"/>
 <use name="DataFormats/SiPixelDetId"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/TrackerRecHit2D"/>
 <use name="DataFormats/TrackingRecHit"/>
 <use name="DataFormats/SiStripCluster"/>
-<use name="DataFormats/TrajectorySeed"/>
-<use name="DataFormats/Candidate"/>
-<use name="DataFormats/JetReco"/>
-<use name="DataFormats/METReco"/>
-<use name="DataFormats/RecoCandidate"/>
-<use name="DataFormats/Math"/>
 <use name="DataFormats/BeamSpot"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/Utilities"/>
 <use name="FWCore/ParameterSet"/>
-<use name="PhysicsTools/RecoAlgos"/>
 <use name="rootcore"/>
 <export>
   <lib name="1"/>
diff --git a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
index c766150f83424..e56f1fcd68524 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
+++ b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
@@ -32,5 +32,7 @@
 </library>
 
 <library file="CalibrationTrackSelectorFromDetIdList.cc" name="CalibrationTrackSelectorFromDetIdList">
+  <use name="MagneticField/Records"/>
+  <use name="TrackingTools/TrajectoryState"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorFromDetIdList.cc b/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorFromDetIdList.cc
index c74ff87342142..0c8c634c9b375 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorFromDetIdList.cc
+++ b/Calibration/TkAlCaRecoProducers/plugins/CalibrationTrackSelectorFromDetIdList.cc
@@ -31,6 +31,7 @@ Tracker DetIds
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
+#include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 #include "TrackingTools/Records/interface/TransientRecHitRecord.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateOnSurface.h"
 #include "TrackingTools/TrajectoryState/interface/TrajectoryStateTransform.h"
diff --git a/Calibration/Tools/BuildFile.xml b/Calibration/Tools/BuildFile.xml
index ad9228c78f9ab..2da7792e7f3ab 100644
--- a/Calibration/Tools/BuildFile.xml
+++ b/Calibration/Tools/BuildFile.xml
@@ -5,18 +5,14 @@
 <use name="DataFormats/EcalRecHit"/>
 <use name="DataFormats/EgammaCandidates"/>
 <use name="DataFormats/EgammaReco"/>
-<use name="DataFormats/HcalDetId"/>
 <use name="DataFormats/GeometrySurface"/>
 <use name="rootcore"/>
 <use name="rootminuit"/>
 <use name="rootgraphics"/>
 <use name="Geometry/CaloGeometry"/>
-<use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/HcalTowerAlgo"/>
 <use name="Geometry/Records"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
 <use name="TrackingTools/GeomPropagators"/>
-<use name="MagneticField/Engine"/>
 <use name="MagneticField/Records"/>
 <use name="TrackPropagation/SteppingHelixPropagator"/>
 <export>
diff --git a/Calibration/Tools/test/BuildFile.xml b/Calibration/Tools/test/BuildFile.xml
index 581a49a78da36..81a7b93d2fc61 100644
--- a/Calibration/Tools/test/BuildFile.xml
+++ b/Calibration/Tools/test/BuildFile.xml
@@ -1,9 +1,6 @@
 <use name="root"/>
 <use name="Calibration/Tools"/>
 <use name="Geometry/CaloGeometry"/>
-<use name="Geometry/EcalAlgo"/>
-<use name="Geometry/CaloTopology"/>
-<use name="DataFormats/HcalDetId"/>
 <use name="DataFormats/EcalDetId"/>
 <use name="FWCore/Framework"/>
 <library file="testEcalRingCalibrationTools.cc" name="testEcalRingCalibrationTools">
diff --git a/CommonTools/ConditionDBWriter/BuildFile.xml b/CommonTools/ConditionDBWriter/BuildFile.xml
new file mode 100644
index 0000000000000..e7a6a3d17fb9c
--- /dev/null
+++ b/CommonTools/ConditionDBWriter/BuildFile.xml
@@ -0,0 +1,2 @@
+<use name="CondCore/DBOutputService"/>
+<use name="FWCore/Framework"/>
diff --git a/CondTools/SiPixel/test/BuildFile.xml b/CondTools/SiPixel/test/BuildFile.xml
index a8c9e3b1baaab..403b462d7b575 100644
--- a/CondTools/SiPixel/test/BuildFile.xml
+++ b/CondTools/SiPixel/test/BuildFile.xml
@@ -5,7 +5,9 @@
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondCore/DBOutputService"/>
 <use name="CondTools/SiPixel"/>
+<use name="CalibTracker/Records"/>
 <use name="CalibTracker/SiPixelESProducers"/>
+<use name="MagneticField/Records"/>
 <use name="RecoLocalTracker/SiPixelRecHits"/>
 <library file="*.cc" name="testCondToolsSiPixel">
   <flags EDM_PLUGIN="1"/>
diff --git a/DQM/SiStripMonitorClient/plugins/BuildFile.xml b/DQM/SiStripMonitorClient/plugins/BuildFile.xml
index 3a9610d643c4c..493f18f237d85 100644
--- a/DQM/SiStripMonitorClient/plugins/BuildFile.xml
+++ b/DQM/SiStripMonitorClient/plugins/BuildFile.xml
@@ -8,6 +8,7 @@
 <use name="DQM/SiStripMonitorClient"/>
 <use name="DQM/SiStripMonitorSummary"/>
 <use name="CalibTracker/SiStripESProducers"/>
+<use name="CondFormats/RunInfo"/>
 <library file="*.cc" name="DQMSiStripMonitorClientPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml b/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml
index 5284bfaa4f3d5..25fe21603e864 100644
--- a/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml
+++ b/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml
@@ -12,6 +12,7 @@
 <use name="CondFormats/DataRecord"/>
 <use name="RecoLocalCalo/EcalRecAlgos"/>
 <use name="FWCore/MessageLogger"/>
+<use name="SimCalorimetry/EcalSimAlgos"/>
 <library file="*.cc" name="RecoLocalCaloEcalRecProducersPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimTracker/SiPhase2Digitizer/plugins/BuildFile.xml b/SimTracker/SiPhase2Digitizer/plugins/BuildFile.xml
index e65fbd7a49e84..9edc039e41acd 100644
--- a/SimTracker/SiPhase2Digitizer/plugins/BuildFile.xml
+++ b/SimTracker/SiPhase2Digitizer/plugins/BuildFile.xml
@@ -8,6 +8,8 @@
   <use name="SimTracker/Common"/>
   <use name="Geometry/Records"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
+  <use name="MagneticField/Engine"/>
+  <use name="MagneticField/Records"/>
   <use name="clhep"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimTracker/SiPixelDigitizer/plugins/BuildFile.xml b/SimTracker/SiPixelDigitizer/plugins/BuildFile.xml
index f4bc4241dab64..e8f0bda119f38 100644
--- a/SimTracker/SiPixelDigitizer/plugins/BuildFile.xml
+++ b/SimTracker/SiPixelDigitizer/plugins/BuildFile.xml
@@ -14,6 +14,7 @@
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="SimGeneral/NoiseGenerators"/>
 <use name="SimTracker/Common"/>
+<use name="CalibTracker/Records"/>
 <use name="CalibTracker/SiPixelESProducers"/>
 <use name="gsl"/>
 <use name="clhep"/>