From 75c0bdb16a3bcffed805ff338e3477fef2a8201a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?=
 <26327373+vkucera@users.noreply.github.com>
Date: Mon, 20 Apr 2026 12:50:46 +0200
Subject: [PATCH 1/2] Fix

---
 ALICE3/Core/FlatLutEntry.cxx                        |  6 ++++++
 ALICE3/Core/FlatLutEntry.h                          |  1 +
 ALICE3/Core/FlatLutWriter.cxx                       |  7 ++++---
 ALICE3/Core/FlatLutWriter.h                         |  7 +++++++
 ALICE3/Core/FlatTrackSmearer.cxx                    | 13 +++++++++++++
 ALICE3/Core/FlatTrackSmearer.h                      |  4 ++++
 .../Core/FemtoUniverseTrackSelection.h              |  1 -
 ...ersePairTaskTrackTrackSpherHarMultKtExtended.cxx |  1 +
 PWGCF/Flow/Tasks/pidFlowPtCorr.cxx                  |  3 +--
 PWGCF/TableProducer/filter2Prong.cxx                |  6 ++++++
 .../DataModel/LongRangeDerived.h                    |  2 ++
 .../TableProducer/longrangeMaker.cxx                |  6 ++++++
 .../Tasks/lambdaR2Correlation.cxx                   |  1 -
 .../Tasks/lambdaSpinPolarization.cxx                |  2 ++
 .../Tasks/particleOriginAnalysis.cxx                |  2 --
 PWGDQ/Tasks/filterPPwithAssociation.cxx             |  3 ++-
 PWGEM/Dilepton/Tasks/taggingHFE.cxx                 |  3 ---
 PWGEM/Dilepton/Utils/SemiCharmTag.h                 |  6 ++++--
 .../TableProducer/secondaryVertexReconstruction.cxx |  1 -
 PWGJE/Tasks/chargedJetHadron.cxx                    |  1 -
 PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx  |  1 -
 21 files changed, 59 insertions(+), 18 deletions(-)

diff --git a/ALICE3/Core/FlatLutEntry.cxx b/ALICE3/Core/FlatLutEntry.cxx
index 1e0c6cef902..5110e9bff4c 100644
--- a/ALICE3/Core/FlatLutEntry.cxx
+++ b/ALICE3/Core/FlatLutEntry.cxx
@@ -14,7 +14,13 @@
 #include <Framework/Logger.h>
 #include <Framework/RuntimeError.h>
 
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
 #include <cstring>
