diff --git a/DPGAnalysis/HcalTools/BuildFile.xml b/DPGAnalysis/HcalTools/BuildFile.xml
index 010c67511fcdf..d1e8df96717c4 100644
--- a/DPGAnalysis/HcalTools/BuildFile.xml
+++ b/DPGAnalysis/HcalTools/BuildFile.xml
@@ -1,13 +1,13 @@
-<use   name="DataFormats/HcalDetId"/>
-<use   name="DataFormats/HcalDigi"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="EventFilter/HcalRawToDigi"/>
-<use   name="Geometry/CaloGeometry"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="Geometry/HcalCommonData"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="DataFormats/FEDRawData"/>
-<use   name="CalibFormats/HcalObjects"/>
-<use   name="CalibCalorimetry/HcalAlgos"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="DataFormats/HcalDetId"/>
+<use name="DataFormats/HcalDigi"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="EventFilter/HcalRawToDigi"/>
+<use name="Geometry/CaloGeometry"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="Geometry/HcalCommonData"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="DataFormats/FEDRawData"/>
+<use name="CalibFormats/HcalObjects"/>
+<use name="CalibCalorimetry/HcalAlgos"/>
+<flags EDM_PLUGIN="1"/>
diff --git a/DPGAnalysis/SiStripTools/BuildFile.xml b/DPGAnalysis/SiStripTools/BuildFile.xml
index ef8a88b0266a0..9e1642742d95a 100644
--- a/DPGAnalysis/SiStripTools/BuildFile.xml
+++ b/DPGAnalysis/SiStripTools/BuildFile.xml
@@ -1,31 +1,29 @@
-<use   name="root"/>
-
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Utilities"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="DataFormats/Luminosity"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="DataFormats/SiStripDigi"/>
-<use   name="DataFormats/SiStripCluster"/>
-<use   name="DataFormats/SiPixelCluster"/>
-<use   name="DataFormats/Scalers"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/TrackerCommon"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="CalibFormats/SiStripObjects"/>
-<use   name="CalibTracker/Records"/>
-<use   name="SimDataFormats/PileupSummaryInfo"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="TrackingTools/TransientTrackingRecHit"/>
-
+<use name="root"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="DataFormats/Luminosity"/>
+<use name="DataFormats/Provenance"/>
+<use name="DataFormats/SiStripDigi"/>
+<use name="DataFormats/SiStripCluster"/>
+<use name="DataFormats/SiPixelCluster"/>
+<use name="DataFormats/Scalers"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrackerCommon"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="CalibFormats/SiStripObjects"/>
+<use name="CalibTracker/Records"/>
+<use name="SimDataFormats/PileupSummaryInfo"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="TrackingTools/TransientTrackingRecHit"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/DPGAnalysis/SiStripTools/bin/BuildFile.xml b/DPGAnalysis/SiStripTools/bin/BuildFile.xml
index 569c99edd8ad6..f878e74dbe567 100644
--- a/DPGAnalysis/SiStripTools/bin/BuildFile.xml
+++ b/DPGAnalysis/SiStripTools/bin/BuildFile.xml
@@ -1,5 +1,5 @@
-<library   name="DPGAnalysisSiStripToolsMacros" file="*.cc">
-<use   name="DPGAnalysis/SiStripTools"/>
-<use   name="root"/>
-<use   name="rootgraphics"/>
+<library name="DPGAnalysisSiStripToolsMacros" file="*.cc">
+  <use name="DPGAnalysis/SiStripTools"/>
+  <use name="root"/>
+  <use name="rootgraphics"/>
 </library>
