diff --git a/CalibCalorimetry/HcalPlugins/BuildFile.xml b/CalibCalorimetry/HcalPlugins/BuildFile.xml
index ac50e43add5c7..048639149a3b7 100644
--- a/CalibCalorimetry/HcalPlugins/BuildFile.xml
+++ b/CalibCalorimetry/HcalPlugins/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/HcalObjects"/>
 <use name="DataFormats/HcalDetId"/>
-<use name="DataFormats/HcalCalibObjects"/>
 <use name="Geometry/ForwardGeometry"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
diff --git a/CalibTracker/SiStripChannelGain/BuildFile.xml b/CalibTracker/SiStripChannelGain/BuildFile.xml
index 22f878a2adcef..467d0e3fbf369 100644
--- a/CalibTracker/SiStripChannelGain/BuildFile.xml
+++ b/CalibTracker/SiStripChannelGain/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="CalibFormats/SiStripObjects"/>
 <use name="CalibTracker/Records"/>
 <use name="CondFormats/SiStripObjects"/>
-<use name="CalibTracker/SiStripCommon"/>
 <use name="DataFormats/DetId"/>
 <use name="DataFormats/FEDRawData"/>
 <use name="DataFormats/TrackerCommon"/>
diff --git a/CalibTracker/SiStripChannelGain/plugins/BuildFile.xml b/CalibTracker/SiStripChannelGain/plugins/BuildFile.xml
index dd044894e9563..f0542c212d13b 100644
--- a/CalibTracker/SiStripChannelGain/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripChannelGain/plugins/BuildFile.xml
@@ -1,5 +1,6 @@
 <use name="CommonTools/UtilAlgos"/>
 <use name="CalibTracker/SiStripChannelGain"/>
+<use name="CalibTracker/SiStripCommon"/>
 <use name="CondFormats/RunInfo"/>
 <use name="RecoTracker/DeDx"/>
 <flags EDM_PLUGIN="1"/>
diff --git a/CalibTracker/SiStripCommon/BuildFile.xml b/CalibTracker/SiStripCommon/BuildFile.xml
index 266c1e24fd3ad..17b87a3ad87ae 100644
--- a/CalibTracker/SiStripCommon/BuildFile.xml
+++ b/CalibTracker/SiStripCommon/BuildFile.xml
@@ -6,7 +6,6 @@
 <use name="DataFormats/OnlineMetaData"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="FWCore/Utilities"/>
 <use name="CondFormats/DataRecord"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
diff --git a/CalibTracker/SiStripCommon/plugins/BuildFile.xml b/CalibTracker/SiStripCommon/plugins/BuildFile.xml
index fb87f9db10dea..039a07453e59c 100644
--- a/CalibTracker/SiStripCommon/plugins/BuildFile.xml
+++ b/CalibTracker/SiStripCommon/plugins/BuildFile.xml
@@ -3,6 +3,7 @@
 <use name="TrackingTools/TrackFitters"/>
 <use name="CalibTracker/SiStripCommon"/>
 <use name="CalibFormats/SiStripObjects"/>
+<use name="FWCore/ServiceRegistry"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/RunInfo"/>
diff --git a/CondFormats/L1TObjects/BuildFile.xml b/CondFormats/L1TObjects/BuildFile.xml
index 7dedd5a1331c3..d23031ae29d16 100644
--- a/CondFormats/L1TObjects/BuildFile.xml
+++ b/CondFormats/L1TObjects/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="boost"/>
 <use name="CondFormats/Serialization"/>
 <use name="boost_serialization"/>
-<use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <use name="DataFormats/L1GlobalCaloTrigger"/>
 <use name="DataFormats/L1GlobalTrigger"/>
diff --git a/CondFormats/SiPixelObjects/BuildFile.xml b/CondFormats/SiPixelObjects/BuildFile.xml
index 78fd0793384de..1d9b8d6b19f53 100644
--- a/CondFormats/SiPixelObjects/BuildFile.xml
+++ b/CondFormats/SiPixelObjects/BuildFile.xml
@@ -12,7 +12,6 @@
 <use name="FWCore/MessageLogger"/>
 <use name="Geometry/CommonDetUnit"/>
 <use name="Geometry/CommonTopologies"/>
-<use name="Geometry/Records"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DQM/RPCMonitorClient/BuildFile.xml b/DQM/RPCMonitorClient/BuildFile.xml
index 0fa366554a94e..c96bface89c7c 100644
--- a/DQM/RPCMonitorClient/BuildFile.xml
+++ b/DQM/RPCMonitorClient/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="CondFormats/DataRecord"/>
 <use name="CondFormats/RunInfo"/>
 <use name="CondCore/PopCon"/>
-<use name="EventFilter/RPCRawToDigi"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/DQM/RPCMonitorClient/plugins/BuildFile.xml b/DQM/RPCMonitorClient/plugins/BuildFile.xml
index a71a0d89997b0..dfa8e97e1aaf2 100644
--- a/DQM/RPCMonitorClient/plugins/BuildFile.xml
+++ b/DQM/RPCMonitorClient/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="DQM/RPCMonitorClient"/>
-<use name="DQMServices/Core"/>
 <use name="Geometry/RPCGeometry"/>
 <library name="DQMRPCMonitorClient_plugins" file="*.cc">
   <flags EDM_PLUGIN="1"/>
