diff --git a/OnlineDB/CSCCondDB/BuildFile.xml b/OnlineDB/CSCCondDB/BuildFile.xml
index 6639ee54c82ac..ac8f3c473c253 100644
--- a/OnlineDB/CSCCondDB/BuildFile.xml
+++ b/OnlineDB/CSCCondDB/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="CondFormats/CSCObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="clhep"/>
-<use   name="root"/>
-<use   name="OnlineDB/Oracle"/>
-<lib   name="occi"/>
-<lib   name="Minuit2"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="CondFormats/CSCObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="clhep"/>
+<use name="root"/>
+<use name="OnlineDB/Oracle"/>
+<lib name="occi"/>
+<lib name="Minuit2"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/OnlineDB/CSCCondDB/test/BuildFile.xml b/OnlineDB/CSCCondDB/test/BuildFile.xml
index 71cf6a63a0f5d..873c0fef649b0 100644
--- a/OnlineDB/CSCCondDB/test/BuildFile.xml
+++ b/OnlineDB/CSCCondDB/test/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="CondCore/PopCon"/>
-<use   name="CondFormats/CSCObjects"/>
-<use   name="OnlineDB/Oracle"/>
-<lib   name="occi"/>
-<library   name="OnlineDBCSCCondDB_TestPlugins" file="../src/CSCMap1.cc,../src/CSCCableRead.cc,stubs/*.cc">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CondCore/PopCon"/>
+<use name="CondFormats/CSCObjects"/>
+<use name="OnlineDB/Oracle"/>
+<lib name="occi"/>
+<library name="OnlineDBCSCCondDB_TestPlugins" file="../src/CSCMap1.cc,../src/CSCCableRead.cc,stubs/*.cc">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/OnlineDB/EcalCondDB/BuildFile.xml b/OnlineDB/EcalCondDB/BuildFile.xml
index ac7acb5f1092f..32c26726d1030 100644
--- a/OnlineDB/EcalCondDB/BuildFile.xml
+++ b/OnlineDB/EcalCondDB/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="OnlineDB/Oracle"/>
-<use   name="DataFormats/EcalDetId"/>
+<use name="OnlineDB/Oracle"/>
+<use name="DataFormats/EcalDetId"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/OnlineDB/EcalCondDB/bin/BuildFile.xml b/OnlineDB/EcalCondDB/bin/BuildFile.xml
index 9aed316dc8fb5..26eb5270316c3 100644
--- a/OnlineDB/EcalCondDB/bin/BuildFile.xml
+++ b/OnlineDB/EcalCondDB/bin/BuildFile.xml
@@ -1,9 +1,10 @@
-<bin   file="cmsecal_rootplot.cpp">
-  <use   name="rootgraphics"/>
-  <use   name="boost"/>
-  <use   name="boost_program_options"/>
+<bin file="cmsecal_rootplot.cpp">
+  <use name="rootgraphics"/>
+  <use name="boost"/>
+  <use name="boost_program_options"/>
 </bin>
-<bin   file="cmsecal_write_offline_det_id.cpp">
-  <use   name="DataFormats/EcalDetId"/>
-  <use   name="RelationalAccess"/>
+
+<bin file="cmsecal_write_offline_det_id.cpp">
+  <use name="DataFormats/EcalDetId"/>
+  <use name="RelationalAccess"/>
 </bin>
diff --git a/OnlineDB/EcalCondDB/test/BuildFile.xml b/OnlineDB/EcalCondDB/test/BuildFile.xml
index 3f5dd49482d77..432ea142dbace 100644
--- a/OnlineDB/EcalCondDB/test/BuildFile.xml
+++ b/OnlineDB/EcalCondDB/test/BuildFile.xml
@@ -1,25 +1,31 @@
-<use   name="OnlineDB/EcalCondDB"/>
-<use   name="CalibCalorimetry/EcalLaserAnalyzer"/>
-<use   name="root"/>
-<bin   file="LaserSeqToDB.cpp">
+<use name="OnlineDB/EcalCondDB"/>
+<use name="CalibCalorimetry/EcalLaserAnalyzer"/>
+<use name="root"/>
+<bin file="LaserSeqToDB.cpp">
   <flags NO_TESTRUN="1"/>
 </bin>
