diff --git a/CommonTools/CandAlgos/BuildFile.xml b/CommonTools/CandAlgos/BuildFile.xml
index 3e70021ae4f50..9c2e3490d920c 100644
--- a/CommonTools/CandAlgos/BuildFile.xml
+++ b/CommonTools/CandAlgos/BuildFile.xml
@@ -2,6 +2,7 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/PatCandidates"/>
+<use name="CommonTools/CandUtils"/>
 <export>
   <lib name="1"/>
 </export>
diff --git a/CommonTools/CandAlgos/interface/CandCombiner.h b/CommonTools/CandAlgos/interface/CandCombiner.h
index 361619419a1fc..ac93f2a9b3b49 100644
--- a/CommonTools/CandAlgos/interface/CandCombiner.h
+++ b/CommonTools/CandAlgos/interface/CandCombiner.h
@@ -26,6 +26,7 @@
 #include "DataFormats/Candidate/interface/Candidate.h"
 #include "FWCore/Utilities/interface/EDMException.h"
 #include "FWCore/Utilities/interface/transform.h"
+#include "CommonTools/CandUtils/interface/AddFourMomenta.h"
 #include <string>
 #include <vector>
 #include <algorithm>
diff --git a/CommonTools/CandAlgos/plugins/BuildFile.xml b/CommonTools/CandAlgos/plugins/BuildFile.xml
index 1f97cb1c49aed..003f0e0b1d21e 100644
--- a/CommonTools/CandAlgos/plugins/BuildFile.xml
+++ b/CommonTools/CandAlgos/plugins/BuildFile.xml
@@ -8,5 +8,4 @@
   <use name="CommonTools/UtilAlgos"/>
   <use name="CommonTools/Utils"/>
   <use name="CommonTools/CandAlgos"/>
-  <use name="CommonTools/CandUtils"/>
 </library>
diff --git a/CommonTools/ParticleFlow/plugins/BuildFile.xml b/CommonTools/ParticleFlow/plugins/BuildFile.xml
index 2cebbef51b433..310e92f763712 100644
--- a/CommonTools/ParticleFlow/plugins/BuildFile.xml
+++ b/CommonTools/ParticleFlow/plugins/BuildFile.xml
@@ -11,7 +11,6 @@
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="JetMETCorrections/Objects"/>
   <use name="JetMETCorrections/JetCorrector"/>
   <use name="CommonTools/Utils"/>
   <use name="CommonTools/ParticleFlow"/>
diff --git a/CommonTools/ParticleFlow/test/BuildFile.xml b/CommonTools/ParticleFlow/test/BuildFile.xml
index a0a62944fc640..a621300c859b2 100644
--- a/CommonTools/ParticleFlow/test/BuildFile.xml
+++ b/CommonTools/ParticleFlow/test/BuildFile.xml
@@ -1,9 +1,9 @@
 <library name="CommonToolsParticleFlowTest" file="PFIsoReaderDemo.cc">
+  <use name="CommonTools/UtilAlgos"/>
   <use name="DataFormats/Common"/>
   <use name="DataFormats/EgammaCandidates"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="PhysicsTools/UtilAlgos"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CommonTools/PileupAlgos/plugins/BuildFile.xml b/CommonTools/PileupAlgos/plugins/BuildFile.xml
index d62965df04cd7..8c42ee20fc50a 100644
--- a/CommonTools/PileupAlgos/plugins/BuildFile.xml
+++ b/CommonTools/PileupAlgos/plugins/BuildFile.xml
@@ -2,13 +2,9 @@
 </export>
 <library name="CommonToolsPileupAlgos_plugins" file="*.cc">
   <use name="DataFormats/ParticleFlowCandidate"/>
-  <use name="DataFormats/JetReco"/>
+  <use name="DataFormats/PatCandidates"/>
   <use name="FWCore/Framework"/>
-  <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="JetMETCorrections/Objects"/>
-  <use name="CommonTools/Utils"/>
-  <use name="CommonTools/ParticleFlow"/>
   <use name="CommonTools/PileupAlgos"/>
   <use name="fastjet"/>
   <use name="fastjet-contrib"/>
diff --git a/CommonTools/RecoAlgos/BuildFile.xml b/CommonTools/RecoAlgos/BuildFile.xml
index 4e46272484be9..ef3d02a8b7dd6 100644
--- a/CommonTools/RecoAlgos/BuildFile.xml
+++ b/CommonTools/RecoAlgos/BuildFile.xml
@@ -12,6 +12,7 @@
 <use name="DataFormats/VertexReco"/>
 <use name="TrackingTools/IPTools"/>
 <use name="TrackingTools/TransientTrack"/>
+<use name="Geometry/TrackerGeometryBuilder">
 <use name="fastjet"/>
 <export>
   <lib name="1"/>
diff --git a/CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h b/CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h
index ca1c3ec92695a..ca984eab33ec6 100644
--- a/CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h
+++ b/CommonTools/RecoAlgos/interface/CosmicTrackingParticleSelector.h
@@ -21,13 +21,13 @@
 #include "MagneticField/Records/interface/IdealMagneticFieldRecord.h"
 
 #include "Geometry/Records/interface/TrackerDigiGeometryRecord.h"
