diff --git a/DataFormats/Alignment/BuildFile.xml b/DataFormats/Alignment/BuildFile.xml
index 42276457935d8..7b654617c980f 100644
--- a/DataFormats/Alignment/BuildFile.xml
+++ b/DataFormats/Alignment/BuildFile.xml
@@ -1,8 +1,7 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="FWCore/Utilities"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/BTauReco/BuildFile.xml b/DataFormats/BTauReco/BuildFile.xml
index cb2f3e212189a..d61fb0cdf68fa 100644
--- a/DataFormats/BTauReco/BuildFile.xml
+++ b/DataFormats/BTauReco/BuildFile.xml
@@ -1,14 +1,13 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="FWCore/Utilities"/>
-<use   name="boost"/>
-<use   name="clhep"/>
-<use   name="rootmath"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/VertexReco"/>
+<use name="FWCore/Utilities"/>
+<use name="boost"/>
+<use name="clhep"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/BeamSpot/BuildFile.xml b/DataFormats/BeamSpot/BuildFile.xml
index cb999f4adb2fc..2e6117fdaf79c 100644
--- a/DataFormats/BeamSpot/BuildFile.xml
+++ b/DataFormats/BeamSpot/BuildFile.xml
@@ -1,9 +1,8 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="rootcore"/>
-<use   name="rootsmatrix"/>
-<use   name="clhep"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/CLHEP"/>
+<use name="rootcore"/>
+<use name="rootsmatrix"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/CLHEP/BuildFile.xml b/DataFormats/CLHEP/BuildFile.xml
index e31cb337489f0..bc8014000671f 100644
--- a/DataFormats/CLHEP/BuildFile.xml
+++ b/DataFormats/CLHEP/BuildFile.xml
@@ -1,8 +1,7 @@
-<use   name="clhep"/>
-
-<use   name="rootmath"/>
-<use   name="DataFormats/Math"/>
+<use name="clhep"/>
+<use name="rootmath"/>
+<use name="DataFormats/Math"/>
 <export>
-  <lib   name="1"/>
-  <use   name="DataFormats/Math"/>
+  <lib name="1"/>
+  <use name="DataFormats/Math"/>
 </export>
diff --git a/DataFormats/CSCDigi/BuildFile.xml b/DataFormats/CSCDigi/BuildFile.xml
index 3cb63ae81db26..d6439ed232394 100644
--- a/DataFormats/CSCDigi/BuildFile.xml
+++ b/DataFormats/CSCDigi/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/GEMDigi"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/GEMDigi"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/CSCDigi/test/BuildFile.xml b/DataFormats/CSCDigi/test/BuildFile.xml
index 364326e85d099..6fc129f63f6a6 100644
--- a/DataFormats/CSCDigi/test/BuildFile.xml
+++ b/DataFormats/CSCDigi/test/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="DataFormats/DetId"/>
-<bin   name="testCSCDigis" file="testCSCDigis.cpp">
-  <use   name="cppunit"/>
-  <use   name="DataFormats/FEDRawData"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="DataFormats/DetId"/>
+<bin name="testCSCDigis" file="testCSCDigis.cpp">
+  <use name="cppunit"/>
+  <use name="DataFormats/FEDRawData"/>
 </bin>
diff --git a/DataFormats/CSCRecHit/BuildFile.xml b/DataFormats/CSCRecHit/BuildFile.xml
index 90b1759298ee3..682712b8592a9 100644
--- a/DataFormats/CSCRecHit/BuildFile.xml
+++ b/DataFormats/CSCRecHit/BuildFile.xml
@@ -1,8 +1,7 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/TrackingRecHit"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/TrackingRecHit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/CSCRecHit/test/BuildFile.xml b/DataFormats/CSCRecHit/test/BuildFile.xml
index 9bc90b9a7ecfd..21772567f5939 100644
--- a/DataFormats/CSCRecHit/test/BuildFile.xml
+++ b/DataFormats/CSCRecHit/test/BuildFile.xml
@@ -1,14 +1,14 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/MuonReco"/>
-<use   name="DataFormats/CSCRecHit"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="root"/>
-<use   name="DataFormats/GeometryVector"/>
-<library   file="CSCSharesInputTest.cc" name="CSCSharesInputTest">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/MuonReco"/>
+<use name="DataFormats/CSCRecHit"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="root"/>
+<use name="DataFormats/GeometryVector"/>
+<library file="CSCSharesInputTest.cc" name="CSCSharesInputTest">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DataFormats/CTPPSDetId/BuildFile.xml b/DataFormats/CTPPSDetId/BuildFile.xml
index 83a0e6456c377..5a1d1280da478 100644
--- a/DataFormats/CTPPSDetId/BuildFile.xml
+++ b/DataFormats/CTPPSDetId/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="DataFormats/DetId"/>
-
 <export>
-	<lib name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/CTPPSDigi/BuildFile.xml b/DataFormats/CTPPSDigi/BuildFile.xml
index a47319ea04f9b..431f8c0d6683a 100644
--- a/DataFormats/CTPPSDigi/BuildFile.xml
+++ b/DataFormats/CTPPSDigi/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="FWCore/Framework"/>
-<use   name="DataFormats/CTPPSDetId"/>
-
+<use name="DataFormats/CTPPSDetId"/>
 <export>
-	<lib name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/CTPPSReco/BuildFile.xml b/DataFormats/CTPPSReco/BuildFile.xml
index 2026c33f016d7..41320fa24a34d 100644
--- a/DataFormats/CTPPSReco/BuildFile.xml
+++ b/DataFormats/CTPPSReco/BuildFile.xml
@@ -5,7 +5,6 @@
 <use name="rootsmatrix"/>
 <use name="rootmath"/>
 <use name="rootphysics"/>
-
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/CaloRecHit/BuildFile.xml b/DataFormats/CaloRecHit/BuildFile.xml
index 82b0b7169ae22..e43f2cd6aa505 100644
--- a/DataFormats/CaloRecHit/BuildFile.xml
+++ b/DataFormats/CaloRecHit/BuildFile.xml
@@ -1,8 +1,7 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/DetId"/>
-<use   name="rootmath"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/DetId"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/CaloRecHit/test/BuildFile.xml b/DataFormats/CaloRecHit/test/BuildFile.xml
index 983e853f47698..abf5dd0108a73 100644
--- a/DataFormats/CaloRecHit/test/BuildFile.xml
+++ b/DataFormats/CaloRecHit/test/BuildFile.xml
@@ -1,13 +1,14 @@
-<bin   name="testCaloCluster" file="testRunner.cpp,testCaloCluster.cppunit.cc">
- 
-  <use   name="DataFormats/CaloRecHit"/>
-  <use   name="DataFormats/Math"/>
-  <use   name="cppunit"/>
+<bin name="testCaloCluster" file="testRunner.cpp,testCaloCluster.cppunit.cc">
+  <use name="DataFormats/CaloRecHit"/>
+  <use name="DataFormats/Math"/>
+  <use name="cppunit"/>
 </bin>
+
 <iftool name="cuda-gcc-support">
-<bin name="test_calo_rechit" file="test_calo_rechit.cu">
+  <bin name="test_calo_rechit" file="test_calo_rechit.cu">
     <use name="DataFormats/CaloRecHit"/>
     <use name="DataFormats/DetId"/>
     <use name="cuda"/>
-</bin>
+  </bin>
+
 </iftool>
diff --git a/DataFormats/CaloTowers/BuildFile.xml b/DataFormats/CaloTowers/BuildFile.xml
index 047535f2839d6..ad268188fc18e 100644
--- a/DataFormats/CaloTowers/BuildFile.xml
+++ b/DataFormats/CaloTowers/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/Math"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/GeometryVector"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/Math"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/GeometryVector"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/CaloTowers/test/BuildFile.xml b/DataFormats/CaloTowers/test/BuildFile.xml
index f4f25c9b972e2..bdd6f33a8bc30 100644
--- a/DataFormats/CaloTowers/test/BuildFile.xml
+++ b/DataFormats/CaloTowers/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="DataFormats/CaloTowers"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<library   file="CaloTowersDump.cc" name="CaloTowersDump">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/CaloTowers"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<library file="CaloTowersDump.cc" name="CaloTowersDump">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DataFormats/Candidate/BuildFile.xml b/DataFormats/Candidate/BuildFile.xml
index 4c3c6321518df..6ca3bda2456a6 100644
--- a/DataFormats/Candidate/BuildFile.xml
+++ b/DataFormats/Candidate/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="DataFormats/Common"/>
-<use   Name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/Math"/>
-<use   name="FWCore/Utilities"/>
-<use   name="rootmath"/>
+<use name="DataFormats/Common"/>
+<use Name="DataFormats/GeometryVector"/>
+<use name="DataFormats/Math"/>
+<use name="FWCore/Utilities"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Candidate/test/BuildFile.xml b/DataFormats/Candidate/test/BuildFile.xml
index b02f27a053b4d..6cd0f6d5b6622 100644
--- a/DataFormats/Candidate/test/BuildFile.xml
+++ b/DataFormats/Candidate/test/BuildFile.xml
@@ -1,4 +1,4 @@
-<bin   name="testDataFormatsCandidate" file="testCompositeCandidate.cc,testCandidate.cc,testParticle.cc,testRunner.cpp">
-  <use   name="DataFormats/Candidate"/>
-  <use   name="cppunit"/>
+<bin name="testDataFormatsCandidate" file="testCompositeCandidate.cc,testCandidate.cc,testParticle.cc,testRunner.cpp">
+  <use name="DataFormats/Candidate"/>
+  <use name="cppunit"/>
 </bin>
diff --git a/DataFormats/CastorReco/BuildFile.xml b/DataFormats/CastorReco/BuildFile.xml
index cbf0bda6aece6..6b20714cdb249 100644
--- a/DataFormats/CastorReco/BuildFile.xml
+++ b/DataFormats/CastorReco/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/HcalRecHit"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/HcalRecHit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Common/BuildFile.xml b/DataFormats/Common/BuildFile.xml
index 0072253e2ee15..5a5dcdcd739da 100644
--- a/DataFormats/Common/BuildFile.xml
+++ b/DataFormats/Common/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/StdDictionaries"/>
-<use   name="boost"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/StdDictionaries"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Common/test/BuildFile.xml b/DataFormats/Common/test/BuildFile.xml
index 66c833bdf6f3a..f0a098c6ac61e 100644
--- a/DataFormats/Common/test/BuildFile.xml
+++ b/DataFormats/Common/test/BuildFile.xml
@@ -1,42 +1,59 @@
-<use   name="boost"/>
-<use   name="cppunit"/>
-<use   name="DataFormats/Common"/>
-<bin   name="testDataFormatsCommon" file="testRunner.cpp,testOwnVector.cc,testOneToOneAssociation.cc,testValueMap.cc,testOneToManyAssociation.cc,testAssociationVector.cc,testAssociationNew.cc,testValueMapNew.cc,testSortedCollection.cc,testRangeMap.cc,testIDVectorMap.cc,ref_t.cppunit.cc,DetSetRefVector_t.cppunit.cc,reftobase_t.cppunit.cc,reftobasevector_t.cppunit.cc,cloningptr_t.cppunit.cc,ptr_t.cppunit.cc,ptrvector_t.cppunit.cc,containermask_t.cppunit.cc,reftobaseprod_t.cppunit.cc,handle_t.cppunit.cc">
+<use name="boost"/>
+<use name="cppunit"/>
+<use name="DataFormats/Common"/>
+<bin name="testDataFormatsCommon" file="testRunner.cpp,testOwnVector.cc,testOneToOneAssociation.cc,testValueMap.cc,testOneToManyAssociation.cc,testAssociationVector.cc,testAssociationNew.cc,testValueMapNew.cc,testSortedCollection.cc,testRangeMap.cc,testIDVectorMap.cc,ref_t.cppunit.cc,DetSetRefVector_t.cppunit.cc,reftobase_t.cppunit.cc,reftobasevector_t.cppunit.cc,cloningptr_t.cppunit.cc,ptr_t.cppunit.cc,ptrvector_t.cppunit.cc,containermask_t.cppunit.cc,reftobaseprod_t.cppunit.cc,handle_t.cppunit.cc">
 </bin>
