From de78a459fcab02edbe08ca4875fcb10e585d9e71 Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Tue, 5 May 2020 19:38:02 +0200
Subject: [PATCH] Clean up BuildFiles under L1Trigger/

Clean up BuildFile.xml filea with `xmllint --format`.
---
 L1Trigger/CSCCommonTrigger/BuildFile.xml      | 16 ++--
 L1Trigger/CSCTrackFinder/BuildFile.xml        | 26 +++---
 .../CSCTrackFinder/plugins/BuildFile.xml      |  6 +-
 L1Trigger/CSCTrackFinder/test/BuildFile.xml   | 78 ++++++++---------
 L1Trigger/CSCTriggerPrimitives/BuildFile.xml  | 22 ++---
 .../plugins/BuildFile.xml                     | 37 ++++----
 L1Trigger/DTBti/BuildFile.xml                 | 25 +++---
 L1Trigger/DTSectorCollector/BuildFile.xml     | 25 +++---
 L1Trigger/DTTrackFinder/BuildFile.xml         | 14 +--
 L1Trigger/DTTrackFinder/plugins/BuildFile.xml |  6 +-
 L1Trigger/DTTraco/BuildFile.xml               | 21 +++--
 L1Trigger/DTTrigger/BuildFile.xml             | 37 ++++----
 L1Trigger/DTTriggerServerPhi/BuildFile.xml    | 19 ++---
 L1Trigger/DTTriggerServerTheta/BuildFile.xml  | 19 ++---
 L1Trigger/DTUtilities/BuildFile.xml           | 17 ++--
 L1Trigger/GlobalCaloTrigger/BuildFile.xml     | 10 +--
 .../GlobalCaloTrigger/plugins/BuildFile.xml   | 10 +--
 .../GlobalCaloTrigger/test/BuildFile.xml      | 35 +++++---
 L1Trigger/GlobalMuonTrigger/BuildFile.xml     | 18 ++--
 .../GlobalMuonTrigger/test/BuildFile.xml      | 53 ++++++------
 L1Trigger/GlobalTrigger/BuildFile.xml         | 22 ++---
 L1Trigger/GlobalTriggerAnalyzer/BuildFile.xml | 26 +++---
 .../plugins/BuildFile.xml                     | 10 +--
 L1Trigger/HardwareValidation/BuildFile.xml    | 30 +++----
 .../HardwareValidation/plugins/BuildFile.xml  | 38 ++++-----
 L1Trigger/L1ExtraFromDigis/BuildFile.xml      | 20 ++---
 L1Trigger/L1GctAnalyzer/BuildFile.xml         | 14 +--
 L1Trigger/L1TCaloLayer1/BuildFile.xml         |  2 +-
 L1Trigger/L1TCaloLayer1/test/BuildFile.xml    | 11 ++-
 .../L1TCalorimeter/plugins/BuildFile.xml      | 46 +++++-----
 L1Trigger/L1TCommon/BuildFile.xml             |  2 -
 L1Trigger/L1TGEM/BuildFile.xml                | 22 ++---
 L1Trigger/L1TGEM/plugins/BuildFile.xml        |  4 +-
 L1Trigger/L1TGlobal/src/BuildFile.xml         |  1 -
 L1Trigger/L1THGCal/BuildFile.xml              | 20 ++---
 L1Trigger/L1THGCal/plugins/BuildFile.xml      | 50 ++++++-----
 L1Trigger/L1THGCal/test/BuildFile.xml         | 21 +++--
 L1Trigger/L1THGCalUtilities/BuildFile.xml     | 12 ++-
 .../L1THGCalUtilities/plugins/BuildFile.xml   | 62 +++++++-------
 L1Trigger/L1TMuon/BuildFile.xml               | 14 +--
 L1Trigger/L1TMuon/plugins/BuildFile.xml       |  1 -
 L1Trigger/L1TMuonBarrel/plugins/BuildFile.xml | 30 +++----
 L1Trigger/L1TMuonBarrel/src/BuildFile.xml     |  2 -
 L1Trigger/L1TMuonCPPF/BuildFile.xml           |  7 --
 L1Trigger/L1TMuonEndCap/BuildFile.xml         |  1 -
 L1Trigger/L1TMuonEndCap/test/BuildFile.xml    |  7 +-
 L1Trigger/L1TMuonOverlap/BuildFile.xml        | 13 +--
 .../L1TMuonOverlap/plugins/BuildFile.xml      |  2 +-
 L1Trigger/L1TNtuples/plugins/BuildFile.xml    |  4 +-
 L1Trigger/L1TTwinMux/BuildFile.xml            |  1 -
 L1Trigger/L1TTwinMux/plugins/BuildFile.xml    | 14 +--
 L1Trigger/RPCTechnicalTrigger/BuildFile.xml   | 28 +++---
 L1Trigger/RPCTrigger/BuildFile.xml            | 32 +++----
 L1Trigger/RPCTrigger/plugins/BuildFile.xml    |  6 +-
 L1Trigger/RegionalCaloTrigger/BuildFile.xml   | 44 +++++-----
 .../RegionalCaloTrigger/plugins/BuildFile.xml | 10 +--
 L1Trigger/Skimmer/BuildFile.xml               | 20 ++---
 L1Trigger/TextToDigi/BuildFile.xml            |  2 +-
 L1Trigger/TextToDigi/plugins/BuildFile.xml    | 20 ++---
 L1Trigger/TextToDigi/test/BuildFile.xml       |  4 +-
 L1Trigger/TrackTrigger/BuildFile.xml          | 80 ++++++++---------
 L1Trigger/TrackTrigger/plugins/BuildFile.xml  | 16 ++--
 L1Trigger/TrackTrigger/test/BuildFile.xml     | 85 ++++++++++---------
 L1Trigger/TrackerDTC/BuildFile.xml            |  2 +-
 L1Trigger/TrackerDTC/plugins/BuildFile.xml    |  6 +-
 65 files changed, 668 insertions(+), 690 deletions(-)

diff --git a/L1Trigger/CSCCommonTrigger/BuildFile.xml b/L1Trigger/CSCCommonTrigger/BuildFile.xml
index bd940ebfc8d20..f34fb06ff7a5e 100644
--- a/L1Trigger/CSCCommonTrigger/BuildFile.xml
+++ b/L1Trigger/CSCCommonTrigger/BuildFile.xml
@@ -1,10 +1,10 @@
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="Geometry/CSCGeometry"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/CommonTopologies"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="boost"/>
-<use   name="clhep"/>
+<use name="Geometry/CSCGeometry"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/CommonTopologies"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="boost"/>
+<use name="clhep"/>
diff --git a/L1Trigger/CSCTrackFinder/BuildFile.xml b/L1Trigger/CSCTrackFinder/BuildFile.xml
index 4488f6c54d5ac..d0001fdb80357 100644
--- a/L1Trigger/CSCTrackFinder/BuildFile.xml
+++ b/L1Trigger/CSCTrackFinder/BuildFile.xml
@@ -1,16 +1,16 @@
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="L1Trigger/CSCCommonTrigger"/>
-<use   name="L1Trigger/DTUtilities"/>
-<use   name="L1Trigger/DTTrackFinder"/>
-<use   name="Geometry/CSCGeometry"/>
-<use   name="Geometry/Records"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="DataFormats/L1CSCTrackFinder"/>
-<use   name="DataFormats/L1DTTrackFinder"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="boost"/>
-<use   name="CSCTrackFinderEmulation"/>
+<use name="L1Trigger/CSCCommonTrigger"/>
+<use name="L1Trigger/DTUtilities"/>
+<use name="L1Trigger/DTTrackFinder"/>
+<use name="Geometry/CSCGeometry"/>
+<use name="Geometry/Records"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="DataFormats/L1CSCTrackFinder"/>
+<use name="DataFormats/L1DTTrackFinder"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="boost"/>
+<use name="CSCTrackFinderEmulation"/>
 <flags CXXFLAGS="-O1"/>
diff --git a/L1Trigger/CSCTrackFinder/plugins/BuildFile.xml b/L1Trigger/CSCTrackFinder/plugins/BuildFile.xml
index 13178c300ad46..40cc58a6a09c7 100644
--- a/L1Trigger/CSCTrackFinder/plugins/BuildFile.xml
+++ b/L1Trigger/CSCTrackFinder/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="L1Trigger/CSCTrackFinder"/>
-<library   file="*.cc" name="L1TriggerCSCTrackFinderPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="L1Trigger/CSCTrackFinder"/>
+<library file="*.cc" name="L1TriggerCSCTrackFinderPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/CSCTrackFinder/test/BuildFile.xml b/L1Trigger/CSCTrackFinder/test/BuildFile.xml
index f0a4d49c5f4dd..f8811634b36ea 100644
--- a/L1Trigger/CSCTrackFinder/test/BuildFile.xml
+++ b/L1Trigger/CSCTrackFinder/test/BuildFile.xml
@@ -1,51 +1,51 @@
-<use   name="SimDataFormats/Track"/>
-<use   name="heppdt"/>
-<use   name="L1Trigger/CSCTrackFinder"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/CSCGeometry"/>
-<use   name="L1Trigger/CSCCommonTrigger"/>
-<use   name="L1Trigger/CSCTriggerPrimitives"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="SimDataFormats/EncodedEventId"/>
-<use   name="rootgraphics"/>
-
+<use name="heppdt"/>
+<use name="rootgraphics"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/CSCGeometry"/>
+<use name="Geometry/Records"/>
+<use name="L1Trigger/CSCCommonTrigger"/>
+<use name="L1Trigger/CSCTrackFinder"/>
+<use name="L1Trigger/CSCTriggerPrimitives"/>
 <use name="PhysicsTools/UtilAlgos"/>
