diff --git a/DQM/BeamMonitor/plugins/BuildFile.xml b/DQM/BeamMonitor/plugins/BuildFile.xml
index 70ee0a9865ae3..b60818913eb0e 100644
--- a/DQM/BeamMonitor/plugins/BuildFile.xml
+++ b/DQM/BeamMonitor/plugins/BuildFile.xml
@@ -1,4 +1,5 @@
 <use name="DQMServices/Core"/>
+<use name="DataFormats/Scalers"/>
 <use name="DataFormats/TrackReco"/>
 <use name="FWCore/Framework"/>
 <use name="DataFormats/BeamSpot"/>
diff --git a/RecoLocalTracker/SiStripClusterizer/BuildFile.xml b/RecoLocalTracker/SiStripClusterizer/BuildFile.xml
index fb84585d33462..2ac07ebc90b7e 100644
--- a/RecoLocalTracker/SiStripClusterizer/BuildFile.xml
+++ b/RecoLocalTracker/SiStripClusterizer/BuildFile.xml
@@ -7,7 +7,6 @@
 <use name="CondFormats/SiStripObjects"/>
 <use name="CalibFormats/SiStripObjects"/>
 <use name="CalibTracker/Records"/>
-<use name="EventFilter/SiStripRawToDigi"/>
 <use name="RecoLocalTracker/Records"/>
 <export>
   <lib name="1"/>
diff --git a/RecoLocalTracker/SiStripClusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiStripClusterizer/plugins/BuildFile.xml
index 6b9e507e41fc2..0343f425c91f1 100644
--- a/RecoLocalTracker/SiStripClusterizer/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiStripClusterizer/plugins/BuildFile.xml
@@ -1,4 +1,5 @@
 <library name="RecoLocalTrackerSiStripClusterizerPlugins" file="*.cc">
+  <use name="EventFilter/SiStripRawToDigi"/>
   <use name="RecoLocalTracker/SiStripClusterizer"/>
   <use name="RecoLocalTracker/SiStripZeroSuppression"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/RecoTracker/TkSeedGenerator/BuildFile.xml b/RecoTracker/TkSeedGenerator/BuildFile.xml
index 2877e14237d28..d22f7f81d5e80 100644
--- a/RecoTracker/TkSeedGenerator/BuildFile.xml
+++ b/RecoTracker/TkSeedGenerator/BuildFile.xml
@@ -8,7 +8,6 @@
 <use name="Geometry/CommonDetUnit"/>
 <use name="DataFormats/TrajectorySeed"/>
 <use name="DataFormats/TrackerRecHit2D"/>
-<use name="DataFormats/L1TrackTrigger"/>
 <use name="Geometry/TrackerGeometryBuilder"/>
 <use name="MagneticField/Records"/>
 <use name="MagneticField/Engine"/>
diff --git a/RecoVertex/BeamSpotProducer/BuildFile.xml b/RecoVertex/BeamSpotProducer/BuildFile.xml
index 1456316fedf48..d730cc127c77a 100644
--- a/RecoVertex/BeamSpotProducer/BuildFile.xml
+++ b/RecoVertex/BeamSpotProducer/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="CondCore/DBOutputService"/>
 <use name="CondFormats/BeamSpotObjects"/>
 <use name="DataFormats/BeamSpot"/>
-<use name="DataFormats/Scalers"/>
 <use name="DataFormats/Common"/>
 <use name="DataFormats/TrackReco"/>
 <use name="DataFormats/VertexReco"/>
diff --git a/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc b/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc
index 3dbd0fdd6dafb..e180c150bc5cf 100644
--- a/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc
+++ b/RecoVertex/BeamSpotProducer/plugins/BeamSpotOnlineProducer.cc
@@ -18,7 +18,6 @@ ________________________________________________________________**/
 #include "FWCore/Framework/interface/ESHandle.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
-//#include "FWCore/Framework/interface/IOVSyncValue.h"
 #include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
diff --git a/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml b/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml
index 7f596993b6237..58986b2fed426 100644
--- a/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml
+++ b/RecoVertex/BeamSpotProducer/plugins/BuildFile.xml
@@ -15,6 +15,7 @@
 <library file="BeamSpotOnlineProducer.cc" name="BeamSpotOnlineProducer">
   <flags EDM_PLUGIN="1"/>
   <use name="DataFormats/L1GlobalTrigger"/>
