diff --git a/EventFilter/EcalRawToDigi/interface/EcalElectronicsMapper.h b/EventFilter/EcalRawToDigi/interface/EcalElectronicsMapper.h
index 6086063d57268..e187ef1695b18 100644
--- a/EventFilter/EcalRawToDigi/interface/EcalElectronicsMapper.h
+++ b/EventFilter/EcalRawToDigi/interface/EcalElectronicsMapper.h
@@ -14,6 +14,7 @@
 */
 
 #include <iostream>
+#include <sstream>
 #include <fstream>
 #include <string>
 #include <map>
@@ -26,9 +27,6 @@
 #include <DataFormats/EcalDigi/interface/EcalTriggerPrimitiveDigi.h>
 #include <DataFormats/EcalDigi/interface/EcalPseudoStripInputDigi.h>
 #include <DataFormats/EcalDigi/interface/EcalSrFlag.h>
-#include <iostream>
-#include <sstream>
-
 #include <DataFormats/EcalDetId/interface/EcalTriggerElectronicsId.h>
 
 class EcalElectronicsMapping;
diff --git a/EventFilter/EcalRawToDigi/plugins/EcalCPUDigisProducer.cc b/EventFilter/EcalRawToDigi/plugins/EcalCPUDigisProducer.cc
index d9a8b35ebb89e..b2bd81515a3af 100644
--- a/EventFilter/EcalRawToDigi/plugins/EcalCPUDigisProducer.cc
+++ b/EventFilter/EcalRawToDigi/plugins/EcalCPUDigisProducer.cc
@@ -7,7 +7,6 @@
 #include "DataFormats/EcalDetId/interface/EcalDetIdCollections.h"
 #include "DataFormats/EcalDigi/interface/EcalDataFrame.h"
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
-#include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 #include "FWCore/Framework/interface/Event.h"
 #include "FWCore/Framework/interface/EventSetup.h"
diff --git a/EventFilter/EcalRawToDigi/plugins/EcalRawToDigi.cc b/EventFilter/EcalRawToDigi/plugins/EcalRawToDigi.cc
index 7fa75f32f1127..7ec7c42219e50 100644
--- a/EventFilter/EcalRawToDigi/plugins/EcalRawToDigi.cc
+++ b/EventFilter/EcalRawToDigi/plugins/EcalRawToDigi.cc
@@ -110,9 +110,6 @@ class EcalRawToDigi : public edm::stream::EDProducer<> {
 #include "FWCore/Framework/interface/EventSetup.h"
 #include "FWCore/Framework/interface/ESHandle.h"
 
-#include "FWCore/ParameterSet/interface/ConfigurationDescriptions.h"
-#include "FWCore/ParameterSet/interface/ParameterSetDescription.h"
-
 EcalRawToDigi::EcalRawToDigi(edm::ParameterSet const& conf)
     :
 
diff --git a/EventFilter/EcalRawToDigi/plugins/MatacqProducer.cc b/EventFilter/EcalRawToDigi/plugins/MatacqProducer.cc
index d8437f56633fd..b3a523297c7ec 100644
--- a/EventFilter/EcalRawToDigi/plugins/MatacqProducer.cc
+++ b/EventFilter/EcalRawToDigi/plugins/MatacqProducer.cc
@@ -17,7 +17,6 @@
 #include "EventFilter/EcalRawToDigi/interface/MatacqRawEvent.h"
 #include "EventFilter/EcalRawToDigi/src/MatacqDataFormatter.h"
 #include "FWCore/MessageLogger/interface/MessageLogger.h"
-#include "FWCore/Utilities/interface/InputTag.h"
 #include "DataFormats/FEDRawData/interface/FEDRawDataCollection.h"
 
 #include <string>
@@ -315,10 +314,8 @@ class MatacqProducer : public edm::EDProducer {
 
 #include <csignal>
 #include <cstdio>
-#include <fstream>
 #include <iomanip>
 #include <iostream>
-#include <memory>
 
 #include <glob.h>
 #include <sys/stat.h>
@@ -330,7 +327,6 @@ class MatacqProducer : public edm::EDProducer {
 
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/EcalDigi/interface/EcalMatacqDigi.h"
-#include "DataFormats/EcalDigi/interface/EcalMatacqDigi.h"
 #include "DataFormats/FEDRawData/interface/FEDNumbering.h"
 #include "DataFormats/FEDRawData/interface/FEDRawData.h"
 #include "EventFilter/EcalRawToDigi/src/Majority.h"
diff --git a/EventFilter/EcalRawToDigi/src/MatacqDataFormatter.cc b/EventFilter/EcalRawToDigi/src/MatacqDataFormatter.cc
index d0f038d7ef0e0..1c27e3728da07 100644
--- a/EventFilter/EcalRawToDigi/src/MatacqDataFormatter.cc
+++ b/EventFilter/EcalRawToDigi/src/MatacqDataFormatter.cc
@@ -9,7 +9,6 @@
 #include <algorithm>
 #include <iomanip>
 #include <iostream>
-#include <algorithm>
 #include <vector>
 
 using namespace std;