diff --git a/RecoLocalTracker/ClusterParameterEstimator/BuildFile.xml b/RecoLocalTracker/ClusterParameterEstimator/BuildFile.xml
index 55102e0a03a5b..5ed83e90681fe 100644
--- a/RecoLocalTracker/ClusterParameterEstimator/BuildFile.xml
+++ b/RecoLocalTracker/ClusterParameterEstimator/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="FWCore/Utilities"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="clhep"/>
+<use name="FWCore/Utilities"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalTracker/Phase2TrackerRecHits/BuildFile.xml b/RecoLocalTracker/Phase2TrackerRecHits/BuildFile.xml
index decc7c20aa179..5e4cccdd5ea50 100644
--- a/RecoLocalTracker/Phase2TrackerRecHits/BuildFile.xml
+++ b/RecoLocalTracker/Phase2TrackerRecHits/BuildFile.xml
@@ -3,5 +3,5 @@
 <use name="RecoLocalTracker/ClusterParameterEstimator"/>
 <use name="DataFormats/Phase2TrackerCluster"/>
 <export>
-    <lib name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml b/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml
index 6309bbd9d4297..6a0afdf223f9f 100644
--- a/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml
+++ b/RecoLocalTracker/Phase2TrackerRecHits/test/BuildFile.xml
@@ -1,20 +1,20 @@
-<use   name="root"/>
-<use   name="classlib"/>
-<use   name="clhep"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="SimDataFormats/TrackerDigiSimLink"/>
-<use   name="DataFormats/SiPixelDetId"/>
-<use   name="DataFormats/DetId"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="DataFormats/Phase2TrackerCluster"/>
-<library   file="RecHitsValidation.cc" name="Phase2TrackerRecHitsValidation">
-  <flags   EDM_PLUGIN="1"/>
+<use name="root"/>
+<use name="classlib"/>
+<use name="clhep"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="SimDataFormats/TrackerDigiSimLink"/>
+<use name="DataFormats/SiPixelDetId"/>
+<use name="DataFormats/DetId"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/Phase2TrackerCluster"/>
+<library file="RecHitsValidation.cc" name="Phase2TrackerRecHitsValidation">
+  <flags EDM_PLUGIN="1"/>
   <flags CXXFLAGS="-g3"/>
 </library>