+  <use name="DataFormats/Scalers"/>
 </library>
 
 <library file="BeamSpotAnalyzer.cc" name="BeamSpotAnalyzer">
diff --git a/SLHCUpgradeSimulations/Geometry/test/BuildFile.xml b/SLHCUpgradeSimulations/Geometry/test/BuildFile.xml
index 40e0cec3a8c68..9d7a684243e43 100644
--- a/SLHCUpgradeSimulations/Geometry/test/BuildFile.xml
+++ b/SLHCUpgradeSimulations/Geometry/test/BuildFile.xml
@@ -4,11 +4,10 @@
     <use name="FWCore/Framework"/>
     <use name="DataFormats/Common"/>
     <use name="DataFormats/TrackReco"/>
-    <use name="DataFormats/StdDictionaries"/>
     <use name="FWCore/ParameterSet"/>
-    <use name="SimTracker/Common"/>
+    <use name="Geometry/Records"/>
+    <use name="Geometry/TrackerGeometryBuilder"/>
     <use name="SimTracker/TrackerHitAssociation"/>
-    <use name="RecoLocalTracker/SiPixelRecHits"/>
   </library>
 
   <library file="ModuleInfo_Phase2.cc" name="ModuleInfo_Phase2">
@@ -18,7 +17,6 @@
     <use name="Geometry/TrackerGeometryBuilder"/>
     <use name="Geometry/TrackerNumberingBuilder"/>
     <use name="Geometry/CommonDetUnit"/>
-    <use name="CondFormats/Alignment"/>
   </library>
 
   <library file="Phase2PixelNtuple.cc" name="Phase2PixelNtuple">
@@ -30,9 +28,9 @@
     <use name="CommonTools/UtilAlgos"/>
     <use name="DataFormats/Common"/>
     <use name="DataFormats/TrackReco"/>
-    <use name="DataFormats/StdDictionaries"/>
     <use name="SimTracker/TrackerHitAssociation"/>
-    <use name="RecoLocalTracker/SiPixelRecHits"/>
+    <use name="Geometry/Records"/>
+    <use name="Geometry/TrackerGeometryBuilder"/>
   </library>
 
   <bin name="testPhase2PixelNtuple" file="testPhase2PixelNtuple.cpp">
diff --git a/SimCalorimetry/CastorSim/plugins/BuildFile.xml b/SimCalorimetry/CastorSim/plugins/BuildFile.xml
index 73d9fa0621426..51f1c705aa48d 100644
--- a/SimCalorimetry/CastorSim/plugins/BuildFile.xml
+++ b/SimCalorimetry/CastorSim/plugins/BuildFile.xml
@@ -2,12 +2,10 @@
   <flags EDM_PLUGIN="1"/>
   <use name="SimCalorimetry/CastorSim"/>
   <use name="DataFormats/HcalDetId"/>
-  <use name="FWCore/PluginManager"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/Utilities"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
   <use name="SimDataFormats/CrossingFrame"/>
   <use name="SimGeneral/MixingModule"/>
-  <use name="Geometry/HcalTowerAlgo"/>
 </library>
diff --git a/SimCalorimetry/CastorSim/test/BuildFile.xml b/SimCalorimetry/CastorSim/test/BuildFile.xml
index b4fd11f3209e4..305365eff3f97 100644
--- a/SimCalorimetry/CastorSim/test/BuildFile.xml
+++ b/SimCalorimetry/CastorSim/test/BuildFile.xml
@@ -1,6 +1,5 @@
 <environment>
   <use name="SimCalorimetry/CastorSim"/>
-  <use name="CalibCalorimetry/HcalTPGAlgos"/>
   <bin file="CastorDigitizerTest.cpp">
 </bin>
 