-<bin   file="DetSetVector_t.cpp">
+
+<bin file="DetSetVector_t.cpp">
 </bin>
-<bin   file="OwnVector_t.cpp">
+
+<bin file="OwnVector_t.cpp">
 </bin>
-<bin   file="DictionaryTools_t.cpp">
-  <use   name="DataFormats/StdDictionaries"/>
-  <use   name="DataFormats/WrappedStdDictionaries"/>
+
+<bin file="DictionaryTools_t.cpp">
+  <use name="DataFormats/StdDictionaries"/>
+  <use name="DataFormats/WrappedStdDictionaries"/>
 </bin>
-<bin   file="Wrapper_t.cpp">
+
+<bin file="Wrapper_t.cpp">
 </bin>
-<bin   file="traits_t.cpp">
+
+<bin file="traits_t.cpp">
 </bin>
-<bin   file="RefCore_t.cpp">
+
+<bin file="RefCore_t.cpp">
 </bin>
-<bin   file="Ref_t.cpp">
+
+<bin file="Ref_t.cpp">
 </bin>
-<bin   file="RefVector_t.cpp">
+
+<bin file="RefVector_t.cpp">
 </bin>
-<bin   file="DataFrame_t.cpp">
+
+<bin file="DataFrame_t.cpp">
 </bin>
-<bin   file="DetSetNew_t.cpp">
+
+<bin file="DetSetNew_t.cpp">
 </bin>
-<bin   file="DetSetNewTS_t.cpp">
+
+<bin file="DetSetNewTS_t.cpp">
   <flags CXXFLAGS="-fopenmp"/>
 </bin>
-<bin   file="MapOfVectors_t.cpp">
+
+<bin file="MapOfVectors_t.cpp">
 </bin>
-<bin   file="exDSTV.cpp">
+
+<bin file="exDSTV.cpp">
 </bin>
-<bin   file="Trie_t.cpp">
+
+<bin file="Trie_t.cpp">
 </bin>
-<bin   file="exTrie.cpp">
+
+<bin file="exTrie.cpp">
 </bin>
-<bin   file="testBoostRange.cpp">
+
+<bin file="testBoostRange.cpp">
 </bin>
-<bin   name="testMultiAssociation" file="testRunner.cpp,testMultiAssociation.cc">
+
+<bin name="testMultiAssociation" file="testRunner.cpp,testMultiAssociation.cc">
 </bin>
diff --git a/DataFormats/DTDigi/BuildFile.xml b/DataFormats/DTDigi/BuildFile.xml
index 983c448ea1924..3ecf2c4947ccc 100644
--- a/DataFormats/DTDigi/BuildFile.xml
+++ b/DataFormats/DTDigi/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/FEDRawData"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/FEDRawData"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/DTDigi/test/BuildFile.xml b/DataFormats/DTDigi/test/BuildFile.xml
index 175a1bf8c9433..ab4a3eba882b9 100644
--- a/DataFormats/DTDigi/test/BuildFile.xml
+++ b/DataFormats/DTDigi/test/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/DTDigi"/>
-<use   name="DataFormats/DetId"/>
-<bin   name="testDTDigis" file="testDTDigis.cpp">
-  <use   name="cppunit"/>
-  <use   name="DataFormats/FEDRawData"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/DTDigi"/>
+<use name="DataFormats/DetId"/>
+<bin name="testDTDigis" file="testDTDigis.cpp">
+  <use name="cppunit"/>
+  <use name="DataFormats/FEDRawData"/>
 </bin>
diff --git a/DataFormats/DTRecHit/BuildFile.xml b/DataFormats/DTRecHit/BuildFile.xml
index d6477b2103214..57b7f1a661bd5 100644
--- a/DataFormats/DTRecHit/BuildFile.xml
+++ b/DataFormats/DTRecHit/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DTDigi"/>
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="FWCore/Utilities"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DTDigi"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/DetId/BuildFile.xml b/DataFormats/DetId/BuildFile.xml
index ddf33bf1fc9b9..7c537d9ebb995 100644
--- a/DataFormats/DetId/BuildFile.xml
+++ b/DataFormats/DetId/BuildFile.xml
@@ -1,5 +1,4 @@
-
-<use   name="DataFormats/Common"/>
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/DetId/test/BuildFile.xml b/DataFormats/DetId/test/BuildFile.xml
index 376a8bdc397ad..3a55e72c5710e 100644
--- a/DataFormats/DetId/test/BuildFile.xml
+++ b/DataFormats/DetId/test/BuildFile.xml
@@ -1,7 +1,8 @@
 <iftool name="cuda-gcc-support">
-<bin name="test_detid" file="test_detid.cu">
+  <bin name="test_detid" file="test_detid.cu">
     <use name="cuda"/>
     <use name="DataFormats/DetId"/>
     <use name="HeterogeneousCore/CUDAUtilities"/>
-</bin>
+  </bin>
+
 </iftool>
diff --git a/DataFormats/EcalDetId/BuildFile.xml b/DataFormats/EcalDetId/BuildFile.xml
index 21afca6cb95bd..e473ea637052c 100644
--- a/DataFormats/EcalDetId/BuildFile.xml
+++ b/DataFormats/EcalDetId/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="FWCore/Utilities"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/EcalDetId/test/BuildFile.xml b/DataFormats/EcalDetId/test/BuildFile.xml
index 4ba2ac8d37804..b7a4ff1500bfb 100644
--- a/DataFormats/EcalDetId/test/BuildFile.xml
+++ b/DataFormats/EcalDetId/test/BuildFile.xml
@@ -1,19 +1,26 @@
-<use   name="DataFormats/EcalDetId"/>
-<bin   name="testEcalDetId" file="testEcalDetId.cpp">
-  <use   name="cppunit"/>
+<use name="DataFormats/EcalDetId"/>
+<bin name="testEcalDetId" file="testEcalDetId.cpp">
+  <use name="cppunit"/>
 </bin>
-<bin   file="printEBDetId.cpp">
+
+<bin file="printEBDetId.cpp">
 </bin>
-<bin   file="printEEDetId.cpp">
+
+<bin file="printEEDetId.cpp">
 </bin>
-<bin   file="testScHashedIndex.cpp">
+
+<bin file="testScHashedIndex.cpp">
 </bin>
-<bin   file="testEEHashedIndex.cpp">
+
+<bin file="testEEHashedIndex.cpp">
 </bin>
-<bin   file="testEBHashedIndex.cpp">
+
+<bin file="testEBHashedIndex.cpp">
 </bin>
-<bin   file="testEcalDetIdLoop.cpp">
+
+<bin file="testEcalDetIdLoop.cpp">
 </bin>
-<bin   name="testEcalContainer" file="testEcalContainer.cpp">
-  <use   name="cppunit"/>
+
+<bin name="testEcalContainer" file="testEcalContainer.cpp">
+  <use name="cppunit"/>
 </bin>
diff --git a/DataFormats/EcalDigi/BuildFile.xml b/DataFormats/EcalDigi/BuildFile.xml
index ccbdcec1a10f3..5b1ead14f9466 100644
--- a/DataFormats/EcalDigi/BuildFile.xml
+++ b/DataFormats/EcalDigi/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EcalDetId"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EcalDetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/EcalDigi/test/BuildFile.xml b/DataFormats/EcalDigi/test/BuildFile.xml
index 0c27990776833..102c2c900e949 100644
--- a/DataFormats/EcalDigi/test/BuildFile.xml
+++ b/DataFormats/EcalDigi/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="boost"/>
-<use   name="cppunit"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EcalDigi"/>
-<bin   file="EcalDigi_t.cpp">
+<use name="boost"/>
+<use name="cppunit"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EcalDigi"/>
+<bin file="EcalDigi_t.cpp">
 </bin>
diff --git a/DataFormats/EcalRawData/BuildFile.xml b/DataFormats/EcalRawData/BuildFile.xml
index b441f4a017fa9..7c537d9ebb995 100644
--- a/DataFormats/EcalRawData/BuildFile.xml
+++ b/DataFormats/EcalRawData/BuildFile.xml
@@ -1,5 +1,4 @@
-<use   name="DataFormats/Common"/>
-
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/EcalRecHit/BuildFile.xml b/DataFormats/EcalRecHit/BuildFile.xml
index 24d38475ee888..3b88044dd0ce9 100644
--- a/DataFormats/EcalRecHit/BuildFile.xml
+++ b/DataFormats/EcalRecHit/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/EcalDigi"/>
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/EcalDigi"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/EcalRecHit/test/BuildFile.xml b/DataFormats/EcalRecHit/test/BuildFile.xml
index 592b5e3dd9d43..c9644864d22cd 100644
--- a/DataFormats/EcalRecHit/test/BuildFile.xml
+++ b/DataFormats/EcalRecHit/test/BuildFile.xml
@@ -1,5 +1,4 @@
-<bin   name="testEcalRecHit" file="testRunner.cpp,testEcalRecHit.cppunit.cc,testEcalUncalibratedRecHit.cppunit.cc">
-  <use   name="DataFormats/EcalRecHit"/>
-  <use   name="cppunit"/>
+<bin name="testEcalRecHit" file="testRunner.cpp,testEcalRecHit.cppunit.cc,testEcalUncalibratedRecHit.cppunit.cc">
+  <use name="DataFormats/EcalRecHit"/>
+  <use name="cppunit"/>
 </bin>
-
diff --git a/DataFormats/EgammaCandidates/BuildFile.xml b/DataFormats/EgammaCandidates/BuildFile.xml
index 4b0780862b608..3b9adcd56ab88 100644
--- a/DataFormats/EgammaCandidates/BuildFile.xml
+++ b/DataFormats/EgammaCandidates/BuildFile.xml
@@ -1,19 +1,18 @@
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/CaloTowers"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="DataFormats/GsfTrackReco"/>
-<use   name="DataFormats/GeometryCommonDetAlgo"/>
-<use   name="FWCore/MessageLogger"/>
-
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/CaloTowers"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/VertexReco"/>
+<use name="DataFormats/GsfTrackReco"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="FWCore/MessageLogger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/EgammaReco/BuildFile.xml b/DataFormats/EgammaReco/BuildFile.xml
index 9a92f34fb7632..98b3ad34f1141 100644
--- a/DataFormats/EgammaReco/BuildFile.xml
+++ b/DataFormats/EgammaReco/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="clhepheader"/>
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/TrajectorySeed"/>
-<use   name="DataFormats/TrackReco"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="clhepheader"/>
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/TrajectorySeed"/>
+<use name="DataFormats/TrackReco"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/EgammaReco/test/BuildFile.xml b/DataFormats/EgammaReco/test/BuildFile.xml
index dfcd6313df181..53f787bdd8cdf 100644
--- a/DataFormats/EgammaReco/test/BuildFile.xml
+++ b/DataFormats/EgammaReco/test/BuildFile.xml
@@ -1,6 +1,5 @@
-<bin   name="testSuperCluster" file="testRunner.cpp,testSuperCluster.cppunit.cc">
-  
-  <use   name="DataFormats/EgammaReco"/>
-  <use   name="DataFormats/Math"/>
-  <use   name="cppunit"/>
+<bin name="testSuperCluster" file="testRunner.cpp,testSuperCluster.cppunit.cc">
+  <use name="DataFormats/EgammaReco"/>
+  <use name="DataFormats/Math"/>
+  <use name="cppunit"/>
 </bin>