-<bin   file="TestLMF2010-temp.cpp">
+
+<bin file="TestLMF2010-temp.cpp">
   <flags NO_TESTRUN="1"/>
 </bin>
-<bin   file="GetDelays.cpp">
+
+<bin file="GetDelays.cpp">
   <flags NO_TESTRUN="1"/>
 </bin>
-<bin   file="TestLMF2010-write.cpp">
+
+<bin file="TestLMF2010-write.cpp">
   <flags NO_TESTRUN="1"/>
 </bin>
-<bin   file="TestLMF2010-read.cpp">
+
+<bin file="TestLMF2010-read.cpp">
   <flags NO_TESTRUN="1"/>
 </bin>
-<bin   file="TestLMF2010-getPrimitives.cpp">
+
+<bin file="TestLMF2010-getPrimitives.cpp">
   <flags NO_TESTRUN="1"/>
 </bin>
-<bin   file="DumpLaserDB.cpp">
+
+<bin file="DumpLaserDB.cpp">
   <flags NO_TESTRUN="1"/>
-  <use   name="boost_program_options" />
+  <use name="boost_program_options"/>
 </bin>
diff --git a/OnlineDB/Oracle/BuildFile.xml b/OnlineDB/Oracle/BuildFile.xml
index 113a5fc4f79ce..49dea7ef70209 100644
--- a/OnlineDB/Oracle/BuildFile.xml
+++ b/OnlineDB/Oracle/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="oracle"/>
-<use   name="oracleocci"/>
+<use name="oracle"/>
+<use name="oracleocci"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/OnlineDB/Oracle/test/BuildFile.xml b/OnlineDB/Oracle/test/BuildFile.xml
index 60820343f2e66..ec314fc3ad2a3 100644
--- a/OnlineDB/Oracle/test/BuildFile.xml
+++ b/OnlineDB/Oracle/test/BuildFile.xml
@@ -3,5 +3,5 @@
     <use name="oracleocci"/>
     <flags TEST_RUNNER_ARGS="12154"/>
   </bin>
-</architecture>
 
