diff --git a/CondTools/BTau/BuildFile.xml b/CondTools/BTau/BuildFile.xml
index 4cb5578525d51..7283a5a9be49c 100644
--- a/CondTools/BTau/BuildFile.xml
+++ b/CondTools/BTau/BuildFile.xml
@@ -1,9 +1,8 @@
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Utilities"/>
-<use   name="CondFormats/BTauObjects"/>
-
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="CondFormats/BTauObjects"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CondTools/BTau/plugins/BuildFile.xml b/CondTools/BTau/plugins/BuildFile.xml
index c3439e70ed014..aeff1527983c8 100644
--- a/CondTools/BTau/plugins/BuildFile.xml
+++ b/CondTools/BTau/plugins/BuildFile.xml
@@ -1,15 +1,16 @@
-<export></export>
-<library   name="CondToolsBTauplugins" file="*.cc">
-  <use   name="CondFormats/PhysicsToolsObjects"/>
-  <use   name="CondFormats/BTauObjects"/>
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="CondTools/BTau"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="CondCore/DBOutputService"/>
-  <use   name="PhysicsTools/CondLiteIO"/>
-  <use   name="PhysicsTools/UtilAlgos"/>
+<export>
+</export>
+<library name="CondToolsBTauplugins" file="*.cc">
+  <use name="CondFormats/PhysicsToolsObjects"/>
+  <use name="CondFormats/BTauObjects"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondTools/BTau"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/Utilities"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="CondCore/DBOutputService"/>
+  <use name="PhysicsTools/CondLiteIO"/>
+  <use name="PhysicsTools/UtilAlgos"/>
 </library>
diff --git a/CondTools/BTau/test/BuildFile.xml b/CondTools/BTau/test/BuildFile.xml
index 67458692b06fa..3f48871c4811b 100644
--- a/CondTools/BTau/test/BuildFile.xml
+++ b/CondTools/BTau/test/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="CondFormats/BTauObjects"/>
-
 <bin file="testBTagCalibrationReader.cpp">
-    <use name="CondTools/BTau"/>
+  <use name="CondTools/BTau"/>
 </bin>
