diff --git a/HLTrigger/HLTanalyzers/test/BuildFile.xml b/HLTrigger/HLTanalyzers/test/BuildFile.xml
index 68327edede27e..45b9452c40a59 100644
--- a/HLTrigger/HLTanalyzers/test/BuildFile.xml
+++ b/HLTrigger/HLTanalyzers/test/BuildFile.xml
@@ -1,6 +1,7 @@
 <environment>
-  <bin   file="TestHLTrigReport.cpp" name="TestHLTrigReport">
-    <flags   TEST_RUNNER_ARGS=" /bin/bash HLTrigger/HLTanalyzers/test test_hltrigreport.sh"/>
-    <use   name="FWCore/Utilities"/>
+  <bin file="TestHLTrigReport.cpp" name="TestHLTrigReport">
+    <flags TEST_RUNNER_ARGS=" /bin/bash HLTrigger/HLTanalyzers/test test_hltrigreport.sh"/>
+    <use name="FWCore/Utilities"/>
   </bin>
+
 </environment>
diff --git a/HLTrigger/HLTcore/BuildFile.xml b/HLTrigger/HLTcore/BuildFile.xml
index 667224f887261..18ad70a2c566b 100644
--- a/HLTrigger/HLTcore/BuildFile.xml
+++ b/HLTrigger/HLTcore/BuildFile.xml
@@ -1,16 +1,16 @@
-<use   name="tbb"/>
-<use   name="boost"/>
-<use   name="DataFormats/Common"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/ServiceRegistry"/>
-<use   name="FWCore/Services"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="L1Trigger/GlobalTriggerAnalyzer"/>
-<use   name="L1Trigger/L1TGlobal"/>
-<use   name="CondCore/DBOutputService"/>
-<use   name="CondFormats/HLTObjects"/>
-<use   name="CondFormats/DataRecord"/>
+<use name="tbb"/>
+<use name="boost"/>
+<use name="DataFormats/Common"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/ServiceRegistry"/>
+<use name="FWCore/Services"/>
+<use name="FWCore/MessageLogger"/>
+<use name="L1Trigger/GlobalTriggerAnalyzer"/>
+<use name="L1Trigger/L1TGlobal"/>
+<use name="CondCore/DBOutputService"/>
+<use name="CondFormats/HLTObjects"/>
+<use name="CondFormats/DataRecord"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/HLTrigger/HLTcore/plugins/BuildFile.xml b/HLTrigger/HLTcore/plugins/BuildFile.xml
index ec31194606c70..8f28151bbabfd 100644
--- a/HLTrigger/HLTcore/plugins/BuildFile.xml
+++ b/HLTrigger/HLTcore/plugins/BuildFile.xml
@@ -1,17 +1,17 @@
-<library   file="*.cc" name="HLTriggerHLTcorePlugins">
-  <use   name="DataFormats/Candidate"/>
-  <use   name="DataFormats/EgammaCandidates"/>
-  <use   name="DataFormats/HcalIsolatedTrack"/>
-  <use   name="DataFormats/HLTReco"/>
-  <use   name="DataFormats/JetReco"/>
-  <use   name="DataFormats/L1Trigger"/>
-  <use   name="DataFormats/METReco"/>
-  <use   name="DataFormats/Provenance"/>
-  <use   name="DataFormats/RecoCandidate"/>
-  <use   name="DataFormats/TauReco"/>
-  <use   name="HLTrigger/HLTcore"/>
-  <use   name="FWCore/PrescaleService"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="FWCore/Utilities"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="HLTriggerHLTcorePlugins">
+  <use name="DataFormats/Candidate"/>
+  <use name="DataFormats/EgammaCandidates"/>
+  <use name="DataFormats/HcalIsolatedTrack"/>
+  <use name="DataFormats/HLTReco"/>
+  <use name="DataFormats/JetReco"/>
+  <use name="DataFormats/L1Trigger"/>
+  <use name="DataFormats/METReco"/>
+  <use name="DataFormats/Provenance"/>
+  <use name="DataFormats/RecoCandidate"/>
+  <use name="DataFormats/TauReco"/>
+  <use name="HLTrigger/HLTcore"/>
+  <use name="FWCore/PrescaleService"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Utilities"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/HLTrigger/JSONMonitoring/plugins/BuildFile.xml b/HLTrigger/JSONMonitoring/plugins/BuildFile.xml
index 6963f83d314de..9044baf9d3fc4 100644
--- a/HLTrigger/JSONMonitoring/plugins/BuildFile.xml
+++ b/HLTrigger/JSONMonitoring/plugins/BuildFile.xml
@@ -1,9 +1,9 @@
-<library   file="*.cc" name="HLTriggerJSONMonitoringPlugins">
-  <use   name="FWCore/PrescaleService"/>
-  <use   name="FWCore/ServiceRegistry"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="HLTrigger/HLTcore"/>
-  <use   name="EventFilter/Utilities"/>
-  <use   name="L1Trigger/L1TGlobal"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="HLTriggerJSONMonitoringPlugins">
+  <use name="FWCore/PrescaleService"/>
+  <use name="FWCore/ServiceRegistry"/>
+  <use name="FWCore/Utilities"/>
+  <use name="HLTrigger/HLTcore"/>
+  <use name="EventFilter/Utilities"/>
+  <use name="L1Trigger/L1TGlobal"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/HLTrigger/JetMET/BuildFile.xml b/HLTrigger/JetMET/BuildFile.xml
index ccf98bb88fb9f..1406857297ab5 100644
--- a/HLTrigger/JetMET/BuildFile.xml
+++ b/HLTrigger/JetMET/BuildFile.xml
@@ -1,23 +1,23 @@
-<use   name="DataFormats/Common"/>
-<use   name="DataFormats/BTauReco"/>
-<use   name="DataFormats/HLTReco"/>
-<use   name="DataFormats/HcalRecHit"/>
-<use   name="DataFormats/JetReco"/>
-<use   name="DataFormats/METReco"/>
-<use   name="DataFormats/Scouting"/>
-<use   name="DataFormats/Math"/>
-<use   name="Geometry/Records"/>
-<use   name="Geometry/CaloTopology"/>
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/MessageLogger"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/Utilities"/>
-<use   name="RecoMET/METAlgorithms"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="RecoJets/JetProducers"/>
-<use   name="TrackingTools/IPTools"/>
-<use   name="TrackingTools/TransientTrack"/>
+<use name="DataFormats/Common"/>
+<use name="DataFormats/BTauReco"/>
+<use name="DataFormats/HLTReco"/>
+<use name="DataFormats/HcalRecHit"/>
+<use name="DataFormats/JetReco"/>
+<use name="DataFormats/METReco"/>
+<use name="DataFormats/Scouting"/>
+<use name="DataFormats/Math"/>
+<use name="Geometry/Records"/>
+<use name="Geometry/CaloTopology"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/MessageLogger"/>
+<use name="FWCore/ParameterSet"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/Utilities"/>
+<use name="RecoMET/METAlgorithms"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="RecoJets/JetProducers"/>
+<use name="TrackingTools/IPTools"/>
+<use name="TrackingTools/TransientTrack"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/HLTrigger/JetMET/plugins/BuildFile.xml b/HLTrigger/JetMET/plugins/BuildFile.xml
index 41ad0671801a1..c57f9118fcbdd 100644
--- a/HLTrigger/JetMET/plugins/BuildFile.xml
+++ b/HLTrigger/JetMET/plugins/BuildFile.xml
@@ -1,23 +1,23 @@
-<library   file="*.cc" name="HLTriggerJetMETPlugins">
-  <use   name="DataFormats/Common"/>
-  <use   name="DataFormats/HLTReco"/>
-  <use   name="DataFormats/HcalRecHit"/>
-  <use   name="DataFormats/JetReco"/>
-  <use   name="DataFormats/METReco"/>
-  <use   name="DataFormats/Scouting"/>
-  <use   name="DataFormats/Math"/>
-  <use   name="Geometry/Records"/>
-  <use   name="Geometry/CaloTopology"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <use   name="FWCore/PluginManager"/>
-  <use   name="FWCore/Utilities"/>
-  <use   name="RecoMET/METAlgorithms"/>
-  <use   name="HLTrigger/HLTcore"/>
-  <use   name="RecoJets/JetProducers"/>
-  <use   name="TrackingTools/IPTools"/>
-  <use   name="TrackingTools/TransientTrack"/>
-  <use   name="HLTrigger/JetMET"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="HLTriggerJetMETPlugins">
+  <use name="DataFormats/Common"/>
+  <use name="DataFormats/HLTReco"/>
+  <use name="DataFormats/HcalRecHit"/>
+  <use name="DataFormats/JetReco"/>
+  <use name="DataFormats/METReco"/>
+  <use name="DataFormats/Scouting"/>
+  <use name="DataFormats/Math"/>
+  <use name="Geometry/Records"/>
+  <use name="Geometry/CaloTopology"/>
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <use name="FWCore/PluginManager"/>
+  <use name="FWCore/Utilities"/>
+  <use name="RecoMET/METAlgorithms"/>
+  <use name="HLTrigger/HLTcore"/>
+  <use name="RecoJets/JetProducers"/>
+  <use name="TrackingTools/IPTools"/>
+  <use name="TrackingTools/TransientTrack"/>
+  <use name="HLTrigger/JetMET"/>
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/HLTrigger/Muon/test/BuildFile.xml b/HLTrigger/Muon/test/BuildFile.xml
index 7b620db393bd4..528f1c71d62f1 100644
--- a/HLTrigger/Muon/test/BuildFile.xml
+++ b/HLTrigger/Muon/test/BuildFile.xml
@@ -1,23 +1,27 @@
-<use   name="FWCore/Framework"/>
-<use   name="FWCore/PluginManager"/>
-<use   name="FWCore/ParameterSet"/>
-<use   name="DataFormats/Common"/>
-<use   name="HLTrigger/HLTcore"/>
-<use   name="SimDataFormats/GeneratorProducts"/>
-<use   name="DataFormats/RecoCandidate"/>
-<use   name="root"/>
-<library   file="HLTMuonRateAnalyzer.cc" name="HLTMuonRateAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+<use name="FWCore/Framework"/>
+<use name="FWCore/PluginManager"/>
+<use name="FWCore/ParameterSet"/>
+<use name="DataFormats/Common"/>
+<use name="HLTrigger/HLTcore"/>
+<use name="SimDataFormats/GeneratorProducts"/>
+<use name="DataFormats/RecoCandidate"/>
+<use name="root"/>
+<library file="HLTMuonRateAnalyzer.cc" name="HLTMuonRateAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="HLTMuonRateAnalyzerWithWeight.cc" name="HLTMuonRateAnalyzerWithWeight">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="HLTMuonRateAnalyzerWithWeight.cc" name="HLTMuonRateAnalyzerWithWeight">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="MuEnrichType1Filter.cc" name="MuEnrichType1Filter">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="MuEnrichType1Filter.cc" name="MuEnrichType1Filter">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="MuEnrichRenormalizer.cc" name="MuEnrichRenormalizer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="MuEnrichRenormalizer.cc" name="MuEnrichRenormalizer">
+  <flags EDM_PLUGIN="1"/>
 </library>
