diff --git a/HLTrigger/special/interface/HLTRegionalEcalResonanceFilter.h b/HLTrigger/special/interface/HLTRegionalEcalResonanceFilter.h
index 8548d706fa9e0..48d09c8e4a58f 100644
--- a/HLTrigger/special/interface/HLTRegionalEcalResonanceFilter.h
+++ b/HLTrigger/special/interface/HLTRegionalEcalResonanceFilter.h
@@ -15,7 +15,7 @@ Description: Producer for EcalRecHits to be used for pi0/eta ECAL calibration.
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDFilter.h"
+#include "FWCore/Framework/interface/stream/EDFilter.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
@@ -71,7 +71,8 @@ namespace edm {
   class ConfigurationDescriptions;
 }
 
-class HLTRegionalEcalResonanceFilter : public edm::EDFilter {
+class HLTRegionalEcalResonanceFilter : public edm::stream::EDFilter<> 
+{
    public:
       explicit HLTRegionalEcalResonanceFilter(const edm::ParameterSet&);
       ~HLTRegionalEcalResonanceFilter();
diff --git a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTNxNClusterProducer.h b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTNxNClusterProducer.h
index 0153603f427f9..e181d9586c564 100644
--- a/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTNxNClusterProducer.h
+++ b/RecoEgamma/EgammaHLTProducers/interface/EgammaHLTNxNClusterProducer.h
@@ -10,7 +10,7 @@ Description: simple NxN ( 3x3 etc) clustering ,( for low energy photon reconstru
 */
 
 #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/EventSetup.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
@@ -44,7 +44,7 @@ class ecalRecHitSort : public std::binary_function<EcalRecHit, EcalRecHit, bool>
 };
 
 
-class EgammaHLTNxNClusterProducer : public edm::EDProducer {
+class EgammaHLTNxNClusterProducer : public edm::stream::EDProducer<> {
  public:
 
   EgammaHLTNxNClusterProducer(const edm::ParameterSet& ps);