-
-# the following blocks are used by CSCTF experts 
-# to generate and test PT and SR LUTs, 
-# please don't remove them
-
+<use name="SimDataFormats/EncodedEventId"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="SimDataFormats/Track"/>
+
+<!--
+The following blocks are used by CSCTF experts
+to generate and test PT and SR LUTs,
+please don't remove them
+-->
 <library file="analysis/CSCMakeSRLUT.cc" name="CSCMakeSRLUT">
-     <flags EDM_PLUGIN="1"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
 
 <library file="analysis/CSCMakePTLUT.cc" name="CSCMakePTLUT">
-     <flags EDM_PLUGIN="1"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-#The following plugins require this library to be built
-
-#<library file="src/*.cc" name="CSCTFAnaHelpers">
-#</library>
-
-#<library file="analysis/CSCTFEfficiency.cc" name="CSCTFEfficiency">
-#     <flags EDM_PLUGIN="1"/>
-#     <lib name="CSCTFAnaHelpers"/>
-#</library>
+<!--
+The following plugins require this library to be built
 
-#<library file="analysis/LCT*.cc" name="CSCTFLCTAna">
-#     <flags EDM_PLUGIN="1"/>
-#     <lib name="CSCTFAnaHelpers"/>
-#     <use name="DataFormats/Luminosity"/>
-#</library>
+<library file="src/*.cc" name="CSCTFAnaHelpers">
+</library>
 
-#<library file="analysis/CSCTFFilter.cc" name="CSCTFFilter">
-#     <flags EDM_PLUGIN="1"/>
-#     <lib name="CSCTFAnaHelpers"/>
-#</library>
+<library file="analysis/CSCTFEfficiency.cc" name="CSCTFEfficiency">
+  <flags EDM_PLUGIN="1"/>
+  <lib name="CSCTFAnaHelpers"/>
+</library>
 
+<library file="analysis/LCT*.cc" name="CSCTFLCTAna">
+  <flags EDM_PLUGIN="1"/>
+  <lib name="CSCTFAnaHelpers"/>
+  <use name="DataFormats/Luminosity"/>
+</library>
 
+<library file="analysis/CSCTFFilter.cc" name="CSCTFFilter">
+  <flags EDM_PLUGIN="1"/>
+  <lib name="CSCTFAnaHelpers"/>
+</library>
+-->
diff --git a/L1Trigger/CSCTriggerPrimitives/BuildFile.xml b/L1Trigger/CSCTriggerPrimitives/BuildFile.xml
index 7cea26f64b9c3..5231f7bf05c1d 100644
--- a/L1Trigger/CSCTriggerPrimitives/BuildFile.xml
+++ b/L1Trigger/CSCTriggerPrimitives/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="CondFormats/CSCObjects"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="DataFormats/GEMDigi"/>
-<use   name="DataFormats/L1CSCTrackFinder"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Geometry/GEMGeometry"/>
-<use   name="L1Trigger/CSCCommonTrigger"/>
+<use name="CondFormats/CSCObjects"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="DataFormats/GEMDigi"/>
+<use name="DataFormats/L1CSCTrackFinder"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/GEMGeometry"/>
+<use name="L1Trigger/CSCCommonTrigger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/CSCTriggerPrimitives/plugins/BuildFile.xml b/L1Trigger/CSCTriggerPrimitives/plugins/BuildFile.xml
index 8d4f1de995023..644fbf18ebf75 100644
--- a/L1Trigger/CSCTriggerPrimitives/plugins/BuildFile.xml
+++ b/L1Trigger/CSCTriggerPrimitives/plugins/BuildFile.xml
@@ -1,20 +1,19 @@
-<use   name="CondFormats/DataRecord"/>
-<use   name="Geometry/Records"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Geometry/CSCGeometry"/>
-<use   name="L1Trigger/CSCCommonTrigger"/>
-<use   name="L1Trigger/CSCTriggerPrimitives"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="CommonTools/Utils"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="rootgraphics"/>
-
-<library   file="*.cc" name="CSCTriggerPrimitivesPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CondFormats/DataRecord"/>
+<use name="Geometry/Records"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/CSCGeometry"/>
+<use name="L1Trigger/CSCCommonTrigger"/>
+<use name="L1Trigger/CSCTriggerPrimitives"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="CommonTools/Utils"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="rootgraphics"/>
+<library file="*.cc" name="CSCTriggerPrimitivesPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/DTBti/BuildFile.xml b/L1Trigger/DTBti/BuildFile.xml
index 5ecb4b75b0814..529a511812369 100644
--- a/L1Trigger/DTBti/BuildFile.xml
+++ b/L1Trigger/DTBti/BuildFile.xml
@@ -1,15 +1,14 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CalibMuon/DTDigiSync"/>
-<use   name="DataFormats/DTDigi"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="L1TriggerConfig/DTTPGConfig"/>
-<use   name="L1Trigger/DTUtilities"/>
-<use   name="CLHEP"/>
-<use   name="root"/>
-
+<use name="FWCore/Framework"/>
+<use name="DataFormats/Common"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CalibMuon/DTDigiSync"/>
+<use name="DataFormats/DTDigi"/>
+<use name="Geometry/DTGeometry"/>
+<use name="L1TriggerConfig/DTTPGConfig"/>
+<use name="L1Trigger/DTUtilities"/>
+<use name="CLHEP"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/DTSectorCollector/BuildFile.xml b/L1Trigger/DTSectorCollector/BuildFile.xml
index 91c2252023078..81c6ce47ec536 100644
--- a/L1Trigger/DTSectorCollector/BuildFile.xml
+++ b/L1Trigger/DTSectorCollector/BuildFile.xml
@@ -1,15 +1,14 @@
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="L1TriggerConfig/DTTPGConfig"/>
-<use   name="L1Trigger/DTUtilities"/>
-<use   name="L1Trigger/DTBti"/>
-<use   name="L1Trigger/DTTraco"/>
-<use   name="L1Trigger/DTTriggerServerTheta"/>
-<use   name="L1Trigger/DTTriggerServerPhi"/>
-<use   name="CLHEP"/>
-<use   name="root"/>
-
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/DTGeometry"/>
+<use name="L1TriggerConfig/DTTPGConfig"/>
+<use name="L1Trigger/DTUtilities"/>
+<use name="L1Trigger/DTBti"/>
+<use name="L1Trigger/DTTraco"/>
+<use name="L1Trigger/DTTriggerServerTheta"/>
+<use name="L1Trigger/DTTriggerServerPhi"/>
+<use name="CLHEP"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/DTTrackFinder/BuildFile.xml b/L1Trigger/DTTrackFinder/BuildFile.xml
index cd66653fab677..1990d71aa96c9 100644
--- a/L1Trigger/DTTrackFinder/BuildFile.xml
+++ b/L1Trigger/DTTrackFinder/BuildFile.xml
@@ -1,9 +1,9 @@
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="FWCore/Framework"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="DataFormats/L1DTTrackFinder"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/L1CSCTrackFinder"/>
+<use name="FWCore/Framework"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="DataFormats/L1DTTrackFinder"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/L1CSCTrackFinder"/>
diff --git a/L1Trigger/DTTrackFinder/plugins/BuildFile.xml b/L1Trigger/DTTrackFinder/plugins/BuildFile.xml
index 578d914c056c9..33278c807bd18 100644
--- a/L1Trigger/DTTrackFinder/plugins/BuildFile.xml
+++ b/L1Trigger/DTTrackFinder/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="L1Trigger/DTTrackFinder"/>
-<library   file="*.cc" name="L1TriggerDTTrackFinderPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="L1Trigger/DTTrackFinder"/>
+<library file="*.cc" name="L1TriggerDTTrackFinderPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/DTTraco/BuildFile.xml b/L1Trigger/DTTraco/BuildFile.xml
index 96633ff9a4a73..e49fa7705e403 100644
--- a/L1Trigger/DTTraco/BuildFile.xml
+++ b/L1Trigger/DTTraco/BuildFile.xml
@@ -1,13 +1,12 @@
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="L1TriggerConfig/DTTPGConfig"/>
-<use   name="L1Trigger/DTUtilities"/>
-<use   name="L1Trigger/DTBti"/>
-<use   name="L1Trigger/DTTriggerServerTheta"/>
-<use   name="CLHEP"/>
-<use   name="root"/>
-
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/DTGeometry"/>
+<use name="L1TriggerConfig/DTTPGConfig"/>
+<use name="L1Trigger/DTUtilities"/>
+<use name="L1Trigger/DTBti"/>
+<use name="L1Trigger/DTTriggerServerTheta"/>
+<use name="CLHEP"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/DTTrigger/BuildFile.xml b/L1Trigger/DTTrigger/BuildFile.xml
index dbafe39713a23..07d8c27198f04 100644
--- a/L1Trigger/DTTrigger/BuildFile.xml
+++ b/L1Trigger/DTTrigger/BuildFile.xml
@@ -1,19 +1,18 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="L1Trigger/DTUtilities"/>
-<use   name="L1Trigger/DTBti"/>
-<use   name="L1Trigger/DTTraco"/>
-<use   name="L1Trigger/DTTriggerServerPhi"/>
-<use   name="L1Trigger/DTTriggerServerTheta"/>
-<use   name="L1Trigger/DTSectorCollector"/>
-<use   name="DataFormats/L1DTTrackFinder"/>
-<use   name="L1TriggerConfig/DTTPGConfig"/>
-<use   name="Utilities/General"/>
-<use   name="CLHEP"/>
-<use   name="root"/>
-
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/Common"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="Geometry/DTGeometry"/>
+<use name="L1Trigger/DTUtilities"/>
+<use name="L1Trigger/DTBti"/>
+<use name="L1Trigger/DTTraco"/>
+<use name="L1Trigger/DTTriggerServerPhi"/>
+<use name="L1Trigger/DTTriggerServerTheta"/>
+<use name="L1Trigger/DTSectorCollector"/>
+<use name="DataFormats/L1DTTrackFinder"/>
+<use name="L1TriggerConfig/DTTPGConfig"/>
+<use name="Utilities/General"/>
+<use name="CLHEP"/>
+<use name="root"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1Trigger/DTTriggerServerPhi/BuildFile.xml b/L1Trigger/DTTriggerServerPhi/BuildFile.xml
index 9567f231a529f..ff9e380e0471a 100644
--- a/L1Trigger/DTTriggerServerPhi/BuildFile.xml
+++ b/L1Trigger/DTTriggerServerPhi/BuildFile.xml
@@ -1,12 +1,11 @@
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="L1TriggerConfig/DTTPGConfig"/>
-<use   name="L1Trigger/DTUtilities"/>
-<use   name="L1Trigger/DTTraco"/>
-<use   name="CLHEP"/>
-<use   name="root"/>
-
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/DTGeometry"/>
+<use name="L1TriggerConfig/DTTPGConfig"/>
+<use name="L1Trigger/DTUtilities"/>
+<use name="L1Trigger/DTTraco"/>
+<use name="CLHEP"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/DTTriggerServerTheta/BuildFile.xml b/L1Trigger/DTTriggerServerTheta/BuildFile.xml
index 0ec6c316b7620..6a7a54b74a6d5 100644
--- a/L1Trigger/DTTriggerServerTheta/BuildFile.xml
+++ b/L1Trigger/DTTriggerServerTheta/BuildFile.xml
@@ -1,12 +1,11 @@
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="L1Trigger/DTBti"/>
-<use   name="L1Trigger/DTUtilities"/>
-<use   name="L1TriggerConfig/DTTPGConfig"/>
-<use   name="CLHEP"/>
-<use   name="root"/>
-
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/DTGeometry"/>
+<use name="L1Trigger/DTBti"/>
+<use name="L1Trigger/DTUtilities"/>
+<use name="L1TriggerConfig/DTTPGConfig"/>
+<use name="CLHEP"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/DTUtilities/BuildFile.xml b/L1Trigger/DTUtilities/BuildFile.xml
index 7357d1a9ba067..e8471da6fd212 100644
--- a/L1Trigger/DTUtilities/BuildFile.xml
+++ b/L1Trigger/DTUtilities/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="L1TriggerConfig/DTTPGConfig"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="CLHEP"/>
-<use   name="root"/>
-
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/DTGeometry"/>
+<use name="L1TriggerConfig/DTTPGConfig"/>
+<use name="CondFormats/DTObjects"/>
+<use name="CLHEP"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/GlobalCaloTrigger/BuildFile.xml b/L1Trigger/GlobalCaloTrigger/BuildFile.xml
index 8618936af5db7..7b94c2413ef6c 100644
--- a/L1Trigger/GlobalCaloTrigger/BuildFile.xml
+++ b/L1Trigger/GlobalCaloTrigger/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="boost"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
+<use name="boost"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/GlobalCaloTrigger/plugins/BuildFile.xml b/L1Trigger/GlobalCaloTrigger/plugins/BuildFile.xml
index a6a875e1e3648..e4ab1758d2722 100644
--- a/L1Trigger/GlobalCaloTrigger/plugins/BuildFile.xml
+++ b/L1Trigger/GlobalCaloTrigger/plugins/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="L1Trigger/GlobalCaloTrigger"/>
-<library   file="*.cc" name="L1TriggerGlobalCaloTriggerPlugins">
-  <use   name="root"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <flags   EDM_PLUGIN="1"/>
+<use name="L1Trigger/GlobalCaloTrigger"/>
+<library file="*.cc" name="L1TriggerGlobalCaloTriggerPlugins">
+  <use name="root"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/GlobalCaloTrigger/test/BuildFile.xml b/L1Trigger/GlobalCaloTrigger/test/BuildFile.xml
index fb486dc073e1f..5e94aa59af536 100644
--- a/L1Trigger/GlobalCaloTrigger/test/BuildFile.xml
+++ b/L1Trigger/GlobalCaloTrigger/test/BuildFile.xml
@@ -1,25 +1,34 @@
-<use   name="L1Trigger/GlobalCaloTrigger"/>
-<use   name="root"/>
-<flags   EDM_PLUGIN="1"/>
-<library   name="L1GctTest" file="*.cc">
+<use name="L1Trigger/GlobalCaloTrigger"/>
+<use name="root"/>
+<flags EDM_PLUGIN="1"/>
+<library name="L1GctTest" file="*.cc">
 </library>
