diff --git a/Common/Tools/PID/pidTPCModule.h b/Common/Tools/PID/pidTPCModule.h
index 0a39c41ff0c..e86ec6ea351 100644
--- a/Common/Tools/PID/pidTPCModule.h
+++ b/Common/Tools/PID/pidTPCModule.h
@@ -25,6 +25,7 @@
 #include "Common/Core/CollisionTypeHelper.h"
 #include "Common/Core/PID/TPCPIDResponse.h"
 #include "Common/Core/TableHelper.h"
+#include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/TableProducer/PID/pidTPCBase.h" // IWYU pragma: keep
 #include "Tools/ML/model.h"
@@ -34,14 +35,15 @@
 #include <Framework/AnalysisHelpers.h>
 #include <Framework/Configurable.h>
 #include <Framework/DeviceSpec.h>
+#include <Framework/Logger.h>
 #include <Framework/RunningWorkflowInfo.h>
-#include <Framework/runDataProcessing.h>
 #include <ReconstructionDataFormats/PID.h>
 
 #include <TFile.h>
 #include <TMatrixD.h> // IWYU pragma: keep (do not replace with TMatrixDfwd.h)
 #include <TMatrixDfwd.h>
 #include <TRandom.h>
+#include <TString.h>
 
 #include <chrono>
 #include <cstddef>
diff --git a/PWGDQ/Core/VarManager.cxx b/PWGDQ/Core/VarManager.cxx
index 6f1c204152e..7ab3070564c 100644
--- a/PWGDQ/Core/VarManager.cxx
+++ b/PWGDQ/Core/VarManager.cxx
@@ -33,6 +33,7 @@
 #include <Rtypes.h>
 #include <RtypesCore.h>
 
+#include <array>
 #include <cmath>
 #include <cstddef>
 #include <cstdint>
diff --git a/PWGEM/Dilepton/Utils/ElectronModule.h b/PWGEM/Dilepton/Utils/ElectronModule.h
index fddcd6fe56c..8d5f1a42508 100644
--- a/PWGEM/Dilepton/Utils/ElectronModule.h
+++ b/PWGEM/Dilepton/Utils/ElectronModule.h
@@ -9,6 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+/// \file ElectronModule.h
 /// \brief write relevant information about primary electrons.
 /// \author daiki.sekihata@cern.ch
 
@@ -20,39 +21,22 @@
 #include "PWGEM/Dilepton/Utils/MlResponseSCT.h"
 #include "PWGEM/Dilepton/Utils/PairUtilities.h"
 #include "PWGEM/Dilepton/Utils/SemiCharmTag.h"
-#include "PWGLF/DataModel/LFStrangenessTables.h"
 
 #include "Common/Core/RecoDecay.h"
-#include "Common/Core/TableHelper.h"
 #include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/CollisionAssociationTables.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponseTOF.h"
-#include "Common/DataModel/PIDResponseTPC.h"
 #include "Tools/ML/MlResponse.h"
 
-#include <CCDB/BasicCCDBManager.h>
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/PhysicsConstants.h>
 #include <DCAFitter/DCAFitterN.h>
-#include <DataFormatsCalibration/MeanVertexObject.h>
-#include <DataFormatsParameters/GRPMagField.h>
-#include <DataFormatsParameters/GRPObject.h>
-#include <DetectorsBase/MatLayerCylSet.h>
 #include <DetectorsBase/Propagator.h>
-#include <Framework/ASoAHelpers.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
-#include <Framework/AnalysisTask.h>
 #include <Framework/Array2D.h>
 #include <Framework/Configurable.h>
-#include <Framework/DataTypes.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
-#include <Framework/InitContext.h>
-#include <Framework/OutputObjHeader.h>
-#include <Framework/runDataProcessing.h>
-#include <MathUtils/Utils.h>
+#include <Framework/Logger.h>
 #include <PID/PIDTOFParamService.h>
 #include <ReconstructionDataFormats/DCA.h>
 #include <ReconstructionDataFormats/PID.h>