-#include <Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h>
+#include "Geometry/TrackerGeometryBuilder/interface/TrackerGeometry.h"
 #include "Geometry/CommonDetUnit/interface/GlobalTrackingGeometry.h"
 #include "Geometry/Records/interface/GlobalTrackingGeometryRecord.h"
 
-#include <DataFormats/GeometrySurface/interface/Surface.h>
-#include <DataFormats/GeometrySurface/interface/GloballyPositioned.h>
-#include <Geometry/CommonDetUnit/interface/GeomDet.h>
+#include "DataFormats/GeometrySurface/interface/Surface.h"
+#include "DataFormats/GeometrySurface/interface/GloballyPositioned.h"
+#include "Geometry/CommonDetUnit/interface/GeomDet.h"
 #include "DataFormats/GeometryVector/interface/GlobalVector.h"
 #include "DataFormats/GeometryVector/interface/GlobalPoint.h"
 
diff --git a/CommonTools/RecoAlgos/plugins/BuildFile.xml b/CommonTools/RecoAlgos/plugins/BuildFile.xml
index 249821a8c3c08..1391d81bd6a18 100644
--- a/CommonTools/RecoAlgos/plugins/BuildFile.xml
+++ b/CommonTools/RecoAlgos/plugins/BuildFile.xml
@@ -1,7 +1,6 @@
 <export>
 </export>
 <library name="CommonToolsRecoAlgos_plugins" file="*.cc">
-  <use name="MagneticField/Engine"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
   <use name="DataFormats/RecoCandidate"/>
@@ -14,12 +13,8 @@
   <use name="DataFormats/PatCandidates"/>
   <use name="DataFormats/HcalRecHit"/>
   <use name="SimDataFormats/TrackingAnalysis"/>
-  <use name="TrackingTools/PatternTools"/>
   <use name="TrackingTools/Records"/>
   <use name="CommonTools/Utils"/>
   <use name="CommonTools/RecoAlgos"/>
-  <use name="MagneticField/Records"/>
-  <use name="Geometry/Records"/>
-  <use name="Geometry/TrackerGeometryBuilder"/>
   <use name="JetMETCorrections/JetCorrector"/>
 </library>
diff --git a/CommonTools/TriggerUtils/plugins/BuildFile.xml b/CommonTools/TriggerUtils/plugins/BuildFile.xml
index e858ef4205c18..dc30e5bf120d5 100644
--- a/CommonTools/TriggerUtils/plugins/BuildFile.xml
+++ b/CommonTools/TriggerUtils/plugins/BuildFile.xml
@@ -1,10 +1,5 @@
 <library file="*.cc" name="CommonToolsTriggerUtilsPlugins">
-  <use name="CondFormats/DataRecord"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/Scalers"/>
-  <use name="DataFormats/L1GlobalTrigger"/>
   <use name="FWCore/Framework"/>
-  <use name="L1Trigger/GlobalTriggerAnalyzer"/>
   <use name="HLTrigger/HLTcore"/>
   <use name="CommonTools/TriggerUtils"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/CommonTools/Utils/test/BuildFile.xml b/CommonTools/Utils/test/BuildFile.xml
index 7da28a44ea1da..f010fe6490294 100644
--- a/CommonTools/Utils/test/BuildFile.xml
+++ b/CommonTools/Utils/test/BuildFile.xml
@@ -4,8 +4,6 @@
   <use name="DataFormats/TrackerRecHit2D"/>
   <use name="DataFormats/Candidate"/>
   <use name="DataFormats/PatCandidates"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/SiStripCluster"/>
   <use name="CommonTools/Utils"/>
   <use name="cppunit"/>
   <use name="rootmath"/>
@@ -22,8 +20,6 @@
   <use name="DataFormats/TrackerRecHit2D"/>
   <use name="DataFormats/Candidate"/>
   <use name="DataFormats/PatCandidates"/>
-  <use name="DataFormats/GeometryVector"/>
-  <use name="DataFormats/SiStripCluster"/>
   <use name="CommonTools/Utils"/>
   <use name="cppunit"/>
 </bin>
diff --git a/CondCore/AlignmentPlugins/plugins/BuildFile.xml b/CondCore/AlignmentPlugins/plugins/BuildFile.xml
index 8c60f9ad26029..5d72b9b466d01 100644
--- a/CondCore/AlignmentPlugins/plugins/BuildFile.xml
+++ b/CondCore/AlignmentPlugins/plugins/BuildFile.xml
@@ -2,7 +2,6 @@
 <library file="TrackerAlignmentErrorExtended_PayloadInspector.cc" name="TrackerAlignmentErrorExtended_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/Alignment"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -11,7 +10,6 @@
 <library file="TrackerAlignment_PayloadInspector.cc" name="TrackerAlignment_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/Alignment"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="Alignment/CommonAlignment"/>
@@ -21,7 +19,6 @@
 <library file="TrackerSurfaceDeformations_PayloadInspector.cc" name="TrackerSurfaceDeformations_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/Alignment"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="Alignment/CommonAlignment"/>