diff --git a/DQM/RPCMonitorDigi/BuildFile.xml b/DQM/RPCMonitorDigi/BuildFile.xml
index eb6d4f952e45d..77356602b98de 100644
--- a/DQM/RPCMonitorDigi/BuildFile.xml
+++ b/DQM/RPCMonitorDigi/BuildFile.xml
@@ -1,15 +1,15 @@
 <flags EDM_PLUGIN="1"/>
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/RPCRecHit"/>
 <use name="DataFormats/MuonReco"/>
 <use name="DQMServices/Core"/>
 <use name="DataFormats/L1GlobalTrigger"/>
 <use name="DataFormats/L1GlobalMuonTrigger"/>
+<use name="DataFormats/RPCDigi"/>
 <use name="DataFormats/Scalers"/>
+<use name="DQM/RPCMonitorDigi"/>
 <use name="FWCore/MessageLogger"/>
-<use name="FWCore/ServiceRegistry"/>
 <use name="Geometry/RPCGeometry"/>
 <use name="TrackingTools/TransientTrack"/>
 <use name="boost"/>
diff --git a/DQMOffline/RecoB/BuildFile.xml b/DQMOffline/RecoB/BuildFile.xml
index 4ebac334d9a6a..953d242f65d17 100644
--- a/DQMOffline/RecoB/BuildFile.xml
+++ b/DQMOffline/RecoB/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="DataFormats/TrackReco"/>
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
-<use name="RecoBTau/JetTagComputer"/>
 <use name="rootcore"/>
 <use name="DQMServices/Core"/>
 <use name="rootgpad"/>
diff --git a/OnlineDB/SiStripESSources/plugins/BuildFile.xml b/OnlineDB/SiStripESSources/plugins/BuildFile.xml
index eb9fdfde7b49d..d5a38ce745035 100644
--- a/OnlineDB/SiStripESSources/plugins/BuildFile.xml
+++ b/OnlineDB/SiStripESSources/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <library file="*.cc" name="OnlineDBSiStripESSourcesPlugins">
   <use name="OnlineDB/SiStripESSources"/>
-  <use name="Geometry/TrackerGeometryBuilder"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml b/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml
index ea434037fa593..df0f7979aa74f 100644
--- a/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiStripRecHitConverter/plugins/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="RecoLocalTracker/SiStripRecHitConverter"/>
 <use name="CalibTracker/Records"/>
-<use name="CalibTracker/SiStripCommon"/>
 <library file="*.cc" name="RecoLocalTrackerSiStripRecHitConverterPlugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/RecoTracker/MkFit/plugins/BuildFile.xml b/RecoTracker/MkFit/plugins/BuildFile.xml
index b8ec556c28544..6b3e4e3d48396 100644
--- a/RecoTracker/MkFit/plugins/BuildFile.xml
+++ b/RecoTracker/MkFit/plugins/BuildFile.xml
@@ -12,7 +12,6 @@
   <use name="FWCore/ParameterSet"/>
   <use name="Geometry/Records"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
-  <use name="RecoTracker/MeasurementDet"/>
   <use name="RecoTracker/MkFit"/>
   <use name="RecoTracker/TkDetLayers"/>
   <use name="RecoTracker/TransientTrackingRecHit"/>
diff --git a/SimCalorimetry/HcalSimProducers/BuildFile.xml b/SimCalorimetry/HcalSimProducers/BuildFile.xml
index 2d088260b7384..91092d4898831 100644
--- a/SimCalorimetry/HcalSimProducers/BuildFile.xml
+++ b/SimCalorimetry/HcalSimProducers/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="SimCalorimetry/HcalSimAlgos"/>
 <use name="SimGeneral/MixingModule"/>
 <use name="DataFormats/HcalDetId"/>
-<use name="DataFormats/HcalCalibObjects"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/SimG4Core/GFlash/BuildFile.xml b/SimG4Core/GFlash/BuildFile.xml
index a088339e2f80a..7d072725a472f 100644
--- a/SimG4Core/GFlash/BuildFile.xml
+++ b/SimG4Core/GFlash/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/MessageLogger"/>
 <use name="SimG4Core/PhysicsLists"/>
-<use name="SimG4Core/Application"/>
 <use name="SimGeneral/GFlash"/>
 <use name="geant4core"/>
 <use name="clhep"/>
diff --git a/Validation/SiTrackerPhase2V/plugins/BuildFile.xml b/Validation/SiTrackerPhase2V/plugins/BuildFile.xml
index 0f313c97de175..94659e6ef2e2e 100644
--- a/Validation/SiTrackerPhase2V/plugins/BuildFile.xml
+++ b/Validation/SiTrackerPhase2V/plugins/BuildFile.xml
@@ -6,8 +6,6 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/TrackerCommon"/>
 <use name="DataFormats/TrackerRecHit2D"/>
-<use name="DataFormats/GeometrySurface"/>
-<use name="DataFormats/GeometryVector"/>
 <use name="DataFormats/SiPixelDigi"/>
 <use name="SimDataFormats/Track"/>
 <use name="SimDataFormats/TrackingHit"/>