diff --git a/CommonTools/BaseParticlePropagator/BuildFile.xml b/CommonTools/BaseParticlePropagator/BuildFile.xml
index 48d6d76367b8a..0c75ad29f057b 100644
--- a/CommonTools/BaseParticlePropagator/BuildFile.xml
+++ b/CommonTools/BaseParticlePropagator/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="DataFormats/Math"/>
-<use   name="rootmath"/>
+<use name="DataFormats/Math"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/BaseParticlePropagator/test/BuildFile.xml b/CommonTools/BaseParticlePropagator/test/BuildFile.xml
index 8569fd5a20fba..8c0c5794d94b8 100644
--- a/CommonTools/BaseParticlePropagator/test/BuildFile.xml
+++ b/CommonTools/BaseParticlePropagator/test/BuildFile.xml
@@ -1,4 +1,4 @@
 <bin file="makeMuon_catch2.cc" name="TestCommonToolsBaseParticlePropagator">
   <use name="catch2"/>
-  <use   name="CommonTools/BaseParticlePropagator"/>
+  <use name="CommonTools/BaseParticlePropagator"/>
 </bin>
diff --git a/CommonTools/CandAlgos/BuildFile.xml b/CommonTools/CandAlgos/BuildFile.xml
index a66b6c8421f4d..3e70021ae4f50 100644
--- a/CommonTools/CandAlgos/BuildFile.xml
+++ b/CommonTools/CandAlgos/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="SimGeneral/HepPDTRecord"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/PatCandidates"/>
+<use name="SimGeneral/HepPDTRecord"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/PatCandidates"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/CandAlgos/plugins/BuildFile.xml b/CommonTools/CandAlgos/plugins/BuildFile.xml
index bdd429e6159d4..1f97cb1c49aed 100644
--- a/CommonTools/CandAlgos/plugins/BuildFile.xml
+++ b/CommonTools/CandAlgos/plugins/BuildFile.xml
@@ -1,12 +1,12 @@
 <export>
 </export>
-<library   name="CommonToolsCandAlgos_plugins" file="*.cc">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="DataFormats/Candidate"/>
-  <use   name="DataFormats/HepMCCandidate"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="CommonTools/Utils"/>
-  <use   name="CommonTools/CandAlgos"/>
-  <use   name="CommonTools/CandUtils"/>
+<library name="CommonToolsCandAlgos_plugins" file="*.cc">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="DataFormats/Candidate"/>
+  <use name="DataFormats/HepMCCandidate"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="CommonTools/Utils"/>
+  <use name="CommonTools/CandAlgos"/>
+  <use name="CommonTools/CandUtils"/>
 </library>
diff --git a/CommonTools/CandUtils/BuildFile.xml b/CommonTools/CandUtils/BuildFile.xml
index 2058058d20bb9..e37aee2e67b24 100644
--- a/CommonTools/CandUtils/BuildFile.xml
+++ b/CommonTools/CandUtils/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="DataFormats/Candidate"/>
+<use name="DataFormats/Candidate"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/CandUtils/test/BuildFile.xml b/CommonTools/CandUtils/test/BuildFile.xml
index 6a60ae9e5f903..3dcd22e6e83b0 100644
--- a/CommonTools/CandUtils/test/BuildFile.xml
+++ b/CommonTools/CandUtils/test/BuildFile.xml
@@ -1,4 +1,4 @@
-<bin   name="testCommonToolsCandUtils" file="testMakeCompositeCandidate.cc,testMakeCompositePtrCandidate.cc,testRunner.cpp ">
-  <use   name="CommonTools/CandUtils"/>
-  <use   name="cppunit"/>
+<bin name="testCommonToolsCandUtils" file="testMakeCompositeCandidate.cc,testMakeCompositePtrCandidate.cc,testRunner.cpp ">
+  <use name="CommonTools/CandUtils"/>
+  <use name="cppunit"/>
 </bin>