diff --git a/SimCalorimetry/EcalSelectiveReadoutAlgos/test/BuildFile.xml b/SimCalorimetry/EcalSelectiveReadoutAlgos/test/BuildFile.xml
deleted file mode 100644
index 5d330ecd36aba..0000000000000
--- a/SimCalorimetry/EcalSelectiveReadoutAlgos/test/BuildFile.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<environment>
-  <use name="SimCalorimetry/EcalSelectiveReadoutAlgos"/>
-  <use name="SimCalorimetry/CaloSimAlgos"/>
-</environment>
diff --git a/SimCalorimetry/EcalSimAlgos/test/BuildFile.xml b/SimCalorimetry/EcalSimAlgos/test/BuildFile.xml
index aab0275d072ca..82a8486113d1d 100644
--- a/SimCalorimetry/EcalSimAlgos/test/BuildFile.xml
+++ b/SimCalorimetry/EcalSimAlgos/test/BuildFile.xml
@@ -1,7 +1,6 @@
 <environment>
   <use name="SimCalorimetry/EcalSimAlgos"/>
   <use name="SimCalorimetry/CaloSimAlgos"/>
-  <use name="SimDataFormats/RandomEngine"/>
   <use name="rootgraphics"/>
   <bin file="testEcalShape.cpp">
 </bin>
diff --git a/SimCalorimetry/HGCalAssociatorProducers/plugins/BuildFile.xml b/SimCalorimetry/HGCalAssociatorProducers/plugins/BuildFile.xml
index 776bbfac5b8cd..50d08e426a84d 100644
--- a/SimCalorimetry/HGCalAssociatorProducers/plugins/BuildFile.xml
+++ b/SimCalorimetry/HGCalAssociatorProducers/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/Framework"/>
-<use name="FWCore/PluginManager"/>
 <use name="FWCore/ParameterSet"/>
 <use name="SimDataFormats/Associations"/>
 <use name="RecoLocalCalo/HGCalRecAlgos"/>
diff --git a/SimDataFormats/GeneratorProducts/test/BuildFile.xml b/SimDataFormats/GeneratorProducts/test/BuildFile.xml
index 9c8b574eb8df5..39c06a36a41c0 100644
--- a/SimDataFormats/GeneratorProducts/test/BuildFile.xml
+++ b/SimDataFormats/GeneratorProducts/test/BuildFile.xml
@@ -1,4 +1,4 @@
 <bin file="rootio_t.cc" name="SimDataFormatsGeneratorProductsRootTest">
+  <use name="hepmc"/>
   <use name="root"/>
-  <use name="SimDataFormats/GeneratorProducts"/>
 </bin>
diff --git a/SimG4Core/Application/test/BuildFile.xml b/SimG4Core/Application/test/BuildFile.xml
index 3976fa1db8f03..ab0f523c24e23 100644
--- a/SimG4Core/Application/test/BuildFile.xml
+++ b/SimG4Core/Application/test/BuildFile.xml
@@ -1,7 +1,5 @@
 <environment>
-  <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
   <use name="boost_serialization"/>
   <library file="SimHitCaloHitDumper.cc" name="SimHitCaloHitDumper">
     <use name="SimDataFormats/TrackingHit"/>
diff --git a/SimG4Core/DD4hepGeometry/test/BuildFile.xml b/SimG4Core/DD4hepGeometry/test/BuildFile.xml
index e315fce597484..00a36d4d598cf 100644
--- a/SimG4Core/DD4hepGeometry/test/BuildFile.xml
+++ b/SimG4Core/DD4hepGeometry/test/BuildFile.xml
@@ -7,14 +7,7 @@
 </bin>
 
 <library name="DD4hepGeometryTestPlugins" file="plugins/*.cc">
-  <use name="DataFormats/GeometryVector"/>
-  <use name="SimG4Core/Notification"/>
-  <use name="SimG4Core/Watcher"/>
   <use name="SimG4Core/DD4hepGeometry"/>
-  <use name="SimG4Core/SensitiveDetector"/>
-  <use name="SimG4Core/MagneticField"/>
-  <use name="MagneticField/Engine"/>
-  <use name="MagneticField/Records"/>
   <use name="geant4core"/>
   <use name="Geometry/Records"/>
   <lib name="Geom"/>