+#include <fstream>
+#include <ios>
+#include <span>
 
 namespace o2::delphes
 {
diff --git a/ALICE3/Core/FlatLutEntry.h b/ALICE3/Core/FlatLutEntry.h
index decde671a06..7786523170b 100644
--- a/ALICE3/Core/FlatLutEntry.h
+++ b/ALICE3/Core/FlatLutEntry.h
@@ -13,6 +13,7 @@
 #define ALICE3_CORE_FLATLUTENTRY_H_
 
 #include <cmath>
+#include <cstddef>
 #include <cstdint>
 #include <fstream>
 #include <span>
diff --git a/ALICE3/Core/FlatLutWriter.cxx b/ALICE3/Core/FlatLutWriter.cxx
index 3a4df00ff00..fa98273b46d 100644
--- a/ALICE3/Core/FlatLutWriter.cxx
+++ b/ALICE3/Core/FlatLutWriter.cxx
@@ -11,6 +11,7 @@
 
 #include "ALICE3/Core/FlatLutWriter.h"
 
+#include "FlatLutEntry.h"
 #include "TrackUtilities.h"
 
 #include "ALICE3/Core/FlatTrackSmearer.h"
@@ -22,7 +23,6 @@
 #include <TDatabasePDG.h>
 #include <TGraph.h>
 #include <TLorentzVector.h>
-#include <TMatrixD.h>
 #include <TMatrixDSymEigen.h>
 #include <TMatrixDSymfwd.h>
 #include <TMatrixDfwd.h>
@@ -30,9 +30,10 @@
 #include <TString.h>
 #include <TVectorDfwd.h>
 
-#include <Rtypes.h>
-
+#include <cmath>
 #include <cstdlib>
+#include <fstream>
+#include <string>
 
 using namespace o2::delphes;
 
diff --git a/ALICE3/Core/FlatLutWriter.h b/ALICE3/Core/FlatLutWriter.h
index f2240b160c4..fd29a174c86 100644
--- a/ALICE3/Core/FlatLutWriter.h
+++ b/ALICE3/Core/FlatLutWriter.h
@@ -14,6 +14,13 @@
 
 #include "ALICE3/Core/FastTracker.h"
 #include "ALICE3/Core/FlatLutEntry.h"
+
+#include <ReconstructionDataFormats/PID.h>
+
+#include <TGraph.h>
+
+#include <cstddef>
+#include <string>
 namespace o2::fastsim
 {
 using lutEntry_t = o2::delphes::lutEntry_t;
diff --git a/ALICE3/Core/FlatTrackSmearer.cxx b/ALICE3/Core/FlatTrackSmearer.cxx
index db56f8ab8d8..e063ce1073f 100644
--- a/ALICE3/Core/FlatTrackSmearer.cxx
+++ b/ALICE3/Core/FlatTrackSmearer.cxx
@@ -11,12 +11,25 @@
 
 #include "FlatTrackSmearer.h"
 
+#include "FlatLutEntry.h"
+
 #include "ALICE3/Core/GeometryContainer.h"
 
+#include <CommonConstants/PhysicsConstants.h>
 #include <Framework/RuntimeError.h>
 
 #include <TRandom.h>
 
+#include <fairlogger/Logger.h>
+
+#include <cmath>
+#include <cstddef>
+#include <cstdint>
+#include <cstdlib>
+#include <fstream>
+#include <span>
+#include <string>
+
 namespace o2::delphes
 {
 int TrackSmearer::getIndexPDG(int pdg)
diff --git a/ALICE3/Core/FlatTrackSmearer.h b/ALICE3/Core/FlatTrackSmearer.h
index 90ecc6feab5..e7943d7c1c0 100644
--- a/ALICE3/Core/FlatTrackSmearer.h
+++ b/ALICE3/Core/FlatTrackSmearer.h
@@ -17,6 +17,10 @@
 #include <CCDB/BasicCCDBManager.h>
 #include <ReconstructionDataFormats/Track.h>
 
+#include <cstddef>
+#include <cstdint>
+#include <span>
+
 namespace o2::delphes
 {
 /**
diff --git a/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h b/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
index ed83b9e6e19..82a7d075840 100644
--- a/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
+++ b/PWGCF/FemtoUniverse/Core/FemtoUniverseTrackSelection.h
@@ -22,7 +22,6 @@
 #include "PWGCF/FemtoUniverse/Core/FemtoUniverseSelection.h"
 #include "PWGCF/FemtoUniverse/DataModel/FemtoDerived.h"
 
-#include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
 
diff --git a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
index f33b8ff24a7..4c5ff1b4cc5 100644
--- a/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
+++ b/PWGCF/FemtoUniverse/Tasks/femtoUniversePairTaskTrackTrackSpherHarMultKtExtended.cxx
@@ -50,6 +50,7 @@
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
+#include <optional>
 #include <string>
 #include <vector>
 
diff --git a/PWGCF/Flow/Tasks/pidFlowPtCorr.cxx b/PWGCF/Flow/Tasks/pidFlowPtCorr.cxx
index 4c2a50c2049..a19e1bc506e 100644
--- a/PWGCF/Flow/Tasks/pidFlowPtCorr.cxx
+++ b/PWGCF/Flow/Tasks/pidFlowPtCorr.cxx
@@ -58,11 +58,10 @@
 
 #include <sys/types.h>
 
-#include <RtypesCore.h>
-
 #include <algorithm>
 #include <chrono>
 #include <cmath>
+#include <cstddef>
 #include <cstdint>
 #include <map>
 #include <memory>
diff --git a/PWGCF/TableProducer/filter2Prong.cxx b/PWGCF/TableProducer/filter2Prong.cxx
index da28c853e3b..6ed360c8b1b 100644
--- a/PWGCF/TableProducer/filter2Prong.cxx
+++ b/PWGCF/TableProducer/filter2Prong.cxx
@@ -19,7 +19,9 @@
 #include "PWGHF/DataModel/TrackIndexSkimmingTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/RecoDecay.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
@@ -29,7 +31,10 @@
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
+#include <Framework/BinningPolicy.h>
 #include <Framework/Configurable.h>
+#include <Framework/GroupedCombinations.h>
+#include <Framework/HistogramSpec.h>
 #include <Framework/InitContext.h>
 #include <Framework/runDataProcessing.h>
 #include <ReconstructionDataFormats/PID.h>
@@ -44,6 +49,7 @@
 #include <algorithm>
 #include <array>
 #include <cstddef>
+#include <cstdint>
 #include <experimental/type_traits>
 #include <iterator>
 #include <memory>
diff --git a/PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h b/PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h
index 5189279aae7..4d4f5f0b90a 100644
--- a/PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h
+++ b/PWGCF/TwoParticleCorrelations/DataModel/LongRangeDerived.h
@@ -23,6 +23,8 @@
 #include "Framework/ASoA.h"
 #include "Framework/AnalysisDataModel.h"
 
+#include <cstdint>
+
 namespace o2::aod
 {
 namespace lrcorrmccolltable
diff --git a/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx b/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx
index fcc5cfa15a9..b318d45d404 100644
--- a/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx
+++ b/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx
@@ -30,6 +30,7 @@
 #include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/PIDResponseTOF.h"
@@ -54,15 +55,20 @@
 #include <MathUtils/Utils.h>
 #include <ReconstructionDataFormats/PID.h>
 
+#include <TPDGCode.h>
+
 #include <sys/types.h>
 
+#include <algorithm>
 #include <array>
 #include <chrono>
 #include <cmath>
 #include <cstdint>
 #include <cstdio>
 #include <cstdlib>
+#include <iterator>
 #include <string>
+#include <string_view>
 #include <vector>
 
 using namespace o2;
diff --git a/PWGCF/TwoParticleCorrelations/Tasks/lambdaR2Correlation.cxx b/PWGCF/TwoParticleCorrelations/Tasks/lambdaR2Correlation.cxx
index 5643f73d107..a8fdbe2e45c 100644
--- a/PWGCF/TwoParticleCorrelations/Tasks/lambdaR2Correlation.cxx
+++ b/PWGCF/TwoParticleCorrelations/Tasks/lambdaR2Correlation.cxx
@@ -46,7 +46,6 @@
 #include <TPDGCode.h>
 #include <TString.h>
 
-#include <array>
 #include <cmath>
 #include <cstdint>
 #include <string>
diff --git a/PWGCF/TwoParticleCorrelations/Tasks/lambdaSpinPolarization.cxx b/PWGCF/TwoParticleCorrelations/Tasks/lambdaSpinPolarization.cxx
index c743e8df4dd..9263b4de6aa 100644
--- a/PWGCF/TwoParticleCorrelations/Tasks/lambdaSpinPolarization.cxx
+++ b/PWGCF/TwoParticleCorrelations/Tasks/lambdaSpinPolarization.cxx
@@ -48,8 +48,10 @@
 #include <TPDGCode.h>
 #include <TString.h>
 
+#include <algorithm>
 #include <array>
 #include <cmath>
+#include <cstddef>
 #include <cstdint>
 #include <random>
 #include <string>
diff --git a/PWGCF/TwoParticleCorrelations/Tasks/particleOriginAnalysis.cxx b/PWGCF/TwoParticleCorrelations/Tasks/particleOriginAnalysis.cxx
index 1b72e99ae3f..e36f77c5683 100644
--- a/PWGCF/TwoParticleCorrelations/Tasks/particleOriginAnalysis.cxx
+++ b/PWGCF/TwoParticleCorrelations/Tasks/particleOriginAnalysis.cxx
@@ -25,7 +25,6 @@
 
 #include "Common/Core/TableHelper.h"
 
-#include <CommonConstants/PhysicsConstants.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisTask.h>
 #include <Framework/HistogramRegistry.h>
@@ -37,7 +36,6 @@
 #include <TH1.h>
 #include <TH2.h>
 #include <TH3.h>
-#include <TPDGCode.h>
 #include <TString.h>
 
 #include <sys/types.h>
diff --git a/PWGDQ/Tasks/filterPPwithAssociation.cxx b/PWGDQ/Tasks/filterPPwithAssociation.cxx
index 8c606b1d98c..cf7c18ce8f6 100644
--- a/PWGDQ/Tasks/filterPPwithAssociation.cxx
+++ b/PWGDQ/Tasks/filterPPwithAssociation.cxx
@@ -29,6 +29,7 @@
 #include <CCDB/BasicCCDBManager.h>
 #include <DataFormatsParameters/GRPMagField.h>
 #include <DetectorsBase/GeometryManager.h>
+#include <DetectorsBase/MatLayerCylSet.h>
 #include <DetectorsBase/Propagator.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
@@ -304,7 +305,7 @@ struct DQTrackSelection {
         DefineHistograms(fHistMan, cutName.Data(), fConfigHistClassesMu.value); // define all histograms
       }
 
-      VarManager::SetUseVars(fHistMan->GetUsedVars());                       // provide the list of required variables so that VarManager knows what to fill
+      VarManager::SetUseVars(fHistMan->GetUsedVars()); // provide the list of required variables so that VarManager knows what to fill
       fOutputList.setObject(fHistMan->GetMainHistogramList());
     }
 
diff --git a/PWGEM/Dilepton/Tasks/taggingHFE.cxx b/PWGEM/Dilepton/Tasks/taggingHFE.cxx
index 6a4ca0915e7..6f0d7156167 100644
--- a/PWGEM/Dilepton/Tasks/taggingHFE.cxx
+++ b/PWGEM/Dilepton/Tasks/taggingHFE.cxx
@@ -15,7 +15,6 @@
 
 #include "PWGEM/Dilepton/Utils/MCUtilities.h"
 #include "PWGEM/Dilepton/Utils/SemiCharmTag.h"
-#include "PWGLF/DataModel/LFStrangenessPIDTables.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
 #include "Common/Core/RecoDecay.h"
@@ -51,12 +50,10 @@
 #include <Math/Vector4Dfwd.h>
 #include <TH1.h>
 
-#include <algorithm>
 #include <array>
 #include <cmath>
 #include <cstdint>
 #include <iostream>
-#include <iterator>
 #include <string>
 #include <string_view>
 #include <utility>
diff --git a/PWGEM/Dilepton/Utils/SemiCharmTag.h b/PWGEM/Dilepton/Utils/SemiCharmTag.h
index 42754d14620..ee8c293b448 100644
--- a/PWGEM/Dilepton/Utils/SemiCharmTag.h
+++ b/PWGEM/Dilepton/Utils/SemiCharmTag.h
@@ -20,15 +20,17 @@
 #include "Common/Core/trackUtilities.h"
 
 #include <CommonConstants/PhysicsConstants.h>
-#include <ReconstructionDataFormats/DCA.h>
 #include <ReconstructionDataFormats/PID.h>
 #include <ReconstructionDataFormats/Track.h>
-#include <ReconstructionDataFormats/TrackParametrization.h>
 #include <ReconstructionDataFormats/TrackParametrizationWithError.h>
 
 #include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
 #include <Math/Vector4Dfwd.h>
 
+#include <fairlogger/Logger.h>
+
+#include <array>
+
 namespace o2::aod::pwgem::dilepton::utils
 {
 
diff --git a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx
index 1afe05455f2..33e82ee6b33 100644
--- a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx
+++ b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx
@@ -47,7 +47,6 @@
 #include <cstddef>
 #include <stdexcept>
 #include <string>
-#include <utility>
 #include <vector>
 
 using namespace o2;
diff --git a/PWGJE/Tasks/chargedJetHadron.cxx b/PWGJE/Tasks/chargedJetHadron.cxx
index c7224f12110..f08f17b1433 100644
--- a/PWGJE/Tasks/chargedJetHadron.cxx
+++ b/PWGJE/Tasks/chargedJetHadron.cxx
@@ -36,7 +36,6 @@
 #include <THn.h>
 
 #include <cmath>
-#include <limits>
 #include <string>
 #include <type_traits>
 #include <vector>
diff --git a/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx b/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
index 5bd49843543..0beb0bd3a46 100644
--- a/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
+++ b/PWGLF/Tasks/Strangeness/derivedcascadeanalysis.cxx
@@ -24,7 +24,6 @@
 #include <CCDB/BasicCCDBManager.h>
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/PhysicsConstants.h>
-#include <DataFormatsITSMFT/DPLAlpideParam.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>

From 4984fdf79518dea8eea05a2951020d0494bdb752 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?=
 <26327373+vkucera@users.noreply.github.com>
Date: Mon, 20 Apr 2026 12:54:42 +0200
Subject: [PATCH 2/2] Fix includes

---
 PWGLF/DataModel/LFStrangenessTables.h                     | 1 -
 PWGLF/TableProducer/Strangeness/cascderivedqaanalysis.cxx | 4 ++--
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/PWGLF/DataModel/LFStrangenessTables.h b/PWGLF/DataModel/LFStrangenessTables.h
index 33d06f159d9..777b2675c5f 100644
--- a/PWGLF/DataModel/LFStrangenessTables.h
+++ b/PWGLF/DataModel/LFStrangenessTables.h
@@ -19,7 +19,6 @@
 #include "Common/Core/RecoDecay.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/McCollisionExtra.h" // IWYU pragma: keep (FIXME: not used, remove asap)
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/Qvectors.h"
 
diff --git a/PWGLF/TableProducer/Strangeness/cascderivedqaanalysis.cxx b/PWGLF/TableProducer/Strangeness/cascderivedqaanalysis.cxx
index b23c7bf2f70..6ccb65c9d4d 100644
--- a/PWGLF/TableProducer/Strangeness/cascderivedqaanalysis.cxx
+++ b/PWGLF/TableProducer/Strangeness/cascderivedqaanalysis.cxx
@@ -18,16 +18,16 @@
 #include "Common/CCDB/EventSelectionParams.h"
 #include "Common/Core/RecoDecay.h"
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include <CommonConstants/PhysicsConstants.h>
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
+#include <Framework/AnalysisTask.h>
 #include <Framework/Configurable.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
 #include <Framework/InitContext.h>
+#include <Framework/runDataProcessing.h>
 
 #include <TH1.h>
 #include <TPDGCode.h>