diff --git a/DPGAnalysis/SiStripTools/plugins/BuildFile.xml b/DPGAnalysis/SiStripTools/plugins/BuildFile.xml
index 060df64f7a7db..4d58cd57a55ef 100644
--- a/DPGAnalysis/SiStripTools/plugins/BuildFile.xml
+++ b/DPGAnalysis/SiStripTools/plugins/BuildFile.xml
@@ -1,60 +1,59 @@
-<use   name="root"/>
-<use   name="boost"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Utilities"/>
-<use   name="CommonTools/Utils"/>
-<use   name="CommonTools/UtilAlgos"/>
-<use   name="CondFormats/SiStripObjects"/>
-<use   name="DataFormats/SiStripDigi"/>
-<use   name="DataFormats/SiStripCluster"/>
-<use   name="DataFormats/SiPixelCluster"/>
-<use   name="DataFormats/Scalers"/>
-<use   name="DataFormats/DetId"/>
-<use   name="DataFormats/SiPixelDetId"/>
-<use   name="DataFormats/SiStripDetId"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/Luminosity"/>
-<use   name="DataFormats/GeometryVector"/>
-<use   name="DataFormats/TCDS"/>
-<use   name="DPGAnalysis/SiStripTools"/>
-<use   name="DQM/SiStripCommon"/>
-<use   name="DQMServices/Core"/>
-<use   name="CommonTools/TrackerMap"/>
-<use   name="CalibFormats/SiStripObjects"/>
-<use   name="CondFormats/SiPixelObjects"/>
-<use   name="CondFormats/DataRecord"/>
-<use   name="CalibTracker/Records"/>
-<use   name="CalibTracker/SiStripCommon"/>
-<use   name="CalibTracker/SiPixelESProducers"/>
-<use   name="MagneticField/Records"/>
-<use   name="MagneticField/Engine"/>
-<use   name="RecoTracker/TransientTrackingRecHit"/>
-<use   name="TrackingTools/TransientTrackingRecHit"/>
-<use   name="TrackingTools/Records"/>
-<use   name="TrackingTools/TrajectoryState"/>
-<use   name="TrackingTools/PatternTools"/>
-<use   name="TrackingTools/TrackFitters"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/TrajectorySeed"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="RecoLocalTracker/SiStripClusterizer"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="Geometry/TrackerGeometryBuilder"/>
-<use   name="Geometry/CommonDetUnit"/>
-<use   name="Geometry/Records"/>
-<use   name="DataFormats/TrackerCommon"/>
-<use   name="SimDataFormats/TrackingAnalysis"/>
-<use   name="SimDataFormats/TrackingHit"/>
-<use   name="DataFormats/TrackingRecHit"/>
-<use   name="SimTracker/TrackAssociation"/>
-<use   name="SimTracker/Records"/>
-
-<library   file="*.cc" name="DPGAnalysisSiStripToolsPlugins">
-  <flags   EDM_PLUGIN="1"/>
+<use name="root"/>
+<use name="boost"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Utilities"/>
+<use name="CommonTools/Utils"/>
+<use name="CommonTools/UtilAlgos"/>
+<use name="CondFormats/SiStripObjects"/>
+<use name="DataFormats/SiStripDigi"/>
+<use name="DataFormats/SiStripCluster"/>
+<use name="DataFormats/SiPixelCluster"/>
+<use name="DataFormats/Scalers"/>
+<use name="DataFormats/DetId"/>
+<use name="DataFormats/SiPixelDetId"/>
+<use name="DataFormats/SiStripDetId"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/Luminosity"/>
+<use name="DataFormats/GeometryVector"/>
+<use name="DataFormats/TCDS"/>
+<use name="DPGAnalysis/SiStripTools"/>
+<use name="DQM/SiStripCommon"/>
+<use name="DQMServices/Core"/>
+<use name="CommonTools/TrackerMap"/>
+<use name="CalibFormats/SiStripObjects"/>
+<use name="CondFormats/SiPixelObjects"/>
+<use name="CondFormats/DataRecord"/>
+<use name="CalibTracker/Records"/>
+<use name="CalibTracker/SiStripCommon"/>
+<use name="CalibTracker/SiPixelESProducers"/>
+<use name="MagneticField/Records"/>
+<use name="MagneticField/Engine"/>
+<use name="RecoTracker/TransientTrackingRecHit"/>
+<use name="TrackingTools/TransientTrackingRecHit"/>
+<use name="TrackingTools/Records"/>
+<use name="TrackingTools/TrajectoryState"/>
+<use name="TrackingTools/PatternTools"/>
+<use name="TrackingTools/TrackFitters"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/TrajectorySeed"/>
+<use name="DataFormats/VertexReco"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="RecoLocalTracker/SiStripClusterizer"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="Geometry/TrackerGeometryBuilder"/>
+<use name="Geometry/CommonDetUnit"/>
+<use name="Geometry/Records"/>
+<use name="DataFormats/TrackerCommon"/>
+<use name="SimDataFormats/TrackingAnalysis"/>
+<use name="SimDataFormats/TrackingHit"/>
+<use name="DataFormats/TrackingRecHit"/>
+<use name="SimTracker/TrackAssociation"/>
+<use name="SimTracker/Records"/>
+<library file="*.cc" name="DPGAnalysisSiStripToolsPlugins">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DPGAnalysis/Skims/BuildFile.xml b/DPGAnalysis/Skims/BuildFile.xml
index e034738302fca..ecda985f661db 100644
--- a/DPGAnalysis/Skims/BuildFile.xml
+++ b/DPGAnalysis/Skims/BuildFile.xml
@@ -1,39 +1,39 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/Utilities"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/CSCGeometry"/>
-<use   name="DataFormats/CSCDigi"/>
-<use   name="DataFormats/CSCRecHit"/>
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/MuonDetId"/>
-<use   name="CondFormats/CSCObjects"/>
-<use   name="DataFormats/DTDigi"/>
-<use   name="CondFormats/DTObjects"/>
-<use   name="DataFormats/RPCRecHit"/>
-<use   name="DataFormats/EcalDetId"/>
-<use   name="DataFormats/EcalRecHit"/>
-<use   name="DataFormats/L1GlobalTrigger"/>
-<use   name="DataFormats/Scalers"/>
-<use   name="Geometry/EcalMapping"/>
-<use   name="DataFormats/TrackReco"/>
-<use   name="DataFormats/MuonReco"/>
-<use   name="DataFormats/VertexReco"/>
-<use   name="DataFormats/METReco"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/EgammaCandidates"/>
-<use   name="DataFormats/HcalIsolatedTrack"/>
-<use   name="Geometry/RPCGeometry"/>
-<use   name="DataFormats/L1Trigger"/>
-<use   name="DataFormats/TrackerRecHit2D"/>
-<use   name="root"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="RecoEcal/EgammaCoreTools"/>
-<use   name="DataFormats/EgammaReco"/>
-<use   name="PhysicsTools/SelectorUtils"/>
-<use   name="DataFormats/Provenance"/>
-<use   name="DataFormats/OnlineMetaData"/>
-<flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/Utilities"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/CSCGeometry"/>
+<use name="DataFormats/CSCDigi"/>
+<use name="DataFormats/CSCRecHit"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/MuonDetId"/>
+<use name="CondFormats/CSCObjects"/>
+<use name="DataFormats/DTDigi"/>
+<use name="CondFormats/DTObjects"/>
+<use name="DataFormats/RPCRecHit"/>
+<use name="DataFormats/EcalDetId"/>
+<use name="DataFormats/EcalRecHit"/>
+<use name="DataFormats/L1GlobalTrigger"/>
+<use name="DataFormats/Scalers"/>
+<use name="Geometry/EcalMapping"/>
+<use name="DataFormats/TrackReco"/>
+<use name="DataFormats/MuonReco"/>
+<use name="DataFormats/VertexReco"/>
+<use name="DataFormats/METReco"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/EgammaCandidates"/>
+<use name="DataFormats/HcalIsolatedTrack"/>
+<use name="Geometry/RPCGeometry"/>
+<use name="DataFormats/L1Trigger"/>
+<use name="DataFormats/TrackerRecHit2D"/>
+<use name="root"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="RecoEcal/EgammaCoreTools"/>
+<use name="DataFormats/EgammaReco"/>
+<use name="PhysicsTools/SelectorUtils"/>
+<use name="DataFormats/Provenance"/>
+<use name="DataFormats/OnlineMetaData"/>
+<flags EDM_PLUGIN="1"/>