diff --git a/RecoEgamma/EgammaElectronAlgos/BuildFile.xml b/RecoEgamma/EgammaElectronAlgos/BuildFile.xml
index aa865c85bb0e8..f17c884a74b73 100644
--- a/RecoEgamma/EgammaElectronAlgos/BuildFile.xml
+++ b/RecoEgamma/EgammaElectronAlgos/BuildFile.xml
@@ -1,29 +1,29 @@
-<use   name="ofast-flag"/>
-<use   name="TrackingTools/MaterialEffects"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="clhep"/>
-<use   name="MagneticField/Engine"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/GsfTrackReco"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="RecoTracker/MeasurementDet"/>
-<use   name="TrackingTools/DetLayers"/>
-<use   name="TrackingTools/GsfTools"/>
-<use   name="TrackingTools/GsfTracking"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="RecoEgamma/EgammaTools"/>
-<use   name="RecoEgamma/EgammaIsolationAlgos"/>
-<use   name="RecoEgamma/ElectronIdentification"/>
-<use   name="CondFormats/EgammaObjects"/>
-<use   name="CondFormats/DataRecord"/>
+<use name="ofast-flag"/>
+<use name="TrackingTools/MaterialEffects"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="clhep"/>
+<use name="MagneticField/Engine"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/GsfTrackReco"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/CaloRecHit"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="RecoTracker/MeasurementDet"/>
+<use name="TrackingTools/DetLayers"/>
+<use name="TrackingTools/GsfTools"/>
+<use name="TrackingTools/GsfTracking"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="RecoEgamma/EgammaTools"/>
+<use name="RecoEgamma/EgammaIsolationAlgos"/>
+<use name="RecoEgamma/ElectronIdentification"/>
+<use name="CondFormats/EgammaObjects"/>
+<use name="CondFormats/DataRecord"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoEgamma/EgammaElectronProducers/plugins/BuildFile.xml b/RecoEgamma/EgammaElectronProducers/plugins/BuildFile.xml
index 7fc7f6f06a4aa..86fd2663b26b9 100644
--- a/RecoEgamma/EgammaElectronProducers/plugins/BuildFile.xml
+++ b/RecoEgamma/EgammaElectronProducers/plugins/BuildFile.xml
@@ -1,33 +1,33 @@
-<use   name="CommonTools/CandAlgos"/>
-<use   name="DataFormats/BeamSpot"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/GsfTrackReco"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-<use   name="DataFormats/ParticleFlowReco"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="CommonTools/BaseParticlePropagator"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/Utilities"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="RecoEgamma/EgammaElectronAlgos"/>
-<use   name="RecoEgamma/EgammaIsolationAlgos"/>
-<use   name="RecoParticleFlow/PFClusterTools"/>
-<use   name="RecoTracker/TkTrackingRegions"/>
-<use   name="RecoTracker/TransientTrackingRecHit"/>
-<use   name="TrackingTools/PatternTools"/>
-<use   name="TrackingTools/Records"/>
-<use   name="TrackingTools/TrajectoryParametrization"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<library   file="*.cc" name="RecoEgammaEgammaElectronProducersPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="CommonTools/CandAlgos"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/GsfTrackReco"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="DataFormats/ParticleFlowReco"/>
+<use name="DataFormats/TrackReco"/>
+<use name="CommonTools/BaseParticlePropagator"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/Utilities"/>
+<use name="MagneticField/Engine"/>
+<use name="MagneticField/Records"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="RecoEgamma/EgammaElectronAlgos"/>
+<use name="RecoEgamma/EgammaIsolationAlgos"/>
+<use name="RecoParticleFlow/PFClusterTools"/>
+<use name="RecoTracker/TkTrackingRegions"/>
+<use name="RecoTracker/TransientTrackingRecHit"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/Records"/>
+<use name="TrackingTools/TrajectoryParametrization"/>
+<use name="TrackingTools/TrajectoryState"/>
+<library file="*.cc" name="RecoEgammaEgammaElectronProducersPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoEgamma/EgammaElectronProducers/test/BuildFile.xml b/RecoEgamma/EgammaElectronProducers/test/BuildFile.xml
index 637835d8d1e97..741bd03652c32 100644
--- a/RecoEgamma/EgammaElectronProducers/test/BuildFile.xml
+++ b/RecoEgamma/EgammaElectronProducers/test/BuildFile.xml
@@ -4,5 +4,5 @@
   <use name="DataFormats/Common"/>
   <use name="DataFormats/ParticleFlowCandidate"/>
   <use name="DataFormats/EgammaCandidates"/>
