diff --git a/RecoEcal/EgammaClusterAlgos/BuildFile.xml b/RecoEcal/EgammaClusterAlgos/BuildFile.xml
index 9443da3183963..bf1e15aefd279 100644
--- a/RecoEcal/EgammaClusterAlgos/BuildFile.xml
+++ b/RecoEcal/EgammaClusterAlgos/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/Math"/>
-<use   name="CondFormats/ESObjects"/>
-<use   name="CondFormats/EgammaObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="RecoParticleFlow/PFClusterTools"/>
-<use   name="clhep"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/Math"/>
+<use name="CondFormats/ESObjects"/>
+<use name="CondFormats/EgammaObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="RecoParticleFlow/PFClusterTools"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoEcal/EgammaClusterProducers/BuildFile.xml b/RecoEcal/EgammaClusterProducers/BuildFile.xml
index d85fdbb591a7b..4986f26bbdd2f 100644
--- a/RecoEcal/EgammaClusterProducers/BuildFile.xml
+++ b/RecoEcal/EgammaClusterProducers/BuildFile.xml
@@ -1,18 +1,18 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/EgammaObjects"/>
-<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="clhep"/>
-<use   name="TrackingTools/TrackAssociator" />
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/EgammaObjects"/>
+<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="clhep"/>
+<use name="TrackingTools/TrackAssociator"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/RecoEcal/EgammaClusterProducers/test/BuildFile.xml b/RecoEcal/EgammaClusterProducers/test/BuildFile.xml
index e854a0ba9668b..97a1b638d71a4 100644
--- a/RecoEcal/EgammaClusterProducers/test/BuildFile.xml
+++ b/RecoEcal/EgammaClusterProducers/test/BuildFile.xml
@@ -1,14 +1,14 @@
-<library   name="RecoEcalPFSuperClusterTreeMaker" file="PFSuperClusterTreeMaker.cc">
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/EgammaReco"/>
-  <use   name="DataFormats/GsfTrackReco"/>
-  <use   name="DataFormats/ParticleFlowCandidate"/>
-  <use   name="DataFormats/ParticleFlowReco"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="RecoEcal/EgammaCoreTools"/>
-  <use   name="RecoParticleFlow/PFClusterTools"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <flags   EDM_PLUGIN="1"/>
-</library>
\ No newline at end of file
+<library name="RecoEcalPFSuperClusterTreeMaker" file="PFSuperClusterTreeMaker.cc">
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/EgammaReco"/>
+  <use name="DataFormats/GsfTrackReco"/>
+  <use name="DataFormats/ParticleFlowCandidate"/>
+  <use name="DataFormats/ParticleFlowReco"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="RecoEcal/EgammaCoreTools"/>
+  <use name="RecoParticleFlow/PFClusterTools"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <flags EDM_PLUGIN="1"/>
+</library>
diff --git a/RecoEcal/EgammaCoreTools/BuildFile.xml b/RecoEcal/EgammaCoreTools/BuildFile.xml
index 0c72e1afe4bfb..82cb929f52e52 100644
--- a/RecoEcal/EgammaCoreTools/BuildFile.xml
+++ b/RecoEcal/EgammaCoreTools/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/Math"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="Geometry/EcalAlgo"/>
-<use   name="RecoLocalCalo/EcalRecAlgos"/>
-<use   name="Geometry/Records"/>
-<use   name="CalibCalorimetry/EcalLaserCorrection"/>
-<use   name="clhep"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/Math"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/MessageLogger"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="Geometry/EcalAlgo"/>
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<use name="Geometry/Records"/>
+<use name="CalibCalorimetry/EcalLaserCorrection"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoEcal/EgammaCoreTools/plugins/BuildFile.xml b/RecoEcal/EgammaCoreTools/plugins/BuildFile.xml
index d20d860ca0bac..91d27abc0394c 100644
--- a/RecoEcal/EgammaCoreTools/plugins/BuildFile.xml
+++ b/RecoEcal/EgammaCoreTools/plugins/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/EcalObjects"/>
-<library   file="*.cc" name="RecoEcalEcalClusterFunctions">
-  <flags   EDM_PLUGIN="1"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/EcalObjects"/>
+<library file="*.cc" name="RecoEcalEcalClusterFunctions">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoEcal/EgammaCoreTools/test/BuildFile.xml b/RecoEcal/EgammaCoreTools/test/BuildFile.xml
index cf71ee447e49d..0f868774d7915 100644
--- a/RecoEcal/EgammaCoreTools/test/BuildFile.xml
+++ b/RecoEcal/EgammaCoreTools/test/BuildFile.xml
@@ -1,24 +1,28 @@
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="hepmc"/>
-<use   name="clhep"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<library   file="testEcalClusterTools.cc" name="testEcalClusterTools">
-  <flags   EDM_PLUGIN="1"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="hepmc"/>
+<use name="clhep"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<library file="testEcalClusterTools.cc" name="testEcalClusterTools">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="testEcalClusterLazyTools.cc" name="testEcalClusterLazyTools">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="testEcalClusterLazyTools.cc" name="testEcalClusterLazyTools">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="testEcalClusterFunctions.cc" name="testEcalClusterFunctions">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="testEcalClusterFunctions.cc" name="testEcalClusterFunctions">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="testEcalClusterSeverityAlgo.cc" name="testEcalClusterSeverityAlgo">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="testEcalClusterSeverityAlgo.cc" name="testEcalClusterSeverityAlgo">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="filterProbClusters.cc" name="filterProbClusters">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="filterProbClusters.cc" name="filterProbClusters">
+  <flags EDM_PLUGIN="1"/>
 </library>