diff --git a/CondTools/CTPPS/BuildFile.xml b/CondTools/CTPPS/BuildFile.xml
index 505f7ab450d22..b8261ccff847b 100644
--- a/CondTools/CTPPS/BuildFile.xml
+++ b/CondTools/CTPPS/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/PPSObjects"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="root"/>
-<use   name="rootcore"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/PPSObjects"/>
+<use name="CondCore/DBOutputService"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="root"/>
+<use name="rootcore"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CondTools/CTPPS/plugins/BuildFile.xml b/CondTools/CTPPS/plugins/BuildFile.xml
index 2b831991ffa0a..c58bc7b143b29 100644
--- a/CondTools/CTPPS/plugins/BuildFile.xml
+++ b/CondTools/CTPPS/plugins/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="CondFormats/PPSObjects"/>
-<use   name="CondCore/PopCon"/>
-<use   name="CondCore/CondDB"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="root"/>
-<use   name="rootcore"/> 
-<flags   EDM_PLUGIN="1"/>
+<use name="CondFormats/PPSObjects"/>
+<use name="CondCore/PopCon"/>
+<use name="CondCore/CondDB"/>
+<use name="CondCore/DBOutputService"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="CondFormats/DataRecord"/>
+<use name="root"/>
+<use name="rootcore"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/CondTools/DQM/BuildFile.xml b/CondTools/DQM/BuildFile.xml
index 72af19f23238e..35b09409bc722 100644
--- a/CondTools/DQM/BuildFile.xml
+++ b/CondTools/DQM/BuildFile.xml
@@ -1,13 +1,12 @@
-<use   name="CondCore/CondDB"/>
-<use   name="CondFormats/Common"/>
-<use   name="CondFormats/DQMObjects"/>
-<use   name="CoralBase"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="RelationalAccess"/>
-
+<use name="CondCore/CondDB"/>
+<use name="CondFormats/Common"/>
+<use name="CondFormats/DQMObjects"/>
+<use name="CoralBase"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="RelationalAccess"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CondTools/DQM/plugins/BuildFile.xml b/CondTools/DQM/plugins/BuildFile.xml
index a94e7d89db6af..f545b20152377 100644
--- a/CondTools/DQM/plugins/BuildFile.xml
+++ b/CondTools/DQM/plugins/BuildFile.xml
@@ -1,34 +1,39 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<library   file="DQMSummaryPopConAnalyzer.cc" name="CondToolsDQMSummaryPopConAnalyzer">
-  <use   name="CondCore/PopCon"/>
-  <use   name="CondTools/DQM"/>
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<library file="DQMSummaryPopConAnalyzer.cc" name="CondToolsDQMSummaryPopConAnalyzer">
+  <use name="CondCore/PopCon"/>
+  <use name="CondTools/DQM"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="DQMSummaryEventSetupAnalyzer.cc" name="CondToolsDQMSummaryEventSetupAnalyzer">
-  <use   name="CondFormats/DQMObjects"/>
-  <use   name="CondFormats/DataRecord"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DQMSummaryEventSetupAnalyzer.cc" name="CondToolsDQMSummaryEventSetupAnalyzer">
+  <use name="CondFormats/DQMObjects"/>
+  <use name="CondFormats/DataRecord"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="DQMReferenceHistogramRootFilePopConAnalyzer.cc" name="CondToolsDQMReferenceHistogramRootFilePopConAnalyzer">
-  <use   name="CondCore/PopCon"/>
-  <use   name="CondTools/DQM"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DQMReferenceHistogramRootFilePopConAnalyzer.cc" name="CondToolsDQMReferenceHistogramRootFilePopConAnalyzer">
+  <use name="CondCore/PopCon"/>
+  <use name="CondTools/DQM"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="DQMReferenceHistogramRootFileEventSetupAnalyzer.cc" name="CondToolsDQMReferenceHistogramRootFileEventSetupAnalyzer">
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="DQMServices/Core"/>
-  <use   name="CondFormats/Common"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DQMReferenceHistogramRootFileEventSetupAnalyzer.cc" name="CondToolsDQMReferenceHistogramRootFileEventSetupAnalyzer">
+  <use name="CondFormats/DataRecord"/>
+  <use name="DQMServices/Core"/>
+  <use name="CondFormats/Common"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="DQMXMLFilePopConAnalyzer.cc" name="CondToolsDQMXMLFilePopConAnalyzer">
-  <use   name="CondCore/PopCon"/>
-  <use   name="CondTools/DQM"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DQMXMLFilePopConAnalyzer.cc" name="CondToolsDQMXMLFilePopConAnalyzer">
+  <use name="CondCore/PopCon"/>
+  <use name="CondTools/DQM"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="DQMXMLFileEventSetupAnalyzer.cc" name="CondToolsDQMXMLFileEventSetupAnalyzer">
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="CondFormats/Common"/>
-  <use   name="DQMServices/Core"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DQMXMLFileEventSetupAnalyzer.cc" name="CondToolsDQMXMLFileEventSetupAnalyzer">
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondFormats/Common"/>
+  <use name="DQMServices/Core"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/DT/BuildFile.xml b/CondTools/DT/BuildFile.xml
index 3835a01df702d..a897089ec3b26 100644
--- a/CondTools/DT/BuildFile.xml
+++ b/CondTools/DT/BuildFile.xml
@@ -1,13 +1,12 @@
-<use   name="CondCore/CondDB"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CoralBase"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="RelationalAccess"/>
-
+<use name="CondCore/CondDB"/>
+<use name="CondFormats/DTObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CoralBase"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="CondCore/DBOutputService"/>
+<use name="RelationalAccess"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CondTools/DT/plugins/BuildFile.xml b/CondTools/DT/plugins/BuildFile.xml
index 677c3bb2f90e8..4e7d60a0654f6 100644
--- a/CondTools/DT/plugins/BuildFile.xml
+++ b/CondTools/DT/plugins/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="CondTools/DT"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondCore/PopCon"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="CoralBase"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="RelationalAccess"/>
-<library   file="*.cc" name="CondToolsDTP">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CondTools/DT"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondCore/PopCon"/>
+<use name="CondFormats/DTObjects"/>
+<use name="CoralBase"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="RelationalAccess"/>
+<library file="*.cc" name="CondToolsDTP">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/DT/test/BuildFile.xml b/CondTools/DT/test/BuildFile.xml
index a5e62be822285..0dbb7c2799208 100644
--- a/CondTools/DT/test/BuildFile.xml
+++ b/CondTools/DT/test/BuildFile.xml
@@ -1,17 +1,18 @@
-<use   name="clhep"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="FWCore/Framework"/>
-<use   name="Geometry/Records"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="DataFormats/MuonDetId"/>
-<library   file="stubs/*.cc" name="CondToolsDTTest">
-  <use   name="CondTools/DT"/>
-  <use   name="Geometry/DTGeometry"/>
-  <use   name="CondCore/DBOutputService"/>
-  <flags   EDM_PLUGIN="1"/>
+<use name="clhep"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/DTObjects"/>
+<use name="FWCore/Framework"/>
+<use name="Geometry/Records"/>
+<use name="CondFormats/DataRecord"/>
+<use name="DataFormats/MuonDetId"/>
+<library file="stubs/*.cc" name="CondToolsDTTest">
+  <use name="CondTools/DT"/>
+  <use name="Geometry/DTGeometry"/>
+  <use name="CondCore/DBOutputService"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="validate/*.cc" name="CondToolsDTValidate">
-  <use   name="CondCore/PopCon"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="validate/*.cc" name="CondToolsDTValidate">
+  <use name="CondCore/PopCon"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/Ecal/BuildFile.xml b/CondTools/Ecal/BuildFile.xml
index 651fc2676b64b..43cbb1a7c8de9 100644
--- a/CondTools/Ecal/BuildFile.xml
+++ b/CondTools/Ecal/BuildFile.xml
@@ -1,28 +1,28 @@
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondCore/PopCon"/>
-<use   name="CondFormats/Alignment"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/ESObjects"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="Utilities/Xerces"/>
-<use   name="OnlineDB/EcalCondDB"/>
-<use   name="OnlineDB/Oracle"/>
-<use   name="SimCalorimetry/EcalSelectiveReadoutProducers"/>
-<use   name="Geometry/EcalMapping"/>
-<use   name="CalibCalorimetry/EcalLaserCorrection"/>
-<use   name="root"/>
-<use   name="rootcore"/>
-<use   name="rootphysics"/>
-<use   name="rootgraphics"/>
-<use   name="boost"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondCore/PopCon"/>
+<use name="CondFormats/Alignment"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/ESObjects"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="Utilities/Xerces"/>
+<use name="OnlineDB/EcalCondDB"/>
+<use name="OnlineDB/Oracle"/>
+<use name="SimCalorimetry/EcalSelectiveReadoutProducers"/>
+<use name="Geometry/EcalMapping"/>
+<use name="CalibCalorimetry/EcalLaserCorrection"/>
+<use name="root"/>
+<use name="rootcore"/>
+<use name="rootphysics"/>
+<use name="rootgraphics"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CondTools/Ecal/bin/BuildFile.xml b/CondTools/Ecal/bin/BuildFile.xml
index d67e59791f548..9acd6fcaef1f3 100644
--- a/CondTools/Ecal/bin/BuildFile.xml
+++ b/CondTools/Ecal/bin/BuildFile.xml
@@ -1,7 +1,5 @@
-
-
-<bin name="array2xmlEB" file="array2xmlEB.cc" >
-   <use name="CondTools/Ecal" />
-   <use name="CondFormats/EcalObjects" />
-   <use name="DataFormats/EcalDetId" />	
+<bin name="array2xmlEB" file="array2xmlEB.cc">
+  <use name="CondTools/Ecal"/>
+  <use name="CondFormats/EcalObjects"/>
+  <use name="DataFormats/EcalDetId"/>
 </bin>