diff --git a/CommonTools/Clustering1D/BuildFile.xml b/CommonTools/Clustering1D/BuildFile.xml
index 3087c990d2555..02141c2c0f49d 100644
--- a/CommonTools/Clustering1D/BuildFile.xml
+++ b/CommonTools/Clustering1D/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="DataFormats/GeometryCommonDetAlgo"/>
-<use   name="FWCore/Utilities"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/Clustering1D/test/BuildFile.xml b/CommonTools/Clustering1D/test/BuildFile.xml
index cb16e55a90c32..8a4814acd937e 100644
--- a/CommonTools/Clustering1D/test/BuildFile.xml
+++ b/CommonTools/Clustering1D/test/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="CommonTools/Clustering1D"/>
-<use   name="FWCore/Framework"/>
-<bin   file="ClusteringTest.cpp">
+<use name="CommonTools/Clustering1D"/>
+<use name="FWCore/Framework"/>
+<bin file="ClusteringTest.cpp">
 </bin>
diff --git a/CommonTools/MVAUtils/BuildFile.xml b/CommonTools/MVAUtils/BuildFile.xml
index 26b7b5c239e4e..9c7589c0a58b1 100644
--- a/CommonTools/MVAUtils/BuildFile.xml
+++ b/CommonTools/MVAUtils/BuildFile.xml
@@ -1,10 +1,9 @@
-<use   name="CondFormats/EgammaObjects"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="roottmva"/>
-<use   name="tinyxml2"/>
-
+<use name="CondFormats/EgammaObjects"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="CondFormats/DataRecord"/>
+<use name="roottmva"/>
+<use name="tinyxml2"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/ParticleFlow/BuildFile.xml b/CommonTools/ParticleFlow/BuildFile.xml
index ac30cc5a182b8..ca92a2a933a6f 100644
--- a/CommonTools/ParticleFlow/BuildFile.xml
+++ b/CommonTools/ParticleFlow/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/METReco"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/PatCandidates"/>
-<use   name="rootmath"/>
-<use   name="FWCore/ParameterSet"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/METReco"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/PatCandidates"/>
+<use name="rootmath"/>
+<use name="FWCore/ParameterSet"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/ParticleFlow/plugins/BuildFile.xml b/CommonTools/ParticleFlow/plugins/BuildFile.xml
index 83ea17acc8f1a..2cebbef51b433 100644
--- a/CommonTools/ParticleFlow/plugins/BuildFile.xml
+++ b/CommonTools/ParticleFlow/plugins/BuildFile.xml
@@ -1,20 +1,20 @@
 <export>
 </export>
-<library   name="CommonToolsParticleFlow_plugins" file="*.cc">
-  <use   name="DataFormats/ParticleFlowCandidate"/>
-  <use   name="DataFormats/JetReco"/>
-  <use   name="DataFormats/TauReco"/>
-  <use   name="DataFormats/METReco"/>
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="DataFormats/VertexReco"/>
-  <use   name="PhysicsTools/IsolationAlgos"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="JetMETCorrections/Objects"/>
-  <use   name="JetMETCorrections/JetCorrector"/>
-  <use   name="CommonTools/Utils"/>
-  <use   name="CommonTools/ParticleFlow"/>
-  <use   name="CalibFormats/HcalObjects"/>
-  <use   name="Geometry/HcalTowerAlgo"/>
+<library name="CommonToolsParticleFlow_plugins" file="*.cc">
+  <use name="DataFormats/ParticleFlowCandidate"/>
+  <use name="DataFormats/JetReco"/>
+  <use name="DataFormats/TauReco"/>
+  <use name="DataFormats/METReco"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="DataFormats/VertexReco"/>
+  <use name="PhysicsTools/IsolationAlgos"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="JetMETCorrections/Objects"/>
+  <use name="JetMETCorrections/JetCorrector"/>
+  <use name="CommonTools/Utils"/>
+  <use name="CommonTools/ParticleFlow"/>
+  <use name="CalibFormats/HcalObjects"/>
+  <use name="Geometry/HcalTowerAlgo"/>
 </library>