diff --git a/CondCore/BeamSpotPlugins/plugins/BuildFile.xml b/CondCore/BeamSpotPlugins/plugins/BuildFile.xml
index 18bde71a5289c..dce62f068af36 100644
--- a/CondCore/BeamSpotPlugins/plugins/BuildFile.xml
+++ b/CondCore/BeamSpotPlugins/plugins/BuildFile.xml
@@ -1,13 +1,11 @@
 <library file="BeamSpot_PayloadInspector.cc" name="BeamSpot_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="boost_python"/>
 </library>
 
 <library file="BeamSpotOnline_PayloadInspector.cc" name="BeamSpotOnline_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="boost_python"/>
 </library>
diff --git a/CondCore/DBOutputService/test/BuildFile.xml b/CondCore/DBOutputService/test/BuildFile.xml
index d1c05f97d1352..fcf4396ab7bf0 100644
--- a/CondCore/DBOutputService/test/BuildFile.xml
+++ b/CondCore/DBOutputService/test/BuildFile.xml
@@ -38,6 +38,5 @@
 </library>
 
 <library file="stubs/writeInt.cc" name="writeInt">
-  <use name="CondFormats/Common"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/CondCore/EcalPlugins/plugins/BuildFile.xml b/CondCore/EcalPlugins/plugins/BuildFile.xml
index 009b72bed0708..b6ebee2d60261 100644
--- a/CondCore/EcalPlugins/plugins/BuildFile.xml
+++ b/CondCore/EcalPlugins/plugins/BuildFile.xml
@@ -1,245 +1,210 @@
 <library file="EcalTPGWeightGroup_PayloadInspector.cc" name="EcalTPGWeightGroup_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGLutGroup_PayloadInspector.cc" name="EcalTPGLutGroup_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalDQMTowerStatus_PayloadInspector.cc" name="EcalDQMTowerStatus_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalWeightXtalGroups_PayloadInspector.cc" name="EcalWeightXtalGroups_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGFineGrainStripEE_PayloadInspector.cc" name="EcalTPGFineGrainStripEE_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGFineGrainEBGroup_PayloadInspector.cc" name="EcalTPGFineGrainEBGroup_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGFineGrainEBIdMap_PayloadInspector.cc" name="EcalTPGFineGrainEBIdMap_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGFineGrainTowerEE_PayloadInspector.cc" name="EcalTPGFineGrainTowerEE_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalDCSTowerStatus_PayloadInspector.cc" name="EcalDCSTowerStatus_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalDAQTowerStatus_PayloadInspector.cc" name="EcalDAQTowerStatus_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalSRSettings_PayloadInspector.cc" name="EcalSRSettings_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalDCUTemperatures_PayloadInspector.cc" name="EcalDCUTemperatures_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalPTMTemperatures_PayloadInspector.cc" name="EcalPTMTemperatures_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTimeCalibErrors_PayloadInspector.cc" name="EcalTimeCalibErrors_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTimeCalibConstants_PayloadInspector.cc" name="EcalTimeCalibConstants_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalLaserAlphas_PayloadInspector.cc" name="EcalLaserAlphas_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalLaserAPDPNRatiosRef_PayloadInspector.cc" name="EcalLaserAPDPNRatiosRef_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalIntercalibErrors_PayloadInspector.cc" name="EcalIntercalibErrors_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalPFRecHitThresholds_PayloadInspector.cc" name="EcalPFRecHitThresholds_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalIntercalibConstantsMC_PayloadInspector.cc" name="EcalIntercalibConstantsMC_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGWeightIdMap_PayloadInspector.cc" name="EcalTPGWeightIdMap_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalClusterLocalContCorrParameters_PayloadInspector.cc" name="EcalClusterLocalContCorrParameters_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalClusterEnergyUncertaintyParameters_PayloadInspector.cc" name="EcalClusterEnergyUncertaintyParameters_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalClusterEnergyCorrectionParameters_PayloadInspector.cc" name="EcalClusterEnergyCorrectionParameters_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalClusterEnergyCorrectionObjectSpecificParameters_PayloadInspector.cc" name="EcalClusterEnergyCorrectionObjectSpecificParameters_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalClusterCrackCorrParameters_PayloadInspector.cc" name="EcalClusterCrackCorrParameters_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalWeightSet_PayloadInspector.cc" name="EcalWeightSet_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalSampleMask_PayloadInspector.cc" name="EcalSampleMask_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTimeOffsetConstant_PayloadInspector.cc" name="EcalTimeOffsetConstant_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalSamplesCorrelation_PayloadInspector.cc" name="EcalSamplesCorrelation_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTimeBiasCorrections_PayloadInspector.cc" name="EcalTimeBiasCorrections_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGLutIdMap_PayloadInspector.cc" name="EcalTPGLutIdMap_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGPhysicsConst_PayloadInspector.cc" name="EcalTPGPhysicsConst_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalADCToGeVConstant_PayloadInspector.cc" name="EcalADCToGeVConstant_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalDQMChannelStatus_PayloadInspector.cc" name="EcalDQMChannelStatus_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