diff --git a/CondTools/Ecal/plugins/BuildFile.xml b/CondTools/Ecal/plugins/BuildFile.xml
index 6b71dd00fda75..6b75f01c0ddaf 100644
--- a/CondTools/Ecal/plugins/BuildFile.xml
+++ b/CondTools/Ecal/plugins/BuildFile.xml
@@ -1,18 +1,18 @@
-<use   name="boost"/>
-<use   name="xerces-c"/>
-<use   name="CondFormats/Alignment"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/RunInfo"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondCore/PopCon"/>
-<use   name="CondTools/Ecal"/>
-<use   name="CondTools/RunInfo"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="Utilities/General"/>
-<library   file="*.cc" name="CondToolsEcalPlugin">
-  <flags   EDM_PLUGIN="1"/>
+<use name="boost"/>
+<use name="xerces-c"/>
+<use name="CondFormats/Alignment"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/RunInfo"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondCore/PopCon"/>
+<use name="CondTools/Ecal"/>
+<use name="CondTools/RunInfo"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="Utilities/General"/>
+<library file="*.cc" name="CondToolsEcalPlugin">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/Ecal/test/BuildFile.xml b/CondTools/Ecal/test/BuildFile.xml
index 4ca1aafdb5490..e1bebed290068 100644
--- a/CondTools/Ecal/test/BuildFile.xml
+++ b/CondTools/Ecal/test/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="CondTools/Ecal"/>
-
 <architecture name="(slc|cc).*_amd64_.*">
   <ifcxx11_abi value="1">
     <flags SETENV="LD_PRELOAD=$(CMS_ORACLEOCCI_LIB)"/>