-<flags EDM_PLUGIN="1"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoEgamma/EgammaHFProducers/plugins/BuildFile.xml b/RecoEgamma/EgammaHFProducers/plugins/BuildFile.xml
index 9a8df5d55d61e..1ae18bf4fdaf2 100644
--- a/RecoEgamma/EgammaHFProducers/plugins/BuildFile.xml
+++ b/RecoEgamma/EgammaHFProducers/plugins/BuildFile.xml
@@ -1,10 +1,10 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="Geometry/Records"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="root"/>
-<library   file="*.cc" name="RecoEgammaEgammaHFProducersPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="Geometry/Records"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="root"/>
+<library file="*.cc" name="RecoEgammaEgammaHFProducersPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoEgamma/EgammaHLTProducers/plugins/BuildFile.xml b/RecoEgamma/EgammaHLTProducers/plugins/BuildFile.xml
index 2a8ba2d5c70a9..7ccea71c41574 100644
--- a/RecoEgamma/EgammaHLTProducers/plugins/BuildFile.xml
+++ b/RecoEgamma/EgammaHLTProducers/plugins/BuildFile.xml
@@ -1,18 +1,18 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="RecoEgamma/EgammaIsolationAlgos"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="CondFormats/L1TObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="TrackingTools/GsfTools"/>
-<library   file="*.cc" name="RecoEgammaEgammaHLTProducersPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="RecoEgamma/EgammaIsolationAlgos"/>
+<use name="MagneticField/Engine"/>
+<use name="MagneticField/Records"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="CondFormats/L1TObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="TrackingTools/GsfTools"/>
+<library file="*.cc" name="RecoEgammaEgammaHLTProducersPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoEgamma/EgammaIsolationAlgos/BuildFile.xml b/RecoEgamma/EgammaIsolationAlgos/BuildFile.xml
index fafa779d8ea5b..8b1cff2820724 100644
--- a/RecoEgamma/EgammaIsolationAlgos/BuildFile.xml
+++ b/RecoEgamma/EgammaIsolationAlgos/BuildFile.xml
@@ -1,18 +1,18 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="RecoCaloTools/Selectors"/>
-<use   name="DataFormats/Candidate"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/ParticleFlowReco"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/PatCandidates"/>
-<use   name="CondFormats/HcalObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="RecoLocalCalo/EcalRecAlgos"/>
-<use   name="CommonTools/Statistics"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="RecoCaloTools/Selectors"/>
+<use name="DataFormats/Candidate"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/ParticleFlowReco"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/PatCandidates"/>
+<use name="CondFormats/HcalObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<use name="CommonTools/Statistics"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoEgamma/EgammaIsolationAlgos/plugins/BuildFile.xml b/RecoEgamma/EgammaIsolationAlgos/plugins/BuildFile.xml
index d86957b233dbc..cec46e7807cd8 100644
--- a/RecoEgamma/EgammaIsolationAlgos/plugins/BuildFile.xml
+++ b/RecoEgamma/EgammaIsolationAlgos/plugins/BuildFile.xml
@@ -1,29 +1,29 @@
-<use   name="DataFormats/BeamSpot"/>
-<use   name="PhysicsTools/IsolationAlgos"/>
-<use   name="DataFormats/CaloTowers"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/Records"/>
-<use   name="RecoCaloTools/Selectors"/>
-<use   name="CommonTools/Statistics"/>
-<use   name="RecoEgamma/EgammaIsolationAlgos"/>
-<use   name="CondFormats/EcalObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="RecoLocalCalo/EcalRecAlgos"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-<use   name="DataFormats/PatCandidates"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="PhysicsTools/IsolationAlgos"/>
+<use name="DataFormats/CaloTowers"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/TrackReco"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/Records"/>
+<use name="RecoCaloTools/Selectors"/>
+<use name="CommonTools/Statistics"/>
+<use name="RecoEgamma/EgammaIsolationAlgos"/>
+<use name="CondFormats/EcalObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="RecoLocalCalo/EcalRecAlgos"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="DataFormats/PatCandidates"/>
 <export>
 </export>
