diff --git a/Calibration/EcalAlCaRecoProducers/BuildFile.xml b/Calibration/EcalAlCaRecoProducers/BuildFile.xml
index eecb65879fbd9..0151673f2cd9e 100644
--- a/Calibration/EcalAlCaRecoProducers/BuildFile.xml
+++ b/Calibration/EcalAlCaRecoProducers/BuildFile.xml
@@ -1,9 +1,9 @@
-<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"/>
+<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/EcalAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml
index 330cd348ad64d..8ad3ad4c865e4 100644
--- a/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml
+++ b/Calibration/EcalAlCaRecoProducers/plugins/BuildFile.xml
@@ -1,21 +1,20 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="clhep"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="Geometry/EcalAlgo"/>
-<use   name="Geometry/HcalTowerAlgo"/>
-<use   name="Geometry/Records"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="DataFormats/RecoCandidate"/>
-# for FED list selector
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="CondFormats/SiPixelObjects"/>
-<use   name="CalibFormats/SiStripObjects"/>
-<use   name="CalibFormats/HcalObjects"/>
-<use   name="Geometry/EcalMapping"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="CalibTracker/Records"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="clhep"/>
+<use name="CalibFormats/HcalObjects"/>
+<use name="CalibFormats/SiStripObjects"/>
+<use name="CalibTracker/Records"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="CondFormats/SiPixelObjects"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/TrackReco"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="Geometry/EcalAlgo"/>
+<use name="Geometry/EcalMapping"/>
+<use name="Geometry/HcalTowerAlgo"/>
+<use name="Geometry/Records"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/Calibration/EcalCalibAlgos/BuildFile.xml b/Calibration/EcalCalibAlgos/BuildFile.xml
index 84c6cefbad348..773585b29cdf1 100644
--- a/Calibration/EcalCalibAlgos/BuildFile.xml
+++ b/Calibration/EcalCalibAlgos/BuildFile.xml
@@ -1,29 +1,29 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<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"/>
-<use   name="Geometry/EcalAlgo"/>
-<use   name="DataFormats/Math"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="root"/>
-<use   name="xerces-c"/>
-<use   name="Calibration/Tools"/>
-<use   name="CalibCalorimetry/CaloMiscalibTools"/>
-<use   name="CondTools/Ecal"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/EgammaCandidates"/>
+<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"/>
+<use name="Geometry/EcalAlgo"/>
+<use name="DataFormats/Math"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="root"/>
+<use name="xerces-c"/>
+<use name="Calibration/Tools"/>
+<use name="CalibCalorimetry/CaloMiscalibTools"/>
+<use name="CondTools/Ecal"/>
+<use name="SimDataFormats/GeneratorProducts"/>
 <use name="DQMServices/Core"/>
 <use name="CondCore/DBOutputService"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/Calibration/EcalCalibAlgos/plugins/BuildFile.xml b/Calibration/EcalCalibAlgos/plugins/BuildFile.xml
index 7123ae55543b9..ed0f6b3dbf292 100644
--- a/Calibration/EcalCalibAlgos/plugins/BuildFile.xml
+++ b/Calibration/EcalCalibAlgos/plugins/BuildFile.xml
@@ -1,2 +1,2 @@
-<use   name="Calibration/EcalCalibAlgos"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="Calibration/EcalCalibAlgos"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/Calibration/EcalTBTools/BuildFile.xml b/Calibration/EcalTBTools/BuildFile.xml
index 1d3e5d555d7b7..fee793806119c 100644
--- a/Calibration/EcalTBTools/BuildFile.xml
+++ b/Calibration/EcalTBTools/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="root"/>
-<use   name="clhep"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="root"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/Calibration/HcalAlCaRecoProducers/BuildFile.xml b/Calibration/HcalAlCaRecoProducers/BuildFile.xml
index 709e50ee1e777..dfbcbb53ea7ee 100644
--- a/Calibration/HcalAlCaRecoProducers/BuildFile.xml
+++ b/Calibration/HcalAlCaRecoProducers/BuildFile.xml
@@ -1,38 +1,37 @@
-<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"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="FWCore/Framework"/>
-<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"/>
-<use   name="clhep"/>
-<use   name="root"/>
-
-<flags   EDM_PLUGIN="1"/>
+<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"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="FWCore/Framework"/>
+<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"/>
+<use name="clhep"/>
+<use name="root"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml
index 344c022629808..32d601e1f18a7 100644
--- a/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml
+++ b/Calibration/HcalAlCaRecoProducers/plugins/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="Calibration/IsolatedParticles"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="rootphysics"/>
-<library   file="*.cc" name="CalibrationHcalAlCaRecoProducersPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="Calibration/IsolatedParticles"/>
+<use name="DataFormats/JetReco"/>
+<use name="rootphysics"/>
+<library file="*.cc" name="CalibrationHcalAlCaRecoProducersPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Calibration/HcalCalibAlgos/BuildFile.xml b/Calibration/HcalCalibAlgos/BuildFile.xml
index 206aad62081d4..b1c18e24973b2 100644
--- a/Calibration/HcalCalibAlgos/BuildFile.xml
+++ b/Calibration/HcalCalibAlgos/BuildFile.xml
@@ -1,19 +1,19 @@
-<use   name="root"/>
-<use   name="rootgraphics"/>
-<use   name="rootminuit"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="CommonTools/UtilAlgos"/>
-<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"/>
-<use   name="CondTools/Hcal"/>
+<use name="root"/>
+<use name="rootgraphics"/>
+<use name="rootminuit"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="CommonTools/UtilAlgos"/>
+<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"/>
+<use name="CondTools/Hcal"/>
 <export>