diff --git a/CommonTools/ParticleFlow/test/BuildFile.xml b/CommonTools/ParticleFlow/test/BuildFile.xml
index 05290caec11f7..a0a62944fc640 100644
--- a/CommonTools/ParticleFlow/test/BuildFile.xml
+++ b/CommonTools/ParticleFlow/test/BuildFile.xml
@@ -1,10 +1,9 @@
-<library   name="CommonToolsParticleFlowTest" file="PFIsoReaderDemo.cc">
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/EgammaCandidates"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="PhysicsTools/UtilAlgos"/>
-
-  <flags   EDM_PLUGIN="1"/>
+<library name="CommonToolsParticleFlowTest" file="PFIsoReaderDemo.cc">
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/EgammaCandidates"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="PhysicsTools/UtilAlgos"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CommonTools/PileupAlgos/BuildFile.xml b/CommonTools/PileupAlgos/BuildFile.xml
index eb953908de111..dda8acbd71b37 100644
--- a/CommonTools/PileupAlgos/BuildFile.xml
+++ b/CommonTools/PileupAlgos/BuildFile.xml
@@ -1,10 +1,9 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="root"/>
-
-<use   name="rootcore"/>
-<use   name="fastjet"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="FWCore/ParameterSet"/>
+<use name="root"/>
+<use name="rootcore"/>
+<use name="fastjet"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/PileupAlgos/plugins/BuildFile.xml b/CommonTools/PileupAlgos/plugins/BuildFile.xml
index f69077ea3063d..d62965df04cd7 100644
--- a/CommonTools/PileupAlgos/plugins/BuildFile.xml
+++ b/CommonTools/PileupAlgos/plugins/BuildFile.xml
@@ -1,15 +1,15 @@
 <export>
 </export>
-<library   name="CommonToolsPileupAlgos_plugins" file="*.cc">
-  <use   name="DataFormats/ParticleFlowCandidate"/>
-  <use   name="DataFormats/JetReco"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="JetMETCorrections/Objects"/>
-  <use   name="CommonTools/Utils"/>
-  <use   name="CommonTools/ParticleFlow"/>
-  <use   name="CommonTools/PileupAlgos"/>
-  <use   name="fastjet"/>
-  <use   name="fastjet-contrib"/>
+<library name="CommonToolsPileupAlgos_plugins" file="*.cc">
+  <use name="DataFormats/ParticleFlowCandidate"/>
+  <use name="DataFormats/JetReco"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="JetMETCorrections/Objects"/>
+  <use name="CommonTools/Utils"/>
+  <use name="CommonTools/ParticleFlow"/>
+  <use name="CommonTools/PileupAlgos"/>
+  <use name="fastjet"/>
+  <use name="fastjet-contrib"/>
 </library>
diff --git a/CommonTools/RecoAlgos/BuildFile.xml b/CommonTools/RecoAlgos/BuildFile.xml
index 1a72dbde78522..e5428e604108a 100644
--- a/CommonTools/RecoAlgos/BuildFile.xml
+++ b/CommonTools/RecoAlgos/BuildFile.xml
@@ -1,21 +1,20 @@
-<use   name="SimGeneral/HepPDTRecord"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/MuonReco"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/SiStripCluster"/>
-<use   name="DataFormats/SiPixelCluster"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="DataFormats/METReco"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="TrackingTools/Records"/>
-<use   name="TrackingTools/IPTools"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="fastjet"/>
-
+<use name="SimGeneral/HepPDTRecord"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/MuonReco"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/SiStripCluster"/>
+<use name="DataFormats/SiPixelCluster"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/METReco"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/VertexReco"/>
+<use name="TrackingTools/Records"/>
+<use name="TrackingTools/IPTools"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="fastjet"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/RecoAlgos/plugins/BuildFile.xml b/CommonTools/RecoAlgos/plugins/BuildFile.xml
index 927e6300afcf0..dba2eff5a4f64 100644
--- a/CommonTools/RecoAlgos/plugins/BuildFile.xml
+++ b/CommonTools/RecoAlgos/plugins/BuildFile.xml
@@ -1,24 +1,24 @@
 <export>
 </export>