diff --git a/DataFormats/EgammaTrackReco/BuildFile.xml b/DataFormats/EgammaTrackReco/BuildFile.xml
index 904e63edf2905..5a533651ffc82 100644
--- a/DataFormats/EgammaTrackReco/BuildFile.xml
+++ b/DataFormats/EgammaTrackReco/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="clhepheader"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="clhepheader"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/FEDRawData/BuildFile.xml b/DataFormats/FEDRawData/BuildFile.xml
index 48f03d75dbe31..38b45babc72b0 100644
--- a/DataFormats/FEDRawData/BuildFile.xml
+++ b/DataFormats/FEDRawData/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/Utilities"/>
-
+<use name="DataFormats/Common"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/FEDRawData/test/BuildFile.xml b/DataFormats/FEDRawData/test/BuildFile.xml
index ed993bf42ad73..c69c5fdc725d3 100644
--- a/DataFormats/FEDRawData/test/BuildFile.xml
+++ b/DataFormats/FEDRawData/test/BuildFile.xml
@@ -1,8 +1,9 @@
-<use   name="DataFormats/FEDRawData"/>
-<bin   name="testFEDRawData" file="FEDRawData_t.cpp,FEDRawDataProduct_t.cc, FEDNumbering_t.cpp">
-  <use   name="cppunit"/>
+<use name="DataFormats/FEDRawData"/>
+<bin name="testFEDRawData" file="FEDRawData_t.cpp,FEDRawDataProduct_t.cc, FEDNumbering_t.cpp">
+  <use name="cppunit"/>
 </bin>
-<library   name="testDumpFEDRawDataProduct" file="DumpFEDRawDataProduct.cc">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="FWCore/Framework"/>
+
+<library name="testDumpFEDRawDataProduct" file="DumpFEDRawDataProduct.cc">
+  <flags EDM_PLUGIN="1"/>
+  <use name="FWCore/Framework"/>
 </library>
diff --git a/DataFormats/FP420Cluster/BuildFile.xml b/DataFormats/FP420Cluster/BuildFile.xml
index b441f4a017fa9..7c537d9ebb995 100644
--- a/DataFormats/FP420Cluster/BuildFile.xml
+++ b/DataFormats/FP420Cluster/BuildFile.xml
@@ -1,5 +1,4 @@
-<use   name="DataFormats/Common"/>
-
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/FP420Digi/BuildFile.xml b/DataFormats/FP420Digi/BuildFile.xml
index b441f4a017fa9..7c537d9ebb995 100644
--- a/DataFormats/FP420Digi/BuildFile.xml
+++ b/DataFormats/FP420Digi/BuildFile.xml
@@ -1,5 +1,4 @@
-<use   name="DataFormats/Common"/>
-
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/FTLDigi/BuildFile.xml b/DataFormats/FTLDigi/BuildFile.xml
index f992daa95d838..15d7f7b3264a8 100644
--- a/DataFormats/FTLDigi/BuildFile.xml
+++ b/DataFormats/FTLDigi/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/ForwardDetId"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/ForwardDetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/FTLRecHit/BuildFile.xml b/DataFormats/FTLRecHit/BuildFile.xml
index f2b5be9c1b3a6..54554ca57ad65 100644
--- a/DataFormats/FTLRecHit/BuildFile.xml
+++ b/DataFormats/FTLRecHit/BuildFile.xml
@@ -1,8 +1,7 @@
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/ForwardDetId"/>
-<use   name="DataFormats/TrackingRecHit"/>
-
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/ForwardDetId"/>
+<use name="DataFormats/TrackingRecHit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/FWLite/BuildFile.xml b/DataFormats/FWLite/BuildFile.xml
index 945c8d5aed205..2c43875ad36e9 100644
--- a/DataFormats/FWLite/BuildFile.xml
+++ b/DataFormats/FWLite/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Common"/>
-<use   name="FWCore/FWLite"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Reflection"/>
-<use   name="rootcore"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Common"/>
+<use name="FWCore/FWLite"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/Reflection"/>
+<use name="rootcore"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/FWLite/test/BuildFile.xml b/DataFormats/FWLite/test/BuildFile.xml
index 4dd803dcfe57d..b1c0a7386a6bc 100644
--- a/DataFormats/FWLite/test/BuildFile.xml
+++ b/DataFormats/FWLite/test/BuildFile.xml
@@ -1,18 +1,20 @@
 <environment>
-  <use   name="cppunit"/>
+  <use name="cppunit"/>
 </environment>
-<bin   name="testDataFormatsFWLiteMakeInput" file="TestRunnerDataFormatsFWLite.cpp">
-  <flags   TEST_RUNNER_ARGS=" /bin/bash DataFormats/FWLite/test RefTest.sh"/>
-  <use   name="FWCore/Utilities"/>
+<bin name="testDataFormatsFWLiteMakeInput" file="TestRunnerDataFormatsFWLite.cpp">
+  <flags TEST_RUNNER_ARGS=" /bin/bash DataFormats/FWLite/test RefTest.sh"/>
+  <use name="FWCore/Utilities"/>
 </bin>
-<bin   name="testDataFormatsFWLite" file="test.cppunit.cpp,format_type_name.cppunit.cpp">
+
+<bin name="testDataFormatsFWLite" file="test.cppunit.cpp,format_type_name.cppunit.cpp">
   <flags PRE_TEST="testDataFormatsFWLiteMakeInput"/>
-  <use   name="DataFormats/FWLite"/>
-  <use   name="FWCore/FWLite"/>
-  <use   name="DataFormats/TestObjects"/>
+  <use name="DataFormats/FWLite"/>
+  <use name="FWCore/FWLite"/>
+  <use name="DataFormats/TestObjects"/>
 </bin>
-<bin   file="TestRunnerDataFormatsFWLite.cpp">
+
+<bin file="TestRunnerDataFormatsFWLite.cpp">
   <flags PRE_TEST="testDataFormatsFWLite"/>
-  <flags   TEST_RUNNER_ARGS=" /bin/bash DataFormats/FWLite/test run_all_t.sh"/>
-  <use   name="FWCore/Utilities"/>
+  <flags TEST_RUNNER_ARGS=" /bin/bash DataFormats/FWLite/test run_all_t.sh"/>
+  <use name="FWCore/Utilities"/>
 </bin>
diff --git a/DataFormats/ForwardDetId/BuildFile.xml b/DataFormats/ForwardDetId/BuildFile.xml
index 540165a1e830c..632d550f4f9f6 100644
--- a/DataFormats/ForwardDetId/BuildFile.xml
+++ b/DataFormats/ForwardDetId/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/DetId"/>
-
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/DetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/ForwardDetId/test/BuildFile.xml b/DataFormats/ForwardDetId/test/BuildFile.xml
index 49dca96c385fb..3f7519d699c29 100644
--- a/DataFormats/ForwardDetId/test/BuildFile.xml
+++ b/DataFormats/ForwardDetId/test/BuildFile.xml
@@ -1,3 +1,6 @@
-<use   name="DataFormats/ForwardDetId"/>
-<bin   file="testHGCDetId.cc"> </bin>
-<bin   file="testHFNoseDetId.cc"> </bin>
+<use name="DataFormats/ForwardDetId"/>
+<bin file="testHGCDetId.cc">
+</bin>
+
+<bin file="testHFNoseDetId.cc">
+</bin>
diff --git a/DataFormats/GEMDigi/BuildFile.xml b/DataFormats/GEMDigi/BuildFile.xml
index 2109567848a12..ba133c8e101a4 100644
--- a/DataFormats/GEMDigi/BuildFile.xml
+++ b/DataFormats/GEMDigi/BuildFile.xml
@@ -1,8 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/GEMRecHit"/>
-
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/GEMRecHit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/GEMRecHit/BuildFile.xml b/DataFormats/GEMRecHit/BuildFile.xml
index cfadfba4f6ba1..f642bb07c1187 100644
--- a/DataFormats/GEMRecHit/BuildFile.xml
+++ b/DataFormats/GEMRecHit/BuildFile.xml
@@ -1,11 +1,9 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/TrackingRecHit"/>
-
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/CSCRecHit"/>
-<use   name="rootrflx"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/CSCRecHit"/>
+<use name="rootrflx"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/GeometryCommonDetAlgo/BuildFile.xml b/DataFormats/GeometryCommonDetAlgo/BuildFile.xml
index 0af0e7aac5535..cf9d1c098f1bf 100644
--- a/DataFormats/GeometryCommonDetAlgo/BuildFile.xml
+++ b/DataFormats/GeometryCommonDetAlgo/BuildFile.xml
@@ -1,10 +1,9 @@
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/Utilities"/>
-
+<use name="DataFormats/Math"/>
+<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/Common"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/GeometryCommonDetAlgo/test/BuildFile.xml b/DataFormats/GeometryCommonDetAlgo/test/BuildFile.xml
index 3b269f578963a..43499b844fc33 100644
--- a/DataFormats/GeometryCommonDetAlgo/test/BuildFile.xml
+++ b/DataFormats/GeometryCommonDetAlgo/test/BuildFile.xml
@@ -1,7 +1,8 @@
 <environment>
-  <use   name="DataFormats/GeometryCommonDetAlgo"/>
-  <use   name="DataFormats/GeometrySurface"/>
-  <use   name="DataFormats/GeometryVector"/>
-  <bin   file="PerpendicularBoundPlaneBuilderTest.cpp">
-  </bin>
+  <use name="DataFormats/GeometryCommonDetAlgo"/>
+  <use name="DataFormats/GeometrySurface"/>
+  <use name="DataFormats/GeometryVector"/>
+  <bin file="PerpendicularBoundPlaneBuilderTest.cpp">
+</bin>
+
 </environment>
diff --git a/DataFormats/GeometrySurface/BuildFile.xml b/DataFormats/GeometrySurface/BuildFile.xml
index d938464f99cb2..2ba0299686a0c 100644
--- a/DataFormats/GeometrySurface/BuildFile.xml
+++ b/DataFormats/GeometrySurface/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/GeometryVector"/>
-<use   name="boost"/>
-
+<use name="DataFormats/GeometryVector"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/GeometrySurface/test/BuildFile.xml b/DataFormats/GeometrySurface/test/BuildFile.xml
index 4427cbdfed983..aaa326df73a9b 100644
--- a/DataFormats/GeometrySurface/test/BuildFile.xml
+++ b/DataFormats/GeometrySurface/test/BuildFile.xml
@@ -1,30 +1,35 @@
 <use name="cppunit"/>
 <use name="DataFormats/GeometrySurface"/>
-
 <bin file="FrameTransformTest.cpp">
 </bin>
+
 <bin file="OldFrameTransformTest.cpp">
 </bin>
+
 <bin file="PrecisionMixSurface.cpp">
 </bin>
+
 <bin file="referencecounted_t.cpp">
 </bin>
+
 <bin file="testGeometricSort.cpp" name="testGeometricSort">
 </bin>
+
 <bin file="Bounds_t.cpp">
 </bin>
 
 <iftool name="cuda-gcc-support">
-<bin file="gpuFrameTransformKernel.cu, gpuFrameTransformTest.cpp" name="gpuFrameTransformTest">
-  <use name="cuda"/>
-  <use name="HeterogeneousCore/CUDAUtilities"/>
-  <flags CXXFLAGS="-g"/>
-</bin>
+  <bin file="gpuFrameTransformKernel.cu, gpuFrameTransformTest.cpp" name="gpuFrameTransformTest">
+    <use name="cuda"/>
+    <use name="HeterogeneousCore/CUDAUtilities"/>
+    <flags CXXFLAGS="-g"/>
+  </bin>
+
+  <bin file="gpuFrameTransformKernel.cu, gpuFrameTransformTest.cpp" name="gpuFrameTransformTestRep">
+    <use name="cuda"/>
+    <use name="HeterogeneousCore/CUDAUtilities"/>
+    <flags CXXFLAGS="-ffp-contract=off"/>
+    <flags CUDA_FLAGS="-fmad=false -ftz=false -prec-div=true -prec-sqrt=true"/>
+  </bin>
 
-<bin file="gpuFrameTransformKernel.cu, gpuFrameTransformTest.cpp" name="gpuFrameTransformTestRep">
-  <use name="cuda"/>
-  <use name="HeterogeneousCore/CUDAUtilities"/>
-  <flags CXXFLAGS="-ffp-contract=off"/>
-  <flags CUDA_FLAGS="-fmad=false -ftz=false -prec-div=true -prec-sqrt=true"/>
-</bin>
 </iftool>