diff --git a/SimGeneral/HepPDTRecord/test/BuildFile.xml b/SimGeneral/HepPDTRecord/test/BuildFile.xml
index 7046f02555e83..611c2393a5b36 100644
--- a/SimGeneral/HepPDTRecord/test/BuildFile.xml
+++ b/SimGeneral/HepPDTRecord/test/BuildFile.xml
@@ -1,5 +1,4 @@
 <bin name="testSimGeneralHepPDTRecord" file="testPdtEntry.cc,testRunner.cpp">
   <use name="SimGeneral/HepPDTRecord"/>
-  <use name="FWCore/ParameterSet"/>
   <use name="cppunit"/>
 </bin>
diff --git a/SimGeneral/NoiseGenerators/test/BuildFile.xml b/SimGeneral/NoiseGenerators/test/BuildFile.xml
index 28b6855123d8d..a46b7b79a9e03 100644
--- a/SimGeneral/NoiseGenerators/test/BuildFile.xml
+++ b/SimGeneral/NoiseGenerators/test/BuildFile.xml
@@ -9,7 +9,6 @@
 </library>
 
 <environment>
-  <use name="FWCore/MessageLogger"/>
   <use name="CommonTools/Statistics"/>
   <bin file="CorrelatedNoisifierTest.cpp">
 </bin>
diff --git a/SimGeneral/TrackingAnalysis/test/BuildFile.xml b/SimGeneral/TrackingAnalysis/test/BuildFile.xml
index 9b4411f99549b..01ed23f0be099 100644
--- a/SimGeneral/TrackingAnalysis/test/BuildFile.xml
+++ b/SimGeneral/TrackingAnalysis/test/BuildFile.xml
@@ -3,7 +3,6 @@
   <use name="FWCore/Framework"/>
   <use name="SimDataFormats/TrackingAnalysis"/>
   <use name="SimDataFormats/Track"/>
-  <use name="SimDataFormats/Vertex"/>
   <use name="SimDataFormats/GeneratorProducts"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/SimMuon/CSCDigitizer/plugins/BuildFile.xml b/SimMuon/CSCDigitizer/plugins/BuildFile.xml
index 56cde6f047076..ae517ae7149b4 100644
--- a/SimMuon/CSCDigitizer/plugins/BuildFile.xml
+++ b/SimMuon/CSCDigitizer/plugins/BuildFile.xml
@@ -1,28 +1,16 @@
 <use name="SimMuon/CSCDigitizer"/>
 <library file="*.cc" name="SimMuonCSCDigitizerPlugins">
-  <use name="CondFormats/CSCObjects"/>
   <use name="DataFormats/CSCDigi"/>
-  <use name="DataFormats/GeometryVector"/>
   <use name="DataFormats/MuonDetId"/>
   <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/Utilities"/>
   <use name="FWCore/PluginManager"/>
   <use name="Geometry/CSCGeometry"/>
   <use name="Geometry/Records"/>
-  <use name="MagneticField/Engine"/>
-  <use name="MagneticField/Records"/>
   <use name="CondFormats/RecoMuonObjects"/>
   <use name="CondFormats/DataRecord"/>
-  <use name="SimDataFormats/CrossingFrame"/>
-  <use name="SimDataFormats/TrackingHit"/>
-  <use name="SimDataFormats/TrackerDigiSimLink"/>
-  <use name="SimGeneral/HepPDTRecord"/>
-  <use name="SimGeneral/NoiseGenerators"/>
   <use name="SimGeneral/PreMixingModule"/>
-  <use name="SimMuon/Neutron"/>
-  <use name="Utilities/General"/>
   <use name="boost"/>
   <use name="clhep"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/SimMuon/DTDigitizer/plugins/BuildFile.xml b/SimMuon/DTDigitizer/plugins/BuildFile.xml
index 9bb7909ad7ad0..f963c4cfcddcc 100644
--- a/SimMuon/DTDigitizer/plugins/BuildFile.xml
+++ b/SimMuon/DTDigitizer/plugins/BuildFile.xml
@@ -2,12 +2,10 @@
   <use name="FWCore/Utilities"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ServiceRegistry"/>
-  <use name="CommonTools/UtilAlgos"/>
   <use name="CondFormats/RecoMuonObjects"/>
   <use name="DataFormats/Common"/>
   <use name="DataFormats/DTDigi"/>
   <use name="DataFormats/MuonDetId"/>
