diff --git a/Common/TableProducer/mftmchMatchingML.cxx b/Common/TableProducer/mftmchMatchingML.cxx
index 4df90bbfdd1..78e1902d6b4 100644
--- a/Common/TableProducer/mftmchMatchingML.cxx
+++ b/Common/TableProducer/mftmchMatchingML.cxx
@@ -9,30 +9,36 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#include <math.h>
-#include <onnxruntime_cxx_api.h>
-#include <string>
-#include <regex>
-#include <TLorentzVector.h>
 #include "Common/DataModel/MftmchMatchingML.h"
+
+#include "Common/CCDB/EventSelectionParams.h"
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+#include "Tools/ML/model.h"
+
+#include "CCDB/CcdbApi.h"
+#include "DetectorsBase/Propagator.h"
+#include "Framework/ASoAHelpers.h"
 #include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/CCDB/EventSelectionParams.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/Core/TrackSelection.h"
+#include "GlobalTracking/MatchGlobalFwd.h"
+#include "MCHTracking/TrackExtrap.h"
+#include "MCHTracking/TrackParam.h"
+#include "MFTTracking/Tracker.h"
 #include "ReconstructionDataFormats/TrackFwd.h"
+
 #include "Math/SMatrix.h"
-#include "DetectorsBase/Propagator.h"
-#include "MFTTracking/Tracker.h"
-#include "MCHTracking/TrackParam.h"
-#include "MCHTracking/TrackExtrap.h"
-#include "GlobalTracking/MatchGlobalFwd.h"
-#include "CCDB/CcdbApi.h"
-#include "Tools/ML/model.h"
+#include <TLorentzVector.h>
+
+#include <onnxruntime_cxx_api.h>
+
+#include <regex>
+#include <string>
+
+#include <math.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx b/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
index b7a9637ba10..cfbcb6573da 100644
--- a/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
+++ b/EventFiltering/PWGHF/HFFilterPrepareMLSamples.cxx
@@ -28,8 +28,6 @@
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include <onnxruntime_cxx_api.h>
-
 #include <CCDB/BasicCCDBManager.h>
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/PhysicsConstants.h>
@@ -46,6 +44,8 @@
 
 #include <TPDGCode.h>
 
+#include <onnxruntime_cxx_api.h>
+
 #include <Rtypes.h>
 
 #include <array>
diff --git a/PWGJE/Core/MlResponseHfTagging.h b/PWGJE/Core/MlResponseHfTagging.h
index 2b07e1c1c25..186575205b9 100644
--- a/PWGJE/Core/MlResponseHfTagging.h
+++ b/PWGJE/Core/MlResponseHfTagging.h
@@ -18,11 +18,10 @@
 
 #include "Tools/ML/MlResponse.h"
 
-#include <onnxruntime_cxx_api.h>
-
 #include <Framework/Logger.h>
 
 #include <onnxruntime_c_api.h>
+#include <onnxruntime_cxx_api.h>
 
 #include <cstddef>
 #include <cstdint>
