diff --git a/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx b/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx
index 2df89e438c117d84c7a4a46f9f97384c495e6300..89bc2db222bf29cfc5d0ec79b4d970d48d0e9971 100644
--- a/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx
+++ b/sim/detectors/much/qa/CbmMuchDigitizerQa.cxx
@@ -8,6 +8,28 @@
 /// \date   21.10.2020
 
 #include "CbmMuchDigitizerQa.h"
+#include "CbmDigiManager.h"
+#include "CbmMCTrack.h"
+#include "CbmMatch.h"
+#include "CbmMuchDigi.h"
+#include "CbmMuchGeoScheme.h"
+#include "CbmMuchModuleGem.h"
+#include "CbmMuchPad.h"
+#include "CbmMuchPoint.h"
+#include "CbmMuchPointInfo.h"
+#include "CbmMuchRecoDefs.h"
+#include "CbmMuchStation.h"
+#include "CbmQaCanvas.h"
+#include "TClonesArray.h"
+#include "TDatabasePDG.h"
+#include "TF1.h"
+#include "TGraph.h"
+#include "TH1.h"
+#include "TH2.h"
+#include "TString.h"
+#include "TStyle.h"
+#include <vector>
+
 using std::cout;
 using std::endl;
 using std::vector;
diff --git a/sim/detectors/much/qa/CbmMuchDigitizerQa.h b/sim/detectors/much/qa/CbmMuchDigitizerQa.h
index aad04643d6482cba2ad1c786d16dfdbf71d916ce..ed0036b26859a2e92c70e955491877acb4e94d56 100644
--- a/sim/detectors/much/qa/CbmMuchDigitizerQa.h
+++ b/sim/detectors/much/qa/CbmMuchDigitizerQa.h
@@ -9,47 +9,14 @@
 #ifndef CbmMuchDigitizerQa_H
 #define CbmMuchDigitizerQa_H
 
-#include "CbmDigiManager.h"
-#include "CbmGeoMuchPar.h"
-#include "CbmMCTrack.h"
-#include "CbmMatch.h"
-#include "CbmMuchAddress.h"
-#include "CbmMuchDigi.h"
-#include "CbmMuchGeoScheme.h"
-#include "CbmMuchModuleGem.h"
-#include "CbmMuchPad.h"
-#include "CbmMuchPoint.h"
-#include "CbmMuchPointInfo.h"
-#include "CbmMuchRecoDefs.h"
-#include "CbmMuchSector.h"
-#include "CbmMuchStation.h"
-#include "CbmQaCanvas.h"
-#include "FairLogger.h"
-#include "FairRootFileSink.h"
-#include "FairRootManager.h"
-#include "FairRun.h"
-#include "FairRuntimeDb.h"
 #include "FairTask.h"
-#include "Riostream.h"
-#include "TArrayI.h"
-#include "TCanvas.h"
-#include "TClonesArray.h"
-#include "TDatabasePDG.h"
-#include "TF1.h"
-#include "TFile.h"
-#include "TGraph.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "TObjArray.h"
-#include "TParticlePDG.h"
-#include "TString.h"
-#include "TStyle.h"
-#include <algorithm>
-#include <cassert>
-#include <map>
-#include <vector>
-
 class CbmMuchGeoScheme;
+class CbmDigiManager;
+class CbmQaCanvas;
+class TCanvas;
+class TH1F;
+class TH2F;
+class TVector2;
 
 /// 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.cxx b/sim/detectors/much/qa/CbmMuchTransportQa.cxx
index 1db69c4ca281f7b6cbefc7c240b892c7b5382d59..d55aedcf2ec894c3530cd001516d435e2b7b63c9 100644
--- a/sim/detectors/much/qa/CbmMuchTransportQa.cxx
+++ b/sim/detectors/much/qa/CbmMuchTransportQa.cxx
@@ -8,6 +8,23 @@
 /// \date   21.10.2020
 
 #include "CbmMuchTransportQa.h"
+#include "CbmMCTrack.h"
+#include "CbmMuchGeoScheme.h"
+#include "CbmMuchPoint.h"
+#include "CbmMuchStation.h"
+#include "CbmQaCanvas.h"
+#include "TClonesArray.h"
+#include "TDatabasePDG.h"
+#include "TH1.h"
+#include "TH2.h"
+#include "TLegend.h"
+#include "TPie.h"
+#include "TPieSlice.h"
+#include "TStyle.h"
+#include <vector>
+
+#define BINS_STA fNstations, 0, fNstations
+
 ClassImp(CbmMuchTransportQa);
 
 // -------------------------------------------------------------------------
diff --git a/sim/detectors/much/qa/CbmMuchTransportQa.h b/sim/detectors/much/qa/CbmMuchTransportQa.h
index 3805faa5a18d7433cfdf6c4f1dafbbd6dd213d6d..9aca99b0bf9a3c59667959215645b79e97e54a98 100644
--- a/sim/detectors/much/qa/CbmMuchTransportQa.h
+++ b/sim/detectors/much/qa/CbmMuchTransportQa.h
@@ -10,34 +10,13 @@
 #ifndef CbmMuchTransportQa_H
 #define CbmMuchTransportQa_H
 
-#include "CbmGeoMuchPar.h"
-#include "CbmMCTrack.h"
-#include "CbmMuchGeoScheme.h"
-#include "CbmMuchPoint.h"
-#include "CbmMuchStation.h"
-#include "CbmQaCanvas.h"
-#include "FairLogger.h"
-#include "FairRootFileSink.h"
-#include "FairRootManager.h"
-#include "FairRun.h"
-#include "FairRuntimeDb.h"
 #include "FairTask.h"
-#include "TClonesArray.h"
-#include "TDatabasePDG.h"
-#include "TFolder.h"
-#include "TH1.h"
-#include "TH2.h"
-#include "TLegend.h"
 #include "TParameter.h"
-#include "TParticlePDG.h"
-#include "TPie.h"
-#include "TPieSlice.h"
-#include "TString.h"
-#include "TStyle.h"
-#include <cassert>
-#include <vector>
-
-#define BINS_STA fNstations, 0, fNstations
+class TH1F;
+class TH2F;
+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