-  <use name="DataFormats/GeometryVector"/>
   <use name="Geometry/DTGeometry"/>
   <use name="Geometry/Records"/>
   <use name="CondFormats/DataRecord"/>
diff --git a/SimMuon/MCTruth/plugins/BuildFile.xml b/SimMuon/MCTruth/plugins/BuildFile.xml
index 8ec79de4c2b9f..1dc8c8c33d871 100644
--- a/SimMuon/MCTruth/plugins/BuildFile.xml
+++ b/SimMuon/MCTruth/plugins/BuildFile.xml
@@ -3,17 +3,13 @@
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/Utilities"/>
   <use name="FWCore/MessageLogger"/>
-  <use name="DataFormats/GeometryVector"/>
   <use name="DataFormats/CSCRecHit"/>
   <use name="DataFormats/MuonReco"/>
-  <use name="Geometry/CSCGeometry"/>
   <use name="Geometry/Records"/>
   <use name="SimDataFormats/Track"/>
   <use name="SimDataFormats/TrackingHit"/>
-  <use name="SimDataFormats/TrackerDigiSimLink"/>
   <use name="SimDataFormats/Associations"/>
   <use name="SimTracker/Records"/>
-  <use name="SimTracker/TrackAssociation"/>
   <use name="SimMuon/MCTruth"/>
   <use name="clhep"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/SimMuon/MCTruth/test/BuildFile.xml b/SimMuon/MCTruth/test/BuildFile.xml
index f20a0a8f93b52..4e69410ccc547 100644
--- a/SimMuon/MCTruth/test/BuildFile.xml
+++ b/SimMuon/MCTruth/test/BuildFile.xml
@@ -1,13 +1,10 @@
 <library file="*.cc" name="SimMuonMCTruthTest">
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="DataFormats/Common"/>
-  <use name="SimDataFormats/TrackingHit"/>
   <use name="SimDataFormats/Track"/>
   <use name="DataFormats/TrackReco"/>
   <use name="DataFormats/MuonReco"/>
   <use name="SimDataFormats/TrackingAnalysis"/>
-  <use name="SimTracker/TrackAssociation"/>
   <use name="SimTracker/Records"/>
   <use name="SimMuon/MCTruth"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/SimMuon/RPCDigitizer/plugins/BuildFile.xml b/SimMuon/RPCDigitizer/plugins/BuildFile.xml
index bb543c1376abf..ce85075734f95 100644
--- a/SimMuon/RPCDigitizer/plugins/BuildFile.xml
+++ b/SimMuon/RPCDigitizer/plugins/BuildFile.xml
@@ -2,12 +2,10 @@
   <use name="FWCore/Utilities"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ServiceRegistry"/>
-  <use name="CommonTools/UtilAlgos"/>
   <use name="CondFormats/RecoMuonObjects"/>
   <use name="DataFormats/Common"/>
   <use name="DataFormats/RPCDigi"/>
   <use name="DataFormats/MuonDetId"/>
-  <use name="DataFormats/GeometryVector"/>
   <use name="Geometry/RPCGeometry"/>
   <use name="Geometry/Records"/>
   <use name="CondFormats/DataRecord"/>
diff --git a/SimTracker/TrackTriggerAssociation/plugins/BuildFile.xml b/SimTracker/TrackTriggerAssociation/plugins/BuildFile.xml
index 325e3163b8952..f491889ea0b18 100644
--- a/SimTracker/TrackTriggerAssociation/plugins/BuildFile.xml
+++ b/SimTracker/TrackTriggerAssociation/plugins/BuildFile.xml
@@ -1,10 +1,7 @@
 <library file="*.cc" name="TrackTriggerAssociationPlugins">
   <use name="L1Trigger/TrackTrigger"/>
   <use name="DataFormats/L1TrackTrigger"/>
-  <use name="PhysicsTools/UtilAlgos"/>
-  <use name="CommonTools/UtilAlgos"/>
   <use name="SimDataFormats/EncodedEventId"/>
-  <use name="SimDataFormats/TrackingAnalysis"/>
   <use name="SimTracker/TrackTriggerAssociation"/>
   <use name="root"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/SimTransport/PPSProtonTransport/BuildFile.xml b/SimTransport/PPSProtonTransport/BuildFile.xml