-<bin   name="checkLut" file="checkLut.cpp,produceTrivialCalibrationLut.cc,L1GctLutFromFile.cc">
+
+<bin name="checkLut" file="checkLut.cpp,produceTrivialCalibrationLut.cc,L1GctLutFromFile.cc">
   <flags NO_TESTRUN="1"/>
 </bin>
-<bin   name="printMap" file="printMap.cpp">
+
+<bin name="printMap" file="printMap.cpp">
 </bin>
-<bin   name="printLut" file="printLut.cpp,produceTrivialCalibrationLut.cc">
+
+<bin name="printLut" file="printLut.cpp,produceTrivialCalibrationLut.cc">
   <flags NO_TESTRUN="1"/>
 </bin>
-<bin   name="testGctMap" file="testGctMap.cpp">
+
+<bin name="testGctMap" file="testGctMap.cpp">
 </bin>
-<bin   name="testEtTypes" file="testEtTypes.cpp">
+
+<bin name="testEtTypes" file="testEtTypes.cpp">
 </bin>
-<bin   name="testJetFinder" file="testJetFinder.cpp,produceTrivialCalibrationLut.cc">
+
+<bin name="testJetFinder" file="testJetFinder.cpp,produceTrivialCalibrationLut.cc">
 </bin>
-<bin   name="testElectronSorter" file="testElectronSorter.cpp">
+
+<bin name="testElectronSorter" file="testElectronSorter.cpp">
 </bin>
-<bin   name="testJetFinalStage" file="testJetFinalStage.cpp,produceTrivialCalibrationLut.cc">
+
+<bin name="testJetFinalStage" file="testJetFinalStage.cpp,produceTrivialCalibrationLut.cc">
 </bin>
-<bin   name="testJetEtCalibrationLut" file="testJetEtCalibrationLut.cpp,produceTrivialCalibrationLut.cc">
+
+<bin name="testJetEtCalibrationLut" file="testJetEtCalibrationLut.cpp,produceTrivialCalibrationLut.cc">
 </bin>
diff --git a/L1Trigger/GlobalMuonTrigger/BuildFile.xml b/L1Trigger/GlobalMuonTrigger/BuildFile.xml
index a6b35775b3437..77839227e3e75 100644
--- a/L1Trigger/GlobalMuonTrigger/BuildFile.xml
+++ b/L1Trigger/GlobalMuonTrigger/BuildFile.xml
@@ -1,9 +1,9 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Sources"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/L1TObjects"/>
+<flags EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Sources"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/L1TObjects"/>
diff --git a/L1Trigger/GlobalMuonTrigger/test/BuildFile.xml b/L1Trigger/GlobalMuonTrigger/test/BuildFile.xml
index 49471a7040a25..66c176ce06659 100644
--- a/L1Trigger/GlobalMuonTrigger/test/BuildFile.xml
+++ b/L1Trigger/GlobalMuonTrigger/test/BuildFile.xml
@@ -1,32 +1,37 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="DataFormats/L1DTTrackFinder"/>
-<use   name="DataFormats/DTDigi"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="hepmc"/>
-<use   name="root"/>
-<use   name="CLHEP"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="DataFormats/L1DTTrackFinder"/>
+<use name="DataFormats/DTDigi"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/DTGeometry"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="hepmc"/>
+<use name="root"/>
+<use name="CLHEP"/>
 <bin file="test_*.cc" name="L1TriggerGlobalMuonTriggerTest">
   <use name="catch2"/>
 </bin>
