diff --git a/RecoVertex/AdaptiveVertexFinder/BuildFile.xml b/RecoVertex/AdaptiveVertexFinder/BuildFile.xml
index feb4d957e50bc..fedd18316cb20 100644
--- a/RecoVertex/AdaptiveVertexFinder/BuildFile.xml
+++ b/RecoVertex/AdaptiveVertexFinder/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="RecoVertex/KalmanVertexFit"/>
-<use   name="RecoVertex/AdaptiveVertexFit"/>
-<use   name="RecoVertex/VertexPrimitives"/>
-<use   name="TrackingTools/IPTools"/>
-<use   name="RecoVertex/VertexTools"/>
+<use name="RecoVertex/KalmanVertexFit"/>
+<use name="RecoVertex/AdaptiveVertexFit"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="TrackingTools/IPTools"/>
+<use name="RecoVertex/VertexTools"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/AdaptiveVertexFinder/plugins/BuildFile.xml b/RecoVertex/AdaptiveVertexFinder/plugins/BuildFile.xml
index 2eaba22eb84b1..1304b57194756 100644
--- a/RecoVertex/AdaptiveVertexFinder/plugins/BuildFile.xml
+++ b/RecoVertex/AdaptiveVertexFinder/plugins/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="DataFormats/BeamSpot"/>
-<use   name="RecoVertex/ConfigurableVertexReco"/>
-<use   name="TrackingTools/Records"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="TrackingTools/IPTools"/>
-<use   name="FWCore/Utilities"/>
-<library   name="RecoVertexAdaptiveVertexFinderPlugins" file="*.cc">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/VertexReco"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="RecoVertex/ConfigurableVertexReco"/>
+<use name="TrackingTools/Records"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="TrackingTools/IPTools"/>
+<use name="FWCore/Utilities"/>
+<library name="RecoVertexAdaptiveVertexFinderPlugins" file="*.cc">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoVertex/AdaptiveVertexFit/BuildFile.xml b/RecoVertex/AdaptiveVertexFit/BuildFile.xml
index 9f262af4d75c6..9f662bdfb888e 100644
--- a/RecoVertex/AdaptiveVertexFit/BuildFile.xml
+++ b/RecoVertex/AdaptiveVertexFit/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/GeometryCommonDetAlgo"/>
-<use   name="RecoVertex/VertexPrimitives"/>
-<use   name="RecoVertex/KalmanVertexFit"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="RecoVertex/KalmanVertexFit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/BeamSpotProducer/BuildFile.xml b/RecoVertex/BeamSpotProducer/BuildFile.xml
index 90eea016a2346..1456316fedf48 100644
--- a/RecoVertex/BeamSpotProducer/BuildFile.xml
+++ b/RecoVertex/BeamSpotProducer/BuildFile.xml
@@ -1,20 +1,20 @@
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondFormats/BeamSpotObjects"/>
-<use   name="DataFormats/BeamSpot"/>
-<use   name="DataFormats/Scalers"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="clhep"/>
-<use   name="rootcore"/>
-<use   name="rootminuit2"/>
-<use   name="rootminuit"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondFormats/BeamSpotObjects"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/Scalers"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/VertexReco"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="clhep"/>
+<use name="rootcore"/>
+<use name="rootminuit2"/>
+<use name="rootminuit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml b/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml
index 9c4a69b6f0e82..7f596993b6237 100644
--- a/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml
+++ b/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml
@@ -1,32 +1,35 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="CondFormats/BeamSpotObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondCore/DBOutputService"/>
-
-<use   name="root"/>
-<use   name="rootminuit"/>
-<use   name="RecoVertex/BeamSpotProducer"/>
-<library   file="BeamSpotProducer.cc" name="BeamSpotProducer">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="CondFormats/BeamSpotObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondCore/DBOutputService"/>
+<use name="root"/>
+<use name="rootminuit"/>
+<use name="RecoVertex/BeamSpotProducer"/>
+<library file="BeamSpotProducer.cc" name="BeamSpotProducer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="BeamSpotOnlineProducer.cc" name="BeamSpotOnlineProducer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="BeamSpotOnlineProducer.cc" name="BeamSpotOnlineProducer">
+  <flags EDM_PLUGIN="1"/>
   <use name="DataFormats/L1GlobalTrigger"/>
 </library>
