diff --git a/ElectroWeakAnalysis/Skimming/plugins/BuildFile.xml b/ElectroWeakAnalysis/Skimming/plugins/BuildFile.xml
index 1c0da4490ee98..9f020de382464 100644
--- a/ElectroWeakAnalysis/Skimming/plugins/BuildFile.xml
+++ b/ElectroWeakAnalysis/Skimming/plugins/BuildFile.xml
@@ -1,13 +1,13 @@
 <export>
 </export>
-<library   name="ElectroWeakAnalysisSkimming_plugins" file="*.cc">
-  <use   name="CommonTools/Utils"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="DataFormats/MuonReco"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="DataFormats/HepMCCandidate"/>
-  <use   name="DataFormats/Candidate"/>
-  <use   name="DataFormats/PatCandidates"/>
-  <use   name="root"/>
+<library name="ElectroWeakAnalysisSkimming_plugins" file="*.cc">
+  <use name="CommonTools/Utils"/>
+  <use name="FWCore/Framework"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="DataFormats/MuonReco"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="DataFormats/HepMCCandidate"/>
+  <use name="DataFormats/Candidate"/>
+  <use name="DataFormats/PatCandidates"/>
+  <use name="root"/>
 </library>
diff --git a/ElectroWeakAnalysis/Utilities/BuildFile.xml b/ElectroWeakAnalysis/Utilities/BuildFile.xml
index f30f988740c84..a5d76caba247c 100644
--- a/ElectroWeakAnalysis/Utilities/BuildFile.xml
+++ b/ElectroWeakAnalysis/Utilities/BuildFile.xml
@@ -1,15 +1,14 @@
-<use   name="CommonTools/Utils"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/PatCandidates"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="CommonTools/CandUtils"/>
-
-<use   name="RecoMuon/Records"/>
-<use   name="CondFormats/RecoMuonObjects"/>
-<use   name="MuonAnalysis/MomentumScaleCalibration"/>
-<use   name="lhapdf"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="CommonTools/Utils"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/PatCandidates"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="CommonTools/CandUtils"/>
+<use name="RecoMuon/Records"/>
+<use name="CondFormats/RecoMuonObjects"/>
+<use name="MuonAnalysis/MomentumScaleCalibration"/>
+<use name="lhapdf"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/ElectroWeakAnalysis/WENu/BuildFile.xml b/ElectroWeakAnalysis/WENu/BuildFile.xml
index 816729781b771..fd97f4952dc24 100644
--- a/ElectroWeakAnalysis/WENu/BuildFile.xml
+++ b/ElectroWeakAnalysis/WENu/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/PatCandidates"/>
-<use   name="DataFormats/Common"/>
-<use   name="RecoEgamma/EgammaTools"/>
-<use   name="RecoLocalCalo/EcalRecAlgos"/>
-<use   name="root"/>
-<use   name="rootmath"/>
-<use   name="rootcore"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/PatCandidates"/>
+<use name="DataFormats/Common"/>
+<use name="RecoEgamma/EgammaTools"/>
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<use name="root"/>
+<use name="rootmath"/>
+<use name="rootcore"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/ElectroWeakAnalysis/WMuNu/BuildFile.xml b/ElectroWeakAnalysis/WMuNu/BuildFile.xml
index e6f86fa7d941a..7fa6abfd44709 100644
--- a/ElectroWeakAnalysis/WMuNu/BuildFile.xml
+++ b/ElectroWeakAnalysis/WMuNu/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/METReco"/>
-<use   name="AnalysisDataFormats/EWK"/>
-<use   name="CommonTools/CandUtils"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="CommonTools/RecoAlgos"/>
-<use   name="CLHEP"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/METReco"/>
+<use name="AnalysisDataFormats/EWK"/>
+<use name="CommonTools/CandUtils"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="CommonTools/RecoAlgos"/>
+<use name="CLHEP"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/ElectroWeakAnalysis/WMuNu/bin/BuildFile.xml b/ElectroWeakAnalysis/WMuNu/bin/BuildFile.xml
index 0e7d3990bf234..9be9155b294d8 100644
--- a/ElectroWeakAnalysis/WMuNu/bin/BuildFile.xml
+++ b/ElectroWeakAnalysis/WMuNu/bin/BuildFile.xml
@@ -1,3 +1,3 @@
-<use   name="PhysicsTools/Utilities"/>
-<use   name="rootrint"/>
-<bin   name="WMuNuValidatorMacro" file="WMuNuValidatorMacro.cpp"/>
+<use name="PhysicsTools/Utilities"/>
+<use name="rootrint"/>
+<bin name="WMuNuValidatorMacro" file="WMuNuValidatorMacro.cpp"/>
diff --git a/ElectroWeakAnalysis/ZEE/BuildFile.xml b/ElectroWeakAnalysis/ZEE/BuildFile.xml
index a9f5a7ed307a9..8b6a64f48b09d 100644
--- a/ElectroWeakAnalysis/ZEE/BuildFile.xml
+++ b/ElectroWeakAnalysis/ZEE/BuildFile.xml
@@ -1,20 +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/Scalers"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="L1Trigger/GlobalTriggerAnalyzer"/>
-<use   name="MagneticField/Records"/>
-<use   name="MagneticField/Engine"/>
-<use   name="RecoEgamma/EgammaTools"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="RecoLocalCalo/EcalRecAlgos"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="root"/>
-<use   name="rootmath"/>
-<use   name="rootcore"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/PatCandidates"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Scalers"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="L1Trigger/GlobalTriggerAnalyzer"/>
+<use name="MagneticField/Records"/>
+<use name="MagneticField/Engine"/>
+<use name="RecoEgamma/EgammaTools"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="root"/>
+<use name="rootmath"/>
+<use name="rootcore"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/ElectroWeakAnalysis/ZMuMu/bin/BuildFile.xml b/ElectroWeakAnalysis/ZMuMu/bin/BuildFile.xml
index aa5f72b507809..3851edc0cfe19 100644
--- a/ElectroWeakAnalysis/ZMuMu/bin/BuildFile.xml
+++ b/ElectroWeakAnalysis/ZMuMu/bin/BuildFile.xml
@@ -1,31 +1,34 @@
-<use   name="rootgraphics"/>
-<use   name="rootminuit"/>
-<use   name="rootminuit2"/>
-<use   name="Utilities/General"/>
-<bin   file="csa08HLTFit.cpp" name="csa08HLTFit">
-  <use   name="PhysicsTools/Utilities"/>
-  <use   name="boost_program_options"/>
+<use name="rootgraphics"/>
+<use name="rootminuit"/>
+<use name="rootminuit2"/>
+<use name="Utilities/General"/>
+<bin file="csa08HLTFit.cpp" name="csa08HLTFit">
+  <use name="PhysicsTools/Utilities"/>
+  <use name="boost_program_options"/>
 </bin>
