diff --git a/RecoLocalCalo/CaloTowersCreator/BuildFile.xml b/RecoLocalCalo/CaloTowersCreator/BuildFile.xml
index 87ec4acad8e0e..0db8dc2033247 100644
--- a/RecoLocalCalo/CaloTowersCreator/BuildFile.xml
+++ b/RecoLocalCalo/CaloTowersCreator/BuildFile.xml
@@ -1,15 +1,15 @@
-<use   name="boost"/>
-<use   name="DataFormats/CaloTowers"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/HcalObjects"/>
-<use   name="RecoLocalCalo/HcalRecAlgos"/>
-<use   name="RecoLocalCalo/EcalRecAlgos"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="boost"/>
+<use name="DataFormats/CaloTowers"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="Geometry/CaloTopology"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/HcalObjects"/>
+<use name="RecoLocalCalo/HcalRecAlgos"/>
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/RecoLocalCalo/Castor/BuildFile.xml b/RecoLocalCalo/Castor/BuildFile.xml
index 1233edfc533b3..b97e3e615409c 100644
--- a/RecoLocalCalo/Castor/BuildFile.xml
+++ b/RecoLocalCalo/Castor/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/CastorReco"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="CondFormats/CastorObjects"/>
-<use   name="CalibFormats/CastorObjects"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/CastorReco"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/JetReco"/>
+<use name="CondFormats/CastorObjects"/>
+<use name="CalibFormats/CastorObjects"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/RecoLocalCalo/CastorReco/BuildFile.xml b/RecoLocalCalo/CastorReco/BuildFile.xml
index be7daed0c5e62..3070d62627a9f 100644
--- a/RecoLocalCalo/CastorReco/BuildFile.xml
+++ b/RecoLocalCalo/CastorReco/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="CalibCalorimetry/CastorCalib"/>
-<use   name="CalibFormats/CastorObjects"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="FWCore/MessageLogger"/>
+<use name="CalibCalorimetry/CastorCalib"/>
+<use name="CalibFormats/CastorObjects"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="FWCore/MessageLogger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalCalo/CastorReco/plugins/BuildFile.xml b/RecoLocalCalo/CastorReco/plugins/BuildFile.xml
index cd5ecee9cd0d6..10f7e01aceabf 100644
--- a/RecoLocalCalo/CastorReco/plugins/BuildFile.xml
+++ b/RecoLocalCalo/CastorReco/plugins/BuildFile.xml
@@ -1,12 +1,12 @@
-<library   file="*.cc" name="RecoLocalCaloCastorRecoPlugins">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="CalibFormats/CastorObjects"/>
-  <use   name="RecoLocalCalo/CastorReco"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/Math"/>
-  <use   name="DataFormats/RecoCandidate"/>
-  <use   name="Geometry/Records"/>
-  <use   name="Geometry/CaloGeometry"/>
-  <use   name="boost"/>
+<library file="*.cc" name="RecoLocalCaloCastorRecoPlugins">
+  <flags EDM_PLUGIN="1"/>
+  <use name="CalibFormats/CastorObjects"/>
+  <use name="RecoLocalCalo/CastorReco"/>
+  <use name="FWCore/Framework"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/Math"/>
+  <use name="DataFormats/RecoCandidate"/>
+  <use name="Geometry/Records"/>
+  <use name="Geometry/CaloGeometry"/>
+  <use name="boost"/>
 </library>