-<library   name="CommonToolsRecoAlgos_plugins" file="*.cc">
-  <use   name="MagneticField/Engine"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="DataFormats/RecoCandidate"/>
-  <use   name="DataFormats/BTauReco"/>
-  <use   name="DataFormats/EgammaCandidates"/>
-  <use   name="DataFormats/EgammaReco"/>
-  <use   name="DataFormats/MuonReco"/>
-  <use   name="DataFormats/JetReco"/>
-  <use   name="DataFormats/METReco"/>
-  <use   name="DataFormats/PatCandidates"/>
-  <use   name="DataFormats/HcalRecHit"/>
-  <use   name="SimDataFormats/TrackingAnalysis"/>
-  <use   name="TrackingTools/PatternTools"/>
-  <use   name="CommonTools/Utils"/>
-  <use   name="CommonTools/RecoAlgos"/>
-  <use   name="MagneticField/Records"/>
-  <use   name="Geometry/Records"/>
-  <use   name="Geometry/TrackerGeometryBuilder"/>
-  <use   name="JetMETCorrections/JetCorrector"/>
+<library name="CommonToolsRecoAlgos_plugins" file="*.cc">
+  <use name="MagneticField/Engine"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="DataFormats/RecoCandidate"/>
+  <use name="DataFormats/BTauReco"/>
+  <use name="DataFormats/EgammaCandidates"/>
+  <use name="DataFormats/EgammaReco"/>
+  <use name="DataFormats/MuonReco"/>
+  <use name="DataFormats/JetReco"/>
+  <use name="DataFormats/METReco"/>
+  <use name="DataFormats/PatCandidates"/>
+  <use name="DataFormats/HcalRecHit"/>
+  <use name="SimDataFormats/TrackingAnalysis"/>
+  <use name="TrackingTools/PatternTools"/>
+  <use name="CommonTools/Utils"/>
+  <use name="CommonTools/RecoAlgos"/>
+  <use name="MagneticField/Records"/>
+  <use name="Geometry/Records"/>
+  <use name="Geometry/TrackerGeometryBuilder"/>
+  <use name="JetMETCorrections/JetCorrector"/>
 </library>
diff --git a/CommonTools/RecoAlgos/test/BuildFile.xml b/CommonTools/RecoAlgos/test/BuildFile.xml
index 029eb7c5c6857..fc764481507de 100644
--- a/CommonTools/RecoAlgos/test/BuildFile.xml
+++ b/CommonTools/RecoAlgos/test/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="cppunit"/>
-<use   name="CommonTools/RecoAlgos"/>
-<bin   file="FKDTree_t.cpp">
+<use name="cppunit"/>
+<use name="CommonTools/RecoAlgos"/>
+<bin file="FKDTree_t.cpp">
 
 </bin>