-<library   file="CruzetL1DTfilter.cc" name="CruzetL1DTfilter">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="CruzetL1DTfilter.cc" name="CruzetL1DTfilter">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="L1MuGMTDump.cc" name="L1MuGMTDump">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="L1MuGMTDump.cc" name="L1MuGMTDump">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="L1MuGMTTree.cc" name="L1MuGMTTree">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="L1MuGMTTree.cc" name="L1MuGMTTree">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="L1GmtTriggerSource.cc" name="L1GmtTriggerSource">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="L1GmtTriggerSource.cc" name="L1GmtTriggerSource">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="L1MuGMTPattern.cc" name="L1MuGMTPattern">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="L1MuGMTPattern.cc" name="L1MuGMTPattern">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/GlobalTrigger/BuildFile.xml b/L1Trigger/GlobalTrigger/BuildFile.xml
index c2cad1da6c827..959d5c6cd682c 100644
--- a/L1Trigger/GlobalTrigger/BuildFile.xml
+++ b/L1Trigger/GlobalTrigger/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="xerces-c"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="xerces-c"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/GlobalTriggerAnalyzer/BuildFile.xml b/L1Trigger/GlobalTriggerAnalyzer/BuildFile.xml
index 6f1a5667bec01..56dc4dc1f9048 100644
--- a/L1Trigger/GlobalTriggerAnalyzer/BuildFile.xml
+++ b/L1Trigger/GlobalTriggerAnalyzer/BuildFile.xml
@@ -1,15 +1,15 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CommonTools/UtilAlgos"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<use name="DataFormats/Provenance"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CommonTools/UtilAlgos"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/GlobalTriggerAnalyzer/plugins/BuildFile.xml b/L1Trigger/GlobalTriggerAnalyzer/plugins/BuildFile.xml
index 2c9462aa01277..006a3d598cd49 100644
--- a/L1Trigger/GlobalTriggerAnalyzer/plugins/BuildFile.xml
+++ b/L1Trigger/GlobalTriggerAnalyzer/plugins/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="L1Trigger/GlobalTriggerAnalyzer"/>
-<library   file="Module.cc" name="L1TriggerGlobalTriggerAnalyzerPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="L1Trigger/GlobalTriggerAnalyzer"/>
+<library file="Module.cc" name="L1TriggerGlobalTriggerAnalyzerPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/HardwareValidation/BuildFile.xml b/L1Trigger/HardwareValidation/BuildFile.xml
index dfeba8b22ef1b..395a0e907112f 100644
--- a/L1Trigger/HardwareValidation/BuildFile.xml
+++ b/L1Trigger/HardwareValidation/BuildFile.xml
@@ -1,17 +1,17 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="DataFormats/L1DTTrackFinder"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/L1TCalorimeter"/>
-<use   name="CondTools/L1Trigger"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="DataFormats/L1DTTrackFinder"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/L1TCalorimeter"/>
+<use name="CondTools/L1Trigger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/HardwareValidation/plugins/BuildFile.xml b/L1Trigger/HardwareValidation/plugins/BuildFile.xml
index d0b1848fa56da..c8c91283f2e54 100644
--- a/L1Trigger/HardwareValidation/plugins/BuildFile.xml
+++ b/L1Trigger/HardwareValidation/plugins/BuildFile.xml
@@ -1,20 +1,20 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="L1Trigger/HardwareValidation"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="DataFormats/LTCDigi"/>
-<use   name="DataFormats/L1DTTrackFinder"/>
-<use   name="DataFormats/L1CSCTrackFinder"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="L1Trigger/CSCTrackFinder"/>
-<library   file="*.cc" name="L1TriggerHardwareValidationPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="L1Trigger/HardwareValidation"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="DataFormats/LTCDigi"/>
+<use name="DataFormats/L1DTTrackFinder"/>
+<use name="DataFormats/L1CSCTrackFinder"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="L1Trigger/CSCTrackFinder"/>
+<library file="*.cc" name="L1TriggerHardwareValidationPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/L1ExtraFromDigis/BuildFile.xml b/L1Trigger/L1ExtraFromDigis/BuildFile.xml
index f74cab6b5bf89..d1971051ed398 100644
--- a/L1Trigger/L1ExtraFromDigis/BuildFile.xml
+++ b/L1Trigger/L1ExtraFromDigis/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="clhep"/>
-<use   name="root"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="clhep"/>
+<use name="root"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1Trigger/L1GctAnalyzer/BuildFile.xml b/L1Trigger/L1GctAnalyzer/BuildFile.xml
index fb2ef5e51fe0b..81f708c78c17a 100644
--- a/L1Trigger/L1GctAnalyzer/BuildFile.xml
+++ b/L1Trigger/L1GctAnalyzer/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="root"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="root"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1Trigger/L1TCaloLayer1/BuildFile.xml b/L1Trigger/L1TCaloLayer1/BuildFile.xml
index 8f3c0efb18027..ca06cf8226fc3 100644
--- a/L1Trigger/L1TCaloLayer1/BuildFile.xml
+++ b/L1Trigger/L1TCaloLayer1/BuildFile.xml
@@ -12,5 +12,5 @@
 <use name="Geometry/HcalTowerAlgo"/>
 <use name="Geometry/Records"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/L1TCaloLayer1/test/BuildFile.xml b/L1Trigger/L1TCaloLayer1/test/BuildFile.xml
index c5aacc332b993..e538d9a23456c 100644
--- a/L1Trigger/L1TCaloLayer1/test/BuildFile.xml
+++ b/L1Trigger/L1TCaloLayer1/test/BuildFile.xml
@@ -1,4 +1,9 @@
 <use name="L1Trigger/L1TCaloLayer1"/>
-<bin name="testUCTGeometry" file="testUCTGeometry.cpp"> </bin>
-<bin name="testUCTLayer1" file="testUCTLayer1.cpp"> </bin>
-<bin name="testUCTLayer1HF" file="testUCTLayer1HF.cpp"> </bin>
+<bin name="testUCTGeometry" file="testUCTGeometry.cpp">
+</bin>
+
+<bin name="testUCTLayer1" file="testUCTLayer1.cpp">
+</bin>
+
+<bin name="testUCTLayer1HF" file="testUCTLayer1HF.cpp">
+</bin>
diff --git a/L1Trigger/L1TCalorimeter/plugins/BuildFile.xml b/L1Trigger/L1TCalorimeter/plugins/BuildFile.xml
index c2442bb807681..00ba97f0ec768 100644
--- a/L1Trigger/L1TCalorimeter/plugins/BuildFile.xml
+++ b/L1Trigger/L1TCalorimeter/plugins/BuildFile.xml
@@ -1,24 +1,24 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="CalibFormats/CaloTPG"/>
-<use   name="CalibCalorimetry/EcalTPGTools"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="DataFormats/L1TCalorimeter"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/METReco"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="L1Trigger/L1TCalorimeter"/>
-<use   name="CondTools/L1Trigger"/>
-<library   file="*.cc" name="L1TriggerL1TCalorimeterPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="CalibFormats/CaloTPG"/>
+<use name="CalibCalorimetry/EcalTPGTools"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="DataFormats/L1TCalorimeter"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/METReco"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="L1Trigger/L1TCalorimeter"/>
+<use name="CondTools/L1Trigger"/>
+<library file="*.cc" name="L1TriggerL1TCalorimeterPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/L1TCommon/BuildFile.xml b/L1Trigger/L1TCommon/BuildFile.xml
index 9f76893ae498f..5666ceaf1474f 100644
--- a/L1Trigger/L1TCommon/BuildFile.xml
+++ b/L1Trigger/L1TCommon/BuildFile.xml
@@ -1,7 +1,5 @@
 <use name="xerces-c"/>
 <use name="CondFormats/L1TObjects"/>
-
 <export>
   <lib name="1"/>
 </export>
-
diff --git a/L1Trigger/L1TGEM/BuildFile.xml b/L1Trigger/L1TGEM/BuildFile.xml
index 9b9638cf535ae..9eda2150b14dc 100644
--- a/L1Trigger/L1TGEM/BuildFile.xml
+++ b/L1Trigger/L1TGEM/BuildFile.xml
@@ -1,14 +1,14 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Catalog"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/GEMGeometry"/>
-<use   name="DataFormats/GEMDigi"/>
-<use   name="DataFormats/Common"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Catalog"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/GEMGeometry"/>
+<use name="DataFormats/GEMDigi"/>
+<use name="DataFormats/Common"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/L1Trigger/L1TGEM/plugins/BuildFile.xml b/L1Trigger/L1TGEM/plugins/BuildFile.xml
index f0ab41c05abb8..b715db0cb17ab 100644
--- a/L1Trigger/L1TGEM/plugins/BuildFile.xml
+++ b/L1Trigger/L1TGEM/plugins/BuildFile.xml
@@ -3,6 +3,6 @@
 <use name="DataFormats/MuonDetId"/>
 <use name="CondFormats/DataRecord"/>
 <use name="Geometry/Records"/>
-<library   file="*.cc" name="L1TGEMPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="L1TGEMPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/L1TGlobal/src/BuildFile.xml b/L1Trigger/L1TGlobal/src/BuildFile.xml
index 196bbccbe8342..44a52e17d3537 100644
--- a/L1Trigger/L1TGlobal/src/BuildFile.xml
+++ b/L1Trigger/L1TGlobal/src/BuildFile.xml
@@ -10,4 +10,3 @@
   <lib name="1"/>
 </export>
 <flags ADD_SUBDIR="1"/>