@@ -254,125 +219,107 @@
 <library file="EcalPedestals_PayloadInspector.cc" name="EcalPedestals_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalChannelStatus_PayloadInspector.cc" name="EcalChannelStatus_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalIntercalibConstants_PayloadInspector.cc" name="EcalIntercalibConstants_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalLaserAPDPNRatios_PayloadInspector.cc" name="EcalLaserAPDPNRatios_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalGainRatios_PayloadInspector.cc" name="EcalGainRatios_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalAlignment_PayloadInspector.cc" name="EcalAlignment_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalFloatCondObjectContainer_PayloadInspector.cc" name="EcalFloatCondObjectContainer_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalLinearCorrections_PayloadInspector.cc" name="EcalLinearCorrections_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalPulseCovariances_PayloadInspector.cc" name="EcalPulseCovariances_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalPulseShapes_PayloadInspector.cc" name="EcalPulseShapes_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalSimPulseShape_PayloadInspector.cc" name="EcalSimPulseShape_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGCrystalStatus_PayloadInspector.cc" name="EcalTPGCrystalStatus_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGStripStatus_PayloadInspector.cc" name="EcalTPGStripStatus_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGTowerStatus_PayloadInspector.cc" name="EcalTPGTowerStatus_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGLinearizationConst_PayloadInspector.cc" name="EcalTPGLinearizationConst_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="EcalTPGPedestals_PayloadInspector.cc" name="EcalTPGPedestals_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/EcalObjects"/>
 </library>
 
 <library file="ESChannelStatus_PayloadInspector.cc" name="ESChannelStatus_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/ESObjects"/>
 </library>
 
 <library file="ESIntercalibConstants_PayloadInspector.cc" name="ESIntercalibConstants_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/ESObjects"/>
 </library>
diff --git a/CondCore/HLTPlugins/plugins/BuildFile.xml b/CondCore/HLTPlugins/plugins/BuildFile.xml
index 38b26e135dcc9..6aa9c99e86719 100644
--- a/CondCore/HLTPlugins/plugins/BuildFile.xml
+++ b/CondCore/HLTPlugins/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <library file="AlCaRecoTriggerBits_PayloadInspector.cc" name="AlCaRecoTriggerBits_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
 </library>
diff --git a/CondCore/HcalPlugins/plugins/BuildFile.xml b/CondCore/HcalPlugins/plugins/BuildFile.xml
index 06b3bef5bc3b8..494aff8f9fc52 100644
--- a/CondCore/HcalPlugins/plugins/BuildFile.xml
+++ b/CondCore/HcalPlugins/plugins/BuildFile.xml
@@ -1,62 +1,53 @@
 <library file="HcalGains_PayloadInspector.cc" name="HcalGains_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/HcalObjects"/>
 </library>
 
 <library file="HcalPedestals_PayloadInspector.cc" name="HcalPedestals_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/HcalObjects"/>
 </library>
 
 <library file="HcalPedestalWidths_PayloadInspector.cc" name="HcalPedestalWidths_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/HcalObjects"/>
 </library>
 
 <library file="HcalRespCorrs_PayloadInspector.cc" name="HcalRespCorrs_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/HcalObjects"/>
 </library>
 
 <library file="HcalChannelQuality_PayloadInspector.cc" name="HcalChannelQuality_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/HcalObjects"/>
 </library>
 
 <library file="HcalL1TriggerObjects_PayloadInspector.cc" name="HcalL1TriggerObjects_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/HcalObjects"/>
 </library>
 
 <library file="HcalRecoParams_PayloadInspector.cc" name="HcalRecoParams_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/HcalObjects"/>
 </library>
 
 <library file="HcalSiPMCharacteristics_PayloadInspector.cc" name="HcalSiPMCharacteristics_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/HcalObjects"/>
 </library>
 
 <library file="HcalSiPMParameters_PayloadInspector.cc" name="HcalSiPMParameters_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/HcalObjects"/>
 </library>
diff --git a/CondCore/PCLConfigPlugins/plugins/BuildFile.xml b/CondCore/PCLConfigPlugins/plugins/BuildFile.xml
index c334e3cbaa1bc..e390ddc361e09 100644
--- a/CondCore/PCLConfigPlugins/plugins/BuildFile.xml
+++ b/CondCore/PCLConfigPlugins/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <library file="AlignPCLThresholds_PayloadInspector.cc" name="AlignPCLThresholds_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
 </library>
diff --git a/CondCore/RunInfoPlugins/plugins/BuildFile.xml b/CondCore/RunInfoPlugins/plugins/BuildFile.xml
index e3bb3ea6004e6..3a1862a84702d 100644
--- a/CondCore/RunInfoPlugins/plugins/BuildFile.xml
+++ b/CondCore/RunInfoPlugins/plugins/BuildFile.xml
@@ -2,5 +2,4 @@
 <library file="RunInfo_PayloadInspector.cc" name="RunInfo_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
 </library>
