From 8fd611e551a9d8467ffcb1a1a6f1b7b566e6b3f2 Mon Sep 17 00:00:00 2001
From: Andrea Bocci <andrea.bocci@cern.ch>
Date: Tue, 5 May 2020 14:40:08 +0200
Subject: [PATCH] Clean up BuildFiles under EventFilter/

Clean up BuildFile.xml filea with `xmllint --format`.
---
 EventFilter/CSCRawToDigi/BuildFile.xml        | 18 +++---
 .../CSCRawToDigi/plugins/BuildFile.xml        |  6 +-
 EventFilter/CSCRawToDigi/test/BuildFile.xml   |  8 +--
 EventFilter/CSCTFRawToDigi/BuildFile.xml      | 16 ++---
 .../CSCTFRawToDigi/plugins/BuildFile.xml      |  8 +--
 EventFilter/CSCTFRawToDigi/test/BuildFile.xml |  2 -
 EventFilter/CTPPSRawToDigi/BuildFile.xml      |  6 +-
 .../CTPPSRawToDigi/plugins/BuildFile.xml      | 21 +++----
 EventFilter/CTPPSRawToDigi/test/BuildFile.xml | 15 ++---
 EventFilter/CastorRawToDigi/BuildFile.xml     | 18 +++---
 .../CastorRawToDigi/plugins/BuildFile.xml     | 22 +++----
 EventFilter/DTRawToDigi/plugins/BuildFile.xml | 20 +++---
 EventFilter/DTRawToDigi/test/BuildFile.xml    | 10 +--
 EventFilter/DTTFRawToDigi/BuildFile.xml       | 12 ++--
 EventFilter/ESDigiToRaw/BuildFile.xml         | 12 ++--
 EventFilter/ESRawToDigi/BuildFile.xml         | 21 +++----
 EventFilter/EcalDigiToRaw/BuildFile.xml       | 20 +++---
 EventFilter/EcalRawToDigi/BuildFile.xml       | 41 ++++++------
 .../EcalRawToDigi/plugins/BuildFile.xml       | 36 +++++------
 EventFilter/EcalTBRawToDigi/BuildFile.xml     | 24 +++----
 .../EcalTBRawToDigi/test/BuildFile.xml        | 63 ++++++++++---------
 EventFilter/GEMRawToDigi/BuildFile.xml        | 24 +++----
 .../GEMRawToDigi/plugins/BuildFile.xml        |  4 +-
 EventFilter/GctRawToDigi/BuildFile.xml        | 20 +++---
 .../GctRawToDigi/plugins/BuildFile.xml        | 20 +++---
 EventFilter/HGCalRawToDigi/BuildFile.xml      |  3 +-
 EventFilter/HcalRawToDigi/BuildFile.xml       | 20 +++---
 .../HcalRawToDigi/plugins/BuildFile.xml       | 27 ++++----
 .../L1GlobalTriggerRawToDigi/BuildFile.xml    | 20 +++---
 EventFilter/L1TXRawToDigi/test/BuildFile.xml  |  3 +-
 EventFilter/LTCRawToDigi/BuildFile.xml        | 14 ++---
 .../plugins/BuildFile.xml                     | 16 ++---
 .../Phase2TrackerRawToDigi/BuildFile.xml      | 25 ++++----
 .../plugins/BuildFile.xml                     | 32 +++++-----
 .../Phase2TrackerRawToDigi/test/BuildFile.xml | 24 +++----
 EventFilter/Playback/BuildFile.xml            |  8 +--
 EventFilter/Playback/plugins/BuildFile.xml    |  8 +--
 EventFilter/RPCRawToDigi/BuildFile.xml        | 23 ++++---
 .../RPCRawToDigi/plugins/BuildFile.xml        |  8 +--
 EventFilter/RawDataCollector/BuildFile.xml    | 12 ++--
 EventFilter/RctRawToDigi/BuildFile.xml        | 20 +++---
 .../RctRawToDigi/plugins/BuildFile.xml        | 20 +++---
 EventFilter/ScalersRawToDigi/BuildFile.xml    | 15 +++--
 EventFilter/SiPixelRawToDigi/BuildFile.xml    | 22 +++----
 .../SiPixelRawToDigi/test/BuildFile.xml       | 32 +++++-----
 .../SiStripChannelChargeFilter/BuildFile.xml  | 22 +++----
 EventFilter/SiStripRawToDigi/BuildFile.xml    | 26 ++++----
 .../SiStripRawToDigi/plugins/BuildFile.xml    | 44 ++++++-------
 .../SiStripRawToDigi/test/BuildFile.xml       | 32 +++++-----
 EventFilter/Utilities/BuildFile.xml           | 18 +++---
 EventFilter/Utilities/plugins/BuildFile.xml   | 28 ++++-----
 EventFilter/Utilities/test/BuildFile.xml      | 26 ++++----
 52 files changed, 502 insertions(+), 513 deletions(-)

diff --git a/EventFilter/CSCRawToDigi/BuildFile.xml b/EventFilter/CSCRawToDigi/BuildFile.xml
index c9f4ad8662463..bcbe2af495851 100644
--- a/EventFilter/CSCRawToDigi/BuildFile.xml
+++ b/EventFilter/CSCRawToDigi/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="DataFormats/CSCDigi"/>
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="CondFormats/CSCObjects"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Utilities"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="DataFormats/L1CSCTrackFinder"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="CondFormats/CSCObjects"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="CondFormats/DataRecord"/>
+<use name="DataFormats/L1CSCTrackFinder"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/CSCRawToDigi/plugins/BuildFile.xml b/EventFilter/CSCRawToDigi/plugins/BuildFile.xml
index 888cd258f803e..2e4be6d3cfc0a 100644
--- a/EventFilter/CSCRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/CSCRawToDigi/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="EventFilter/CSCRawToDigi"/>
-<library   file="*.cc" name="EventFilterCSCRawToDigiPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="EventFilter/CSCRawToDigi"/>
+<library file="*.cc" name="EventFilterCSCRawToDigiPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/CSCRawToDigi/test/BuildFile.xml b/EventFilter/CSCRawToDigi/test/BuildFile.xml
index bbcc19d4ffadc..569b32aeb5444 100644
--- a/EventFilter/CSCRawToDigi/test/BuildFile.xml
+++ b/EventFilter/CSCRawToDigi/test/BuildFile.xml
@@ -1,5 +1,5 @@
-<bin   file="cscRawToDigiTest.cpp">
-  <use   name="EventFilter/CSCRawToDigi"/>
-  <use   name="DataFormats/CSCDigi"/>
-  <use   name="FWCore/MessageService"/>
+<bin file="cscRawToDigiTest.cpp">
+  <use name="EventFilter/CSCRawToDigi"/>
+  <use name="DataFormats/CSCDigi"/>
+  <use name="FWCore/MessageService"/>
 </bin>