-  <lib name="1"/> 
+  <lib name="1"/>
 </export>
diff --git a/Calibration/HcalCalibAlgos/plugins/BuildFile.xml b/Calibration/HcalCalibAlgos/plugins/BuildFile.xml
index 7e57f7747df3e..d2657aed48acf 100644
--- a/Calibration/HcalCalibAlgos/plugins/BuildFile.xml
+++ b/Calibration/HcalCalibAlgos/plugins/BuildFile.xml
@@ -1,37 +1,37 @@
-<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"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/HcalDigi"/>
-<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"/>
-<use   name="FWCore/MessageLogger"/>
-<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"/>
+<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"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/HcalDigi"/>
+<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"/>
+<use name="FWCore/MessageLogger"/>
+<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"/>
 </library>
diff --git a/Calibration/HcalCalibAlgos/test/BuildFile.xml b/Calibration/HcalCalibAlgos/test/BuildFile.xml
index c1bada3edcd22..3e788b4147d0b 100644
--- a/Calibration/HcalCalibAlgos/test/BuildFile.xml
+++ b/Calibration/HcalCalibAlgos/test/BuildFile.xml
@@ -1,39 +1,39 @@
-<use   name="Calibration/HcalCalibAlgos"/>
-<use   name="SimDataFormats/Track"/>
-<use   name="CondFormats/HcalObjects"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="DQMServices/Core"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/HcalDigi"/>
-<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"/>
-<use   name="FWCore/MessageLogger"/>
-<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="SimDataFormats/GeneratorProducts"/>
-<use   name="clhep"/>
-<use   name="hepmc"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="TrackPropagation/SteppingHelixPropagator"/>
-<use   name="TrackingTools/TrackAssociator"/>
-<library   file="*.cc" name="CalibrationHcalCalibAlgosTest">
-  <flags   EDM_PLUGIN="1"/>
+<use name="Calibration/HcalCalibAlgos"/>
+<use name="SimDataFormats/Track"/>
+<use name="CondFormats/HcalObjects"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="DQMServices/Core"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/HcalDigi"/>
+<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"/>
+<use name="FWCore/MessageLogger"/>
+<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="SimDataFormats/GeneratorProducts"/>
+<use name="clhep"/>
+<use name="hepmc"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="TrackPropagation/SteppingHelixPropagator"/>
+<use name="TrackingTools/TrackAssociator"/>
+<library file="*.cc" name="CalibrationHcalCalibAlgosTest">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Calibration/HcalConnectivity/BuildFile.xml b/Calibration/HcalConnectivity/BuildFile.xml
index 897f9161de2dd..d1e4c66a4c80c 100644
--- a/Calibration/HcalConnectivity/BuildFile.xml
+++ b/Calibration/HcalConnectivity/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/HcalDigi"/>
-<flags   EDM_PLUGIN="1"/>
-
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/HcalDigi"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/Calibration/HcalIsolatedTrackReco/BuildFile.xml b/Calibration/HcalIsolatedTrackReco/BuildFile.xml
index a66fe99fd584f..c05feda983100 100644
--- a/Calibration/HcalIsolatedTrackReco/BuildFile.xml
+++ b/Calibration/HcalIsolatedTrackReco/BuildFile.xml
@@ -1,26 +1,26 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/HcalIsolatedTrack"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/EcalRecHit"/>
-<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/VolumeBasedEngine"/>
-<use   name="rootmath"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/HcalIsolatedTrack"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/EcalRecHit"/>
+<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/VolumeBasedEngine"/>
+<use name="rootmath"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/Calibration/IsolatedParticles/BuildFile.xml b/Calibration/IsolatedParticles/BuildFile.xml
index 34e07ade5f6bf..6f8d329e2a608 100644
--- a/Calibration/IsolatedParticles/BuildFile.xml
+++ b/Calibration/IsolatedParticles/BuildFile.xml
@@ -1,42 +1,42 @@
-<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"/>
-<use   name="DataFormats/EcalRecHit"/>
-<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"/>
-<use   name="SimDataFormats/Vertex"/>
-<use   name="SimTracker/TrackerHitAssociation"/>
-<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"/>
-<use   name="TrackingTools/TrackAssociator"/>
+<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"/>
+<use name="DataFormats/EcalRecHit"/>
+<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"/>
+<use name="SimDataFormats/Vertex"/>
+<use name="SimTracker/TrackerHitAssociation"/>
+<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"/>
+<use name="TrackingTools/TrackAssociator"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/Calibration/IsolatedParticles/plugins/BuildFile.xml b/Calibration/IsolatedParticles/plugins/BuildFile.xml
index 7ace932ae2f58..4dc83f6cf8f65 100644
--- a/Calibration/IsolatedParticles/plugins/BuildFile.xml
+++ b/Calibration/IsolatedParticles/plugins/BuildFile.xml
@@ -1,54 +1,79 @@
-<use   name="clhep"/>
-<use   name="boost"/>
-<use   name="root"/>
-<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"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/Luminosity"/>
-<use   name="L1Trigger/GlobalTriggerAnalyzer"/>
-<use   name="SimGeneral/HepPDTRecord"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<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"/>
-<library   name="CalibrationIsolatedTracksNxN" file="IsolatedTracksNxN.cc"> </library>
-<library   name="CalibrationIsolatedTracksCone" file="IsolatedTracksCone.cc"> </library>
-<library   name="CalibrationIsolatedParticlesGeneratedJets" file="IsolatedParticlesGeneratedJets.cc"> </library>
-<library   name="CalibrationIsolatedGenParticles" file="IsolatedGenParticles.cc"> </library>
-<library   name="CalibrationIsolatedTracksHcalScale" file="IsolatedTracksHcalScale.cc"> </library>
-<library   name="CalibrationElectronStudy" file="ElectronStudy.cc"> </library>
-<library   name="CalibrationStudyCaloResponse" file="StudyCaloResponse.cc"> </library>
-<library   name="CalibrationStudyTriggerHLT" file="StudyTriggerHLT.cc"> </library>
-<library   name="CalibrationIsoTrig" file="IsoTrig.cc"> </library>
-<library   name="CalibrationIsoTrackCalib" file="IsoTrackCalib.cc"> </library>
-<library   name="CalibrationIsoTrackCalibration" file="IsoTrackCalibration.cc"> </library>
-<library   name="CalibrationHcalRaddamMuon" file="HcalRaddamMuon.cc"> </library>
-<library   name="CalibrationHcalHBHEMuonSimAnalyzer" file="HcalHBHEMuonSimAnalyzer.cc"> </library>
+<use name="clhep"/>
+<use name="boost"/>
+<use name="root"/>
+<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"/>
+<use name="DataFormats/VertexReco"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/Luminosity"/>
+<use name="L1Trigger/GlobalTriggerAnalyzer"/>
+<use name="SimGeneral/HepPDTRecord"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<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"/>
+<library name="CalibrationIsolatedTracksNxN" file="IsolatedTracksNxN.cc">
+</library>
+
+<library name="CalibrationIsolatedTracksCone" file="IsolatedTracksCone.cc">
+</library>
+
+<library name="CalibrationIsolatedParticlesGeneratedJets" file="IsolatedParticlesGeneratedJets.cc">
+</library>
+
+<library name="CalibrationIsolatedGenParticles" file="IsolatedGenParticles.cc">
+</library>
+
+<library name="CalibrationIsolatedTracksHcalScale" file="IsolatedTracksHcalScale.cc">
+</library>
+
+<library name="CalibrationElectronStudy" file="ElectronStudy.cc">
+</library>
+
+<library name="CalibrationStudyCaloResponse" file="StudyCaloResponse.cc">
+</library>
+
+<library name="CalibrationStudyTriggerHLT" file="StudyTriggerHLT.cc">
+</library>
+
+<library name="CalibrationIsoTrig" file="IsoTrig.cc">
+</library>
+
+<library name="CalibrationIsoTrackCalib" file="IsoTrackCalib.cc">
+</library>
+
+<library name="CalibrationIsoTrackCalibration" file="IsoTrackCalibration.cc">
+</library>
+
+<library name="CalibrationHcalRaddamMuon" file="HcalRaddamMuon.cc">
+</library>
+
+<library name="CalibrationHcalHBHEMuonSimAnalyzer" file="HcalHBHEMuonSimAnalyzer.cc">
+</library>
diff --git a/Calibration/IsolatedParticles/test/BuildFile.xml b/Calibration/IsolatedParticles/test/BuildFile.xml
index 92d750f268124..c3f20956d3c5a 100644
--- a/Calibration/IsolatedParticles/test/BuildFile.xml
+++ b/Calibration/IsolatedParticles/test/BuildFile.xml
@@ -1,16 +1,17 @@
-<use   name="Calibration/IsolatedParticles"/>
-<use   name="DataFormats/CaloTowers"/>
-<use   name="DataFormats/EcalDetId"/>
-<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"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<flags   EDM_PLUGIN="1"/>
-<library   name="CalibrationIsolatedParticlesTest" file="*.cc"> </library>
+<use name="Calibration/IsolatedParticles"/>
+<use name="DataFormats/CaloTowers"/>
+<use name="DataFormats/EcalDetId"/>
+<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"/>
+<use name="MagneticField/Engine"/>
+<use name="MagneticField/Records"/>
+<flags EDM_PLUGIN="1"/>
+<library name="CalibrationIsolatedParticlesTest" file="*.cc">
+</library>
diff --git a/Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml
index ae74cfb0a96e8..131ebc574ede3 100644
--- a/Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml
+++ b/Calibration/LumiAlCaRecoProducers/plugins/BuildFile.xml
@@ -1,31 +1,30 @@
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DQMServices/Core"/>
-
-<use   name="FWCore/ServiceRegistry"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DQMServices/Core"/>
+<use name="FWCore/ServiceRegistry"/>
 <use name="CondFormats/Luminosity"/>
 <use name="CoralBase"/>