-<library   file="HLTMuonTurnOnAnalyzer.cc" name="HLTMuonTurnOnAnalyzer">
-  <flags   EDM_PLUGIN="1"/>
+
+<library file="HLTMuonTurnOnAnalyzer.cc" name="HLTMuonTurnOnAnalyzer">
+  <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/HLTrigger/Timer/BuildFile.xml b/HLTrigger/Timer/BuildFile.xml
index 065b6fd72d825..d3f2053126285 100644
--- a/HLTrigger/Timer/BuildFile.xml
+++ b/HLTrigger/Timer/BuildFile.xml
@@ -8,5 +8,5 @@
 <use name="sigcpp"/>
 <use name="boost_chrono"/>
 <export>
-  <lib   name="1"/>
+  <lib name="1"/>
 </export>
diff --git a/HLTrigger/Timer/test/BuildFile.xml b/HLTrigger/Timer/test/BuildFile.xml
index bcb219e9ff4c8..1372082167f81 100644
--- a/HLTrigger/Timer/test/BuildFile.xml
+++ b/HLTrigger/Timer/test/BuildFile.xml
@@ -1,7 +1,7 @@
-<bin   name="analyzeTiming" file="analyzeTiming.cpp">
+<bin name="analyzeTiming" file="analyzeTiming.cpp">
   <flags NO_TESTRUN="1"/>