diff --git a/CondTools/Ecal/test/tools/BuildFile.xml b/CondTools/Ecal/test/tools/BuildFile.xml
index 07bf111856427..49f48d85fcdf9 100644
--- a/CondTools/Ecal/test/tools/BuildFile.xml
+++ b/CondTools/Ecal/test/tools/BuildFile.xml
@@ -1,9 +1,10 @@
-<use   name="xerces-c"/>
-<use   name="CondTools/Ecal"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<bin   name="testXMLTranslators" file="testXMLTranslators.cc">
+<use name="xerces-c"/>
+<use name="CondTools/Ecal"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/DataRecord"/>
+<bin name="testXMLTranslators" file="testXMLTranslators.cc">
 </bin>
-<library   name="TestXMLTranslators" file="stubs/EcalTestConditionAnalyzer.cc">
-  <flags   EDM_PLUGIN="1"/>
+
+<library name="TestXMLTranslators" file="stubs/EcalTestConditionAnalyzer.cc">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/Geometry/plugins/BuildFile.xml b/CondTools/Geometry/plugins/BuildFile.xml
index 79c411a3fc784..137d78eecf21b 100644
--- a/CondTools/Geometry/plugins/BuildFile.xml
+++ b/CondTools/Geometry/plugins/BuildFile.xml
@@ -1,16 +1,13 @@
 <use name="boost"/>
 <use name="root"/>
-
 <use name="CondCore/DBOutputService"/>
 <use name="CondFormats/GeometryObjects"/>
 <use name="CondFormats/DataRecord"/>
 <use name="DataFormats/CTPPSDetId"/>
-
 <use name="DetectorDescription/Core"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
-
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="Geometry/TrackerNumberingBuilder"/>
@@ -20,17 +17,16 @@
 <use name="Geometry/HcalTowerAlgo"/>
 <use name="Geometry/ForwardGeometry"/>
 <use name="Geometry/CSCGeometryBuilder"/>
-<use name="Geometry/DTGeometry"/> 
+<use name="Geometry/DTGeometry"/>
 <use name="Geometry/DTGeometryBuilder"/>
 <use name="Geometry/RPCGeometry"/>
 <use name="Geometry/RPCGeometryBuilder"/>
 <use name="Geometry/GEMGeometry"/>
 <use name="Geometry/GEMGeometryBuilder"/>
-<use name="Geometry/MuonNumbering"/>  
+<use name="Geometry/MuonNumbering"/>
 <use name="CondFormats/Alignment"/>
 <use name="Geometry/HGCalGeometry"/>
 <use name="Geometry/VeryForwardGeometryBuilder"/>
 <library file="*.cc" name="CondToolsGeometryPlugins">
- <flags EDM_PLUGIN="1"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-        
diff --git a/CondTools/Geometry/test/BuildFile.xml b/CondTools/Geometry/test/BuildFile.xml
index 77905ef35f135..887619083a329 100644
--- a/CondTools/Geometry/test/BuildFile.xml
+++ b/CondTools/Geometry/test/BuildFile.xml
@@ -1,15 +1,12 @@
 <use name="boost"/>
 <use name="root"/>
-
 <use name="CondCore/DBOutputService"/>
 <use name="CondFormats/GeometryObjects"/>
 <use name="CondFormats/DataRecord"/>
-
 <use name="DetectorDescription/Core"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
-
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="Geometry/TrackerNumberingBuilder"/>
@@ -18,14 +15,13 @@
 <use name="Geometry/HcalTowerAlgo"/>
 <use name="Geometry/ForwardGeometry"/>
 <use name="Geometry/CSCGeometryBuilder"/>
-<use name="Geometry/DTGeometry"/> 
+<use name="Geometry/DTGeometry"/>
 <use name="Geometry/DTGeometryBuilder"/>
 <use name="Geometry/RPCGeometry"/>
 <use name="Geometry/RPCGeometryBuilder"/>
-<use name="Geometry/MuonNumbering"/>  
-
-<library file="GeometryTester.cc" name="GeometryTester"> 
- <flags EDM_PLUGIN="1"/>
-</library> 
+<use name="Geometry/MuonNumbering"/>
+<library file="GeometryTester.cc" name="GeometryTester">
+  <flags EDM_PLUGIN="1"/>
+</library>
 
 <test name="test-data-file-deletion" command="test-data-file-deletion.sh"/>
