diff --git a/HLTrigger/Egamma/plugins/BuildFile.xml b/HLTrigger/Egamma/plugins/BuildFile.xml
index 80a5ebbd98a18..88bc8eca9e05e 100644
--- a/HLTrigger/Egamma/plugins/BuildFile.xml
+++ b/HLTrigger/Egamma/plugins/BuildFile.xml
@@ -5,7 +5,6 @@
 <use name="DataFormats/EgammaCandidates"/>
 <use name="DataFormats/EgammaReco"/>
 <use name="DataFormats/HLTReco"/>
-<use name="DataFormats/JetReco"/>
 <use name="DataFormats/L1Trigger"/>
 <use name="DataFormats/Math"/>
 <use name="DataFormats/RecoCandidate"/>
diff --git a/HLTrigger/HLTcore/BuildFile.xml b/HLTrigger/HLTcore/BuildFile.xml
index 18ad70a2c566b..afb830d3506bc 100644
--- a/HLTrigger/HLTcore/BuildFile.xml
+++ b/HLTrigger/HLTcore/BuildFile.xml
@@ -4,7 +4,6 @@
 <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"/>
diff --git a/HLTrigger/HLTcore/plugins/HLTPrescaleRecorder.cc b/HLTrigger/HLTcore/plugins/HLTPrescaleRecorder.cc
index a5b66a7d3df65..97d93ff78bc05 100644
--- a/HLTrigger/HLTcore/plugins/HLTPrescaleRecorder.cc
+++ b/HLTrigger/HLTcore/plugins/HLTPrescaleRecorder.cc
@@ -18,10 +18,11 @@
 
 #include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
+#include "FWCore/PrescaleService/interface/PrescaleService.h"
 
-#include <sys/time.h>
 #include "DataFormats/Provenance/interface/Timestamp.h"
 
+#include <sys/time.h>
 #include <string>
 #include <ostream>
 
diff --git a/HLTrigger/JSONMonitoring/plugins/BuildFile.xml b/HLTrigger/JSONMonitoring/plugins/BuildFile.xml
index b52251ff7a8a0..8e1f1fddb19c4 100644
--- a/HLTrigger/JSONMonitoring/plugins/BuildFile.xml
+++ b/HLTrigger/JSONMonitoring/plugins/BuildFile.xml
@@ -1,10 +1,8 @@
 <library file="*.cc" name="HLTriggerJSONMonitoringPlugins">
   <use name="fmt"/>
   <use name="EventFilter/Utilities"/>
-  <use name="FWCore/PrescaleService"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>
   <use name="HLTrigger/HLTcore"/>
-  <use name="L1Trigger/L1TGlobal"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/HLTrigger/JetMET/BuildFile.xml b/HLTrigger/JetMET/BuildFile.xml
index 1406857297ab5..585433e4dd13b 100644
--- a/HLTrigger/JetMET/BuildFile.xml
+++ b/HLTrigger/JetMET/BuildFile.xml
@@ -4,7 +4,6 @@
 <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"/>
@@ -16,8 +15,6 @@
 <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 c57f9118fcbdd..691b52a6fdf8b 100644
--- a/HLTrigger/JetMET/plugins/BuildFile.xml
+++ b/HLTrigger/JetMET/plugins/BuildFile.xml
@@ -1,21 +1,16 @@
 <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"/>
diff --git a/HLTrigger/Muon/plugins/BuildFile.xml b/HLTrigger/Muon/plugins/BuildFile.xml
index 1cbfe95e496ba..46ab459e79184 100644
--- a/HLTrigger/Muon/plugins/BuildFile.xml
+++ b/HLTrigger/Muon/plugins/BuildFile.xml
@@ -13,7 +13,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/ParameterSet"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/Utilities"/>
 <use name="HLTrigger/HLTcore"/>
 <use name="L1Trigger/CSCTrackFinder"/>
diff --git a/HLTrigger/Muon/test/BuildFile.xml b/HLTrigger/Muon/test/BuildFile.xml
index 528f1c71d62f1..3ba1184e5acc8 100644
--- a/HLTrigger/Muon/test/BuildFile.xml
+++ b/HLTrigger/Muon/test/BuildFile.xml
@@ -1,8 +1,6 @@
 <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"/>