-<library   file="*.cc" name="RecoEgammaEgammaIsolationAlgosPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="RecoEgammaEgammaIsolationAlgosPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
 
-<library   file="isolation_cones/*.cc" name="RecoEgammaEgammaIsolationAlgosPlugins_isolation_cones">
-  <flags   EDM_PLUGIN="1"/>
+<library file="isolation_cones/*.cc" name="RecoEgammaEgammaIsolationAlgosPlugins_isolation_cones">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoEgamma/EgammaIsolationAlgos/test/BuildFile.xml b/RecoEgamma/EgammaIsolationAlgos/test/BuildFile.xml
index 86491e7ad9bc0..c9aadf990a25d 100644
--- a/RecoEgamma/EgammaIsolationAlgos/test/BuildFile.xml
+++ b/RecoEgamma/EgammaIsolationAlgos/test/BuildFile.xml
@@ -1,5 +1,5 @@
 <use name="RecoEgamma/EgammaIsolationAlgos"/>
-<bin file="EgammaTowerIso_t.cpp" />
-<library   file="TestEgammaTowerIso.cc" name="TestEgammaTowerIso">
-<flags   EDM_PLUGIN="1"/>
-</library>
\ No newline at end of file
+<bin file="EgammaTowerIso_t.cpp"/>
+<library file="TestEgammaTowerIso.cc" name="TestEgammaTowerIso">
+  <flags EDM_PLUGIN="1"/>
+</library>
diff --git a/RecoEgamma/EgammaMCTools/BuildFile.xml b/RecoEgamma/EgammaMCTools/BuildFile.xml
index 9403251074102..4483bc5eef1b0 100644
--- a/RecoEgamma/EgammaMCTools/BuildFile.xml
+++ b/RecoEgamma/EgammaMCTools/BuildFile.xml
@@ -1,7 +1,7 @@
-<use   name="SimDataFormats/Track"/>
-<use   name="SimDataFormats/Vertex"/>
-<use   name="SimDataFormats/CrossingFrame"/>
-<use   name="clhep"/>
+<use name="SimDataFormats/Track"/>
+<use name="SimDataFormats/Vertex"/>
+<use name="SimDataFormats/CrossingFrame"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoEgamma/EgammaMCTools/plugins/BuildFile.xml b/RecoEgamma/EgammaMCTools/plugins/BuildFile.xml
index 4187c088f682c..23dc7d7d8e660 100644
--- a/RecoEgamma/EgammaMCTools/plugins/BuildFile.xml
+++ b/RecoEgamma/EgammaMCTools/plugins/BuildFile.xml
@@ -1,11 +1,11 @@
 <export>
 </export>
-<library   name="PFClusterMatchedToPhotonsSelector_plugins" file="PFClusterMatchedToPhotonsSelector.cc">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/Math"/>
-  <use   name="DataFormats/ParticleFlowReco"/>
-  <use   name="DataFormats/HepMCCandidate"/>
-  <use   name="SimDataFormats/TrackingAnalysis"/>
+<library name="PFClusterMatchedToPhotonsSelector_plugins" file="PFClusterMatchedToPhotonsSelector.cc">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/Math"/>
+  <use name="DataFormats/ParticleFlowReco"/>
+  <use name="DataFormats/HepMCCandidate"/>
+  <use name="SimDataFormats/TrackingAnalysis"/>
 </library>
