diff --git a/DPG/Tasks/AOTTrack/qaEventTrack.h b/DPG/Tasks/AOTTrack/qaEventTrack.h
index e2230e37c87..42cbe5455ca 100644
--- a/DPG/Tasks/AOTTrack/qaEventTrack.h
+++ b/DPG/Tasks/AOTTrack/qaEventTrack.h
@@ -17,10 +17,10 @@
 /// \brief  Header file for QA tasks for the track and the event properties.
 ///
 
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/ASoAHelpers.h"
 #include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/PIDResponse.h"
+
+#include "Framework/ASoAHelpers.h"
+#include "Framework/AnalysisDataModel.h"
 
 // Output table declaration
 namespace o2::aod
diff --git a/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx b/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
index 0184d5b39f0..2c2ab18a49d 100644
--- a/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
+++ b/DPG/Tasks/AOTTrack/qaEventTrackLiteProducer.cxx
@@ -19,22 +19,24 @@
 
 #include "qaEventTrack.h"
 
-#include <vector>
+#include "Common/Core/TrackSelection.h"
+#include "Common/Core/TrackSelectionDefaults.h"
+#include "Common/Core/trackUtilities.h"
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/McCollisionExtra.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "TRandom.h"
+#include "Framework/AnalysisDataModel.h"
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/runDataProcessing.h"
-#include "Framework/AnalysisDataModel.h"
 #include "ReconstructionDataFormats/DCA.h"
-#include "Common/Core/trackUtilities.h"
-#include "Common/DataModel/McCollisionExtra.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/TrackSelectionTables.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/Core/TrackSelection.h"
-#include "Common/Core/TrackSelectionDefaults.h"
-#include "Common/TableProducer/PID/pidTOFBase.h"
+
+#include "TRandom.h"
+
+#include <vector>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/DPG/Tasks/TOF/tofSkimsTableCreator.h b/DPG/Tasks/TOF/tofSkimsTableCreator.h
index 4f0ec48ed06..f1dd4ccfb3e 100644
--- a/DPG/Tasks/TOF/tofSkimsTableCreator.h
+++ b/DPG/Tasks/TOF/tofSkimsTableCreator.h
@@ -19,9 +19,10 @@
 #ifndef DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 #define DPG_TASKS_TOF_TOFSKIMSTABLECREATOR_H_
 
-#include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/TableProducer/PID/pidTOFBase.h"
+
 #include "Framework/AnalysisDataModel.h"
 
 namespace o2::aod