diff --git a/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml b/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml
index dc154c7207323..f126b5184d0e1 100644
--- a/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml
+++ b/Alignment/CommonAlignmentMonitor/plugins/BuildFile.xml
@@ -87,8 +87,6 @@
   <use name="TrackingTools/Records"/>
   <use name="DataFormats/TrackReco"/>
   <use name="DataFormats/MuonDetId"/>
-  <use name="DataFormats/CSCRecHit"/>
-  <use name="DataFormats/DTRecHit"/>
   <use name="DataFormats/TrackingRecHit"/>
   <use name="Geometry/DTGeometry"/>
   <use name="Geometry/CSCGeometry"/>
@@ -106,7 +104,6 @@
   <use name="Alignment/CommonAlignment"/>
   <use name="Alignment/TrackerAlignment"/>
   <use name="DataFormats/Common"/>
-  <use name="DataFormats/SiPixelDetId"/>
   <use name="DataFormats/SiStripDetId"/>
   <use name="DataFormats/Alignment"/>
   <use name="DataFormats/TrackReco"/>
diff --git a/Alignment/CommonAlignmentProducer/BuildFile.xml b/Alignment/CommonAlignmentProducer/BuildFile.xml
index 130caeac609f7..c95162c23e7f5 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/CommonAlignmentProducer/plugins/BuildFile.xml b/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml
index 21df32c32949d..0dce8b3e19e24 100644
--- a/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml
+++ b/Alignment/CommonAlignmentProducer/plugins/BuildFile.xml
@@ -21,7 +21,6 @@
   <use name="DataFormats/MuonDetId"/>
   <use name="DataFormats/TrackingRecHit"/>
   <use name="DataFormats/TrackReco"/>
-  <use name="DataFormats/Alignment"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="CommonTools/UtilAlgos"/>
   <use name="CommonTools/RecoAlgos"/>
@@ -33,7 +32,6 @@
 
 <library name="AlignmentCommonAlignmentProducerGlobal" file="GlobalTrackerMuonAlignment.cc">
   <use name="root"/>
-  <use name="FWCore/PluginManager"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="Geometry/Records"/>
   <use name="Geometry/CommonDetUnit"/>
@@ -52,9 +50,6 @@
   <use name="DataFormats/DetId"/>
   <use name="DataFormats/TrackReco"/>
   <use name="RecoMuon/TransientTrackingRecHit"/>
-  <use name="DataFormats/CSCRecHit"/>
-  <use name="DataFormats/DTRecHit"/>
-  <use name="DataFormats/RPCRecHit"/>
 </library>
 
 <library file="LSNumberFilter.cc" name="AlignmentCommonAlignmentProducerFilter">
diff --git a/Alignment/LaserAlignment/plugins/BuildFile.xml b/Alignment/LaserAlignment/plugins/BuildFile.xml
index 59ed99666f1ef..0af0cd2263128 100644
--- a/Alignment/LaserAlignment/plugins/BuildFile.xml
+++ b/Alignment/LaserAlignment/plugins/BuildFile.xml
@@ -6,7 +6,6 @@
   <use name="EventFilter/SiStripRawToDigi"/>
   <use name="Geometry/CommonTopologies"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
-  <use name="Geometry/TrackerNumberingBuilder"/>
   <use name="MagneticField/Engine"/>
   <use name="MagneticField/Records"/>
   <use name="CondFormats/SiStripObjects"/>
diff --git a/Alignment/LaserAlignmentSimulation/plugins/BuildFile.xml b/Alignment/LaserAlignmentSimulation/plugins/BuildFile.xml
index 39ab1aaf4e5e0..254ed3d401bd2 100644
--- a/Alignment/LaserAlignmentSimulation/plugins/BuildFile.xml
+++ b/Alignment/LaserAlignmentSimulation/plugins/BuildFile.xml
@@ -6,7 +6,6 @@
   <use name="SimG4Core/Notification"/>
   <use name="SimG4Core/Watcher"/>
   <use name="SimG4CMS/Tracker"/>
