From 14e6b4c26d4b9a2f9ef14bae74c14b4cbfff4e2b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?V=C3=ADt=20Ku=C4=8Dera?= <vit.kucera@cern.ch>
Date: Thu, 12 Jun 2025 20:25:18 +0200
Subject: [PATCH] Include What You Use

---
 Tools/KFparticle/KFUtilities.h | 23 ++++++++++++++++-------
 Tools/ML/MlResponse.h          | 13 +++++++------
 Tools/ML/model.cxx             | 15 ++++++++++++++-
 Tools/ML/model.h               | 21 ++++++++++-----------
 4 files changed, 47 insertions(+), 25 deletions(-)

diff --git a/Tools/KFparticle/KFUtilities.h b/Tools/KFparticle/KFUtilities.h
index d1545e11651..bec24fd7adc 100644
--- a/Tools/KFparticle/KFUtilities.h
+++ b/Tools/KFparticle/KFUtilities.h
@@ -22,17 +22,26 @@
 #define HomogeneousField
 #endif
 
-#include <utility>
+#include "Common/Core/RecoDecay.h"
+#include "Common/Core/trackUtilities.h"
+
+#include <Framework/Logger.h>
+#include <ReconstructionDataFormats/PID.h>
+#include <ReconstructionDataFormats/Track.h>
+#include <ReconstructionDataFormats/TrackParametrizationWithError.h>
 
 #include <TDatabasePDG.h> // FIXME
 
-#include "KFParticle.h"
-#include "KFPTrack.h"
-#include "KFPVertex.h"
-#include "KFParticleBase.h"
-#include "KFVertex.h"
+#include <KFPTrack.h>
+#include <KFPVertex.h>
+#include <KFParticle.h>
+#include <KFParticleBase.h>
 
-#include "Common/Core/RecoDecay.h"
+#include <array>
+#include <cmath>
+#include <cstdint>
+#include <stdexcept>
+#include <utility>
 
 /// @brief Function to create a KFPVertex from the collision table in the AO2Ds.
 /// The Multiplicity table is required to set the number of real PV Contributors
diff --git a/Tools/ML/MlResponse.h b/Tools/ML/MlResponse.h
index b8c192fd386..c60946bcb03 100644
--- a/Tools/ML/MlResponse.h
+++ b/Tools/ML/MlResponse.h
@@ -17,17 +17,18 @@
 #ifndef TOOLS_ML_MLRESPONSE_H_
 #define TOOLS_ML_MLRESPONSE_H_
 
-#include <onnxruntime_cxx_api.h>
+#include "Tools/ML/model.h"
+
+#include <CCDB/CcdbApi.h>
+#include <Framework/Array2D.h>
+#include <Framework/Logger.h>
 
+#include <cstddef>
+#include <cstdint>
 #include <map>
 #include <string>
 #include <vector>
 
-#include "CCDB/CcdbApi.h"
-#include "Framework/Array2D.h"
-
-#include "Tools/ML/model.h"
-
 namespace o2
 {
 namespace cuts_ml
diff --git a/Tools/ML/model.cxx b/Tools/ML/model.cxx
index 7e2e099aa3b..62ccd9f9839 100644
--- a/Tools/ML/model.cxx
+++ b/Tools/ML/model.cxx
@@ -17,9 +17,22 @@
 /// \brief    A general-purpose class with functions for ONNX model applications
 ///
 
-// ONNX includes
 #include "Tools/ML/model.h"
 
+#include <Framework/Logger.h>
+
+#include <TSystem.h>
+
+#include <onnxruntime_cxx_api.h>
+
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <memory>
+#include <sstream>
+#include <string>
+#include <vector>
+
 namespace o2
 {
 
diff --git a/Tools/ML/model.h b/Tools/ML/model.h
index 1fef9154c9b..e08b84f129f 100644
--- a/Tools/ML/model.h
+++ b/Tools/ML/model.h
@@ -20,19 +20,18 @@
 #ifndef TOOLS_ML_MODEL_H_
 #define TOOLS_ML_MODEL_H_
 
-// C++ and system includes
-#include <onnxruntime_cxx_api.h>
-#include <vector>
-#include <string>
-#include <memory>
-#include <map>
-#include <algorithm>
+#include <Framework/Logger.h>
 
-// ROOT includes
-#include "TSystem.h"
+#include <onnxruntime_cxx_api.h>
 
-// O2 includes
-#include "Framework/Logger.h"
+#include <algorithm>
+#include <cassert>
+#include <cstddef>
+#include <cstdint>
+#include <iterator>
+#include <memory>
+#include <string>
+#include <vector>
 
 namespace o2
 {