-
diff --git a/L1Trigger/L1THGCal/BuildFile.xml b/L1Trigger/L1THGCal/BuildFile.xml
index 89b85d8bd78d2..7b13987c4ffa0 100644
--- a/L1Trigger/L1THGCal/BuildFile.xml
+++ b/L1Trigger/L1THGCal/BuildFile.xml
@@ -1,14 +1,12 @@
-<use   name="FWCore/Framework"/>
-<use   name="Geometry/HGCalGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="Geometry/Records"/>
-<use   name="DataFormats/L1THGCal"/>
-<use   name="CommonTools/Utils"/>
-<use   name="Geometry/HcalTowerAlgo"/>
-<use   name="SimDataFormats/CaloTest"/>
+<use name="FWCore/Framework"/>
+<use name="Geometry/HGCalGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="Geometry/Records"/>
+<use name="DataFormats/L1THGCal"/>
+<use name="CommonTools/Utils"/>
+<use name="Geometry/HcalTowerAlgo"/>
+<use name="SimDataFormats/CaloTest"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
 <flags ADD_SUBDIR="1"/>
-
-
diff --git a/L1Trigger/L1THGCal/plugins/BuildFile.xml b/L1Trigger/L1THGCal/plugins/BuildFile.xml
index 028150e8acb3c..cfbf8a906b574 100644
--- a/L1Trigger/L1THGCal/plugins/BuildFile.xml
+++ b/L1Trigger/L1THGCal/plugins/BuildFile.xml
@@ -1,31 +1,29 @@
-
-<library   name="L1TriggerL1THGCalPlugins" file="*.cc">
-  <use   name="Geometry/HGCalGeometry"/>
-  <use   name="Geometry/HcalTowerAlgo"/>
-  <use   name="Geometry/CaloTopology"/>
-  <use   name="L1Trigger/L1THGCal"/>
-  <use   name="Geometry/Records"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="L1TriggerL1THGCalPlugins" file="*.cc">
+  <use name="Geometry/HGCalGeometry"/>
+  <use name="Geometry/HcalTowerAlgo"/>
+  <use name="Geometry/CaloTopology"/>
+  <use name="L1Trigger/L1THGCal"/>
+  <use name="Geometry/Records"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-<library   name="L1TriggerL1THGCalPlugins_geometries" file="geometries/*.cc">
-  <use   name="Geometry/HGCalGeometry"/>
-  <use   name="Geometry/HcalTowerAlgo"/>
-  <use   name="Geometry/CaloTopology"/>
-  <use   name="L1Trigger/L1THGCal"/>  
-  <flags   EDM_PLUGIN="1"/>
+<library name="L1TriggerL1THGCalPlugins_geometries" file="geometries/*.cc">
+  <use name="Geometry/HGCalGeometry"/>
+  <use name="Geometry/HcalTowerAlgo"/>
+  <use name="Geometry/CaloTopology"/>
+  <use name="L1Trigger/L1THGCal"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-<library   name="L1TriggerL1THGCalPlugins_fe_be" file="veryfrontend/*.cc, concentrator/*.cc, backend/*.cc">
-  <use   name="CommonTools/MVAUtils"/>
-  <use   name="Geometry/HGCalGeometry"/>
-  <use   name="Geometry/HcalTowerAlgo"/>
-  <use   name="Geometry/CaloTopology"/>
-  <use   name="Geometry/Records"/>
-  <use   name="rootcore"/>
-  <use   name="L1Trigger/L1THGCal"/>
-  <use   name="DataFormats/L1THGCal"/>
-  <use   name="SimDataFormats/CaloTest"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="L1TriggerL1THGCalPlugins_fe_be" file="veryfrontend/*.cc, concentrator/*.cc, backend/*.cc">
+  <use name="CommonTools/MVAUtils"/>
+  <use name="Geometry/HGCalGeometry"/>
+  <use name="Geometry/HcalTowerAlgo"/>
+  <use name="Geometry/CaloTopology"/>
+  <use name="Geometry/Records"/>
+  <use name="rootcore"/>
+  <use name="L1Trigger/L1THGCal"/>
+  <use name="DataFormats/L1THGCal"/>
+  <use name="SimDataFormats/CaloTest"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-
diff --git a/L1Trigger/L1THGCal/test/BuildFile.xml b/L1Trigger/L1THGCal/test/BuildFile.xml
index 50c9632a641a5..fc3e5bc126dfb 100644
--- a/L1Trigger/L1THGCal/test/BuildFile.xml
+++ b/L1Trigger/L1THGCal/test/BuildFile.xml
@@ -1,12 +1,11 @@
-<use   name="Geometry/HGCalGeometry"/>
-<use   name="Geometry/HcalTowerAlgo"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="L1Trigger/L1THGCal"/>
-<use   name="Geometry/Records"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="SimDataFormats/CaloTest"/>
-
-<library name="testL1TriggerL1THGCal"  file="HGCalTriggerGeomTester.cc,HGCalTriggerGeomTesterV9.cc,HGCalTriggerGeomTesterV9Imp2.cc,calib/*.cc">
-<flags   EDM_PLUGIN="1"/>
+<use name="Geometry/HGCalGeometry"/>
+<use name="Geometry/HcalTowerAlgo"/>
+<use name="Geometry/CaloTopology"/>
+<use name="L1Trigger/L1THGCal"/>
+<use name="Geometry/Records"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="SimDataFormats/CaloTest"/>
+<library name="testL1TriggerL1THGCal" file="HGCalTriggerGeomTester.cc,HGCalTriggerGeomTesterV9.cc,HGCalTriggerGeomTesterV9Imp2.cc,calib/*.cc">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/L1THGCalUtilities/BuildFile.xml b/L1Trigger/L1THGCalUtilities/BuildFile.xml
index 1e33cfeb25c51..67d14007906db 100644
--- a/L1Trigger/L1THGCalUtilities/BuildFile.xml
+++ b/L1Trigger/L1THGCalUtilities/BuildFile.xml
@@ -1,10 +1,8 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/L1THGCal"/>
-<use   name="CommonTools/Utils"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1THGCal"/>
+<use name="CommonTools/Utils"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
 <flags ADD_SUBDIR="1"/>
-
-
diff --git a/L1Trigger/L1THGCalUtilities/plugins/BuildFile.xml b/L1Trigger/L1THGCalUtilities/plugins/BuildFile.xml
index 87febb90d6c24..412e5a217a64f 100644
--- a/L1Trigger/L1THGCalUtilities/plugins/BuildFile.xml
+++ b/L1Trigger/L1THGCalUtilities/plugins/BuildFile.xml
@@ -1,35 +1,37 @@
-<library   name="L1TriggerL1THGCalUtilitiesPlugins_ntuples" file="ntuples/*.cc">
-  <use   name="L1Trigger/L1THGCal"/>
-  <use   name="L1Trigger/L1THGCalUtilities"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="SimDataFormats/CaloTest"/>
-  <use   name="DataFormats/JetReco"/>
-  <use   name="Geometry/HcalTowerAlgo"/>
-  <use   name="SimDataFormats/PileupSummaryInfo"/>
-  <use   name="SimDataFormats/GeneratorProducts"/>
-  <use   name="TrackPropagation/RungeKutta"/>
-  <use   name="FastSimulation/Event"/>
-  <use   name="FastSimulation/CaloGeometryTools"/>
-  <use   name="MagneticField/Engine"/>
-  <use   name="MagneticField/Records"/>
+<library name="L1TriggerL1THGCalUtilitiesPlugins_ntuples" file="ntuples/*.cc">
+  <use name="L1Trigger/L1THGCal"/>
+  <use name="L1Trigger/L1THGCalUtilities"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="SimDataFormats/CaloTest"/>
+  <use name="DataFormats/JetReco"/>
+  <use name="Geometry/HcalTowerAlgo"/>
+  <use name="SimDataFormats/PileupSummaryInfo"/>
+  <use name="SimDataFormats/GeneratorProducts"/>
+  <use name="TrackPropagation/RungeKutta"/>
+  <use name="FastSimulation/Event"/>
+  <use name="FastSimulation/CaloGeometryTools"/>
+  <use name="MagneticField/Engine"/>
+  <use name="MagneticField/Records"/>
   <use name="heppdt"/>
-  <flags   EDM_PLUGIN="1"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   name="L1TriggerL1THGCalUtilitiesPlugins_selectors" file="selectors/*.cc">
-  <use   name="L1Trigger/L1THGCal"/>
-  <use   name="CommonTools/Utils"/>
-  <use   name="CommonTools/MVAUtils"/>
-  <use   name="roottmva"/>
-  <flags   EDM_PLUGIN="1"/>
+
+<library name="L1TriggerL1THGCalUtilitiesPlugins_selectors" file="selectors/*.cc">
+  <use name="L1Trigger/L1THGCal"/>
+  <use name="CommonTools/Utils"/>
+  <use name="CommonTools/MVAUtils"/>
+  <use name="roottmva"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   name="L1TriggerL1THGCalUtilitiesPlugins_calotruth" file="CaloTruthCellsProducer.cc">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="Geometry/Records"/>
-  <use   name="SimDataFormats/CaloAnalysis"/>
-  <use   name="SimDataFormats/CaloTest"/>
-  <use   name="DataFormats/L1THGCal"/>
-  <use   name="L1Trigger/L1THGCal"/>
+
+<library name="L1TriggerL1THGCalUtilitiesPlugins_calotruth" file="CaloTruthCellsProducer.cc">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="Geometry/Records"/>
+  <use name="SimDataFormats/CaloAnalysis"/>
+  <use name="SimDataFormats/CaloTest"/>
+  <use name="DataFormats/L1THGCal"/>
+  <use name="L1Trigger/L1THGCal"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/L1TMuon/BuildFile.xml b/L1Trigger/L1TMuon/BuildFile.xml
index 9d4cb7d1a0d2d..6ef9fe262da5a 100644
--- a/L1Trigger/L1TMuon/BuildFile.xml
+++ b/L1Trigger/L1TMuon/BuildFile.xml
@@ -1,34 +1,26 @@
 <export>