diff --git a/RecoLocalTracker/Records/BuildFile.xml b/RecoLocalTracker/Records/BuildFile.xml
index 513f2ec7df1ba..629b1aa7a1ebc 100644
--- a/RecoLocalTracker/Records/BuildFile.xml
+++ b/RecoLocalTracker/Records/BuildFile.xml
@@ -1,10 +1,10 @@
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="FWCore/Framework"/>
-<use   name="Geometry/Records"/>
-<use   name="MagneticField/Records"/>
-<use   name="clhep"/>
-<use   name="boost"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CalibTracker/Records"/>
+<use name="FWCore/Framework"/>
+<use name="Geometry/Records"/>
+<use name="MagneticField/Records"/>
+<use name="clhep"/>
+<use name="boost"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CalibTracker/Records"/>
diff --git a/RecoLocalTracker/SiPhase2Clusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiPhase2Clusterizer/plugins/BuildFile.xml
index 58554c497295a..f66ab1e227c9b 100644
--- a/RecoLocalTracker/SiPhase2Clusterizer/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiPhase2Clusterizer/plugins/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Common"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="DataFormats/Phase2TrackerCluster"/>
-<use   name="DataFormats/Phase2TrackerDigi"/>
-<use   name="root"/>
-<library   file="*.cc" name="Phase2TrackerClusterizerPlugin">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Common"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="DataFormats/Phase2TrackerCluster"/>
+<use name="DataFormats/Phase2TrackerDigi"/>
+<use name="root"/>
+<library file="*.cc" name="Phase2TrackerClusterizerPlugin">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml b/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml
index ecd3219c6e9d9..faa80527c56d8 100644
--- a/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml
+++ b/RecoLocalTracker/SiPhase2Clusterizer/test/BuildFile.xml
@@ -1,20 +1,20 @@
-<use   name="boost"/>
-<use   name="root"/>
-<use   name="classlib"/>
-<use   name="clhep"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="SimDataFormats/TrackerDigiSimLink"/>
-<use   name="DataFormats/SiPixelDigi"/>
-<use   name="DataFormats/SiPixelDetId"/>
-<use   name="DataFormats/DetId"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Phase2TrackerCluster"/>
-<library   file="ClustersValidation.cc" name="Phase2TrackerClusterizerValidation">
-  <flags   EDM_PLUGIN="1"/>
+<use name="boost"/>
+<use name="root"/>
+<use name="classlib"/>
+<use name="clhep"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="SimDataFormats/TrackerDigiSimLink"/>
+<use name="DataFormats/SiPixelDigi"/>
+<use name="DataFormats/SiPixelDetId"/>
+<use name="DataFormats/DetId"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Phase2TrackerCluster"/>
+<library file="ClustersValidation.cc" name="Phase2TrackerClusterizerValidation">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
index 51e90278cee01..c7b16a6ef4ee2 100644
--- a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/SiPixelCluster"/>
-<use   name="boost_serialization"/>
-<use   name="CalibTracker/SiPixelESProducers"/>
-<library   file="*.cc" name="RecoLocalTrackerSiPixelClusterizerPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/Common"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/SiPixelCluster"/>
+<use name="boost_serialization"/>
+<use name="CalibTracker/SiPixelESProducers"/>
+<library file="*.cc" name="RecoLocalTrackerSiPixelClusterizerPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml
index fe6b2c39ba9d2..e4a31cc26cd56 100644
--- a/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml
+++ b/RecoLocalTracker/SiPixelClusterizer/test/BuildFile.xml
@@ -16,16 +16,18 @@
 <use name="TrackingTools/TrackFitters"/>
 <use name="TrackingTools/TrajectoryState"/>
 <use name="TrackingTools/TransientTrack"/>
-
 <library file="ReadPixClusters.cc" name="ReadPixClusters">
   <flags EDM_PLUGIN="1"/>
 </library>
+
 <library file="TestClusters.cc" name="TestClusters">
   <flags EDM_PLUGIN="1"/>
 </library>
+
 <library file="TestWithTracks.cc" name="TestWithTracks">
   <flags EDM_PLUGIN="1"/>
 </library>
+
 <library file="Triplet.cc" name="Triplet">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiPixelRecHits/BuildFile.xml b/RecoLocalTracker/SiPixelRecHits/BuildFile.xml
index fb7e334661353..552c5373cfc19 100644
--- a/RecoLocalTracker/SiPixelRecHits/BuildFile.xml
+++ b/RecoLocalTracker/SiPixelRecHits/BuildFile.xml
@@ -1,16 +1,14 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CondFormats/SiPixelObjects"/>
-<use   name="CalibTracker/SiPixelESProducers"/>
-<use   name="DataFormats/TrackerCommon"/>
-<use   name="DataFormats/SiPixelCluster"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="CondFormats/SiPixelTransient"/>
-<use   name="RecoLocalTracker/ClusterParameterEstimator"/>
-
-<use   name="boost"/>
-<use   name="vdt_headers"/>
-
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CondFormats/SiPixelObjects"/>
+<use name="CalibTracker/SiPixelESProducers"/>
+<use name="DataFormats/TrackerCommon"/>
+<use name="DataFormats/SiPixelCluster"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="CondFormats/SiPixelTransient"/>
+<use name="RecoLocalTracker/ClusterParameterEstimator"/>
+<use name="boost"/>
+<use name="vdt_headers"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalTracker/SiPixelRecHits/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelRecHits/plugins/BuildFile.xml
index 0b477d0fb2d34..e02a0b722c1ae 100644
--- a/RecoLocalTracker/SiPixelRecHits/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiPixelRecHits/plugins/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="RecoLocalTracker/ClusterParameterEstimator"/>
-<use   name="RecoLocalTracker/Records"/>
-<use   name="RecoLocalTracker/SiPixelRecHits"/>
-<use   name="DataFormats/TrackerCommon"/>
-<library   file="*.cc" name="RecoLocalTrackerSiPixelRecHitsPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="RecoLocalTracker/ClusterParameterEstimator"/>
+<use name="RecoLocalTracker/Records"/>
+<use name="RecoLocalTracker/SiPixelRecHits"/>
+<use name="DataFormats/TrackerCommon"/>
+<library file="*.cc" name="RecoLocalTrackerSiPixelRecHitsPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiPixelRecHits/test/BuildFile.xml b/RecoLocalTracker/SiPixelRecHits/test/BuildFile.xml
index a49bf419dc4e3..b0022b0d031aa 100644
--- a/RecoLocalTracker/SiPixelRecHits/test/BuildFile.xml
+++ b/RecoLocalTracker/SiPixelRecHits/test/BuildFile.xml
@@ -1,26 +1,20 @@
-<use name="rootmath"/> 
 <use name="boost"/>
