diff --git a/CalibMuon/DTCalibration/plugins/BuildFile.xml b/CalibMuon/DTCalibration/plugins/BuildFile.xml
index a39780a14bb5b..afcf86ef3c72d 100644
--- a/CalibMuon/DTCalibration/plugins/BuildFile.xml
+++ b/CalibMuon/DTCalibration/plugins/BuildFile.xml
@@ -12,7 +12,7 @@
 <use name="root"/>
 <use name="rootmath"/>
 <use name="rootcore"/>
-<use name="rootfitcore"/>
+<use name="roofitcore"/>
 <use name="rootgraphics"/>
 <lib name="Spectrum"/>
 <library file="*.cc" name="CalibMuonDTCalibrationPlugins">
diff --git a/DQM/GEM/BuildFile.xml b/DQM/GEM/BuildFile.xml
index 39faf72810d64..3426b1493c859 100644
--- a/DQM/GEM/BuildFile.xml
+++ b/DQM/GEM/BuildFile.xml
@@ -4,7 +4,6 @@
 <use name="FWCore/Utilities"/>
 <use name="DQMServices/Core"/>
 <use name="DataFormats/GEMDigi"/>
-<use name="DataFormats/GEMRecHit"/>
 <use name="Geometry/Records"/>
 <use name="Geometry/GEMGeometry"/>
 <use name="Validation/MuonGEMHits"/>
diff --git a/DQM/GEM/plugins/BuildFile.xml b/DQM/GEM/plugins/BuildFile.xml
index b644d1fd4f6d0..a469275194e23 100644
--- a/DQM/GEM/plugins/BuildFile.xml
+++ b/DQM/GEM/plugins/BuildFile.xml
@@ -7,7 +7,5 @@
   <use name="DQMServices/Core"/>
   <use name="DataFormats/GEMDigi"/>
   <use name="DataFormats/GEMRecHit"/>
-  <use name="Geometry/Records"/>
-  <use name="Geometry/GEMGeometry"/>
   <use name="Validation/MuonGEMHits"/>
 </library>
diff --git a/DQM/SiStripMonitorSummary/plugins/BuildFile.xml b/DQM/SiStripMonitorSummary/plugins/BuildFile.xml
index d1f817031dfe3..cd39b6c292b72 100644
--- a/DQM/SiStripMonitorSummary/plugins/BuildFile.xml
+++ b/DQM/SiStripMonitorSummary/plugins/BuildFile.xml
@@ -8,9 +8,7 @@
 <use name="DataFormats/SiStripDetId"/>
 <use name="CalibTracker/Records"/>
 <use name="CommonTools/TrackerMap"/>
-<use name="DQM/SiStripCommon"/>
 <use name="DQM/SiStripMonitorSummary"/>
-<use name="DQMServices/Core"/>
 <library file="*.cc" name="DQMSiStripMonitorSummaryplugins">
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DataFormats/DTDigi/BuildFile.xml b/DataFormats/DTDigi/BuildFile.xml
index 64f4c2632e8e6..6733c6fb10838 100644
--- a/DataFormats/DTDigi/BuildFile.xml
+++ b/DataFormats/DTDigi/BuildFile.xml
@@ -1,7 +1,7 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/MuonDetId"/>
 <use name="DataFormats/FEDRawData"/>
-<use name="DataFormats/MuonData"/>
+<use name="DataFormats/MuonData" source_only="1"/>
 <use name="FWCore/Utilities"/>
 <export>
   <lib name="1"/>
diff --git a/DataFormats/HLTReco/BuildFile.xml b/DataFormats/HLTReco/BuildFile.xml
index d7fd9b9046193..6e4c24de1329c 100644
--- a/DataFormats/HLTReco/BuildFile.xml
+++ b/DataFormats/HLTReco/BuildFile.xml
@@ -11,7 +11,6 @@
 <use name="DataFormats/TauReco"/>
 <use name="DataFormats/L1TParticleFlow"/>
 <use name="DataFormats/L1TCorrelator"/>
-<use name="FWCore/MessageLogger"/>
 <use name="DataFormats/GsfTrackReco"/>
 <export>
   <lib name="1"/>
diff --git a/GeneratorInterface/LHEInterface/plugins/BuildFile.xml b/GeneratorInterface/LHEInterface/plugins/BuildFile.xml
index b96e39874c6f2..167989f991b0d 100644
--- a/GeneratorInterface/LHEInterface/plugins/BuildFile.xml
+++ b/GeneratorInterface/LHEInterface/plugins/BuildFile.xml
@@ -6,7 +6,6 @@
 <use name="stdcxx-fs"/>
 <library name="GeneratorInterfaceLHEProducer" file="LHEFilter.cc LHE2HepMCConverter.cc ExternalLHEProducer.cc ExternalLHEAsciiDumper.cc">
   <use name="FWCore/Framework"/>
-  <use name="FWCore/Concurrency"/>
   <use name="SimDataFormats/GeneratorProducts"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/Geometry/VeryForwardGeometry/BuildFile.xml b/Geometry/VeryForwardGeometry/BuildFile.xml