diff --git a/EventFilter/CSCTFRawToDigi/BuildFile.xml b/EventFilter/CSCTFRawToDigi/BuildFile.xml
index e76bcc1faff7f..956fd75f14548 100644
--- a/EventFilter/CSCTFRawToDigi/BuildFile.xml
+++ b/EventFilter/CSCTFRawToDigi/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="DataFormats/CSCDigi"/>
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="DataFormats/L1CSCTrackFinder"/>
-<use   name="CondFormats/CSCObjects"/>
-<use   name="FWCore/MessageLogger"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="DataFormats/L1CSCTrackFinder"/>
+<use name="CondFormats/CSCObjects"/>
+<use name="FWCore/MessageLogger"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/CSCTFRawToDigi/plugins/BuildFile.xml b/EventFilter/CSCTFRawToDigi/plugins/BuildFile.xml
index 6e456b0e548b2..2c1c1c73325f5 100644
--- a/EventFilter/CSCTFRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/CSCTFRawToDigi/plugins/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="EventFilter/CSCTFRawToDigi"/>
-<use   name="FWCore/Utilities"/>
-<library   file="*.cc" name="EventFilterCSCTFRawToDigiPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="EventFilter/CSCTFRawToDigi"/>
+<use name="FWCore/Utilities"/>
+<library file="*.cc" name="EventFilterCSCTFRawToDigiPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/CSCTFRawToDigi/test/BuildFile.xml b/EventFilter/CSCTFRawToDigi/test/BuildFile.xml
index 0749e30bab490..5a0aa458c6e72 100644
--- a/EventFilter/CSCTFRawToDigi/test/BuildFile.xml
+++ b/EventFilter/CSCTFRawToDigi/test/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/Utilities"/>
 <use name="FWCore/PluginManager"/>
-
 <library file="CSCTFSingleGen.cc" name="EventFilterCSCTFSingleGen_test">
   <use name="DataFormats/CSCDigi"/>
   <use name="DataFormats/MuonDetId"/>
@@ -14,4 +13,3 @@
   <use name="FWCore/ParameterSetReader"/>
   <use name="cppunit"/>
 </bin>
-
diff --git a/EventFilter/CTPPSRawToDigi/BuildFile.xml b/EventFilter/CTPPSRawToDigi/BuildFile.xml
index f63c93d6c389a..764592ae9d6ac 100644
--- a/EventFilter/CTPPSRawToDigi/BuildFile.xml
+++ b/EventFilter/CTPPSRawToDigi/BuildFile.xml
@@ -1,16 +1,12 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
-
 <use name="DataFormats/FEDRawData"/>
 <use name="DataFormats/Common"/>
-
 <use name="DataFormats/CTPPSDigi"/>
 <use name="DataFormats/CTPPSDetId"/>
-
 <use name="CondFormats/PPSObjects"/>
 <use name="CondFormats/DataRecord"/>
-
 <export>
-	<lib name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/CTPPSRawToDigi/plugins/BuildFile.xml b/EventFilter/CTPPSRawToDigi/plugins/BuildFile.xml
index 5884bc96ef6a4..2e53ca9b2be53 100644
--- a/EventFilter/CTPPSRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/CTPPSRawToDigi/plugins/BuildFile.xml
@@ -1,15 +1,10 @@
 <library file="*.cc" name="EventFilterCTPPSRawToDigiPlugins">
-	<flags EDM_PLUGIN="1"/>
-
-	<use name="FWCore/Framework"/>
-	
-	<use name="DataFormats/FEDRawData"/>
-	<use name="DataFormats/Common"/>
-	
-	<use name="DataFormats/CTPPSDigi"/>
-	
-	<use name="CondFormats/DataRecord"/>
-	<use name="CondFormats/PPSObjects"/>
-	
-	<use name="EventFilter/CTPPSRawToDigi"/>
+  <flags EDM_PLUGIN="1"/>
+  <use name="FWCore/Framework"/>
+  <use name="DataFormats/FEDRawData"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/CTPPSDigi"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondFormats/PPSObjects"/>
+  <use name="EventFilter/CTPPSRawToDigi"/>
 </library>
diff --git a/EventFilter/CTPPSRawToDigi/test/BuildFile.xml b/EventFilter/CTPPSRawToDigi/test/BuildFile.xml
index 9cc405d39c17f..66f2641dd0864 100644
--- a/EventFilter/CTPPSRawToDigi/test/BuildFile.xml
+++ b/EventFilter/CTPPSRawToDigi/test/BuildFile.xml
@@ -1,11 +1,8 @@
 <library file="*.cc" name="EventFilterCTPPSRawToDigiTest">
-	<flags EDM_PLUGIN="1"/>
-
-	<use name="FWCore/Framework"/>
-	<use name="FWCore/Utilities"/>
-	
-	<use name="DataFormats/FEDRawData"/>
-	<use name="DataFormats/CTPPSDigi"/>
-	
-	<use name="EventFilter/CTPPSRawToDigi"/>
+  <flags EDM_PLUGIN="1"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/Utilities"/>
+  <use name="DataFormats/FEDRawData"/>
+  <use name="DataFormats/CTPPSDigi"/>
+  <use name="EventFilter/CTPPSRawToDigi"/>
 </library>
