diff --git a/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx b/analysis/PWGCHA/jpsi/CbmAnaJpsiTask.cxx
index c6012e986dd1160da3ed7c48cfd522622a66e1fb..7601b87ad955715be048906912c2ed0d4b88b708 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 7eaccfe76f1ff0a2aad75671d7af89259f767df7..b0d796531bcdd9ba90429a6d464f3b33060b1c87 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 df8c496f1484beea24e7b7355e9a2c263c83883a..fbfce20ddb100d6922c9f5d79084aa01b6513199 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 2831106228deaf63667a84d5ca4c097200918a67..9b5978f7f61d811befcb221c8ea35dccd466db17 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 4934c7d524b39f83939088fedd72fdc66d9f7e88..d65371a2ce26bae830818ae7f385cd1ce683b8ba 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 b08cc56ffa543c0fd28c38e5230c35b17ee97acf..77552434f5e0f5d8fca1ba1800f858c4e9f125e2 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 ee365e01767ae390a1a53a6a84d797a8f345750f..0f4cbb7c73cb0739d9235c69ec34079a2dfc73fe 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 0ba33d2fe35de38f1e370047c8162f79f1b5f498..78a137ee69f263cbf1140d2db5a8529e297fa575 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 873e2799187401140be92e4c8d151a69d2da4885..825c083de91ab3683ca2e8245e10dd00ff3aeb45 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 ff97ed40f9065b106c41246678a95da473695112..40681bb2cb4a2361d146a7327aa7c7c78c391f8a 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 af7622e14b94aa41a7af3f739794637344cb73d9..a5357e1280283b356ce21a864a1243febe536e99 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 1a628d99df5e8d0834ddf89980177139aac05c41..b0abceb6779b394b63c3a476ab460e119f084c1b 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 c30c3caa8cc01cc227767c34188942337be32d75..fb26039e829cec39f4e0b581e40a917cb514b95e 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 48c47b611d2601fbc5df22c33f61ac79ac78b8af..46c9f8ff8d242064839421aa786907a536395d46 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 5ddf056b2db62387db701d44dd6850573bc88790..96d1b67d03ca1b86b954fecfd651141ae872c068 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 2eaa0dc3b3350c6a3a5a9d113f5094158503e2f9..41b1a2f1cb0e295171beca81033fdff4090a5a41 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 346e4e5454c1d2dd12be333cada1b257458a2b9a..0e8ed6ca939bbeb53a2d83eec7de31ed85766e5f 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 7119ae56706ae993e4de80a1690a3ab998ffdf33..ce4efd7818d63a9dc55ecb2592cf84daaaeab52e 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 18dd1a5c510be7b75422a9dd26f457a7da81d87e..cc748627765fe81be5712b5d80ec4a0e7ab5cbd9 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 9070e14be5d35e083f5db9b911070a920a5f2e94..b1d32e068c4d802d1f4e440f390a192b080fd039 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 dc821e2d06e630bf9a5f4cff2d8672f777ec8827..237e0fb4d0c60256debedb0b3bd2a95667dfaa38 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 8bf210be1afc8491f8e5251c3022932c3c191c58..6a4715583579e97e6c87c8ae04bb00d881ab8f38 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 d78cd661b6aab16d8fd1d99a7da225c510e46a78..da37ec3b2cb6c98e5e56183fd311f1aaecbbc148 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 50fb2b2ea67e709ad54dbc084a6904a98b590aa4..50c46f236aa6b6463d873a18d0209f931f14e63f 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 5f57e281184b2778cadd79701e1106277c10a7b9..6052a79f45979a20efd14b6c5cbde87a231d3b9b 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 f7fed709af0b8194f04bb79cf76d5ee14b227904..68e8b554c6d203ba3f4dbc4a2741896b45438680 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 18ec2e3f94fe5a4ba6a878206efb8c5d11274ba3..7de1ec5aee1fec41ff6dfb69fd26656fbd04ffe0 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 6519a2aab45b1961706b6938d90edce5da08d1a2..622973c2d16c8d92bcd36d91dbf37edb46282a87 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 1405fbf130935875d7c05968038fbfb2bb1d2499..1ed7eb1ab49d818f73313a11ef259ffbf8319b65 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 1d1b5663cf35db6552721597dddb6734ba3fc33f..ed19abb7a78989836faf32ed7417e09f81e70405 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 4ee2f291fb3bfdfe6fbf0259d38cdfd2d18ddf10..92306905493446e25db48ee5d203d292a274e9a6 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 03cd50fd9113479eb76a67630166ca3632418d3f..f89430cbac6e5f1ead5523e88630b8861b4ce409 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 b06282c8a46e54ec1762cd13b681714e70dfed8b..2c1c2d373e2ea3447b306fa50938028cc3b22fca 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 5c754987155808c58fb680cb312c063c8f4a2235..fb32c43542ef0186e3cfef91825f58a3734637c3 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 5ab6fbd32f4978585fa5b28618672852c6b93f11..71f432bca5153a0482b025b3bb12a03e7dbe34ac 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 4633ac55e4c5e01a6a0d8e185a7082e40f1b0f6a..7a6d799fbc0e005bbd227158f34fd9fbd0147653 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 77dadd05c3b4fc7d6f27053f0f9726068ac26bf5..f3c76a4cefcd3c0b1151fad43884fc61a16cb905 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 fd378d14bb29e28d7faf0c47bf9a004ad7e66325..c401f92a6021111b120a914e42ffd4f6fb96db22 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 8cc27629522db96b527c844ed1df68e83932ba6e..16d5e201827e597ada12af98b96f680db5f2ef81 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 b662ac014198b4437d388d7c8f1b43ae301c18a0..4fc9409edb93eb1d8b0645959a580764d83eaaca 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 e432b42b5a38c7ad973d1b58afb1a2d28a7c6093..6d640164b99017a1f19ea7282e0d97e7973073f6 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 fc6dc4b8acc552907f47664859fea4e9ee5e370d..adaf851978961d4bc8a2206704f93db545fb550f 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 a6a3dad68d12a9f1eb48082a4d7fcf33a0ba8dd5..0fb39184101ef81328331c4a4ecb5a1f7e52ba76 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 297d2178e1bc4e0eb04b524453d66dabd566ff6a..fcda90b9e8d0817e0744589170722369b7800557 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 81485a8cf031af234f542ebb6935096683ea33c9..5a09112d7068a4fb30c1ea80f8305404d0fb9990 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 2ce3b5bed33260f9fdbf0a34e2e9402d72e51c56..e9d2e6099ab31c074f4c5134b38c37583856c12b 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 cb766cf6c757d7ce1a5be452a7161cb59dd30282..6a4373350a3389943048e36e884eca00c0656242 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 ce499c09eb904cf7bf980a0444686720fd515c74..b3946cb4df0459c389cbd2d0c389d52d58f17c16 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 88ced740983abc40d550e464d068123b14befd64..54a03014fc166af3605a684e6fa4b67032a51168 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 16c747a8192269b29381f969a2ecad673386a677..b73a0e2b2c6bfdc47050c5cbc0c2483eff9ce4bf 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 502ac9da8e36d0316813031f1dbdf48ee76db9cf..e4b4862d1340cde315ddaef24f30b7e25307203a 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 fb2a786ec82f1debe18af652d5a46fec4e5cdf30..94326bc0fcd2b105a4d74db2e7d16f6bc47b3291 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 bc35bf13582f65b2f825912e02d1bd7a5b52111e..e58314d78122ae0845352ce247c707a15f4a50c7 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 3e50ea87d5820f5aa6f07988a28f05744c1afbd5..5e374ed66c5202f3fe44a6dea7eb91dc58ccedb6 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 f2d9b63235b72d04827c4d83d9737c501bbb0406..4b90ab4cd2ddbbb647a12451f40c33e34273ba2a 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 dc76ba9dfb46dae1279e5208e279c19bdafd4918..989d679a503aabea6ceca37a48f57893ac8f5b24 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 15de64179b3fcfbd37f78cb5e38de6352139c7ab..2b748d3e28ac6b4bf51118ca1bb26a0d7fb9d654 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 7ade6189079bd38721e23760e79c7e99f091b2f0..ddb366c3c1f1fdc891f4204a2fa9a0020aaacdd4 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 a07b32d9d57362557d57236c1207e2475c053bbf..aeadc0e6c8aaa0c0f2097271ed6d902210c52956 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 6b6303244a1b6cc109c0016016eb977e56dd4569..d1a1f6ba7eb9d567e69f3e6c3c73ffe66970962d 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 75c26786dd586ebffb4cf5060f30f40e882111ac..70431bc9cd977ac186e546793acb0c5f828da238 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 49b70c498802f223a1ea9238a303e11011f799c9..76e03e19e59f02e509f2c1bac9d667c75a0bc6b6 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 9c1c9b18126ac90e3cfef304a465c84e77107ef1..1caa07f8f971ea026c7718cc42716d5534741ca2 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 ea2b806b5402a0bb23dbd7fb0df9e90700b995a0..0f4d7b139d2bbfacffb7dfc44d488711fb642111 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 4876ad8df406062bdf35800c10d295ec41893ef3..b03e33175293017774f49e6b9034b33f798655e9 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 25d9f9c98e1f5b70c12d409267c56b683667828c..c98d74b21be442ec0af6f92d1927d51af5c1b6ee 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 60e3cb21303ee5a5ad934133b8014db939cbdb32..4628b0e9091a6b5403fdad3034d018517ae1d817 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 962d7be78e8e8c07e7656b274398a73b9542497a..1a13d1c0c6149d70635f7e804386d2a6aa8f7ef5 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 e5b73c36adf4d3584324e86e3c37e84a750a1b6a..5563481476358fdf64e206d3cb4b4c61274f1882 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 54ee4d5a78a726abcdeec1742aa238cf84f7f0d5..b6ba08ea87c52f508ad5894be9c9dd900eed0afb 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 77e8381338f6cf57488cb92ef05001ad0f662c32..315390d24f943bd4f21a0d1dc4fbaad41b720392 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 c75a1a6a4158656f1695a932fdbae21539a13f72..37e05273b25b649bef8be61fca75b298f1d84c32 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 192c6167d6554a8753858ca85387e42cf5303723..64b7f7020705ebba87a94828fdbf22b6cb1c84ec 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 d7fd0287ccc7584432a79525e338df21af68deee..13eac68091c651fb16d3f1ad21800a6d63c09eeb 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>