diff --git a/Common/TableProducer/qVectorsTable.cxx b/Common/TableProducer/qVectorsTable.cxx
index ce5152aace6..ba8af37b094 100644
--- a/Common/TableProducer/qVectorsTable.cxx
+++ b/Common/TableProducer/qVectorsTable.cxx
@@ -45,7 +45,6 @@
 
 #include <TComplex.h>
 #include <TH3.h>
-#include <TMath.h>
 #include <TProfile3D.h>
 #include <TString.h>
 
diff --git a/Common/Tasks/centralityQa.cxx b/Common/Tasks/centralityQa.cxx
index ab7bd502377..2fc8ed715a3 100644
--- a/Common/Tasks/centralityQa.cxx
+++ b/Common/Tasks/centralityQa.cxx
@@ -22,6 +22,8 @@
 #include <TH1.h>
 #include <TProfile.h>
 
+#include <cstdlib>
+
 using namespace o2;
 using namespace o2::framework;
 
diff --git a/Common/Tasks/centralityStudypp.cxx b/Common/Tasks/centralityStudypp.cxx
index a43f59e1973..47f1e540480 100644
--- a/Common/Tasks/centralityStudypp.cxx
+++ b/Common/Tasks/centralityStudypp.cxx
@@ -32,7 +32,6 @@
 #include <TList.h>
 #include <TProfile.h>
 
-#include <cstdint>
 #include <format>
 #include <map>
 #include <memory>
@@ -331,7 +330,7 @@ struct centralityStudypp {
     float multNTracksPV = collision.multNTracksPV();
 
     if (applyVertexZEqualization) {
-      float epsilon = 1e-2; // average value after which this collision will be disregarded
+      float epsilon = 1e-2;     // average value after which this collision will be disregarded
       float maxVertexZ = 15.0f; // max value for any equalization attempt
 
       // same defaults as multCentTable in case of unhealthy signals
diff --git a/Common/Tasks/checkDataModelMC.cxx b/Common/Tasks/checkDataModelMC.cxx
index 343c577853d..799cf68a8e2 100644
--- a/Common/Tasks/checkDataModelMC.cxx
+++ b/Common/Tasks/checkDataModelMC.cxx
@@ -25,6 +25,7 @@
 
 #include <TH1.h>
 
+#include <cstdint>
 #include <limits>
 #include <memory>
 
diff --git a/Common/Tasks/qVectorsCorrection.cxx b/Common/Tasks/qVectorsCorrection.cxx
index b879cdaeb4c..e99017b1397 100644
--- a/Common/Tasks/qVectorsCorrection.cxx
+++ b/Common/Tasks/qVectorsCorrection.cxx
@@ -39,6 +39,7 @@
 
 #include <sys/types.h>
 
+#include <concepts>
 #include <string>
 #include <vector>