diff --git a/CondTools/HLT/BuildFile.xml b/CondTools/HLT/BuildFile.xml
index d7161a52c81b2..9efc269ec8bf1 100644
--- a/CondTools/HLT/BuildFile.xml
+++ b/CondTools/HLT/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondFormats/HLTObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondFormats/HLTObjects"/>
+<use name="CondFormats/DataRecord"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/CondTools/Hcal/BuildFile.xml b/CondTools/Hcal/BuildFile.xml
index 7e15c5b38c13f..d97edf229fcdd 100644
--- a/CondTools/Hcal/BuildFile.xml
+++ b/CondTools/Hcal/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="boost"/>
-<use   name="FWCore/Framework"/>
-<use   name="Utilities/Xerces"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="CalibCalorimetry/HcalAlgos"/>
-<use   name="CalibCalorimetry/CastorCalib"/>
-<use   name="CondFormats/HcalObjects"/>
-<use   name="CondFormats/CastorObjects"/>
-<use   name="CalibFormats/HcalObjects"/>
-<use   name="CalibFormats/CastorObjects"/>
-<use   name="RelationalAccess"/>
-<use   name="CondCore/PopCon"/>
-<use   name="xerces-c"/>
+<use name="boost"/>
+<use name="FWCore/Framework"/>
+<use name="Utilities/Xerces"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="CalibCalorimetry/HcalAlgos"/>
+<use name="CalibCalorimetry/CastorCalib"/>
+<use name="CondFormats/HcalObjects"/>
+<use name="CondFormats/CastorObjects"/>
+<use name="CalibFormats/HcalObjects"/>
+<use name="CalibFormats/CastorObjects"/>
+<use name="RelationalAccess"/>
+<use name="CondCore/PopCon"/>
+<use name="xerces-c"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CondTools/Hcal/bin/BuildFile.xml b/CondTools/Hcal/bin/BuildFile.xml
index b06ede29109e0..ecdbaa47e6a55 100644
--- a/CondTools/Hcal/bin/BuildFile.xml
+++ b/CondTools/Hcal/bin/BuildFile.xml
@@ -1,20 +1,29 @@
-<use   name="clhep"/>
-<use   name="boost"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CalibCalorimetry/HcalAlgos"/>
-<use   name="CondFormats/Calibration"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/HcalObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Services"/>
-<use   name="FWCore/MessageService"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="CondTools/Hcal"/>
-<use   name="DataFormats/HcalDetId"/>
-<bin   file="HcalRawIdToReadable.cpp"> </bin>
+<use name="clhep"/>
+<use name="boost"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CalibCalorimetry/HcalAlgos"/>
+<use name="CondFormats/Calibration"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/HcalObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Services"/>
+<use name="FWCore/MessageService"/>
+<use name="Geometry/CaloTopology"/>
+<use name="CondTools/Hcal"/>
+<use name="DataFormats/HcalDetId"/>
+<bin file="HcalRawIdToReadable.cpp">
+</bin>
+
 <flags EDM_PLUGIN="1"/>
-<library file="scaleGains.cc" name="CondToolsHcalScaleGains"> </library>
-<library file="corrGains.cc"  name="CondToolsHcalCorrGains">  </library>
-<library file="corrResps.cc"  name="CondToolsHcalCorrResps">  </library>
-<library file="modGains.cc"   name="CondToolsHcalModGains">   </library>
+<library file="scaleGains.cc" name="CondToolsHcalScaleGains">
+</library>
+
+<library file="corrGains.cc" name="CondToolsHcalCorrGains">
+</library>
+
+<library file="corrResps.cc" name="CondToolsHcalCorrResps">
+</library>
+
+<library file="modGains.cc" name="CondToolsHcalModGains">
+</library>
diff --git a/CondTools/Hcal/plugins/BuildFile.xml b/CondTools/Hcal/plugins/BuildFile.xml
index bd27e846c1078..3196a2ab9cbd4 100644
--- a/CondTools/Hcal/plugins/BuildFile.xml
+++ b/CondTools/Hcal/plugins/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="boost"/>
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="CalibCalorimetry/HcalAlgos"/>
-<use   name="CondFormats/HcalObjects"/>
-<use   name="CalibFormats/HcalObjects"/>
-<use   name="CondTools/Hcal"/>
-<use   name="RelationalAccess"/>
-<use   name="CondCore/PopCon"/>
-<use   name="xerces-c"/>
-<library   file="*.cc" name="CondToolsHcalPlugin">
-  <flags   EDM_PLUGIN="1"/>
+<use name="boost"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="CalibCalorimetry/HcalAlgos"/>
+<use name="CondFormats/HcalObjects"/>
+<use name="CalibFormats/HcalObjects"/>
+<use name="CondTools/Hcal"/>
+<use name="RelationalAccess"/>
+<use name="CondCore/PopCon"/>
+<use name="xerces-c"/>
+<library file="*.cc" name="CondToolsHcalPlugin">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/Hcal/test/BuildFile.xml b/CondTools/Hcal/test/BuildFile.xml
index 96b2044e78693..7b4a7ae810c0a 100644
--- a/CondTools/Hcal/test/BuildFile.xml
+++ b/CondTools/Hcal/test/BuildFile.xml
@@ -1,26 +1,28 @@
-<use   name="clhep"/>
-<use   name="boost"/>
-<use   name="root"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="CalibCalorimetry/HcalAlgos"/>
-<use   name="CondFormats/HcalObjects"/>
-<use   name="CondFormats/Serialization"/>
-<use   name="CondTools/Hcal"/>
-<use   name="CondFormats/DataRecord"/>
+<use name="clhep"/>
+<use name="boost"/>
+<use name="root"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="CalibCalorimetry/HcalAlgos"/>
+<use name="CondFormats/HcalObjects"/>
+<use name="CondFormats/Serialization"/>
+<use name="CondTools/Hcal"/>
+<use name="CondFormats/DataRecord"/>
+<library name="PMTParams" file="make_*cc">
+</library>
 
