diff --git a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidQa.cxx b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidQa.cxx
index 346fd643233..5a1f821cda2 100644
--- a/DPG/Tasks/AOTTrack/PID/HMPID/hmpidQa.cxx
+++ b/DPG/Tasks/AOTTrack/PID/HMPID/hmpidQa.cxx
@@ -14,7 +14,6 @@
 #include "Common/Core/PID/PIDTOF.h"
 #include "Common/Core/trackUtilities.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
diff --git a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.cxx b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.cxx
index e350f1bbf28..95f9016d388 100644
--- a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.cxx
+++ b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOF.cxx
@@ -17,7 +17,7 @@
 
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
-#include "Common/DataModel/PIDResponse.h"
+#include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
diff --git a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
index 60ad0a9ab38..a1461cb0509 100644
--- a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
+++ b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBeta.cxx
@@ -15,16 +15,17 @@
 /// \brief  Task to produce the TOF QA plots for Beta
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
index f503ab1d92d..4fe9551d434 100644
--- a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
+++ b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFBetaImp.cxx
@@ -15,16 +15,17 @@
 /// \brief  Task to produce the TOF QA plots for Beta. Version using dynamic columns. Interim solution for test and benchmarking
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
 using namespace o2;
 using namespace o2::framework;
 using namespace o2::framework::expressions;
diff --git a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
index 204bff837fb..b9ead03b14f 100644
--- a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
+++ b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFEvTime.cxx
@@ -15,20 +15,21 @@
 /// \brief  Tasks of the TOF PID quantities for the event times
 ///
 
-#include "TEfficiency.h"
-#include "THashList.h"
-
-#include "Framework/HistogramRegistry.h"
-#include "Framework/StaticFor.h"
-#include "Framework/AnalysisTask.h"
-#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
-#include "Framework/runDataProcessing.h"
+
 #include "CommonConstants/LHCConstants.h"
 #include "DataFormatsFT0/Digit.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/HistogramRegistry.h"
+#include "Framework/StaticFor.h"
+#include "Framework/runDataProcessing.h"
+
+#include "TEfficiency.h"
+#include "THashList.h"
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
index 73d1c72ad1e..2e6987ce034 100644
--- a/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
+++ b/DPG/Tasks/AOTTrack/PID/TOF/qaPIDTOFMC.cxx
@@ -16,11 +16,12 @@
 ///
 
 // O2 includes
+#include "Common/DataModel/EventSelection.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/EventSelection.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx b/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
index 993c2f7b24c..e05023b4b3a 100644
--- a/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
+++ b/DPG/Tasks/AOTTrack/PID/TPC/qaPIDTPCMC.cxx
@@ -16,10 +16,11 @@
 ///
 
 // O2 includes
+#include "Common/DataModel/PIDResponseTPC.h"
+
 #include "Framework/AnalysisTask.h"
 #include "Framework/HistogramRegistry.h"
 #include "Framework/StaticFor.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Framework/runDataProcessing.h"
 
 using namespace o2;
diff --git a/DPG/Tasks/TOF/tofSkimsTableCreator.cxx b/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
index 1c2d1a79608..c61a3336982 100644
--- a/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
+++ b/DPG/Tasks/TOF/tofSkimsTableCreator.cxx
@@ -16,15 +16,16 @@
 /// \brief  Task to defined the skimmed data format for the TOF skims
 ///
 
-#include "Framework/AnalysisTask.h"
-#include "Framework/runDataProcessing.h"
-#include "Common/DataModel/PIDResponse.h"
-#include "Common/DataModel/Multiplicity.h"
-#include "Common/DataModel/TrackSelectionTables.h"
+#include "tofSkimsTableCreator.h"
+
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
+#include "Common/DataModel/Multiplicity.h"
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/TrackSelectionTables.h"
 
-#include "tofSkimsTableCreator.h"
+#include "Framework/AnalysisTask.h"
+#include "Framework/runDataProcessing.h"
 
 using namespace o2;
 using namespace o2::framework;