diff --git a/RecoLocalCalo/EcalDeadChannelRecoveryAlgos/BuildFile.xml b/RecoLocalCalo/EcalDeadChannelRecoveryAlgos/BuildFile.xml
index 63bba32a1283b..78513a67e9552 100644
--- a/RecoLocalCalo/EcalDeadChannelRecoveryAlgos/BuildFile.xml
+++ b/RecoLocalCalo/EcalDeadChannelRecoveryAlgos/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="DataFormats/EcalDetId"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="CommonTools/MVAUtils"/>
-<use   name="root"/>
-<use   name="rootmath"/>
-<use   name="rootcore"/>
-<use   name="rootmlp"/>
-
+<use name="DataFormats/EcalDetId"/>
+<use name="Geometry/CaloTopology"/>
+<use name="CommonTools/MVAUtils"/>
+<use name="root"/>
+<use name="rootmath"/>
+<use name="rootcore"/>
+<use name="rootmlp"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalCalo/EcalRecAlgos/BuildFile.xml b/RecoLocalCalo/EcalRecAlgos/BuildFile.xml
index 7d8f8d425738e..2eaf053c342dd 100644
--- a/RecoLocalCalo/EcalRecAlgos/BuildFile.xml
+++ b/RecoLocalCalo/EcalRecAlgos/BuildFile.xml
@@ -1,17 +1,16 @@
-<use   name="clhep"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Framework"/>
-<use   name="CondFormats/ESObjects"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="vdt_headers"/>
-<use   name="root"/>
-<use   name="rootminuit"/>
-<use   name="eigen"/>
-
+<use name="clhep"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Framework"/>
+<use name="CondFormats/ESObjects"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="vdt_headers"/>
+<use name="root"/>
+<use name="rootminuit"/>
+<use name="eigen"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalCalo/EcalRecAlgos/plugins/BuildFile.xml b/RecoLocalCalo/EcalRecAlgos/plugins/BuildFile.xml
index 1730308fa44a8..a9a575bde3cd6 100644
--- a/RecoLocalCalo/EcalRecAlgos/plugins/BuildFile.xml
+++ b/RecoLocalCalo/EcalRecAlgos/plugins/BuildFile.xml
@@ -1,9 +1,6 @@
- <use   name="RecoLocalCalo/EcalRecAlgos"/>
- <use   name="FWCore/ParameterSet"/>
- <use   name="FWCore/Framework"/> 
-
-<library   name="RecoLocalCalo_EcalRecAlgos_plugins" file="*.cc">
-  
-   <flags   EDM_PLUGIN="1"/>
-
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Framework"/>
+<library name="RecoLocalCalo_EcalRecAlgos_plugins" file="*.cc">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalCalo/EcalRecAlgos/test/BuildFile.xml b/RecoLocalCalo/EcalRecAlgos/test/BuildFile.xml
index b8ea3b1defa64..929ce93c874c9 100644
--- a/RecoLocalCalo/EcalRecAlgos/test/BuildFile.xml
+++ b/RecoLocalCalo/EcalRecAlgos/test/BuildFile.xml
@@ -1,22 +1,16 @@
-<bin   name="testEcalSeverity" file="testRunner.cpp,testEcalSeverityLevelAlgo.cppunit.cc">
- 
-  <use   name="DataFormats/EcalRecHit"/>
-  <use   name="cppunit"/>
-  <use   name="RecoLocalCalo/EcalRecAlgos"/>
-
+<bin name="testEcalSeverity" file="testRunner.cpp,testEcalSeverityLevelAlgo.cppunit.cc">
+  <use name="DataFormats/EcalRecHit"/>
+  <use name="cppunit"/>
+  <use name="RecoLocalCalo/EcalRecAlgos"/>
 </bin>
 
-
-<library   file="stubs/testEcalSeverityLevelAlgo.cc" name="testEcalSeverityLevelAlgo">
-
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="FWCore/Framework"/>
-
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="DataFormats/DetId"/>
-  <use   name="DataFormats/EcalDetId"/>
-  <use   name="DataFormats/EcalRecHit"/>
-  <use   name="RecoLocalCalo/EcalRecAlgos"/>
-  <use   name="CommonTools/UtilAlgos"/>
-
+<library file="stubs/testEcalSeverityLevelAlgo.cc" name="testEcalSeverityLevelAlgo">
+  <flags EDM_PLUGIN="1"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="DataFormats/DetId"/>
+  <use name="DataFormats/EcalDetId"/>
+  <use name="DataFormats/EcalRecHit"/>
+  <use name="RecoLocalCalo/EcalRecAlgos"/>
+  <use name="CommonTools/UtilAlgos"/>
 </library>