diff --git a/CondCore/SiPixelPlugins/BuildFile.xml b/CondCore/SiPixelPlugins/BuildFile.xml
index 0c32578102f71..4fa45f6c24c18 100644
--- a/CondCore/SiPixelPlugins/BuildFile.xml
+++ b/CondCore/SiPixelPlugins/BuildFile.xml
@@ -3,4 +3,3 @@
 <use name="CondCore/ESSources"/>
 <use name="CondFormats/SiPixelObjects"/>
 <use name="CondFormats/DataRecord"/>
-<flags EDM_PLUGIN="1"/>
diff --git a/CondCore/SiPixelPlugins/plugins/BuildFile.xml b/CondCore/SiPixelPlugins/plugins/BuildFile.xml
index 7c2d2a7629de5..d7a663d7df84c 100644
--- a/CondCore/SiPixelPlugins/plugins/BuildFile.xml
+++ b/CondCore/SiPixelPlugins/plugins/BuildFile.xml
@@ -1,55 +1,45 @@
+<use name="CondCore/SiPixelPlugins"/>
+
 <library file="SiPixelQuality_PayloadInspector.cc" name="SiPixelQuality_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
-  <use name="CalibTracker/SiPixelESProducers"/>
   <use name="boost_python"/>
 </library>
 
 <library file="SiPixelLorentzAngle_PayloadInspector.cc" name="SiPixelLorentzAngle_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
-  <use name="CalibTracker/SiPixelESProducers"/>
   <use name="boost_python"/>
 </library>
 
 <library file="SiPixelGainCalibrationOffline_PayloadInspector.cc" name="SiPixelGainCalibrationOffline_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
-  <use name="CalibTracker/SiPixelESProducers"/>
   <use name="boost_python"/>
 </library>
 
 <library file="SiPixelGainCalibrationForHLT_PayloadInspector.cc" name="SiPixelGainCalibrationForHLT_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
-  <use name="CalibTracker/SiPixelESProducers"/>
   <use name="boost_python"/>
 </library>
 
 <library file="SiPixelTemplateDBObject_PayloadInspector.cc" name="SiPixelTemplateDBObject_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiPixelTransient"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
-  <use name="CalibTracker/SiPixelESProducers"/>
   <use name="boost_python"/>
 </library>
 
 <library file="SiPixelVCal_PayloadInspector.cc" name="SiPixelVCal_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
-  <use name="CalibTracker/SiPixelESProducers"/>
   <use name="boost_python"/>
 </library>
 
@@ -62,3 +52,7 @@
   <use name="CalibTracker/SiPixelESProducers"/>
   <use name="boost_python"/>
 </library>
+
+<library file="plugin.cc" name="CondCoreSiPixelPluginsPlugin">
+  <use name="CondCore/SiPixelPlugins"/>
+</library>
diff --git a/CondCore/SiPixelPlugins/src/plugin.cc b/CondCore/SiPixelPlugins/plugins/plugin.cc
similarity index 100%
rename from CondCore/SiPixelPlugins/src/plugin.cc
rename to CondCore/SiPixelPlugins/plugins/plugin.cc
diff --git a/CondCore/SiStripPlugins/plugins/BuildFile.xml b/CondCore/SiStripPlugins/plugins/BuildFile.xml
index 1cccad5d8a05b..8571d57487480 100644
--- a/CondCore/SiStripPlugins/plugins/BuildFile.xml
+++ b/CondCore/SiStripPlugins/plugins/BuildFile.xml
@@ -1,7 +1,6 @@
 <library file="SiStripDetVOff_PayloadInspector.cc" name="SiStripDetVOff_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
 </library>
@@ -9,7 +8,6 @@
 <library file="SiStripApvGain_PayloadInspector.cc" name="SiStripApvGain_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -18,7 +16,6 @@
 <library file="SiStripBadStrip_PayloadInspector.cc" name="SiStripBadStrip_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -27,7 +24,6 @@
 <library file="SiStripLorentzAngle_PayloadInspector.cc" name="SiStripLorentzAngle_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -36,7 +32,6 @@
 <library file="SiStripBackPlaneCorrection_PayloadInspector.cc" name="SiStripBackPlaneCorrection_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -45,7 +40,6 @@
 <library file="SiStripNoises_PayloadInspector.cc" name="SiStripNoises_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -54,7 +48,6 @@
 <library file="SiStripPedestals_PayloadInspector.cc" name="SiStripPedestals_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -63,7 +56,6 @@
 <library file="SiStripConfObject_PayloadInspector.cc" name="SiStripConfObject_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CalibFormats/SiStripObjects"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -73,7 +65,6 @@
 <library file="SiStripThreshold_PayloadInspector.cc" name="SiStripThreshold_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -82,7 +73,6 @@
 <library file="SiStripLatency_PayloadInspector.cc" name="SiStripLatency_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
@@ -91,15 +81,12 @@
 <library file="SiStripFedCabling_PayloadInspector.cc" name="SiStripFedCabling_PayloadInspector">
   <use name="CondCore/Utilities"/>
   <use name="CondCore/CondDB"/>