diff --git a/RecoEgamma/EgammaPhotonAlgos/BuildFile.xml b/RecoEgamma/EgammaPhotonAlgos/BuildFile.xml
index a12cb7bc14ac1..daac60baad259 100644
--- a/RecoEgamma/EgammaPhotonAlgos/BuildFile.xml
+++ b/RecoEgamma/EgammaPhotonAlgos/BuildFile.xml
@@ -1,32 +1,32 @@
-<use   name="ofast-flag"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="CommonTools/CandAlgos"/>
-<use   name="RecoEgamma/EgammaTools"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrajectorySeed"/>
-<use   name="TrackingTools/MaterialEffects"/>
-<use   name="TrackingTools/GeomPropagators"/>
-<use   name="TrackingTools/KalmanUpdators"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="TrackingTools/PatternTools"/>
-<use   name="TrackingTools/DetLayers"/>
-<use   name="TrackingTools/TransientTrack"/>
-<use   name="RecoTracker/MeasurementDet"/>
-<use   name="RecoTracker/CkfPattern"/>
-<use   name="RecoTracker/TkSeedGenerator"/>
-<use   name="RecoVertex/VertexPrimitives"/>
-<use   name="RecoVertex/KalmanVertexFit"/>
-<use   name="RecoVertex/KinematicFitPrimitives"/>
-<use   name="RecoVertex/KinematicFit"/>
-<use   name="MagneticField/Engine"/>
-<use   name="Utilities/General"/>
-<use   name="clhep"/>
+<use name="ofast-flag"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="DataFormats/CaloRecHit"/>
+<use name="CommonTools/CandAlgos"/>
+<use name="RecoEgamma/EgammaTools"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrajectorySeed"/>
+<use name="TrackingTools/MaterialEffects"/>
+<use name="TrackingTools/GeomPropagators"/>
+<use name="TrackingTools/KalmanUpdators"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/DetLayers"/>
+<use name="TrackingTools/TransientTrack"/>
+<use name="RecoTracker/MeasurementDet"/>
+<use name="RecoTracker/CkfPattern"/>
+<use name="RecoTracker/TkSeedGenerator"/>
+<use name="RecoVertex/VertexPrimitives"/>
+<use name="RecoVertex/KalmanVertexFit"/>
+<use name="RecoVertex/KinematicFitPrimitives"/>
+<use name="RecoVertex/KinematicFit"/>
+<use name="MagneticField/Engine"/>
+<use name="Utilities/General"/>
+<use name="clhep"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoEgamma/EgammaPhotonProducers/BuildFile.xml b/RecoEgamma/EgammaPhotonProducers/BuildFile.xml
index 4d8f5bb2def30..bf15fe4512b9b 100644
--- a/RecoEgamma/EgammaPhotonProducers/BuildFile.xml
+++ b/RecoEgamma/EgammaPhotonProducers/BuildFile.xml
@@ -1,29 +1,28 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="DataFormats/ParticleFlowCandidate"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/TrajectorySeed"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/TrackCandidate"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/EgammaTrackReco"/>
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/Math"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="RecoEgamma/EgammaIsolationAlgos"/>
-<use   name="RecoEgamma/EgammaPhotonAlgos"/>
-<use   name="RecoEgamma/PhotonIdentification"/>
-<use   name="RecoEgamma/EgammaTools"/>
-<use   name="RecoTracker/MeasurementDet"/>
-<use   name="RecoTracker/CkfPattern"/>
-<use   name="RecoTracker/TrackProducer"/>
-<use   name="RecoVertex/KinematicFitPrimitives"/>
-<use   name="RecoVertex/KinematicFit"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="RecoCaloTools/Selectors"/>
-
-<use   name="clhep"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="DataFormats/ParticleFlowCandidate"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/TrajectorySeed"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/TrackCandidate"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/EgammaTrackReco"/>
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/Math"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="RecoEgamma/EgammaIsolationAlgos"/>
+<use name="RecoEgamma/EgammaPhotonAlgos"/>
+<use name="RecoEgamma/PhotonIdentification"/>
+<use name="RecoEgamma/EgammaTools"/>
+<use name="RecoTracker/MeasurementDet"/>
+<use name="RecoTracker/CkfPattern"/>
+<use name="RecoTracker/TrackProducer"/>
+<use name="RecoVertex/KinematicFitPrimitives"/>
+<use name="RecoVertex/KinematicFit"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="RecoCaloTools/Selectors"/>
+<use name="clhep"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/RecoEgamma/EgammaTools/BuildFile.xml b/RecoEgamma/EgammaTools/BuildFile.xml
index 0098fff81aa4a..68da645a15c4e 100644
--- a/RecoEgamma/EgammaTools/BuildFile.xml
+++ b/RecoEgamma/EgammaTools/BuildFile.xml
@@ -1,17 +1,17 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="RecoLocalCalo/HGCalRecAlgos"/>
-<use   name="clhep"/>
-<use   name="root"/>
-<use   name="roottmva"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/EgammaObjects"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="DataFormats/ParticleFlowReco"/>
-<use   name="CommonTools/Utils"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="RecoLocalCalo/HGCalRecAlgos"/>
+<use name="clhep"/>
+<use name="root"/>
+<use name="roottmva"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/EgammaObjects"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="DataFormats/ParticleFlowReco"/>
+<use name="CommonTools/Utils"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoEgamma/EgammaTools/plugins/BuildFile.xml b/RecoEgamma/EgammaTools/plugins/BuildFile.xml
index eed2297ecaf97..4ca75b304960d 100644
--- a/RecoEgamma/EgammaTools/plugins/BuildFile.xml
+++ b/RecoEgamma/EgammaTools/plugins/BuildFile.xml
@@ -1,10 +1,10 @@
-<library   file="*.cc" name="RecoEgammaEgammaToolsPlugins">
-  <flags   EDM_PLUGIN="1"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="CommonTools/CandAlgos"/>
-  <use   name="CondCore/DBOutputService"/>
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="CondFormats/EgammaObjects"/>
-  <use   name="DataFormats/EgammaCandidates"/>
-  <use   name="RecoEgamma/EgammaTools"/>
+<library file="*.cc" name="RecoEgammaEgammaToolsPlugins">
+  <flags EDM_PLUGIN="1"/>
+  <use name="FWCore/Framework"/>
+  <use name="CommonTools/CandAlgos"/>
+  <use name="CondCore/DBOutputService"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondFormats/EgammaObjects"/>
+  <use name="DataFormats/EgammaCandidates"/>
+  <use name="RecoEgamma/EgammaTools"/>
 </library>
