diff --git a/CommonTools/CandAlgos/plugins/CandViewRefMerger.cc b/CommonTools/CandAlgos/plugins/CandViewRefMerger.cc
index f870bea6432ac..d3801252e9f61 100644
--- a/CommonTools/CandAlgos/plugins/CandViewRefMerger.cc
+++ b/CommonTools/CandAlgos/plugins/CandViewRefMerger.cc
@@ -8,13 +8,13 @@
 
 #include "FWCore/Framework/interface/MakerMacros.h"
 #include "DataFormats/Candidate/interface/Candidate.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Utilities/interface/transform.h"
 #include "DataFormats/Common/interface/Handle.h"
 
-class CandViewRefMerger : public edm::EDProducer {
+class CandViewRefMerger : public edm::global::EDProducer<> {
 public:
   explicit CandViewRefMerger(const edm::ParameterSet& cfg)
       : srcTokens_(
@@ -24,7 +24,7 @@ class CandViewRefMerger : public edm::EDProducer {
   }
 
 private:
-  void produce(edm::Event& evt, const edm::EventSetup&) override {
+  void produce(edm::StreamID, edm::Event& evt, const edm::EventSetup&) const override {
     std::unique_ptr<std::vector<reco::CandidateBaseRef> > out(new std::vector<reco::CandidateBaseRef>);
     for (std::vector<edm::EDGetTokenT<reco::CandidateView> >::const_iterator i = srcTokens_.begin();
          i != srcTokens_.end();
diff --git a/CommonTools/UtilAlgos/interface/AssociationMapOneToOne2Association.h b/CommonTools/UtilAlgos/interface/AssociationMapOneToOne2Association.h
index a55407ca3f0f2..4e1d60c932316 100644
--- a/CommonTools/UtilAlgos/interface/AssociationMapOneToOne2Association.h
+++ b/CommonTools/UtilAlgos/interface/AssociationMapOneToOne2Association.h
@@ -10,18 +10,18 @@
 #include "DataFormats/Common/interface/AssociationMap.h"
 #include "DataFormats/Common/interface/OneToOne.h"
 #include "DataFormats/Common/interface/Association.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 template <typename CKey, typename CVal>
-class AssociationMapOneToOne2Association : public edm::EDProducer {
+class AssociationMapOneToOne2Association : public edm::global::EDProducer<> {
 public:
   AssociationMapOneToOne2Association(const edm::ParameterSet&);
 
 private:
   typedef edm::AssociationMap<edm::OneToOne<CKey, CVal> > am_t;
   typedef edm::Association<CVal> as_t;
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
   edm::EDGetTokenT<am_t> am_;
 };
 
@@ -38,7 +38,9 @@ AssociationMapOneToOne2Association<CKey, CVal>::AssociationMapOneToOne2Associati
 }
 
 template <typename CKey, typename CVal>
-void AssociationMapOneToOne2Association<CKey, CVal>::produce(edm::Event& evt, const edm::EventSetup&) {
+void AssociationMapOneToOne2Association<CKey, CVal>::produce(edm::StreamID,
+                                                             edm::Event& evt,
+                                                             const edm::EventSetup&) const {
   using namespace edm;
   using namespace std;
   Handle<am_t> am;
diff --git a/CommonTools/UtilAlgos/interface/AssociationVector2ValueMap.h b/CommonTools/UtilAlgos/interface/AssociationVector2ValueMap.h
index 7463edd818aad..7604659d31b4f 100644
--- a/CommonTools/UtilAlgos/interface/AssociationVector2ValueMap.h
+++ b/CommonTools/UtilAlgos/interface/AssociationVector2ValueMap.h
@@ -9,11 +9,11 @@
 
 #include "DataFormats/Common/interface/AssociationVector.h"
 #include "DataFormats/Common/interface/ValueMap.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/global/EDProducer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 
 template <typename KeyRefProd, typename CVal>
-class AssociationVector2ValueMap : public edm::EDProducer {
+class AssociationVector2ValueMap : public edm::global::EDProducer<> {
 public:
   AssociationVector2ValueMap(const edm::ParameterSet&);
 
@@ -22,7 +22,7 @@ class AssociationVector2ValueMap : public edm::EDProducer {
   typedef typename CVal::value_type value_t;
   typedef edm::ValueMap<value_t> vm_t;
   typedef typename av_t::CKey collection_t;
-  void produce(edm::Event&, const edm::EventSetup&) override;
+  void produce(edm::StreamID, edm::Event&, const edm::EventSetup&) const override;
   edm::EDGetTokenT<av_t> av_;
 };
 
@@ -39,7 +39,9 @@ AssociationVector2ValueMap<KeyRefProd, CVal>::AssociationVector2ValueMap(const e
 }
 
 template <typename KeyRefProd, typename CVal>
-void AssociationVector2ValueMap<KeyRefProd, CVal>::produce(edm::Event& evt, const edm::EventSetup&) {
+void AssociationVector2ValueMap<KeyRefProd, CVal>::produce(edm::StreamID,
+                                                           edm::Event& evt,
+                                                           const edm::EventSetup&) const {
   using namespace edm;
   using namespace std;
   Handle<av_t> av;
diff --git a/CommonTools/UtilAlgos/interface/AssociationVectorSelector.h b/CommonTools/UtilAlgos/interface/AssociationVectorSelector.h
index 232524e1ed8d7..5794445f5a44b 100644
--- a/CommonTools/UtilAlgos/interface/AssociationVectorSelector.h
+++ b/CommonTools/UtilAlgos/interface/AssociationVectorSelector.h
@@ -8,12 +8,12 @@
  */
 
 #include "DataFormats/Common/interface/AssociationVector.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Utilities/interface/InputTag.h"
 #include "CommonTools/UtilAlgos/interface/AnySelector.h"
 
 template <typename KeyRefProd, typename CVal, typename KeySelector = AnySelector, typename ValSelector = AnySelector>
-class AssociationVectorSelector : public edm::EDProducer {
+class AssociationVectorSelector : public edm::stream::EDProducer<> {
 public:
   AssociationVectorSelector(const edm::ParameterSet&);
 
diff --git a/CommonTools/UtilAlgos/interface/HistoAnalyzer.h b/CommonTools/UtilAlgos/interface/HistoAnalyzer.h
index 6d816425edbfe..4eccc02321544 100644
--- a/CommonTools/UtilAlgos/interface/HistoAnalyzer.h
+++ b/CommonTools/UtilAlgos/interface/HistoAnalyzer.h
@@ -10,7 +10,7 @@
  * - C : Concrete candidate collection type
  *
  */
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "FWCore/Utilities/interface/InputTag.h"
@@ -19,7 +19,7 @@
 #include "CommonTools/UtilAlgos/interface/ExpressionHisto.h"
 
 template <typename C>
-class HistoAnalyzer : public edm::EDAnalyzer {
+class HistoAnalyzer : public edm::one::EDAnalyzer<edm::one::SharedResources> {
 public:
   /// constructor from parameter set
   HistoAnalyzer(const edm::ParameterSet&);
@@ -47,6 +47,7 @@ HistoAnalyzer<C>::HistoAnalyzer(const edm::ParameterSet& par)
       usingWeights_(par.exists("weights")),
       weightsToken_(
           mayConsume<double>(par.template getUntrackedParameter<edm::InputTag>("weights", edm::InputTag("fake")))) {
+  usesResource(TFileService::kSharedResource);
   edm::Service<TFileService> fs;
   std::vector<edm::ParameterSet> histograms = par.template getParameter<std::vector<edm::ParameterSet> >("histograms");
   std::vector<edm::ParameterSet>::const_iterator it = histograms.begin();
diff --git a/CommonTools/UtilAlgos/interface/NtpProducer.h b/CommonTools/UtilAlgos/interface/NtpProducer.h
index 476766a64a698..78e7f7980676c 100644
--- a/CommonTools/UtilAlgos/interface/NtpProducer.h
+++ b/CommonTools/UtilAlgos/interface/NtpProducer.h
@@ -10,7 +10,7 @@
  * - C : Concrete candidate collection type
  *
  */
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
 #include "DataFormats/Provenance/interface/RunLumiEventNumber.h"
@@ -18,7 +18,7 @@
 #include "CommonTools/Utils/interface/StringObjectFunction.h"
 
 template <typename C>
-class NtpProducer : public edm::EDProducer {
+class NtpProducer : public edm::stream::EDProducer<> {
 public:
   /// constructor from parameter set
   NtpProducer(const edm::ParameterSet&);