diff --git a/CommonTools/RecoUtils/interface/PFCand_AssoMap.h b/CommonTools/RecoUtils/interface/PFCand_AssoMap.h
index 61558aba573de..78f5e9488d57d 100644
--- a/CommonTools/RecoUtils/interface/PFCand_AssoMap.h
+++ b/CommonTools/RecoUtils/interface/PFCand_AssoMap.h
@@ -18,7 +18,7 @@
 //
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -34,7 +34,7 @@
 // class declaration
 //
 
-class PFCand_AssoMap : public edm::EDProducer, public PFCand_AssoMapAlgos {
+class PFCand_AssoMap : public edm::stream::EDProducer<>, public PFCand_AssoMapAlgos {
    public:
       explicit PFCand_AssoMap(const edm::ParameterSet&);
       ~PFCand_AssoMap();
diff --git a/CommonTools/RecoUtils/interface/PF_PU_AssoMap.h b/CommonTools/RecoUtils/interface/PF_PU_AssoMap.h
index 4f577f86cfc17..67e9412a7abd6 100644
--- a/CommonTools/RecoUtils/interface/PF_PU_AssoMap.h
+++ b/CommonTools/RecoUtils/interface/PF_PU_AssoMap.h
@@ -23,7 +23,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDProducer.h"
+#include "FWCore/Framework/interface/stream/EDProducer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -38,7 +38,7 @@
 // class declaration
 //
 
-class PF_PU_AssoMap : public edm::EDProducer, public PF_PU_AssoMapAlgos {
+class PF_PU_AssoMap : public edm::stream::EDProducer<>, public PF_PU_AssoMapAlgos {
    public:
       explicit PF_PU_AssoMap(const edm::ParameterSet&);
       ~PF_PU_AssoMap();