diff --git a/EventFilter/CastorRawToDigi/BuildFile.xml b/EventFilter/CastorRawToDigi/BuildFile.xml
index bef18cc0eec41..6684cfedad02f 100644
--- a/EventFilter/CastorRawToDigi/BuildFile.xml
+++ b/EventFilter/CastorRawToDigi/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="CondFormats/CastorObjects"/>
-<use   name="FWCore/Utilities"/>
-<use   name="EventFilter/HcalRawToDigi"/>
-<use   name="boost"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="FWCore/MessageLogger"/>
+<use name="CondFormats/CastorObjects"/>
+<use name="FWCore/Utilities"/>
+<use name="EventFilter/HcalRawToDigi"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/CastorRawToDigi/plugins/BuildFile.xml b/EventFilter/CastorRawToDigi/plugins/BuildFile.xml
index 539209b1eca7d..ae3feaf0566de 100644
--- a/EventFilter/CastorRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/CastorRawToDigi/plugins/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="CondFormats/CastorObjects"/>
-<use   name="CalibFormats/CastorObjects"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="boost"/>
-<use   name="EventFilter/CastorRawToDigi"/>
-<library   file="*.cc" name="EventFilterCastorRawToDigiPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="CondFormats/CastorObjects"/>
+<use name="CalibFormats/CastorObjects"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="boost"/>
+<use name="EventFilter/CastorRawToDigi"/>
+<library file="*.cc" name="EventFilterCastorRawToDigiPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/DTRawToDigi/plugins/BuildFile.xml b/EventFilter/DTRawToDigi/plugins/BuildFile.xml
index e600bd4ab900e..05721f95db99e 100644
--- a/EventFilter/DTRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/DTRawToDigi/plugins/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Utilities"/>
-<use   name="EventFilter/Utilities"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/DTDigi"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="boost"/>
-<library   file="*.cc" name="EventFilterDTRawToDigiPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Utilities"/>
+<use name="EventFilter/Utilities"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/DTDigi"/>
+<use name="CondFormats/DTObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="boost"/>
+<library file="*.cc" name="EventFilterDTRawToDigiPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/DTRawToDigi/test/BuildFile.xml b/EventFilter/DTRawToDigi/test/BuildFile.xml
index 7ab0a2f5f538d..5c478d55da907 100644
--- a/EventFilter/DTRawToDigi/test/BuildFile.xml
+++ b/EventFilter/DTRawToDigi/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Utilities"/>
-<library   file="FilterByLTC/*.cc" name="testFilterByLTC">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="DataFormats/LTCDigi"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Utilities"/>
+<library file="FilterByLTC/*.cc" name="testFilterByLTC">
+  <flags EDM_PLUGIN="1"/>
+  <use name="DataFormats/LTCDigi"/>
 </library>
diff --git a/EventFilter/DTTFRawToDigi/BuildFile.xml b/EventFilter/DTTFRawToDigi/BuildFile.xml
index b5047de64b05c..86a1052c38c03 100644
--- a/EventFilter/DTTFRawToDigi/BuildFile.xml
+++ b/EventFilter/DTTFRawToDigi/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/L1DTTrackFinder"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="EventFilter/Utilities"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/L1DTTrackFinder"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="EventFilter/Utilities"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/EventFilter/ESDigiToRaw/BuildFile.xml b/EventFilter/ESDigiToRaw/BuildFile.xml
index 2afd401619faf..c9d95597dc754 100644
--- a/EventFilter/ESDigiToRaw/BuildFile.xml
+++ b/EventFilter/ESDigiToRaw/BuildFile.xml
@@ -1,6 +1,6 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
+<flags EDM_PLUGIN="1"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
diff --git a/EventFilter/ESRawToDigi/BuildFile.xml b/EventFilter/ESRawToDigi/BuildFile.xml
index 5310f33587d71..c14e5588592ff 100644
--- a/EventFilter/ESRawToDigi/BuildFile.xml
+++ b/EventFilter/ESRawToDigi/BuildFile.xml
@@ -1,11 +1,10 @@
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/EcalRawData"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="EventFilter/EcalRawToDigi"/>
-
-<use   name="rootcore"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/EcalRawData"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="EventFilter/EcalRawToDigi"/>
+<use name="rootcore"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/EventFilter/EcalDigiToRaw/BuildFile.xml b/EventFilter/EcalDigiToRaw/BuildFile.xml
index 015a8b41ccbf0..a182c8ba3db36 100644
--- a/EventFilter/EcalDigiToRaw/BuildFile.xml
+++ b/EventFilter/EcalDigiToRaw/BuildFile.xml
@@ -1,11 +1,9 @@
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/EcalRawData"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/EcalMapping"/>
-
-<flags   EDM_PLUGIN="1"/>
-
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/EcalRawData"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/EcalMapping"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/EventFilter/EcalRawToDigi/BuildFile.xml b/EventFilter/EcalRawToDigi/BuildFile.xml
index 3bb940370c1f4..86b6c65f20585 100644
--- a/EventFilter/EcalRawToDigi/BuildFile.xml
+++ b/EventFilter/EcalRawToDigi/BuildFile.xml
@@ -1,23 +1,22 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="boost"/>
-<use   name="CalibCalorimetry/EcalLaserCorrection"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalRawData"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="Geometry/EcalMapping"/>
-<use   name="Geometry/Records"/>
-<use   name="RecoLocalCalo/EcalRecAlgos"/>
-<use   name="RecoLocalCalo/EcalRecProducers"/>
-<use   name="Utilities/StorageFactory"/>
-
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="boost"/>
+<use name="CalibCalorimetry/EcalLaserCorrection"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalRawData"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/Common"/>
+<use name="FWCore/MessageLogger"/>
+<use name="Geometry/EcalMapping"/>
+<use name="Geometry/Records"/>
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<use name="RecoLocalCalo/EcalRecProducers"/>
+<use name="Utilities/StorageFactory"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/EcalRawToDigi/plugins/BuildFile.xml b/EventFilter/EcalRawToDigi/plugins/BuildFile.xml
index c2bfbb6adef14..4490b786270e5 100644
--- a/EventFilter/EcalRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/EcalRawToDigi/plugins/BuildFile.xml
@@ -1,19 +1,19 @@
-<use   name="EventFilter/EcalRawToDigi"/>
-<use   name="root"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Scalers"/>
-<use   name="FWCore/Framework"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="TrackingTools/Records"/>
-<use   name="TrackingTools/GeomPropagators"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<library   file="*.cc" name="EventFilterEcalRawToDigiPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="EventFilter/EcalRawToDigi"/>
+<use name="root"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Scalers"/>
+<use name="FWCore/Framework"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="TrackingTools/Records"/>
+<use name="TrackingTools/GeomPropagators"/>
+<use name="TrackingTools/TrajectoryState"/>
+<library file="*.cc" name="EventFilterEcalRawToDigiPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/EcalTBRawToDigi/BuildFile.xml b/EventFilter/EcalTBRawToDigi/BuildFile.xml
index 3d22340533fe6..4e808593556e8 100644
--- a/EventFilter/EcalTBRawToDigi/BuildFile.xml
+++ b/EventFilter/EcalTBRawToDigi/BuildFile.xml
@@ -1,12 +1,12 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/EcalDigi"/>
-<use   name="DataFormats/EcalRawData"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="TBDataFormats/EcalTBObjects"/>
+<flags EDM_PLUGIN="1"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/EcalDigi"/>
+<use name="DataFormats/EcalRawData"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="TBDataFormats/EcalTBObjects"/>
diff --git a/EventFilter/EcalTBRawToDigi/test/BuildFile.xml b/EventFilter/EcalTBRawToDigi/test/BuildFile.xml
index 6e5192421ddcb..ea90ef04ecc44 100644
--- a/EventFilter/EcalTBRawToDigi/test/BuildFile.xml
+++ b/EventFilter/EcalTBRawToDigi/test/BuildFile.xml
@@ -1,35 +1,40 @@
-<use   name="FWCore/Framework"/>
-<library   file="stubs/EcalDigiDumperModule.cc" name="EcalDigiDumperModule">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="cppunit"/>
-  <use   name="DataFormats/EcalDigi"/>
+<use name="FWCore/Framework"/>
+<library file="stubs/EcalDigiDumperModule.cc" name="EcalDigiDumperModule">
+  <flags EDM_PLUGIN="1"/>
+  <use name="cppunit"/>
+  <use name="DataFormats/EcalDigi"/>
 </library>
