From 5ee4b70099020ea59ad56a454edb3fe8ce9a03db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?=
 <26327373+vkucera@users.noreply.github.com>
Date: Tue, 29 Sep 2026 23:35:02 +0200
Subject: [PATCH] Fix includes

---
 Common/TableProducer/propagationServiceV2.cxx            | 2 +-
 PWGCF/Femto3D/Tasks/multEstimator.cxx                    | 9 +++++----
 .../TableProducer/longrangeMaker.cxx                     | 1 -
 PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx      | 1 +
 .../TwoParticleCorrelations/Tasks/flowDecorrelation.cxx  | 1 +
 PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx           | 5 +++--
 .../TableProducer/photonconversionbuilder.cxx            | 4 ++++
 .../TableProducer/photonconversionbuilderTmpTable.cxx    | 4 ++++
 .../TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx | 6 ++++++
 .../TableProducer/skimmerPrimaryElectronFromDalitzEE.h   | 1 -
 .../skimmerPrimaryElectronFromDalitzEETmpTable.cxx       | 6 ++++++
 PWGEM/PhotonMeson/Utils/AnalyticV0.h                     | 3 ++-
 PWGEM/PhotonMeson/Utils/PairUtilities.h                  | 4 ++--
 PWGJE/TableProducer/derivedDataSelector.cxx              | 1 +
 PWGJE/TableProducer/derivedDataWriter.cxx                | 1 +
 PWGLF/TableProducer/Common/zdcvector.cxx                 | 1 -
 .../TableProducer/Resonances/xi1530kaonreducedtable.cxx  | 6 +++++-
 .../TableProducer/Strangeness/doubleOmegaTreeCreator.cxx | 1 -
 .../GlobalEventProperties/PseudorapidityDensityMFT.cxx   | 1 +
 PWGLF/Tasks/Strangeness/derivedXi0analysis.cxx           | 3 ---
 20 files changed, 43 insertions(+), 18 deletions(-)

diff --git a/Common/TableProducer/propagationServiceV2.cxx b/Common/TableProducer/propagationServiceV2.cxx
index 0fb3f09b6b4..c22544027fa 100644
--- a/Common/TableProducer/propagationServiceV2.cxx
+++ b/Common/TableProducer/propagationServiceV2.cxx
@@ -37,8 +37,8 @@
 #include <DetectorsBase/Propagator.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/InitContext.h>
 #include <Framework/runDataProcessing.h>
diff --git a/PWGCF/Femto3D/Tasks/multEstimator.cxx b/PWGCF/Femto3D/Tasks/multEstimator.cxx
index fc284861c28..1d6b9e845eb 100644
--- a/PWGCF/Femto3D/Tasks/multEstimator.cxx
+++ b/PWGCF/Femto3D/Tasks/multEstimator.cxx
@@ -14,20 +14,19 @@
 /// \since 31 May 2023
 
 #include "PWGCF/Femto3D/DataModel/PIDutils.h"
-#include "PWGCF/Femto3D/DataModel/singletrackselector.h"
 
+#include "Common/CCDB/EventSelectionParams.h"
 #include "Common/CCDB/RCTSelectionFlags.h"
 #include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseITS.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
 #include <CCDB/BasicCCDBManager.h>
-#include <CommonConstants/MathConstants.h>
-#include <DetectorsBase/Propagator.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
@@ -42,9 +41,11 @@
 
 #include <TH1.h>
 #include <TH2.h>
+#include <TString.h>
 
-#include <array>
 #include <cmath>
+#include <cstdint>
+#include <memory>
 #include <string>
 #include <utility>
 #include <vector>
diff --git a/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx b/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx
index b49e5a6f554..d9d528c64b0 100644
--- a/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx
+++ b/PWGCF/TwoParticleCorrelations/TableProducer/longrangeMaker.cxx
@@ -62,7 +62,6 @@
 
 #include <algorithm>
 #include <array>
