diff --git a/Tutorials/OpenData/flowAnalysis.cxx b/Tutorials/OpenData/flowAnalysis.cxx
index dc5e180b300..29190eee67e 100644
--- a/Tutorials/OpenData/flowAnalysis.cxx
+++ b/Tutorials/OpenData/flowAnalysis.cxx
@@ -15,20 +15,23 @@
 /// \author
 /// \since
 
-#include <TF1.h>
-#include <TH3.h>
-#include <Framework/runDataProcessing.h>
-#include <Framework/AnalysisTask.h>
-#include <Framework/HistogramRegistry.h>
-#include <Framework/AnalysisDataModel.h>
-#include <Common/DataModel/EventSelection.h>
 #include <Common/CCDB/TriggerAliases.h>
 #include <Common/DataModel/Centrality.h>
+#include <Common/DataModel/EventSelection.h>
 #include <Common/DataModel/Multiplicity.h>
+#include <Common/DataModel/PIDResponseTOF.h>
+#include <Common/DataModel/PIDResponseTPC.h>
 #include <Common/DataModel/TrackSelectionTables.h>
-#include <Common/DataModel/PIDResponse.h>
+
 #include <CCDB/BasicCCDBManager.h>
 #include <DataFormatsParameters/GRPObject.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/runDataProcessing.h>
+
+#include <TF1.h>
+#include <TH3.h>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/Tutorials/PWGEM/emcclustertutorial.cxx b/Tutorials/PWGEM/emcclustertutorial.cxx
index a047206e70d..2e2df5912c1 100644
--- a/Tutorials/PWGEM/emcclustertutorial.cxx
+++ b/Tutorials/PWGEM/emcclustertutorial.cxx
@@ -9,6 +9,23 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+#include "PWGJE/DataModel/EMCALClusters.h"
+
+#include "Common/DataModel/Centrality.h"
+#include "Common/DataModel/EventSelection.h"
+
+#include "CommonDataFormat/InteractionRecord.h"
+#include "DataFormatsEMCAL/AnalysisCluster.h"
+#include "DataFormatsEMCAL/Cell.h"
+#include "DataFormatsEMCAL/Constants.h"
+#include "EMCALBase/Geometry.h"
+#include "EMCALCalib/BadChannelMap.h"
+#include "Framework/ASoA.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+
 #include <climits>
 #include <cstdlib>
 #include <map>
@@ -17,25 +34,6 @@
 #include <string>
 #include <vector>
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoA.h"
-#include "Framework/HistogramRegistry.h"
-
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/Centrality.h"
-#include "Common/DataModel/PIDResponse.h"
-
-#include "EMCALBase/Geometry.h"
-#include "EMCALCalib/BadChannelMap.h"
-#include "PWGJE/DataModel/EMCALClusters.h"
-#include "DataFormatsEMCAL/Cell.h"
-#include "DataFormatsEMCAL/Constants.h"
-#include "DataFormatsEMCAL/AnalysisCluster.h"
-
-#include "CommonDataFormat/InteractionRecord.h"
-
 // \struct ClusterTutorial
 /// \brief Skeleton task for EMCal cluster tutorial
 /// \author Florian Jonas <florian.jonas@cern.ch>, Oak Ridge National Laoratory; Joshua König <joshua.konig@cern.ch>, Goethe-University Frankfurt; Marvin Hemmer <marvin.hemmer@cern.ch>, Goethe-University Frankfurt
diff --git a/Tutorials/PWGUD/UDTutorial_01.cxx b/Tutorials/PWGUD/UDTutorial_01.cxx
index c2cbf7b4f13..d19accd1ee8 100644
--- a/Tutorials/PWGUD/UDTutorial_01.cxx
+++ b/Tutorials/PWGUD/UDTutorial_01.cxx
@@ -13,13 +13,15 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Common/DataModel/PIDResponseTOF.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TVector3.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/Tutorials/PWGUD/UDTutorial_02a.cxx b/Tutorials/PWGUD/UDTutorial_02a.cxx
index 75aa83c87a7..847191d3626 100644
--- a/Tutorials/PWGUD/UDTutorial_02a.cxx
+++ b/Tutorials/PWGUD/UDTutorial_02a.cxx
@@ -13,14 +13,14 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/Tutorials/PWGUD/UDTutorial_02b.cxx b/Tutorials/PWGUD/UDTutorial_02b.cxx
index 26a76a98186..ece20563991 100644
--- a/Tutorials/PWGUD/UDTutorial_02b.cxx
+++ b/Tutorials/PWGUD/UDTutorial_02b.cxx
@@ -13,13 +13,12 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  April 2023
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/DataModel/UDTables.h"
-#include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/Core/DGPIDSelector.h"
+#include "PWGUD/Core/UDHelpers.h"
+#include "PWGUD/DataModel/UDTables.h"
+
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/Tutorials/PWGUD/UDTutorial_03a.cxx b/Tutorials/PWGUD/UDTutorial_03a.cxx
index 9840123236b..4a7c91d0690 100644
--- a/Tutorials/PWGUD/UDTutorial_03a.cxx
+++ b/Tutorials/PWGUD/UDTutorial_03a.cxx
@@ -13,15 +13,17 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/Tutorials/PWGUD/UDTutorial_03b.cxx b/Tutorials/PWGUD/UDTutorial_03b.cxx
index 71a144f1d1e..af5c1e1166e 100644
--- a/Tutorials/PWGUD/UDTutorial_03b.cxx
+++ b/Tutorials/PWGUD/UDTutorial_03b.cxx
@@ -13,15 +13,17 @@
 // \author Paul Buehler, paul.buehler@oeaw.ac.at
 // \since  October 2023
 