diff --git a/HLTrigger/Timer/plugins/BuildFile.xml b/HLTrigger/Timer/plugins/BuildFile.xml
index 085870baccb2c..8470334992251 100644
--- a/HLTrigger/Timer/plugins/BuildFile.xml
+++ b/HLTrigger/Timer/plugins/BuildFile.xml
@@ -2,16 +2,12 @@
   <use name="fmt"/>
   <use name="json"/>
   <use name="DQMServices/Core"/>
-  <use name="DataFormats/Luminosity"/>
   <use name="DataFormats/Provenance"/>
   <use name="DataFormats/Scalers"/>
-  <use name="DataFormats/VertexReco"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>
   <use name="HLTrigger/Timer"/>
-  <use name="RecoLuminosity/LumiProducer"/>
-  <use name="SimDataFormats/PileupSummaryInfo"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/HLTrigger/Timer/test/BuildFile.xml b/HLTrigger/Timer/test/BuildFile.xml
index 5cbadfe21e7aa..4bc473c7993db 100644
--- a/HLTrigger/Timer/test/BuildFile.xml
+++ b/HLTrigger/Timer/test/BuildFile.xml
@@ -2,7 +2,6 @@
   <flags NO_TESTRUN="1"/>
   <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 e0bc2da43e9d8..146289b651768 100644
--- a/HLTrigger/Tools/bin/BuildFile.xml
+++ b/HLTrigger/Tools/bin/BuildFile.xml
@@ -7,7 +7,6 @@
   <use name="boost_program_options"/>
   <use name="DataFormats/HLTReco"/>
   <use name="FWCore/FWLite"/>
-  <use name="FWCore/Framework"/>
   <use name="rootgraphics"/>
 </bin>
 
@@ -16,7 +15,6 @@
   <use name="boost"/>
   <use name="boost_filesystem"/>
   <use name="FWCore/Common"/>
-  <use name="FWCore/Framework"/>
   <use name="FWCore/Utilities"/>
   <use name="DataFormats/Common"/>
   <use name="DataFormats/FWLite"/>
diff --git a/HLTrigger/special/plugins/BuildFile.xml b/HLTrigger/special/plugins/BuildFile.xml
index 1ddbc383ada36..335f4c61ac7bf 100644
--- a/HLTrigger/special/plugins/BuildFile.xml
+++ b/HLTrigger/special/plugins/BuildFile.xml
@@ -5,7 +5,6 @@
 <use name="CommonTools/UtilAlgos"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/EcalObjects"/>
-<use name="CondFormats/L1TObjects"/>
 <use name="CondFormats/RunInfo"/>
 <use name="DataFormats/CSCDigi"/>
 <use name="DataFormats/CSCRecHit"/>
@@ -26,7 +25,6 @@
 <use name="DataFormats/METReco"/>
 <use name="DataFormats/Math"/>
 <use name="DataFormats/MuonDetId"/>
-<use name="DataFormats/MuonReco"/>
 <use name="DataFormats/RecoCandidate"/>
 <use name="DataFormats/TCDS"/>
 <use name="DataFormats/TrackReco"/>
@@ -44,14 +42,12 @@
 <use name="Geometry/CommonTopologies"/>
 <use name="Geometry/DTGeometry"/>
 <use name="Geometry/EcalAlgo"/>
-<use name="Geometry/EcalMapping"/>
 <use name="Geometry/RPCGeometry"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="HLTrigger/HLTcore"/>
 <use name="RecoEcal/EgammaClusterAlgos"/>
 <use name="RecoEcal/EgammaCoreTools"/>
-<use name="RecoMuon/TrackingTools"/>
-<use name="SimGeneral/HepPDTRecord"/>
+<use name="TrackingTools/Records"/>
 <use name="TrackingTools/TransientTrack"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/HLTriggerOffline/B2G/BuildFile.xml b/HLTriggerOffline/B2G/BuildFile.xml
index f1f00f36cdb83..fda630aa2f889 100644
--- a/HLTriggerOffline/B2G/BuildFile.xml
+++ b/HLTriggerOffline/B2G/BuildFile.xml
@@ -1,33 +1,12 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/Common"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DQMServices/Core"/>
 <use name="DataFormats/Common"/>
