diff --git a/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx b/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx
index 89bc2db222bf29cfc5d0ec79b4d970d48d0e9971..3215a4f4b6da210c63582b8ee31452163b1b9274 100644
--- a/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx
+++ b/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx
@@ -8,11 +8,15 @@
 /// \date   21.10.2020
 
 #include "CbmMuchDigitizerQa.h"
+#include "CbmDefs.h"
 #include "CbmDigiManager.h"
+#include "CbmLink.h"
 #include "CbmMCTrack.h"
 #include "CbmMatch.h"
+#include "CbmMuchAddress.h"
 #include "CbmMuchDigi.h"
 #include "CbmMuchGeoScheme.h"
+#include "CbmMuchModule.h"
 #include "CbmMuchModuleGem.h"
 #include "CbmMuchPad.h"
 #include "CbmMuchPoint.h"
@@ -28,6 +32,27 @@
 #include "TH2.h"
 #include "TString.h"
 #include "TStyle.h"
+#include <FairRootManager.h>
+#include <FairSink.h>
+#include <FairTask.h>
+#include <Logger.h>
+#include <TAxis.h>
+#include <TCanvas.h>
+#include <TDirectory.h>
+#include <TGenericClassInfo.h>
+#include <TMath.h>
+#include <TParticlePDG.h>
+#include <TROOT.h>
+#include <TVector2.h>
+#include <TVector3.h>
+#include <TVirtualPad.h>
+#include <assert.h>
+#include <boost/exception/exception.hpp>
+#include <boost/type_index/type_index_facade.hpp>
+#include <iostream>
+#include <limits>
+#include <math.h>
+#include <stdio.h>
 #include <vector>
 
 using std::cout;
diff --git a/sim/detectors/much/qa/CbmMuchDigitizerQa.h b/sim/detectors/much/qa/CbmMuchDigitizerQa.h
index ed0036b26859a2e92c70e955491877acb4e94d56..7349ead879e8b58dc09ae03dbfe940b46288289c 100644
--- a/sim/detectors/much/qa/CbmMuchDigitizerQa.h
+++ b/sim/detectors/much/qa/CbmMuchDigitizerQa.h
@@ -10,6 +10,15 @@
 #define CbmMuchDigitizerQa_H
 
 #include "FairTask.h"
+#include <Rtypes.h>
+#include <RtypesCore.h>
+#include <TFolder.h>
+#include <vector>
+class TBuffer;
+class TClass;
+class TClonesArray;
+class TF1;
+class TMemberInspector;
 class CbmMuchGeoScheme;
 class CbmDigiManager;
 class CbmQaCanvas;
diff --git a/sim/detectors/much/qa/CbmMuchTransportQa.cxx b/sim/detectors/much/qa/CbmMuchTransportQa.cxx
index d55aedcf2ec894c3530cd001516d435e2b7b63c9..867c33e271e67c18ab7bab4be2f5e170ca68aff2 100644
--- a/sim/detectors/much/qa/CbmMuchTransportQa.cxx
+++ b/sim/detectors/much/qa/CbmMuchTransportQa.cxx
@@ -9,6 +9,7 @@
 
 #include "CbmMuchTransportQa.h"
 #include "CbmMCTrack.h"
+#include "CbmMuchAddress.h"
 #include "CbmMuchGeoScheme.h"
 #include "CbmMuchPoint.h"
 #include "CbmMuchStation.h"
@@ -21,7 +22,22 @@
 #include "TPie.h"
 #include "TPieSlice.h"
 #include "TStyle.h"
+#include <FairRootManager.h>
+#include <FairSink.h>
+#include <FairTask.h>
+#include <Logger.h>
+#include <ROOT/RConfig.h>
+#include <TAxis.h>
+#include <TDirectory.h>
+#include <TGenericClassInfo.h>
+#include <TMath.h>
+#include <TParameter.h>
+#include <TString.h>
+#include <TVector3.h>
+#include <stdlib.h>
+#include <sys/types.h>
 #include <vector>
+class TParticlePDG;
 
 #define BINS_STA fNstations, 0, fNstations
 
diff --git a/sim/detectors/much/qa/CbmMuchTransportQa.h b/sim/detectors/much/qa/CbmMuchTransportQa.h
index 9aca99b0bf9a3c59667959215645b79e97e54a98..c50836783007cafc69ed86418e54f4f39f6bf604 100644
--- a/sim/detectors/much/qa/CbmMuchTransportQa.h
+++ b/sim/detectors/much/qa/CbmMuchTransportQa.h
@@ -12,11 +12,19 @@
 
 #include "FairTask.h"
 #include "TParameter.h"
+#include <Rtypes.h>
+#include <RtypesCore.h>
+#include <TFolder.h>
+#include <vector>
+class CbmMuchPoint;
+class CbmQaCanvas;
+class TBuffer;
+class TClass;
+class TClonesArray;
 class TH1F;
 class TH2F;
+class TMemberInspector;
 class TPie;
-class CbmQaCanvas;
-class CbmMuchPoint;
 
 /// QA for the MUCH detector after a "transport" step of the simulation.
 /// The class reimplements corresponding QA checks from old CbmMuchHitFinderQa class