-<use   name="clhep"/>
-<use   name="root"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
+<use name="clhep"/>
+<use name="root"/>
+<use name="rootmath"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="RecoLocalTracker/ClusterParameterEstimator"/>
+<use name="RecoLocalTracker/Records"/>
+<flags EDM_PLUGIN="1"/>
 
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-
-<use   name="CommonTools/UtilAlgos"/>
-
-#<use   name="Geometry/Records"/>
-#<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-
-<use   name="RecoLocalTracker/ClusterParameterEstimator"/>
-<use   name="RecoLocalTracker/Records"/>
-
-<flags   EDM_PLUGIN="1"/>
-<library   file="ReadPixelRecHit.cc" name="ReadPixelRecHit">
+<library file="ReadPixelRecHit.cc" name="ReadPixelRecHit">
 </library>
-<flags   EDM_PLUGIN="1"/>
-<library   file="CPEAccessTester.cc" name="CPEAccessTester">
+
+<library file="CPEAccessTester.cc" name="CPEAccessTester">
 </library>
diff --git a/RecoLocalTracker/SiStripClusterizer/BuildFile.xml b/RecoLocalTracker/SiStripClusterizer/BuildFile.xml
index 205ebf193064a..9eb9dd361a095 100644
--- a/RecoLocalTracker/SiStripClusterizer/BuildFile.xml
+++ b/RecoLocalTracker/SiStripClusterizer/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/SiStripDigi"/>
-<use   name="DataFormats/SiStripCluster"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="CalibFormats/SiStripObjects"/>
-<use   name="CalibTracker/Records"/>
-<use   name="EventFilter/SiStripRawToDigi"/>
+<use name="DataFormats/Common"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/SiStripDigi"/>
+<use name="DataFormats/SiStripCluster"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="CalibFormats/SiStripObjects"/>
+<use name="CalibTracker/Records"/>
+<use name="EventFilter/SiStripRawToDigi"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/RecoLocalTracker/SiStripClusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiStripClusterizer/plugins/BuildFile.xml
index c55773cb25e2a..6b9e507e41fc2 100644
--- a/RecoLocalTracker/SiStripClusterizer/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiStripClusterizer/plugins/BuildFile.xml
@@ -1,5 +1,5 @@
-<library   name="RecoLocalTrackerSiStripClusterizerPlugins" file="*.cc">
-  <use   name="RecoLocalTracker/SiStripClusterizer"/>
-  <use   name="RecoLocalTracker/SiStripZeroSuppression"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="RecoLocalTrackerSiStripClusterizerPlugins" file="*.cc">
+  <use name="RecoLocalTracker/SiStripClusterizer"/>
+  <use name="RecoLocalTracker/SiStripZeroSuppression"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiStripClusterizer/test/BuildFile.xml b/RecoLocalTracker/SiStripClusterizer/test/BuildFile.xml
index 955d603451683..ed003eaf391a8 100644
--- a/RecoLocalTracker/SiStripClusterizer/test/BuildFile.xml
+++ b/RecoLocalTracker/SiStripClusterizer/test/BuildFile.xml
@@ -1,5 +1,5 @@
-<library   name="RecoLocalTrackerSiStripClusterizerTestPlugins" file="*.cc">
-  <use   name="RecoLocalTracker/SiStripClusterizer"/>
-  <use   name="SimTracker/TrackerHitAssociation"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="RecoLocalTrackerSiStripClusterizerTestPlugins" file="*.cc">
+  <use name="RecoLocalTracker/SiStripClusterizer"/>
+  <use name="SimTracker/TrackerHitAssociation"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiStripRecHitConverter/BuildFile.xml b/RecoLocalTracker/SiStripRecHitConverter/BuildFile.xml
index beca6f5edf929..3aa8386d6cb58 100644
--- a/RecoLocalTracker/SiStripRecHitConverter/BuildFile.xml
+++ b/RecoLocalTracker/SiStripRecHitConverter/BuildFile.xml
@@ -1,18 +1,18 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="DataFormats/SiStripCluster"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="RecoLocalTracker/Records"/>
-<use   name="RecoLocalTracker/ClusterParameterEstimator"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="CalibFormats/SiStripObjects"/>
-<use   name="CalibTracker/Records"/>
-<use   name="TrackingTools/TransientTrackingRecHit"/>
-<use   name="vdt_headers"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/SiStripCluster"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="RecoLocalTracker/Records"/>
+<use name="RecoLocalTracker/ClusterParameterEstimator"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="CalibFormats/SiStripObjects"/>
+<use name="CalibTracker/Records"/>
+<use name="TrackingTools/TransientTrackingRecHit"/>
+<use name="vdt_headers"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml b/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml
index 045cac3e0be42..df0f7979aa74f 100644
--- a/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="RecoLocalTracker/SiStripRecHitConverter"/>
-<use   name="CalibTracker/Records"/>
-<library   file="*.cc" name="RecoLocalTrackerSiStripRecHitConverterPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="RecoLocalTracker/SiStripRecHitConverter"/>
+<use name="CalibTracker/Records"/>
+<library file="*.cc" name="RecoLocalTrackerSiStripRecHitConverterPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiStripRecHitConverter/test/BuildFile.xml b/RecoLocalTracker/SiStripRecHitConverter/test/BuildFile.xml
index 99a052b59bf1a..5057a55b7ed08 100644
--- a/RecoLocalTracker/SiStripRecHitConverter/test/BuildFile.xml
+++ b/RecoLocalTracker/SiStripRecHitConverter/test/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="RecoLocalTracker/SiStripRecHitConverter"/>
-<use   name="clhep"/>
-<use   name="boost"/>
-<use   name="root"/>
-<library   file="*.cc" name="RecoLocalTrackerSiStripRecHitConverterTestModules">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/Common"/>
+<use name="FWCore/ParameterSet"/>
+<use name="RecoLocalTracker/SiStripRecHitConverter"/>
+<use name="clhep"/>
+<use name="boost"/>
+<use name="root"/>
+<library file="*.cc" name="RecoLocalTrackerSiStripRecHitConverterTestModules">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiStripZeroSuppression/BuildFile.xml b/RecoLocalTracker/SiStripZeroSuppression/BuildFile.xml
index feba7456bb0b2..7f52cc84a63af 100644
--- a/RecoLocalTracker/SiStripZeroSuppression/BuildFile.xml
+++ b/RecoLocalTracker/SiStripZeroSuppression/BuildFile.xml
@@ -1,14 +1,14 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Utilities"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="CalibFormats/SiStripObjects"/>
-<use   name="CalibTracker/Records"/>
-<use   name="root"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="CalibFormats/SiStripObjects"/>
+<use name="CalibTracker/Records"/>
+<use name="root"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoLocalTracker/SiStripZeroSuppression/plugins/BuildFile.xml b/RecoLocalTracker/SiStripZeroSuppression/plugins/BuildFile.xml
index 9ef3d82532c57..446208cb493f9 100644
--- a/RecoLocalTracker/SiStripZeroSuppression/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiStripZeroSuppression/plugins/BuildFile.xml
@@ -1,4 +1,4 @@
-<library   name="RecoLocalTrackerSiStripZeroSuppressionPlugins" file="*.cc">
-  <use   name="RecoLocalTracker/SiStripZeroSuppression"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="RecoLocalTrackerSiStripZeroSuppressionPlugins" file="*.cc">
+  <use name="RecoLocalTracker/SiStripZeroSuppression"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiStripZeroSuppression/test/BuildFile.xml b/RecoLocalTracker/SiStripZeroSuppression/test/BuildFile.xml
index 057572fa32e2b..97aad9f074324 100644
--- a/RecoLocalTracker/SiStripZeroSuppression/test/BuildFile.xml
+++ b/RecoLocalTracker/SiStripZeroSuppression/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<library   name="RecoLocalTrackerSiStripZeroSuppressionTestPlugins" file="*.cc">
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="CommonTools/Utils"/>
-  <use   name="RecoLocalTracker/SiStripZeroSuppression"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="RecoLocalTrackerSiStripZeroSuppressionTestPlugins" file="*.cc">
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="CommonTools/Utils"/>
+  <use name="RecoLocalTracker/SiStripZeroSuppression"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SubCollectionProducers/BuildFile.xml b/RecoLocalTracker/SubCollectionProducers/BuildFile.xml
index c7865377830f8..b1ef95a20cb25 100644
--- a/RecoLocalTracker/SubCollectionProducers/BuildFile.xml
+++ b/RecoLocalTracker/SubCollectionProducers/BuildFile.xml
@@ -1,19 +1,19 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="DataFormats/TrackerCommon"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/SiStripDigi"/>
-<use   name="DataFormats/SiStripCluster"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="DataFormats/SiPixelCluster"/>
-<use   name="RecoLocalTracker/SiStripClusterizer"/>
-<use   name="RecoLocalTracker/ClusterParameterEstimator"/>
-<use   name="RecoLocalTracker/Records"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/TrackerCommon"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/SiStripDigi"/>
+<use name="DataFormats/SiStripCluster"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/JetReco"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="DataFormats/SiPixelCluster"/>
+<use name="RecoLocalTracker/SiStripClusterizer"/>
+<use name="RecoLocalTracker/ClusterParameterEstimator"/>
+<use name="RecoLocalTracker/Records"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/RecoLocalTracker/SubCollectionProducers/test/BuildFile.xml b/RecoLocalTracker/SubCollectionProducers/test/BuildFile.xml
index e7924cfaa2af0..9a3732f0ae374 100644
--- a/RecoLocalTracker/SubCollectionProducers/test/BuildFile.xml
+++ b/RecoLocalTracker/SubCollectionProducers/test/BuildFile.xml
@@ -1,8 +1,8 @@
-<library   name="RecoLocalTrackerSubCollectionProducersTestPlugins" file="*.cc">
-  <use   name="FWCore/Framework"/>
-  <use   name="CommonTools/UtilAlgos"/>
-  <use   name="Geometry/Records"/>
-  <use   name="Geometry/TrackerGeometryBuilder"/>
-  <use   name="DataFormats/TrackerCommon"/>
-  <flags   EDM_PLUGIN="1"/>
+<library name="RecoLocalTrackerSubCollectionProducersTestPlugins" file="*.cc">
+  <use name="FWCore/Framework"/>
+  <use name="CommonTools/UtilAlgos"/>
+  <use name="Geometry/Records"/>
+  <use name="Geometry/TrackerGeometryBuilder"/>
+  <use name="DataFormats/TrackerCommon"/>
+  <flags EDM_PLUGIN="1"/>
 </library>