diff --git a/L1Trigger/DemonstratorTools/interface/codecs/etsums.h b/L1Trigger/DemonstratorTools/interface/codecs/etsums.h
index 543c18f18f842..d39d4944ea1ea 100644
--- a/L1Trigger/DemonstratorTools/interface/codecs/etsums.h
+++ b/L1Trigger/DemonstratorTools/interface/codecs/etsums.h
@@ -9,8 +9,6 @@
 
 #include "DataFormats/Common/interface/View.h"
 #include "DataFormats/L1Trigger/interface/EtSum.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-#include "L1Trigger/DemonstratorTools/interface/BoardData.h"
 #include "L1Trigger/L1TTrackMatch/interface/L1TkEtMissEmuAlgo.h"
 
 namespace l1t::demo::codecs {
diff --git a/L1Trigger/DemonstratorTools/interface/codecs/htsums.h b/L1Trigger/DemonstratorTools/interface/codecs/htsums.h
index bd238af66c4b1..88320ec40ad10 100644
--- a/L1Trigger/DemonstratorTools/interface/codecs/htsums.h
+++ b/L1Trigger/DemonstratorTools/interface/codecs/htsums.h
@@ -9,8 +9,6 @@
 
 #include "DataFormats/Common/interface/View.h"
 #include "DataFormats/L1Trigger/interface/EtSum.h"
-#include "DataFormats/Math/interface/LorentzVector.h"
-#include "L1Trigger/DemonstratorTools/interface/BoardData.h"
 #include "L1Trigger/L1TTrackMatch/interface/L1TkHTMissEmulatorProducer.h"
 
 namespace l1t::demo::codecs {
diff --git a/L1Trigger/DemonstratorTools/interface/codecs/tkjets.h b/L1Trigger/DemonstratorTools/interface/codecs/tkjets.h
index c188aded6873d..6fde3fd5f279e 100644
--- a/L1Trigger/DemonstratorTools/interface/codecs/tkjets.h
+++ b/L1Trigger/DemonstratorTools/interface/codecs/tkjets.h
@@ -11,7 +11,6 @@
 #include "DataFormats/L1TCorrelator/interface/TkJet.h"
 #include "DataFormats/L1TCorrelator/interface/TkJetFwd.h"
 #include "DataFormats/L1Trigger/interface/TkJetWord.h"
-#include "L1Trigger/DemonstratorTools/interface/BoardData.h"
 
 namespace l1t::demo::codecs {
 
diff --git a/L1Trigger/DemonstratorTools/interface/codecs/tracks.h b/L1Trigger/DemonstratorTools/interface/codecs/tracks.h
index 0862a18900a45..2b71e5d4cce03 100644
--- a/L1Trigger/DemonstratorTools/interface/codecs/tracks.h
+++ b/L1Trigger/DemonstratorTools/interface/codecs/tracks.h
@@ -14,8 +14,6 @@
 #include "DataFormats/L1TrackTrigger/interface/TTTrack.h"
 #include "DataFormats/L1TrackTrigger/interface/TTTypes.h"
 
-#include "L1Trigger/DemonstratorTools/interface/BoardData.h"
-
 namespace l1t::demo::codecs {
 
   // Return true if a track is contained within a collection
diff --git a/L1Trigger/DemonstratorTools/interface/codecs/vertices.h b/L1Trigger/DemonstratorTools/interface/codecs/vertices.h
index 4f17131c1cbad..e26ef591e1021 100644
--- a/L1Trigger/DemonstratorTools/interface/codecs/vertices.h
+++ b/L1Trigger/DemonstratorTools/interface/codecs/vertices.h
@@ -10,7 +10,6 @@
 #include "DataFormats/Common/interface/View.h"
 #include "DataFormats/L1Trigger/interface/Vertex.h"
 #include "DataFormats/L1Trigger/interface/VertexWord.h"
-#include "L1Trigger/DemonstratorTools/interface/BoardData.h"
 
 namespace l1t::demo::codecs {
 
diff --git a/L1Trigger/DemonstratorTools/plugins/GTTFileWriter.cc b/L1Trigger/DemonstratorTools/plugins/GTTFileWriter.cc
index fb31aba43088c..b28157833db59 100644
--- a/L1Trigger/DemonstratorTools/plugins/GTTFileWriter.cc
+++ b/L1Trigger/DemonstratorTools/plugins/GTTFileWriter.cc
@@ -126,15 +126,15 @@ class GTTFileWriter : public edm::one::EDAnalyzer<edm::one::SharedResources> {
   void endJob() override;
 
   // ----------member data ---------------------------
-  edm::EDGetTokenT<edm::View<Track_t>> tracksToken_;
-  edm::EDGetTokenT<edm::View<Track_t>> convertedTracksToken_;
-  edm::EDGetTokenT<TrackCollection_t> convertedTrackCollectionToken_;
-  edm::EDGetTokenT<TrackRefCollection_t> selectedTracksToken_;
-  edm::EDGetTokenT<TrackRefCollection_t> vertexAssociatedTracksToken_;
-  edm::EDGetTokenT<edm::View<l1t::VertexWord>> verticesToken_;
-  edm::EDGetTokenT<edm::View<l1t::TkJetWord>> jetsToken_;
-  edm::EDGetTokenT<edm::View<l1t::EtSum>> htMissToken_;
-  edm::EDGetTokenT<edm::View<l1t::EtSum>> etMissToken_;
+  const edm::EDGetTokenT<edm::View<Track_t>> tracksToken_;
+  const edm::EDGetTokenT<edm::View<Track_t>> convertedTracksToken_;
+  const edm::EDGetTokenT<TrackCollection_t> convertedTrackCollectionToken_;
+  const edm::EDGetTokenT<TrackRefCollection_t> selectedTracksToken_;
+  const edm::EDGetTokenT<TrackRefCollection_t> vertexAssociatedTracksToken_;
+  const edm::EDGetTokenT<edm::View<l1t::VertexWord>> verticesToken_;
+  const edm::EDGetTokenT<edm::View<l1t::TkJetWord>> jetsToken_;
+  const edm::EDGetTokenT<edm::View<l1t::EtSum>> htMissToken_;
+  const edm::EDGetTokenT<edm::View<l1t::EtSum>> etMissToken_;
 
   l1t::demo::BoardDataWriter fileWriterInputTracks_;
   l1t::demo::BoardDataWriter fileWriterConvertedTracks_;