From e55f8bf2d85044ffb9c555adc98f5ea44d18bedc Mon Sep 17 00:00:00 2001
From: Florian Uhlig <f.uhlig@gsi.de>
Date: Fri, 18 Nov 2022 11:59:24 +0100
Subject: [PATCH] Prepare for FairRoot v18.8

Add missing include statements and forward declarations.
In FairRoot a serious cleanup of include statements was done which needs fixes
in our code base.
---
 analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx                  | 2 ++
 .../PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx     | 5 ++++-
 analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h            | 2 ++
 analysis/PWGHAD/hadron/CbmHadronAnalysis.h               | 1 +
 .../common/analysis_tree_converter/CbmConverterManager.h | 1 +
 .../common/analysis_tree_converter/CbmMatchEvents.cxx    | 3 +++
 analysis/detectors/tof/CbmTofHitFinderTBQa.cxx           | 1 +
 core/base/CbmDigitize.h                                  | 1 +
 core/detectors/much/CbmMuchSegmentManual.h               | 9 +++++----
 core/detectors/much/CbmMuchSegmentSector.h               | 9 +++++----
 core/detectors/rich/utils/CbmRichUtil.cxx                | 2 ++
 mvd/CbmMvdHitfinder.h                                    | 2 +-
 mvd/qa/CbmMvdQa.cxx                                      | 3 ++-
 mvd/qa/CbmMvdQa.h                                        | 1 +
 mvd/tools/readout/CbmMvdReadoutCluster.cxx               | 1 +
 mvd/tools/readout/CbmMvdReadoutCluster.h                 | 3 +++
 mvd/tools/readout/CbmMvdReadoutSimple.cxx                | 9 +++++----
 mvd/tools/readout/CbmMvdReadoutSimple.h                  | 3 +++
 reco/KF/KFQA/CbmKFTrackFitQa.cxx                         | 3 ++-
 reco/L1/qa/CbmTrackingInputQaSts.cxx                     | 3 ++-
 reco/detectors/much/qa/CbmMuchHitFinderQa.h              | 1 +
 reco/detectors/psd/CbmPsdMCbmHitProducer.cxx             | 1 +
 reco/detectors/rich/CbmRichHitProducer.cxx               | 1 +
 reco/detectors/rich/CbmRichTrainAnnSelect.h              | 2 ++
 reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx      | 1 +
 reco/detectors/rich/qa/CbmL1RichRingQa.h                 | 2 ++
 reco/detectors/rich/qa/CbmRichGeoOpt.cxx                 | 3 ++-
 reco/detectors/rich/qa/CbmRichRecoQa.h                   | 1 +
 reco/detectors/sts/CbmRecoSts.cxx                        | 1 +
 reco/detectors/sts/CbmRecoStsPixel.cxx                   | 1 +
 reco/detectors/sts/qa/CbmStsFindTracksQa.h               | 3 +++
 reco/detectors/tof/CbmTofCalibrator.h                    | 1 +
 reco/detectors/tof/CbmTofCosmicClusterizer.h             | 1 +
 reco/detectors/tof/CbmTofEventClusterizer.h              | 1 +
 reco/detectors/tof/CbmTofExtendTracks.h                  | 1 +
 reco/detectors/tof/CbmTofFindTracks.h                    | 1 +
 reco/detectors/tof/CbmTofHitMaker.h                      | 1 +
 reco/detectors/tof/CbmTofSimpClusterizer.h               | 1 +
 reco/detectors/tof/CbmTofTestBeamClusterizer.h           | 1 +
 reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx       | 3 +++
 reco/detectors/trd/qa/CbmTrdQa.h                         | 1 +
 reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h          | 1 +
 reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx          | 1 +
 reco/eventbuilder/digis/CbmEvbuildRawAlgo.h              | 1 +
 reco/eventbuilder/digis/CbmEvbuildRawTask.cxx            | 2 +-
 reco/global/CbmRecoTzero.cxx                             | 3 +++
 reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h        | 2 ++
 reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h     | 1 +
 reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx                 | 2 ++
 reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx                 | 2 ++
 reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h         | 1 +
 .../littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx | 1 +
 reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h  | 2 ++
 reco/littrack/cbm/reco/CbmLitFindMvdTracks.h             | 1 +
 reco/littrack/cbm/reco/CbmLitFitTracks.h                 | 2 ++
 reco/littrack/cbm/reco/CbmLitFitTracksParallel.h         | 2 ++
 reco/qa/CbmTrackingTrdQa.h                               | 1 +
 reco/tasks/CbmTaskBuildEvents.cxx                        | 1 +
 reco/tasks/CbmTaskMakeRecoEvents.cxx                     | 1 +
 reco/tasks/CbmTaskTriggerDigi.cxx                        | 1 +
 reco/tracking/global/CbmGlobalTrackingQa.cxx             | 1 +
 reco/tracking/global/CbmGlobalTrackingTask.cxx           | 1 +
 reco/tracking/lx/CalcStats/CalcStats.cxx                 | 1 +
 reco/tracking/lx/CalcStats/CalcStats.h                   | 2 ++
 reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx | 1 +
 reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h   | 2 ++
 reco/tracking/lx/TBBinned/LxTBTask.cxx                   | 1 +
 reco/tracking/lx/TBBinned/LxTBTrdTask.cxx                | 1 +
 sim/detectors/much/qa/CbmMuchDigitizerQa.h               | 1 +
 sim/detectors/much/qa/CbmMuchTransportQa.h               | 1 +
 sim/detectors/tof/CbmTof.cxx                             | 1 +
 sim/detectors/trd/qa/CbmTrdHitRateFastQa.h               | 1 +
 sim/detectors/trd/qa/CbmTrdHitRateQa.h                   | 1 +
 sim/transport/base/CbmMCEventFilter.cxx                  | 1 +
 74 files changed, 118 insertions(+), 19 deletions(-)

diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx
index c6012e986d..7601b87ad9 100644
--- a/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx
+++ b/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx
@@ -24,6 +24,8 @@
 #include "CbmTrdTrack.h"
 #include "cbm/elid/CbmLitGlobalElectronId.h"
 
+#include <FairRootManager.h>
+
 #include "TCanvas.h"
 #include "TFile.h"
 #include "TMath.h"
diff --git a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
index 7eaccfe76f..b0d796531b 100644
--- a/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
+++ b/analysis/PWGDIL/dielectron/pi0eta/CbmKresConversionKF.cxx
@@ -34,11 +34,14 @@
 #include "CbmStsTrack.h"
 #include "CbmTrackMatchNew.h"
 
+#include <FairRootManager.h>
+
+#include <TDirectory.h>
+
 #include "KFParticle.h"
 #include "KFParticleTopoReconstructor.h"
 #include "LmvmKinePar.h"
 
-
 using namespace std;
 
 CbmKresConversionKF::CbmKresConversionKF()
diff --git a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
index df8c496f14..fbfce20ddb 100644
--- a/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
+++ b/analysis/PWGDIL/dimuon/CbmAnaDimuonAnalysis.h
@@ -32,11 +32,13 @@ class CbmVertex;
 class TClonesArray;
 class TLorentzVector;
 class TString;
+class TFile;
 class TH1D;
 class TH2D;
 class TH3D;
 class TProfile;
 class TMultiLayerPerceptron;