diff --git a/PWGHF/Core/HfMlResponseB0ToJpsiK0StarReduced.h b/PWGHF/Core/HfMlResponseB0ToJpsiK0StarReduced.h
index b8b8f9ed8f7..a8cf0fa4752 100644
--- a/PWGHF/Core/HfMlResponseB0ToJpsiK0StarReduced.h
+++ b/PWGHF/Core/HfMlResponseB0ToJpsiK0StarReduced.h
@@ -23,6 +23,7 @@
 
 #include <CommonConstants/PhysicsConstants.h>
 
+#include <array>
 #include <cstdint>
 #include <vector>
 
diff --git a/PWGHF/Core/HfMlResponseBplusToJpsiKReduced.h b/PWGHF/Core/HfMlResponseBplusToJpsiKReduced.h
index 85830fcb55b..cab5d8e3141 100644
--- a/PWGHF/Core/HfMlResponseBplusToJpsiKReduced.h
+++ b/PWGHF/Core/HfMlResponseBplusToJpsiKReduced.h
@@ -23,16 +23,16 @@
 
 #include <CommonConstants/PhysicsConstants.h>
 
+#include <array>
 #include <cstdint>
 #include <vector>
 
 // Fill the map of available input features
 // the key is the feature's name (std::string)
 // the value is the corresponding value in EnumInputFeatures
