diff --git a/SimCalorimetry/EcalEBTrigPrimProducers/plugins/EcalEBTrigPrimAnalyzer.cc b/SimCalorimetry/EcalEBTrigPrimProducers/plugins/EcalEBTrigPrimAnalyzer.cc
index eba80b38155cf..cfb331e055174 100644
--- a/SimCalorimetry/EcalEBTrigPrimProducers/plugins/EcalEBTrigPrimAnalyzer.cc
+++ b/SimCalorimetry/EcalEBTrigPrimProducers/plugins/EcalEBTrigPrimAnalyzer.cc
@@ -3,7 +3,6 @@
 #include <utility>
 
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
diff --git a/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.h b/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.h
index 1296b2f6a6a5f..a5100b946f42d 100644
--- a/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.h
+++ b/SimCalorimetry/EcalSimProducers/test/ESDigisReferenceDistrib.h
@@ -1,7 +1,7 @@
 #ifndef ESDigisReferenceDistrib_H
 #define ESDigisReferenceDistrib_H
 
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
@@ -22,7 +22,7 @@
 #include "TH1F.h"
 #include "TH3F.h"
 
-class ESDigisReferenceDistrib : public edm::EDAnalyzer {
+class ESDigisReferenceDistrib : public edm::one::EDAnalyzer<> {
 public:
   /// Constructor
   ESDigisReferenceDistrib(const edm::ParameterSet &ps);
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.cc b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.cc
index 24857334143b9..b0adb2c6def8e 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.cc
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.cc
@@ -19,7 +19,6 @@
 #include <utility>
 
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h
index ecbdd22bad579..ddc52f89ae96f 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTPInputAnalyzer.h
@@ -16,7 +16,7 @@
 //
 
 // system include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
@@ -32,7 +32,7 @@
 // class declaration
 //
 
-class EcalTPInputAnalyzer : public edm::EDAnalyzer {
+class EcalTPInputAnalyzer : public edm::one::EDAnalyzer<> {
 public:
   explicit EcalTPInputAnalyzer(const edm::ParameterSet &);
   ~EcalTPInputAnalyzer() override;
diff --git a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc
index bb4bd340ebbb2..e115f0ff9f4f8 100644
--- a/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc
+++ b/SimCalorimetry/EcalTrigPrimProducers/plugins/EcalTrigPrimAnalyzer.cc
@@ -19,7 +19,6 @@
 #include <utility>
 
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
 
diff --git a/SimGeneral/MixingModule/plugins/InputAnalyzer.cc b/SimGeneral/MixingModule/plugins/InputAnalyzer.cc
index 156cb029c4216..cfdaf22fa2307 100644
--- a/SimGeneral/MixingModule/plugins/InputAnalyzer.cc
+++ b/SimGeneral/MixingModule/plugins/InputAnalyzer.cc
@@ -21,7 +21,6 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/SimGeneral/MixingModule/plugins/SecSourceAnalyzer.cc b/SimGeneral/MixingModule/plugins/SecSourceAnalyzer.cc
index 87643806f4f7c..0a6a8485eb34d 100644
--- a/SimGeneral/MixingModule/plugins/SecSourceAnalyzer.cc
+++ b/SimGeneral/MixingModule/plugins/SecSourceAnalyzer.cc
@@ -22,7 +22,6 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/SimGeneral/MixingModule/plugins/TestMix.cc b/SimGeneral/MixingModule/plugins/TestMix.cc
index 51adf2acdd595..fe536673e5b23 100644
--- a/SimGeneral/MixingModule/plugins/TestMix.cc
+++ b/SimGeneral/MixingModule/plugins/TestMix.cc
@@ -20,7 +20,6 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/SimGeneral/MixingModule/plugins/TestMixedSource.cc b/SimGeneral/MixingModule/plugins/TestMixedSource.cc
index df9d5552c1a09..239d561d4631e 100644
--- a/SimGeneral/MixingModule/plugins/TestMixedSource.cc
+++ b/SimGeneral/MixingModule/plugins/TestMixedSource.cc
@@ -21,7 +21,6 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
diff --git a/SimGeneral/NoiseGenerators/test/GaussianTailNoiseGeneratorTest.cc b/SimGeneral/NoiseGenerators/test/GaussianTailNoiseGeneratorTest.cc
index ac9e783a71096..55d326efea8d4 100644
--- a/SimGeneral/NoiseGenerators/test/GaussianTailNoiseGeneratorTest.cc
+++ b/SimGeneral/NoiseGenerators/test/GaussianTailNoiseGeneratorTest.cc
@@ -1,7 +1,7 @@
 // system include files
 #include <memory>
 // user include files
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 #include "FWCore/Framework/interface/Frameworkfwd.h"
 
 #include "FWCore/Framework/interface/Event.h"
@@ -19,7 +19,7 @@
 #include <TH1F.h>
 #include <TROOT.h>
 
-class GaussianTailNoiseGeneratorTest : public edm::EDAnalyzer {
+class GaussianTailNoiseGeneratorTest : public edm::one::EDAnalyzer<> {
 public:
   explicit GaussianTailNoiseGeneratorTest(const edm::ParameterSet &);
   ~GaussianTailNoiseGeneratorTest() override;
diff --git a/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.cc b/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.cc
index 16feb128a9c52..de46de98feb99 100644
--- a/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.cc
+++ b/SimGeneral/PileupInformation/plugins/PileupVertexAccumulator.cc
@@ -36,7 +36,6 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"