diff --git a/CommonTools/RecoUtils/BuildFile.xml b/CommonTools/RecoUtils/BuildFile.xml
index 544d3cc90bfd0..8d672793b2b25 100644
--- a/CommonTools/RecoUtils/BuildFile.xml
+++ b/CommonTools/RecoUtils/BuildFile.xml
@@ -1,24 +1,23 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/Scalers"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="DataFormats/ParticleFlowReco"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-<use   name="L1Trigger/GlobalTriggerAnalyzer"/>
-<use   name="MagneticField/Records"/>
-<use   name="MagneticField/Engine"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="RecoEgamma/EgammaTools"/>
-<use   name="RecoVertex/KinematicFit"/>
-<use   name="RecoVertex/KinematicFitPrimitives"/>
-
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="TrackingTools/IPTools"/>
-<use   name="TrackingTools/Records"/>
-<use   name="FWCore/Framework"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/Scalers"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/VertexReco"/>
+<use name="DataFormats/ParticleFlowReco"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="L1Trigger/GlobalTriggerAnalyzer"/>
+<use name="MagneticField/Records"/>
+<use name="MagneticField/Engine"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="RecoEgamma/EgammaTools"/>
+<use name="RecoVertex/KinematicFit"/>
+<use name="RecoVertex/KinematicFitPrimitives"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="TrackingTools/IPTools"/>
+<use name="TrackingTools/Records"/>
+<use name="FWCore/Framework"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/RecoUtils/plugins/BuildFile.xml b/CommonTools/RecoUtils/plugins/BuildFile.xml
index d5310c37a87e5..99316321ec26d 100644
--- a/CommonTools/RecoUtils/plugins/BuildFile.xml
+++ b/CommonTools/RecoUtils/plugins/BuildFile.xml
@@ -5,6 +5,6 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/EgammaCandidates"/>
-<library   file="*.cc" name="PFPUAssoMapPlugins">
-  <flags   EDM_PLUGIN="1"/>
-</library>
\ No newline at end of file
+<library file="*.cc" name="PFPUAssoMapPlugins">
+  <flags EDM_PLUGIN="1"/>
+</library>
diff --git a/CommonTools/Statistics/BuildFile.xml b/CommonTools/Statistics/BuildFile.xml
index ee74235e6b46f..040a1cac4b317 100644
--- a/CommonTools/Statistics/BuildFile.xml
+++ b/CommonTools/Statistics/BuildFile.xml
@@ -1,7 +1,7 @@
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="clhep"/>
-<use   name="boost"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="FWCore/MessageLogger"/>
+<use name="clhep"/>
+<use name="boost"/>
+<use name="DataFormats/CLHEP"/>
+<use name="FWCore/MessageLogger"/>
diff --git a/CommonTools/TrackerMap/BuildFile.xml b/CommonTools/TrackerMap/BuildFile.xml
index fda1ff549677b..9a4b3ea68dbb6 100644
--- a/CommonTools/TrackerMap/BuildFile.xml
+++ b/CommonTools/TrackerMap/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="CalibFormats/SiStripObjects"/>
-<use   name="rootgraphics"/>
+<use name="FWCore/Framework"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="CalibFormats/SiStripObjects"/>
+<use name="rootgraphics"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/TrackerMap/bin/BuildFile.xml b/CommonTools/TrackerMap/bin/BuildFile.xml
index 69908ecbcaaf0..b04efea4894cd 100644
--- a/CommonTools/TrackerMap/bin/BuildFile.xml
+++ b/CommonTools/TrackerMap/bin/BuildFile.xml
@@ -1,3 +1,4 @@
-<use   name="FWCore/ParameterSet"/>
-<use   name="CommonTools/TrackerMap"/>
-<bin   name="print_TrackerMap" file="print_TrackerMap.cc"></bin>
+<use name="FWCore/ParameterSet"/>
+<use name="CommonTools/TrackerMap"/>
+<bin name="print_TrackerMap" file="print_TrackerMap.cc">
+</bin>
diff --git a/CommonTools/TriggerUtils/BuildFile.xml b/CommonTools/TriggerUtils/BuildFile.xml
index a072264a647e7..f14529836e414 100644
--- a/CommonTools/TriggerUtils/BuildFile.xml
+++ b/CommonTools/TriggerUtils/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Scalers"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="FWCore/Framework"/>
-<use   name="L1Trigger/GlobalTriggerAnalyzer"/>
-<use   name="L1Trigger/L1TGlobal"/>
-<use   name="HLTrigger/HLTcore"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Scalers"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="FWCore/Framework"/>
+<use name="L1Trigger/GlobalTriggerAnalyzer"/>
+<use name="L1Trigger/L1TGlobal"/>
+<use name="HLTrigger/HLTcore"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/TriggerUtils/plugins/BuildFile.xml b/CommonTools/TriggerUtils/plugins/BuildFile.xml
index d5b58742c4668..e858ef4205c18 100644
--- a/CommonTools/TriggerUtils/plugins/BuildFile.xml
+++ b/CommonTools/TriggerUtils/plugins/BuildFile.xml
@@ -1,12 +1,11 @@
-<library   file="*.cc" name="CommonToolsTriggerUtilsPlugins">
-<use   name="CondFormats/DataRecord"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Scalers"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="FWCore/Framework"/>
-<use   name="L1Trigger/GlobalTriggerAnalyzer"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="CommonTools/TriggerUtils"/>
-<flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="CommonToolsTriggerUtilsPlugins">
+  <use name="CondFormats/DataRecord"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/Scalers"/>
+  <use name="DataFormats/L1GlobalTrigger"/>
+  <use name="FWCore/Framework"/>
+  <use name="L1Trigger/GlobalTriggerAnalyzer"/>
+  <use name="HLTrigger/HLTcore"/>
+  <use name="CommonTools/TriggerUtils"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-
diff --git a/CommonTools/TriggerUtils/test/BuildFile.xml b/CommonTools/TriggerUtils/test/BuildFile.xml
index 38d14ea53a97a..82d81d1baf125 100644
--- a/CommonTools/TriggerUtils/test/BuildFile.xml
+++ b/CommonTools/TriggerUtils/test/BuildFile.xml
@@ -1,6 +1,6 @@
 <export>
 </export>