diff --git a/DataFormats/GeometryVector/BuildFile.xml b/DataFormats/GeometryVector/BuildFile.xml
index 84eab0a14a01c..4878718f6ca94 100644
--- a/DataFormats/GeometryVector/BuildFile.xml
+++ b/DataFormats/GeometryVector/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="rootmath"/>
-
-<use   name="DataFormats/Math"/>
+<use name="rootmath"/>
+<use name="DataFormats/Math"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/GeometryVector/test/BuildFile.xml b/DataFormats/GeometryVector/test/BuildFile.xml
index a0715bbc07be0..27dd5fd918c99 100644
--- a/DataFormats/GeometryVector/test/BuildFile.xml
+++ b/DataFormats/GeometryVector/test/BuildFile.xml
@@ -1,5 +1,5 @@
-<use  name="DataFormats/GeometryVector"/>
-<bin  file="BasicVector_t.cpp" name="DataFormatsBasicVector_t"/>
-<bin  file="phiLess_t.cpp" name="GeomVectPhiLess_t"/>
-<bin  file="Intervals_t.cpp" name="DataFormatsIntervals_t"/>
-<bin   file="PhiTest.cc" name="PhiTest"/>
+<use name="DataFormats/GeometryVector"/>
+<bin file="BasicVector_t.cpp" name="DataFormatsBasicVector_t"/>
+<bin file="phiLess_t.cpp" name="GeomVectPhiLess_t"/>
+<bin file="Intervals_t.cpp" name="DataFormatsIntervals_t"/>
+<bin file="PhiTest.cc" name="PhiTest"/>
diff --git a/DataFormats/GsfTrackReco/BuildFile.xml b/DataFormats/GsfTrackReco/BuildFile.xml
index b8dc5473c9cc2..061af954fdd84 100644
--- a/DataFormats/GsfTrackReco/BuildFile.xml
+++ b/DataFormats/GsfTrackReco/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackReco"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrackReco"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/HGCDigi/BuildFile.xml b/DataFormats/HGCDigi/BuildFile.xml
index ce3ec05a161bb..d410cbfccec84 100644
--- a/DataFormats/HGCDigi/BuildFile.xml
+++ b/DataFormats/HGCDigi/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/ForwardDetId"/>
-<use   name="DataFormats/HcalDetId"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/ForwardDetId"/>
+<use name="DataFormats/HcalDetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/HGCDigi/test/BuildFile.xml b/DataFormats/HGCDigi/test/BuildFile.xml
index 3dbd89a1b7d7d..c9e9184e93ca5 100644
--- a/DataFormats/HGCDigi/test/BuildFile.xml
+++ b/DataFormats/HGCDigi/test/BuildFile.xml
@@ -1,4 +1,4 @@
 <bin file="HGCSampleTest.cpp" name="HGCSampleTest">
-  <flags   TEST_RUNNER_ARGS=" 200000000 y"/>
+  <flags TEST_RUNNER_ARGS=" 200000000 y"/>
   <use name="DataFormats/HGCDigi"/>
 </bin>
diff --git a/DataFormats/HGCRecHit/BuildFile.xml b/DataFormats/HGCRecHit/BuildFile.xml
index 64a3ed9e8363c..eb5042c528e97 100644
--- a/DataFormats/HGCRecHit/BuildFile.xml
+++ b/DataFormats/HGCRecHit/BuildFile.xml
@@ -1,8 +1,7 @@
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/ForwardDetId"/>
-<use   name="DataFormats/HcalDetId"/>
-
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/ForwardDetId"/>
+<use name="DataFormats/HcalDetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/HGCalReco/BuildFile.xml b/DataFormats/HGCalReco/BuildFile.xml
index adfadd4a18324..e168223e87f69 100644
--- a/DataFormats/HGCalReco/BuildFile.xml
+++ b/DataFormats/HGCalReco/BuildFile.xml
@@ -1,11 +1,9 @@
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="eigen"/>
-
+<use name="DataFormats/Math"/>
+<use name="DataFormats/Provenance"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrackReco"/>
+<use name="eigen"/>
 <export>
-    <lib   name="1"/>
+  <lib name="1"/>
 </export>
-
diff --git a/DataFormats/HLTReco/BuildFile.xml b/DataFormats/HLTReco/BuildFile.xml
index def5cc9457ee3..26dc1bc782b7c 100644
--- a/DataFormats/HLTReco/BuildFile.xml
+++ b/DataFormats/HLTReco/BuildFile.xml
@@ -1,15 +1,14 @@
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/METReco"/>
-<use   name="DataFormats/HcalIsolatedTrack"/>
-<use   name="DataFormats/TauReco"/>
-
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/METReco"/>
+<use name="DataFormats/HcalIsolatedTrack"/>
+<use name="DataFormats/TauReco"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/HcalCalibObjects/BuildFile.xml b/DataFormats/HcalCalibObjects/BuildFile.xml
index 0bb8d3d1dedf5..2e32b563d83ae 100644
--- a/DataFormats/HcalCalibObjects/BuildFile.xml
+++ b/DataFormats/HcalCalibObjects/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/ParameterSet"/>
+<use name="DataFormats/Common"/>
+<use name="FWCore/ParameterSet"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/HcalDetId/BuildFile.xml b/DataFormats/HcalDetId/BuildFile.xml
index 834da04ff1c57..7b963c0dd3077 100644
--- a/DataFormats/HcalDetId/BuildFile.xml
+++ b/DataFormats/HcalDetId/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/DetId"/>
-<use   name="FWCore/Utilities"/>
-
+<use name="DataFormats/DetId"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/HcalDetId/test/BuildFile.xml b/DataFormats/HcalDetId/test/BuildFile.xml
index e49b14a5cf4bd..cbcac315bb5e6 100644
--- a/DataFormats/HcalDetId/test/BuildFile.xml
+++ b/DataFormats/HcalDetId/test/BuildFile.xml
@@ -1,6 +1,7 @@
 <iftool name="cuda-gcc-support">
-<bin name="test_hcal_detid" file="test_hcal_detid.cu">
+  <bin name="test_hcal_detid" file="test_hcal_detid.cu">
     <use name="DataFormats/DetId"/>
     <use name="DataFormats/HcalDetId"/>
-</bin>
+  </bin>
+
 </iftool>
diff --git a/DataFormats/HcalDigi/BuildFile.xml b/DataFormats/HcalDigi/BuildFile.xml
index 1a2e6da475f62..cee2c128fcdbf 100644
--- a/DataFormats/HcalDigi/BuildFile.xml
+++ b/DataFormats/HcalDigi/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/HcalDetId"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/HcalDetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/HcalDigi/test/BuildFile.xml b/DataFormats/HcalDigi/test/BuildFile.xml
index 5fad363ed130e..c3de08b0c2357 100644
--- a/DataFormats/HcalDigi/test/BuildFile.xml
+++ b/DataFormats/HcalDigi/test/BuildFile.xml
@@ -1,14 +1,16 @@
-<library   file="HcalDigiDump.cc" name="HcalDigiDump">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="DataFormats/HcalDigi"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
+<library file="HcalDigiDump.cc" name="HcalDigiDump">
+  <flags EDM_PLUGIN="1"/>
+  <use name="DataFormats/HcalDigi"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
 </library>
+
 <iftool name="cuda-gcc-support">
-<bin name="test_hcal_digi" file="test_hcal_digi.cu">
+  <bin name="test_hcal_digi" file="test_hcal_digi.cu">
     <use name="DataFormats/DetId"/>
     <use name="DataFormats/HcalDetId"/>
     <use name="DataFormats/HcalDigi"/>
     <use name="DataFormats/Common"/>
-</bin>
+  </bin>
+
 </iftool>
diff --git a/DataFormats/HcalIsolatedTrack/BuildFile.xml b/DataFormats/HcalIsolatedTrack/BuildFile.xml
index c111c5af6fcde..709f9cad4b187 100644
--- a/DataFormats/HcalIsolatedTrack/BuildFile.xml
+++ b/DataFormats/HcalIsolatedTrack/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="FWCore/MessageLogger"/>
-
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="FWCore/MessageLogger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/HcalRecHit/BuildFile.xml b/DataFormats/HcalRecHit/BuildFile.xml
index 20a570aef6dc4..45f262e49d64a 100644
--- a/DataFormats/HcalRecHit/BuildFile.xml
+++ b/DataFormats/HcalRecHit/BuildFile.xml
@@ -1,8 +1,7 @@
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/HcalDigi"/>
-
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/HcalDigi"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/HcalRecHit/test/BuildFile.xml b/DataFormats/HcalRecHit/test/BuildFile.xml
index d0eacceebeddd..0b9deb8f1e8f3 100644
--- a/DataFormats/HcalRecHit/test/BuildFile.xml
+++ b/DataFormats/HcalRecHit/test/BuildFile.xml
@@ -1,15 +1,17 @@
-<library   file="HcalRecHitDump.cc" name="HcalRecHitDump">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="DataFormats/HcalRecHit"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
+<library file="HcalRecHitDump.cc" name="HcalRecHitDump">
+  <flags EDM_PLUGIN="1"/>
+  <use name="DataFormats/HcalRecHit"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
 </library>
+
 <iftool name="cuda-gcc-support">
-<bin name="test_hcal_reco" file="test_hcal_reco.cu">
+  <bin name="test_hcal_reco" file="test_hcal_reco.cu">
     <use name="DataFormats/CaloRecHit"/>
     <use name="DataFormats/HcalRecHit"/>
     <use name="DataFormats/HcalDetId"/>
     <use name="DataFormats/HcalDigi"/>
     <use name="cuda"/>
-</bin>
+  </bin>
+
 </iftool>
diff --git a/DataFormats/HeavyIonEvent/BuildFile.xml b/DataFormats/HeavyIonEvent/BuildFile.xml
index 08b23e6a4e2a4..bae25b15f94f1 100644
--- a/DataFormats/HeavyIonEvent/BuildFile.xml
+++ b/DataFormats/HeavyIonEvent/BuildFile.xml
@@ -1,9 +1,8 @@
-<use   name="root"/>
-
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="CondFormats/HIObjects"/>
-<use   name="CondFormats/DataRecord"/>
+<use name="root"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Candidate"/>
+<use name="CondFormats/HIObjects"/>
+<use name="CondFormats/DataRecord"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/HepMCCandidate/BuildFile.xml b/DataFormats/HepMCCandidate/BuildFile.xml
index 2b0cd5a6e03cd..5a555e0693ad0 100644
--- a/DataFormats/HepMCCandidate/BuildFile.xml
+++ b/DataFormats/HepMCCandidate/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/StdDictionaries"/>
-<use   name="root"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/StdDictionaries"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Histograms/BuildFile.xml b/DataFormats/Histograms/BuildFile.xml
index cafb5dae7305a..5e41c09784248 100644
--- a/DataFormats/Histograms/BuildFile.xml
+++ b/DataFormats/Histograms/BuildFile.xml
@@ -1,6 +1,5 @@
-
-<use   name="roothistmatrix"/>
-<use   name="DataFormats/Common"/>
+<use name="roothistmatrix"/>
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Histograms/test/BuildFile.xml b/DataFormats/Histograms/test/BuildFile.xml
index 8672b5c0e7b2d..0022f83a4ea85 100644
--- a/DataFormats/Histograms/test/BuildFile.xml
+++ b/DataFormats/Histograms/test/BuildFile.xml
@@ -1,4 +1,4 @@
-<bin   name="TestDataFormatsHistogramsMEtoEDMFormat" file="metoedmformat_t.cc">
-  <use   name="cppunit"/>
-  <use   name="DataFormats/Histograms"/>
+<bin name="TestDataFormatsHistogramsMEtoEDMFormat" file="metoedmformat_t.cc">
+  <use name="cppunit"/>
+  <use name="DataFormats/Histograms"/>
 </bin>