-  <use name="FWCore/PluginManager"/>
   <flags EDM_PLUGIN="1"/>
 </library>
 
diff --git a/Alignment/LaserDQM/plugins/BuildFile.xml b/Alignment/LaserDQM/plugins/BuildFile.xml
index 548a2cf88a454..7dbe62344970a 100644
--- a/Alignment/LaserDQM/plugins/BuildFile.xml
+++ b/Alignment/LaserDQM/plugins/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="DataFormats/SiStripDetId"/>
   <use name="DataFormats/DetId"/>
   <use name="DataFormats/Common"/>
diff --git a/Alignment/MuonAlignment/BuildFile.xml b/Alignment/MuonAlignment/BuildFile.xml
index cc3c2d285a88e..ee578a5f73a20 100644
--- a/Alignment/MuonAlignment/BuildFile.xml
+++ b/Alignment/MuonAlignment/BuildFile.xml
@@ -3,9 +3,7 @@
 </export>
 <use name="Alignment/CommonAlignment"/>
 <use name="Geometry/DTGeometry"/>
-<use name="Geometry/DTGeometryBuilder"/>
 <use name="Geometry/CSCGeometry"/>
-<use name="Geometry/CSCGeometryBuilder"/>
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/Records"/>
 <use name="FWCore/Framework"/>
diff --git a/Alignment/TrackerAlignment/plugins/BuildFile.xml b/Alignment/TrackerAlignment/plugins/BuildFile.xml
index c010e1c21efd3..a2259c0204010 100644
--- a/Alignment/TrackerAlignment/plugins/BuildFile.xml
+++ b/Alignment/TrackerAlignment/plugins/BuildFile.xml
@@ -76,7 +76,6 @@
   <use name="MagneticField/Engine"/>
   <use name="MagneticField/Records"/>
   <use name="DataFormats/Common"/>
-  <use name="DataFormats/RecoCandidate"/>
   <use name="DataFormats/TrackReco"/>
   <use name="Geometry/TrackerNumberingBuilder"/>
   <use name="root"/>
diff --git a/CalibCalorimetry/EcalCorrectionModules/test/BuildFile.xml b/CalibCalorimetry/EcalCorrectionModules/test/BuildFile.xml
index 0cd2e4b96fa6f..dc0051fc07218 100644
--- a/CalibCalorimetry/EcalCorrectionModules/test/BuildFile.xml
+++ b/CalibCalorimetry/EcalCorrectionModules/test/BuildFile.xml
@@ -1,16 +1,8 @@
 <library file="stubs/EcalContainmentCorrectionAnalyzer.cc" name="EcalContainmentCorrectionAnalyzer">
   <use name="FWCore/Framework"/>
   <flags EDM_PLUGIN="1"/>
-  <use name="FWCore/ParameterSet"/>
-  <use name="DataFormats/DetId"/>
   <use name="DataFormats/EcalDetId"/>
-  <use name="DataFormats/EcalRecHit"/>
-  <use name="TBDataFormats/EcalTBObjects"/>
-  <use name="CondFormats/EcalObjects"/>
   <use name="CondFormats/EcalCorrections"/>
   <use name="CondFormats/DataRecord"/>
   <use name="clhep"/>
-  <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/Records"/>
-  <use name="RecoTBCalo/EcalTBAnalysisCoreTools"/>
 </library>
diff --git a/CalibFormats/SiStripObjects/test/BuildFile.xml b/CalibFormats/SiStripObjects/test/BuildFile.xml
index 0f8257521623f..67f9cf2b56196 100644
--- a/CalibFormats/SiStripObjects/test/BuildFile.xml
+++ b/CalibFormats/SiStripObjects/test/BuildFile.xml
@@ -2,7 +2,6 @@
   <use name="CalibFormats/SiStripObjects"/>
   <use name="DataFormats/SiStripCommon"/>
   <use name="FWCore/Framework"/>