-<library   file="BeamSpotAnalyzer.cc" name="BeamSpotAnalyzer">
-  <use   name="clhep"/>
-  <flags   EDM_PLUGIN="1"/>
-</library>
-<library   file="BeamSpotWrite2DB.cc" name="BeamSpotWrite2DB">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="BeamSpotAnalyzer.cc" name="BeamSpotAnalyzer">
+  <use name="clhep"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="BeamSpotFakeConditions.cc" name="BeamSpotFakeConditions">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="BeamSpotWrite2DB.cc" name="BeamSpotWrite2DB">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="BeamSpotFromDB.cc" name="BeamSpotFromDB">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="BeamSpotFakeConditions.cc" name="BeamSpotFakeConditions">
+  <flags EDM_PLUGIN="1"/>
 </library>
 
+<library file="BeamSpotFromDB.cc" name="BeamSpotFromDB">
+  <flags EDM_PLUGIN="1"/>
+</library>
diff --git a/RecoVertex/BeamSpotProducer/test/BuildFile.xml b/RecoVertex/BeamSpotProducer/test/BuildFile.xml
index 0d5970489e1bb..6ab5ce6988b73 100644
--- a/RecoVertex/BeamSpotProducer/test/BuildFile.xml
+++ b/RecoVertex/BeamSpotProducer/test/BuildFile.xml
@@ -1,10 +1,10 @@
-
-<use   name="root"/>
-<use   name="rootminuit"/>
-<use   name="RecoVertex/BeamSpotProducer"/>
-<library   file="NtupleHelper.cc" name="NtupleHelper">
+<use name="root"/>
+<use name="rootminuit"/>
+<use name="RecoVertex/BeamSpotProducer"/>
+<library file="NtupleHelper.cc" name="NtupleHelper">
 </library>
-<bin   file="BeamFit.cc" name="beamfit">
+
+<bin file="BeamFit.cc" name="beamfit">
   <flags NO_TESTRUN="1"/>
-  <lib   name="NtupleHelper"/>
+  <lib name="NtupleHelper"/>
 </bin>
diff --git a/RecoVertex/ConfigurableVertexReco/BuildFile.xml b/RecoVertex/ConfigurableVertexReco/BuildFile.xml
index b94e57954f613..536cc6d836f6a 100644
--- a/RecoVertex/ConfigurableVertexReco/BuildFile.xml
+++ b/RecoVertex/ConfigurableVertexReco/BuildFile.xml
@@ -1,8 +1,8 @@
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="FWCore/ParameterSet"/>
-<use   name="RecoVertex/AdaptiveVertexFit"/>
-<use   name="RecoVertex/TrimmedKalmanVertexFinder"/>
-<use   name="RecoVertex/AdaptiveVertexFinder"/>
-<use   name="RecoVertex/MultiVertexFit"/>
+<use name="FWCore/ParameterSet"/>
+<use name="RecoVertex/AdaptiveVertexFit"/>
+<use name="RecoVertex/TrimmedKalmanVertexFinder"/>
+<use name="RecoVertex/AdaptiveVertexFinder"/>
+<use name="RecoVertex/MultiVertexFit"/>
diff --git a/RecoVertex/ConfigurableVertexReco/test/BuildFile.xml b/RecoVertex/ConfigurableVertexReco/test/BuildFile.xml
index e9204df2631f4..ecb3c356cc713 100644
--- a/RecoVertex/ConfigurableVertexReco/test/BuildFile.xml
+++ b/RecoVertex/ConfigurableVertexReco/test/BuildFile.xml
@@ -1,9 +1,9 @@
-<library   file="CVRTest.cc" name="CVRTest">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="RecoVertex/ConfigurableVertexReco"/>
-  <use   name="root"/>
-  <use   name="PhysicsTools/UtilAlgos"/>
-  <use   name="TrackingTools/Records"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="CVRTest.cc" name="CVRTest">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="RecoVertex/ConfigurableVertexReco"/>
+  <use name="root"/>
+  <use name="PhysicsTools/UtilAlgos"/>
+  <use name="TrackingTools/Records"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoVertex/GaussianSumVertexFit/BuildFile.xml b/RecoVertex/GaussianSumVertexFit/BuildFile.xml
index f563e44d114b7..836a9415b8041 100644
--- a/RecoVertex/GaussianSumVertexFit/BuildFile.xml
+++ b/RecoVertex/GaussianSumVertexFit/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/GeometryCommonDetAlgo"/>
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="RecoVertex/AdaptiveVertexFit"/>
-<use   name="RecoVertex/KalmanVertexFit"/>
-<use   name="RecoVertex/LinearizationPointFinders"/>
-<use   name="RecoVertex/VertexPrimitives"/>
-<use   name="RecoVertex/VertexTools"/>
-<use   name="TrackingTools/GsfTools"/>
-<use   name="TrackingTools/PatternTools"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="TrackingTools/TransientTrack"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="FWCore/ParameterSet"/>
+<use name="RecoVertex/AdaptiveVertexFit"/>
+<use name="RecoVertex/KalmanVertexFit"/>
+<use name="RecoVertex/LinearizationPointFinders"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="RecoVertex/VertexTools"/>
+<use name="TrackingTools/GsfTools"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="TrackingTools/TransientTrack"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/GaussianSumVertexFit/test/BuildFile.xml b/RecoVertex/GaussianSumVertexFit/test/BuildFile.xml
index 5d6071c435024..a5451a8457878 100644
--- a/RecoVertex/GaussianSumVertexFit/test/BuildFile.xml
+++ b/RecoVertex/GaussianSumVertexFit/test/BuildFile.xml
@@ -1,17 +1,17 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/GsfTrackReco"/>
-<use   name="SimDataFormats/TrackingAnalysis"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="MagneticField/Records"/>
-<use   name="TrackingTools/Records"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="RecoVertex/GaussianSumVertexFit"/>
-<use   name="RecoVertex/KalmanVertexFit"/>
-<use   name="clhep"/>
-<use   name="boost"/>
-<use   name="root"/>
-<use   name="DataFormats/TrackReco"/>
-<flags   EDM_PLUGIN="1"/>
-<library   file="*.cc" name="GaussianSumVertexFitTest">
+<use name="FWCore/Framework"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/GsfTrackReco"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
+<use name="FWCore/ParameterSet"/>
+<use name="MagneticField/Records"/>
+<use name="TrackingTools/Records"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="RecoVertex/GaussianSumVertexFit"/>
+<use name="RecoVertex/KalmanVertexFit"/>
+<use name="clhep"/>
+<use name="boost"/>
+<use name="root"/>
+<use name="DataFormats/TrackReco"/>
+<flags EDM_PLUGIN="1"/>
+<library file="*.cc" name="GaussianSumVertexFitTest">
 </library>
