diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.cxx
index 353f2944ec91ca7758545068193c2b31b5e7dd3f..93bf1a40fb38190ba0500ea074887427de94f306 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisMetaData.cxx
@@ -16,6 +16,7 @@
 ///////////////////////////////////////////////////////////////////////////
 
 #include <TCollection.h>
+#include <TDatime.h>
 #include <TList.h>
 #include <TPad.h>
 #include <TROOT.h>
diff --git a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx
index c71335e94e6a937507f5bf323b508e74c4a68d1e..0641f23280db68720f310711dff8ec359dbf3a16 100644
--- a/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx
+++ b/analysis/PWGDIL/dielectron/papaframework/PairAnalysisSpectrum.cxx
@@ -56,6 +56,7 @@
 #include <TGraphErrors.h>
 #include <TH1.h>
 #include <TList.h>
+#include <TObjString.h>
 #include <TPad.h>
 #include <TPaveText.h>
 #include <TProfile.h>
diff --git a/core/config/CbmConfigBase.h b/core/config/CbmConfigBase.h
index 7129c88e6779e961f563d50beaeaf42c29604aa2..870816027ae38a107694a37f96ff80375a59dc3d 100644
--- a/core/config/CbmConfigBase.h
+++ b/core/config/CbmConfigBase.h
@@ -12,6 +12,7 @@
 #include <iostream>
 #include <map>
 #include <regex>
+#include <set>
 
 namespace pt = boost::property_tree;
 
diff --git a/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx b/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
index 4e67af6eb69f564647fea877f5f426229bfa3a46..0ed438cff1f8f2b9f2350492732d01d6b89afc1c 100644
--- a/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
+++ b/fles/cosy2019/unpacker/CbmStsCoincHodo.cxx
@@ -16,6 +16,7 @@
 #include "FairRunOnline.h"
 
 #include "TClonesArray.h"
+#include "TFile.h"
 #include "TH1.h"
 #include "TH2.h"
 #include "TH3.h"
diff --git a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
index 088918db986d991705294523536a7367ac19e780..827f2c9537ecf9ce4cf0ec835e6e91cdfc32b1db 100644
--- a/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
+++ b/reco/littrack/cbm/qa/material/CbmLitCheckBrem.cxx
@@ -12,10 +12,13 @@
 #include "TPad.h"
 #include "TStyle.h"
 
-#include <cmath>
 #include <cstdlib>
+#include <iostream>
+
+#include <cmath>
 
-CbmLitCheckBrem::CbmLitCheckBrem() : fMat("iron") {
+CbmLitCheckBrem::CbmLitCheckBrem() : fMat("iron")
+{
   fNofMom = 10;
   fMom.resize(fNofMom);
   fMom[0] = 0.05;  // GeV
@@ -94,7 +97,8 @@ CbmLitCheckBrem::CbmLitCheckBrem() : fMat("iron") {
 
 CbmLitCheckBrem::~CbmLitCheckBrem() {}
 
-void CbmLitCheckBrem::Check() {
+void CbmLitCheckBrem::Check()
+{
   gStyle->SetCanvasColor(kWhite);
   gStyle->SetFrameFillColor(kWhite);
   gStyle->SetPadColor(kWhite);
@@ -107,7 +111,8 @@ void CbmLitCheckBrem::Check() {
   DrawGraphs();
 }
 
-void CbmLitCheckBrem::DrawGraphs() {
+void CbmLitCheckBrem::DrawGraphs()
+{
   TCanvas* c1 = new TCanvas("brem_loss", "c1", 800, 800);
   c1->SetGrid();
 
@@ -166,7 +171,8 @@ void CbmLitCheckBrem::DrawGraphs() {
   c1->SaveAs("brem_loss.svg");
 }
 
-void CbmLitCheckBrem::FillGraphs() {
+void CbmLitCheckBrem::FillGraphs()
+{
   for (Int_t i = 0; i < fNofMom; i++) {
     Double_t p = fMom[i];
 
@@ -175,20 +181,20 @@ void CbmLitCheckBrem::FillGraphs() {
       //       Double_t brem_calc = p / (m.fX0);
       //       Double_t Z2 = (m.fZ*m.fZ);
       //       Double_t X0 = 1./(m.fA * 716.408) * (Z2 * (std::log(184.15/std::pow(Z, 1./3.)) ) + Z*)
-      Double_t X0 =
-        (716.4 * m.fA) / (m.fZ * (m.fZ + 1) * std::log(287. / std::sqrt(m.fZ)));
+      Double_t X0 = (716.4 * m.fA) / (m.fZ * (m.fZ + 1) * std::log(287. / std::sqrt(m.fZ)));
       std::cout << "X0=" << m.fX0 * m.fRho << " X0calc=" << X0 << std::endl;
       Double_t brem_calc = p / X0;
       fCalc[j]->SetPoint(i, p, brem_calc);
 
-      Double_t brem_table = (6.022045e23 / m.fA) * 5.794661e-28 * (m.fZ * m.fZ)
-                            * (p + 0.000511) * m.fPHIRAD[i];  // * m.fRho;
+      Double_t brem_table =
+        (6.022045e23 / m.fA) * 5.794661e-28 * (m.fZ * m.fZ) * (p + 0.000511) * m.fPHIRAD[i];  // * m.fRho;
       fTable[j]->SetPoint(i, p, brem_table);
     }
   }
 }
 
-void CbmLitCheckBrem::CreateGraphs() {
+void CbmLitCheckBrem::CreateGraphs()
+{
   for (int i = 0; i < fNofMaterials; i++) {
     fTable[i] = new TGraph();
     fCalc[i]  = new TGraph();
diff --git a/sim/response/base/CbmDigitization.cxx b/sim/response/base/CbmDigitization.cxx
index 6dd7585f98c720e95a57ad0a6b5f67954f5a03f2..4b57c9a1709c98e6b3ba87f12fcfd62a0b4bb068 100644
--- a/sim/response/base/CbmDigitization.cxx
+++ b/sim/response/base/CbmDigitization.cxx
@@ -26,6 +26,7 @@
 
 #include "TClonesArray.h"
 #include "TGeoManager.h"
+#include "TObjString.h"
 #include "TROOT.h"
 
 #include <cassert>