diff --git a/RecoLocalCalo/EcalRecProducers/BuildFile.xml b/RecoLocalCalo/EcalRecProducers/BuildFile.xml
index 938c23fa82ffa..25939a2a69b8e 100644
--- a/RecoLocalCalo/EcalRecProducers/BuildFile.xml
+++ b/RecoLocalCalo/EcalRecProducers/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="FWCore/Framework"/>
-<use   name="clhep"/>
+<use name="FWCore/Framework"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml b/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml
index 9ca8edb5b8e14..5284bfaa4f3d5 100644
--- a/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml
+++ b/RecoLocalCalo/EcalRecProducers/plugins/BuildFile.xml
@@ -1,17 +1,17 @@
-<use   name="CalibCalorimetry/EcalTPGTools"/>
-<use   name="RecoLocalCalo/EcalDeadChannelRecoveryAlgos"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="RecoLocalCalo/EcalRecProducers"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CalibCalorimetry/EcalLaserCorrection"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/ESObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="RecoLocalCalo/EcalRecAlgos"/>
-<use   name="FWCore/MessageLogger"/>
-<library   file="*.cc" name="RecoLocalCaloEcalRecProducersPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CalibCalorimetry/EcalTPGTools"/>
+<use name="RecoLocalCalo/EcalDeadChannelRecoveryAlgos"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="RecoLocalCalo/EcalRecProducers"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CalibCalorimetry/EcalLaserCorrection"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/ESObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<use name="FWCore/MessageLogger"/>
+<library file="*.cc" name="RecoLocalCaloEcalRecProducersPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalCalo/EcalRecProducers/test/BuildFile.xml b/RecoLocalCalo/EcalRecProducers/test/BuildFile.xml
index b66d7393d036c..892b02e5fb8fe 100644
--- a/RecoLocalCalo/EcalRecProducers/test/BuildFile.xml
+++ b/RecoLocalCalo/EcalRecProducers/test/BuildFile.xml
@@ -1,30 +1,29 @@
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="SimDataFormats/CaloHit"/>
-<use   name="SimDataFormats/CrossingFrame"/>
-<use   name="FWCore/Framework"/>
-<use   name="DQMServices/Core"/>
-<use   name="root"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/DataRecord"/>
-
-<library   file="EcalLocalRecoTask.cc" name="testEcalLocalReco">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="SimDataFormats/CaloHit"/>
+<use name="SimDataFormats/CrossingFrame"/>
+<use name="FWCore/Framework"/>
+<use name="DQMServices/Core"/>
+<use name="root"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/DataRecord"/>
+<library file="EcalLocalRecoTask.cc" name="testEcalLocalReco">
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-<library   file="stubs/EcalBasicUncalibRecHitFilter.cc" name="EcalBasicUncalibRecHitFilter">
-  <flags   EDM_PLUGIN="1"/>
+<library file="stubs/EcalBasicUncalibRecHitFilter.cc" name="EcalBasicUncalibRecHitFilter">
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-<library   file="EcalCompactTrigPrimProducerTest.cc" name="testEcalCompactTrigPrimProducer">
-  <flags   EDM_PLUGIN="1"/>
+<library file="EcalCompactTrigPrimProducerTest.cc" name="testEcalCompactTrigPrimProducer">
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-<library   file="stubs/EcalSampleMaskRecordESProducer.cc" name="testEcalSampleMaskRecordESProducer">
-  <flags   EDM_PLUGIN="1"/>
+<library file="stubs/EcalSampleMaskRecordESProducer.cc" name="testEcalSampleMaskRecordESProducer">
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-<library   file="plugins/*.cc" name="testEcalRecHitProducersPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<library file="plugins/*.cc" name="testEcalRecHitProducersPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalCalo/HGCalRecAlgos/BuildFile.xml b/RecoLocalCalo/HGCalRecAlgos/BuildFile.xml
index ac0e378e262c6..2bcf3e74e0f17 100644
--- a/RecoLocalCalo/HGCalRecAlgos/BuildFile.xml
+++ b/RecoLocalCalo/HGCalRecAlgos/BuildFile.xml
@@ -1,14 +1,14 @@
-<use   name="clhep"/>
-<use   name="DataFormats/HGCRecHit"/>
-<use   name="root"/>
-<use   name="rootminuit"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Framework"/>
+<use name="clhep"/>
+<use name="DataFormats/HGCRecHit"/>
+<use name="root"/>
+<use name="rootminuit"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Framework"/>
 <use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/HcalTowerAlgo"/>
 <use name="Geometry/Records"/>
 <use name="DataFormats/ParticleFlowReco"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalCalo/HGCalRecProducers/BuildFile.xml b/RecoLocalCalo/HGCalRecProducers/BuildFile.xml
index 667d978a6d458..291cf1fc01881 100644
--- a/RecoLocalCalo/HGCalRecProducers/BuildFile.xml
+++ b/RecoLocalCalo/HGCalRecProducers/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="Geometry/HGCalGeometry"/>
-<use   name="clhep"/>
-<use   name="RecoLocalCalo/HGCalRecAlgos"/>
+<use name="FWCore/Framework"/>
+<use name="Geometry/HGCalGeometry"/>
+<use name="clhep"/>
+<use name="RecoLocalCalo/HGCalRecAlgos"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml b/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml
index d1d71a7bc04ef..318a924040fad 100644
--- a/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml
+++ b/RecoLocalCalo/HGCalRecProducers/plugins/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="Geometry/CaloGeometry"/>
-<use   name="RecoLocalCalo/HGCalRecProducers"/>
-<use   name="RecoLocalCalo/HGCalRecAlgos"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/HGCDigi"/>
-<use   name="DataFormats/HGCRecHit"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="Geometry/HGCalGeometry"/>
-<library   file="*.cc" name="RecoLocalCaloHGCalRecProducersPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="RecoLocalCalo/HGCalRecProducers"/>
+<use name="RecoLocalCalo/HGCalRecAlgos"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/HGCDigi"/>
+<use name="DataFormats/HGCRecHit"/>
+<use name="FWCore/MessageLogger"/>
+<use name="Geometry/HGCalGeometry"/>
+<library file="*.cc" name="RecoLocalCaloHGCalRecProducersPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalCalo/HcalLaserReco/BuildFile.xml b/RecoLocalCalo/HcalLaserReco/BuildFile.xml
index dda712e32c040..496286b2f96c2 100644
--- a/RecoLocalCalo/HcalLaserReco/BuildFile.xml
+++ b/RecoLocalCalo/HcalLaserReco/BuildFile.xml
@@ -1,7 +1,7 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="boost"/>
+<flags EDM_PLUGIN="1"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="boost"/>
diff --git a/RecoLocalCalo/HcalRecAlgos/BuildFile.xml b/RecoLocalCalo/HcalRecAlgos/BuildFile.xml
index 6294d952f5056..ac94d61e12494 100644
--- a/RecoLocalCalo/HcalRecAlgos/BuildFile.xml
+++ b/RecoLocalCalo/HcalRecAlgos/BuildFile.xml
@@ -1,19 +1,19 @@
-<use   name="boost"/>
-<use   name="eigen"/>
-<use   name="clhep"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="CalibFormats/HcalObjects"/>
-<use   name="CalibFormats/CaloObjects"/>
-<use   name="CalibCalorimetry/HcalAlgos"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="RecoLocalCalo/EcalRecAlgos"/>
-<use   name="vdt_headers"/>
-<use   name="rootminuit2"/> 
+<use name="boost"/>
+<use name="eigen"/>
+<use name="clhep"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="DataFormats/TrackReco"/>
+<use name="CalibFormats/HcalObjects"/>
+<use name="CalibFormats/CaloObjects"/>
+<use name="CalibCalorimetry/HcalAlgos"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="CondFormats/DataRecord"/>
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<use name="vdt_headers"/>
+<use name="rootminuit2"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalCalo/HcalRecAlgos/plugins/BuildFile.xml b/RecoLocalCalo/HcalRecAlgos/plugins/BuildFile.xml
index b8bcbe8af1095..eb63abc57cce8 100644
--- a/RecoLocalCalo/HcalRecAlgos/plugins/BuildFile.xml
+++ b/RecoLocalCalo/HcalRecAlgos/plugins/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="RecoLocalCalo/HcalRecAlgos"/>
-<library   file="*.cc" name="RecoLocalCaloHcalRecAlgosPlugin">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="RecoLocalCalo/HcalRecAlgos"/>
+<library file="*.cc" name="RecoLocalCaloHcalRecAlgosPlugin">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalCalo/HcalRecAlgos/test/BuildFile.xml b/RecoLocalCalo/HcalRecAlgos/test/BuildFile.xml
index 197798c6419b6..7344c604ebc20 100644
--- a/RecoLocalCalo/HcalRecAlgos/test/BuildFile.xml
+++ b/RecoLocalCalo/HcalRecAlgos/test/BuildFile.xml
@@ -1,18 +1,17 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="CalibCalorimetry/HcalAlgos"/>
-<use   name="RecoLocalCalo/HcalRecAlgos"/>
-
-<library   file="HcalSevLvlAnalyzer.cc" name="HcalSevLvlAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="CalibCalorimetry/HcalAlgos"/>
+<use name="RecoLocalCalo/HcalRecAlgos"/>
+<library file="HcalSevLvlAnalyzer.cc" name="HcalSevLvlAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-<library   file="HcalRecHitReflagger.cc" name="HcalRecHitReflagger">
-  <flags   EDM_PLUGIN="1"/>
+<library file="HcalRecHitReflagger.cc" name="HcalRecHitReflagger">
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-<library   file="MahiDebugger.cc" name="MahiDebugger">
-  <flags   EDM_PLUGIN="1"/>
+<library file="MahiDebugger.cc" name="MahiDebugger">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalCalo/HcalRecProducers/BuildFile.xml b/RecoLocalCalo/HcalRecProducers/BuildFile.xml
index 935359b3063c9..c3ae589a0c0a7 100644
--- a/RecoLocalCalo/HcalRecProducers/BuildFile.xml
+++ b/RecoLocalCalo/HcalRecProducers/BuildFile.xml
@@ -1,8 +1,8 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="CalibCalorimetry/HcalAlgos"/>
-<use   name="CalibFormats/HcalObjects"/>
-<use   name="RecoLocalCalo/HcalRecAlgos"/>
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/Common"/>
-<use   name="Geometry/Records"/>
-<use   name="boost"/>
+<flags EDM_PLUGIN="1"/>
+<use name="CalibCalorimetry/HcalAlgos"/>
+<use name="CalibFormats/HcalObjects"/>
+<use name="RecoLocalCalo/HcalRecAlgos"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/Common"/>
+<use name="Geometry/Records"/>
+<use name="boost"/>