-  <lib name="1"/>  
-  <use name="DataFormats/L1TMuon"/>   
-  <use name="root"/> 
+  <lib name="1"/>
+  <use name="DataFormats/L1TMuon"/>
+  <use name="root"/>
   <use name="xerces-c"/>
 </export>
-
-
 <use name="DataFormats/L1TMuon"/>
 <use name="DataFormats/ParticleFlowCandidate"/>
 <use name="DataFormats/ParticleFlowReco"/>
-
 <use name="FWCore/PluginManager"/>
-
 <use name="L1Trigger/L1TCommon"/>
 <use name="L1Trigger/CSCCommonTrigger"/>
 <use name="L1Trigger/CSCTrackFinder"/>
 <use name="L1Trigger/DTTrackFinder"/>
 <use name="L1Trigger/DTUtilities"/>
 <use name="L1Trigger/RPCTrigger"/>
-
 <use name="Geometry/Records"/>
 <use name="Geometry/CSCGeometry"/>
 <use name="Geometry/DTGeometry"/>
 <use name="Geometry/RPCGeometry"/>
 <use name="Geometry/GEMGeometry"/>
-
 <use name="PhysicsTools/UtilAlgos"/>
-
 <use name="MagneticField/Engine"/>
 <use name="MagneticField/Records"/>
-
 <use name="DataFormats/L1TrackTrigger"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
diff --git a/L1Trigger/L1TMuon/plugins/BuildFile.xml b/L1Trigger/L1TMuon/plugins/BuildFile.xml
index a863c7ff56c47..996f2871fb2ad 100644
--- a/L1Trigger/L1TMuon/plugins/BuildFile.xml
+++ b/L1Trigger/L1TMuon/plugins/BuildFile.xml
@@ -10,4 +10,3 @@
   <use name="CondFormats/DataRecord"/>
   <flags EDM_PLUGIN="1"/>
 </library>
-
diff --git a/L1Trigger/L1TMuonBarrel/plugins/BuildFile.xml b/L1Trigger/L1TMuonBarrel/plugins/BuildFile.xml
index acf173399e197..51f09d74b78fa 100644
--- a/L1Trigger/L1TMuonBarrel/plugins/BuildFile.xml
+++ b/L1Trigger/L1TMuonBarrel/plugins/BuildFile.xml
@@ -1,16 +1,16 @@
-<library   file="*.cc" name="L1TriggerL1TMuonBarrelPlugins">
-<use name="L1Trigger/L1TMuonEndCap"/>
-<use name="L1Trigger/DTTrackFinder"/>
-<use name="FWCore/ServiceRegistry"/>
-<use name="CommonTools/UtilAlgos"/>
-<use name="DataFormats/HepMCCandidate"/>
-<use name="DataFormats/L1TMuon"/>
-<use name="DQM/DTMonitorModule"/>
-<use name="CondFormats/DataRecord"/>
-<use name="CondFormats/L1TObjects"/>
-<use name="L1Trigger/L1TMuonBarrel"/>
-<use name="L1Trigger/L1TCommon"/>
-<flags LDFLAGS="-fPIC"/>
-<flags EDM_PLUGIN="1"/>
-<flags ADD_SUBDIR="1"/>
+<library file="*.cc" name="L1TriggerL1TMuonBarrelPlugins">
+  <use name="L1Trigger/L1TMuonEndCap"/>
+  <use name="L1Trigger/DTTrackFinder"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="DataFormats/HepMCCandidate"/>
+  <use name="DataFormats/L1TMuon"/>
+  <use name="DQM/DTMonitorModule"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondFormats/L1TObjects"/>
+  <use name="L1Trigger/L1TMuonBarrel"/>
+  <use name="L1Trigger/L1TCommon"/>
+  <flags LDFLAGS="-fPIC"/>
+  <flags EDM_PLUGIN="1"/>
+  <flags ADD_SUBDIR="1"/>
 </library>
diff --git a/L1Trigger/L1TMuonBarrel/src/BuildFile.xml b/L1Trigger/L1TMuonBarrel/src/BuildFile.xml
index b6c0f3bb41e3d..71e3accd40ec5 100644
--- a/L1Trigger/L1TMuonBarrel/src/BuildFile.xml
+++ b/L1Trigger/L1TMuonBarrel/src/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="L1Trigger/DTTrackFinder"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Framework"/>
-
 <use name="CommonTools/UtilAlgos"/>
 <use name="DataFormats/HepMCCandidate"/>
 <use name="DataFormats/L1TMuon"/>
@@ -11,7 +10,6 @@
 <use name="CondFormats/L1TObjects"/>
 <use name="CondFormats/DataRecord"/>
 <use name="L1Trigger/L1TCommon"/>
-
 <export>
   <lib name="1"/>
 </export>
diff --git a/L1Trigger/L1TMuonCPPF/BuildFile.xml b/L1Trigger/L1TMuonCPPF/BuildFile.xml
index b62bcb7a291cc..6e21a90f00480 100644
--- a/L1Trigger/L1TMuonCPPF/BuildFile.xml
+++ b/L1Trigger/L1TMuonCPPF/BuildFile.xml
@@ -1,32 +1,25 @@
 <export>
   <lib name="1"/>
 </export>
-
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/L1TMuon"/>
 <use name="L1Trigger/L1TMuon"/>
 <use name="root"/>
-
 <use name="FWCore/PluginManager"/>
-
 <use name="DataFormats/Common"/>
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/MuonDetId"/>
 <use name="DataFormats/RPCDigi"/>
 <use name="DataFormats/RPCRecHit"/>
 <use name="DataFormats/TrackingRecHit"/>
-
 <use name="CondFormats/RPCObjects"/>
 <use name="CondFormats/DataRecord"/>
-
 <use name="Geometry/Records"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/RPCGeometry"/>
 <use name="TrackingTools/TrackRefitter"/>
-
 <use name="RecoMuon/DetLayers"/>
-
 <use name="FWCore/Utilities"/>
 <use name="FWCore/MessageLogger"/>
 <use name="L1Trigger/L1TMuonEndCap"/>
diff --git a/L1Trigger/L1TMuonEndCap/BuildFile.xml b/L1Trigger/L1TMuonEndCap/BuildFile.xml
index ad127848a5983..b0e1ace8a2804 100644
--- a/L1Trigger/L1TMuonEndCap/BuildFile.xml
+++ b/L1Trigger/L1TMuonEndCap/BuildFile.xml
@@ -3,7 +3,6 @@
 </export>
 <flags ADD_SUBDIR="1"/>
 <flags LDFLAGS="-lXMLIO"/>
-
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/L1TMuon"/>
diff --git a/L1Trigger/L1TMuonEndCap/test/BuildFile.xml b/L1Trigger/L1TMuonEndCap/test/BuildFile.xml
index 9a10c30338392..97868c9e80869 100644
--- a/L1Trigger/L1TMuonEndCap/test/BuildFile.xml
+++ b/L1Trigger/L1TMuonEndCap/test/BuildFile.xml
@@ -8,13 +8,11 @@
     <use name="L1Trigger/L1TMuonEndCap"/>
     <use name="cppunit"/>
   </bin>
-</environment>
-
 
+</environment>
 <environment>
   <export>
-  </export>
-
+</export>
   <library file="tools/*.cc" name="L1TriggerL1TMuonEndCap_tools">
     <use name="L1Trigger/L1TMuonEndCap"/>
     <use name="Geometry/DTGeometry"/>
@@ -23,4 +21,5 @@
     <use name="root"/>
     <flags EDM_PLUGIN="1"/>
   </library>
+
 </environment>
diff --git a/L1Trigger/L1TMuonOverlap/BuildFile.xml b/L1Trigger/L1TMuonOverlap/BuildFile.xml
index 73d47acfac162..35b347363fb2c 100644
--- a/L1Trigger/L1TMuonOverlap/BuildFile.xml
+++ b/L1Trigger/L1TMuonOverlap/BuildFile.xml
@@ -1,28 +1,23 @@
 <export>
-  <lib name="1"/>  
+  <lib name="1"/>
   <use name="DataFormats/L1TMuon"/>
   <use name="L1Trigger/RPCTrigger"/>
   <use name="DataFormats/L1TMuon"/>
   <use name="Geometry/Records"/>
   <use name="Geometry/DTGeometry"/>
   <use name="Geometry/CSCGeometry"/>
-  <use name="Geometry/RPCGeometry"/>  
-  <use name="root"/> 
+  <use name="Geometry/RPCGeometry"/>
+  <use name="root"/>
   <use name="xerces-c"/>
 </export>
-
 <use name="xerces-c"/>
 <use name="root"/>
-
 <use name="L1Trigger/RPCTrigger"/>
 <use name="DataFormats/L1TMuon"/>
-
 <use name="Geometry/Records"/>
 <use name="Geometry/DTGeometry"/>
 <use name="Geometry/CSCGeometry"/>