-<library name="PMTParams" file="make_*cc">   </library>
-<bin     file="write_HFPhase1PMTParams.cc">
+<bin file="write_HFPhase1PMTParams.cc">
   <lib name="PMTParams"/>
 </bin>
 
 <library name="PMTParamsVis" file="visualizeHFPhase1PMTParams.cc">
-  <use  name="rootgpad"/>
+  <use name="rootgpad"/>
 </library>
-<bin     file="makeHFPhase1PMTParamsPlots.cc">
+
+<bin file="makeHFPhase1PMTParamsPlots.cc">
   <lib name="PMTParams"/>
   <lib name="PMTParamsVis"/>
 </bin>
 
-<bin     file="write_HBHENegativeEFilter.cc">
+<bin file="write_HBHENegativeEFilter.cc">
   <lib name="PMTParams"/>
 </bin>
diff --git a/CondTools/L1Trigger/BuildFile.xml b/CondTools/L1Trigger/BuildFile.xml
index 92c1a2dfe414c..399b6a56fa362 100644
--- a/CondTools/L1Trigger/BuildFile.xml
+++ b/CondTools/L1Trigger/BuildFile.xml
@@ -1,9 +1,9 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/L1TObjects"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/L1TObjects"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CondTools/L1Trigger/plugins/BuildFile.xml b/CondTools/L1Trigger/plugins/BuildFile.xml
index bc01615153186..a511719c7edab 100644
--- a/CondTools/L1Trigger/plugins/BuildFile.xml
+++ b/CondTools/L1Trigger/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="CondTools/L1Trigger"/>
-<library   file="*.cc" name="CondToolsL1TriggerPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CondTools/L1Trigger"/>
+<library file="*.cc" name="CondToolsL1TriggerPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/L1TriggerExt/BuildFile.xml b/CondTools/L1TriggerExt/BuildFile.xml
index 75903e36a7f71..15a1bb0a32e03 100644
--- a/CondTools/L1TriggerExt/BuildFile.xml
+++ b/CondTools/L1TriggerExt/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondTools/L1Trigger"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondTools/L1Trigger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CondTools/L1TriggerExt/plugins/BuildFile.xml b/CondTools/L1TriggerExt/plugins/BuildFile.xml
index d4bc267a7d333..422d9f59e2f19 100644
--- a/CondTools/L1TriggerExt/plugins/BuildFile.xml
+++ b/CondTools/L1TriggerExt/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="CondTools/L1TriggerExt"/>
-<library   file="*.cc" name="CondToolsL1TriggerExtPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CondTools/L1TriggerExt"/>
+<library file="*.cc" name="CondToolsL1TriggerExtPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/RPC/BuildFile.xml b/CondTools/RPC/BuildFile.xml
index a345017172c37..a8cea4f7b0d38 100644
--- a/CondTools/RPC/BuildFile.xml
+++ b/CondTools/RPC/BuildFile.xml
@@ -1,14 +1,14 @@
-<use   name="CondFormats/RPCObjects"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondCore/PopCon"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="L1Trigger/RPCTrigger"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="boost"/>
+<use name="CondFormats/RPCObjects"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondCore/PopCon"/>
+<use name="CondCore/DBOutputService"/>
+<use name="L1Trigger/RPCTrigger"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CondTools/RPC/plugins/BuildFile.xml b/CondTools/RPC/plugins/BuildFile.xml
index bba62103efb1a..a3eb16c87dd4a 100644
--- a/CondTools/RPC/plugins/BuildFile.xml
+++ b/CondTools/RPC/plugins/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="CondTools/RPC"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondCore/PopCon"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CoralBase"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Catalog"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="RelationalAccess"/>
-<library   file="*.cc" name="CondToolsRPCP">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CondTools/RPC"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondCore/PopCon"/>
+<use name="CondFormats/DTObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CoralBase"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Catalog"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="RelationalAccess"/>
+<library file="*.cc" name="CondToolsRPCP">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/RunInfo/BuildFile.xml b/CondTools/RunInfo/BuildFile.xml
index 8040f3b7c52ba..5f37fcfc6f31e 100644
--- a/CondTools/RunInfo/BuildFile.xml
+++ b/CondTools/RunInfo/BuildFile.xml
@@ -1,15 +1,14 @@
-<use   name="CondCore/CondDB"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondCore/PopCon"/>
-<use   name="CondFormats/RunInfo"/>
-<use   name="CoralBase"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="RelationalAccess"/>
-
+<use name="CondCore/CondDB"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondCore/PopCon"/>
+<use name="CondFormats/RunInfo"/>
+<use name="CoralBase"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="RelationalAccess"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CondTools/RunInfo/bin/BuildFile.xml b/CondTools/RunInfo/bin/BuildFile.xml
index 07ec1338bc15b..84daa97017d57 100644
--- a/CondTools/RunInfo/bin/BuildFile.xml
+++ b/CondTools/RunInfo/bin/BuildFile.xml
@@ -1,10 +1,11 @@
-<use   name="CondTools/RunInfo"/>
-<use   name="CondFormats/RunInfo"/>
-<bin   file="conddb_import_runInfo.cpp" name="conddb_import_runInfo">
-  <use   name="CondCore/Utilities"/>
-  <use   name="CondCore/CondDB"/>
+<use name="CondTools/RunInfo"/>
+<use name="CondFormats/RunInfo"/>
+<bin file="conddb_import_runInfo.cpp" name="conddb_import_runInfo">
+  <use name="CondCore/Utilities"/>
+  <use name="CondCore/CondDB"/>
 </bin>