diff --git a/DataFormats/JetReco/BuildFile.xml b/DataFormats/JetReco/BuildFile.xml
index 5b1acd73e180c..c17b5dc73a0d5 100644
--- a/DataFormats/JetReco/BuildFile.xml
+++ b/DataFormats/JetReco/BuildFile.xml
@@ -1,14 +1,13 @@
-<use   name="DataFormats/CaloTowers"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/HepMCCandidate"/>
-<use   name="DataFormats/ParticleFlowReco"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="FWCore/Utilities"/>
-
+<use name="DataFormats/CaloTowers"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/HepMCCandidate"/>
+<use name="DataFormats/ParticleFlowReco"/>
+<use name="DataFormats/TrackReco"/>
+<use name="FWCore/Utilities"/>
 <flags LCG_DICT_HEADER="classes_1.h classes_2.h classes_3.h classes_4.h"/>
 <flags LCG_DICT_XML="classes_def_1.xml classes_def_2.xml classes_def_3.xml classes_def_4.xml"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/L1CSCTrackFinder/BuildFile.xml b/DataFormats/L1CSCTrackFinder/BuildFile.xml
index 728c52bf4f5db..b5dad09e033eb 100644
--- a/DataFormats/L1CSCTrackFinder/BuildFile.xml
+++ b/DataFormats/L1CSCTrackFinder/BuildFile.xml
@@ -1,9 +1,8 @@
-<use   name="DataFormats/CSCDigi"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/MuonDetId"/>
-
+<use name="DataFormats/CSCDigi"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/MuonDetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/L1CaloTrigger/BuildFile.xml b/DataFormats/L1CaloTrigger/BuildFile.xml
index 8338e8b9c0da0..0d835c3981862 100644
--- a/DataFormats/L1CaloTrigger/BuildFile.xml
+++ b/DataFormats/L1CaloTrigger/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/L1CaloTrigger/test/BuildFile.xml b/DataFormats/L1CaloTrigger/test/BuildFile.xml
index 4482597729050..f43eec2035d22 100644
--- a/DataFormats/L1CaloTrigger/test/BuildFile.xml
+++ b/DataFormats/L1CaloTrigger/test/BuildFile.xml
@@ -1,5 +1,6 @@
-<use   name="DataFormats/L1CaloTrigger"/>
-<bin   name="printRegionMap" file="printRegionMap.cpp">
+<use name="DataFormats/L1CaloTrigger"/>
+<bin name="printRegionMap" file="printRegionMap.cpp">
 </bin>
-<bin   name="testL1CaloRegionDetId" file="testL1CaloRegionDetId.cpp">
+
+<bin name="testL1CaloRegionDetId" file="testL1CaloRegionDetId.cpp">
 </bin>
diff --git a/DataFormats/L1DTTrackFinder/BuildFile.xml b/DataFormats/L1DTTrackFinder/BuildFile.xml
index cc4ecccc595cb..a4b5fbf1485f5 100644
--- a/DataFormats/L1DTTrackFinder/BuildFile.xml
+++ b/DataFormats/L1DTTrackFinder/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/L1GlobalCaloTrigger/BuildFile.xml b/DataFormats/L1GlobalCaloTrigger/BuildFile.xml
index 57848d8679e9b..fee4e5a277b70 100644
--- a/DataFormats/L1GlobalCaloTrigger/BuildFile.xml
+++ b/DataFormats/L1GlobalCaloTrigger/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="boost"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/L1GlobalCaloTrigger/test/BuildFile.xml b/DataFormats/L1GlobalCaloTrigger/test/BuildFile.xml
index 29e13d12e1858..53f976451cbf4 100644
--- a/DataFormats/L1GlobalCaloTrigger/test/BuildFile.xml
+++ b/DataFormats/L1GlobalCaloTrigger/test/BuildFile.xml
@@ -1,10 +1,13 @@
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<bin   name="testL1GlobalCaloRegionDetId" file="testL1GlobalCaloRegionDetId.cpp">
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<bin name="testL1GlobalCaloRegionDetId" file="testL1GlobalCaloRegionDetId.cpp">
 </bin>
-<bin   name="testGctDataFormats" file="testGctDataFormats.cpp">
+
+<bin name="testGctDataFormats" file="testGctDataFormats.cpp">
 </bin>
-<bin   name="testL1GctHtMiss" file="testL1GctHtMiss.cpp">
+
+<bin name="testL1GctHtMiss" file="testL1GctHtMiss.cpp">
 </bin>
-<bin   name="testL1GctInternHtMiss" file="testL1GctInternHtMiss.cpp">
+
+<bin name="testL1GctInternHtMiss" file="testL1GctInternHtMiss.cpp">
 </bin>
diff --git a/DataFormats/L1GlobalMuonTrigger/BuildFile.xml b/DataFormats/L1GlobalMuonTrigger/BuildFile.xml
index 373b8541f9ce2..53f0864778f0f 100644
--- a/DataFormats/L1GlobalMuonTrigger/BuildFile.xml
+++ b/DataFormats/L1GlobalMuonTrigger/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/MessageLogger"/>
-
+<use name="DataFormats/Common"/>
+<use name="FWCore/MessageLogger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/L1GlobalTrigger/BuildFile.xml b/DataFormats/L1GlobalTrigger/BuildFile.xml
index 727cd5a4db077..8835c1e8f167e 100644
--- a/DataFormats/L1GlobalTrigger/BuildFile.xml
+++ b/DataFormats/L1GlobalTrigger/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="DataFormats/StdDictionaries"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Utilities"/>
-<use   name="boost"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Provenance"/>
+<use name="DataFormats/StdDictionaries"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/L1GlobalTrigger/test/BuildFile.xml b/DataFormats/L1GlobalTrigger/test/BuildFile.xml
index c25e4430bda02..ead251bfb2580 100644
--- a/DataFormats/L1GlobalTrigger/test/BuildFile.xml
+++ b/DataFormats/L1GlobalTrigger/test/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Provenance"/>
-
-<bin   file="L1GlobalTriggerObjectMaps_t.cc">
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Provenance"/>
+<bin file="L1GlobalTriggerObjectMaps_t.cc">
 </bin>
diff --git a/DataFormats/L1TCalorimeter/BuildFile.xml b/DataFormats/L1TCalorimeter/BuildFile.xml
index 62bb44c3f8871..18fcc075ce1ea 100644
--- a/DataFormats/L1TCalorimeter/BuildFile.xml
+++ b/DataFormats/L1TCalorimeter/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/L1Trigger"/>
-
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1Trigger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/L1TCalorimeterPhase2/BuildFile.xml b/DataFormats/L1TCalorimeterPhase2/BuildFile.xml
index 23d4dd3b113d6..26cdc521839af 100644
--- a/DataFormats/L1TCalorimeterPhase2/BuildFile.xml
+++ b/DataFormats/L1TCalorimeterPhase2/BuildFile.xml
@@ -1,10 +1,9 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="rootrflx"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="rootrflx"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-
diff --git a/DataFormats/L1TCorrelator/BuildFile.xml b/DataFormats/L1TCorrelator/BuildFile.xml
index 80b4b00d54d56..574895fa2b8a2 100644
--- a/DataFormats/L1TCorrelator/BuildFile.xml
+++ b/DataFormats/L1TCorrelator/BuildFile.xml
@@ -1,9 +1,8 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Phase2TrackerDigi"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/L1TrackTrigger"/>
-<use   name="rootrflx"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Phase2TrackerDigi"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/L1TrackTrigger"/>
+<use name="rootrflx"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-
diff --git a/DataFormats/L1TGlobal/BuildFile.xml b/DataFormats/L1TGlobal/BuildFile.xml
index 0dbc35285609c..18fcc075ce1ea 100644
--- a/DataFormats/L1TGlobal/BuildFile.xml
+++ b/DataFormats/L1TGlobal/BuildFile.xml
@@ -1,8 +1,6 @@
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/L1Trigger"/>
-
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1Trigger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-
diff --git a/DataFormats/L1THGCal/BuildFile.xml b/DataFormats/L1THGCal/BuildFile.xml
index 7e621a8fbe0ee..48920999e41e3 100644
--- a/DataFormats/L1THGCal/BuildFile.xml
+++ b/DataFormats/L1THGCal/BuildFile.xml
@@ -1,13 +1,12 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/ForwardDetId"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="FWCore/Utilities"/>
-<use   name="rootrflx"/>
-<use   name="boost"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/ForwardDetId"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="FWCore/Utilities"/>
+<use name="rootrflx"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/L1TMuon/BuildFile.xml b/DataFormats/L1TMuon/BuildFile.xml
index e852134332933..9e146abaa54cb 100644
--- a/DataFormats/L1TMuon/BuildFile.xml
+++ b/DataFormats/L1TMuon/BuildFile.xml
@@ -1,7 +1,6 @@
 <export>
   <lib name="1"/>
 </export>
-
 <use name="DataFormats/CSCDigi"/>
 <use name="DataFormats/L1DTTrackFinder"/>
 <use name="DataFormats/GEMDigi"/>
diff --git a/DataFormats/L1TParticleFlow/BuildFile.xml b/DataFormats/L1TParticleFlow/BuildFile.xml
index 493765ff6c9bf..4e9d33aae5bf7 100644
--- a/DataFormats/L1TParticleFlow/BuildFile.xml
+++ b/DataFormats/L1TParticleFlow/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/L1TrackTrigger"/>
-<use   name="rootrflx"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/L1TrackTrigger"/>
+<use name="rootrflx"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-
diff --git a/DataFormats/L1TrackTrigger/BuildFile.xml b/DataFormats/L1TrackTrigger/BuildFile.xml
index 6d1645c1e36e0..54723d87ca386 100644
--- a/DataFormats/L1TrackTrigger/BuildFile.xml
+++ b/DataFormats/L1TrackTrigger/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/GeometryCommonDetAlgo"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/Phase2TrackerDigi"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="DataFormats/TrackerCommon"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/Phase2TrackerDigi"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/TrackerCommon"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-
diff --git a/DataFormats/L1Trigger/BuildFile.xml b/DataFormats/L1Trigger/BuildFile.xml
index 4d791c053f4d0..0a412dcbebe4e 100644
--- a/DataFormats/L1Trigger/BuildFile.xml
+++ b/DataFormats/L1Trigger/BuildFile.xml
@@ -1,9 +1,8 @@
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/HcalDetId"/>
-
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/HcalDetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/LTCDigi/BuildFile.xml b/DataFormats/LTCDigi/BuildFile.xml
index b441f4a017fa9..7c537d9ebb995 100644
--- a/DataFormats/LTCDigi/BuildFile.xml
+++ b/DataFormats/LTCDigi/BuildFile.xml
@@ -1,5 +1,4 @@
-<use   name="DataFormats/Common"/>
-
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Luminosity/test/BuildFile.xml b/DataFormats/Luminosity/test/BuildFile.xml
index 191d400b7e374..98a7fa9168552 100644
--- a/DataFormats/Luminosity/test/BuildFile.xml
+++ b/DataFormats/Luminosity/test/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="cppunit"/>
-<use   name="DataFormats/Luminosity"/>
-<bin   name="testDataFormatsLuminosity" file="testRunner.cpp,lumiInfo_t.cpp,beamCurrentInfo_t.cpp,lumiInfoRunHeader_t.cpp">
+<use name="cppunit"/>
+<use name="DataFormats/Luminosity"/>
+<bin name="testDataFormatsLuminosity" file="testRunner.cpp,lumiInfo_t.cpp,beamCurrentInfo_t.cpp,lumiInfoRunHeader_t.cpp">
 </bin>
diff --git a/DataFormats/METReco/BuildFile.xml b/DataFormats/METReco/BuildFile.xml
index eb4720af1ba00..889e5997b270c 100644
--- a/DataFormats/METReco/BuildFile.xml
+++ b/DataFormats/METReco/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="FWCore/Utilities"/>
-<use   name="root"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="FWCore/Utilities"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Math/BuildFile.xml b/DataFormats/Math/BuildFile.xml
index 83d06125a017c..ca9295240cdec 100644
--- a/DataFormats/Math/BuildFile.xml
+++ b/DataFormats/Math/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="eigen"/>
 <use name="rootmath"/>
 <use name="DataFormats/Common"/>
-
 <export>
   <lib name="1"/>
 </export>
diff --git a/DataFormats/Math/test/BuildFile.xml b/DataFormats/Math/test/BuildFile.xml
index 5f2dd3854f6d1..7f5df3eab0ca9 100644
--- a/DataFormats/Math/test/BuildFile.xml
+++ b/DataFormats/Math/test/BuildFile.xml
@@ -3,6 +3,7 @@
   <use name="DataFormats/Common"/>
   <flags EDM_PLUGIN="1"/>
 </library>
