diff --git a/CaloOnlineTools/EcalTools/BuildFile.xml b/CaloOnlineTools/EcalTools/BuildFile.xml
index ad58d3b6d8626..1556b623b6769 100644
--- a/CaloOnlineTools/EcalTools/BuildFile.xml
+++ b/CaloOnlineTools/EcalTools/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="root"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CaloOnlineTools/EcalTools/bin/BuildFile.xml b/CaloOnlineTools/EcalTools/bin/BuildFile.xml
index 95e68f22e75bb..18065f1dc8d65 100644
--- a/CaloOnlineTools/EcalTools/bin/BuildFile.xml
+++ b/CaloOnlineTools/EcalTools/bin/BuildFile.xml
@@ -1,4 +1,4 @@
-<bin   name="TPGTreeReader" file="TPGTreeReader.cpp">
-  <use   name="CaloOnlineTools/EcalTools"/>
-  <use   name="boost_header"/>
+<bin name="TPGTreeReader" file="TPGTreeReader.cpp">
+  <use name="CaloOnlineTools/EcalTools"/>
+  <use name="boost_header"/>
 </bin>
diff --git a/CaloOnlineTools/EcalTools/plugins/BuildFile.xml b/CaloOnlineTools/EcalTools/plugins/BuildFile.xml
index 985afa7a43f68..a5be61c6cab28 100644
--- a/CaloOnlineTools/EcalTools/plugins/BuildFile.xml
+++ b/CaloOnlineTools/EcalTools/plugins/BuildFile.xml
@@ -1,23 +1,23 @@
-<use   name="CaloOnlineTools/EcalTools"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalRawData"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="Geometry/EcalMapping"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="TrackingTools/TrackAssociator"/>
-<use   name="rootgraphics"/>
-<use   name="rootcore"/>
-<library   file="*.cc" name="CaloOnlineToolsEcalToolsPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CaloOnlineTools/EcalTools"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalRawData"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="Geometry/EcalMapping"/>
+<use name="Geometry/CaloTopology"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="TrackingTools/TrackAssociator"/>
+<use name="rootgraphics"/>
+<use name="rootcore"/>
+<library file="*.cc" name="CaloOnlineToolsEcalToolsPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CaloOnlineTools/HcalOnlineDb/BuildFile.xml b/CaloOnlineTools/HcalOnlineDb/BuildFile.xml
index 3133659418eb1..e0b0e49b2a2d3 100644
--- a/CaloOnlineTools/HcalOnlineDb/BuildFile.xml
+++ b/CaloOnlineTools/HcalOnlineDb/BuildFile.xml
@@ -1,24 +1,23 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="boost"/>
-<use   name="oracle"/>
-<use   name="DataFormats/Common"/>
-<use   name="xerces-c"/>
-<use   name="zlib"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="CalibCalorimetry/CaloTPG"/>
-<use   name="CalibCalorimetry/HcalAlgos"/>
-<use   name="CalibCalorimetry/HcalTPGAlgos"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="CondTools/Hcal"/>
-<use   name="OnlineDB/Oracle"/>
-<use   name="SimCalorimetry/HcalTrigPrimAlgos"/>
-<use   name="root"/>
-<use   name="rootgraphics"/>
-
+<use name="FWCore/Framework"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="boost"/>
+<use name="oracle"/>
+<use name="DataFormats/Common"/>
+<use name="xerces-c"/>
+<use name="zlib"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="CalibCalorimetry/CaloTPG"/>
+<use name="CalibCalorimetry/HcalAlgos"/>
+<use name="CalibCalorimetry/HcalTPGAlgos"/>
+<use name="Geometry/CaloTopology"/>
+<use name="CondTools/Hcal"/>
+<use name="OnlineDB/Oracle"/>
+<use name="SimCalorimetry/HcalTrigPrimAlgos"/>
+<use name="root"/>
+<use name="rootgraphics"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CaloOnlineTools/HcalOnlineDb/bin/BuildFile.xml b/CaloOnlineTools/HcalOnlineDb/bin/BuildFile.xml
index e0c151a0a89b0..2e713d1c68cbc 100644
--- a/CaloOnlineTools/HcalOnlineDb/bin/BuildFile.xml
+++ b/CaloOnlineTools/HcalOnlineDb/bin/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="PhysicsTools/FWLite"/>
 <use name="CaloOnlineTools/HcalOnlineDb"/>
 <environment>
-  <bin file="hcalLUT.cc"></bin>
-</environment>
+  <bin file="hcalLUT.cc">
+</bin>
 
+</environment>
diff --git a/CaloOnlineTools/HcalOnlineDb/plugins/BuildFile.xml b/CaloOnlineTools/HcalOnlineDb/plugins/BuildFile.xml
index ed5776bd89463..d668228b0ec2d 100644
--- a/CaloOnlineTools/HcalOnlineDb/plugins/BuildFile.xml
+++ b/CaloOnlineTools/HcalOnlineDb/plugins/BuildFile.xml
@@ -1,18 +1,17 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="boost"/>
-<use   name="OnlineDB/Oracle"/>
-<use   name="DataFormats/Common"/>
-
-<use   name="xerces-c"/>
-<use   name="zlib"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="CalibCalorimetry/CaloTPG"/>
-<use   name="CalibCalorimetry/HcalTPGAlgos"/>
-<use   name="CaloOnlineTools/HcalOnlineDb"/>
-<library   file="*.cc" name="CaloOnlineToolsHcalOnlineDbPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="boost"/>
+<use name="OnlineDB/Oracle"/>
+<use name="DataFormats/Common"/>
+<use name="xerces-c"/>
+<use name="zlib"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="CalibCalorimetry/CaloTPG"/>
+<use name="CalibCalorimetry/HcalTPGAlgos"/>
+<use name="CaloOnlineTools/HcalOnlineDb"/>
+<library file="*.cc" name="CaloOnlineToolsHcalOnlineDbPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>