-<library   file="stubs/EcalDCCHeaderDumperModule.cc" name="EcalDCCHeaderDumperModule">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="cppunit"/>
-  <use   name="DataFormats/EcalRawData"/>
+
+<library file="stubs/EcalDCCHeaderDumperModule.cc" name="EcalDCCHeaderDumperModule">
+  <flags EDM_PLUGIN="1"/>
+  <use name="cppunit"/>
+  <use name="DataFormats/EcalRawData"/>
 </library>
-<library   file="stubs/EcalHexDumperModule.cc" name="EcalHexDumperModule">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="cppunit"/>
-  <use   name="DataFormats/FEDRawData"/>
-  <use   name="FWCore/Utilities"/>
+
+<library file="stubs/EcalHexDumperModule.cc" name="EcalHexDumperModule">
+  <flags EDM_PLUGIN="1"/>
+  <use name="cppunit"/>
+  <use name="DataFormats/FEDRawData"/>
+  <use name="FWCore/Utilities"/>
 </library>
-<library   file="stubs/EcalMatacqHist.cc" name="EcalMatacqHist">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="cppunit"/>
-  <use   name="DataFormats/EcalDigi"/>
-  <use   name="root"/>
+
+<library file="stubs/EcalMatacqHist.cc" name="EcalMatacqHist">
+  <flags EDM_PLUGIN="1"/>
+  <use name="cppunit"/>
+  <use name="DataFormats/EcalDigi"/>
+  <use name="root"/>
 </library>
-<library   file="stubs/EcalGraphDumperModule.cc" name="EcalGraphDumperModule">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="cppunit"/>
-  <use   name="rootgraphics"/>
-  <use   name="DataFormats/EcalDigi"/>
+
+<library file="stubs/EcalGraphDumperModule.cc" name="EcalGraphDumperModule">
+  <flags EDM_PLUGIN="1"/>
+  <use name="cppunit"/>
+  <use name="rootgraphics"/>
+  <use name="DataFormats/EcalDigi"/>
 </library>
-<library   file="stubs/EcalPnGraphDumperModule.cc" name="EcalPnGraphDumperModule">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="cppunit"/>
-  <use   name="rootgraphics"/>
-  <use   name="DataFormats/EcalDigi"/>
+
+<library file="stubs/EcalPnGraphDumperModule.cc" name="EcalPnGraphDumperModule">
+  <flags EDM_PLUGIN="1"/>
+  <use name="cppunit"/>
+  <use name="rootgraphics"/>
+  <use name="DataFormats/EcalDigi"/>
 </library>
diff --git a/EventFilter/GEMRawToDigi/BuildFile.xml b/EventFilter/GEMRawToDigi/BuildFile.xml
index bb98fdbe7708a..7ad25bdf6d77a 100644
--- a/EventFilter/GEMRawToDigi/BuildFile.xml
+++ b/EventFilter/GEMRawToDigi/BuildFile.xml
@@ -1,15 +1,15 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/GEMObjects"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="Utilities/StorageFactory"/>
-<use   name="FWCore/Sources"/>
-<use   name="rootrflx"/>
-<use   name="boost"/>
-<use   name="root"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/GEMObjects"/>
+<use name="FWCore/MessageLogger"/>
+<use name="Utilities/StorageFactory"/>
+<use name="FWCore/Sources"/>
+<use name="rootrflx"/>
+<use name="boost"/>
+<use name="root"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/EventFilter/GEMRawToDigi/plugins/BuildFile.xml b/EventFilter/GEMRawToDigi/plugins/BuildFile.xml
index c22c420bacf8c..b544b62c78bf0 100644
--- a/EventFilter/GEMRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/GEMRawToDigi/plugins/BuildFile.xml
@@ -5,6 +5,6 @@
 <use name="DataFormats/GEMDigi"/>
 <use name="Utilities/StorageFactory"/>
 <use name="FWCore/Sources"/>