-<library   name="CommonToolsTriggerUtils_test" file="*.cc">
+<library name="CommonToolsTriggerUtils_test" file="*.cc">
   <use name="CommonTools/TriggerUtils"/>
   <use name="FWCore/Framework"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/CommonTools/UtilAlgos/BuildFile.xml b/CommonTools/UtilAlgos/BuildFile.xml
index 98061cc0e0627..ce83cb33a91fe 100644
--- a/CommonTools/UtilAlgos/BuildFile.xml
+++ b/CommonTools/UtilAlgos/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="CommonTools/Utils"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="DataFormats/DetId"/>
-<use   name="roothistmatrix"/>
+<use name="CommonTools/Utils"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/Provenance"/>
+<use name="DataFormats/DetId"/>
+<use name="roothistmatrix"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/UtilAlgos/plugins/BuildFile.xml b/CommonTools/UtilAlgos/plugins/BuildFile.xml
index d276c5a2b95fd..e248a8a77b442 100644
--- a/CommonTools/UtilAlgos/plugins/BuildFile.xml
+++ b/CommonTools/UtilAlgos/plugins/BuildFile.xml
@@ -1,9 +1,9 @@
 <export>
 </export>
-<library   name="CommonToolsToolsUtilAlgos_plugins" file="*.cc">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="DataFormats/Candidate"/>
+<library name="CommonToolsToolsUtilAlgos_plugins" file="*.cc">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="DataFormats/Candidate"/>
 </library>
diff --git a/CommonTools/UtilAlgos/test/BuildFile.xml b/CommonTools/UtilAlgos/test/BuildFile.xml
index 5162b758f144d..2355b5b62cff9 100644
--- a/CommonTools/UtilAlgos/test/BuildFile.xml
+++ b/CommonTools/UtilAlgos/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/Framework"/>
-<library   file="TestTFileServiceAnalyzer.cc">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Framework"/>
+<library file="TestTFileServiceAnalyzer.cc">
+  <flags EDM_PLUGIN="1"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="FWCore/ServiceRegistry"/>
 </library>
diff --git a/CommonTools/Utils/BuildFile.xml b/CommonTools/Utils/BuildFile.xml
index 3da01739443ba..258746d36b0da 100644
--- a/CommonTools/Utils/BuildFile.xml
+++ b/CommonTools/Utils/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="boost"/>
-<use   name="roothistmatrix"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/MessageLogger"/>
+<use name="boost"/>
+<use name="roothistmatrix"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CommonTools/Utils/bin/BuildFile.xml b/CommonTools/Utils/bin/BuildFile.xml
index 48035c1ddb41c..279a27634a7ba 100644
--- a/CommonTools/Utils/bin/BuildFile.xml
+++ b/CommonTools/Utils/bin/BuildFile.xml
@@ -1,3 +1,3 @@
-<bin   name="runFormulaEvaluator" file="runFormulaEvaluator.cc">
-  <use   name="CommonTools/Utils"/>
+<bin name="runFormulaEvaluator" file="runFormulaEvaluator.cc">
+  <use name="CommonTools/Utils"/>
 </bin>