-  <use name="CondFormats/Common"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CommonTools/TrackerMap"/>
   <use name="CalibTracker/StandaloneTrackerTopology"/>
 </library>
 
 <library file="plugin.cc" name="CondCoreSiStripPluginsOthers">
-  <use name="FWCore/Framework"/>
-  <use name="FWCore/PluginManager"/>
   <use name="CondCore/ESSources"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="CondFormats/DataRecord"/>
diff --git a/CondFormats/CSCObjects/test/BuildFile.xml b/CondFormats/CSCObjects/test/BuildFile.xml
index f7814f0b8ae25..41cfcad380c47 100644
--- a/CondFormats/CSCObjects/test/BuildFile.xml
+++ b/CondFormats/CSCObjects/test/BuildFile.xml
@@ -99,5 +99,4 @@
 </library>
 
 <bin file="testSerializationCSCObjects.cpp">
-  <use name="CondFormats/External"/>
 </bin>
diff --git a/CondFormats/Common/test/BuildFile.xml b/CondFormats/Common/test/BuildFile.xml
index dcb79d02e42ca..515a88c443e45 100644
--- a/CondFormats/Common/test/BuildFile.xml
+++ b/CondFormats/Common/test/BuildFile.xml
@@ -20,5 +20,4 @@
 </library>
 
 <bin file="testSerializationCommon.cpp">
-  <use name="CondFormats/External"/>
 </bin>
diff --git a/CondFormats/EcalObjects/test/BuildFile.xml b/CondFormats/EcalObjects/test/BuildFile.xml
index 8749c1b1410f0..94f6ae2527d7a 100644
--- a/CondFormats/EcalObjects/test/BuildFile.xml
+++ b/CondFormats/EcalObjects/test/BuildFile.xml
@@ -1,6 +1,5 @@
 <environment>
   <use name="clhep"/>
-  <use name="DataFormats/EcalDetId"/>
   <use name="CondFormats/DataRecord"/>
   <use name="CondFormats/EcalObjects"/>
   <use name="CondCore/DBOutputService"/>
diff --git a/CondFormats/RPCObjects/test/BuildFile.xml b/CondFormats/RPCObjects/test/BuildFile.xml
index bc9bd1b77e406..0ddff269f72b8 100644
--- a/CondFormats/RPCObjects/test/BuildFile.xml
+++ b/CondFormats/RPCObjects/test/BuildFile.xml
@@ -1,6 +1,5 @@
 <environment>
   <use name="FWCore/Framework"/>
-  <use name="DataFormats/FEDRawData"/>
   <use name="CondCore/DBOutputService"/>
   <use name="CondFormats/RPCObjects"/>
   <use name="CondFormats/DataRecord"/>
diff --git a/CondFormats/RecoMuonObjects/test/BuildFile.xml b/CondFormats/RecoMuonObjects/test/BuildFile.xml
index 634065e367f55..75fc848439b73 100644
--- a/CondFormats/RecoMuonObjects/test/BuildFile.xml
+++ b/CondFormats/RecoMuonObjects/test/BuildFile.xml
@@ -1,7 +1,6 @@
 <library file="*.cc" name="CondFormatsRecoMuonObjectsTest">
   <use name="CondFormats/RecoMuonObjects"/>
   <use name="CondCore/DBOutputService"/>
-  <use name="FWCore/MessageLogger"/>
   <use name="Geometry/DTGeometry"/>
   <use name="Geometry/CSCGeometry"/>
   <use name="Geometry/Records"/>
diff --git a/CondFormats/Serialization/test/BuildFile.xml b/CondFormats/Serialization/test/BuildFile.xml
index 0c0e3480ae617..fb133941124b2 100644
--- a/CondFormats/Serialization/test/BuildFile.xml
+++ b/CondFormats/Serialization/test/BuildFile.xml
@@ -1,3 +1,3 @@
 <bin file="testSerializationEqual.cpp">
-  <use name="CondFormats/External"/>
+  <use name="CondFormats/Serialization"/>
 </bin>
diff --git a/CondTools/BTau/plugins/BuildFile.xml b/CondTools/BTau/plugins/BuildFile.xml
index aeff1527983c8..72bdf87ec58f9 100644
--- a/CondTools/BTau/plugins/BuildFile.xml
+++ b/CondTools/BTau/plugins/BuildFile.xml
@@ -1,16 +1,8 @@
 <export>
 </export>
 <library name="CondToolsBTauplugins" file="*.cc">
-  <use name="CondFormats/PhysicsToolsObjects"/>
   <use name="CondFormats/BTauObjects"/>
-  <use name="CondFormats/DataRecord"/>
-  <use name="CondTools/BTau"/>
-  <use name="FWCore/PluginManager"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/Utilities"/>
-  <use name="FWCore/MessageLogger"/>
   <use name="CondCore/DBOutputService"/>
-  <use name="PhysicsTools/CondLiteIO"/>
-  <use name="PhysicsTools/UtilAlgos"/>
 </library>