+</architecture>
diff --git a/OnlineDB/SiStripConfigDb/BuildFile.xml b/OnlineDB/SiStripConfigDb/BuildFile.xml
index 825f97834f3fa..efffd20ebd464 100644
--- a/OnlineDB/SiStripConfigDb/BuildFile.xml
+++ b/OnlineDB/SiStripConfigDb/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/SiStripCommon"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="tkonlineswdb"/>
-<use   name="boost"/>
-<use   name="boost_serialization"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/SiStripCommon"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="tkonlineswdb"/>
+<use name="boost"/>
+<use name="boost_serialization"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/OnlineDB/SiStripConfigDb/plugins/BuildFile.xml b/OnlineDB/SiStripConfigDb/plugins/BuildFile.xml
index daf9abb394daf..a78ea354920bb 100644
--- a/OnlineDB/SiStripConfigDb/plugins/BuildFile.xml
+++ b/OnlineDB/SiStripConfigDb/plugins/BuildFile.xml
@@ -1,5 +1,5 @@
-<library   file="*.cc" name="OnlineDBSiStripConfigDbPlugins">
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="OnlineDB/SiStripConfigDb"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="OnlineDBSiStripConfigDbPlugins">
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="OnlineDB/SiStripConfigDb"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/OnlineDB/SiStripConfigDb/test/BuildFile.xml b/OnlineDB/SiStripConfigDb/test/BuildFile.xml
index 8ce3b05443a3a..c44b973b7e726 100644
--- a/OnlineDB/SiStripConfigDb/test/BuildFile.xml
+++ b/OnlineDB/SiStripConfigDb/test/BuildFile.xml
@@ -1,16 +1,16 @@
-<library   file="plugins/*.cc" name="testOnlineDBSiStripConfigDbPlugins">
-  <use   name="CalibFormats/SiStripObjects"/>
-  <use   name="CondFormats/SiStripObjects"/>
-  <use   name="DataFormats/SiStripCommon"/>
-  <use   name="DataFormats/DetId"/>
-  <use   name="DataFormats/SiStripDetId"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="Geometry/CommonTopologies"/>
-  <use   name="Geometry/TrackerGeometryBuilder"/>
-  <use   name="OnlineDB/SiStripConfigDb"/>
-  <use   name="boost"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="plugins/*.cc" name="testOnlineDBSiStripConfigDbPlugins">
+  <use name="CalibFormats/SiStripObjects"/>
+  <use name="CondFormats/SiStripObjects"/>
+  <use name="DataFormats/SiStripCommon"/>
+  <use name="DataFormats/DetId"/>
+  <use name="DataFormats/SiStripDetId"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="Geometry/CommonTopologies"/>
+  <use name="Geometry/TrackerGeometryBuilder"/>
+  <use name="OnlineDB/SiStripConfigDb"/>
+  <use name="boost"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/OnlineDB/SiStripESSources/BuildFile.xml b/OnlineDB/SiStripESSources/BuildFile.xml
index 4843e8f48b6a1..ab4ef3f74e529 100644
--- a/OnlineDB/SiStripESSources/BuildFile.xml
+++ b/OnlineDB/SiStripESSources/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="CalibTracker/SiStripESProducers"/>
-<use   name="CalibFormats/SiStripObjects"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="DataFormats/SiStripCommon"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="OnlineDB/SiStripConfigDb"/>
-<use   name="TkOnlineSwDB"/>
-<use   name="boost"/>
+<use name="CalibTracker/SiStripESProducers"/>
+<use name="CalibFormats/SiStripObjects"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="DataFormats/SiStripCommon"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="OnlineDB/SiStripConfigDb"/>
+<use name="TkOnlineSwDB"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/OnlineDB/SiStripESSources/plugins/BuildFile.xml b/OnlineDB/SiStripESSources/plugins/BuildFile.xml
index 3ab35c9bddf82..d5a38ce745035 100644
--- a/OnlineDB/SiStripESSources/plugins/BuildFile.xml
+++ b/OnlineDB/SiStripESSources/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<library   file="*.cc" name="OnlineDBSiStripESSourcesPlugins">
-  <use   name="OnlineDB/SiStripESSources"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="OnlineDBSiStripESSourcesPlugins">
+  <use name="OnlineDB/SiStripESSources"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/OnlineDB/SiStripESSources/test/BuildFile.xml b/OnlineDB/SiStripESSources/test/BuildFile.xml
index e509022129054..274301e1a9b2d 100644
--- a/OnlineDB/SiStripESSources/test/BuildFile.xml
+++ b/OnlineDB/SiStripESSources/test/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="CalibFormats/SiStripObjects"/>
-<use   name="DataFormats/SiStripCommon"/>
-<use   name="boost"/>
-<library   file="stubs/*.cc" name="testOnlineDBSiStripESSources">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="CalibFormats/SiStripObjects"/>
+<use name="DataFormats/SiStripCommon"/>
+<use name="boost"/>
+<library file="stubs/*.cc" name="testOnlineDBSiStripESSources">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/OnlineDB/SiStripO2O/plugins/BuildFile.xml b/OnlineDB/SiStripO2O/plugins/BuildFile.xml
index bccac5cd08424..404f2305a7ec4 100644
--- a/OnlineDB/SiStripO2O/plugins/BuildFile.xml
+++ b/OnlineDB/SiStripO2O/plugins/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="boost"/>
-<use   name="root"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondCore/PopCon"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="OnlineDB/SiStripConfigDb"/>
-<use   name="OnlineDB/SiStripESSources"/>
-<library   file="*.cc" name="OnlineDBSiStripO2OPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="boost"/>
+<use name="root"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondCore/PopCon"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="FWCore/PluginManager"/>
+<use name="OnlineDB/SiStripConfigDb"/>
+<use name="OnlineDB/SiStripESSources"/>
+<library file="*.cc" name="OnlineDBSiStripO2OPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>