-  <use name="FWCore/ParameterSet"/>
   <use name="FWCore/MessageLogger"/>
   <use name="Geometry/Records"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
diff --git a/CalibMuon/DTCalibration/test/BuildFile.xml b/CalibMuon/DTCalibration/test/BuildFile.xml
index 10447d63224e8..b73ca5c839e84 100644
--- a/CalibMuon/DTCalibration/test/BuildFile.xml
+++ b/CalibMuon/DTCalibration/test/BuildFile.xml
@@ -1,10 +1,12 @@
 <library file="stubs/*.cc" name="testDTCalibration">
   <use name="rootgraphics"/>
+  <use name="CalibMuon/DTCalibration"/>
 </library>
 
 <library file="DBTools/*.cc" name="testDTCalibrationDBTools">
   <flags EDM_PLUGIN="1"/>
   <use name="root"/>
+  <use name="CalibMuon/DTCalibration"/>
   <use name="Geometry/Records"/>
   <use name="Geometry/DTGeometry"/>
   <use name="DataFormats/MuonDetId"/>
@@ -12,5 +14,4 @@
   <use name="CondFormats/DTObjects"/>
   <use name="FWCore/Framework"/>
   <use name="CondFormats/DataRecord"/>
-  <use name="CondCore/DBOutputService"/>
 </library>
diff --git a/CalibTracker/SiPixelGainCalibration/plugins/BuildFile.xml b/CalibTracker/SiPixelGainCalibration/plugins/BuildFile.xml
index 010b7fb362c43..b5e77606b014d 100644
--- a/CalibTracker/SiPixelGainCalibration/plugins/BuildFile.xml
+++ b/CalibTracker/SiPixelGainCalibration/plugins/BuildFile.xml
@@ -1,23 +1,16 @@
 <environment>
   <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="DataFormats/SiPixelRawData"/>
   <use name="CalibTracker/SiPixelESProducers"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/SiPixelObjects"/>
   <use name="CondCore/DBOutputService"/>
-  <use name="PhysicsTools/UtilAlgos"/>
   <use name="root"/>
   <use name="rootminuit"/>
   <use name="Geometry/Records"/>
-  <use name="Geometry/CommonDetUnit"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
-  <use name="CalibFormats/SiPixelObjects"/>
   <use name="CalibTracker/SiPixelTools"/>
   <library file="*.cc" name="CalibTrackerSiPixelGainCalibrationPlugin">
     <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiPixelTools/plugins/BuildFile.xml b/CalibTracker/SiPixelTools/plugins/BuildFile.xml
index 0a1957e9e2954..40a6caaf01001 100644
--- a/CalibTracker/SiPixelTools/plugins/BuildFile.xml
+++ b/CalibTracker/SiPixelTools/plugins/BuildFile.xml
@@ -1,8 +1,6 @@
 <environment>
   <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/Common"/>
diff --git a/CalibTracker/SiStripDCS/test/BuildFile.xml b/CalibTracker/SiStripDCS/test/BuildFile.xml
index 1af9ebba2c9d4..b26f5aa2a39ef 100644
--- a/CalibTracker/SiStripDCS/test/BuildFile.xml
+++ b/CalibTracker/SiStripDCS/test/BuildFile.xml
@@ -3,10 +3,8 @@
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/ServiceRegistry"/>
-  <use name="Geometry/Records"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/SiStripObjects"/>
-  <use name="DataFormats/SiStripDetId"/>
   <use name="CoralCommon"/>
   <use name="boost"/>
   <use name="root"/>
diff --git a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc
index 6548564ea15e2..c71ed7471f9e5 100644
--- a/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc
+++ b/CalibTracker/SiStripESProducers/plugins/real/SiStripQualityESProducer.cc
@@ -30,6 +30,7 @@
 #include "DataFormats/SiStripCommon/interface/SiStripConstants.h"
 #include "CalibFormats/SiStripObjects/interface/SiStripQuality.h"
 #include "CalibTracker/Records/interface/SiStripDependentRecords.h"