+
 <use name="rootmath"/>
 <use name="rootgraphics"/>
 <use name="DataFormats/Math"/>
@@ -34,9 +35,9 @@
 
 <release name="!.*ICC_X.*">
   <bin file="ExtVec_t.cpp" name="DataFormatsExtVec_t">
-  </bin>
-</release>
+</bin>
 
+</release>
 <bin file="SSEVec_t.cpp" name="DataFormatsSSEVec_t">
 </bin>
 
@@ -95,35 +96,34 @@
 </bin>
 
 <iftool name="cuda-gcc-support">
+  <bin file="cudaAtan2Test.cu" name="DFM_Atan2">
+    <use name="cuda"/>
+    <use name="vdt_headers"/>
+    <use name="HeterogeneousCore/CUDAUtilities"/>
+    <flags CUDA_FLAGS="--expt-relaxed-constexpr"/>
+    <flags CXXFLAGS="-O3 -fwrapv"/>
+  </bin>
 
-<bin file="cudaAtan2Test.cu" name="DFM_Atan2">
-  <use name="cuda"/>
-  <use name="vdt_headers"/>
-  <use name="HeterogeneousCore/CUDAUtilities"/>
-  <flags CUDA_FLAGS="--expt-relaxed-constexpr"/>
-  <flags CXXFLAGS="-O3 -fwrapv"/>
-</bin>
-
-<bin file="cudaMathTest.cu" name="DFM_Math">
-  <use name="cuda"/>
-  <use name="vdt_headers"/>
-  <use name="HeterogeneousCore/CUDAUtilities"/>
-  <flags CUDA_FLAGS="--expt-relaxed-constexpr"/>
-  <flags CXXFLAGS="-O3 -fwrapv"/>
-</bin>
+  <bin file="cudaMathTest.cu" name="DFM_Math">
+    <use name="cuda"/>
+    <use name="vdt_headers"/>
+    <use name="HeterogeneousCore/CUDAUtilities"/>
+    <flags CUDA_FLAGS="--expt-relaxed-constexpr"/>
+    <flags CXXFLAGS="-O3 -fwrapv"/>
+  </bin>
 
-<bin file="cudaMathTest.cu" name="DFM_MathRepr">
-  <use name="cuda"/>
-  <use name="vdt_headers"/>
-  <use name="HeterogeneousCore/CUDAUtilities"/>
-  <flags CUDA_FLAGS="--expt-relaxed-constexpr -fmad=false -ftz=false -prec-div=true -prec-sqrt=true"/>
-  <flags CXXFLAGS="-ffp-contract=off"/>
-</bin>
+  <bin file="cudaMathTest.cu" name="DFM_MathRepr">
+    <use name="cuda"/>
+    <use name="vdt_headers"/>
+    <use name="HeterogeneousCore/CUDAUtilities"/>
+    <flags CUDA_FLAGS="--expt-relaxed-constexpr -fmad=false -ftz=false -prec-div=true -prec-sqrt=true"/>
+    <flags CXXFLAGS="-ffp-contract=off"/>
+  </bin>
 
-<bin file="CholeskyInvert_t.cu" name="CholeskyInvertOnGPU_t">
-  <use name="cuda"/>
-  <use name="HeterogeneousCore/CUDAUtilities"/>
-  <flags CUDA_FLAGS="-w"/>
-</bin>
+  <bin file="CholeskyInvert_t.cu" name="CholeskyInvertOnGPU_t">
+    <use name="cuda"/>
+    <use name="HeterogeneousCore/CUDAUtilities"/>
+    <flags CUDA_FLAGS="-w"/>
+  </bin>
 
 </iftool>
diff --git a/DataFormats/MuonDetId/BuildFile.xml b/DataFormats/MuonDetId/BuildFile.xml
index 834da04ff1c57..7b963c0dd3077 100644
--- a/DataFormats/MuonDetId/BuildFile.xml
+++ b/DataFormats/MuonDetId/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/DetId"/>
-<use   name="FWCore/Utilities"/>
-
+<use name="DataFormats/DetId"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/MuonDetId/test/BuildFile.xml b/DataFormats/MuonDetId/test/BuildFile.xml
index 2e6f26b2c8c95..f1238e49bf350 100644
--- a/DataFormats/MuonDetId/test/BuildFile.xml
+++ b/DataFormats/MuonDetId/test/BuildFile.xml
@@ -1,9 +1,10 @@
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/MuonDetId"/>
-<bin   name="testMuonDetId" file="testDTDetIds.cc,testCSCDetId.cc,testRPCDetId.cc,testRPCCompDetId.cc,testCSCTriggerNumbering.cc,testME0DetId.cc,testMuonDetId.cpp">
-  <use   name="cppunit"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/MuonDetId"/>
+<bin name="testMuonDetId" file="testDTDetIds.cc,testCSCDetId.cc,testRPCDetId.cc,testRPCCompDetId.cc,testCSCTriggerNumbering.cc,testME0DetId.cc,testMuonDetId.cpp">
+  <use name="cppunit"/>
   <flags CXXFLAGS="-O2"/>
 </bin>
-<bin   name="testCSCDetId" file="testCSCDetId.cc,testMuonDetId.cpp">
-  <use   name="cppunit"/>
+
+<bin name="testCSCDetId" file="testCSCDetId.cc,testMuonDetId.cpp">
+  <use name="cppunit"/>
 </bin>
diff --git a/DataFormats/MuonReco/BuildFile.xml b/DataFormats/MuonReco/BuildFile.xml
index a1bb0c7c974e3..87fc25933f09f 100644
--- a/DataFormats/MuonReco/BuildFile.xml
+++ b/DataFormats/MuonReco/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/DTRecHit"/>
-<use   name="DataFormats/CSCRecHit"/>
-<use   name="DataFormats/GEMRecHit"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="rootmath"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/DTRecHit"/>
+<use name="DataFormats/CSCRecHit"/>
+<use name="DataFormats/GEMRecHit"/>
+<use name="DataFormats/VertexReco"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/MuonReco/test/BuildFile.xml b/DataFormats/MuonReco/test/BuildFile.xml
index 6bcf2e223a3b9..7d48e6099f3ad 100644
--- a/DataFormats/MuonReco/test/BuildFile.xml
+++ b/DataFormats/MuonReco/test/BuildFile.xml
@@ -1,3 +1,3 @@
-<bin   name="testDataFormatsMuonReco" file="testMuon.cc,testRunner.cpp">
-  <use   name="cppunit"/>
+<bin name="testDataFormatsMuonReco" file="testMuon.cc,testRunner.cpp">
+  <use name="cppunit"/>
 </bin>
diff --git a/DataFormats/MuonSeed/BuildFile.xml b/DataFormats/MuonSeed/BuildFile.xml
index 2b023a87f9e3f..ec54154936ea6 100644
--- a/DataFormats/MuonSeed/BuildFile.xml
+++ b/DataFormats/MuonSeed/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="clhepheader"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/TrackingRecHit"/>
+<use name="clhepheader"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrackingRecHit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/NanoAOD/BuildFile.xml b/DataFormats/NanoAOD/BuildFile.xml
index 0838e3ae19889..a35b3b59ceccf 100644
--- a/DataFormats/NanoAOD/BuildFile.xml
+++ b/DataFormats/NanoAOD/BuildFile.xml
@@ -1,9 +1,9 @@
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Common"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/StdDictionaries"/>
-<use   name="DataFormats/Math"/>
-<use   name="boost"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/Common"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/StdDictionaries"/>
+<use name="DataFormats/Math"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/OnlineMetaData/BuildFile.xml b/DataFormats/OnlineMetaData/BuildFile.xml
index b441f4a017fa9..7c537d9ebb995 100644
--- a/DataFormats/OnlineMetaData/BuildFile.xml
+++ b/DataFormats/OnlineMetaData/BuildFile.xml
@@ -1,5 +1,4 @@
-<use   name="DataFormats/Common"/>
-
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/OnlineMetaData/test/BuildFile.xml b/DataFormats/OnlineMetaData/test/BuildFile.xml
index 00a4a5919c7b2..cd45470346956 100644
--- a/DataFormats/OnlineMetaData/test/BuildFile.xml
+++ b/DataFormats/OnlineMetaData/test/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="cppunit"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/OnlineMetaData"/>
-<bin   name="testDataFormatsOnlineMetaData" file="testRunner.cpp,onlineMetaDataRecord_t.cpp">
+<use name="cppunit"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/OnlineMetaData"/>
+<bin name="testDataFormatsOnlineMetaData" file="testRunner.cpp,onlineMetaDataRecord_t.cpp">
 </bin>
diff --git a/DataFormats/ParticleFlowCandidate/BuildFile.xml b/DataFormats/ParticleFlowCandidate/BuildFile.xml
index e7f62dc232a9a..393c79a15dcfb 100644
--- a/DataFormats/ParticleFlowCandidate/BuildFile.xml
+++ b/DataFormats/ParticleFlowCandidate/BuildFile.xml
@@ -1,18 +1,17 @@
-<use   name="DataFormats/ParticleFlowReco"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/GsfTrackReco"/>
-<use   name="DataFormats/DTRecHit"/>
-<use   name="DataFormats/CSCRecHit"/>
-<use   name="DataFormats/MuonReco"/>
-<use   name="FWCore/Utilities"/>
-<use   name="rootcore"/>
-<use   name="rootmath"/>
-
-<use   name="clhepheader"/>
+<use name="DataFormats/ParticleFlowReco"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/GsfTrackReco"/>
+<use name="DataFormats/DTRecHit"/>
+<use name="DataFormats/CSCRecHit"/>
+<use name="DataFormats/MuonReco"/>
+<use name="FWCore/Utilities"/>
+<use name="rootcore"/>
+<use name="rootmath"/>
+<use name="clhepheader"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/ParticleFlowReco/BuildFile.xml b/DataFormats/ParticleFlowReco/BuildFile.xml
index 0b1c8ca80c061..3c9568b85f88c 100644
--- a/DataFormats/ParticleFlowReco/BuildFile.xml
+++ b/DataFormats/ParticleFlowReco/BuildFile.xml
@@ -1,20 +1,19 @@
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EgammaCandidates "/>
-<use   name="DataFormats/EgammaReco "/>
-<use   name="DataFormats/MuonReco"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/TrajectorySeed"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="rootcore"/>
-<use   name="rootmath"/>
-<use   name="vdt_headers"/>
-
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EgammaCandidates "/>
+<use name="DataFormats/EgammaReco "/>
+<use name="DataFormats/MuonReco"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrajectorySeed"/>
+<use name="DataFormats/VertexReco"/>
+<use name="DataFormats/Candidate"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="rootcore"/>
+<use name="rootmath"/>
+<use name="vdt_headers"/>
 <flags LCG_DICT_HEADER="classes_1.h classes_2.h"/>
 <flags LCG_DICT_XML="classes_def_1.xml classes_def_2.xml"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/ParticleFlowReco/test/BuildFile.xml b/DataFormats/ParticleFlowReco/test/BuildFile.xml
index d52b776d0a2aa..344601d19efb5 100644
--- a/DataFormats/ParticleFlowReco/test/BuildFile.xml
+++ b/DataFormats/ParticleFlowReco/test/BuildFile.xml
@@ -3,4 +3,5 @@
     <use name="DataFormats/ParticleFlowReco"/>
     <use name="catch2"/>
   </bin>
+
 </environment>