-<use name="CommonTools/UtilAlgos"/>
-<use name="PhysicsTools/UtilAlgos"/>
-<use name="SimDataFormats/GeneratorProducts"/>
-<use name="DataFormats/Math"/>
-<use name="SimDataFormats/Track"/>
-<use name="DataFormats/TrackReco"/>
-<use name="DataFormats/TrackingRecHit"/>
 <use name="DataFormats/MuonReco"/>
 <use name="DataFormats/EgammaCandidates"/>
-<use name="DataFormats/EgammaReco"/>
-<use name="DataFormats/RecoCandidate"/>
-<use name="DataFormats/TauReco"/>
 <use name="DataFormats/JetReco"/>
-<use name="DataFormats/METReco"/>
-<use name="DataFormats/VertexReco"/>
-<use name="DataFormats/TrackerRecHit2D"/>
 <use name="HLTrigger/HLTcore"/>
-<use name="Geometry/Records"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
-<use name="JetMETCorrections/Objects"/>
-<use name="RecoEcal/EgammaCoreTools"/>
-<use name="DataFormats/EcalRecHit"/>
-<use name="CondFormats/DataRecord"/>
-<use name="CondFormats/EcalObjects"/>
 <use name="clhep"/>
 <use name="root"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/HLTriggerOffline/Common/BuildFile.xml b/HLTriggerOffline/Common/BuildFile.xml
index 7517ed3170d66..b1a5949e872ba 100644
--- a/HLTriggerOffline/Common/BuildFile.xml
+++ b/HLTriggerOffline/Common/BuildFile.xml
@@ -1,27 +1,8 @@
-<use name="DQMServices/Core"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
-<use name="DataFormats/MuonReco"/>
 <use name="FWCore/ServiceRegistry"/>
-<use name="DataFormats/RecoCandidate"/>
-<use name="DataFormats/StdDictionaries"/>
-<use name="DataFormats/HLTReco"/>
-<use name="DataFormats/EgammaReco"/>
-<use name="DataFormats/TrackReco"/>
-<use name="DataFormats/TrajectorySeed"/>
-<use name="DataFormats/BTauReco"/>
-<use name="DataFormats/TauReco"/>
-<use name="DataFormats/METReco"/>
-<use name="DataFormats/JetReco"/>
-<use name="DataFormats/L1GlobalTrigger"/>
-<use name="RecoEcal/EgammaCoreTools"/>
-<use name="HLTrigger/HLTcore"/>
-<use name="CondFormats/DataRecord"/>
-<use name="SimGeneral/HepPDTRecord"/>
 <use name="heppdt"/>
 <use name="clhep"/>
-<use name="DataFormats/HepMCCandidate"/>
 <use name="root"/>
 <use name="boost"/>
 <use name="CommonTools/UtilAlgos"/>
diff --git a/HLTriggerOffline/Egamma/BuildFile.xml b/HLTriggerOffline/Egamma/BuildFile.xml
index 1bff2e58b855d..9dede3c4ba742 100644
--- a/HLTriggerOffline/Egamma/BuildFile.xml
+++ b/HLTriggerOffline/Egamma/BuildFile.xml
@@ -1,10 +1,8 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/ServiceRegistry"/>
 <use name="DQMServices/Core"/>
 <use name="DataFormats/HepMCCandidate"/>
-<use name="DataFormats/CLHEP"/>
 <use name="SimDataFormats/GeneratorProducts"/>
 <use name="HLTrigger/HLTcore"/>
 <use name="boost"/>
diff --git a/HLTriggerOffline/JetMET/BuildFile.xml b/HLTriggerOffline/JetMET/BuildFile.xml
index 8b3f848bd7655..074067541ec06 100644
--- a/HLTriggerOffline/JetMET/BuildFile.xml
+++ b/HLTriggerOffline/JetMET/BuildFile.xml
@@ -6,6 +6,4 @@
 <use name="FWCore/ServiceRegistry"/>
 <use name="DQMServices/Core"/>
 <use name="DataFormats/Common"/>
-<use name="DataFormats/CLHEP"/>
-<use name="DataFormats/L1GlobalTrigger"/>
 <use name="FWCore/MessageLogger"/>
