diff --git a/PWGDQ/Core/AnalysisCut.cxx b/PWGDQ/Core/AnalysisCut.cxx
index 7b5718552ba..ecb1ace04e6 100644
--- a/PWGDQ/Core/AnalysisCut.cxx
+++ b/PWGDQ/Core/AnalysisCut.cxx
@@ -12,6 +12,8 @@
 #include "PWGDQ/Core/AnalysisCut.h"
 
 #include <iostream>
+#include <vector>
+
 using std::cout;
 using std::endl;
 
diff --git a/PWGDQ/Core/MCSignalLibrary.h b/PWGDQ/Core/MCSignalLibrary.h
index df01f60c978..f244c7cbbfc 100644
--- a/PWGDQ/Core/MCSignalLibrary.h
+++ b/PWGDQ/Core/MCSignalLibrary.h
@@ -15,11 +15,14 @@
 #ifndef PWGDQ_CORE_MCSIGNALLIBRARY_H_
 #define PWGDQ_CORE_MCSIGNALLIBRARY_H_
 
-#include <string>
-#include "rapidjson/document.h"
 #include "PWGDQ/Core/MCProng.h"
 #include "PWGDQ/Core/MCSignal.h"
 
+#include "rapidjson/document.h"
+
+#include <string>
+#include <vector>
+
 namespace o2::aod
 {
 namespace dqmcsignals
@@ -36,7 +39,7 @@ MCProng* ParseJSONMCProng(T prongJSON, const char* prongName);
 
 template <typename T>
 bool ValidateJSONMCProng(T prongJSON, const char* prongName);
-}
+} // namespace dqmcsignals
 } // namespace o2::aod
 
 #endif // PWGDQ_CORE_MCSIGNALLIBRARY_H_
diff --git a/PWGDQ/Core/MixingHandler.h b/PWGDQ/Core/MixingHandler.h
index 0e38a89291e..12b4b4dcc1a 100644
--- a/PWGDQ/Core/MixingHandler.h
+++ b/PWGDQ/Core/MixingHandler.h
@@ -14,18 +14,20 @@
 // Class to define and fill histograms
 //
 
-#ifndef MixingHandler_H
-#define MixingHandler_H
+#ifndef PWGDQ_CORE_MIXINGHANDLER_H_
+#define PWGDQ_CORE_MIXINGHANDLER_H_
+
+#include "PWGDQ/Core/HistogramManager.h"
+#include "PWGDQ/Core/VarManager.h"
 
-#include <TNamed.h>
 #include <TArrayF.h>
 #include <TArrayI.h>
 #include <TClonesArray.h>
 #include <TList.h>
+#include <TNamed.h>
 #include <TString.h>
 
-#include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/VarManager.h"
+#include <vector>
 
 class MixingHandler : public TNamed
 {
@@ -61,4 +63,4 @@ class MixingHandler : public TNamed
   ClassDef(MixingHandler, 1);
 };
 
-#endif
+#endif // PWGDQ_CORE_MIXINGHANDLER_H_
diff --git a/PWGDQ/Core/MixingLibrary.cxx b/PWGDQ/Core/MixingLibrary.cxx
index 9cb2eb9029d..37278b90971 100644
--- a/PWGDQ/Core/MixingLibrary.cxx
+++ b/PWGDQ/Core/MixingLibrary.cxx
@@ -13,6 +13,9 @@
 //
 #include "PWGDQ/Core/MixingLibrary.h"
 