diff --git a/RecoEgamma/EgammaTools/test/BuildFile.xml b/RecoEgamma/EgammaTools/test/BuildFile.xml
index abd4465531d16..01ae80699ad78 100644
--- a/RecoEgamma/EgammaTools/test/BuildFile.xml
+++ b/RecoEgamma/EgammaTools/test/BuildFile.xml
@@ -1,10 +1,10 @@
 <library name="RecoEGammaGBRWrapperMaker" file="GBRWrapperMaker.cc">
-  <use   name="FWCore/Framework"/>
-  <use   name="PhysicsTools/MVAComputer"/>
-  <use   name="CondCore/DBOutputService"/>
-  <use   name="CondFormats/DataRecord"/>
-  <use   name="CondFormats/EgammaObjects"/>
-  <use   name="DataFormats/EgammaCandidates"/>
-  <use   name="RecoEgamma/EgammaTools"/>
+  <use name="FWCore/Framework"/>
+  <use name="PhysicsTools/MVAComputer"/>
+  <use name="CondCore/DBOutputService"/>
+  <use name="CondFormats/DataRecord"/>
+  <use name="CondFormats/EgammaObjects"/>
+  <use name="DataFormats/EgammaCandidates"/>
+  <use name="RecoEgamma/EgammaTools"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoEgamma/ElectronIdentification/BuildFile.xml b/RecoEgamma/ElectronIdentification/BuildFile.xml
index dbdb22e6d6c06..6972bdf67004b 100644
--- a/RecoEgamma/ElectronIdentification/BuildFile.xml
+++ b/RecoEgamma/ElectronIdentification/BuildFile.xml
@@ -1,9 +1,8 @@
-<use   name="CondFormats/EgammaObjects"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="CommonTools/MVAUtils"/>
-<use   name="RecoEgamma/EgammaTools"/>
-<use   name="PhysicsTools/SelectorUtils"/>
-
+<use name="CondFormats/EgammaObjects"/>
+<use name="DataFormats/TrackReco"/>
+<use name="CommonTools/MVAUtils"/>
+<use name="RecoEgamma/EgammaTools"/>
+<use name="PhysicsTools/SelectorUtils"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoEgamma/ElectronIdentification/plugins/BuildFile.xml b/RecoEgamma/ElectronIdentification/plugins/BuildFile.xml
index 5a02a8245db68..33177a5470dc4 100644
--- a/RecoEgamma/ElectronIdentification/plugins/BuildFile.xml
+++ b/RecoEgamma/ElectronIdentification/plugins/BuildFile.xml
@@ -1,18 +1,18 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="root"/>
-<use   name="rootcore"/>
-<use   name="RecoEgamma/EgammaTools"/>
-<use   name="RecoEgamma/EgammaIsolationAlgos"/>
-<use   name="RecoEgamma/ElectronIdentification"/>
-
-<library   file="*.cc" name="RecoEgammaElectronIdentificationPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="root"/>
+<use name="rootcore"/>
+<use name="RecoEgamma/EgammaTools"/>
+<use name="RecoEgamma/EgammaIsolationAlgos"/>
+<use name="RecoEgamma/ElectronIdentification"/>
+<library file="*.cc" name="RecoEgammaElectronIdentificationPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
+
 <library name="RecoEgammaElectronIdentificationPlugins_cuts" file="cuts/*.cc">
