diff --git a/PWGJE/DataModel/EMCALClusters.h b/PWGJE/DataModel/EMCALClusters.h
index 9384ef1a9b6..5f85849bcc6 100644
--- a/PWGJE/DataModel/EMCALClusters.h
+++ b/PWGJE/DataModel/EMCALClusters.h
@@ -19,7 +19,7 @@
 #include "EMCALClusterDefinition.h"
 
 #include <Framework/ASoA.h>
-#include <Framework/AnalysisDataModel.h> // IWYU pragma: keep
+#include <Framework/AnalysisDataModel.h>
 
 #include <stdexcept>
 #include <string>
diff --git a/PWGJE/DataModel/EMCALMatchedCollisions.h b/PWGJE/DataModel/EMCALMatchedCollisions.h
index 2e93a2c765b..eb231619ce9 100644
--- a/PWGJE/DataModel/EMCALMatchedCollisions.h
+++ b/PWGJE/DataModel/EMCALMatchedCollisions.h
@@ -19,7 +19,7 @@
 #define PWGJE_DATAMODEL_EMCALMATCHEDCOLLISIONS_H_
 
 #include <Framework/ASoA.h>
-#include <Framework/AnalysisDataModel.h> // IWYU pragma: keep
+#include <Framework/AnalysisDataModel.h>
 
 namespace o2::aod
 {
diff --git a/PWGJE/DataModel/JetReducedData.h b/PWGJE/DataModel/JetReducedData.h
index 1cd94a96d03..77f98dc0dbd 100644
--- a/PWGJE/DataModel/JetReducedData.h
+++ b/PWGJE/DataModel/JetReducedData.h
@@ -18,10 +18,9 @@
 #define PWGJE_DATAMODEL_JETREDUCEDDATA_H_
 
 #include "PWGJE/Core/JetDerivedDataUtilities.h"
-#include "PWGJE/DataModel/EMCALClusters.h" // IWYU pragma: keep
 
 #include <Framework/ASoA.h>
-#include <Framework/AnalysisDataModel.h> // IWYU pragma: keep
+#include <Framework/AnalysisDataModel.h>
 #include <Framework/DataTypes.h>
 #include <SimulationDataFormat/MCGenProperties.h>
 
diff --git a/PWGJE/DataModel/JetReducedDataDQ.h b/PWGJE/DataModel/JetReducedDataDQ.h
index 1249263a71f..6246e4c808c 100644
--- a/PWGJE/DataModel/JetReducedDataDQ.h
+++ b/PWGJE/DataModel/JetReducedDataDQ.h
@@ -21,7 +21,7 @@
 #include "PWGJE/DataModel/JetReducedDataHF.h"
 
 #include <Framework/ASoA.h>
-#include <Framework/AnalysisDataModel.h> // IWYU pragma: keep
+#include <Framework/AnalysisDataModel.h>
 #include <Framework/DataTypes.h>
 #include <SimulationDataFormat/MCGenProperties.h>
 
diff --git a/PWGJE/DataModel/JetReducedDataHF.h b/PWGJE/DataModel/JetReducedDataHF.h
index 7a2f1c86cd1..378a97cc1c0 100644
--- a/PWGJE/DataModel/JetReducedDataHF.h
+++ b/PWGJE/DataModel/JetReducedDataHF.h
@@ -17,11 +17,10 @@
 #ifndef PWGJE_DATAMODEL_JETREDUCEDDATAHF_H_
 #define PWGJE_DATAMODEL_JETREDUCEDDATAHF_H_
 
-#include "PWGJE/DataModel/EMCALClusters.h" // IWYU pragma: keep
 #include "PWGJE/DataModel/JetReducedData.h"
 
 #include <Framework/ASoA.h>
-#include <Framework/AnalysisDataModel.h> // IWYU pragma: keep
+#include <Framework/AnalysisDataModel.h>
 
 #include <sys/types.h>
 
diff --git a/PWGJE/DataModel/JetReducedDataV0.h b/PWGJE/DataModel/JetReducedDataV0.h
index e9d4e4040c2..18f2f3048fe 100644
--- a/PWGJE/DataModel/JetReducedDataV0.h
+++ b/PWGJE/DataModel/JetReducedDataV0.h
@@ -20,7 +20,7 @@
 #include "PWGJE/DataModel/JetReducedData.h"
 
 #include <Framework/ASoA.h>
-#include <Framework/AnalysisDataModel.h> // IWYU pragma: keep
+#include <Framework/AnalysisDataModel.h>
 #include <Framework/DataTypes.h>
 #include <SimulationDataFormat/MCGenProperties.h>
 
diff --git a/PWGJE/DataModel/JetSubstructure.h b/PWGJE/DataModel/JetSubstructure.h
index 983a7944a80..e3c198ce956 100644
--- a/PWGJE/DataModel/JetSubstructure.h
+++ b/PWGJE/DataModel/JetSubstructure.h
@@ -19,7 +19,7 @@
 
 #include "PWGDQ/DataModel/ReducedInfoTables.h"
 #include "PWGHF/DataModel/DerivedTables.h"
-#include "PWGJE/DataModel/Jet.h" // IWYU pragma: keep
+#include "PWGJE/DataModel/Jet.h"
 #include "PWGJE/DataModel/JetReducedData.h"
 #include "PWGJE/DataModel/JetReducedDataDQ.h"
 
diff --git a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx
index 1afe05455f2..36c17f77ec5 100644
--- a/PWGJE/TableProducer/secondaryVertexReconstruction.cxx
+++ b/PWGJE/TableProducer/secondaryVertexReconstruction.cxx
@@ -22,22 +22,22 @@
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "CommonConstants/PhysicsConstants.h"
-#include "DCAFitter/DCAFitterN.h"
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "ReconstructionDataFormats/DCA.h"
 #include <CCDB/BasicCCDBManager.h>
+#include <CommonConstants/PhysicsConstants.h>
+#include <DCAFitter/DCAFitterN.h>
 #include <DetectorsBase/MatLayerCylSet.h>
 #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/HistogramSpec.h>
 #include <Framework/InitContext.h>
 #include <Framework/Logger.h>
 #include <Framework/runDataProcessing.h>
+#include <ReconstructionDataFormats/DCA.h>
 #include <ReconstructionDataFormats/TrackParametrizationWithError.h>
 #include <ReconstructionDataFormats/Vertex.h>
 
@@ -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/PWGJE/Tasks/jetFormationTimeReclustering.cxx b/PWGJE/Tasks/jetFormationTimeReclustering.cxx
index b411fdddbe9..89e34a9340e 100644
--- a/PWGJE/Tasks/jetFormationTimeReclustering.cxx
+++ b/PWGJE/Tasks/jetFormationTimeReclustering.cxx
@@ -20,20 +20,38 @@
 //                                                        *
 //*********************************************************
 
-#ifndef PWGJE_TASKS_JETFORMATIONTIMERECLUSTERING_H_
-#define PWGJE_TASKS_JETFORMATIONTIMERECLUSTERING_H_
-
+#include "PWGJE/Core/FastJetUtilities.h"
+#include "PWGJE/Core/JetFinder.h"
 #include "PWGJE/DataModel/Jet.h" // IWYU pragma: keep
 #include "PWGJE/DataModel/JetReducedData.h"
-#include "PWGJE/DataModel/JetSubstructure.h" // new
+#include "PWGJE/DataModel/JetSubstructure.h"
 #include "PWGJE/DataModel/JetSubtraction.h"
 
 #include <Framework/ASoA.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/O2DatabasePDGPlugin.h>
+#include <Framework/runDataProcessing.h>
+
+#include <TMath.h>
+
+#include <fastjet/ClusterSequenceArea.hh>
+#include <fastjet/JetDefinition.hh>
+#include <fastjet/PseudoJet.hh>
 
 #include <cmath>
 #include <cstdint>
+#include <utility>
 #include <vector>
 
+using namespace o2;
+using namespace o2::framework;
+using namespace o2::framework::expressions;
+
 namespace o2::aod
 {
 // new part
@@ -65,41 +83,12 @@ DECLARE_SOA_TABLE(CEWSJetTFSSs, "AOD", "CEWSJETTFSS", jetTFsubstructure::JetPt,
 
 } // namespace o2::aod
 
-#endif // PWGJE_DATAMODEL_JETFORMATIONTIMERECLUSTERING_H_
-
 //*********************************************************
 //                                                        *
 //              Begin of the task                         *
 //                                                        *
 //*********************************************************
 
-#include "PWGJE/Core/FastJetUtilities.h"
-#include "PWGJE/Core/JetFinder.h"
-
-#include <Framework/ASoA.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/O2DatabasePDGPlugin.h>
-#include <Framework/runDataProcessing.h>
-
-#include <TMath.h>
-
-#include <fastjet/ClusterSequenceArea.hh>
-#include <fastjet/JetDefinition.hh>
-#include <fastjet/PseudoJet.hh>
-
-#include <cmath>
-#include <cstdint>
-#include <utility>
-
-using namespace o2;
-using namespace o2::framework;
-using namespace o2::framework::expressions;
-
 struct JetFormationTimeReclustering {
 
   Produces<aod::CJetTFSSs> jetSubstructureDataTable;