diff --git a/RecoVertex/GhostTrackFitter/BuildFile.xml b/RecoVertex/GhostTrackFitter/BuildFile.xml
index c8fc482f8f042..6b32682fb44e9 100644
--- a/RecoVertex/GhostTrackFitter/BuildFile.xml
+++ b/RecoVertex/GhostTrackFitter/BuildFile.xml
@@ -13,5 +13,5 @@
 <use name="RecoVertex/AdaptiveVertexFit"/>
 <use name="rootmath"/>
 <export>
-   <lib name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/KalmanVertexFit/BuildFile.xml b/RecoVertex/KalmanVertexFit/BuildFile.xml
index a26a8e396bd96..384e60d3434ae 100644
--- a/RecoVertex/KalmanVertexFit/BuildFile.xml
+++ b/RecoVertex/KalmanVertexFit/BuildFile.xml
@@ -1,17 +1,17 @@
-<use   name="CommonTools/Statistics"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="DataFormats/GeometryCommonDetAlgo"/>
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="RecoVertex/LinearizationPointFinders"/>
-<use   name="RecoVertex/VertexPrimitives"/>
-<use   name="RecoVertex/VertexTools"/>
-<use   name="SimDataFormats/TrackingAnalysis"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="rootcore"/>
+<use name="CommonTools/Statistics"/>
+<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/VertexReco"/>
+<use name="FWCore/MessageLogger"/>
+<use name="RecoVertex/LinearizationPointFinders"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="RecoVertex/VertexTools"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="rootcore"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml b/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml
index 667762709a108..190b1e5e60c2e 100644
--- a/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml
+++ b/RecoVertex/KalmanVertexFit/plugins/BuildFile.xml
@@ -1,14 +1,14 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/Common"/>
-<use   name="SimDataFormats/TrackingAnalysis"/>
-<use   name="SimTracker/Records"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="RecoVertex/KalmanVertexFit"/>
-<use   name="clhep"/>
-<use   name="boost"/>
-<use   name="root"/>
-<use   name="DataFormats/TrackReco"/>
-<flags   EDM_PLUGIN="1"/>
-<library   file="*.cc" name="RecoVertexKalmanVertexFitPlugins">
+<use name="FWCore/Framework"/>
+<use name="DataFormats/Common"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
+<use name="SimTracker/Records"/>
+<use name="FWCore/ParameterSet"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="RecoVertex/KalmanVertexFit"/>
+<use name="clhep"/>
+<use name="boost"/>
+<use name="root"/>
+<use name="DataFormats/TrackReco"/>
+<flags EDM_PLUGIN="1"/>
+<library file="*.cc" name="RecoVertexKalmanVertexFitPlugins">
 </library>