-#include "Framework/runDataProcessing.h"
+#include "PWGUD/Core/UDHelpers.h"
+
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 #include "TDatabasePDG.h"
 #include "TLorentzVector.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "PWGUD/Core/UDHelpers.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/Tutorials/Skimming/DataModel/JEDerived.h b/Tutorials/Skimming/DataModel/JEDerived.h
index 20a8b3d076e..000d01411d9 100644
--- a/Tutorials/Skimming/DataModel/JEDerived.h
+++ b/Tutorials/Skimming/DataModel/JEDerived.h
@@ -10,11 +10,13 @@
 // or submit itself to any jurisdiction.
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
-#ifndef O2_ANALYSIS_JEDERIVED_H
-#define O2_ANALYSIS_JEDERIVED_H
+#ifndef TUTORIALS_SKIMMING_DATAMODEL_JEDERIVED_H_
+#define TUTORIALS_SKIMMING_DATAMODEL_JEDERIVED_H_
 
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
+#include <Framework/ASoA.h>
+#include <Framework/AnalysisDataModel.h>
+
+#include <TMath.h>
 
 namespace o2::aod
 {
@@ -29,7 +31,7 @@ DECLARE_SOA_COLUMN(Area, area, float);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
 } // namespace jejet
 
 DECLARE_SOA_TABLE(JEJets, "AOD", "JEJET",
@@ -56,7 +58,7 @@ DECLARE_SOA_COLUMN(Phi, phi, float);
 DECLARE_SOA_DYNAMIC_COLUMN(Px, px, [](float pt, float phi) { return pt * TMath::Cos(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Py, py, [](float pt, float phi) { return pt * TMath::Sin(phi); });
 DECLARE_SOA_DYNAMIC_COLUMN(Pz, pz, [](float pt, float eta) { return pt * TMath::SinH(eta); });
-DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); //absolute p
+DECLARE_SOA_DYNAMIC_COLUMN(P, p, [](float pt, float eta) { return pt * TMath::CosH(eta); }); // absolute p
 } // namespace jeconstituent
 
 DECLARE_SOA_TABLE(JEConstituents, "AOD", "JECONSTITUENT", o2::soa::Index<>,
@@ -69,4 +71,4 @@ DECLARE_SOA_TABLE(JEConstituents, "AOD", "JECONSTITUENT", o2::soa::Index<>,
 using JEConstituent = JEConstituents::iterator;
 } // namespace o2::aod
 
-#endif // O2_ANALYSIS_JEDERIVED_H
+#endif // TUTORIALS_SKIMMING_DATAMODEL_JEDERIVED_H_
diff --git a/Tutorials/Skimming/DataModel/LFDerived.h b/Tutorials/Skimming/DataModel/LFDerived.h
index c89e0da5323..4e47d06cd68 100644
--- a/Tutorials/Skimming/DataModel/LFDerived.h
+++ b/Tutorials/Skimming/DataModel/LFDerived.h
@@ -10,11 +10,13 @@
 // or submit itself to any jurisdiction.
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
-#ifndef O2_ANALYSIS_LFDERIVED_H
-#define O2_ANALYSIS_LFDERIVED_H
+#ifndef TUTORIALS_SKIMMING_DATAMODEL_LFDERIVED_H_
+#define TUTORIALS_SKIMMING_DATAMODEL_LFDERIVED_H_
 
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
+#include <Framework/ASoA.h>
+#include <Framework/AnalysisDataModel.h>
+
+#include <TMath.h>
 
 namespace o2::aod
 {
@@ -92,4 +94,4 @@ using LFNucleiTrack = LFNucleiTracks::iterator;
 
 } // namespace o2::aod
 
-#endif // O2_ANALYSIS_LFDERIVED_H
+#endif // TUTORIALS_SKIMMING_DATAMODEL_LFDERIVED_H_
diff --git a/Tutorials/Skimming/spectraNucleiAnalyser.cxx b/Tutorials/Skimming/spectraNucleiAnalyser.cxx
index f0647db20a9..699905c2f9b 100644
--- a/Tutorials/Skimming/spectraNucleiAnalyser.cxx
+++ b/Tutorials/Skimming/spectraNucleiAnalyser.cxx
@@ -10,16 +10,16 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/LFDerived.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/Tutorials/Skimming/spectraNucleiProvider.cxx b/Tutorials/Skimming/spectraNucleiProvider.cxx
index 7a76882fd7a..76a0bb9dc42 100644
--- a/Tutorials/Skimming/spectraNucleiProvider.cxx
+++ b/Tutorials/Skimming/spectraNucleiProvider.cxx
@@ -11,16 +11,18 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "MathUtils/Utils.h"
 #include "DataModel/LFDerived.h"
 
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "MathUtils/Utils.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/Tutorials/Skimming/spectraNucleiReference.cxx b/Tutorials/Skimming/spectraNucleiReference.cxx
index 40535297fef..7d3bf950210 100644
--- a/Tutorials/Skimming/spectraNucleiReference.cxx
+++ b/Tutorials/Skimming/spectraNucleiReference.cxx
@@ -10,18 +10,17 @@
 // or submit itself to any jurisdiction.
 // O2 includes
 
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TLorentzVector.h>
 
diff --git a/Tutorials/Skimming/spectraTPCAnalyser.cxx b/Tutorials/Skimming/spectraTPCAnalyser.cxx
index 769ad0b885a..348e9d1de7c 100644
--- a/Tutorials/Skimming/spectraTPCAnalyser.cxx
+++ b/Tutorials/Skimming/spectraTPCAnalyser.cxx
@@ -10,14 +10,15 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/LFDerived.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -63,7 +64,7 @@ struct TPCSpectraAnalyserTask {
     histos.fill(HIST(hpt[i]), track.pt());
   }
 
-  Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; //collision filters not doing anything now?
+  Filter collisionFilter = nabs(aod::collision::posZ) < cfgCutVertex; // collision filters not doing anything now?
   Filter trackFilter = nabs(aod::lftrack::eta) < cfgCutEta;
 
   void process(soa::Filtered<aod::LFTracks>::iterator const& track)
diff --git a/Tutorials/Skimming/spectraTPCProvider.cxx b/Tutorials/Skimming/spectraTPCProvider.cxx
index c0bbf087fd3..c79115dd78f 100644
--- a/Tutorials/Skimming/spectraTPCProvider.cxx
+++ b/Tutorials/Skimming/spectraTPCProvider.cxx
@@ -11,15 +11,17 @@
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "DataModel/LFDerived.h"
+
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "MathUtils/Utils.h"
-#include "DataModel/LFDerived.h"
+#include "ReconstructionDataFormats/Track.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/Tutorials/Skimming/spectraTPCReference.cxx b/Tutorials/Skimming/spectraTPCReference.cxx
index 5d23fd202dc..6111c5dba92 100644
--- a/Tutorials/Skimming/spectraTPCReference.cxx
+++ b/Tutorials/Skimming/spectraTPCReference.cxx
@@ -10,13 +10,14 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "ReconstructionDataFormats/Track.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
@@ -47,7 +48,7 @@ struct TPCSpectraReferenceTask {
     }
   }
 
-  //Defining filters and input
+  // Defining filters and input
   Configurable<float> cfgCutVertex{"cfgCutVertex", 10.0f, "Accepted z-vertex range"};
   Configurable<float> cfgCutEta{"cfgCutEta", 0.8f, "Eta range for tracks"};
   Configurable<float> cfgCutPt{"cfgCutPt", 0.0f, "Pt range for tracks"};
diff --git a/Tutorials/Skimming/spectraUPCAnalyser.cxx b/Tutorials/Skimming/spectraUPCAnalyser.cxx
index cdc6c9a0c4b..740a62dc822 100644
--- a/Tutorials/Skimming/spectraUPCAnalyser.cxx
+++ b/Tutorials/Skimming/spectraUPCAnalyser.cxx
@@ -10,16 +10,17 @@
 // or submit itself to any jurisdiction.
 
 // O2 includes
-#include "ReconstructionDataFormats/Track.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "DataModel/UDDerived.h"
-#include "TLorentzVector.h"
 
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
+#include "ReconstructionDataFormats/Track.h"
+
+#include "TLorentzVector.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/Tutorials/Skimming/spectraUPCProvider.cxx b/Tutorials/Skimming/spectraUPCProvider.cxx
index 053b7437080..8884c09d99b 100644
--- a/Tutorials/Skimming/spectraUPCProvider.cxx
+++ b/Tutorials/Skimming/spectraUPCProvider.cxx
@@ -10,18 +10,18 @@
 // or submit itself to any jurisdiction.
 /// \author Nima Zardoshti <nima.zardoshti@cern.ch>, CERN
 
-#include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "ReconstructionDataFormats/Track.h"
+#include "DataModel/UDDerived.h"
 
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
+#include "ReconstructionDataFormats/Track.h"
 
 #include <TH1D.h>
-#include "DataModel/UDDerived.h"
 
 using namespace o2;
 using namespace o2::aod::evsel;
diff --git a/Tutorials/src/pidTpcTof.cxx b/Tutorials/src/pidTpcTof.cxx
index 777c09c1920..dab7d9e425c 100644
--- a/Tutorials/src/pidTpcTof.cxx
+++ b/Tutorials/src/pidTpcTof.cxx
@@ -17,11 +17,12 @@
 
 // O2 includes
 #include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
 #include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
 
 // O2Physics includes
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
 
 using namespace o2;
 using namespace o2::aod::pidutils;