-  <use   name="DataFormats/HLTReco"/>
-  <use   name="FWCore/FWLite"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="root"/>
+  <use name="DataFormats/HLTReco"/>
+  <use name="FWCore/FWLite"/>
+  <use name="FWCore/Framework"/>
+  <use name="root"/>
 </bin>
diff --git a/HLTrigger/Tools/bin/BuildFile.xml b/HLTrigger/Tools/bin/BuildFile.xml
index b675486794a1e..e0bc2da43e9d8 100644
--- a/HLTrigger/Tools/bin/BuildFile.xml
+++ b/HLTrigger/Tools/bin/BuildFile.xml
@@ -1,15 +1,14 @@
 <architecture name="slc6_amd64">
   <flags LDFLAGS="-Wl,-dynamic-linker,$(GLIBC_BASE)/lib64/ld.so"/>
 </architecture>
-
-<bin   name="hltTimingSummary" file="hltTimingSummary.cpp">
+<bin name="hltTimingSummary" file="hltTimingSummary.cpp">
   <flags NO_TESTRUN="1"/>
-  <use   name="boost"/>
-  <use   name="boost_program_options"/>
-  <use   name="DataFormats/HLTReco"/>
-  <use   name="FWCore/FWLite"/>
-  <use   name="FWCore/Framework"/>
-  <use   name="rootgraphics"/>
+  <use name="boost"/>
+  <use name="boost_program_options"/>
+  <use name="DataFormats/HLTReco"/>
+  <use name="FWCore/FWLite"/>
+  <use name="FWCore/Framework"/>
+  <use name="rootgraphics"/>
 </bin>
 
 <bin name="hltDiff" file="hltDiff.cc">
@@ -22,7 +21,5 @@
   <use name="DataFormats/Common"/>
   <use name="DataFormats/FWLite"/>
   <use name="HLTrigger/HLTcore"/>
-  <!--
-  <use name="root"/>
-  -->
+  <!--<use name="root"/>-->
 </bin>
diff --git a/HLTrigger/special/test/BuildFile.xml b/HLTrigger/special/test/BuildFile.xml
index 1892c44994372..10d968e887670 100644
--- a/HLTrigger/special/test/BuildFile.xml
+++ b/HLTrigger/special/test/BuildFile.xml
@@ -1,6 +1,6 @@
-<library   file="*.cc" name="testHLTriggerspecial">
-  <use   name="FWCore/Framework"/>
-  <use   name="FWCore/MessageLogger"/>
-  <use   name="FWCore/ParameterSet"/>
-  <flags   EDM_PLUGIN="1"/>
+<library file="*.cc" name="testHLTriggerspecial">
+  <use name="FWCore/Framework"/>
+  <use name="FWCore/MessageLogger"/>
+  <use name="FWCore/ParameterSet"/>
+  <flags EDM_PLUGIN="1"/>
 </library>