diff --git a/EgammaAnalysis/ElectronTools/BuildFile.xml b/EgammaAnalysis/ElectronTools/BuildFile.xml
index fb301b409fd93..39591971ccd78 100644
--- a/EgammaAnalysis/ElectronTools/BuildFile.xml
+++ b/EgammaAnalysis/ElectronTools/BuildFile.xml
@@ -1,27 +1,27 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondFormats/EgammaObjects"/>
-<use   name="CondFormats/PhysicsToolsObjects"/>
-<use   name="RecoEgamma/EgammaTools"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/PatCandidates"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="TrackingTools/IPTools"/>
-<use   name="PhysicsTools/UtilAlgos"/>
-<use   name="PhysicsTools/SelectorUtils"/>
-<use   name="clhep"/>
-<use   name="root"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/CaloTopology"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondFormats/EgammaObjects"/>
+<use name="CondFormats/PhysicsToolsObjects"/>
+<use name="RecoEgamma/EgammaTools"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/PatCandidates"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/TrackReco"/>
+<use name="TrackingTools/IPTools"/>
+<use name="PhysicsTools/UtilAlgos"/>
+<use name="PhysicsTools/SelectorUtils"/>
+<use name="clhep"/>
+<use name="root"/>
 <use name="rootcore"/>
-<use   name="roottmva"/>
+<use name="roottmva"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml b/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml
index 3f39c3aa70048..e2e340f283aac 100644
--- a/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml
+++ b/EgammaAnalysis/ElectronTools/plugins/BuildFile.xml
@@ -1,19 +1,20 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/PatCandidates"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="PhysicsTools/UtilAlgos"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="Geometry/Records"/>
-<use   name="EgammaAnalysis/ElectronTools"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="PhysicsTools/SelectorUtils"/>
-<use   name="TrackingTools/Records"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/PatCandidates"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/VertexReco"/>
+<use name="PhysicsTools/UtilAlgos"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="Geometry/Records"/>
+<use name="EgammaAnalysis/ElectronTools"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="PhysicsTools/SelectorUtils"/>
+<use name="TrackingTools/Records"/>
 <library name="EgammaAnalysisElectronToolsPlugins" file="*.cc">
-   <flags   EDM_PLUGIN="1"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
+
 <export>
 </export>
diff --git a/EgammaAnalysis/ElectronTools/test/BuildFile.xml b/EgammaAnalysis/ElectronTools/test/BuildFile.xml
index bb6951fac5b26..a14bf80cce4f2 100644
--- a/EgammaAnalysis/ElectronTools/test/BuildFile.xml
+++ b/EgammaAnalysis/ElectronTools/test/BuildFile.xml
@@ -1,17 +1,17 @@
-<library   name="EgammaEGammaAnalysisToolsTest" file="*.cc">
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/EgammaReco"/>
-  <use   name="DataFormats/GsfTrackReco"/>
-  <use   name="DataFormats/ParticleFlowCandidate"/>
-  <use   name="DataFormats/ParticleFlowReco"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="RecoParticleFlow/PFProducer"/>
-  <use   name="EgammaAnalysis/ElectronTools"/>
-  <use   name="TrackingTools/Records"/>
-  <use   name="clhep"/>
-  <use   name="root"/>
-  <use   name="roottmva"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="EgammaEGammaAnalysisToolsTest" file="*.cc">
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/EgammaReco"/>
+  <use name="DataFormats/GsfTrackReco"/>
+  <use name="DataFormats/ParticleFlowCandidate"/>
+  <use name="DataFormats/ParticleFlowReco"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="RecoParticleFlow/PFProducer"/>
+  <use name="EgammaAnalysis/ElectronTools"/>
+  <use name="TrackingTools/Records"/>
+  <use name="clhep"/>
+  <use name="root"/>
+  <use name="roottmva"/>
+  <flags EDM_PLUGIN="1"/>
 </library>