diff --git a/HLTriggerOffline/Muon/BuildFile.xml b/HLTriggerOffline/Muon/BuildFile.xml
index d996ba418cc9a..04494b9563b82 100644
--- a/HLTriggerOffline/Muon/BuildFile.xml
+++ b/HLTriggerOffline/Muon/BuildFile.xml
@@ -1,23 +1,18 @@
 <use name="DQMServices/Core"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/MuonReco"/>
 <use name="DataFormats/HepMCCandidate"/>
 <use name="DataFormats/RecoCandidate"/>
-<use name="DataFormats/L1GlobalMuonTrigger"/>
 <use name="HLTrigger/HLTcore"/>
 <use name="CommonTools/Utils"/>
 <use name="root"/>
-<use name="DataFormats/CLHEP"/>
 <use name="DataFormats/GeometrySurface"/>
 <use name="DataFormats/L1Trigger"/>
 <use name="DataFormats/Math"/>
 <use name="DataFormats/TrackReco"/>
 <use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
-<use name="Geometry/CommonDetUnit"/>
-<use name="Geometry/Records"/>
 <use name="MagneticField/Engine"/>
 <use name="MagneticField/Records"/>
 <use name="RecoMuon/DetLayers"/>
@@ -25,7 +20,6 @@
 <use name="TrackingTools/DetLayers"/>
 <use name="TrackingTools/GeomPropagators"/>
 <use name="TrackingTools/KalmanUpdators"/>
-<use name="TrackingTools/PatternTools"/>
 <use name="TrackingTools/Records"/>
 <use name="TrackingTools/TrajectoryState"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/HLTriggerOffline/SUSYBSM/BuildFile.xml b/HLTriggerOffline/SUSYBSM/BuildFile.xml
index b1b0de075c8ed..45725de2bcdbf 100644
--- a/HLTriggerOffline/SUSYBSM/BuildFile.xml
+++ b/HLTriggerOffline/SUSYBSM/BuildFile.xml
@@ -1,14 +1,10 @@
 <use name="CommonTools/Egamma"/>
 <use name="DataFormats/BeamSpot"/>
 <use name="DataFormats/BTauReco"/>
-<use name="DataFormats/Candidate"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/EgammaCandidates"/>
-<use name="DataFormats/HepMCCandidate"/>
 <use name="DataFormats/HLTReco"/>
 <use name="DataFormats/JetReco"/>
-<use name="DataFormats/L1GlobalTrigger"/>
-<use name="DataFormats/L1Trigger"/>
 <use name="DataFormats/Math"/>
 <use name="DataFormats/METReco"/>
 <use name="DataFormats/MuonReco"/>
diff --git a/HLTriggerOffline/Tau/BuildFile.xml b/HLTriggerOffline/Tau/BuildFile.xml
index 0abd54773c45b..61120b0eb88a0 100644
--- a/HLTriggerOffline/Tau/BuildFile.xml
+++ b/HLTriggerOffline/Tau/BuildFile.xml
@@ -1,30 +1,13 @@
-<use name="DataFormats/BTauReco"/>
-<use name="DataFormats/TauReco"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="DataFormats/Candidate"/>
 <use name="DataFormats/Common"/>
-<use name="DataFormats/EgammaCandidates"/>
-<use name="DataFormats/EgammaReco"/>
-<use name="DataFormats/HLTReco"/>
 <use name="DataFormats/HepMCCandidate"/>
-<use name="DataFormats/JetReco"/>
-<use name="DataFormats/L1Trigger"/>
-<use name="DataFormats/L1GlobalTrigger"/>
 <use name="DataFormats/METReco"/>
 <use name="DataFormats/Math"/>
-<use name="DataFormats/MuonReco"/>
-<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="CommonTools/UtilAlgos"/>
 <use name="SimDataFormats/GeneratorProducts"/>
-<use name="Geometry/Records"/>
-<use name="Geometry/TrackerGeometryBuilder"/>
-<use name="TrackingTools/Records"/>
-<use name="DQMServices/Components"/>
 <use name="clhep"/>
 <use name="hepmc"/>
 <use name="rootcore"/>