-<use name="Geometry/RPCGeometry"/>  
-
+<use name="Geometry/RPCGeometry"/>
 <use name="L1Trigger/CSCCommonTrigger"/>
 <use name="L1Trigger/DTUtilities"/>
-
 <flags ADD_SUBDIR="1"/>
diff --git a/L1Trigger/L1TMuonOverlap/plugins/BuildFile.xml b/L1Trigger/L1TMuonOverlap/plugins/BuildFile.xml
index f64a4b668baa8..82f07b94769ad 100644
--- a/L1Trigger/L1TMuonOverlap/plugins/BuildFile.xml
+++ b/L1Trigger/L1TMuonOverlap/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<library file="*.cc" name="L1TriggerL1TMuonOverlapPlugins"> 
+<library file="*.cc" name="L1TriggerL1TMuonOverlapPlugins">
   <use name="L1Trigger/L1TMuonOverlap"/>
   <use name="CondFormats/L1TObjects"/>
   <use name="CondFormats/DataRecord"/>
diff --git a/L1Trigger/L1TNtuples/plugins/BuildFile.xml b/L1Trigger/L1TNtuples/plugins/BuildFile.xml
index 45ccf43faf767..a42e8f7c42e3b 100644
--- a/L1Trigger/L1TNtuples/plugins/BuildFile.xml
+++ b/L1Trigger/L1TNtuples/plugins/BuildFile.xml
@@ -46,6 +46,6 @@
 <use name="PhysicsTools/Utilities"/>
 <use name="HLTrigger/HLTcore"/>
 <use name="L1Trigger/L1TNtuples"/>
-<library   file="*.cc" name="L1TriggerL1TNtuplePlugins">
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="L1TriggerL1TNtuplePlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/L1TTwinMux/BuildFile.xml b/L1Trigger/L1TTwinMux/BuildFile.xml
index 2514dc47a6f1a..ef6df37965f69 100644
--- a/L1Trigger/L1TTwinMux/BuildFile.xml
+++ b/L1Trigger/L1TTwinMux/BuildFile.xml
@@ -6,7 +6,6 @@
 <use name="CondFormats/L1TObjects"/>
 <use name="CondFormats/DataRecord"/>
 <use name="DataFormats/RPCDigi"/>
-
 <export>
   <lib name="1"/>
 </export>
diff --git a/L1Trigger/L1TTwinMux/plugins/BuildFile.xml b/L1Trigger/L1TTwinMux/plugins/BuildFile.xml
index 946a24363cbf3..58e2fbc9bbd94 100644
--- a/L1Trigger/L1TTwinMux/plugins/BuildFile.xml
+++ b/L1Trigger/L1TTwinMux/plugins/BuildFile.xml
@@ -1,8 +1,8 @@
-<library   file="*.cc" name="L1TriggerL1TTwinMuxPlugins">
-<use name="FWCore/ServiceRegistry"/>
-<use name="CondFormats/DataRecord"/>
-<use name="CondFormats/L1TObjects"/>
-<use name="L1Trigger/L1TTwinMux"/>
-<flags EDM_PLUGIN="1"/>
-<flags ADD_SUBDIR="1"/>
+<library file="*.cc" name="L1TriggerL1TTwinMuxPlugins">
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondFormats/L1TObjects"/>
+  <use name="L1Trigger/L1TTwinMux"/>
+  <flags EDM_PLUGIN="1"/>
+  <flags ADD_SUBDIR="1"/>
 </library>
diff --git a/L1Trigger/RPCTechnicalTrigger/BuildFile.xml b/L1Trigger/RPCTechnicalTrigger/BuildFile.xml
index 7749d976561bb..c1b81314b6e57 100644
--- a/L1Trigger/RPCTechnicalTrigger/BuildFile.xml
+++ b/L1Trigger/RPCTechnicalTrigger/BuildFile.xml
@@ -1,14 +1,14 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="DataFormats/RPCDigi"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/Common"/>
-<use   name="CondFormats/RPCObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/RPCGeometry"/>
-<use   name="root"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="DataFormats/RPCDigi"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/Common"/>
+<use name="CondFormats/RPCObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/RPCGeometry"/>
+<use name="root"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/L1Trigger/RPCTrigger/BuildFile.xml b/L1Trigger/RPCTrigger/BuildFile.xml
index 8d7997934fc80..19775eb62dae6 100644
--- a/L1Trigger/RPCTrigger/BuildFile.xml
+++ b/L1Trigger/RPCTrigger/BuildFile.xml
@@ -1,18 +1,18 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Utilities/Xerces"/>
-<use   name="DataFormats/RPCDigi"/>
-<use   name="Geometry/RPCGeometry"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/CommonTopologies"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="xerces-c"/>
-<use   name="CondFormats/RPCObjects"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Utilities/Xerces"/>
+<use name="DataFormats/RPCDigi"/>
+<use name="Geometry/RPCGeometry"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/CommonTopologies"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="xerces-c"/>
+<use name="CondFormats/RPCObjects"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/RPCTrigger/plugins/BuildFile.xml b/L1Trigger/RPCTrigger/plugins/BuildFile.xml
index 314d9e125cbca..9d65e754b5f30 100644
--- a/L1Trigger/RPCTrigger/plugins/BuildFile.xml
+++ b/L1Trigger/RPCTrigger/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="L1Trigger/RPCTrigger"/>
-<library   file="*.cc" name="L1TriggerRPCTriggerPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="L1Trigger/RPCTrigger"/>
+<library file="*.cc" name="L1TriggerRPCTriggerPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/RegionalCaloTrigger/BuildFile.xml b/L1Trigger/RegionalCaloTrigger/BuildFile.xml
index 118060bd69ef4..f303483f3524a 100644
--- a/L1Trigger/RegionalCaloTrigger/BuildFile.xml
+++ b/L1Trigger/RegionalCaloTrigger/BuildFile.xml
@@ -1,24 +1,24 @@
-<use   name="boost"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="CalibFormats/CaloTPG"/>
-<use   name="CalibCalorimetry/EcalTPGTools"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="clhep"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/HepMCCandidate"/>
-<use   name="CalibFormats/HcalObjects"/>
-<use   name="CondFormats/RunInfo"/>
-<use   name="root"/>
+<use name="boost"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="CalibFormats/CaloTPG"/>
+<use name="CalibCalorimetry/EcalTPGTools"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="clhep"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/HepMCCandidate"/>
+<use name="CalibFormats/HcalObjects"/>
+<use name="CondFormats/RunInfo"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/RegionalCaloTrigger/plugins/BuildFile.xml b/L1Trigger/RegionalCaloTrigger/plugins/BuildFile.xml
index c4568c5570d43..cde2f18440e5a 100644
--- a/L1Trigger/RegionalCaloTrigger/plugins/BuildFile.xml
+++ b/L1Trigger/RegionalCaloTrigger/plugins/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="L1Trigger/RegionalCaloTrigger"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="FWCore/ServiceRegistry"/>
-<library   file="*.cc" name="L1TriggerRegionalCaloTriggerPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="L1Trigger/RegionalCaloTrigger"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="FWCore/ServiceRegistry"/>
+<library file="*.cc" name="L1TriggerRegionalCaloTriggerPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/Skimmer/BuildFile.xml b/L1Trigger/Skimmer/BuildFile.xml
index 5420132d16dd0..50f0a7b271c60 100644
--- a/L1Trigger/Skimmer/BuildFile.xml
+++ b/L1Trigger/Skimmer/BuildFile.xml
@@ -1,10 +1,10 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="boost"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/L1TObjects"/>
+<flags EDM_PLUGIN="1"/>
+<use name="boost"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/L1TObjects"/>
diff --git a/L1Trigger/TextToDigi/BuildFile.xml b/L1Trigger/TextToDigi/BuildFile.xml
index 558bb531b7989..a1fdbaede7c39 100644
--- a/L1Trigger/TextToDigi/BuildFile.xml
+++ b/L1Trigger/TextToDigi/BuildFile.xml
@@ -1,3 +1,3 @@
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/TextToDigi/plugins/BuildFile.xml b/L1Trigger/TextToDigi/plugins/BuildFile.xml
index b7258da8f75ea..579a4490f38e8 100644
--- a/L1Trigger/TextToDigi/plugins/BuildFile.xml
+++ b/L1Trigger/TextToDigi/plugins/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="L1Trigger/TextToDigi"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<library   file="*.cc" name="L1TriggerTextToDigiPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="L1Trigger/TextToDigi"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<library file="*.cc" name="L1TriggerTextToDigiPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/TextToDigi/test/BuildFile.xml b/L1Trigger/TextToDigi/test/BuildFile.xml
index 6d6d43cf3e52c..02b163dc94f3d 100644
--- a/L1Trigger/TextToDigi/test/BuildFile.xml
+++ b/L1Trigger/TextToDigi/test/BuildFile.xml
@@ -1,3 +1,3 @@
-<use   name="L1Trigger/TextToDigi"/>
-<bin   name="testSourceCardRouting" file="testSourceCardRouting.cpp">
+<use name="L1Trigger/TextToDigi"/>
+<bin name="testSourceCardRouting" file="testSourceCardRouting.cpp">
 </bin>