-<library   file="*.cc" name="EventFilterGEMRawToDigiPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="EventFilterGEMRawToDigiPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/GctRawToDigi/BuildFile.xml b/EventFilter/GctRawToDigi/BuildFile.xml
index efee28e904675..91b80d0ea6a33 100644
--- a/EventFilter/GctRawToDigi/BuildFile.xml
+++ b/EventFilter/GctRawToDigi/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="L1Trigger/TextToDigi"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="L1Trigger/TextToDigi"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/GctRawToDigi/plugins/BuildFile.xml b/EventFilter/GctRawToDigi/plugins/BuildFile.xml
index 9f392323fbe2a..802decb2c10c0 100644
--- a/EventFilter/GctRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/GctRawToDigi/plugins/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="EventFilter/GctRawToDigi"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<use   name="DataFormats/L1Trigger"/>
-<library   file="*.cc" name="EventFilterGctRawToDigiPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="EventFilter/GctRawToDigi"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<use name="DataFormats/L1Trigger"/>
+<library file="*.cc" name="EventFilterGctRawToDigiPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/HGCalRawToDigi/BuildFile.xml b/EventFilter/HGCalRawToDigi/BuildFile.xml
index f1ed21ba30bd3..4b88866572245 100644
--- a/EventFilter/HGCalRawToDigi/BuildFile.xml
+++ b/EventFilter/HGCalRawToDigi/BuildFile.xml
@@ -2,6 +2,5 @@
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/HGCDigi"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-
diff --git a/EventFilter/HcalRawToDigi/BuildFile.xml b/EventFilter/HcalRawToDigi/BuildFile.xml
index 21be219fe39ff..6395941774553 100644
--- a/EventFilter/HcalRawToDigi/BuildFile.xml
+++ b/EventFilter/HcalRawToDigi/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="CondFormats/HcalObjects"/>
-<use   name="FWCore/Utilities"/>
-<use   name="CalibFormats/HcalObjects"/>
-<use   name="CalibFormats/CaloObjects"/>
-<use   name="boost"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="FWCore/MessageLogger"/>
+<use name="CondFormats/HcalObjects"/>
+<use name="FWCore/Utilities"/>
+<use name="CalibFormats/HcalObjects"/>
+<use name="CalibFormats/CaloObjects"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/HcalRawToDigi/plugins/BuildFile.xml b/EventFilter/HcalRawToDigi/plugins/BuildFile.xml
index 2855afe777098..ccf6a061119c2 100644
--- a/EventFilter/HcalRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/HcalRawToDigi/plugins/BuildFile.xml
@@ -1,15 +1,16 @@
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="CondFormats/HcalObjects"/>
-<use   name="CalibFormats/HcalObjects"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="boost"/>
-<use   name="zlib"/>
-<use   name="EventFilter/HcalRawToDigi"/>
-<flags   EDM_PLUGIN="1"/>
-<library   file="HcalCalibFEDSelector.cc,HcalCalibTypeFilter.cc,HcalDigiToRaw.cc,HcalEmptyEventFilter.cc,HcalHistogramRawToDigi.cc,HcalRawToDigi.cc,modules.cc,HcalDigiToRawuHTR.cc,HcalRawToDigiFake.cc" name="EventFilterHcalRawToDigiPlugins">
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="CondFormats/HcalObjects"/>
+<use name="CalibFormats/HcalObjects"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="boost"/>
+<use name="zlib"/>
+<use name="EventFilter/HcalRawToDigi"/>
+<flags EDM_PLUGIN="1"/>
+<library file="HcalCalibFEDSelector.cc,HcalCalibTypeFilter.cc,HcalDigiToRaw.cc,HcalEmptyEventFilter.cc,HcalHistogramRawToDigi.cc,HcalRawToDigi.cc,modules.cc,HcalDigiToRawuHTR.cc,HcalRawToDigiFake.cc" name="EventFilterHcalRawToDigiPlugins">
 </library>
-<library   file="HcalLaserEventFiltProducer2012.cc, HcalLaserEventFilter2012.cc,HcalLaserHFFilter2012.cc,HcalLaserHBHEFilter2012.cc,HcalLaserHBHEHFFilter2012.cc" name="EventFilterHcalRawToDigiFiltersPlugins">
+
+<library file="HcalLaserEventFiltProducer2012.cc, HcalLaserEventFilter2012.cc,HcalLaserHFFilter2012.cc,HcalLaserHBHEFilter2012.cc,HcalLaserHBHEHFFilter2012.cc" name="EventFilterHcalRawToDigiFiltersPlugins">
 </library>
diff --git a/EventFilter/L1GlobalTriggerRawToDigi/BuildFile.xml b/EventFilter/L1GlobalTriggerRawToDigi/BuildFile.xml
index a56c2512ccf47..b14d401ca6779 100644
--- a/EventFilter/L1GlobalTriggerRawToDigi/BuildFile.xml
+++ b/EventFilter/L1GlobalTriggerRawToDigi/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="DataFormats/L1GlobalMuonTrigger"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/RunInfo"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/RunInfo"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/EventFilter/L1TXRawToDigi/test/BuildFile.xml b/EventFilter/L1TXRawToDigi/test/BuildFile.xml
index 545a84edd5400..6042d5f3252ec 100644
--- a/EventFilter/L1TXRawToDigi/test/BuildFile.xml
+++ b/EventFilter/L1TXRawToDigi/test/BuildFile.xml
@@ -3,4 +3,5 @@
 <use name="FWCore/PluginManager"/>
 <use name="FWCore/MessageLogger"/>
 <use name="DataFormats/FEDRawData"/>