-<use   name="CondCore/DBOutputService"/>
-
-<use   name="DataFormats/Luminosity"/>
+<use name="CondCore/DBOutputService"/>
+<use name="DataFormats/Luminosity"/>
 <use name="CondFormats/DataRecord"/>
 <flags EDM_PLUGIN="1"/>
-
-
-
-<library   file="AlcaPCCProducer.cc" name="AlcaPCCProducer">
-  <flags   EDM_PLUGIN="1"/>
+<library file="AlcaPCCProducer.cc" name="AlcaPCCProducer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="RawPCCProducer.cc" name="RawPCCProducer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="RawPCCProducer.cc" name="RawPCCProducer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="CorrPCCProducer.cc" name="CorrPCCProducer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="CorrPCCProducer.cc" name="CorrPCCProducer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="AlcaPCCEventProducer.cc" name="AlcaPCCEventProducer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="AlcaPCCEventProducer.cc" name="AlcaPCCEventProducer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="AlcaPCCIntegrator.cc" name="AlcaPCCIntegrator">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="AlcaPCCIntegrator.cc" name="AlcaPCCIntegrator">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Calibration/LumiAlCaRecoProducers/test/BuildFile.xml b/Calibration/LumiAlCaRecoProducers/test/BuildFile.xml
index d9905cca6ecdd..99ad3dd84b8b7 100644
--- a/Calibration/LumiAlCaRecoProducers/test/BuildFile.xml
+++ b/Calibration/LumiAlCaRecoProducers/test/BuildFile.xml
@@ -1,4 +1,4 @@
-<bin   file="test.cpp" name="TestCalibrationLumiAlCaRecoProducers">
-  <flags   TEST_RUNNER_ARGS=" /bin/bash Calibration/LumiAlCaRecoProducers/test test.sh"/>
-  <use   name="FWCore/Utilities"/>
+<bin file="test.cpp" name="TestCalibrationLumiAlCaRecoProducers">
+  <flags TEST_RUNNER_ARGS=" /bin/bash Calibration/LumiAlCaRecoProducers/test test.sh"/>
+  <use name="FWCore/Utilities"/>
 </bin>