diff --git a/RecoVertex/KalmanVertexFit/test/BuildFile.xml b/RecoVertex/KalmanVertexFit/test/BuildFile.xml
index 312ee4a1e5732..19aa703b81a1d 100644
--- a/RecoVertex/KalmanVertexFit/test/BuildFile.xml
+++ b/RecoVertex/KalmanVertexFit/test/BuildFile.xml
@@ -1,4 +1,4 @@
-<use   name="clhep"/>
-<use   name="boost"/>
-<use   name="root"/>
-<use   name="hepmc"/>
+<use name="clhep"/>
+<use name="boost"/>
+<use name="root"/>
+<use name="hepmc"/>
diff --git a/RecoVertex/KinematicFit/BuildFile.xml b/RecoVertex/KinematicFit/BuildFile.xml
index 59192234583df..5ed322848bca0 100644
--- a/RecoVertex/KinematicFit/BuildFile.xml
+++ b/RecoVertex/KinematicFit/BuildFile.xml
@@ -1,5 +1,5 @@
-<use   name="RecoVertex/KalmanVertexFit"/>
+<use name="RecoVertex/KalmanVertexFit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="RecoVertex/KinematicFitPrimitives"/>
+<use name="RecoVertex/KinematicFitPrimitives"/>
diff --git a/RecoVertex/KinematicFit/plugins/BuildFile.xml b/RecoVertex/KinematicFit/plugins/BuildFile.xml
index 3b0dba7df842b..90cd7d9be4ac9 100644
--- a/RecoVertex/KinematicFit/plugins/BuildFile.xml
+++ b/RecoVertex/KinematicFit/plugins/BuildFile.xml
@@ -1,14 +1,14 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/Common"/>
-<use   name="SimDataFormats/TrackingAnalysis"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="TrackingTools/Records"/>
-<use   name="RecoVertex/KinematicFit"/>
-<use   name="RecoVertex/KinematicFitPrimitives"/>
-<use   name="RecoVertex/KalmanVertexFit"/>
-<use   name="clhep"/>
-<use   name="boost"/>
-<use   name="root"/>
-<use   name="DataFormats/TrackReco"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/Common"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
+<use name="FWCore/ParameterSet"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="TrackingTools/Records"/>
+<use name="RecoVertex/KinematicFit"/>
+<use name="RecoVertex/KinematicFitPrimitives"/>
+<use name="RecoVertex/KalmanVertexFit"/>
+<use name="clhep"/>
+<use name="boost"/>
+<use name="root"/>
+<use name="DataFormats/TrackReco"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/RecoVertex/KinematicFitPrimitives/BuildFile.xml b/RecoVertex/KinematicFitPrimitives/BuildFile.xml
index 7398ba59df6b6..a1b467a508f2e 100644
--- a/RecoVertex/KinematicFitPrimitives/BuildFile.xml
+++ b/RecoVertex/KinematicFitPrimitives/BuildFile.xml
@@ -1,6 +1,6 @@
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="TrackingTools/GeomPropagators"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="TrackingTools/GeomPropagators"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="RecoVertex/VertexPrimitives"/>
+<use name="RecoVertex/VertexPrimitives"/>
diff --git a/RecoVertex/KinematicFitPrimitives/test/BuildFile.xml b/RecoVertex/KinematicFitPrimitives/test/BuildFile.xml
index 513b982eef6f4..763fe98067da6 100644
--- a/RecoVertex/KinematicFitPrimitives/test/BuildFile.xml
+++ b/RecoVertex/KinematicFitPrimitives/test/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="MagneticField/Engine"/>
-<use   name="RecoVertex/KinematicFitPrimitives"/>
-<use   name="boost"/>
-<use   name="clhep"/>
-<bin   file="KinematicState_t.cpp">
+<use name="DataFormats/GeometrySurface"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="MagneticField/Engine"/>
+<use name="RecoVertex/KinematicFitPrimitives"/>
+<use name="boost"/>
+<use name="clhep"/>
+<bin file="KinematicState_t.cpp">
 </bin>