-<bin   file="conddb_dump_LHCInfo.cpp" name="conddb_dump_LHCInfo">
-  <use   name="CondCore/Utilities"/>
-  <use   name="CondCore/CondDB"/>
+
+<bin file="conddb_dump_LHCInfo.cpp" name="conddb_dump_LHCInfo">
+  <use name="CondCore/Utilities"/>
+  <use name="CondCore/CondDB"/>
 </bin>
diff --git a/CondTools/RunInfo/plugins/BuildFile.xml b/CondTools/RunInfo/plugins/BuildFile.xml
index 63d167768b6f5..c651c33b38cfd 100644
--- a/CondTools/RunInfo/plugins/BuildFile.xml
+++ b/CondTools/RunInfo/plugins/BuildFile.xml
@@ -1,35 +1,44 @@
-<use   name="CondTools/RunInfo"/>
-<use   name="CondCore/PopCon"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/DataRecord"/>
-<library   file="RunInfoESAnalyzer.cc" name="CondToolsRunInfoESAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CondTools/RunInfo"/>
+<use name="CondCore/PopCon"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/DataRecord"/>
+<library file="RunInfoESAnalyzer.cc" name="CondToolsRunInfoESAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="RunInfoPopConAnalyzer.cc" name="CondToolsRunInfoPopConAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="RunInfoPopConAnalyzer.cc" name="CondToolsRunInfoPopConAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="RunSummaryPopConAnalyzer.cc" name="CondToolsRunSummaryPopConAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="RunSummaryPopConAnalyzer.cc" name="CondToolsRunSummaryPopConAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="RunSummaryESAnalyzer.cc" name="CondToolsRunSummaryESAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="RunSummaryESAnalyzer.cc" name="CondToolsRunSummaryESAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="L1TriggerScalerPopConAnalyzer.cc" name="CondToolsL1TriggerScalerPopConAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="L1TriggerScalerPopConAnalyzer.cc" name="CondToolsL1TriggerScalerPopConAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="FillInfoESAnalyzer.cc" name="CondToolsFillInfoESAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="FillInfoESAnalyzer.cc" name="CondToolsFillInfoESAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="FillInfoPopConAnalyzer.cc" name="CondToolsFillInfoPopConAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="FillInfoPopConAnalyzer.cc" name="CondToolsFillInfoPopConAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="LHCInfoESAnalyzer.cc" name="CondToolsLHCInfoESAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="LHCInfoESAnalyzer.cc" name="CondToolsLHCInfoESAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="LHCInfoPopConAnalyzer.cc" name="CondToolsLHCInfoPopConAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="LHCInfoPopConAnalyzer.cc" name="CondToolsLHCInfoPopConAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="RunInfoTestESProducer.cc" name="CondToolsRunInfoTestESProducer">
+
+<library file="RunInfoTestESProducer.cc" name="CondToolsRunInfoTestESProducer">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/RunInfo/test/BuildFile.xml b/CondTools/RunInfo/test/BuildFile.xml
index 91ce76e4ad189..831fe9b570583 100644
--- a/CondTools/RunInfo/test/BuildFile.xml
+++ b/CondTools/RunInfo/test/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="CondTools/RunInfo"/>
-
 <architecture name="(slc|cc).*_amd64_.*">
   <use name="py2-sqlalchemy"/>
   <test name="RunInfoStart_O2O_test" command="RunInfoStart_O2O_test.sh"/>