diff --git a/CondTools/BeamSpot/BuildFile.xml b/CondTools/BeamSpot/BuildFile.xml
index dcef87e21f30c..c29c5e0b51236 100644
--- a/CondTools/BeamSpot/BuildFile.xml
+++ b/CondTools/BeamSpot/BuildFile.xml
@@ -1,5 +1,3 @@
-<use name="CondCore/CondDB"/>
-<use name="CondCore/DBOutputService"/>
 <use name="CondCore/PopCon"/>
 <use name="CondFormats/Common"/>
 <use name="CondFormats/BeamSpotObjects"/>
diff --git a/CondTools/DT/test/BuildFile.xml b/CondTools/DT/test/BuildFile.xml
index 0dbb7c2799208..2ef004b654a3c 100644
--- a/CondTools/DT/test/BuildFile.xml
+++ b/CondTools/DT/test/BuildFile.xml
@@ -8,7 +8,6 @@
 <library file="stubs/*.cc" name="CondToolsDTTest">
   <use name="CondTools/DT"/>
   <use name="Geometry/DTGeometry"/>
-  <use name="CondCore/DBOutputService"/>
   <flags EDM_PLUGIN="1"/>
 </library>
 
diff --git a/DQM/CSCMonitorModule/plugins/BuildFile.xml b/DQM/CSCMonitorModule/plugins/BuildFile.xml
index 24663854a38d2..606ca86b2a691 100644
--- a/DQM/CSCMonitorModule/plugins/BuildFile.xml
+++ b/DQM/CSCMonitorModule/plugins/BuildFile.xml
@@ -7,7 +7,6 @@
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="Utilities/Xerces"/>
   <use name="xerces-c"/>
   <use name="boost"/>
diff --git a/DQM/CTPPS/plugins/BuildFile.xml b/DQM/CTPPS/plugins/BuildFile.xml
index c635b70c74a78..f82346cffcbd3 100644
--- a/DQM/CTPPS/plugins/BuildFile.xml
+++ b/DQM/CTPPS/plugins/BuildFile.xml
@@ -13,5 +13,4 @@
   <use name="Geometry/Records"/>
   <use name="Geometry/VeryForwardGeometryBuilder"/>
   <use name="Geometry/VeryForwardRPTopology"/>
-  <use name="DQM/CTPPS"/>
 </library>
diff --git a/DQM/DataScouting/BuildFile.xml b/DQM/DataScouting/BuildFile.xml
index 68823581e6135..e9bbac313c107 100644
--- a/DQM/DataScouting/BuildFile.xml
+++ b/DQM/DataScouting/BuildFile.xml
@@ -3,7 +3,6 @@
 <use name="FWCore/Framework"/>
 <use name="FWCore/ParameterSet"/>
 <use name="DataFormats/Math"/>
-<use name="DataFormats/Candidate"/>
 <use name="DQMServices/Core"/>
 <export>
   <use name="FWCore/Framework"/>
diff --git a/DQM/GEM/plugins/BuildFile.xml b/DQM/GEM/plugins/BuildFile.xml
index 5d6116158c89a..93b7aed74e564 100644
--- a/DQM/GEM/plugins/BuildFile.xml
+++ b/DQM/GEM/plugins/BuildFile.xml
@@ -4,12 +4,8 @@
   <use name="FWCore/ParameterSet"/>
   <use name="FWCore/Utilities"/>
   <use name="DQMServices/Core"/>
-  <use name="DataFormats/Common"/>
-  <use name="DataFormats/MuonDetId"/>
   <use name="DataFormats/GEMDigi"/>
   <use name="DataFormats/GEMRecHit"/>
   <use name="Geometry/Records"/>
-  <use name="Geometry/CommonDetUnit"/>
   <use name="Geometry/GEMGeometry"/>
-  <use name="DQM/GEM"/>
 </library>
diff --git a/DQM/HLTEvF/plugins/BuildFile.xml b/DQM/HLTEvF/plugins/BuildFile.xml
index aaff90f5de420..eccf32c4c23dd 100644
--- a/DQM/HLTEvF/plugins/BuildFile.xml
+++ b/DQM/HLTEvF/plugins/BuildFile.xml
@@ -1,36 +1,21 @@
 <library file="*.cc" name="DQMHLTEvFPlugins">
   <use name="HLTrigger/HLTcore"/>
   <use name="HLTrigger/JetMET"/>
-  <use name="CondFormats/HLTObjects"/>
   <use name="CondFormats/L1TObjects"/>
   <use name="DQMServices/Core"/>
-  <use name="DQMServices/Components"/>
   <use name="DataFormats/BeamSpot"/>
   <use name="DataFormats/BTauReco"/>
   <use name="DataFormats/Common"/>
   <use name="DataFormats/Math"/>
-  <use name="DataFormats/EgammaCandidates"/>
-  <use name="DataFormats/EgammaReco"/>
   <use name="DataFormats/HLTReco"/>
   <use name="DataFormats/JetReco"/>
-  <use name="DataFormats/L1GlobalMuonTrigger"/>
-  <use name="DataFormats/L1Trigger"/>
   <use name="DataFormats/L1TGlobal"/>