diff --git a/RecoVertex/LinearizationPointFinders/BuildFile.xml b/RecoVertex/LinearizationPointFinders/BuildFile.xml
index 191ed7c164787..618ca5b6344df 100644
--- a/RecoVertex/LinearizationPointFinders/BuildFile.xml
+++ b/RecoVertex/LinearizationPointFinders/BuildFile.xml
@@ -1,8 +1,8 @@
-<use   name="DataFormats/GeometryVector"/>
-<use   name="FWCore/Utilities"/>
-<use   name="RecoVertex/VertexTools"/>
-<use   name="TrackingTools/PatternTools"/>
-<use   name="TrackingTools/TransientTrack"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="FWCore/Utilities"/>
+<use name="RecoVertex/VertexTools"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/TransientTrack"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/MultiVertexFit/BuildFile.xml b/RecoVertex/MultiVertexFit/BuildFile.xml
index ff7b20052a8b4..d554e4b3b2f17 100644
--- a/RecoVertex/MultiVertexFit/BuildFile.xml
+++ b/RecoVertex/MultiVertexFit/BuildFile.xml
@@ -1,12 +1,12 @@
-<use   name="CommonTools/Clustering1D"/>
-<use   name="DataFormats/GeometryCommonDetAlgo"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="RecoVertex/KalmanVertexFit"/>
-<use   name="RecoVertex/LinearizationPointFinders"/>
-<use   name="RecoVertex/VertexPrimitives"/>
-<use   name="RecoVertex/VertexTools"/>
-<use   name="TrackingTools/PatternTools"/>
-<use   name="TrackingTools/TransientTrack"/>
+<use name="CommonTools/Clustering1D"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="RecoVertex/KalmanVertexFit"/>
+<use name="RecoVertex/LinearizationPointFinders"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="RecoVertex/VertexTools"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/TransientTrack"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/PrimaryVertexProducer/BuildFile.xml b/RecoVertex/PrimaryVertexProducer/BuildFile.xml
index e55253e9d749c..e9f239c3e3809 100644
--- a/RecoVertex/PrimaryVertexProducer/BuildFile.xml
+++ b/RecoVertex/PrimaryVertexProducer/BuildFile.xml
@@ -1,15 +1,15 @@
-<use   name="ofast-flag"/>
-<use   name="DataFormats/BeamSpot"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="RecoVertex/AdaptiveVertexFit"/>
-<use   name="RecoVertex/KalmanVertexFit"/>
-<use   name="RecoVertex/VertexPrimitives"/>
-<use   name="RecoVertex/VertexTools"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="vdt_headers"/>
+<use name="ofast-flag"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/VertexReco"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="RecoVertex/AdaptiveVertexFit"/>
+<use name="RecoVertex/KalmanVertexFit"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="RecoVertex/VertexTools"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="vdt_headers"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/PrimaryVertexProducer/plugins/BuildFile.xml b/RecoVertex/PrimaryVertexProducer/plugins/BuildFile.xml
index f7fb492d49085..805c8cee567d8 100644
--- a/RecoVertex/PrimaryVertexProducer/plugins/BuildFile.xml
+++ b/RecoVertex/PrimaryVertexProducer/plugins/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="FWCore/Framework"/>
-<use   name="clhep"/>
-<use   name="RecoVertex/PrimaryVertexProducer"/>
-<use   name="TrackingTools/Records"/>
-<library   file="*.cc" name="RecoVertexPrimaryVertexProducerPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="clhep"/>
+<use name="RecoVertex/PrimaryVertexProducer"/>
+<use name="TrackingTools/Records"/>
+<library file="*.cc" name="RecoVertexPrimaryVertexProducerPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoVertex/TrimmedKalmanVertexFinder/BuildFile.xml b/RecoVertex/TrimmedKalmanVertexFinder/BuildFile.xml
index d7535854a68d0..9742897159477 100644
--- a/RecoVertex/TrimmedKalmanVertexFinder/BuildFile.xml
+++ b/RecoVertex/TrimmedKalmanVertexFinder/BuildFile.xml
@@ -1,5 +1,5 @@
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
-<use   name="RecoVertex/KalmanVertexFit"/>
-<use   name="CommonTools/Statistics"/>
+<use name="RecoVertex/KalmanVertexFit"/>
+<use name="CommonTools/Statistics"/>
diff --git a/RecoVertex/TrimmedVertexFit/BuildFile.xml b/RecoVertex/TrimmedVertexFit/BuildFile.xml
index 4c22ac0561fb8..0359913407011 100644
--- a/RecoVertex/TrimmedVertexFit/BuildFile.xml
+++ b/RecoVertex/TrimmedVertexFit/BuildFile.xml
@@ -1,9 +1,9 @@
-<use   name="DataFormats/BeamSpot"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="RecoVertex/TrimmedKalmanVertexFinder"/>
-<use   name="RecoVertex/VertexPrimitives"/>
-<use   name="RecoVertex/VertexTools"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="RecoVertex/TrimmedKalmanVertexFinder"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="RecoVertex/VertexTools"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/V0Producer/BuildFile.xml b/RecoVertex/V0Producer/BuildFile.xml
index e609d35296820..89cd87a855187 100644
--- a/RecoVertex/V0Producer/BuildFile.xml
+++ b/RecoVertex/V0Producer/BuildFile.xml
@@ -1,19 +1,19 @@
-<flags   EDM_PLUGIN="1"/>
-<use   name="root"/>
-<use   name="DataFormats/BeamSpot"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="MagneticField/Records"/>
-<use   name="MagneticField/VolumeBasedEngine"/>
-<use   name="CommonTools/CandUtils"/>
-<use   name="RecoVertex/AdaptiveVertexFit"/>
-<use   name="RecoVertex/KalmanVertexFit"/>
-<use   name="RecoVertex/VertexPrimitives"/>
-<use   name="TrackingTools/TransientTrack"/>
+<flags EDM_PLUGIN="1"/>
+<use name="root"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/VertexReco"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="MagneticField/Records"/>
+<use name="MagneticField/VolumeBasedEngine"/>
+<use name="CommonTools/CandUtils"/>
+<use name="RecoVertex/AdaptiveVertexFit"/>
+<use name="RecoVertex/KalmanVertexFit"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="TrackingTools/TransientTrack"/>
diff --git a/RecoVertex/V0Producer/test/BuildFile.xml b/RecoVertex/V0Producer/test/BuildFile.xml
index 034ee16ea3e05..ee8166e754a64 100644
--- a/RecoVertex/V0Producer/test/BuildFile.xml
+++ b/RecoVertex/V0Producer/test/BuildFile.xml
@@ -1,20 +1,20 @@
-<use   name="MagneticField/Records"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="SimDataFormats/Track"/>
-<use   name="SimDataFormats/Vertex"/>
-<use   name="root"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="FWCore/ServiceRegistry"/>
-<library   file="*.cc" name="RecoVertexV0Analyzer">
-  <flags   EDM_PLUGIN="1"/>
+<use name="MagneticField/Records"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/VertexReco"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="SimDataFormats/Track"/>
+<use name="SimDataFormats/Vertex"/>
+<use name="root"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="FWCore/ServiceRegistry"/>
+<library file="*.cc" name="RecoVertexV0Analyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoVertex/VertexPrimitives/BuildFile.xml b/RecoVertex/VertexPrimitives/BuildFile.xml
index d69c79afdfcdd..5dc56f3c85576 100644
--- a/RecoVertex/VertexPrimitives/BuildFile.xml
+++ b/RecoVertex/VertexPrimitives/BuildFile.xml
@@ -1,9 +1,9 @@
-<use   name="DataFormats/BeamSpot"/>
-<use   name="DataFormats/GeometrySurface"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="TrackingTools/TransientTrack"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/GeometrySurface"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/VertexReco"/>
+<use name="DataFormats/Candidate"/>
+<use name="TrackingTools/TransientTrack"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoVertex/VertexTools/BuildFile.xml b/RecoVertex/VertexTools/BuildFile.xml
index 984c8d3d88946..62472008ef99e 100644
--- a/RecoVertex/VertexTools/BuildFile.xml
+++ b/RecoVertex/VertexTools/BuildFile.xml
@@ -1,17 +1,17 @@
-<use   name="DataFormats/BeamSpot"/>
-<use   name="DataFormats/CLHEP"/>
-<use   name="DataFormats/GeometryCommonDetAlgo"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="RecoVertex/VertexPrimitives"/>
-<use   name="TrackingTools/GeomPropagators"/>
-<use   name="TrackingTools/PatternTools"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="TrackingTools/TransientTrack"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/CLHEP"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/VertexReco"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="TrackingTools/GeomPropagators"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="TrackingTools/TransientTrack"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>