+#include <string>
+#include <vector>
+
 void o2::aod::dqmixing::SetUpMixing(MixingHandler* mh, const char* mixingVarible)
 {
   std::string nameStr = mixingVarible;
diff --git a/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx b/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
index 9d578c4e916..22d5d78e6f7 100644
--- a/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
+++ b/PWGDQ/TableProducer/generatedQuarkoniaMC.cxx
@@ -50,7 +50,9 @@
 #include <cstdlib>
 #include <iterator>
 #include <map>
+#include <string>
 #include <utility>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/PWGDQ/TableProducer/tableMakerJpsiHf.cxx b/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
index 7ae949c40d1..d5690ab7b78 100644
--- a/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
+++ b/PWGDQ/TableProducer/tableMakerJpsiHf.cxx
@@ -14,23 +14,25 @@
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 /// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN
 
-#include <string>
-
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
 #include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/HistogramManager.h"
 #include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/DataModel/CandidateReconstructionTables.h"
 #include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/PWGDQ/Tasks/DalitzSelection.cxx b/PWGDQ/Tasks/DalitzSelection.cxx
index c0023ff8de7..4312434c2e6 100644
--- a/PWGDQ/Tasks/DalitzSelection.cxx
+++ b/PWGDQ/Tasks/DalitzSelection.cxx
@@ -37,6 +37,11 @@
 #include "Framework/DataTypes.h"
 #include "Framework/runDataProcessing.h"
 
+#include <map>
+#include <memory>
+#include <string>
+#include <vector>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/PWGDQ/Tasks/dqCorrelation.cxx b/PWGDQ/Tasks/dqCorrelation.cxx
index ec240fa66fe..f6ba8f3bd39 100644
--- a/PWGDQ/Tasks/dqCorrelation.cxx
+++ b/PWGDQ/Tasks/dqCorrelation.cxx
@@ -49,6 +49,8 @@
 #include <algorithm>
 #include <cmath>
 #include <iostream>
+#include <memory>
+#include <string>
 #include <vector>
 
 using std::cout;
diff --git a/PWGDQ/Tasks/muonDCA.cxx b/PWGDQ/Tasks/muonDCA.cxx
index 897ed273322..a607ad16b4b 100644
--- a/PWGDQ/Tasks/muonDCA.cxx
+++ b/PWGDQ/Tasks/muonDCA.cxx
@@ -23,6 +23,8 @@
 #include "Framework/runDataProcessing.h"
 #include "GlobalTracking/MatchGlobalFwd.h"
 
+#include <string>
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::aod;
diff --git a/PWGDQ/Tasks/taskFwdTrackPid.cxx b/PWGDQ/Tasks/taskFwdTrackPid.cxx
index cbe6e233630..33b89b0e745 100644
--- a/PWGDQ/Tasks/taskFwdTrackPid.cxx
+++ b/PWGDQ/Tasks/taskFwdTrackPid.cxx
@@ -13,38 +13,44 @@
 /// \brief Task for the analysis of forward PID with MFT
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 
-#include <iostream>
-#include <vector>
-#include <algorithm>
-#include <TH1F.h>
-#include <TH3F.h>
-#include <THashList.h>
-#include <TList.h>
-#include <TString.h>
-#include "CCDB/BasicCCDBManager.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
-#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/Core/AnalysisCompositeCut.h"
+#include "PWGDQ/Core/AnalysisCut.h"
+#include "PWGDQ/Core/CutsLibrary.h"
 #include "PWGDQ/Core/HistogramManager.h"
-#include "PWGDQ/Core/MixingHandler.h"
+#include "PWGDQ/Core/HistogramsLibrary.h"
 #include "PWGDQ/Core/MCSignal.h"
 #include "PWGDQ/Core/MCSignalLibrary.h"
-#include "PWGDQ/Core/AnalysisCut.h"
-#include "PWGDQ/Core/AnalysisCompositeCut.h"
-#include "PWGDQ/Core/HistogramsLibrary.h"
-#include "PWGDQ/Core/CutsLibrary.h"
+#include "PWGDQ/Core/MixingHandler.h"
 #include "PWGDQ/Core/MixingLibrary.h"
+#include "PWGDQ/Core/VarManager.h"
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+
+#include "CCDB/BasicCCDBManager.h"
 #include "DataFormatsParameters/GRPMagField.h"
-#include "Field/MagneticField.h"
-#include "TGeoGlobalMagField.h"
-#include "DetectorsBase/Propagator.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "DetectorsBase/GeometryManager.h"
+#include "DetectorsBase/Propagator.h"
+#include "Field/MagneticField.h"
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 #include "ITSMFTBase/DPLAlpideParam.h"
-#include "Common/CCDB/EventSelectionParams.h"
+
+#include "TGeoGlobalMagField.h"
+#include <TH1F.h>
+#include <TH3F.h>
+#include <THashList.h>
+#include <TList.h>
+#include <TString.h>
+
+#include <algorithm>
+#include <iostream>
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
@@ -150,7 +156,7 @@ struct taskFwdTrackPid {
       for (const auto& mftTrack : mftTracks) {
         if (TMath::Abs(mftTrack.fwdDcaX()) < fConfigMaxDCA && TMath::Abs(mftTrack.fwdDcaY()) < fConfigMaxDCA) {
           if (downSampleFactor < 1.) {
-            float pseudoRndm = mftTrack.pt() * 1000. - (int64_t)(mftTrack.pt() * 1000);
+            float pseudoRndm = mftTrack.pt() * 1000. - static_cast<int64_t>(mftTrack.pt() * 1000);
             if (pseudoRndm >= downSampleFactor) {
               continue;
             }
diff --git a/PWGDQ/Tasks/taskJpsiHf.cxx b/PWGDQ/Tasks/taskJpsiHf.cxx
index ef415259a02..fcc78628b20 100644
--- a/PWGDQ/Tasks/taskJpsiHf.cxx
+++ b/PWGDQ/Tasks/taskJpsiHf.cxx
@@ -14,20 +14,22 @@
 /// \author Luca Micheletti <luca.micheletti@to.infn.it>, INFN
 /// \author Fabrizio Grosa <fabrizio.grosa@cern.ch>, CERN
 
-#include <string>
+#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include "PWGHF/Core/HfHelper.h"
+#include "PWGHF/DataModel/CandidateReconstructionTables.h"
+#include "PWGHF/DataModel/CandidateSelectionTables.h"
+#include "PWGHF/Utils/utilsAnalysis.h"
+
+#include "Common/Core/RecoDecay.h"
 
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "Common/Core/RecoDecay.h"
-
-#include "PWGHF/Core/HfHelper.h"
-#include "PWGHF/DataModel/CandidateReconstructionTables.h"
-#include "PWGHF/DataModel/CandidateSelectionTables.h"
-#include "PWGHF/Utils/utilsAnalysis.h"
-#include "PWGDQ/DataModel/ReducedInfoTables.h"
+#include <memory>
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::analysis;
diff --git a/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx b/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
index 4914658ae81..ff161fbafc1 100644
--- a/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
+++ b/PWGDQ/Tasks/taskMuonMchTrkEfficiency.cxx
@@ -19,11 +19,14 @@
 /// \author Zaida Conesa del Valle <zaida.conesa.del.valle@cern.ch>
 ///
 
+#include "PWGDQ/DataModel/MchTrkEffTables.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
 
-#include "PWGDQ/DataModel/MchTrkEffTables.h"
+#include <string>
+#include <vector>
 
 using namespace o2;
 using namespace o2::aod;