-<bin name="testUCTUnpacker" file="testUCTUnpacker.cpp"> </bin>
+<bin name="testUCTUnpacker" file="testUCTUnpacker.cpp">
+</bin>
diff --git a/EventFilter/LTCRawToDigi/BuildFile.xml b/EventFilter/LTCRawToDigi/BuildFile.xml
index 1a9114593422b..f2143ebcfb16a 100644
--- a/EventFilter/LTCRawToDigi/BuildFile.xml
+++ b/EventFilter/LTCRawToDigi/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/LTCDigi"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="boost"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/LTCDigi"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="boost"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/EventFilter/OnlineMetaDataRawToDigi/plugins/BuildFile.xml b/EventFilter/OnlineMetaDataRawToDigi/plugins/BuildFile.xml
index d7bdc0edb9bb2..d4753d8638030 100644
--- a/EventFilter/OnlineMetaDataRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/OnlineMetaDataRawToDigi/plugins/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/BeamSpot"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/OnlineMetaData"/>
-<use   name="boost"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/OnlineMetaData"/>
+<use name="boost"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/EventFilter/Phase2TrackerRawToDigi/BuildFile.xml b/EventFilter/Phase2TrackerRawToDigi/BuildFile.xml
index cacc1417238ea..f6cc503d646d9 100644
--- a/EventFilter/Phase2TrackerRawToDigi/BuildFile.xml
+++ b/EventFilter/Phase2TrackerRawToDigi/BuildFile.xml
@@ -1,15 +1,14 @@
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/Phase2TrackerDigi"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/Utilities"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/Phase2TrackerDigi"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/Utilities"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-
diff --git a/EventFilter/Phase2TrackerRawToDigi/plugins/BuildFile.xml b/EventFilter/Phase2TrackerRawToDigi/plugins/BuildFile.xml
index 64fe6b68b6283..70e630609e9dd 100644
--- a/EventFilter/Phase2TrackerRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/Phase2TrackerRawToDigi/plugins/BuildFile.xml
@@ -1,17 +1,17 @@
-<library   file="*.cc" name="EventFilterPhase2TrackerRawToDigiPlugins">
-  <use   name="CalibTracker/Records"/>
-  <use   name="CondFormats/SiStripObjects"/>
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/DetId"/>
-  <use   name="DataFormats/FEDRawData"/>
-  <use   name="DataFormats/EgammaReco"/>
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="DataFormats/JetReco"/>
-  <use   name="SimDataFormats/GeneratorProducts"/>
-  <use   name="EventFilter/Phase2TrackerRawToDigi"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="EventFilterPhase2TrackerRawToDigiPlugins">
+  <use name="CalibTracker/Records"/>
+  <use name="CondFormats/SiStripObjects"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/DetId"/>
+  <use name="DataFormats/FEDRawData"/>
+  <use name="DataFormats/EgammaReco"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="DataFormats/JetReco"/>
+  <use name="SimDataFormats/GeneratorProducts"/>
+  <use name="EventFilter/Phase2TrackerRawToDigi"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/Phase2TrackerRawToDigi/test/BuildFile.xml b/EventFilter/Phase2TrackerRawToDigi/test/BuildFile.xml
index 004f699970e9d..668947544a24e 100644
--- a/EventFilter/Phase2TrackerRawToDigi/test/BuildFile.xml
+++ b/EventFilter/Phase2TrackerRawToDigi/test/BuildFile.xml
@@ -1,13 +1,13 @@
-<library   file="plugins/*.cc" name="testEventFilterPhase2TrackerRawToDigiPlugins">
-  <use   name="CalibTracker/Records"/>
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="CondFormats/SiStripObjects"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="rootcore"/>
-  <use   name="EventFilter/Phase2TrackerRawToDigi"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="plugins/*.cc" name="testEventFilterPhase2TrackerRawToDigiPlugins">
+  <use name="CalibTracker/Records"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondFormats/SiStripObjects"/>
+  <use name="DataFormats/Common"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="rootcore"/>
+  <use name="EventFilter/Phase2TrackerRawToDigi"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/Playback/BuildFile.xml b/EventFilter/Playback/BuildFile.xml
index 527eb771f4474..492bfe570396a 100644
--- a/EventFilter/Playback/BuildFile.xml
+++ b/EventFilter/Playback/BuildFile.xml
@@ -1,6 +1,6 @@
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
diff --git a/EventFilter/Playback/plugins/BuildFile.xml b/EventFilter/Playback/plugins/BuildFile.xml
index c0c97683b78cd..96361c7523109 100644
--- a/EventFilter/Playback/plugins/BuildFile.xml
+++ b/EventFilter/Playback/plugins/BuildFile.xml
@@ -1,5 +1,5 @@
-<library   file="*.cc" name="EventFilterPlaybackPlugins">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="EventFilter/Playback"/>
-  <use   name="FWCore/PluginManager"/>
+<library file="*.cc" name="EventFilterPlaybackPlugins">
+  <flags EDM_PLUGIN="1"/>
+  <use name="EventFilter/Playback"/>
+  <use name="FWCore/PluginManager"/>
 </library>