+class TTree;
 
 class CbmAnaDimuonAnalysis : public FairTask {
 public:
diff --git a/analysis/PWGHAD/hadron/CbmHadronAnalysis.h b/analysis/PWGHAD/hadron/CbmHadronAnalysis.h
index 2831106228..9b5978f7f6 100644
--- a/analysis/PWGHAD/hadron/CbmHadronAnalysis.h
+++ b/analysis/PWGHAD/hadron/CbmHadronAnalysis.h
@@ -21,6 +21,7 @@ class CbmVertex;
 class CbmStsKFTrackFitter;
 
 class TClonesArray;
+class TFile;
 class TH1F;
 class TH2F;
 class TString;
diff --git a/analysis/common/analysis_tree_converter/CbmConverterManager.h b/analysis/common/analysis_tree_converter/CbmConverterManager.h
index 4934c7d524..d65371a2ce 100644
--- a/analysis/common/analysis_tree_converter/CbmConverterManager.h
+++ b/analysis/common/analysis_tree_converter/CbmConverterManager.h
@@ -6,6 +6,7 @@
 #define ANALYSIS_TREE_CONVERTERMANAGER_H_
 
 #include "FairTask.h"
+#include <FairRootManager.h>
 
 #include <utility>
 
diff --git a/analysis/common/analysis_tree_converter/CbmMatchEvents.cxx b/analysis/common/analysis_tree_converter/CbmMatchEvents.cxx
index b08cc56ffa..77552434f5 100644
--- a/analysis/common/analysis_tree_converter/CbmMatchEvents.cxx
+++ b/analysis/common/analysis_tree_converter/CbmMatchEvents.cxx
@@ -8,6 +8,9 @@
 #include "CbmMCDataManager.h"
 #include "CbmTrackMatchNew.h"
 
+#include <FairRootManager.h>
+#include <Logger.h>
+
 #include "TClonesArray.h"
 
 #include "AnalysisTree/TaskManager.hpp"
diff --git a/analysis/detectors/tof/CbmTofHitFinderTBQa.cxx b/analysis/detectors/tof/CbmTofHitFinderTBQa.cxx
index ee365e0176..0f4cbb7c73 100644
--- a/analysis/detectors/tof/CbmTofHitFinderTBQa.cxx
+++ b/analysis/detectors/tof/CbmTofHitFinderTBQa.cxx
@@ -16,6 +16,7 @@
 #include "CbmTofHit.h"
 #include "CbmTofPoint.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TH1.h"
diff --git a/core/base/CbmDigitize.h b/core/base/CbmDigitize.h
index 0ba33d2fe3..78a137ee69 100644
--- a/core/base/CbmDigitize.h
+++ b/core/base/CbmDigitize.h
@@ -15,6 +15,7 @@
 #include "CbmMatch.h"
 #include "CbmTimeSlice.h"
 
+#include <FairRootManager.h>
 #include <FairTask.h>
 #include <Logger.h>  // for LOG
 
diff --git a/core/detectors/much/CbmMuchSegmentManual.h b/core/detectors/much/CbmMuchSegmentManual.h
index 873e279918..825c083de9 100644
--- a/core/detectors/much/CbmMuchSegmentManual.h
+++ b/core/detectors/much/CbmMuchSegmentManual.h
@@ -19,11 +19,12 @@
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
 #include <RtypesCore.h>  // for Int_t, Double_t, Bool_t, Char_t, Option_t
 #include <TString.h>     // for TString
-#include <typeinfo>      // for bad_cast
 
-#include <fstream>  // for string, getline, char_traits, basic_istream
-#include <map>      // for map
-#include <vector>   // for vector
+#include <fstream>   // for string, getline, char_traits, basic_istream
+#include <map>       // for map
+#include <sstream>   // for stringstream
+#include <typeinfo>  // for bad_cast
+#include <vector>    // for vector
 
 class CbmGeoMuchPar;
 class CbmMuchLayerSide;
diff --git a/core/detectors/much/CbmMuchSegmentSector.h b/core/detectors/much/CbmMuchSegmentSector.h
index ff97ed40f9..40681bb2cb 100644
--- a/core/detectors/much/CbmMuchSegmentSector.h
+++ b/core/detectors/much/CbmMuchSegmentSector.h
@@ -21,11 +21,12 @@
 #include <Rtypes.h>      // for THashConsistencyHolder, ClassDef
 #include <RtypesCore.h>  // for Int_t, Double_t, Bool_t
 #include <TString.h>     // for TString
-#include <typeinfo>      // for bad_cast
 
-#include <fstream>  // for string, getline, char_traits, basic_istream
-#include <map>      // for map
-#include <vector>   // for vector
+#include <fstream>   // for string, getline, char_traits, basic_istream
+#include <map>       // for map
+#include <sstream>   // for stringstream
+#include <typeinfo>  // for bad_cast
+#include <vector>    // for vector
 
 class CbmGeoMuchPar;
 class CbmMuchLayerSide;
diff --git a/core/detectors/rich/utils/CbmRichUtil.cxx b/core/detectors/rich/utils/CbmRichUtil.cxx
index af7622e14b..a5357e1280 100644
--- a/core/detectors/rich/utils/CbmRichUtil.cxx
+++ b/core/detectors/rich/utils/CbmRichUtil.cxx
@@ -15,6 +15,8 @@
 #include "CbmRichHit.h"
 #include "CbmRichRing.h"
 
+#include <FairRootManager.h>
+
 #include "TClonesArray.h"
 
 using namespace std;
diff --git a/mvd/CbmMvdHitfinder.h b/mvd/CbmMvdHitfinder.h
index 1a628d99df..b0abceb677 100644
--- a/mvd/CbmMvdHitfinder.h
+++ b/mvd/CbmMvdHitfinder.h
@@ -17,7 +17,7 @@
 
 class CbmMvdDetector;
 class CbmDigiManager;
-
+class TClonesArray;
 
 class CbmMvdHitfinder : public FairTask {
 
diff --git a/mvd/qa/CbmMvdQa.cxx b/mvd/qa/CbmMvdQa.cxx
index c30c3caa8c..fb26039e82 100644
--- a/mvd/qa/CbmMvdQa.cxx
+++ b/mvd/qa/CbmMvdQa.cxx
@@ -27,7 +27,8 @@
 
 
 //-- Include from Fair --//
-#include "FairTrackParam.h"
+#include <FairRootManager.h>
+#include <FairTrackParam.h>
 #include <Logger.h>
 
 
diff --git a/mvd/qa/CbmMvdQa.h b/mvd/qa/CbmMvdQa.h
index 48c47b611d..46c9f8ff8d 100644
--- a/mvd/qa/CbmMvdQa.h
+++ b/mvd/qa/CbmMvdQa.h
@@ -23,6 +23,7 @@
 
 
 class TClonesArray;
+class TFile;
 class TH1F;
 class TH2F;
 
diff --git a/mvd/tools/readout/CbmMvdReadoutCluster.cxx b/mvd/tools/readout/CbmMvdReadoutCluster.cxx
index 5ddf056b2d..96d1b67d03 100644
--- a/mvd/tools/readout/CbmMvdReadoutCluster.cxx
+++ b/mvd/tools/readout/CbmMvdReadoutCluster.cxx
@@ -12,6 +12,7 @@
 #include "CbmMvdCluster.h"
 
 //-- Include from Fair --//
+#include <FairRootManager.h>
 #include <Logger.h>
 
 //-- Include from Root --//
diff --git a/mvd/tools/readout/CbmMvdReadoutCluster.h b/mvd/tools/readout/CbmMvdReadoutCluster.h
index 2eaa0dc3b3..41b1a2f1cb 100644
--- a/mvd/tools/readout/CbmMvdReadoutCluster.h
+++ b/mvd/tools/readout/CbmMvdReadoutCluster.h
@@ -23,6 +23,9 @@
 #include "TH1F.h"
 #include "TH2F.h"
 
+class TClonesArray;
+class TFile;
+
 class CbmMvdReadoutCluster : public FairTask {
 public:
   CbmMvdReadoutCluster();
diff --git a/mvd/tools/readout/CbmMvdReadoutSimple.cxx b/mvd/tools/readout/CbmMvdReadoutSimple.cxx
index 346e4e5454..0e8ed6ca93 100644
--- a/mvd/tools/readout/CbmMvdReadoutSimple.cxx
+++ b/mvd/tools/readout/CbmMvdReadoutSimple.cxx
@@ -17,15 +17,16 @@
 
 
 //-- Include from Fair --//
-#include "FairTrackParam.h"
+#include <FairRootManager.h>
+#include <FairTrackParam.h>
 #include <Logger.h>
 
 
 //-- Include from Root --//
-#include "TCanvas.h"
-#include "TF1.h"
-#include "TMath.h"
+#include <TCanvas.h>
+#include <TF1.h>
 #include <TFile.h>
+#include <TMath.h>
 
 #include <iostream>
 
diff --git a/mvd/tools/readout/CbmMvdReadoutSimple.h b/mvd/tools/readout/CbmMvdReadoutSimple.h
index 7119ae5670..ce4efd7818 100644
--- a/mvd/tools/readout/CbmMvdReadoutSimple.h
+++ b/mvd/tools/readout/CbmMvdReadoutSimple.h
@@ -23,6 +23,9 @@
 #include "TH1F.h"
 #include "TH2F.h"
 
+class TClonesArray;
+class TFile;
+
 class CbmMvdReadoutSimple : public FairTask {
 public:
   CbmMvdReadoutSimple();
diff --git a/reco/KF/KFQA/CbmKFTrackFitQa.cxx b/reco/KF/KFQA/CbmKFTrackFitQa.cxx
index 18dd1a5c51..cc74862776 100644
--- a/reco/KF/KFQA/CbmKFTrackFitQa.cxx
+++ b/reco/KF/KFQA/CbmKFTrackFitQa.cxx
@@ -19,7 +19,8 @@
 #include "CbmStsTrack.h"
 #include "CbmTrackMatch.h"
 
-#include "FairMCPoint.h"
+#include <FairMCPoint.h>
+#include <FairRootManager.h>
 
 #include "TBranch.h"
 #include "TDatabasePDG.h"
diff --git a/reco/L1/qa/CbmTrackingInputQaSts.cxx b/reco/L1/qa/CbmTrackingInputQaSts.cxx
index 9070e14be5..b1d32e068c 100644
--- a/reco/L1/qa/CbmTrackingInputQaSts.cxx
+++ b/reco/L1/qa/CbmTrackingInputQaSts.cxx
@@ -23,7 +23,8 @@
 #include "CbmStsTrackingInterface.h"  // Communicate via tracking detector interface
 #include "CbmTimeSlice.h"
 
-#include "Logger.h"
+#include <FairRootManager.h>
+#include <Logger.h>
 
 #include "TClonesArray.h"
 #include "TDatabasePDG.h"
diff --git a/reco/detectors/much/qa/CbmMuchHitFinderQa.h b/reco/detectors/much/qa/CbmMuchHitFinderQa.h
index dc821e2d06..237e0fb4d0 100644
--- a/reco/detectors/much/qa/CbmMuchHitFinderQa.h
+++ b/reco/detectors/much/qa/CbmMuchHitFinderQa.h
@@ -33,6 +33,7 @@ class TMemberInspector;
 class CbmMCDataArray;
 class CbmMCDataManager;
 class CbmTimeSlice;
+class FairRootManager;
 
 class CbmMuchHitFinderQa : public FairTask {
 
diff --git a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
index 8bf210be1a..6a47155835 100644
--- a/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
+++ b/reco/detectors/psd/CbmPsdMCbmHitProducer.cxx
@@ -9,6 +9,7 @@
 #include "CbmPsdDigi.h"
 #include "CbmPsdMCbmHit.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TClonesArray.h"
diff --git a/reco/detectors/rich/CbmRichHitProducer.cxx b/reco/detectors/rich/CbmRichHitProducer.cxx
index d78cd661b6..da37ec3b2c 100644
--- a/reco/detectors/rich/CbmRichHitProducer.cxx
+++ b/reco/detectors/rich/CbmRichHitProducer.cxx
@@ -20,6 +20,7 @@
 #include "CbmRichHit.h"
 #include "CbmRichPoint.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TClonesArray.h"
diff --git a/reco/detectors/rich/CbmRichTrainAnnSelect.h b/reco/detectors/rich/CbmRichTrainAnnSelect.h
index 50fb2b2ea6..50c46f236a 100644
--- a/reco/detectors/rich/CbmRichTrainAnnSelect.h
+++ b/reco/detectors/rich/CbmRichTrainAnnSelect.h
@@ -30,6 +30,8 @@ using std::vector;
 //class CbmRichRingSelectImpl;
 class CbmRichRing;
 
+class TClonesArray;
+
 /**
  * \class RingSelectParam
  *
diff --git a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
index 5f57e28118..6052a79f45 100644
--- a/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
+++ b/reco/detectors/rich/mcbm/CbmRichMCbmHitProducer.cxx
@@ -13,6 +13,7 @@
 #include "CbmRichHit.h"
 #include "CbmRichPoint.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TClonesArray.h"
diff --git a/reco/detectors/rich/qa/CbmL1RichRingQa.h b/reco/detectors/rich/qa/CbmL1RichRingQa.h
index f7fed709af..68e8b554c6 100644
--- a/reco/detectors/rich/qa/CbmL1RichRingQa.h
+++ b/reco/detectors/rich/qa/CbmL1RichRingQa.h
@@ -26,6 +26,8 @@
 #include <stdlib.h>
 #include <string.h>
 
+class TClonesArray;
+
 class CbmL1RichRingQa : public FairTask {
 private:
   CbmL1RichRingQa(const CbmL1RichRingQa&);
diff --git a/reco/detectors/rich/qa/CbmRichGeoOpt.cxx b/reco/detectors/rich/qa/CbmRichGeoOpt.cxx
index 18ec2e3f94..7de1ec5aee 100644
--- a/reco/detectors/rich/qa/CbmRichGeoOpt.cxx
+++ b/reco/detectors/rich/qa/CbmRichGeoOpt.cxx
@@ -19,7 +19,8 @@
 #include "CbmRichRingLight.h"
 #include "CbmTrackMatchNew.h"
 
-#include "FairTrackParam.h"
+#include <FairRootManager.h>
+#include <FairTrackParam.h>
 
 #include "TCanvas.h"
 #include "TClonesArray.h"
diff --git a/reco/detectors/rich/qa/CbmRichRecoQa.h b/reco/detectors/rich/qa/CbmRichRecoQa.h
index 6519a2aab4..622973c2d1 100644
--- a/reco/detectors/rich/qa/CbmRichRecoQa.h
+++ b/reco/detectors/rich/qa/CbmRichRecoQa.h
@@ -12,6 +12,7 @@ class CbmRichRing;
 class CbmHistManager;
 class TH1D;
 class TH2D;
+class TH1;
 class TH2;
 class TH3;
 class CbmMCTrack;
diff --git a/reco/detectors/sts/CbmRecoSts.cxx b/reco/detectors/sts/CbmRecoSts.cxx
index 1405fbf130..1ed7eb1ab4 100644
--- a/reco/detectors/sts/CbmRecoSts.cxx
+++ b/reco/detectors/sts/CbmRecoSts.cxx
@@ -24,6 +24,7 @@
 #include "CbmStsSetup.h"
 
 #include <FairField.h>
+#include <FairRootManager.h>
 #include <FairRun.h>
 #include <FairRuntimeDb.h>
 
diff --git a/reco/detectors/sts/CbmRecoStsPixel.cxx b/reco/detectors/sts/CbmRecoStsPixel.cxx
index 1d1b5663cf..ed19abb7a7 100644
--- a/reco/detectors/sts/CbmRecoStsPixel.cxx
+++ b/reco/detectors/sts/CbmRecoStsPixel.cxx
@@ -26,6 +26,7 @@
 #include "CbmStsStation.h"
 
 #include <FairField.h>
+#include <FairRootManager.h>
 #include <FairRun.h>
 #include <FairRuntimeDb.h>
 
diff --git a/reco/detectors/sts/qa/CbmStsFindTracksQa.h b/reco/detectors/sts/qa/CbmStsFindTracksQa.h
index 4ee2f291fb..9230690549 100644
--- a/reco/detectors/sts/qa/CbmStsFindTracksQa.h
+++ b/reco/detectors/sts/qa/CbmStsFindTracksQa.h
@@ -25,11 +25,14 @@
 #include <TStopwatch.h>
 #include <TVector3.h>
 
+class TClonesArray;
+class TH1;
 class TH1F;
 class CbmMCDataArray;
 class CbmStsSetup;
 class CbmMCDataManager;
 class CbmTimeSlice;
+class FairRootManager;
 
 class CbmStsFindTracksQa : public FairTask {
 
diff --git a/reco/detectors/tof/CbmTofCalibrator.h b/reco/detectors/tof/CbmTofCalibrator.h
index 03cd50fd91..f89430cbac 100644
--- a/reco/detectors/tof/CbmTofCalibrator.h
+++ b/reco/detectors/tof/CbmTofCalibrator.h
@@ -44,6 +44,7 @@ class CbmDigiManager;
 #include <vector>
 
 class TClonesArray;
+class TFile;
 
 /** @class CbmTofCalibrator
  ** @brief  contains filling and updating of calibration histos
diff --git a/reco/detectors/tof/CbmTofCosmicClusterizer.h b/reco/detectors/tof/CbmTofCosmicClusterizer.h
index b06282c8a4..2c1c2d373e 100644
--- a/reco/detectors/tof/CbmTofCosmicClusterizer.h
+++ b/reco/detectors/tof/CbmTofCosmicClusterizer.h
@@ -39,6 +39,7 @@ class TTrbHeader;
 
 // ROOT Classes and includes
 class TClonesArray;
+class TFile;
 class TF1;
 class TH1;
 class TH2;
diff --git a/reco/detectors/tof/CbmTofEventClusterizer.h b/reco/detectors/tof/CbmTofEventClusterizer.h
index 5c75498715..fb32c43542 100644
--- a/reco/detectors/tof/CbmTofEventClusterizer.h
+++ b/reco/detectors/tof/CbmTofEventClusterizer.h
@@ -44,6 +44,7 @@ class FairEventHeader;
 // ROOT Classes and includes
 class TClonesArray;
 class TF1;
+class TFile;
 class TH1;
 class TH2;
 class TH3;
diff --git a/reco/detectors/tof/CbmTofExtendTracks.h b/reco/detectors/tof/CbmTofExtendTracks.h
index 5ab6fbd32f..71f432bca5 100644
--- a/reco/detectors/tof/CbmTofExtendTracks.h
+++ b/reco/detectors/tof/CbmTofExtendTracks.h
@@ -28,6 +28,7 @@ class CbmTofTrackletParam;
 class CbmTofTrackletTools;
 class CbmTofCalibrator;
 class TClonesArray;
+class TFile;
 class TH1;
 class TH2;
 class TH3;
diff --git a/reco/detectors/tof/CbmTofFindTracks.h b/reco/detectors/tof/CbmTofFindTracks.h
index 4633ac55e4..7a6d799fbc 100644
--- a/reco/detectors/tof/CbmTofFindTracks.h
+++ b/reco/detectors/tof/CbmTofFindTracks.h
@@ -33,6 +33,7 @@ class CbmTofTrackFitter;
 class CbmTofTrackletTools;
 class CbmTofCalibrator;
 class TClonesArray;
+class TFile;
 class TH1;
 class TH2;
 class TH3;
diff --git a/reco/detectors/tof/CbmTofHitMaker.h b/reco/detectors/tof/CbmTofHitMaker.h
index 77dadd05c3..f3c76a4cef 100644
--- a/reco/detectors/tof/CbmTofHitMaker.h
+++ b/reco/detectors/tof/CbmTofHitMaker.h
@@ -42,6 +42,7 @@ class TTrbHeader;
 
 // ROOT Classes and includes
 class TClonesArray;
+class TFile;
 class TF1;
 class TH1;
 class TH2;
diff --git a/reco/detectors/tof/CbmTofSimpClusterizer.h b/reco/detectors/tof/CbmTofSimpClusterizer.h
index fd378d14bb..c401f92a60 100644
--- a/reco/detectors/tof/CbmTofSimpClusterizer.h
+++ b/reco/detectors/tof/CbmTofSimpClusterizer.h
@@ -34,6 +34,7 @@ class CbmEvent;
 
 // ROOT Classes and includes
 class TClonesArray;
+class TFile;
 class TH1;
 class TH2;
 class TString;
diff --git a/reco/detectors/tof/CbmTofTestBeamClusterizer.h b/reco/detectors/tof/CbmTofTestBeamClusterizer.h
index 8cc2762952..16d5e20182 100644
--- a/reco/detectors/tof/CbmTofTestBeamClusterizer.h
+++ b/reco/detectors/tof/CbmTofTestBeamClusterizer.h
@@ -40,6 +40,7 @@ class TTrbHeader;
 // ROOT Classes and includes
 class TClonesArray;
 class TF1;
+class TFile;
 class TH1;
 class TH2;
 class TProfile;
diff --git a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
index b662ac0141..4fc9409edb 100644
--- a/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
+++ b/reco/detectors/trd/pid/CbmTrdElectronsTrainAnn.cxx
@@ -11,6 +11,9 @@
 #include "CbmTrdPoint.h"
 #include "CbmTrdTrack.h"
 
+#include <FairRootManager.h>
+#include <Logger.h>
+
 #include "TCanvas.h"
 #include "TClonesArray.h"
 #include "TCut.h"
diff --git a/reco/detectors/trd/qa/CbmTrdQa.h b/reco/detectors/trd/qa/CbmTrdQa.h
index e432b42b5a..6d640164b9 100644
--- a/reco/detectors/trd/qa/CbmTrdQa.h
+++ b/reco/detectors/trd/qa/CbmTrdQa.h
@@ -19,6 +19,7 @@ class CbmTrdCluster;
 class CbmTrdHit;
 class TProfile;
 class TProfile2D;
+class TH1;
 class TH1F;
 class TH1I;
 class TH2I;
diff --git a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
index fc6dc4b8ac..adaf851978 100644
--- a/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
+++ b/reco/eventbuilder/digis/CbmAlgoBuildRawEvents.h
@@ -37,6 +37,7 @@ class TH2;
 class TNamed;
 class TStopwatch;
 class TCanvas;
+class TFolder;
 
 enum class EOverlapModeRaw
 {
diff --git a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
index a6a3dad68d..0fb3918410 100644
--- a/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
+++ b/reco/eventbuilder/digis/CbmBuildEventsIdeal.cxx
@@ -16,6 +16,7 @@
 #include "CbmModuleList.h"
 #include "CbmTimeSlice.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include <TClonesArray.h>
diff --git a/reco/eventbuilder/digis/CbmEvbuildRawAlgo.h b/reco/eventbuilder/digis/CbmEvbuildRawAlgo.h
index 297d2178e1..fcda90b9e8 100644
--- a/reco/eventbuilder/digis/CbmEvbuildRawAlgo.h
+++ b/reco/eventbuilder/digis/CbmEvbuildRawAlgo.h
@@ -33,6 +33,7 @@
 class TimesliceMetaData;
 class CbmRawEvent;
 class TClonesArray;
+class TFolder;
 class TH1;
 class TH2;
 class TNamed;
diff --git a/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx b/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx
index 81485a8cf0..5a09112d70 100644
--- a/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx
+++ b/reco/eventbuilder/digis/CbmEvbuildRawTask.cxx
@@ -8,7 +8,7 @@
 #include "CbmRawEvent.h"
 
 #include <FairRootManager.h>
-#include <FairRunOnline.h>
+//#include <FairRunOnline.h>
 #include <Logger.h>
 
 #include <TClonesArray.h>
diff --git a/reco/global/CbmRecoTzero.cxx b/reco/global/CbmRecoTzero.cxx
index 2ce3b5bed3..e9d2e6099a 100644
--- a/reco/global/CbmRecoTzero.cxx
+++ b/reco/global/CbmRecoTzero.cxx
@@ -8,6 +8,9 @@
 #include "CbmEvent.h"
 #include "CbmTzdDigi.h"
 
+#include <FairRootManager.h>
+#include <Logger.h>
+
 #include <TClonesArray.h>
 #include <TStopwatch.h>
 
diff --git a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
index cb766cf6c7..6a4373350a 100644
--- a/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
+++ b/reco/littrack/cbm/qa/CbmLitCreateStandaloneData.h
@@ -9,6 +9,8 @@
 
 #include <fstream>
 
+class TClonesArray;
+
 class CbmLitCreateStandaloneData : public FairTask {
 public:
   CbmLitCreateStandaloneData();
diff --git a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h
index ce499c09eb..b3946cb4df 100644
--- a/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h
+++ b/reco/littrack/cbm/qa/clustering/CbmLitClusteringQa.h
@@ -26,6 +26,7 @@
 class CbmHistManager;
 class CbmMCDataArray;
 class CbmDigiManager;
+class TClonesArray;
 
 class CbmLitClusteringQa : public FairTask {
 public:
diff --git a/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx b/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
index 88ced74098..54a03014fc 100644
--- a/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
+++ b/reco/littrack/cbm/qa/fit/CbmLitFitQa.cxx
@@ -27,6 +27,8 @@
 #include "CbmTrackMatchNew.h"
 #include "CbmTrdAddress.h"
 
+#include <FairRootManager.h>
+
 #include "TClonesArray.h"
 #include "TH1.h"
 #include "TH1F.h"
diff --git a/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx b/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx
index 16c747a819..b73a0e2b2c 100644
--- a/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx
+++ b/reco/littrack/cbm/qa/tof/CbmLitTofQa.cxx
@@ -24,6 +24,8 @@
 #include "CbmVertex.h"
 #include "qa/base/CbmLitAcceptanceFunction.h"
 
+#include <FairRootManager.h>
+
 #include "TClonesArray.h"
 #include "TDatabasePDG.h"
 #include "TH2F.h"
diff --git a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h
index 502ac9da8e..e4b4862d13 100644
--- a/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h
+++ b/reco/littrack/cbm/qa/tracking/CbmLitTrackingQa.h
@@ -21,6 +21,7 @@ class CbmHistManager;
 class CbmTrackMatchNew;
 class CbmLitMCTrackCreator;
 class CbmMCDataArray;
+class TClonesArray;
 
 using std::multimap;
 using std::pair;
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
index fb2a786ec8..94326bc0fc 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.cxx
@@ -16,6 +16,7 @@
 #include "cbm/utils/CbmLitConverterParallel.h"
 #include "std/utils/CbmLitMemoryManagment.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TClonesArray.h"
diff --git a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h
index bc35bf1358..e58314d781 100644
--- a/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h
+++ b/reco/littrack/cbm/reco/CbmLitFindGlobalTracksParallel.h
@@ -24,6 +24,8 @@
 using std::string;
 using std::vector;
 
+class TClonesArray;
+
 class CbmLitFindGlobalTracksParallel : public FairTask {
 public:
   /**
diff --git a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h
index 3e50ea87d5..5e374ed66c 100644
--- a/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h
+++ b/reco/littrack/cbm/reco/CbmLitFindMvdTracks.h
@@ -18,6 +18,7 @@
 #include "FairTask.h"
 
 class CbmEvent;
+class TClonesArray;
 
 /**
  * \class CbmLitFindMvdTracks.h
diff --git a/reco/littrack/cbm/reco/CbmLitFitTracks.h b/reco/littrack/cbm/reco/CbmLitFitTracks.h
index f2d9b63235..4b90ab4cd2 100644
--- a/reco/littrack/cbm/reco/CbmLitFitTracks.h
+++ b/reco/littrack/cbm/reco/CbmLitFitTracks.h
@@ -16,6 +16,8 @@
 
 #include "TStopwatch.h"
 
+class TClonesArray;
+
 class CbmLitFitTracks : public FairTask {
 public:
   /**
diff --git a/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h b/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h
index dc76ba9dfb..989d679a50 100644
--- a/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h
+++ b/reco/littrack/cbm/reco/CbmLitFitTracksParallel.h
@@ -16,6 +16,8 @@
 
 #include "TStopwatch.h"
 
+class TClonesArray;
+
 class CbmLitFitTracksParallel : public FairTask {
 public:
   /**
diff --git a/reco/qa/CbmTrackingTrdQa.h b/reco/qa/CbmTrackingTrdQa.h
index 15de64179b..2b748d3e28 100644
--- a/reco/qa/CbmTrackingTrdQa.h
+++ b/reco/qa/CbmTrackingTrdQa.h
@@ -34,6 +34,7 @@ class TH1F;
 class CbmMCDataArray;
 class CbmMCDataManager;
 class CbmTimeSlice;
+class FairRootManager;
 
 class CbmTrackingTrdQa : public FairTask {
 
diff --git a/reco/tasks/CbmTaskBuildEvents.cxx b/reco/tasks/CbmTaskBuildEvents.cxx
index 7ade618907..ddb366c3c1 100644
--- a/reco/tasks/CbmTaskBuildEvents.cxx
+++ b/reco/tasks/CbmTaskBuildEvents.cxx
@@ -9,6 +9,7 @@
 #include "CbmDigiTimeslice.h"
 #include "CbmModuleList.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include <TStopwatch.h>
diff --git a/reco/tasks/CbmTaskMakeRecoEvents.cxx b/reco/tasks/CbmTaskMakeRecoEvents.cxx
index a07b32d9d5..aeadc0e6c8 100644
--- a/reco/tasks/CbmTaskMakeRecoEvents.cxx
+++ b/reco/tasks/CbmTaskMakeRecoEvents.cxx
@@ -8,6 +8,7 @@
 #include "CbmDefs.h"
 #include "CbmEvent.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include <TClonesArray.h>
diff --git a/reco/tasks/CbmTaskTriggerDigi.cxx b/reco/tasks/CbmTaskTriggerDigi.cxx
index 6b6303244a..d1a1f6ba7e 100644
--- a/reco/tasks/CbmTaskTriggerDigi.cxx
+++ b/reco/tasks/CbmTaskTriggerDigi.cxx
@@ -15,6 +15,7 @@
 #include "CbmTofDigi.h"
 #include "CbmTrdDigi.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TimeClusterTrigger.h"
diff --git a/reco/tracking/global/CbmGlobalTrackingQa.cxx b/reco/tracking/global/CbmGlobalTrackingQa.cxx
index 75c26786dd..70431bc9cd 100644
--- a/reco/tracking/global/CbmGlobalTrackingQa.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingQa.cxx
@@ -21,6 +21,7 @@
 #include "CbmStsTrack.h"
 #include "CbmTofPoint.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include <map>
diff --git a/reco/tracking/global/CbmGlobalTrackingTask.cxx b/reco/tracking/global/CbmGlobalTrackingTask.cxx
index 49b70c4988..76e03e19e5 100644
--- a/reco/tracking/global/CbmGlobalTrackingTask.cxx
+++ b/reco/tracking/global/CbmGlobalTrackingTask.cxx
@@ -18,6 +18,7 @@
 #include "CbmStsHit.h"
 #include "CbmStsTrack.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TH1F.h"
diff --git a/reco/tracking/lx/CalcStats/CalcStats.cxx b/reco/tracking/lx/CalcStats/CalcStats.cxx
index 9c1c9b1812..1caa07f8f9 100644
--- a/reco/tracking/lx/CalcStats/CalcStats.cxx
+++ b/reco/tracking/lx/CalcStats/CalcStats.cxx
@@ -10,6 +10,7 @@
 #include "CbmTrdAddress.h"
 #include "CbmTrdPoint.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TClonesArray.h"
diff --git a/reco/tracking/lx/CalcStats/CalcStats.h b/reco/tracking/lx/CalcStats/CalcStats.h
index ea2b806b54..0f4d7b139d 100644
--- a/reco/tracking/lx/CalcStats/CalcStats.h
+++ b/reco/tracking/lx/CalcStats/CalcStats.h
@@ -9,6 +9,8 @@
 
 #include "TH1F.h"
 
+class TClonesArray;
+
 class LxCalcStats : public FairTask {
 public:
   LxCalcStats();
diff --git a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
index 4876ad8df4..b03e331752 100644
--- a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
+++ b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.cxx
@@ -9,6 +9,7 @@
 #include "CbmMuchPoint.h"
 #include "CbmTrdPoint.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TClonesArray.h"
diff --git a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h
index 25d9f9c98e..c98d74b21b 100644
--- a/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h
+++ b/reco/tracking/lx/GenNoiseElectrons/GenNoiseElectrons.h
@@ -7,6 +7,8 @@
 
 #include "FairTask.h"
 
+class TClonesArray;
+
 class LxGenNoiseElectrons : public FairTask {
 public:
   LxGenNoiseElectrons();
diff --git a/reco/tracking/lx/TBBinned/LxTBTask.cxx b/reco/tracking/lx/TBBinned/LxTBTask.cxx
index 60e3cb2130..4628b0e909 100644
--- a/reco/tracking/lx/TBBinned/LxTBTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTask.cxx
@@ -18,6 +18,7 @@
 #include "CbmMuchPixelHit.h"
 #include "CbmTrdHit.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TClonesArray.h"
diff --git a/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx b/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
index 962d7be78e..1a13d1c0c6 100644
--- a/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
+++ b/reco/tracking/lx/TBBinned/LxTBTrdTask.cxx
@@ -19,6 +19,7 @@
 #include "CbmTrdPoint.h"
 #include "CbmTrdTrack.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include "TClonesArray.h"
diff --git a/sim/detectors/much/qa/CbmMuchDigitizerQa.h b/sim/detectors/much/qa/CbmMuchDigitizerQa.h
index e5b73c36ad..5563481476 100644
--- a/sim/detectors/much/qa/CbmMuchDigitizerQa.h
+++ b/sim/detectors/much/qa/CbmMuchDigitizerQa.h
@@ -35,6 +35,7 @@ class CbmMuchPad;
 class CbmMCDataArray;
 class CbmMCDataManager;
 class CbmTimeSlice;
+class FairRootManager;
 
 /// QA for the MUCH detector after a "digitization" step of the simulation.
 /// The class reimplements corresponding QA checks from old CbmMuchHitFinderQa class
diff --git a/sim/detectors/much/qa/CbmMuchTransportQa.h b/sim/detectors/much/qa/CbmMuchTransportQa.h
index 54ee4d5a78..b6ba08ea87 100644
--- a/sim/detectors/much/qa/CbmMuchTransportQa.h
+++ b/sim/detectors/much/qa/CbmMuchTransportQa.h
@@ -30,6 +30,7 @@ class TH1F;
 class TH2F;
 class TMemberInspector;
 class CbmQaPie;
+class FairRootManager;
 
 /// QA for the MUCH detector after a "transport" step of the simulation.
 /// The class reimplements corresponding QA checks from old CbmMuchHitFinderQa class
diff --git a/sim/detectors/tof/CbmTof.cxx b/sim/detectors/tof/CbmTof.cxx
index 77e8381338..315390d24f 100644
--- a/sim/detectors/tof/CbmTof.cxx
+++ b/sim/detectors/tof/CbmTof.cxx
@@ -17,6 +17,7 @@
 #include <FairGeoBuilder.h>
 #include <FairGeoMedia.h>
 #include <FairMCEventHeader.h>
+#include <FairRootManager.h>
 #include <FairRunSim.h>
 
 #include "TClonesArray.h"
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h
index c75a1a6a41..37e05273b2 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h
+++ b/sim/detectors/trd/qa/CbmTrdHitRateFastQa.h
@@ -21,6 +21,7 @@ class CbmTrdGeoHandler;
 
 class TClonesArray;
 class TCanvas;
+class TFile;
 class TH1F;
 class TH2F;
 
diff --git a/sim/detectors/trd/qa/CbmTrdHitRateQa.h b/sim/detectors/trd/qa/CbmTrdHitRateQa.h
index 192c6167d6..64b7f70207 100644
--- a/sim/detectors/trd/qa/CbmTrdHitRateQa.h
+++ b/sim/detectors/trd/qa/CbmTrdHitRateQa.h
@@ -20,6 +20,7 @@ class CbmTrdGeoHandler;
 
 class TClonesArray;
 class TCanvas;
+class TFile;
 class TH1F;
 class TH2F;
 
diff --git a/sim/transport/base/CbmMCEventFilter.cxx b/sim/transport/base/CbmMCEventFilter.cxx
index d7fd0287cc..13eac68091 100644
--- a/sim/transport/base/CbmMCEventFilter.cxx
+++ b/sim/transport/base/CbmMCEventFilter.cxx
@@ -9,6 +9,7 @@
 
 #include "CbmMCEventFilter.h"
 
+#include <FairRootManager.h>
 #include <Logger.h>
 
 #include <cassert>
-- 
GitLab