diff --git a/Calibration/TkAlCaRecoProducers/BuildFile.xml b/Calibration/TkAlCaRecoProducers/BuildFile.xml
index 9601782a631dd..47854c00c04d2 100644
--- a/Calibration/TkAlCaRecoProducers/BuildFile.xml
+++ b/Calibration/TkAlCaRecoProducers/BuildFile.xml
@@ -1,25 +1,25 @@
-<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"/>
+<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"/>
+  <lib name="1"/>
 </export>
diff --git a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
index 0300c119ff612..c766150f83424 100644
--- a/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
+++ b/Calibration/TkAlCaRecoProducers/plugins/BuildFile.xml
@@ -1,35 +1,36 @@
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-
-<use   name="CondCore/Utilities"/> 
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="CondFormats/BeamSpotObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="RecoVertex/BeamSpotProducer"/>
-<use   name="Calibration/TkAlCaRecoProducers"/>
-
-
-<library   file="CalibrationTrackSelectorModule.cc">
-  <use   name="CommonTools/RecoAlgos"/>
-  <use   name="PhysicsTools/UtilAlgos"/>
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondCore/Utilities"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="CondFormats/BeamSpotObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="RecoVertex/BeamSpotProducer"/>
+<use name="Calibration/TkAlCaRecoProducers"/>
+<library file="CalibrationTrackSelectorModule.cc">
+  <use name="CommonTools/RecoAlgos"/>
+  <use name="PhysicsTools/UtilAlgos"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-<library   file="AlcaBeamSpotProducer.cc" name="AlcaBeamSpotProducer">
-  <flags   EDM_PLUGIN="1"/>
+<library file="AlcaBeamSpotProducer.cc" name="AlcaBeamSpotProducer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="AlcaBeamSpotHarvester.cc" name="AlcaBeamSpotHarvester">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="AlcaBeamSpotHarvester.cc" name="AlcaBeamSpotHarvester">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="AlcaBeamSpotFromDB.cc" name="AlcaBeamSpotFromDB">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="AlcaBeamSpotFromDB.cc" name="AlcaBeamSpotFromDB">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="PCLMetadataWriter.cc" name="PCLMetadataWriter">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="PCLMetadataWriter.cc" name="PCLMetadataWriter">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="CalibrationTrackSelectorFromDetIdList.cc" name="CalibrationTrackSelectorFromDetIdList">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="CalibrationTrackSelectorFromDetIdList.cc" name="CalibrationTrackSelectorFromDetIdList">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Calibration/TkAlCaRecoProducers/test/BuildFile.xml b/Calibration/TkAlCaRecoProducers/test/BuildFile.xml
index a842cbd34e562..aa41fd324349f 100644
--- a/Calibration/TkAlCaRecoProducers/test/BuildFile.xml
+++ b/Calibration/TkAlCaRecoProducers/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="DQMServices/Core"/>
-<use   name="FWCore/Framework"/>
-<use   name="boost"/>
-<library   file="DQMRootFileReader.cc" name="CalibrationTkAlCaRecoProducersDQMRootFileReader">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DQMServices/Core"/>
+<use name="FWCore/Framework"/>
+<use name="boost"/>
+<library file="DQMRootFileReader.cc" name="CalibrationTkAlCaRecoProducersDQMRootFileReader">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Calibration/Tools/BuildFile.xml b/Calibration/Tools/BuildFile.xml
index 3de0a1ab4cc60..ad9228c78f9ab 100644
--- a/Calibration/Tools/BuildFile.xml
+++ b/Calibration/Tools/BuildFile.xml
@@ -1,24 +1,24 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/CaloTowers"/>
-<use   name="DataFormats/DetId"/>
-<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"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/CaloTowers"/>
+<use name="DataFormats/DetId"/>
+<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>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/Calibration/Tools/bin/BuildFile.xml b/Calibration/Tools/bin/BuildFile.xml
index 45cb1b072f329..248403e4077cb 100644
--- a/Calibration/Tools/bin/BuildFile.xml
+++ b/Calibration/Tools/bin/BuildFile.xml
@@ -1,297 +1,305 @@
-<bin   name="coeffCompareInvEE" file="coeffCompareInvEE.cpp,trivialParser.cc">
-  <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 name="coeffCompareInvEE" file="coeffCompareInvEE.cpp,trivialParser.cc">
+  <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>
-<bin   name="coeffCompare" file="coeffCompare.cpp,trivialParser.cc">
-  <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 name="coeffCompare" file="coeffCompare.cpp,trivialParser.cc">
+  <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>
-<bin   name="viewCoeffEB" file="viewCoeffEB.cpp">
-  <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 name="viewCoeffEB" file="viewCoeffEB.cpp">
+  <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>
-<bin   name="viewCoeffEE" file="viewCoeffEE.cpp">
-  <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 name="viewCoeffEE" file="viewCoeffEE.cpp">
+  <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>
-<bin   name="mergeXMLEB" file="mergeXMLEB.cpp,trivialParser.cc">
-  <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 name="mergeXMLEB" file="mergeXMLEB.cpp,trivialParser.cc">
+  <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>
-<bin   name="mergeXMLEE" file="mergeXMLEE.cpp,trivialParser.cc">
-  <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 name="mergeXMLEE" file="mergeXMLEE.cpp,trivialParser.cc">
+  <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>
-<bin   name="recalibEB" file="recalibEB.cpp">
-  <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 name="recalibEB" file="recalibEB.cpp">
+  <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>
-<bin   name="recalibEE" file="recalibEE.cpp">
-  <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 name="recalibEE" file="recalibEE.cpp">
+  <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>
-<bin   name="solveCalibSys" file="solveCalibSys.cpp">
-  <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 name="solveCalibSys" file="solveCalibSys.cpp">
+  <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/Calibration/Tools/plugins/BuildFile.xml b/Calibration/Tools/plugins/BuildFile.xml
index b642ead0da8e4..7eced6aa1e733 100644
--- a/Calibration/Tools/plugins/BuildFile.xml
+++ b/Calibration/Tools/plugins/BuildFile.xml
@@ -1,27 +1,27 @@
-<library   name="CalibrationToolsPlugins" file="*.cc">
-  <use   name="Calibration/Tools"/>
-  <use   name="CommonTools/RecoAlgos"/>
-  <use   name="DataFormats/Candidate"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/DetId"/>
-  <use   name="DataFormats/EcalDetId"/>
-  <use   name="DataFormats/EcalRecHit"/>
-  <use   name="DataFormats/EgammaCandidates"/>
-  <use   name="DataFormats/GeometryVector"/>
-  <use   name="DataFormats/GsfTrackReco"/>
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="Geometry/CaloGeometry"/>
-  <use   name="Geometry/CaloTopology"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="TrackingTools/PatternTools"/>
-  <use   name="TrackingTools/TrajectoryState"/>
-  <use   name="clhep"/>
-  <use   name="rootcore"/>
-  <use   name="rootmath"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="CalibrationToolsPlugins" file="*.cc">
+  <use name="Calibration/Tools"/>
+  <use name="CommonTools/RecoAlgos"/>
+  <use name="DataFormats/Candidate"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/DetId"/>
+  <use name="DataFormats/EcalDetId"/>
+  <use name="DataFormats/EcalRecHit"/>
+  <use name="DataFormats/EgammaCandidates"/>
+  <use name="DataFormats/GeometryVector"/>
+  <use name="DataFormats/GsfTrackReco"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/Utilities"/>
+  <use name="Geometry/CaloGeometry"/>
+  <use name="Geometry/CaloTopology"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="TrackingTools/PatternTools"/>
+  <use name="TrackingTools/TrajectoryState"/>
+  <use name="clhep"/>
+  <use name="rootcore"/>
+  <use name="rootmath"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Calibration/Tools/test/BuildFile.xml b/Calibration/Tools/test/BuildFile.xml
index bbf29f2a001be..581a49a78da36 100644
--- a/Calibration/Tools/test/BuildFile.xml
+++ b/Calibration/Tools/test/BuildFile.xml
@@ -1,11 +1,11 @@
-<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">
-  <flags   EDM_PLUGIN="1"/>
+<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">
+  <flags EDM_PLUGIN="1"/>
 </library>