diff --git a/DataFormats/PatCandidates/BuildFile.xml b/DataFormats/PatCandidates/BuildFile.xml
index d39055de28bda..d0a0b633ba94a 100644
--- a/DataFormats/PatCandidates/BuildFile.xml
+++ b/DataFormats/PatCandidates/BuildFile.xml
@@ -1,27 +1,26 @@
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Common"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/StdDictionaries"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/MuonReco"/>
-<use   name="DataFormats/TauReco"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/METReco"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/HepMCCandidate"/>
-<use   name="DataFormats/BTauReco"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/HLTReco"/>
-<use   name="DataFormats/CaloTowers"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="SimDataFormats/JetMatching"/>
-<use   name="boost"/>
-
+<use name="FWCore/Utilities"/>
+<use name="FWCore/Common"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/StdDictionaries"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/MuonReco"/>
+<use name="DataFormats/TauReco"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/METReco"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/HepMCCandidate"/>
+<use name="DataFormats/BTauReco"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/HLTReco"/>
+<use name="DataFormats/CaloTowers"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="SimDataFormats/JetMatching"/>
+<use name="boost"/>
 <flags LCG_DICT_HEADER="classes_objects.h classes_trigger.h classes_user.h classes_other.h"/>
 <flags LCG_DICT_XML="classes_def_objects.xml classes_def_trigger.xml classes_def_user.xml classes_def_other.xml"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/PatCandidates/test/BuildFile.xml b/DataFormats/PatCandidates/test/BuildFile.xml
index 0888af03dfa0f..839233bd9c2e0 100644
--- a/DataFormats/PatCandidates/test/BuildFile.xml
+++ b/DataFormats/PatCandidates/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="cppunit"/>
-<use   name="DataFormats/PatCandidates"/>
+<use name="cppunit"/>
+<use name="DataFormats/PatCandidates"/>
 <bin name="testDataFormatsPatCandidates" file="testPackedCandidate.cc,testPackedGenParticle.cc,testRunner.cpp"/>
-<bin   name="testKinResolutions" file="testKinParametrizations.cc,testKinResolutions.cc,testRunner.cpp">
-  <flags   NO_TESTRUN="1"/>
+<bin name="testKinResolutions" file="testKinParametrizations.cc,testKinResolutions.cc,testRunner.cpp">
+  <flags NO_TESTRUN="1"/>
 </bin>
diff --git a/DataFormats/Phase2TrackerCluster/BuildFile.xml b/DataFormats/Phase2TrackerCluster/BuildFile.xml
index 1c6eb99fefdca..bf2f6ec080f3d 100644
--- a/DataFormats/Phase2TrackerCluster/BuildFile.xml
+++ b/DataFormats/Phase2TrackerCluster/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Phase2TrackerDigi"/>
-<use   name="rootrflx"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Phase2TrackerDigi"/>
+<use name="rootrflx"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Phase2TrackerDigi/BuildFile.xml b/DataFormats/Phase2TrackerDigi/BuildFile.xml
index b441f4a017fa9..7c537d9ebb995 100644
--- a/DataFormats/Phase2TrackerDigi/BuildFile.xml
+++ b/DataFormats/Phase2TrackerDigi/BuildFile.xml
@@ -1,5 +1,4 @@
-<use   name="DataFormats/Common"/>
-
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Provenance/BuildFile.xml b/DataFormats/Provenance/BuildFile.xml
index 57740d2811128..7a18a7df5d644 100644
--- a/DataFormats/Provenance/BuildFile.xml
+++ b/DataFormats/Provenance/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/Reflection"/>
-<use   name="boost"/>
-<use   name="rootcore"/>
-<use   name="tbb"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/Reflection"/>
+<use name="boost"/>
+<use name="rootcore"/>
+<use name="tbb"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Provenance/test/BuildFile.xml b/DataFormats/Provenance/test/BuildFile.xml
index c0b3fb70f588a..c1bcb3118b137 100644
--- a/DataFormats/Provenance/test/BuildFile.xml
+++ b/DataFormats/Provenance/test/BuildFile.xml
@@ -1,15 +1,19 @@
-<use   name="cppunit"/>
-<use   name="DataFormats/Provenance"/>
-<bin   name="testDataFormatsProvenance" file="testRunner.cpp,eventid_t.cppunit.cc,timestamp_t.cppunit.cc,parametersetid_t.cppunit.cc,indexIntoFile_t.cppunit.cc,indexIntoFile1_t.cppunit.cc,indexIntoFile2_t.cppunit.cc,indexIntoFile3_t.cppunit.cc,indexIntoFile4_t.cppunit.cc,indexIntoFile5_t.cppunit.cc,lumirange_t.cppunit.cc,eventrange_t.cppunit.cc">
+<use name="cppunit"/>
+<use name="DataFormats/Provenance"/>
+<bin name="testDataFormatsProvenance" file="testRunner.cpp,eventid_t.cppunit.cc,timestamp_t.cppunit.cc,parametersetid_t.cppunit.cc,indexIntoFile_t.cppunit.cc,indexIntoFile1_t.cppunit.cc,indexIntoFile2_t.cppunit.cc,indexIntoFile3_t.cppunit.cc,indexIntoFile4_t.cppunit.cc,indexIntoFile5_t.cppunit.cc,lumirange_t.cppunit.cc,eventrange_t.cppunit.cc">
 </bin>
-<bin   file="EntryDescription_t.cpp">
+
+<bin file="EntryDescription_t.cpp">
 </bin>
-<bin   file="ElementID_t.cpp">
+
+<bin file="ElementID_t.cpp">
   <use name="catch2"/>
 </bin>
-<bin   name="testProductResolverIndexHelper" file="testRunner.cpp productResolverIndexHelper_t.cppunit.cc">
+
+<bin name="testProductResolverIndexHelper" file="testRunner.cpp productResolverIndexHelper_t.cppunit.cc">
   <use name="DataFormats/TestObjects"/>
 </bin>
-<bin   name="productResolverIndexHelperTest" file="productResolverIndexHelperTest.cc">
+
+<bin name="productResolverIndexHelperTest" file="productResolverIndexHelperTest.cc">
   <flags NO_TESTRUN="1"/>
 </bin>
diff --git a/DataFormats/RPCDigi/BuildFile.xml b/DataFormats/RPCDigi/BuildFile.xml
index 028e138b8df48..45612b7880a0b 100644
--- a/DataFormats/RPCDigi/BuildFile.xml
+++ b/DataFormats/RPCDigi/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="CondFormats/RPCObjects"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="CondFormats/RPCObjects"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/RPCRecHit/BuildFile.xml b/DataFormats/RPCRecHit/BuildFile.xml
index 0b431e98854d6..a833074f74ae6 100644
--- a/DataFormats/RPCRecHit/BuildFile.xml
+++ b/DataFormats/RPCRecHit/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/TrackingRecHit"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/TrackingRecHit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/RecoCandidate/BuildFile.xml b/DataFormats/RecoCandidate/BuildFile.xml
index 6a43dac455993..4cffac0a32725 100644
--- a/DataFormats/RecoCandidate/BuildFile.xml
+++ b/DataFormats/RecoCandidate/BuildFile.xml
@@ -1,15 +1,14 @@
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/CaloTowers"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/GsfTrackReco"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="clhep"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="SimDataFormats/TrackingAnalysis"/>
-
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/CaloTowers"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/GsfTrackReco"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="clhep"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Scalers/BuildFile.xml b/DataFormats/Scalers/BuildFile.xml
index b441f4a017fa9..7c537d9ebb995 100644
--- a/DataFormats/Scalers/BuildFile.xml
+++ b/DataFormats/Scalers/BuildFile.xml
@@ -1,5 +1,4 @@
-<use   name="DataFormats/Common"/>
-
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Scalers/test/BuildFile.xml b/DataFormats/Scalers/test/BuildFile.xml
index 754d6761a996a..e9596afe59b0d 100644
--- a/DataFormats/Scalers/test/BuildFile.xml
+++ b/DataFormats/Scalers/test/BuildFile.xml
@@ -1,3 +1,3 @@
-<bin   file="ScalersTest.cpp">
-  <use   name="DataFormats/Scalers"/>
+<bin file="ScalersTest.cpp">
+  <use name="DataFormats/Scalers"/>
 </bin>
diff --git a/DataFormats/Scouting/BuildFile.xml b/DataFormats/Scouting/BuildFile.xml
index 418a9be60b9e1..06d710ca67c99 100644
--- a/DataFormats/Scouting/BuildFile.xml
+++ b/DataFormats/Scouting/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Common"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/SiPixelCluster/BuildFile.xml b/DataFormats/SiPixelCluster/BuildFile.xml
index b441f4a017fa9..7c537d9ebb995 100644
--- a/DataFormats/SiPixelCluster/BuildFile.xml
+++ b/DataFormats/SiPixelCluster/BuildFile.xml
@@ -1,5 +1,4 @@
-<use   name="DataFormats/Common"/>
-
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/SiPixelCluster/test/BuildFile.xml b/DataFormats/SiPixelCluster/test/BuildFile.xml
index 68bad9348faba..9fba40d013614 100644
--- a/DataFormats/SiPixelCluster/test/BuildFile.xml
+++ b/DataFormats/SiPixelCluster/test/BuildFile.xml
@@ -1,2 +1,2 @@
-<use name="DataFormats/SiPixelCluster" />
-<bin file="SiPixelCluster_t.cpp" />
\ No newline at end of file
+<use name="DataFormats/SiPixelCluster"/>
+<bin file="SiPixelCluster_t.cpp"/>
diff --git a/DataFormats/SiPixelDetId/BuildFile.xml b/DataFormats/SiPixelDetId/BuildFile.xml
index 1971f79b51625..2582aa71146d8 100644
--- a/DataFormats/SiPixelDetId/BuildFile.xml
+++ b/DataFormats/SiPixelDetId/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/DetId"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/MessageLogger"/>
-
+<use name="DataFormats/DetId"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/MessageLogger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/SiPixelDigi/BuildFile.xml b/DataFormats/SiPixelDigi/BuildFile.xml
index 2e6becbe116a8..e0d6ef180aa41 100644
--- a/DataFormats/SiPixelDigi/BuildFile.xml
+++ b/DataFormats/SiPixelDigi/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/SiPixelDetId"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/SiPixelDetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/SiPixelRawData/BuildFile.xml b/DataFormats/SiPixelRawData/BuildFile.xml
index b441f4a017fa9..7c537d9ebb995 100644
--- a/DataFormats/SiPixelRawData/BuildFile.xml
+++ b/DataFormats/SiPixelRawData/BuildFile.xml
@@ -1,5 +1,4 @@
-<use   name="DataFormats/Common"/>
-
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/SiStripCluster/BuildFile.xml b/DataFormats/SiStripCluster/BuildFile.xml
index d8d46bd864a96..64d3e18e16284 100644
--- a/DataFormats/SiStripCluster/BuildFile.xml
+++ b/DataFormats/SiStripCluster/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrajectoryState"/>
-<use   name="DataFormats/SiStripDigi"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrajectoryState"/>
+<use name="DataFormats/SiStripDigi"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/SiStripCommon/BuildFile.xml b/DataFormats/SiStripCommon/BuildFile.xml
index 0619d75d1522f..b8bc952eb8685 100644
--- a/DataFormats/SiStripCommon/BuildFile.xml
+++ b/DataFormats/SiStripCommon/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/MessageLogger"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/SiStripDetId"/>
+<use name="FWCore/MessageLogger"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/SiStripDetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/SiStripCommon/test/BuildFile.xml b/DataFormats/SiStripCommon/test/BuildFile.xml
index ed515cef53a30..53a5e791865e1 100644
--- a/DataFormats/SiStripCommon/test/BuildFile.xml
+++ b/DataFormats/SiStripCommon/test/BuildFile.xml
@@ -1,7 +1,7 @@
-<library   file="plugins/*.cc" name="testDataFormatsSiStripCommonPlugins">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="DataFormats/SiStripCommon"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="plugins/*.cc" name="testDataFormatsSiStripCommonPlugins">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="DataFormats/SiStripCommon"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DataFormats/SiStripDetId/BuildFile.xml b/DataFormats/SiStripDetId/BuildFile.xml
index 3768893e403eb..e947b460d31f6 100644
--- a/DataFormats/SiStripDetId/BuildFile.xml
+++ b/DataFormats/SiStripDetId/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/TrackerCommon"/>
-
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/TrackerCommon"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/SiStripDigi/BuildFile.xml b/DataFormats/SiStripDigi/BuildFile.xml
index b441f4a017fa9..7c537d9ebb995 100644
--- a/DataFormats/SiStripDigi/BuildFile.xml
+++ b/DataFormats/SiStripDigi/BuildFile.xml
@@ -1,5 +1,4 @@
-<use   name="DataFormats/Common"/>
-
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/StdDictionaries/BuildFile.xml b/DataFormats/StdDictionaries/BuildFile.xml
index 064be47671c5b..6f3188b06a8e2 100644
--- a/DataFormats/StdDictionaries/BuildFile.xml
+++ b/DataFormats/StdDictionaries/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="rootcore"/>
+<use name="rootcore"/>
 <flags LCG_DICT_HEADER="classes_map.h classes_others.h classes_pair.h classes_vector.h"/>
 <flags LCG_DICT_XML="classes_def_map.xml classes_def_others.xml classes_def_pair.xml classes_def_vector.xml"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/Streamer/BuildFile.xml b/DataFormats/Streamer/BuildFile.xml
