diff --git a/EventFilter/GEMRawToDigi/interface/VFATdata.h b/EventFilter/GEMRawToDigi/interface/VFATdata.h
index 2d227bfa62d19..d74ffbc97f47d 100644
--- a/EventFilter/GEMRawToDigi/interface/VFATdata.h
+++ b/EventFilter/GEMRawToDigi/interface/VFATdata.h
@@ -1,5 +1,6 @@
 #ifndef EventFilter_GEMRawToDigi_VFATdata_h
 #define EventFilter_GEMRawToDigi_VFATdata_h
+#include "stdint.h"
 
 namespace gem {
   class VFATdata 
diff --git a/EventFilter/L1TRawToDigi/interface/PackerTokens.h b/EventFilter/L1TRawToDigi/interface/PackerTokens.h
index f2bf35cd9c460..ec028c7f83e61 100644
--- a/EventFilter/L1TRawToDigi/interface/PackerTokens.h
+++ b/EventFilter/L1TRawToDigi/interface/PackerTokens.h
@@ -1,6 +1,8 @@
 #ifndef EventFilter_L1TRawToDigi_PackerTokens_h
 #define EventFilter_L1TRawToDigi_PackerTokens_h
 
+#include "FWCore/Utilities/interface/EDGetToken.h"
+
 namespace edm {
    class ConsumesCollector;
    class ParameterSet;
diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Tokens.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Tokens.h
index b47ef2b814403..b05668d074bcd 100644
--- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Tokens.h
+++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CaloLayer1Tokens.h
@@ -4,6 +4,7 @@
 #include "DataFormats/EcalDigi/interface/EcalDigiCollections.h"
 #include "DataFormats/HcalDigi/interface/HcalDigiCollections.h"
 #include "DataFormats/L1CaloTrigger/interface/L1CaloCollections.h"
+#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "EventFilter/L1TRawToDigi/interface/PackerTokens.h"
 
 namespace l1t {
diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CommonTokens.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CommonTokens.h
index fbda048f0f264..f1f6b580f5ece 100644
--- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CommonTokens.h
+++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/CommonTokens.h
@@ -6,7 +6,7 @@
 #include "DataFormats/L1Trigger/interface/Jet.h"
 #include "DataFormats/L1Trigger/interface/Tau.h"
 #include "DataFormats/L1Trigger/interface/Muon.h"
-
+#include "FWCore/Utilities/interface/EDGetToken.h"
 #include "EventFilter/L1TRawToDigi/interface/PackerTokens.h"
 
 namespace l1t {
diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/IntermediateMuonUnpacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/IntermediateMuonUnpacker.h
index b1f95bee8e8fe..36b945a8332f6 100644
--- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/IntermediateMuonUnpacker.h
+++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/IntermediateMuonUnpacker.h
@@ -1,6 +1,8 @@
 #ifndef EventFilter_L1TRawToDigi_stage2_IntermediateMuonUnpacker_h
 #define EventFilter_L1TRawToDigi_stage2_IntermediateMuonUnpacker_h
 
+#include <map>
+#include "DataFormats/L1Trigger/interface/Muon.h"
 #include "EventFilter/L1TRawToDigi/interface/Unpacker.h"
 
 namespace l1t {
diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonPacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonPacker.h
index 47a9a981fd851..0aea9295b9304 100644
--- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonPacker.h
+++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/MuonPacker.h
@@ -1,6 +1,7 @@
 #ifndef L1T_PACKER_STAGE2_MUONPACKER_H
 #define L1T_PACKER_STAGE2_MUONPACKER_H
 
+#include <map>
 #include "EventFilter/L1TRawToDigi/interface/Packer.h"
 
 namespace l1t {
diff --git a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/RegionalMuonGMTPacker.h b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/RegionalMuonGMTPacker.h
index 682c7fa080324..f710fa4974686 100644
--- a/EventFilter/L1TRawToDigi/plugins/implementations_stage2/RegionalMuonGMTPacker.h
+++ b/EventFilter/L1TRawToDigi/plugins/implementations_stage2/RegionalMuonGMTPacker.h
@@ -1,6 +1,13 @@
 #ifndef L1T_PACKER_STAGE2_REGIONALMUONGMTPACKER_H
 #define L1T_PACKER_STAGE2_REGIONALMUONGMTPACKER_H
 
+#include <vector>
+#include <map>
+#include "FWCore/Framework/interface/Event.h"
+#include "DataFormats/L1TMuon/interface/RegionalMuonCand.h"
+#include "EventFilter/L1TRawToDigi/interface/Block.h"
+#include "EventFilter/L1TRawToDigi/interface/PackerTokens.h"
+
 namespace l1t {
    namespace stage2 {
       class RegionalMuonGMTPacker : public Packer {
diff --git a/EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDChannel.h b/EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDChannel.h
index 48ba28234b2c0..48bc95af57607 100644
--- a/EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDChannel.h
+++ b/EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDChannel.h
@@ -3,11 +3,11 @@
 
 #include "EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDDAQHeader.h"
 #include "EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDDAQTrailer.h"
-#include "EventFilter/Phase2TrackerRawToDigi/interface/Phase2TrackerFEDBuffer.h"
 #include <cstdint>
 
 namespace Phase2Tracker {
-
+  //forward declaration
+  class Phase2TrackerFEDBuffer;
   // holds information about position of a channel in the buffer
   // for use by unpacker
   class Phase2TrackerFEDChannel