-   <flags   EDM_PLUGIN="1"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoEgamma/ElectronIdentification/test/BuildFile.xml b/RecoEgamma/ElectronIdentification/test/BuildFile.xml
index 7de6563367022..7fe80d3dff6a6 100644
--- a/RecoEgamma/ElectronIdentification/test/BuildFile.xml
+++ b/RecoEgamma/ElectronIdentification/test/BuildFile.xml
@@ -1,17 +1,17 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="root"/>
-<use   name="rootcore"/>
-<use   name="RecoEgamma/ElectronIdentification"/>
-
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="root"/>
+<use name="rootcore"/>
+<use name="RecoEgamma/ElectronIdentification"/>
 <library name="RecoEgammaElectronIdentificationVIDExample" file="VIDUsageExample.cc">
-   <flags   EDM_PLUGIN="1"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
 
 <environment>
-  <bin   file="runtestRecoEgammaElectronIdentification.cpp">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash RecoEgamma/ElectronIdentification/test runtests.sh"/>
-    <use   name="FWCore/Utilities"/>
+  <bin file="runtestRecoEgammaElectronIdentification.cpp">
+    <flags TEST_RUNNER_ARGS=" /bin/bash RecoEgamma/ElectronIdentification/test runtests.sh"/>
+    <use name="FWCore/Utilities"/>
   </bin>
+
 </environment>
