diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h b/CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h
index cf48a1dd9adb2..fe0f900cb1ee0 100644
--- a/CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h
+++ b/CalibCalorimetry/HcalAlgos/interface/HcalLedAnalysis.h
@@ -2,11 +2,7 @@
 #define HcalLedAnalysis_H
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 
diff --git a/CalibCalorimetry/HcalAlgos/interface/HcalPedestalAnalysis.h b/CalibCalorimetry/HcalAlgos/interface/HcalPedestalAnalysis.h
index 12fb1b29495c3..6556b2ef0454a 100644
--- a/CalibCalorimetry/HcalAlgos/interface/HcalPedestalAnalysis.h
+++ b/CalibCalorimetry/HcalAlgos/interface/HcalPedestalAnalysis.h
@@ -2,11 +2,7 @@
 #define HcalPedestalAnalysis_H
 
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
-#include "FWCore/Framework/interface/Event.h"
-#include "FWCore/Framework/interface/MakerMacros.h"
 #include "FWCore/ParameterSet/interface/ParameterSet.h"
-#include "FWCore/ServiceRegistry/interface/Service.h"
 #include "DataFormats/HcalDetId/interface/HcalDetId.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 
diff --git a/CalibCalorimetry/HcalAlgos/test/MapTester.cc b/CalibCalorimetry/HcalAlgos/test/MapTester.cc
index 3ae98d8ead613..16da3a4ee1051 100644
--- a/CalibCalorimetry/HcalAlgos/test/MapTester.cc
+++ b/CalibCalorimetry/HcalAlgos/test/MapTester.cc
@@ -25,7 +25,7 @@
 
 // user include files
 #include "FWCore/Framework/interface/Frameworkfwd.h"
-#include "FWCore/Framework/interface/EDAnalyzer.h"
+#include "FWCore/Framework/interface/one/EDAnalyzer.h"
 
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/MakerMacros.h"
@@ -40,17 +40,17 @@
 // class decleration
 //
 
-class MapTester : public edm::EDAnalyzer {
+class MapTester : public edm::one::EDAnalyzer<> {
 public:
   explicit MapTester(const edm::ParameterSet&);
-  ~MapTester();
+  ~MapTester() override = default;
 
 private:
   unsigned int mapIOV_;  //1 for first set, 2 for second, ...
   bool generateTextfiles_;
   bool generateEmap_;
 
-  virtual void analyze(const edm::Event&, const edm::EventSetup&);
+  void analyze(const edm::Event&, const edm::EventSetup&) override;
 
   // ----------member data ---------------------------
   const edm::ESGetToken<HcalTopology, HcalRecNumberingRecord> tok_topo_;
@@ -62,8 +62,6 @@ MapTester::MapTester(const edm::ParameterSet& iConfig) : tok_topo_(esConsumes<Hc
   generateEmap_ = iConfig.getParameter<bool>("generateEmap");
 }
 
-MapTester::~MapTester() {}
-
 // ------------ method called to for each event  ------------
 void MapTester::analyze(const edm::Event& iEvent, const edm::EventSetup& iSetup) {
   char tempbuff[128];