+#include "CondFormats/RunInfo/interface/RunInfo.h"
 
 namespace {
   class ProductAdder {
diff --git a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
index e56f1fcd68524..90ac441775da4 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
+++ b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
@@ -11,7 +11,6 @@
 <use name="Calibration/TkAlCaRecoProducers"/>
 <library file="CalibrationTrackSelectorModule.cc">
   <use name="CommonTools/RecoAlgos"/>
-  <use name="PhysicsTools/UtilAlgos"/>
   <flags EDM_PLUGIN="1"/>
 </library>
 
diff --git a/Calibration/Tools/bin/BuildFile.xml b/Calibration/Tools/bin/BuildFile.xml
index 248403e4077cb..06245ea61ff91 100644
--- a/Calibration/Tools/bin/BuildFile.xml
+++ b/Calibration/Tools/bin/BuildFile.xml
@@ -2,33 +2,14 @@
   <use name="CalibCalorimetry/CaloMiscalibTools"/>
   <use name="Calibration/Tools"/>
   <use name="clhep"/>
-  <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/EcalObjects"/>
-  <use name="CondFormats/HcalObjects"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/DetId"/>
-  <use name="DataFormats/EcalDetId"/>
-  <use name="DataFormats/EcalDigi"/>
-  <use name="DataFormats/EcalRecHit"/>
-  <use name="DataFormats/EgammaCandidates"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/HcalRecHit"/>
-  <use name="DataFormats/Math"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/CaloTopology"/>
-  <use name="Geometry/EcalAlgo"/>
   <use name="Geometry/Records"/>
-  <use name="RecoEcal/EgammaClusterAlgos"/>
-  <use name="RecoEcal/EgammaCoreTools"/>
-  <use name="RecoLocalCalo/EcalRecAlgos"/>
   <use name="rootcore"/>
   <use name="rootmath"/>
-  <use name="TrackingTools/TrackAssociator"/>
   <use name="xerces-c"/>
 </bin>
 
@@ -36,33 +17,14 @@
   <use name="CalibCalorimetry/CaloMiscalibTools"/>
   <use name="Calibration/Tools"/>
   <use name="clhep"/>
-  <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/EcalObjects"/>
-  <use name="CondFormats/HcalObjects"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/DetId"/>
-  <use name="DataFormats/EcalDetId"/>
-  <use name="DataFormats/EcalDigi"/>
-  <use name="DataFormats/EcalRecHit"/>
-  <use name="DataFormats/EgammaCandidates"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/HcalRecHit"/>
-  <use name="DataFormats/Math"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/CaloTopology"/>
-  <use name="Geometry/EcalAlgo"/>
   <use name="Geometry/Records"/>
-  <use name="RecoEcal/EgammaClusterAlgos"/>
-  <use name="RecoEcal/EgammaCoreTools"/>
-  <use name="RecoLocalCalo/EcalRecAlgos"/>
   <use name="rootcore"/>
   <use name="rootmath"/>
-  <use name="TrackingTools/TrackAssociator"/>
   <use name="xerces-c"/>
 </bin>
 
@@ -70,33 +32,14 @@
   <use name="CalibCalorimetry/CaloMiscalibTools"/>
   <use name="Calibration/Tools"/>
   <use name="clhep"/>
-  <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/EcalObjects"/>
-  <use name="CondFormats/HcalObjects"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/DetId"/>
-  <use name="DataFormats/EcalDetId"/>
-  <use name="DataFormats/EcalDigi"/>
-  <use name="DataFormats/EcalRecHit"/>
-  <use name="DataFormats/EgammaCandidates"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/HcalRecHit"/>
-  <use name="DataFormats/Math"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/CaloTopology"/>
-  <use name="Geometry/EcalAlgo"/>
   <use name="Geometry/Records"/>
-  <use name="RecoEcal/EgammaClusterAlgos"/>
-  <use name="RecoEcal/EgammaCoreTools"/>
-  <use name="RecoLocalCalo/EcalRecAlgos"/>
   <use name="rootcore"/>
   <use name="rootmath"/>
-  <use name="TrackingTools/TrackAssociator"/>
   <use name="xerces-c"/>
 </bin>
 
@@ -104,33 +47,14 @@
   <use name="CalibCalorimetry/CaloMiscalibTools"/>
   <use name="Calibration/Tools"/>
   <use name="clhep"/>
-  <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/EcalObjects"/>
-  <use name="CondFormats/HcalObjects"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/DetId"/>
-  <use name="DataFormats/EcalDetId"/>
-  <use name="DataFormats/EcalDigi"/>
-  <use name="DataFormats/EcalRecHit"/>
-  <use name="DataFormats/EgammaCandidates"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/HcalRecHit"/>
-  <use name="DataFormats/Math"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/CaloTopology"/>
-  <use name="Geometry/EcalAlgo"/>
   <use name="Geometry/Records"/>
-  <use name="RecoEcal/EgammaClusterAlgos"/>
-  <use name="RecoEcal/EgammaCoreTools"/>
-  <use name="RecoLocalCalo/EcalRecAlgos"/>
   <use name="rootcore"/>
   <use name="rootmath"/>
-  <use name="TrackingTools/TrackAssociator"/>
   <use name="xerces-c"/>
 </bin>
 
@@ -138,33 +62,14 @@
   <use name="CalibCalorimetry/CaloMiscalibTools"/>
   <use name="Calibration/Tools"/>
   <use name="clhep"/>
-  <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/EcalObjects"/>
-  <use name="CondFormats/HcalObjects"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/DetId"/>
-  <use name="DataFormats/EcalDetId"/>
-  <use name="DataFormats/EcalDigi"/>
-  <use name="DataFormats/EcalRecHit"/>
-  <use name="DataFormats/EgammaCandidates"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/HcalRecHit"/>
-  <use name="DataFormats/Math"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/CaloTopology"/>
-  <use name="Geometry/EcalAlgo"/>
   <use name="Geometry/Records"/>
-  <use name="RecoEcal/EgammaClusterAlgos"/>
-  <use name="RecoEcal/EgammaCoreTools"/>
-  <use name="RecoLocalCalo/EcalRecAlgos"/>
   <use name="rootcore"/>
   <use name="rootmath"/>
-  <use name="TrackingTools/TrackAssociator"/>
   <use name="xerces-c"/>
 </bin>
 
@@ -172,33 +77,14 @@
   <use name="CalibCalorimetry/CaloMiscalibTools"/>
   <use name="Calibration/Tools"/>
   <use name="clhep"/>
-  <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/EcalObjects"/>
-  <use name="CondFormats/HcalObjects"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/DetId"/>
-  <use name="DataFormats/EcalDetId"/>
-  <use name="DataFormats/EcalDigi"/>
-  <use name="DataFormats/EcalRecHit"/>
-  <use name="DataFormats/EgammaCandidates"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/HcalRecHit"/>
-  <use name="DataFormats/Math"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/CaloTopology"/>
-  <use name="Geometry/EcalAlgo"/>
   <use name="Geometry/Records"/>
-  <use name="RecoEcal/EgammaClusterAlgos"/>
-  <use name="RecoEcal/EgammaCoreTools"/>
-  <use name="RecoLocalCalo/EcalRecAlgos"/>
   <use name="rootcore"/>
   <use name="rootmath"/>
-  <use name="TrackingTools/TrackAssociator"/>
   <use name="xerces-c"/>
 </bin>
 
@@ -206,33 +92,14 @@
   <use name="CalibCalorimetry/CaloMiscalibTools"/>
   <use name="Calibration/Tools"/>
   <use name="clhep"/>
-  <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/EcalObjects"/>
-  <use name="CondFormats/HcalObjects"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/DetId"/>
-  <use name="DataFormats/EcalDetId"/>
-  <use name="DataFormats/EcalDigi"/>
-  <use name="DataFormats/EcalRecHit"/>
-  <use name="DataFormats/EgammaCandidates"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/HcalRecHit"/>
-  <use name="DataFormats/Math"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/CaloTopology"/>
-  <use name="Geometry/EcalAlgo"/>
   <use name="Geometry/Records"/>
-  <use name="RecoEcal/EgammaClusterAlgos"/>
-  <use name="RecoEcal/EgammaCoreTools"/>
-  <use name="RecoLocalCalo/EcalRecAlgos"/>
   <use name="rootcore"/>
   <use name="rootmath"/>
-  <use name="TrackingTools/TrackAssociator"/>
   <use name="xerces-c"/>
 </bin>
 
@@ -240,33 +107,14 @@
   <use name="CalibCalorimetry/CaloMiscalibTools"/>
   <use name="Calibration/Tools"/>
   <use name="clhep"/>
-  <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/EcalObjects"/>
-  <use name="CondFormats/HcalObjects"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/DetId"/>
-  <use name="DataFormats/EcalDetId"/>
-  <use name="DataFormats/EcalDigi"/>
-  <use name="DataFormats/EcalRecHit"/>
-  <use name="DataFormats/EgammaCandidates"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/HcalRecHit"/>
-  <use name="DataFormats/Math"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/CaloTopology"/>
-  <use name="Geometry/EcalAlgo"/>
   <use name="Geometry/Records"/>
-  <use name="RecoEcal/EgammaClusterAlgos"/>
-  <use name="RecoEcal/EgammaCoreTools"/>
-  <use name="RecoLocalCalo/EcalRecAlgos"/>
   <use name="rootcore"/>
   <use name="rootmath"/>
-  <use name="TrackingTools/TrackAssociator"/>
   <use name="xerces-c"/>
 </bin>
 
@@ -274,32 +122,13 @@
   <use name="CalibCalorimetry/CaloMiscalibTools"/>
   <use name="Calibration/Tools"/>
   <use name="clhep"/>
-  <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/EcalObjects"/>
-  <use name="CondFormats/HcalObjects"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/DetId"/>
-  <use name="DataFormats/EcalDetId"/>
-  <use name="DataFormats/EcalDigi"/>
-  <use name="DataFormats/EcalRecHit"/>
-  <use name="DataFormats/EgammaCandidates"/>
-  <use name="DataFormats/EgammaReco"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/HcalRecHit"/>
-  <use name="DataFormats/Math"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="Geometry/CaloGeometry"/>
-  <use name="Geometry/CaloTopology"/>
-  <use name="Geometry/EcalAlgo"/>
   <use name="Geometry/Records"/>
-  <use name="RecoEcal/EgammaClusterAlgos"/>
-  <use name="RecoEcal/EgammaCoreTools"/>
-  <use name="RecoLocalCalo/EcalRecAlgos"/>
   <use name="rootcore"/>
   <use name="rootmath"/>
-  <use name="TrackingTools/TrackAssociator"/>
   <use name="xerces-c"/>
 </bin>
diff --git a/CaloOnlineTools/EcalTools/bin/BuildFile.xml b/CaloOnlineTools/EcalTools/bin/BuildFile.xml
index 18065f1dc8d65..c3b7d505415bc 100644
--- a/CaloOnlineTools/EcalTools/bin/BuildFile.xml
+++ b/CaloOnlineTools/EcalTools/bin/BuildFile.xml
@@ -1,4 +1,4 @@
 <bin name="TPGTreeReader" file="TPGTreeReader.cpp">
-  <use name="CaloOnlineTools/EcalTools"/>
   <use name="boost_header"/>
+  <use name="root"/>
 </bin>