diff --git a/RecoEgamma/Examples/plugins/BuildFile.xml b/RecoEgamma/Examples/plugins/BuildFile.xml
index 4edc5b2702ca4..75d1a22d2986b 100644
--- a/RecoEgamma/Examples/plugins/BuildFile.xml
+++ b/RecoEgamma/Examples/plugins/BuildFile.xml
@@ -1,47 +1,47 @@
-<use   name="RecoEgamma/EgammaMCTools"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="RecoTracker/TkDetLayers"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="MagneticField/Engine"/>
-<use   name="MagneticField/Records"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="TrackingTools/MaterialEffects"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<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="DataFormats/BeamSpot"/>
-<use   name="DataFormats/CaloRecHit"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/GeometryCommonDetAlgo"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/GsfTrackReco"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/Math"/>
-<use   name="DataFormats/PatCandidates"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/TrajectoryState"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="DQMServices/Core"/>
-<use   name="SimDataFormats/CrossingFrame"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="SimDataFormats/Track"/>
-<use   name="SimDataFormats/TrackingAnalysis"/>
-<use   name="SimDataFormats/Vertex"/>
-<library   file="*.cc" name="RecoEgammaExamplesPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="RecoEgamma/EgammaMCTools"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="RecoTracker/TkDetLayers"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="Geometry/CaloTopology"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="MagneticField/Engine"/>
+<use name="MagneticField/Records"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="TrackingTools/MaterialEffects"/>
+<use name="TrackingTools/TrajectoryState"/>
+<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="DataFormats/BeamSpot"/>
+<use name="DataFormats/CaloRecHit"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/GeometryCommonDetAlgo"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/GsfTrackReco"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/Math"/>
+<use name="DataFormats/PatCandidates"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrajectoryState"/>
+<use name="DataFormats/VertexReco"/>
+<use name="DQMServices/Core"/>
+<use name="SimDataFormats/CrossingFrame"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="SimDataFormats/Track"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
+<use name="SimDataFormats/Vertex"/>
+<library file="*.cc" name="RecoEgammaExamplesPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoEgamma/PhotonIdentification/BuildFile.xml b/RecoEgamma/PhotonIdentification/BuildFile.xml
index a71189f583850..ac04029939f10 100644
--- a/RecoEgamma/PhotonIdentification/BuildFile.xml
+++ b/RecoEgamma/PhotonIdentification/BuildFile.xml
@@ -1,13 +1,12 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/PatCandidates"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="DataFormats/BeamSpot"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="RecoEgamma/EgammaIsolationAlgos"/>
-<use   name="PhysicsTools/SelectorUtils"/>
-
+<use name="FWCore/Framework"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/PatCandidates"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="DataFormats/BeamSpot"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="RecoEgamma/EgammaIsolationAlgos"/>
+<use name="PhysicsTools/SelectorUtils"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/RecoEgamma/PhotonIdentification/plugins/BuildFile.xml b/RecoEgamma/PhotonIdentification/plugins/BuildFile.xml
index 514d643860932..d982ef7fabaf1 100644
--- a/RecoEgamma/PhotonIdentification/plugins/BuildFile.xml
+++ b/RecoEgamma/PhotonIdentification/plugins/BuildFile.xml
@@ -1,17 +1,18 @@
-<use   name="FWCore/Framework"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/PatCandidates"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="PhysicsTools/SelectorUtils"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="CommonTools/MVAUtils"/>
-<library   name="RecoEgammaPhotonIdentificationPlugins" file="*.cc">
-  <use   name="RecoEgamma/PhotonIdentification"/>
-  <use   name="RecoEgamma/EgammaTools"/>
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/PatCandidates"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="PhysicsTools/SelectorUtils"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="CommonTools/MVAUtils"/>
+<library name="RecoEgammaPhotonIdentificationPlugins" file="*.cc">
+  <use name="RecoEgamma/PhotonIdentification"/>
+  <use name="RecoEgamma/EgammaTools"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
+
 <library name="RecoEgammaPhotonIdentificationPlugins_cuts" file="cuts/*.cc">
-  <use   name="RecoEgamma/EgammaTools"/>
-  <flags   EDM_PLUGIN="1"/>
+  <use name="RecoEgamma/EgammaTools"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoEgamma/PhotonIdentification/test/BuildFile.xml b/RecoEgamma/PhotonIdentification/test/BuildFile.xml
index a0888612613e2..eb024edc388f2 100644
--- a/RecoEgamma/PhotonIdentification/test/BuildFile.xml
+++ b/RecoEgamma/PhotonIdentification/test/BuildFile.xml
@@ -1,6 +1,7 @@
 <environment>
-  <bin   file="runtestRecoEgammaPhotonIdentification.cpp">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash RecoEgamma/PhotonIdentification/test runtests.sh"/>
-    <use   name="FWCore/Utilities"/>
+  <bin file="runtestRecoEgammaPhotonIdentification.cpp">
+    <flags TEST_RUNNER_ARGS=" /bin/bash RecoEgamma/PhotonIdentification/test runtests.sh"/>
+    <use name="FWCore/Utilities"/>
   </bin>
+
 </environment>