-#include <bitset>
 #include <chrono>
 #include <cmath>
 #include <cstdint>
diff --git a/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx b/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
index 54e9e909adf..0458b99b65a 100644
--- a/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
+++ b/PWGCF/TwoParticleCorrelations/Tasks/diHadronCor.cxx
@@ -43,6 +43,7 @@
 #include <TH3.h>
 #include <TPDGCode.h>
 #include <TRandom3.h>
+#include <TString.h>
 
 #include <algorithm>
 #include <chrono>
diff --git a/PWGCF/TwoParticleCorrelations/Tasks/flowDecorrelation.cxx b/PWGCF/TwoParticleCorrelations/Tasks/flowDecorrelation.cxx
index 7ab6ca2f262..5780cffa5e6 100644
--- a/PWGCF/TwoParticleCorrelations/Tasks/flowDecorrelation.cxx
+++ b/PWGCF/TwoParticleCorrelations/Tasks/flowDecorrelation.cxx
@@ -44,6 +44,7 @@
 #include <TFile.h>
 #include <TH3.h>
 #include <TRandom3.h>
+#include <TString.h>
 
 #include <algorithm>
 #include <array>
diff --git a/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx b/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
index d31a296d0ac..5d63e2e5e17 100644
--- a/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
+++ b/PWGDQ/TableProducer/tableMakerMC_withAssoc.cxx
@@ -66,6 +66,7 @@
 #include <RtypesCore.h>
 
 #include <array>
+#include <cstddef>
 #include <cstdint>
 #include <cstdlib>
 #include <map>