@@ -330,6 +329,7 @@ class TensorAllocator
 {
  protected:
   Ort::MemoryInfo memInfo;
+
  public:
   TensorAllocator()
     : memInfo(Ort::MemoryInfo::CreateCpu(OrtAllocatorType::OrtArenaAllocator, OrtMemType::OrtMemTypeDefault))
diff --git a/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h b/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
index 53f5e581d82..36806e1f4c0 100644
--- a/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
+++ b/PWGJE/DataModel/PhotonChargedTriggerCorrelation.h
@@ -18,11 +18,12 @@
 #ifndef PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
 #define PWGJE_DATAMODEL_PHOTONCHARGEDTRIGGERCORRELATION_H_
 
-#include "Framework/AnalysisDataModel.h"
-#include "PWGJE/Core/JetDerivedDataUtilities.h"
-#include "PWGJE/DataModel/Jet.h"
 #include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
 #include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGJE/Core/JetDerivedDataUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod
 {
diff --git a/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx b/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
index 8c62845a145..57d72df74ab 100644
--- a/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
+++ b/PWGJE/Tasks/photonChargedTriggerCorrelation.cxx
@@ -18,36 +18,37 @@
 /// Also contains checks and monte-carlo (efficiency, purity, mc-true correlation,...)
 /// End goal of studying correlations between direct photons and jets
 
-#include <cmath>
-#include <deque>
-#include <string>
-#include <vector>
-#include <algorithm>
-#include <chrono>
-#include <memory>
-#include <random>
+#include "PWGJE/DataModel/PhotonChargedTriggerCorrelation.h"
 
-#include "TMath.h"
-#include "Math/Vector4D.h"
+#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
+#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "PWGJE/DataModel/Jet.h"
+
+#include "Common/Core/TableHelper.h"
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
 #include "CCDB/BasicCCDBManager.h"
 #include "Framework/ASoAHelpers.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
 #include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/O2DatabasePDGPlugin.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/Core/TableHelper.h"
+#include "Framework/runDataProcessing.h"
 
-#include "PWGEM/PhotonMeson/DataModel/gammaTables.h"
-#include "PWGEM/PhotonMeson/Utils/PCMUtilities.h"
+#include "Math/Vector4D.h"
+#include "TMath.h"
 
-#include "PWGJE/DataModel/Jet.h"
-#include "PWGJE/DataModel/PhotonChargedTriggerCorrelation.h"
+#include <algorithm>
+#include <chrono>
+#include <cmath>
+#include <deque>
+#include <memory>
+#include <random>
+#include <string>
+#include <vector>
 
 const double absEtaMax = 0.8;
 #define DPHI_SCALE constants::math::TwoPI - constants::math::PIHalf
diff --git a/PWGJE/Tasks/statPromptPhoton.cxx b/PWGJE/Tasks/statPromptPhoton.cxx
index 977b94741c5..f23bb34df88 100644
--- a/PWGJE/Tasks/statPromptPhoton.cxx
+++ b/PWGJE/Tasks/statPromptPhoton.cxx
@@ -1114,9 +1114,9 @@ struct statPromptPhoton {
 
     histos.fill(HIST("DATA_nEvents"), 2.5);
 
-      if (!jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
-        return;
-      }
+    if (!jetderiveddatautilities::selectTrigger(collision, triggerMaskBits)) {
+      return;
+    }
 
     histos.fill(HIST("DATA_nEvents"), 3.5);
 
diff --git a/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx b/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
index 35d6224da36..506365a642a 100644
--- a/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
+++ b/PWGLF/Tasks/Resonances/k1AnalysisMicro.cxx
@@ -14,20 +14,23 @@
 /// \author Su-Jeong Ji <su-jeong.ji@cern.ch>, Bong-Hwi Lim <bong-hwi.lim@cern.ch>
 ///
 
-#include <vector>
-#include <TLorentzVector.h>
-#include <TDatabasePDG.h> // FIXME
-#include <TPDGCode.h>     // FIXME
+#include "PWGLF/DataModel/LFResonanceTables.h"
 
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/Centrality.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Framework/AnalysisTask.h"
+#include "Common/DataModel/PIDResponse.h"
+
+#include "CommonConstants/PhysicsConstants.h"
+#include "DataFormatsParameters/GRPObject.h"
 #include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/runDataProcessing.h"
-#include "PWGLF/DataModel/LFResonanceTables.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "CommonConstants/PhysicsConstants.h"
+
+#include <TDatabasePDG.h> // FIXME
+#include <TLorentzVector.h>
+#include <TPDGCode.h> // FIXME
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/Tutorials/src/reweighting.cxx b/Tutorials/src/reweighting.cxx
index 17a4ad4bf33..b1f0c43a22f 100644
--- a/Tutorials/src/reweighting.cxx
+++ b/Tutorials/src/reweighting.cxx
@@ -28,11 +28,15 @@
 // This workflow is used to create a flat tree for model training
 // Use o2-aod-merger to combine dataframes in output AnalysisResults_trees.root
 
-#include <onnxruntime_cxx_api.h>
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/Multiplicity.h"
 #include "TrainingTree.h"
+
+#include "Common/DataModel/Multiplicity.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+
+#include <onnxruntime_cxx_api.h>
+
 #include <cmath>
 
 using namespace o2;