diff --git a/L1TriggerConfig/CSCTFConfigProducers/BuildFile.xml b/L1TriggerConfig/CSCTFConfigProducers/BuildFile.xml
index 7e62fb3dea24b..1b189c07486b1 100644
--- a/L1TriggerConfig/CSCTFConfigProducers/BuildFile.xml
+++ b/L1TriggerConfig/CSCTFConfigProducers/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="FWCore/Framework"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondTools/L1Trigger"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondTools/L1Trigger"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/DTTPGConfig/BuildFile.xml b/L1TriggerConfig/DTTPGConfig/BuildFile.xml
index a61db7425788c..8393e889e9527 100644
--- a/L1TriggerConfig/DTTPGConfig/BuildFile.xml
+++ b/L1TriggerConfig/DTTPGConfig/BuildFile.xml
@@ -1,9 +1,8 @@
-<use   name="DataFormats/MuonDetId"/>
-<use   name="FWCore/Framework"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondCore/DBOutputService"/>
-
+<use name="DataFormats/MuonDetId"/>
+<use name="FWCore/Framework"/>
+<use name="CondFormats/DTObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondCore/DBOutputService"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1TriggerConfig/DTTPGConfigProducers/BuildFile.xml b/L1TriggerConfig/DTTPGConfigProducers/BuildFile.xml
index 347075adbecbe..000f0bd8248c9 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/BuildFile.xml
+++ b/L1TriggerConfig/DTTPGConfigProducers/BuildFile.xml
@@ -1,16 +1,15 @@
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondCore/PopCon"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondTools/DT"/>
-<use   name="CoralBase"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/Catalog"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="RelationalAccess"/>
-
-<use   name="L1TriggerConfig/DTTPGConfig"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondCore/PopCon"/>
+<use name="CondFormats/DTObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondTools/DT"/>
+<use name="CoralBase"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/Catalog"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/PluginManager"/>
+<use name="RelationalAccess"/>
+<use name="L1TriggerConfig/DTTPGConfig"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/DTTPGConfigProducers/plugins/BuildFile.xml b/L1TriggerConfig/DTTPGConfigProducers/plugins/BuildFile.xml
index f9b5558fa717e..50cea1dadd8c6 100644
--- a/L1TriggerConfig/DTTPGConfigProducers/plugins/BuildFile.xml
+++ b/L1TriggerConfig/DTTPGConfigProducers/plugins/BuildFile.xml
@@ -1,16 +1,15 @@
-<use   name="FWCore/Framework"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="CalibMuon/DTDigiSync"/>
-<use   name="boost"/>
-
-<library   file="*.cc" name="L1TriggerConfigDTTPGConfigProducersPlugin">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="CondFormats/DTObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/DTGeometry"/>
+<use name="CondCore/DBOutputService"/>
+<use name="DataFormats/Provenance"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/PluginManager"/>
+<use name="CalibMuon/DTDigiSync"/>
+<use name="boost"/>
+<library file="*.cc" name="L1TriggerConfigDTTPGConfigProducersPlugin">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1TriggerConfig/DTTrackFinder/BuildFile.xml b/L1TriggerConfig/DTTrackFinder/BuildFile.xml
index 7e62fb3dea24b..1b189c07486b1 100644
--- a/L1TriggerConfig/DTTrackFinder/BuildFile.xml
+++ b/L1TriggerConfig/DTTrackFinder/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="FWCore/Framework"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondTools/L1Trigger"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondTools/L1Trigger"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/GMTConfigProducers/BuildFile.xml b/L1TriggerConfig/GMTConfigProducers/BuildFile.xml
index b3b907eefb3db..8032e762a8731 100644
--- a/L1TriggerConfig/GMTConfigProducers/BuildFile.xml
+++ b/L1TriggerConfig/GMTConfigProducers/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondTools/L1Trigger"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondTools/L1Trigger"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/GctConfigProducers/BuildFile.xml b/L1TriggerConfig/GctConfigProducers/BuildFile.xml
index 3bd47249a28d6..a6537fab66016 100644
--- a/L1TriggerConfig/GctConfigProducers/BuildFile.xml
+++ b/L1TriggerConfig/GctConfigProducers/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondTools/L1Trigger"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondTools/L1Trigger"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/L1CSCTPConfigProducers/BuildFile.xml b/L1TriggerConfig/L1CSCTPConfigProducers/BuildFile.xml
index b69a01d468252..d8fff0f9c9e41 100644
--- a/L1TriggerConfig/L1CSCTPConfigProducers/BuildFile.xml
+++ b/L1TriggerConfig/L1CSCTPConfigProducers/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/CSCObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/CSCObjects"/>
+<use name="CondFormats/DataRecord"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/L1GeometryProducers/BuildFile.xml b/L1TriggerConfig/L1GeometryProducers/BuildFile.xml
index 91d8eb10c1409..0ca9229e10a89 100644
--- a/L1TriggerConfig/L1GeometryProducers/BuildFile.xml
+++ b/L1TriggerConfig/L1GeometryProducers/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/L1GtConfigProducers/BuildFile.xml b/L1TriggerConfig/L1GtConfigProducers/BuildFile.xml
index 76dfd33f9a2bb..d3bdb87eeaa4b 100644
--- a/L1TriggerConfig/L1GtConfigProducers/BuildFile.xml
+++ b/L1TriggerConfig/L1GtConfigProducers/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondTools/L1Trigger"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="Utilities/Xerces"/>
-<use   name="xerces-c"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondTools/L1Trigger"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="Utilities/Xerces"/>
+<use name="xerces-c"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1TriggerConfig/L1ScalesProducers/BuildFile.xml b/L1TriggerConfig/L1ScalesProducers/BuildFile.xml
index ddbdd5ca5f8b8..47c843ca5811b 100644
--- a/L1TriggerConfig/L1ScalesProducers/BuildFile.xml
+++ b/L1TriggerConfig/L1ScalesProducers/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CalibFormats/CaloTPG"/>
-<use   name="CalibCalorimetry/EcalTPGTools"/>
-<use   name="CalibCalorimetry/CaloTPG"/>
-<use   name="CondTools/L1Trigger"/>
-<use   name="Geometry/EcalMapping"/>
-<use   name="Geometry/HcalTowerAlgo"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CalibFormats/CaloTPG"/>
+<use name="CalibCalorimetry/EcalTPGTools"/>
+<use name="CalibCalorimetry/CaloTPG"/>
+<use name="CondTools/L1Trigger"/>
+<use name="Geometry/EcalMapping"/>
+<use name="Geometry/HcalTowerAlgo"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/L1TConfigProducers/BuildFile.xml b/L1TriggerConfig/L1TConfigProducers/BuildFile.xml
index e18d2dadc951c..0bf61b9ee46ec 100644
--- a/L1TriggerConfig/L1TConfigProducers/BuildFile.xml
+++ b/L1TriggerConfig/L1TConfigProducers/BuildFile.xml
@@ -1,15 +1,15 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondTools/L1TriggerExt"/>
-<use   name="L1Trigger/L1TCalorimeter"/>
-<use   name="L1Trigger/L1TCommon"/>
-<use   name="L1Trigger/L1TGlobal"/>
-<use   name="L1Trigger/L1TMuonBarrel"/>
-<use   name="L1Trigger/L1TMuonEndCap"/>
-<use   name="L1Trigger/L1TMuonOverlap"/>
-<use   name="xerces-c"/>
-<use   name="utm"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondTools/L1TriggerExt"/>
+<use name="L1Trigger/L1TCalorimeter"/>
+<use name="L1Trigger/L1TCommon"/>
+<use name="L1Trigger/L1TGlobal"/>
+<use name="L1Trigger/L1TMuonBarrel"/>
+<use name="L1Trigger/L1TMuonEndCap"/>
+<use name="L1Trigger/L1TMuonOverlap"/>
+<use name="xerces-c"/>
+<use name="utm"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/RCTConfigProducers/BuildFile.xml b/L1TriggerConfig/RCTConfigProducers/BuildFile.xml
index 462985b8e2625..854dd73fb83f9 100644
--- a/L1TriggerConfig/RCTConfigProducers/BuildFile.xml
+++ b/L1TriggerConfig/RCTConfigProducers/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondTools/L1Trigger"/>
-<use   name="CondFormats/RunInfo"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondTools/L1Trigger"/>
+<use name="CondFormats/RunInfo"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/RPCTriggerConfig/BuildFile.xml b/L1TriggerConfig/RPCTriggerConfig/BuildFile.xml
index 46b19e7ad9b5b..c8011377617bb 100644
--- a/L1TriggerConfig/RPCTriggerConfig/BuildFile.xml
+++ b/L1TriggerConfig/RPCTriggerConfig/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/RPCObjects"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="Geometry/RPCGeometry"/>
-<use   name="L1Trigger/RPCTrigger"/>
-<use   name="CondTools/L1Trigger"/>
-<use   name="boost"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/RPCObjects"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="Geometry/RPCGeometry"/>
+<use name="L1Trigger/RPCTrigger"/>
+<use name="CondTools/L1Trigger"/>
+<use name="boost"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1TriggerConfig/RPCTriggerConfig/test/BuildFile.xml b/L1TriggerConfig/RPCTriggerConfig/test/BuildFile.xml
index 521adac8ed078..a6a89ac573af3 100644
--- a/L1TriggerConfig/RPCTriggerConfig/test/BuildFile.xml
+++ b/L1TriggerConfig/RPCTriggerConfig/test/BuildFile.xml
@@ -1,29 +1,35 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="CondFormats/RPCObjects"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="L1Trigger/RPCTrigger"/>
-<use   name="DataFormats/RPCDigi"/>
-<library   file="RPCConeConnectionsAna.cc" name="RPCConeConnectionsAna">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="CondFormats/RPCObjects"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="L1Trigger/RPCTrigger"/>
+<use name="DataFormats/RPCDigi"/>
+<library file="RPCConeConnectionsAna.cc" name="RPCConeConnectionsAna">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="TestHWConfig.cc" name="TestHWConfig">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="TestHWConfig.cc" name="TestHWConfig">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="WriteVHDL.cc" name="WriteVHDL">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="WriteVHDL.cc" name="WriteVHDL">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="DumpConeDefinition.cc" name="DumpConeDefinition">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DumpConeDefinition.cc" name="DumpConeDefinition">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="DumpL1RPCConfig.cc" name="DumpL1RPCConfig">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DumpL1RPCConfig.cc" name="DumpL1RPCConfig">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="DumpL1RPCHsbConfig.cc" name="DumpL1RPCHsbConfig">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DumpL1RPCHsbConfig.cc" name="DumpL1RPCHsbConfig">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="DumpL1RPCBxOrConfig.cc" name="DumpL1RPCBxOrConfig">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="DumpL1RPCBxOrConfig.cc" name="DumpL1RPCBxOrConfig">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1TriggerConfig/Utilities/BuildFile.xml b/L1TriggerConfig/Utilities/BuildFile.xml
index 7c78d94ab6f1b..6392ed41edbef 100644
--- a/L1TriggerConfig/Utilities/BuildFile.xml
+++ b/L1TriggerConfig/Utilities/BuildFile.xml
@@ -1,9 +1,8 @@
-<use   name="FWCore/Framework"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondTools/L1Trigger"/>
-<use   name="L1Trigger/L1TMuon"/>
-<use   name="L1Trigger/L1TMuonEndCap"/>
-<use   name="L1Trigger/L1TCalorimeter"/>
-<flags   EDM_PLUGIN="1"/>
-
+<use name="FWCore/Framework"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondTools/L1Trigger"/>
+<use name="L1Trigger/L1TMuon"/>
+<use name="L1Trigger/L1TMuonEndCap"/>
+<use name="L1Trigger/L1TCalorimeter"/>
+<flags EDM_PLUGIN="1"/>