index 247b0ceb3646e..3efbda365a801 100644
--- a/DataFormats/Streamer/BuildFile.xml
+++ b/DataFormats/Streamer/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="DataFormats/Provenance"/>
-<use   name="DataFormats/StdDictionaries"/>
+<use name="DataFormats/Provenance"/>
+<use name="DataFormats/StdDictionaries"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TCDS/BuildFile.xml b/DataFormats/TCDS/BuildFile.xml
index 2837aeb58788a..b3abdbf704c72 100644
--- a/DataFormats/TCDS/BuildFile.xml
+++ b/DataFormats/TCDS/BuildFile.xml
@@ -1,6 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/FEDRawData"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/FEDRawData"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TCDS/test/BuildFile.xml b/DataFormats/TCDS/test/BuildFile.xml
index 4e217b530c155..10e2cde55c985 100644
--- a/DataFormats/TCDS/test/BuildFile.xml
+++ b/DataFormats/TCDS/test/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="cppunit"/>
-<use   name="DataFormats/TCDS"/>
-<bin   name="testDataFormatsTCDS" file="testRunner.cpp,tcdsRecord_t.cpp">
+<use name="cppunit"/>
+<use name="DataFormats/TCDS"/>
+<bin name="testDataFormatsTCDS" file="testRunner.cpp,tcdsRecord_t.cpp">
 </bin>
diff --git a/DataFormats/TauReco/BuildFile.xml b/DataFormats/TauReco/BuildFile.xml
index c79e279d9270d..df5fe8fe03f0c 100644
--- a/DataFormats/TauReco/BuildFile.xml
+++ b/DataFormats/TauReco/BuildFile.xml
@@ -1,13 +1,12 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
 <flags LCG_DICT_HEADER="classes_hlt.h classes_1.h classes_2.h classes_3.h"/>
 <flags LCG_DICT_XML="classes_def_hlt.xml classes_def_1.xml classes_def_2.xml classes_def_3.xml"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TestObjects/BuildFile.xml b/DataFormats/TestObjects/BuildFile.xml
index f02f9d875ef60..78feda1bd1db7 100644
--- a/DataFormats/TestObjects/BuildFile.xml
+++ b/DataFormats/TestObjects/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Provenance"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Provenance"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TestObjects/test/BuildFile.xml b/DataFormats/TestObjects/test/BuildFile.xml
index 5d39b39013122..78c061c1cf356 100644
--- a/DataFormats/TestObjects/test/BuildFile.xml
+++ b/DataFormats/TestObjects/test/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="cppunit"/>
-<use   name="DataFormats/TestObjects"/>
-<bin   file="Enum_t.cpp">
-  <use   name="FWCore/Reflection"/>
-  <use   name="DataFormats/StdDictionaries"/>
-  <use   name="DataFormats/WrappedStdDictionaries"/>
+<use name="cppunit"/>
+<use name="DataFormats/TestObjects"/>
+<bin file="Enum_t.cpp">
+  <use name="FWCore/Reflection"/>
+  <use name="DataFormats/StdDictionaries"/>
+  <use name="DataFormats/WrappedStdDictionaries"/>
 </bin>
diff --git a/DataFormats/TrackCandidate/BuildFile.xml b/DataFormats/TrackCandidate/BuildFile.xml
index 02e2287a58b2b..eb75fa27154fa 100644
--- a/DataFormats/TrackCandidate/BuildFile.xml
+++ b/DataFormats/TrackCandidate/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/TrajectorySeed"/>
-<use   name="clhepheader"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/TrajectorySeed"/>
+<use name="clhepheader"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TrackReco/BuildFile.xml b/DataFormats/TrackReco/BuildFile.xml
index ac7d6cc67f95a..475cab8b53f07 100644
--- a/DataFormats/TrackReco/BuildFile.xml
+++ b/DataFormats/TrackReco/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrajectoryState"/>
-<use   name="DataFormats/TrackCandidate"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/BeamSpot"/>
-<use   name="DataFormats/SiPixelDetId"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="DataFormats/SiPixelCluster"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/TrackerCommon"/>
-<use   name="FWCore/Utilities"/>
-<use   name="clhepheader"/>
-<use   name="rootmath"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrajectoryState"/>
+<use name="DataFormats/TrackCandidate"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/SiPixelDetId"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/SiPixelCluster"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/TrackerCommon"/>
+<use name="FWCore/Utilities"/>
+<use name="clhepheader"/>
+<use name="rootmath"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TrackReco/test/BuildFile.xml b/DataFormats/TrackReco/test/BuildFile.xml
index 4e8c6cf15f0d6..5b6af284b0fdf 100644
--- a/DataFormats/TrackReco/test/BuildFile.xml
+++ b/DataFormats/TrackReco/test/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrackReco"/>
 <bin file="testHitPattern.cpp"/>
-<bin   name="testDataFormatsTrackReco" file="testTrack.cc,testRunner.cpp">
-  <use   name="cppunit"/>
+<bin name="testDataFormatsTrackReco" file="testTrack.cc,testRunner.cpp">
+  <use name="cppunit"/>
 </bin>
diff --git a/DataFormats/TrackerCommon/BuildFile.xml b/DataFormats/TrackerCommon/BuildFile.xml
index d07eb76d76d35..3f270f523ffab 100644
--- a/DataFormats/TrackerCommon/BuildFile.xml
+++ b/DataFormats/TrackerCommon/BuildFile.xml
@@ -7,5 +7,5 @@
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
 <export>
- <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TrackerRecHit2D/BuildFile.xml b/DataFormats/TrackerRecHit2D/BuildFile.xml
index 2eb96cc2cfa79..17ee9fb29a2e0 100644
--- a/DataFormats/TrackerRecHit2D/BuildFile.xml
+++ b/DataFormats/TrackerRecHit2D/BuildFile.xml
@@ -1,13 +1,12 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="DataFormats/FTLRecHit"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/TrajectorySeed"/>
-<use   name="DataFormats/Phase2TrackerCluster"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Framework"/>
-<use   name="Geometry/CommonDetUnit"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/FTLRecHit"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/TrajectorySeed"/>
+<use name="DataFormats/Phase2TrackerCluster"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Framework"/>
+<use name="Geometry/CommonDetUnit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TrackerRecHit2D/test/BuildFile.xml b/DataFormats/TrackerRecHit2D/test/BuildFile.xml
index 77db40bd32193..eadc7cb50b207 100644
--- a/DataFormats/TrackerRecHit2D/test/BuildFile.xml
+++ b/DataFormats/TrackerRecHit2D/test/BuildFile.xml
@@ -1,3 +1,3 @@
-<use   name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/TrackerRecHit2D"/>
 <bin file="mayown_t.cpp"/>
 <bin file="testOmniClusterRef.cpp"/>
diff --git a/DataFormats/TrackingRecHit/BuildFile.xml b/DataFormats/TrackingRecHit/BuildFile.xml
index 42f515278c9ae..c22f87d6e1db9 100644
--- a/DataFormats/TrackingRecHit/BuildFile.xml
+++ b/DataFormats/TrackingRecHit/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="DataFormats/GeometryCommonDetAlgo"/>
-<use   name="FWCore/Utilities"/>
-<use   name="clhep"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="FWCore/Utilities"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TrajectorySeed/BuildFile.xml b/DataFormats/TrajectorySeed/BuildFile.xml
index d618a468e258a..df56062ada9bf 100644
--- a/DataFormats/TrajectorySeed/BuildFile.xml
+++ b/DataFormats/TrajectorySeed/BuildFile.xml
@@ -1,13 +1,12 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="DataFormats/TrajectoryState"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="DataFormats/SiPixelDetId"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Geometry/CommonDetUnit"/>
-
-<use   name="clhepheader"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/TrajectoryState"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/SiPixelDetId"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="clhepheader"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TrajectorySeed/test/BuildFile.xml b/DataFormats/TrajectorySeed/test/BuildFile.xml
index 4ae1636bb451b..1d53360f031e7 100644
--- a/DataFormats/TrajectorySeed/test/BuildFile.xml
+++ b/DataFormats/TrajectorySeed/test/BuildFile.xml
@@ -1,4 +1,4 @@
-<bin   file="TrajectorySeed_t.cpp">
-  <use   name="DataFormats/TrajectorySeed"/>
-  <use   name="DataFormats/TrackerRecHit2D"/>
+<bin file="TrajectorySeed_t.cpp">
+  <use name="DataFormats/TrajectorySeed"/>
+  <use name="DataFormats/TrackerRecHit2D"/>
 </bin>
diff --git a/DataFormats/TrajectoryState/BuildFile.xml b/DataFormats/TrajectoryState/BuildFile.xml
index 1f4e6ba913e3b..ea3598810ab81 100644
--- a/DataFormats/TrajectoryState/BuildFile.xml
+++ b/DataFormats/TrajectoryState/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="DataFormats/GeometryVector"/>
-<use   name="rootcore"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="rootcore"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/TrajectoryState/test/BuildFile.xml b/DataFormats/TrajectoryState/test/BuildFile.xml
index e415806df8182..c7d36ff24f7f2 100644
--- a/DataFormats/TrajectoryState/test/BuildFile.xml
+++ b/DataFormats/TrajectoryState/test/BuildFile.xml
@@ -1,4 +1,3 @@
 <use name="DataFormats/TrajectoryState"/>
-<bin   file="PTraj_t.cpp">
+<bin file="PTraj_t.cpp">
 </bin>
-
diff --git a/DataFormats/V0Candidate/BuildFile.xml b/DataFormats/V0Candidate/BuildFile.xml
index faa3f640ba107..370091d116d8a 100644
--- a/DataFormats/V0Candidate/BuildFile.xml
+++ b/DataFormats/V0Candidate/BuildFile.xml
@@ -1,10 +1,9 @@
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="FWCore/Utilities"/>
-
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/VertexReco"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/VertexReco/BuildFile.xml b/DataFormats/VertexReco/BuildFile.xml
index e23687e4e863d..de5e9bc64b53d 100644
--- a/DataFormats/VertexReco/BuildFile.xml
+++ b/DataFormats/VertexReco/BuildFile.xml
@@ -1,7 +1,6 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="FWCore/Utilities"/>
-
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrackReco"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DataFormats/VertexReco/test/BuildFile.xml b/DataFormats/VertexReco/test/BuildFile.xml
index 99c67e52dc2ee..f44208b56bcb3 100644
--- a/DataFormats/VertexReco/test/BuildFile.xml
+++ b/DataFormats/VertexReco/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="clhep"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="root"/>
-<bin   name="testDataFormatsVertexReco" file="testVertex.cc,testRunner.cpp">
-  <use   name="cppunit"/>
+<use name="clhep"/>
+<use name="DataFormats/VertexReco"/>
+<use name="root"/>
+<bin name="testDataFormatsVertexReco" file="testVertex.cc,testRunner.cpp">
+  <use name="cppunit"/>
 </bin>
diff --git a/DataFormats/WrappedStdDictionaries/BuildFile.xml b/DataFormats/WrappedStdDictionaries/BuildFile.xml
index 3c50331ab8410..7c537d9ebb995 100644
--- a/DataFormats/WrappedStdDictionaries/BuildFile.xml
+++ b/DataFormats/WrappedStdDictionaries/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="DataFormats/Common"/>
+<use name="DataFormats/Common"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>