diff --git a/CondTools/SiPixel/BuildFile.xml b/CondTools/SiPixel/BuildFile.xml
index c1f959d7d4878..da814dd4e4d63 100644
--- a/CondTools/SiPixel/BuildFile.xml
+++ b/CondTools/SiPixel/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/SiPixelObjects"/>
-<use   name="CondFormats/SiPixelTransient"/>
-<use   name="CondCore/PopCon"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/SiPixelObjects"/>
+<use name="CondFormats/SiPixelTransient"/>
+<use name="CondCore/PopCon"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/CondTools/SiPixel/plugins/BuildFile.xml b/CondTools/SiPixel/plugins/BuildFile.xml
index 1746a76c12bb2..8b6c28ff1f2d3 100644
--- a/CondTools/SiPixel/plugins/BuildFile.xml
+++ b/CondTools/SiPixel/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="CondTools/SiPixel"/>
-<library   name="CondToolsSiPixelPlugins" file="*.cc">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CondTools/SiPixel"/>
+<library name="CondToolsSiPixelPlugins" file="*.cc">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/SiPixel/test/BuildFile.xml b/CondTools/SiPixel/test/BuildFile.xml
index 4996e1fc93840..a8c9e3b1baaab 100644
--- a/CondTools/SiPixel/test/BuildFile.xml
+++ b/CondTools/SiPixel/test/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="boost"/>
-<use   name="root"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondTools/SiPixel"/>
-<use   name="CalibTracker/SiPixelESProducers"/>
-<use   name="RecoLocalTracker/SiPixelRecHits"/>
-<library   file="*.cc" name="testCondToolsSiPixel">
-  <flags   EDM_PLUGIN="1"/>
+<use name="boost"/>
+<use name="root"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondTools/SiPixel"/>
+<use name="CalibTracker/SiPixelESProducers"/>
+<use name="RecoLocalTracker/SiPixelRecHits"/>
+<library file="*.cc" name="testCondToolsSiPixel">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/SiStrip/plugins/BuildFile.xml b/CondTools/SiStrip/plugins/BuildFile.xml
index b4b0d47a358cf..ddd39b0d717d7 100644
--- a/CondTools/SiStrip/plugins/BuildFile.xml
+++ b/CondTools/SiStrip/plugins/BuildFile.xml
@@ -1,18 +1,18 @@
-<use   name="boost"/>
-<use   name="root"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="CommonTools/TrackerMap"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="CalibTracker/Records"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="CalibFormats/SiStripObjects"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="CalibTracker/SiStripCommon"/>
-<library   file="*.cc" name="CondToolsSiStripPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="boost"/>
+<use name="root"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="CommonTools/TrackerMap"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="CalibTracker/Records"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="CalibFormats/SiStripObjects"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="CalibTracker/SiStripCommon"/>
+<library file="*.cc" name="CondToolsSiStripPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondTools/Utilities/test/BuildFile.xml b/CondTools/Utilities/test/BuildFile.xml
index 8484518ed8aa1..40c06d54a4f98 100644
--- a/CondTools/Utilities/test/BuildFile.xml
+++ b/CondTools/Utilities/test/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="CondCore/Utilities"/>
-<use   name="CondFormats/Alignment"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="boost"/>
-<use   name="boost_program_options"/>
-
-<library   name="testCondToolsUtilities" file="">
+<use name="FWCore/Framework"/>
+<use name="CondCore/Utilities"/>
+<use name="CondFormats/Alignment"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="CondFormats/DTObjects"/>
+<use name="boost"/>
+<use name="boost_program_options"/>
+<library name="testCondToolsUtilities" file="">
 </library>