index 916885e32c43d..ee1f106dd38af 100644
--- a/SimTransport/PPSProtonTransport/BuildFile.xml
+++ b/SimTransport/PPSProtonTransport/BuildFile.xml
@@ -1,6 +1,5 @@
 <use   name="FWCore/Framework"/>
 <use   name="FWCore/ParameterSet"/>
-<use   name="CommonTools/Utils"/>
 <use   name="SimDataFormats/GeneratorProducts"/>
 <use   name="SimGeneral/HepPDTRecord"/>
 <use   name="Utilities/PPS"/>
diff --git a/TopQuarkAnalysis/TopEventSelection/bin/BuildFile.xml b/TopQuarkAnalysis/TopEventSelection/bin/BuildFile.xml
index 6dd71e1626ecb..a41a5a7216142 100644
--- a/TopQuarkAnalysis/TopEventSelection/bin/BuildFile.xml
+++ b/TopQuarkAnalysis/TopEventSelection/bin/BuildFile.xml
@@ -2,7 +2,6 @@
   <use name="AnalysisDataFormats/TopObjects"/>
   <use name="TopQuarkAnalysis/TopTools"/>
   <use name="FWCore/FWLite"/>
-  <use name="FWCore/Framework"/>
   <use name="root"/>
   <bin file="TtSemiLRSignalSel_SoverSplusBLoop.cpp">
 </bin>
diff --git a/TopQuarkAnalysis/TopJetCombination/bin/BuildFile.xml b/TopQuarkAnalysis/TopJetCombination/bin/BuildFile.xml
index 0fd2be4d486cd..dabc68424cadb 100644
--- a/TopQuarkAnalysis/TopJetCombination/bin/BuildFile.xml
+++ b/TopQuarkAnalysis/TopJetCombination/bin/BuildFile.xml
@@ -2,7 +2,6 @@
   <use name="AnalysisDataFormats/TopObjects"/>
   <use name="TopQuarkAnalysis/TopTools"/>
   <use name="FWCore/FWLite"/>
-  <use name="FWCore/Framework"/>
   <use name="root"/>
   <bin file="TtSemiLRJetComb_SoverSplusBLoop.cpp">
 </bin>
diff --git a/TrackingTools/DetLayers/test/BuildFile.xml b/TrackingTools/DetLayers/test/BuildFile.xml
deleted file mode 100644
index c3fd46098aedb..0000000000000
--- a/TrackingTools/DetLayers/test/BuildFile.xml
+++ /dev/null
@@ -1,4 +0,0 @@
-<bin file="testBinFinders.cpp">
-  <use name="DataFormats/Math"/>
-  <use name="clhep"/>
-</bin>
diff --git a/TrackingTools/DetLayers/test/testBinFinders.cpp b/TrackingTools/DetLayers/test/testBinFinders.cpp
deleted file mode 100644
index 09eccf58872b0..0000000000000
--- a/TrackingTools/DetLayers/test/testBinFinders.cpp
+++ /dev/null
@@ -1,7 +0,0 @@
-// For the time being, just try to compile the headers.
-
-
-
-int main(){
-  return 0;
-}
diff --git a/TrackingTools/TrajectoryFiltering/test/BuildFile.xml b/TrackingTools/TrajectoryFiltering/test/BuildFile.xml
index c2e61dcde2ccf..c44e1f5cb2985 100644
--- a/TrackingTools/TrajectoryFiltering/test/BuildFile.xml
+++ b/TrackingTools/TrajectoryFiltering/test/BuildFile.xml
@@ -1,6 +1,4 @@
 <library file="*.cc" name="TrackingToolsTrajectoryFilteringTest">
   <flags EDM_PLUGIN="1"/>
   <use name="TrackingTools/TrajectoryFiltering"/>
-  <use name="TrackingTools/Records"/>
-  <use name="RecoTracker/Record"/>
 </library>