-<bin   file="zChi2Fit.cpp" name="zChi2Fit">
-  <use   name="PhysicsTools/Utilities"/>
-  <use   name="boost_program_options"/>
-</bin>
-<bin   file="zFitToyMc.cpp" name="zFitToyMc">
-  <use   name="PhysicsTools/Utilities"/>
-  <use   name="boost_program_options"/>
-</bin>
-<bin   file="zUMLChi2Fit.cpp" name="zUMLChi2Fit">
-  <use   name="PhysicsTools/Utilities"/>
-  <use   name="boost_program_options"/>
-  <use   name="FWCore/FWLite"/>
-  <use   name="DataFormats/FWLite"/> 
+
+<bin file="zChi2Fit.cpp" name="zChi2Fit">
+  <use name="PhysicsTools/Utilities"/>
+  <use name="boost_program_options"/>
 </bin>
-<bin   file="toyMonteCarlo.cpp" name="toyMonteCarlo">
-  <use   name="boost_program_options"/>
+
+<bin file="zFitToyMc.cpp" name="zFitToyMc">
+  <use name="PhysicsTools/Utilities"/>
+  <use name="boost_program_options"/>
 </bin>
-<bin   file="zMuMuRooFit.cpp" name="zMuMuRooFit">
-  <use   name="roofit"/>
-  <use   name="boost_program_options"/>
+
+<bin file="zUMLChi2Fit.cpp" name="zUMLChi2Fit">
+  <use name="PhysicsTools/Utilities"/>
+  <use name="boost_program_options"/>
+  <use name="FWCore/FWLite"/>
+  <use name="DataFormats/FWLite"/>
 </bin>
 
+<bin file="toyMonteCarlo.cpp" name="toyMonteCarlo">
+  <use name="boost_program_options"/>
+</bin>
 
+<bin file="zMuMuRooFit.cpp" name="zMuMuRooFit">
+  <use name="roofit"/>
+  <use name="boost_program_options"/>
+</bin>
diff --git a/ElectroWeakAnalysis/ZMuMu/plugins/BuildFile.xml b/ElectroWeakAnalysis/ZMuMu/plugins/BuildFile.xml
index d24806abb4d34..e95db43361c25 100644
--- a/ElectroWeakAnalysis/ZMuMu/plugins/BuildFile.xml
+++ b/ElectroWeakAnalysis/ZMuMu/plugins/BuildFile.xml
@@ -1,15 +1,15 @@
 <export>
 </export>
-<library   name="ElectroWeakAnalysisZMuMu_plugins" file="*.cc">
-  <use   name="CommonTools/Utils"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="DataFormats/MuonReco"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="DataFormats/HepMCCandidate"/>
-  <use   name="DataFormats/Candidate"/>
-  <use   name="DataFormats/PatCandidates"/>
-  <use   name="root"/>
-  <use name="DataFormats/BTauReco"/> 
+<library name="ElectroWeakAnalysisZMuMu_plugins" file="*.cc">
+  <use name="CommonTools/Utils"/>
+  <use name="FWCore/Framework"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="DataFormats/MuonReco"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/Utilities"/>
+  <use name="DataFormats/HepMCCandidate"/>
+  <use name="DataFormats/Candidate"/>
+  <use name="DataFormats/PatCandidates"/>
+  <use name="root"/>
+  <use name="DataFormats/BTauReco"/>
 </library>
diff --git a/ElectroWeakAnalysis/ZMuMu/test/BuildFile.xml b/ElectroWeakAnalysis/ZMuMu/test/BuildFile.xml
index 81a06a00ff69f..0ecd2c37519dd 100644
--- a/ElectroWeakAnalysis/ZMuMu/test/BuildFile.xml
+++ b/ElectroWeakAnalysis/ZMuMu/test/BuildFile.xml
@@ -1,3 +1,3 @@
-<bin   file="errorMatrix.cpp" name="errorMatrix">
+<bin file="errorMatrix.cpp" name="errorMatrix">
   <flags NO_TESTRUN="1"/>
 </bin>