-#define FILL_MAP_BPLUS(FEATURE)                                               \
-  {                                                                           \
-    #FEATURE, static_cast<uint8_t>(InputFeaturesBplusToJpsiKReduced::FEATURE) \
-  }
+#define FILL_MAP_BPLUS(FEATURE) \
+  {                             \
+    #FEATURE, static_cast<uint8_t>(InputFeaturesBplusToJpsiKReduced::FEATURE)}
 
 // Check if the index of mCachedIndices (index associated to a FEATURE)
 // matches the entry in EnumInputFeatures associated to this FEATURE
diff --git a/PWGHF/Core/HfMlResponseBsToJpsiPhiReduced.h b/PWGHF/Core/HfMlResponseBsToJpsiPhiReduced.h
index 8c094c9b305..5e189aa68ba 100644
--- a/PWGHF/Core/HfMlResponseBsToJpsiPhiReduced.h
+++ b/PWGHF/Core/HfMlResponseBsToJpsiPhiReduced.h
@@ -23,6 +23,7 @@
 
 #include <CommonConstants/PhysicsConstants.h>
 
+#include <array>
 #include <cstdint>
 #include <vector>
 
diff --git a/PWGHF/D2H/Core/DataCreationCharmReso.h b/PWGHF/D2H/Core/DataCreationCharmReso.h
index 01092564ff8..87621940c91 100644
--- a/PWGHF/D2H/Core/DataCreationCharmReso.h
+++ b/PWGHF/D2H/Core/DataCreationCharmReso.h
@@ -19,7 +19,7 @@
 #define PWGHF_D2H_CORE_DATACREATIONCHARMRESO_H_
 
 #ifndef HomogeneousField
-#define HomogeneousField // needed for KFParticle::SetField(magneticField);
+#define HomogeneousField // o2-linter: disable=name/macro (needed for KFParticle::SetField(magneticField);)
 #endif
 
 #include "PWGHF/Core/CentralityEstimation.h"
@@ -27,7 +27,6 @@
 #include "PWGHF/Core/HfHelper.h"
 #include "PWGHF/Utils/utilsEvSelHf.h"
 #include "PWGHF/Utils/utilsMcMatching.h"
-
 //
 #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
 #include "PWGEM/PhotonMeson/Utils/TrackSelection.h"
@@ -63,6 +62,7 @@
 #include <cstdint>
 #include <map>
 #include <string>
+#include <type_traits>
 #include <vector>
 
 namespace o2::analysis
diff --git a/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx b/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
index 7e4d5a871f1..7d354f30b69 100644
--- a/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
+++ b/PWGLF/Tasks/GlobalEventProperties/heavyionMultiplicity.cxx
@@ -18,8 +18,6 @@
 #include "PWGLF/DataModel/LFStrangenessTables.h"
 
 #include "Common/CCDB/EventSelectionParams.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/McCollisionExtra.h"
diff --git a/PWGLF/Tasks/Resonances/k892hadronphoton.cxx b/PWGLF/Tasks/Resonances/k892hadronphoton.cxx
index 29274a8333d..fa6def1b51b 100644
--- a/PWGLF/Tasks/Resonances/k892hadronphoton.cxx
+++ b/PWGLF/Tasks/Resonances/k892hadronphoton.cxx
@@ -42,6 +42,7 @@
 
 #include <array>
 #include <cmath>
+#include <cstdint>
 #include <cstdlib>
 #include <string>
 #include <string_view>
diff --git a/PWGLF/Utils/decay3bodyBuilderHelper.h b/PWGLF/Utils/decay3bodyBuilderHelper.h
index 347b53d37cb..72def2d54a3 100644
--- a/PWGLF/Utils/decay3bodyBuilderHelper.h
+++ b/PWGLF/Utils/decay3bodyBuilderHelper.h
@@ -16,21 +16,21 @@
 #define HomogeneousField
 #endif
 
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 #include <CommonConstants/PhysicsConstants.h>
 #include <DCAFitter/DCAFitterN.h>
+#include <DetectorsBase/Propagator.h>
 #include <DetectorsVertexing/SVertexHypothesis.h>
 #include <Framework/Logger.h>
 #include <ReconstructionDataFormats/DCA.h>
+#include <ReconstructionDataFormats/PID.h>
 #include <ReconstructionDataFormats/Track.h>
 #include <ReconstructionDataFormats/Vertex.h>
 
-#include <KFPTrack.h>
-#include <KFPVertex.h>
 #include <KFParticle.h>
-#include <KFParticleBase.h>
 #include <KFVertex.h>
 
 #include <array>
diff --git a/PWGLF/Utils/strangenessBuilderHelper.h b/PWGLF/Utils/strangenessBuilderHelper.h
index c6e2674079d..b7842e7c73e 100644
--- a/PWGLF/Utils/strangenessBuilderHelper.h
+++ b/PWGLF/Utils/strangenessBuilderHelper.h
@@ -16,28 +16,28 @@
 #define HomogeneousField
 #endif
 
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/trackUtilities.h"
 #include "Tools/KFparticle/KFUtilities.h"
 
 #include <CommonConstants/PhysicsConstants.h>
 #include <DCAFitter/DCAFitterN.h>
 #include <DetectorsBase/MatLayerCylSet.h>
+#include <DetectorsBase/Propagator.h>
 #include <Framework/Logger.h>
 #include <ReconstructionDataFormats/PID.h>
 #include <ReconstructionDataFormats/Track.h>
 
 #include <TMath.h> // IWYU pragma: keep
 
-#include <KFPTrack.h>
 #include <KFPVertex.h>
 #include <KFParticle.h>
-#include <KFParticleBase.h>
-#include <KFVertex.h>
 
 #include <array>
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
+#include <numeric>
 #include <stdexcept>
 #include <vector>
 
diff --git a/PWGLF/Utils/strangenessBuilderModule.h b/PWGLF/Utils/strangenessBuilderModule.h
index f58313bed1c..980e13e4da8 100644
--- a/PWGLF/Utils/strangenessBuilderModule.h
+++ b/PWGLF/Utils/strangenessBuilderModule.h
@@ -19,11 +19,16 @@
 #include "PWGLF/DataModel/LFStrangenessTables.h" // IWYU pragma: keep
 #include "PWGLF/Utils/strangenessBuilderHelper.h"
 
+#include "Common/Core/RecoDecay.h"
 #include "Common/Core/TPCVDriftManager.h"
 
+#include <CommonConstants/PhysicsConstants.h>
+#include <DetectorsBase/Propagator.h>
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
+#include <Framework/Array2D.h>
 #include <Framework/Configurable.h>
+#include <Framework/DataSpecUtils.h>
 #include <Framework/DeviceSpec.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
@@ -35,6 +40,7 @@
 
 #include <TH1.h>
 #include <TMCProcess.h>
+#include <TMath.h>
 #include <TPDGCode.h>
 #include <TString.h>
 
@@ -42,6 +48,7 @@
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
+#include <numeric>
 #include <string>
 #include <vector>