diff --git a/TrackingTools/TransientTrack/plugins/BuildFile.xml b/TrackingTools/TransientTrack/plugins/BuildFile.xml
index 1087c867065dd..82ce4627d37dc 100644
--- a/TrackingTools/TransientTrack/plugins/BuildFile.xml
+++ b/TrackingTools/TransientTrack/plugins/BuildFile.xml
@@ -1,7 +1,6 @@
 <library file="*.cc" name="TrackingToolsTransientTrackPlugins">
   <use name="Geometry/CommonDetUnit"/>
   <use name="Geometry/Records"/>
-  <use name="MagneticField/Engine"/>
   <use name="TrackingTools/Records"/>
   <use name="TrackingTools/TransientTrack"/>
   <use name="FWCore/Framework"/>
diff --git a/Validation/MuonGEMHits/plugins/BuildFile.xml b/Validation/MuonGEMHits/plugins/BuildFile.xml
index 97c0678303fa2..13fc9957c81d8 100644
--- a/Validation/MuonGEMHits/plugins/BuildFile.xml
+++ b/Validation/MuonGEMHits/plugins/BuildFile.xml
@@ -1,8 +1,6 @@
 <library file="*.cc" name="ValidationMuonGEMHitsPlugin">
   <use name="FWCore/Framework"/>
   <use name="Validation/MuonGEMHits"/>
-  <use name="Validation/MuonHits"/>
-  <use name="DQMServices/Core"/>
   <use name="HepMC"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Validation/MuonGEMRecHits/plugins/BuildFile.xml b/Validation/MuonGEMRecHits/plugins/BuildFile.xml
index f1586ca8a733a..89d81387b48d7 100644
--- a/Validation/MuonGEMRecHits/plugins/BuildFile.xml
+++ b/Validation/MuonGEMRecHits/plugins/BuildFile.xml
@@ -2,7 +2,6 @@
   <use name="FWCore/Framework"/>
   <use name="Validation/MuonGEMHits"/>
   <use name="Validation/MuonGEMRecHits"/>
-  <use name="DQMServices/Core"/>
   <use name="HepMC"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Validation/MuonHits/plugins/BuildFile.xml b/Validation/MuonHits/plugins/BuildFile.xml
index 2615df42a66bf..a1c89e5982a1f 100644
--- a/Validation/MuonHits/plugins/BuildFile.xml
+++ b/Validation/MuonHits/plugins/BuildFile.xml
@@ -3,7 +3,6 @@
   <use name="Geometry/CSCGeometry"/>
   <use name="Geometry/DTGeometry"/>
   <use name="Geometry/RPCGeometry"/>
-  <use name="Geometry/GEMGeometry"/>
   <use name="Geometry/Records"/>
   <use name="SimDataFormats/GeneratorProducts"/>
   <use name="SimDataFormats/TrackingHit"/>
diff --git a/Validation/RecoMuon/test/BuildFile.xml b/Validation/RecoMuon/test/BuildFile.xml
index e46b4d88a5249..1a03d332f90bc 100644
--- a/Validation/RecoMuon/test/BuildFile.xml
+++ b/Validation/RecoMuon/test/BuildFile.xml
@@ -2,8 +2,6 @@
   <flags NO_TESTRUN="1"/>
   <use name="boost"/>
   <use name="boost_program_options"/>
-  <use name="FWCore/FWLite"/>
-  <use name="FWCore/Framework"/>
   <use name="rootgraphics"/>
   <use name="root"/>
 </bin>
@@ -11,8 +9,6 @@
 <bin name="makePlot" file="makePlot.cpp">
   <flags NO_TESTRUN="1"/>
   <use name="boost"/>
-  <use name="FWCore/FWLite"/>
-  <use name="FWCore/Framework"/>
   <use name="rootgraphics"/>
   <use name="root"/>
 </bin>
diff --git a/Validation/RecoParticleFlow/plugins/BuildFile.xml b/Validation/RecoParticleFlow/plugins/BuildFile.xml
index f262b4ea6a3fe..df24419b486e1 100644
--- a/Validation/RecoParticleFlow/plugins/BuildFile.xml
+++ b/Validation/RecoParticleFlow/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <library name="ValidationRecoParticleFlow_plugins" file="*.cc">
-  <use name="FWCore/FWLite"/>
   <use name="FWCore/Framework"/>
   <use name="root"/>
   <use name="rootcore"/>