diff --git a/EventFilter/RPCRawToDigi/BuildFile.xml b/EventFilter/RPCRawToDigi/BuildFile.xml
index cf32db6b3e3eb..9a7ce99bb4a17 100644
--- a/EventFilter/RPCRawToDigi/BuildFile.xml
+++ b/EventFilter/RPCRawToDigi/BuildFile.xml
@@ -1,14 +1,13 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/RPCDigi"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/RPCObjects"/>
-<use   name="FWCore/MessageLogger"/>
-
-<use   name="boost"/>
-<use   name="root"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/RPCDigi"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/RPCObjects"/>
+<use name="FWCore/MessageLogger"/>
+<use name="boost"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/RPCRawToDigi/plugins/BuildFile.xml b/EventFilter/RPCRawToDigi/plugins/BuildFile.xml
index 3c48b69d09767..7179e3c40fd92 100644
--- a/EventFilter/RPCRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/RPCRawToDigi/plugins/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="EventFilter/RPCRawToDigi"/>
-<use   name="DataFormats/L1TMuon"/>
-<library   file="*.cc" name="EventFilterRPCRawToDigiPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="EventFilter/RPCRawToDigi"/>
+<use name="DataFormats/L1TMuon"/>
+<library file="*.cc" name="EventFilterRPCRawToDigiPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/RawDataCollector/BuildFile.xml b/EventFilter/RawDataCollector/BuildFile.xml
index 46376f535f6f0..a52793940053c 100644
--- a/EventFilter/RawDataCollector/BuildFile.xml
+++ b/EventFilter/RawDataCollector/BuildFile.xml
@@ -1,6 +1,6 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/Common"/>
+<flags EDM_PLUGIN="1"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/Common"/>
diff --git a/EventFilter/RctRawToDigi/BuildFile.xml b/EventFilter/RctRawToDigi/BuildFile.xml
index efee28e904675..91b80d0ea6a33 100644
--- a/EventFilter/RctRawToDigi/BuildFile.xml
+++ b/EventFilter/RctRawToDigi/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="L1Trigger/TextToDigi"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="L1Trigger/TextToDigi"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/RctRawToDigi/plugins/BuildFile.xml b/EventFilter/RctRawToDigi/plugins/BuildFile.xml
index e0b9490ac0b83..248ddcaa2ab44 100644
--- a/EventFilter/RctRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/RctRawToDigi/plugins/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="EventFilter/RctRawToDigi"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/L1CaloTrigger"/>
-<use   name="DataFormats/L1GlobalCaloTrigger"/>
-<use   name="DataFormats/L1Trigger"/>
-<library   file="*.cc" name="EventFilterRctRawToDigiPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="EventFilter/RctRawToDigi"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/L1CaloTrigger"/>
+<use name="DataFormats/L1GlobalCaloTrigger"/>
+<use name="DataFormats/L1Trigger"/>
+<library file="*.cc" name="EventFilterRctRawToDigiPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/ScalersRawToDigi/BuildFile.xml b/EventFilter/ScalersRawToDigi/BuildFile.xml
index fcb4eec0f0d4d..b269f3bbdf4ad 100644
--- a/EventFilter/ScalersRawToDigi/BuildFile.xml
+++ b/EventFilter/ScalersRawToDigi/BuildFile.xml
@@ -1,8 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Scalers"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="boost"/>
-<flags   EDM_PLUGIN="1"/>
-
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Scalers"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="boost"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/EventFilter/SiPixelRawToDigi/BuildFile.xml b/EventFilter/SiPixelRawToDigi/BuildFile.xml
index 5b2a132e4e626..cef57a95f74fd 100644
--- a/EventFilter/SiPixelRawToDigi/BuildFile.xml
+++ b/EventFilter/SiPixelRawToDigi/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/SiPixelDigi"/>
-<use   name="DataFormats/SiPixelRawData"/>
-<use   name="CondFormats/SiPixelObjects"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="root"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/SiPixelDigi"/>
+<use name="DataFormats/SiPixelRawData"/>
+<use name="CondFormats/SiPixelObjects"/>
+<use name="DataFormats/Candidate"/>
+<use name="CondFormats/DataRecord"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/SiPixelRawToDigi/test/BuildFile.xml b/EventFilter/SiPixelRawToDigi/test/BuildFile.xml
index bd2898ae4f14a..e9c4ec6b80608 100644
--- a/EventFilter/SiPixelRawToDigi/test/BuildFile.xml
+++ b/EventFilter/SiPixelRawToDigi/test/BuildFile.xml
@@ -1,18 +1,20 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="CondFormats/SiPixelObjects"/>
-<use   name="EventFilter/SiPixelRawToDigi"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="root"/>
-<library   file="SiPixelRawDumper.cc" name="SiPixelRawDumper">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/MessageLogger"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="CondFormats/SiPixelObjects"/>
+<use name="EventFilter/SiPixelRawToDigi"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="root"/>
+<library file="SiPixelRawDumper.cc" name="SiPixelRawDumper">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="FedErrorDumper.cc" name="FedErrorDumper">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="FedErrorDumper.cc" name="FedErrorDumper">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="findHotPixels.cc" name="findHotPixels">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="findHotPixels.cc" name="findHotPixels">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/SiStripChannelChargeFilter/BuildFile.xml b/EventFilter/SiStripChannelChargeFilter/BuildFile.xml
index 89d2a12512970..b65d4da7ba58e 100644
--- a/EventFilter/SiStripChannelChargeFilter/BuildFile.xml
+++ b/EventFilter/SiStripChannelChargeFilter/BuildFile.xml
@@ -1,11 +1,11 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/SiStripDigi"/>
-<use   name="DataFormats/SiStripCluster"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
+<flags EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/SiStripDigi"/>
+<use name="DataFormats/SiStripCluster"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/TrackReco"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
diff --git a/EventFilter/SiStripRawToDigi/BuildFile.xml b/EventFilter/SiStripRawToDigi/BuildFile.xml
index 2fab85ba45622..eba5139ef47ac 100644
--- a/EventFilter/SiStripRawToDigi/BuildFile.xml
+++ b/EventFilter/SiStripRawToDigi/BuildFile.xml
@@ -1,15 +1,15 @@
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/SiStripDigi"/>
-<use   name="DataFormats/SiStripCluster"/>
-<use   name="DataFormats/SiStripCommon"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Utilities"/>
-<use   name="boost"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/SiStripDigi"/>
+<use name="DataFormats/SiStripCluster"/>
+<use name="DataFormats/SiStripCommon"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="boost"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/SiStripRawToDigi/plugins/BuildFile.xml b/EventFilter/SiStripRawToDigi/plugins/BuildFile.xml
index 73b644478445b..0cb9a3b20d5cc 100644
--- a/EventFilter/SiStripRawToDigi/plugins/BuildFile.xml
+++ b/EventFilter/SiStripRawToDigi/plugins/BuildFile.xml
@@ -1,23 +1,23 @@
-<library   file="*.cc" name="EventFilterSiStripRawToDigiPlugins">
-  <use   name="CalibFormats/SiStripObjects"/>
-  <use   name="CalibTracker/Records"/>
-  <use   name="CalibTracker/SiStripESProducers"/>
-  <use   name="CondFormats/SiStripObjects"/>
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/DetId"/>
-  <use   name="DataFormats/FEDRawData"/>
-  <use   name="DataFormats/SiStripCommon"/>
-  <use   name="DataFormats/SiStripCluster"/>
-  <use   name="DataFormats/SiStripDigi"/>
-  <use   name="DataFormats/EgammaReco"/>
-  <use   name="DataFormats/TrackReco"/>
-  <use   name="DataFormats/JetReco"/>
-  <use   name="SimDataFormats/GeneratorProducts"/>
-  <use   name="EventFilter/SiStripRawToDigi"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="boost"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="EventFilterSiStripRawToDigiPlugins">
+  <use name="CalibFormats/SiStripObjects"/>
+  <use name="CalibTracker/Records"/>
+  <use name="CalibTracker/SiStripESProducers"/>
+  <use name="CondFormats/SiStripObjects"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/DetId"/>
+  <use name="DataFormats/FEDRawData"/>
+  <use name="DataFormats/SiStripCommon"/>
+  <use name="DataFormats/SiStripCluster"/>
+  <use name="DataFormats/SiStripDigi"/>
+  <use name="DataFormats/EgammaReco"/>
+  <use name="DataFormats/TrackReco"/>
+  <use name="DataFormats/JetReco"/>
+  <use name="SimDataFormats/GeneratorProducts"/>
+  <use name="EventFilter/SiStripRawToDigi"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="boost"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/SiStripRawToDigi/test/BuildFile.xml b/EventFilter/SiStripRawToDigi/test/BuildFile.xml
index 81b82b64c2577..9c2a1f118a840 100644
--- a/EventFilter/SiStripRawToDigi/test/BuildFile.xml
+++ b/EventFilter/SiStripRawToDigi/test/BuildFile.xml
@@ -1,17 +1,17 @@
-<library   file="plugins/*.cc" name="testEventFilterSiStripRawToDigiPlugins">
-  <use   name="CalibFormats/SiStripObjects"/>
-  <use   name="CalibTracker/Records"/>
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="CondFormats/SiStripObjects"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/SiStripCommon"/>
-  <use   name="DataFormats/SiStripCluster"/>
-  <use   name="DataFormats/SiStripDigi"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="EventFilter/SiStripRawToDigi"/>
-  <use   name="rootcore"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="plugins/*.cc" name="testEventFilterSiStripRawToDigiPlugins">
+  <use name="CalibFormats/SiStripObjects"/>
+  <use name="CalibTracker/Records"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondFormats/SiStripObjects"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/SiStripCommon"/>
+  <use name="DataFormats/SiStripCluster"/>
+  <use name="DataFormats/SiStripDigi"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="EventFilter/SiStripRawToDigi"/>
+  <use name="rootcore"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/Utilities/BuildFile.xml b/EventFilter/Utilities/BuildFile.xml
index 72e17fb00055f..321bae8893752 100644
--- a/EventFilter/Utilities/BuildFile.xml
+++ b/EventFilter/Utilities/BuildFile.xml
@@ -1,11 +1,11 @@
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/Sources"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="DataFormats/TCDS"/>
-<use   name="IOPool/Streamer"/>
-<use   name="curl"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/Sources"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="DataFormats/TCDS"/>
+<use name="IOPool/Streamer"/>
+<use name="curl"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/EventFilter/Utilities/plugins/BuildFile.xml b/EventFilter/Utilities/plugins/BuildFile.xml
index dec77856fd8e6..5feef2d3434e3 100644
--- a/EventFilter/Utilities/plugins/BuildFile.xml
+++ b/EventFilter/Utilities/plugins/BuildFile.xml
@@ -1,15 +1,15 @@
-<library   file="*.cc" name="EventFilterUtilitiesPlugins">
-  <use   name="DataFormats/FEDRawData"/>
-  <use   name="DataFormats/TCDS"/>
-  <use   name="EventFilter/Utilities"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="FWCore/Sources"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="IOPool/Streamer"/>
-  <use   name="CLHEP"/>
-  <use   name="boost"/>
-  <use   name="root"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="EventFilterUtilitiesPlugins">
+  <use name="DataFormats/FEDRawData"/>
+  <use name="DataFormats/TCDS"/>
+  <use name="EventFilter/Utilities"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Sources"/>
+  <use name="FWCore/Utilities"/>
+  <use name="IOPool/Streamer"/>
+  <use name="CLHEP"/>
+  <use name="boost"/>
+  <use name="root"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/EventFilter/Utilities/test/BuildFile.xml b/EventFilter/Utilities/test/BuildFile.xml
index 10446584189ab..4cc6ad6ecb046 100644
--- a/EventFilter/Utilities/test/BuildFile.xml
+++ b/EventFilter/Utilities/test/BuildFile.xml
@@ -1,16 +1,18 @@
-<use   name="FWCore/Framework"/>
-<library   file="*.cc" name="EventFilterUtilitiesTest">
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="DataFormats/FEDRawData"/>
-  <use   name="DataFormats/TCDS"/>
-  <use   name="EventFilter/Utilities"/>
-  <use   name="boost"/>
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<library file="*.cc" name="EventFilterUtilitiesTest">
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/Utilities"/>
+  <use name="DataFormats/FEDRawData"/>
+  <use name="DataFormats/TCDS"/>
+  <use name="EventFilter/Utilities"/>
+  <use name="boost"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
+
 <environment>
-  <bin   file="RunBUFU_t.cpp" name="BUFU_TEST">
-    <flags   TEST_RUNNER_ARGS="/bin/bash EventFilter/Utilities/test RunBUFU.sh"/>
+  <bin file="RunBUFU_t.cpp" name="BUFU_TEST">
+    <flags TEST_RUNNER_ARGS="/bin/bash EventFilter/Utilities/test RunBUFU.sh"/>
   </bin>
+
 </environment>