-  <use name="DataFormats/MuonReco"/>
-  <use name="DataFormats/MuonSeed"/>
   <use name="DataFormats/RecoCandidate"/>
-  <use name="DataFormats/TrackReco"/>
-  <use name="DataFormats/TrajectorySeed"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
-  <use name="FWCore/PluginManager"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="Geometry/Records"/>
-  <use name="Geometry/CommonDetUnit"/>
-  <use name="MagneticField/Records"/>
-  <use name="MagneticField/Engine"/>
-  <use name="TrackingTools/TrajectoryState"/>
   <use name="DQMOffline/Trigger"/>
   <use name="rootcore"/>
   <flags EDM_PLUGIN="1"/>
diff --git a/DQM/MuonMonitor/plugins/BuildFile.xml b/DQM/MuonMonitor/plugins/BuildFile.xml
index d1c5796250507..73ab5d0ce1388 100644
--- a/DQM/MuonMonitor/plugins/BuildFile.xml
+++ b/DQM/MuonMonitor/plugins/BuildFile.xml
@@ -9,7 +9,6 @@
   <use name="FWCore/PluginManager"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="FWCore/Utilities"/>
-  <use name="RecoMuon/TrackingTools"/>
   <use name="roofitcore"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DQM/SiStripCommissioningSources/plugins/BuildFile.xml b/DQM/SiStripCommissioningSources/plugins/BuildFile.xml
index 257807458372d..85922b1686717 100644
--- a/DQM/SiStripCommissioningSources/plugins/BuildFile.xml
+++ b/DQM/SiStripCommissioningSources/plugins/BuildFile.xml
@@ -1,5 +1,6 @@
+<use name="DQM/SiStripCommissioningSources"/>
+
 <library file="*.cc" name="DQMSiStripCommissioningSourcesPlugins">
-  <use name="DQM/SiStripCommissioningSources"/>
   <use name="DataFormats/SiStripCommon"/>
   <flags EDM_PLUGIN="1"/>
 </library>
@@ -12,13 +13,9 @@
   <use name="boost"/>
   <use name="CondFormats/SiStripObjects"/>
   <use name="DataFormats/Common"/>
-  <use name="DataFormats/FEDRawData"/>
-  <use name="TrackingTools/TrackFitters"/>
   <use name="TrackingTools/TransientTrack"/>
   <use name="Geometry/TrackerGeometryBuilder"/>
   <use name="DataFormats/SiStripCluster"/>
-  <use name="TrackingTools/MaterialEffects"/>
-  <use name="TrackingTools/KalmanUpdators"/>
   <use name="DQMServices/Core"/>
   <flags EDM_PLUGIN="1"/>
 </library>
diff --git a/DQMOffline/PFTau/plugins/BuildFile.xml b/DQMOffline/PFTau/plugins/BuildFile.xml
index 97f17cd93917d..4c5d893646a8e 100644
--- a/DQMOffline/PFTau/plugins/BuildFile.xml
+++ b/DQMOffline/PFTau/plugins/BuildFile.xml
@@ -1,5 +1,4 @@
 <library name="DQMOfflinePFTau_plugins" file="*.cc">
-  <use name="FWCore/FWLite"/>
   <use name="FWCore/Framework"/>
   <use name="FWCore/MessageLogger"/>
   <use name="FWCore/ParameterSet"/>
diff --git a/DQMServices/Examples/plugins/BuildFile.xml b/DQMServices/Examples/plugins/BuildFile.xml
index 71ffb9c670962..ad5881fdf578c 100644
--- a/DQMServices/Examples/plugins/BuildFile.xml
+++ b/DQMServices/Examples/plugins/BuildFile.xml
@@ -1,7 +1,5 @@
 <library file="*.cc" name="DQMServicesExamplesPlugins">
   <flags EDM_PLUGIN="1"/>
   <use name="DQMServices/Examples"/>
-  <use name="FWCore/MessageLogger"/>
   <use name="FWCore/Framework"/>
-  <use name="DQMServices/Core"/>
 </library>
diff --git a/RecoTauTag/RecoTau/test/BuildFile.xml b/RecoTauTag/RecoTau/test/BuildFile.xml
index 36029a0abb913..c1d7b812cc02a 100644
--- a/RecoTauTag/RecoTau/test/BuildFile.xml
+++ b/RecoTauTag/RecoTau/test/BuildFile.xml
@@ -17,14 +17,12 @@
 </library>
 
 <library name="rerunMVAIsolationOnMiniAOD_Phase2" file="rerunMVAIsolationOnMiniAOD_Phase2.cc">
+  <use name="CommonTools/UtilAlgos"/>
   <use name="FWCore/Framework"/>
-  <use name="FWCore/PluginManager"/>
   <use name="FWCore/ParameterSet"/>
   <use name="DataFormats/PatCandidates"/>
   <use name="DataFormats/TauReco"/>
   <use name="RecoTauTag/RecoTau"/>
-  <use name="PhysicsTools/PatAlgos"/>
-  <use name="PhysicsTools/UtilAlgos"/>
   <use name="FWCore/ServiceRegistry"/>
   <use name="clhep"/>
   <use name="root"/>