index 2ee98ae471ac9..83388240c8ef8 100644
--- a/Geometry/VeryForwardGeometry/BuildFile.xml
+++ b/Geometry/VeryForwardGeometry/BuildFile.xml
@@ -1,6 +1,5 @@
 <export>
   <lib name="1"/>
 </export>
-<use name="CondFormats/PPSObjects"/>
 <use name="hepmc"/>
 <use name="heppdt"/>
diff --git a/L1Trigger/L1CaloTrigger/BuildFile.xml b/L1Trigger/L1CaloTrigger/BuildFile.xml
index dbd471630a98a..b95505a2ac92a 100644
--- a/L1Trigger/L1CaloTrigger/BuildFile.xml
+++ b/L1Trigger/L1CaloTrigger/BuildFile.xml
@@ -1,5 +1,4 @@
 <use name="FWCore/ParameterSet"/>
-<use name="DataFormats/L1TCalorimeterPhase2"/>
 <use   name="clhep"/>
 
 <export> 
diff --git a/L1Trigger/L1CaloTrigger/plugins/BuildFile.xml b/L1Trigger/L1CaloTrigger/plugins/BuildFile.xml
index c4d970df01ac5..a732a86066576 100644
--- a/L1Trigger/L1CaloTrigger/plugins/BuildFile.xml
+++ b/L1Trigger/L1CaloTrigger/plugins/BuildFile.xml
@@ -2,6 +2,7 @@
 <use   name="Geometry/CaloGeometry"/>
 <use   name="Geometry/HcalTowerAlgo"/>
 <use   name="Geometry/EcalAlgo"/>
+<use   name="DataFormats/L1TCalorimeterPhase2"/>
 <use   name="DataFormats/L1Trigger"/>
 <use   name="DataFormats/HcalDetId"/>
 <use   name="DataFormats/EcalDigi"/>
diff --git a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
index 8c9e1456eb1bb..82519c629f620 100644
--- a/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
+++ b/RecoLocalTracker/SiPixelClusterizer/plugins/BuildFile.xml
@@ -9,7 +9,6 @@
 <use name="FWCore/ParameterSet"/>
 <use name="FWCore/Utilities"/>
 <use name="HeterogeneousCore/CUDACore"/>
-<use name="RecoLocalTracker/SiPixelClusterizer"/>
 <use name="RecoTracker/Record"/>
 <library file="*.cc *.cu" name="RecoLocalTrackerSiPixelClusterizerPlugins">
   <flags EDM_PLUGIN="1"/>
diff --git a/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml b/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
index 62511823f5ae7..4dc0bfafbb439 100644
--- a/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
+++ b/RecoTracker/TkSeedGenerator/plugins/BuildFile.xml
@@ -31,7 +31,7 @@
 <use name="MagneticField/UniformEngine"/>
 <use name="RecoTracker/MeasurementDet"/>
 <use name="RecoTracker/Record"/>
-<use name="RecoTracker/SpecialSeedGenerators"/>
+<use name="RecoTracker/SpecialSeedGenerators" source_only="1"/>
 <use name="RecoTracker/TkHitPairs"/>
 <use name="RecoTracker/TkSeedingLayers"/>
 <use name="RecoTracker/TransientTrackingRecHit"/>
diff --git a/SimDataFormats/CrossingFrame/BuildFile.xml b/SimDataFormats/CrossingFrame/BuildFile.xml
index d28289e9b01f3..2090bf1896b36 100644
--- a/SimDataFormats/CrossingFrame/BuildFile.xml
+++ b/SimDataFormats/CrossingFrame/BuildFile.xml
@@ -1,6 +1,5 @@
 <use name="DataFormats/Common"/>
 <use name="DataFormats/Provenance"/>
-<use name="FWCore/MessageLogger"/>
 <use name="FWCore/Utilities"/>
 <use name="SimDataFormats/CaloHit"/>
 <use name="SimDataFormats/EncodedEventId"/>
diff --git a/SimDataFormats/DigiSimLinks/BuildFile.xml b/SimDataFormats/DigiSimLinks/BuildFile.xml
index 6b9556c3cb003..28b680e20592b 100644
--- a/SimDataFormats/DigiSimLinks/BuildFile.xml
+++ b/SimDataFormats/DigiSimLinks/BuildFile.xml
@@ -1,7 +1,7 @@
 <use name="DataFormats/Common"/>
 <use name="SimDataFormats/EncodedEventId"/>
 <use name="DataFormats/MuonDetId"/>
-<use name="DataFormats/MuonData"/>
+<use name="DataFormats/MuonData" source_only="1"/>
 <use name="boost"/>
 <export>
   <lib name="1"/>
diff --git a/SimPPS/PPSPixelDigiProducer/BuildFile.xml b/SimPPS/PPSPixelDigiProducer/BuildFile.xml
index 637a74d0afb0c..c652a2c295e37 100644
--- a/SimPPS/PPSPixelDigiProducer/BuildFile.xml
+++ b/SimPPS/PPSPixelDigiProducer/BuildFile.xml
@@ -1,7 +1,6 @@
 <use name="CondFormats/PPSObjects"/>
 <use name="DataFormats/CTPPSDigi"/>
 <use name="FWCore/ParameterSet"/>
-<use name="Geometry/VeryForwardGeometry"/>
 <use name="SimTracker/Common"/>
 <export>
   <lib name="1"/>