@@ -985,7 +986,7 @@ struct TableMakerMC {
 
         mcflags = 0;
         int isig = 0; // runs over the MC signals
-        int j = 0; // runs over the track cuts
+        int j = 0;    // runs over the track cuts
         // check all the specified signals and fill histograms for MC truth matched tracks
         for (const auto& sig : fMCSignals) {
           if (sig->CheckSignal(true, mctrack)) {
@@ -1239,7 +1240,7 @@ struct TableMakerMC {
 
           mcflags = 0;
           int isig = 0; // runs over the MC signals
-          int j = 0; // runs over the track cuts
+          int j = 0;    // runs over the track cuts
           // check all the specified signals and fill histograms for MC truth matched tracks
           for (const auto& sig : fMCSignals) {
             if (sig->CheckSignal(true, mctrack)) {
diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
index 714a3ca3f72..6ee033f2817 100644
--- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
+++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.cxx
@@ -16,6 +16,10 @@
 
 #include "PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h"
 
+#include <Framework/AnalysisTask.h>
+#include <Framework/ConfigContext.h>
+#include <Framework/WorkflowSpec.h>
+
 o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& context)
 {
   return o2::framework::WorkflowSpec{
diff --git a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx
index 6b7927b6340..0346617358c 100644
--- a/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx
+++ b/PWGEM/PhotonMeson/TableProducer/photonconversionbuilderTmpTable.cxx
@@ -16,6 +16,10 @@
 
 #include "PWGEM/PhotonMeson/TableProducer/photonconversionbuilder.h"
 
+#include <Framework/AnalysisTask.h>
+#include <Framework/ConfigContext.h>
+#include <Framework/WorkflowSpec.h>
+
 o2::framework::WorkflowSpec defineDataProcessing(o2::framework::ConfigContext const& context)
 {
   return o2::framework::WorkflowSpec{
diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx
index 97fe86ece34..1efd61d1ab7 100644
--- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx
+++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.cxx
@@ -15,6 +15,12 @@
 
 #include "PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h"
 
+#include "PID/PIDTOFParamService.h"
+
+#include <Framework/AnalysisTask.h>
+#include <Framework/ConfigContext.h>
+#include <Framework/WorkflowSpec.h>
+
 using namespace o2::framework;
 using namespace o2::aod;
 using namespace o2::framework::expressions;
diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h
index ed671564446..d89f3b002a1 100644
--- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h
+++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h
@@ -36,7 +36,6 @@
 #include <Framework/ASoAHelpers.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
-#include <Framework/AnalysisTask.h>
 #include <Framework/Concepts.h>
 #include <Framework/Configurable.h>
 #include <Framework/HistogramRegistry.h>
diff --git a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx
index 4587e8d6975..32ba2e5f287 100644
--- a/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx
+++ b/PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEETmpTable.cxx
@@ -15,6 +15,12 @@
 
 #include "PWGEM/PhotonMeson/TableProducer/skimmerPrimaryElectronFromDalitzEE.h"
 
+#include "PID/PIDTOFParamService.h"
+
+#include <Framework/AnalysisTask.h>
+#include <Framework/ConfigContext.h>
+#include <Framework/WorkflowSpec.h>
+
 using namespace o2::framework;
 using namespace o2::aod;
 using namespace o2::framework::expressions;
diff --git a/PWGEM/PhotonMeson/Utils/AnalyticV0.h b/PWGEM/PhotonMeson/Utils/AnalyticV0.h
index 90bfb05b272..ede542509cf 100644
--- a/PWGEM/PhotonMeson/Utils/AnalyticV0.h
+++ b/PWGEM/PhotonMeson/Utils/AnalyticV0.h
@@ -22,10 +22,11 @@
 
 #include <CommonConstants/MathConstants.h>
 #include <DCAFitter/DCAFitterN.h>
-#include <MathUtils/Cartesian.h>
 #include <ReconstructionDataFormats/HelixHelper.h>
 #include <ReconstructionDataFormats/Track.h>
 
+#include <GPUROOTCartesianFwd.h>
+
 #include <algorithm>
 #include <array>
 #include <cmath>
diff --git a/PWGEM/PhotonMeson/Utils/PairUtilities.h b/PWGEM/PhotonMeson/Utils/PairUtilities.h
index e4deb542747..87c45f4ad99 100644
--- a/PWGEM/PhotonMeson/Utils/PairUtilities.h
+++ b/PWGEM/PhotonMeson/Utils/PairUtilities.h
@@ -21,9 +21,9 @@
 #include <Framework/Concepts.h>
 
 #include <Math/GenVector/Boost.h>
-#include <Math/Vector3D.h>
+#include <Math/Vector3D.h> // IWYU pragma: keep
 #include <Math/Vector3Dfwd.h>
-#include <Math/Vector4D.h>
+#include <Math/Vector4D.h> // IWYU pragma: keep
 #include <Math/Vector4Dfwd.h>
 
 #include <algorithm>
diff --git a/PWGJE/TableProducer/derivedDataSelector.cxx b/PWGJE/TableProducer/derivedDataSelector.cxx
index 25d4e69d3ba..b82419f7079 100644
--- a/PWGJE/TableProducer/derivedDataSelector.cxx
+++ b/PWGJE/TableProducer/derivedDataSelector.cxx
@@ -21,6 +21,7 @@
 #include "PWGJE/DataModel/Jet.h"
 #include "PWGJE/DataModel/JetReducedData.h"
 #include "PWGJE/DataModel/JetReducedDataSelector.h"
+#include "PWGJE/DataModel/JetSubtraction.h"
 
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisHelpers.h>
diff --git a/PWGJE/TableProducer/derivedDataWriter.cxx b/PWGJE/TableProducer/derivedDataWriter.cxx
index 5cb9b9c8f10..d0146f7c294 100644
--- a/PWGJE/TableProducer/derivedDataWriter.cxx
+++ b/PWGJE/TableProducer/derivedDataWriter.cxx
@@ -28,6 +28,7 @@
 #include "PWGJE/DataModel/JetReducedDataDQ.h"
 #include "PWGJE/DataModel/JetReducedDataHF.h"
 #include "PWGJE/DataModel/JetReducedDataSelector.h"
+#include "PWGJE/DataModel/JetReducedDataV0.h"
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 #include "PWGLF/DataModel/V0SelectorTables.h"
 
diff --git a/PWGLF/TableProducer/Common/zdcvector.cxx b/PWGLF/TableProducer/Common/zdcvector.cxx
index d1c5eb20766..852834dcb8b 100644
--- a/PWGLF/TableProducer/Common/zdcvector.cxx
+++ b/PWGLF/TableProducer/Common/zdcvector.cxx
@@ -46,7 +46,6 @@
 #include <cstddef>
 #include <cstdint>
 #include <string>
-#include <unordered_map>
 #include <vector>
 
 using namespace o2;
diff --git a/PWGLF/TableProducer/Resonances/xi1530kaonreducedtable.cxx b/PWGLF/TableProducer/Resonances/xi1530kaonreducedtable.cxx
index 149879b75d5..9565711b486 100644
--- a/PWGLF/TableProducer/Resonances/xi1530kaonreducedtable.cxx
+++ b/PWGLF/TableProducer/Resonances/xi1530kaonreducedtable.cxx
@@ -27,14 +27,18 @@
 #include <CommonConstants/PhysicsConstants.h>
 #include <DataFormatsParameters/GRPMagField.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/Logger.h>
+#include <Framework/OutputObjHeader.h>
 #include <Framework/runDataProcessing.h>
 
-#include <Math/Vector4D.h>
+#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
+#include <Math/Vector4Dfwd.h>
 #include <TH1.h>
 
 #include <algorithm>
diff --git a/PWGLF/TableProducer/Strangeness/doubleOmegaTreeCreator.cxx b/PWGLF/TableProducer/Strangeness/doubleOmegaTreeCreator.cxx
index 9ca484967f6..8c081656ba7 100644
--- a/PWGLF/TableProducer/Strangeness/doubleOmegaTreeCreator.cxx
+++ b/PWGLF/TableProducer/Strangeness/doubleOmegaTreeCreator.cxx
@@ -21,7 +21,6 @@
 #include "Common/DataModel/Multiplicity.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/PIDResponseTPC.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 
 #include <CCDB/BasicCCDBManager.h>
 #include <CommonConstants/PhysicsConstants.h>
diff --git a/PWGLF/Tasks/GlobalEventProperties/PseudorapidityDensityMFT.cxx b/PWGLF/Tasks/GlobalEventProperties/PseudorapidityDensityMFT.cxx
index 83d6ef873c2..0fddd6d62d9 100644
--- a/PWGLF/Tasks/GlobalEventProperties/PseudorapidityDensityMFT.cxx
+++ b/PWGLF/Tasks/GlobalEventProperties/PseudorapidityDensityMFT.cxx
@@ -50,6 +50,7 @@
 #include <TGeoGlobalMagField.h>
 #include <TH1.h>
 #include <TH2.h>
+#include <THnSparse.h>
 #include <TPDGCode.h>
 
 #include <algorithm>
diff --git a/PWGLF/Tasks/Strangeness/derivedXi0analysis.cxx b/PWGLF/Tasks/Strangeness/derivedXi0analysis.cxx
index cfc54fd89fa..bf84dd619ba 100644
--- a/PWGLF/Tasks/Strangeness/derivedXi0analysis.cxx
+++ b/PWGLF/Tasks/Strangeness/derivedXi0analysis.cxx
@@ -50,7 +50,6 @@
 #include "Common/Core/RecoDecay.h"
 
 #include <CCDB/BasicCCDBManager.h>
-#include <CommonConstants/MathConstants.h>
 #include <CommonConstants/PhysicsConstants.h>
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
@@ -64,8 +63,6 @@
 #include <Framework/runDataProcessing.h>
 
 #include <TH1.h>
-#include <TH2.h>
-#include <TPDGCode.h>
 
 #include <array>
 #include <cmath>