diff --git a/L1Trigger/TrackTrigger/BuildFile.xml b/L1Trigger/TrackTrigger/BuildFile.xml
index b6efbd97e1049..bcd42808b20e3 100644
--- a/L1Trigger/TrackTrigger/BuildFile.xml
+++ b/L1Trigger/TrackTrigger/BuildFile.xml
@@ -1,42 +1,42 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/CommonTopologies"/>
-<use   name="Geometry/DTGeometry"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="DataFormats/SiPixelDigi"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="TrackingTools/TrackAssociator"/>
-<use   name="PhysicsTools/CandUtils"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/HepMCCandidate"/>
-<use   name="TrackingTools/Records"/>
-<use   name="TrackingTools/PatternTools"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="TrackingTools/GeomPropagators"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="TrackingTools/TrajectoryParametrization"/>
-<use   name="RecoTracker/TrackProducer"/>
-<use   name="clhep"/>
-<use   name="xerces-c"/>
-<use   name="boost"/>
-<use   name="root"/>
-<use   name="rootrflx"/>
-<use   name="DataFormats/SiPixelDetId"/>
-<use   name="DataFormats/L1TrackTrigger"/>
-<use   name="DataFormats/Phase2TrackerDigi"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/CommonTopologies"/>
+<use name="Geometry/DTGeometry"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/SiPixelDigi"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/VertexReco"/>
+<use name="TrackingTools/TrackAssociator"/>
+<use name="PhysicsTools/CandUtils"/>
+<use name="FWCore/MessageLogger"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/HepMCCandidate"/>
+<use name="TrackingTools/Records"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="TrackingTools/GeomPropagators"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="TrackingTools/TrajectoryParametrization"/>
+<use name="RecoTracker/TrackProducer"/>
+<use name="clhep"/>
+<use name="xerces-c"/>
+<use name="boost"/>
+<use name="root"/>
+<use name="rootrflx"/>
+<use name="DataFormats/SiPixelDetId"/>
+<use name="DataFormats/L1TrackTrigger"/>
+<use name="DataFormats/Phase2TrackerDigi"/>
 <export>
-  <flags   SEALPLUGIN="1"/>
-  <lib   name="1"/>
+  <flags SEALPLUGIN="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/TrackTrigger/plugins/BuildFile.xml b/L1Trigger/TrackTrigger/plugins/BuildFile.xml
index 724574e812612..dbf6e6ba55ad8 100644
--- a/L1Trigger/TrackTrigger/plugins/BuildFile.xml
+++ b/L1Trigger/TrackTrigger/plugins/BuildFile.xml
@@ -1,9 +1,9 @@
-<library   file="*.cc" name="TrackTriggerPlugins">
-  <use   name="L1Trigger/TrackTrigger"/>
-  <use   name="DataFormats/L1TrackTrigger"/>
-  <use   name="PhysicsTools/UtilAlgos"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="DataFormats/Phase2TrackerDigi"/>
-  <use   name="root"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="TrackTriggerPlugins">
+  <use name="L1Trigger/TrackTrigger"/>
+  <use name="DataFormats/L1TrackTrigger"/>
+  <use name="PhysicsTools/UtilAlgos"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="DataFormats/Phase2TrackerDigi"/>
+  <use name="root"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/L1Trigger/TrackTrigger/test/BuildFile.xml b/L1Trigger/TrackTrigger/test/BuildFile.xml
index 88ce97cac38ce..c56c0abc54c71 100644
--- a/L1Trigger/TrackTrigger/test/BuildFile.xml
+++ b/L1Trigger/TrackTrigger/test/BuildFile.xml
@@ -1,45 +1,46 @@
 <environment>
-  <library   file="*.cc" name="L1TriggerTrackTriggerTests">
-    <flags   EDM_PLUGIN="1"/>
-    <use   name="FWCore/Framework"/>
-    <use   name="FWCore/PluginManager"/>
-    <use   name="FWCore/ParameterSet"/>
-    <use   name="Geometry/Records"/>
-    <use   name="Geometry/TrackerGeometryBuilder"/>
-    <use   name="Geometry/TrackerNumberingBuilder"/>
-    <use   name="Geometry/CommonDetUnit"/>
-    <use   name="CondFormats/Alignment"/>
-    <use   name="DataFormats/CaloTowers"/>    
-    <use   name="Geometry/CaloTopology"/>    
-    <use   name="Geometry/CaloGeometry"/>
-    <use   name="DataFormats/L1TrackTrigger"/>
-    <use   name="root"/>
-    <use   name="heppdt"/>
-    <use   name="SimTracker/TrackerHitAssociation"/>
-    <use   name="DataFormats/Common"/>
-    <use   name="DataFormats/TrackerRecHit2D"/>
-    <use   name="SimDataFormats/Vertex"/>
-    <use   name="SimDataFormats/TrackingHit"/>
-    <use   name="SimDataFormats/CrossingFrame"/>
-    <use   name="SimDataFormats/TrackingAnalysis"/>
-    <use   name="RecoLocalTracker/SiPixelRecHits"/>
-    <use   name="PhysicsTools/UtilAlgos"/>
-    <use   name="FWCore/ServiceRegistry"/>
-    <use   name="clhep"/>
-    <use   name="DataFormats/EcalDigi"/>
-    <use   name="DataFormats/EcalDetId"/>
-    <use   name="DataFormats/HcalDigi"/>
-    <use   name="DataFormats/HcalDetId"/>
-    <use   name="TrackingTools/TrackAssociator"/>
-    <use   name="TrackingTools/TrajectoryState"/>
-    <use   name="PhysicsTools/CandUtils"/>
-    <use   name="FWCore/MessageLogger"/>
-    <use   name="DataFormats/L1Trigger"/>
-    <use   name="DataFormats/HepMCCandidate"/>
-    <use   name="CondFormats/L1TObjects"/>
-    <use   name="CondFormats/DataRecord"/>
-    <use   name="RecoTracker/TkSeedGenerator"/>
-    <use   name="DataFormats/Phase2TrackerDigi"/>
-    <flags   CXXFLAGS="-g -O0"/>
+  <library file="*.cc" name="L1TriggerTrackTriggerTests">
+    <flags EDM_PLUGIN="1"/>
+    <use name="FWCore/Framework"/>
+    <use name="FWCore/PluginManager"/>
+    <use name="FWCore/ParameterSet"/>
+    <use name="Geometry/Records"/>
+    <use name="Geometry/TrackerGeometryBuilder"/>
+    <use name="Geometry/TrackerNumberingBuilder"/>
+    <use name="Geometry/CommonDetUnit"/>
+    <use name="CondFormats/Alignment"/>
+    <use name="DataFormats/CaloTowers"/>
+    <use name="Geometry/CaloTopology"/>
+    <use name="Geometry/CaloGeometry"/>
+    <use name="DataFormats/L1TrackTrigger"/>
+    <use name="root"/>
+    <use name="heppdt"/>
+    <use name="SimTracker/TrackerHitAssociation"/>
+    <use name="DataFormats/Common"/>
+    <use name="DataFormats/TrackerRecHit2D"/>
+    <use name="SimDataFormats/Vertex"/>
+    <use name="SimDataFormats/TrackingHit"/>
+    <use name="SimDataFormats/CrossingFrame"/>
+    <use name="SimDataFormats/TrackingAnalysis"/>
+    <use name="RecoLocalTracker/SiPixelRecHits"/>
+    <use name="PhysicsTools/UtilAlgos"/>
+    <use name="FWCore/ServiceRegistry"/>
+    <use name="clhep"/>
+    <use name="DataFormats/EcalDigi"/>
+    <use name="DataFormats/EcalDetId"/>
+    <use name="DataFormats/HcalDigi"/>
+    <use name="DataFormats/HcalDetId"/>
+    <use name="TrackingTools/TrackAssociator"/>
+    <use name="TrackingTools/TrajectoryState"/>
+    <use name="PhysicsTools/CandUtils"/>
+    <use name="FWCore/MessageLogger"/>
+    <use name="DataFormats/L1Trigger"/>
+    <use name="DataFormats/HepMCCandidate"/>
+    <use name="CondFormats/L1TObjects"/>
+    <use name="CondFormats/DataRecord"/>
+    <use name="RecoTracker/TkSeedGenerator"/>
+    <use name="DataFormats/Phase2TrackerDigi"/>
+    <flags CXXFLAGS="-g -O0"/>
   </library>
+
 </environment>
diff --git a/L1Trigger/TrackerDTC/BuildFile.xml b/L1Trigger/TrackerDTC/BuildFile.xml
index 44fcee99a80e4..2812c28514fd3 100644
--- a/L1Trigger/TrackerDTC/BuildFile.xml
+++ b/L1Trigger/TrackerDTC/BuildFile.xml
@@ -2,5 +2,5 @@
 <use name="CondFormats/SiPhase2TrackerObjects"/>
 <use name="L1Trigger/TrackTrigger"/>
 <export>
-    <lib name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/L1Trigger/TrackerDTC/plugins/BuildFile.xml b/L1Trigger/TrackerDTC/plugins/BuildFile.xml
index bb78c98e34f27..d02f4a981c62d 100644
--- a/L1Trigger/TrackerDTC/plugins/BuildFile.xml
+++ b/L1Trigger/TrackerDTC/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
 <library file="*.cc" name="TrackerDTCPlugins">
-    <use name="L1Trigger/TrackerDTC"/>
-    <flags EDM_PLUGIN="1"/>
-</library>
\ No newline at end of file
+  <use name="L1Trigger/TrackerDTC"/>
+  <flags EDM_PLUGIN="1"/>
+</library>