diff --git a/CommonTools/Utils/test/BuildFile.xml b/CommonTools/Utils/test/BuildFile.xml
index 6232cf6e658f9..7da28a44ea1da 100644
--- a/CommonTools/Utils/test/BuildFile.xml
+++ b/CommonTools/Utils/test/BuildFile.xml
@@ -1,47 +1,41 @@
-<bin   name="testCommonToolsUtil" file="testSelectors.cc,testSelectIterator.cc,testComparators.cc,testCutParser.cc,testExpressionParser.cc,testAssociationMapFilterValues.cc,testFormulaEvaluator.cc,testRunner.cpp">
-  <use   name="Geometry/CommonDetUnit"/>
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="DataFormats/TrackerRecHit2D"/>
-  <use   name="DataFormats/Candidate"/>
-  <use   name="DataFormats/PatCandidates"/>
-  <use   name="DataFormats/GeometryVector"/>
-  <use   name="DataFormats/SiStripCluster"/>
-  <use   name="CommonTools/Utils"/>
-  <use   name="cppunit"/>
-  <use   name="rootmath"/>
+<bin name="testCommonToolsUtil" file="testSelectors.cc,testSelectIterator.cc,testComparators.cc,testCutParser.cc,testExpressionParser.cc,testAssociationMapFilterValues.cc,testFormulaEvaluator.cc,testRunner.cpp">
+  <use name="Geometry/CommonDetUnit"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="DataFormats/TrackerRecHit2D"/>
+  <use name="DataFormats/Candidate"/>
+  <use name="DataFormats/PatCandidates"/>
+  <use name="DataFormats/GeometryVector"/>
+  <use name="DataFormats/SiStripCluster"/>
+  <use name="CommonTools/Utils"/>
+  <use name="cppunit"/>
+  <use name="rootmath"/>
 </bin>
 
 <bin name="testCommonToolsUtilThreaded" file="testCutParserThreaded.cc">
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="CommonTools/Utils"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="CommonTools/Utils"/>
 </bin>
 
-<bin   name="testExpressionEvaluator" file="testExpressionEvaluator.cc,testRunner.cpp">
-  <use   name="Geometry/CommonDetUnit"/>
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="DataFormats/TrackerRecHit2D"/>
-  <use   name="DataFormats/Candidate"/>
-  <use   name="DataFormats/PatCandidates"/>
-  <use   name="DataFormats/GeometryVector"/>
-  <use   name="DataFormats/SiStripCluster"/>
-  <use   name="CommonTools/Utils"/>
-  <use   name="cppunit"/>
+<bin name="testExpressionEvaluator" file="testExpressionEvaluator.cc,testRunner.cpp">
+  <use name="Geometry/CommonDetUnit"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="DataFormats/TrackerRecHit2D"/>
+  <use name="DataFormats/Candidate"/>
+  <use name="DataFormats/PatCandidates"/>
+  <use name="DataFormats/GeometryVector"/>
+  <use name="DataFormats/SiStripCluster"/>
+  <use name="CommonTools/Utils"/>
+  <use name="cppunit"/>
 </bin>
 
-
-
 <bin file="ExprEvalPopen_t.cpp">
   <use name="CommonTools/Utils"/>
 </bin>
 
-
 <bin file="ExpressionEvaluatorUnitTest.cpp">
   <flags CXXFLAGS="-fopenmp"/>
   <use name="CommonTools/Utils"/>
 </bin>
 
-
 <bin file="testDynArray.cpp">
 </bin>
-
-