diff --git a/PWGHF/TableProducer/mcPidTof.cxx b/PWGHF/TableProducer/mcPidTof.cxx
index 2fbfa5db98a..382cf870897 100644
--- a/PWGHF/TableProducer/mcPidTof.cxx
+++ b/PWGHF/TableProducer/mcPidTof.cxx
@@ -21,7 +21,6 @@
 #include "Common/Core/TableHelper.h"
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/FT0Corrected.h"
-#include "Common/DataModel/PIDResponse.h"
 #include "Common/DataModel/PIDResponseTOF.h"
 #include "Common/TableProducer/PID/pidTOFBase.h"
 
@@ -870,32 +869,28 @@ struct McPidTof {
         if (fullTable) {
           tablePIDFullPi(-999.f, -999.f);
         } else {
-          aod::pidutils::packInTable<aod::pidtof_tiny::binning>(-999.f,
-                                                                tablePIDPi);
+          aod::pidtof_tiny::binning::packInTable(-999.f, tablePIDPi);
         }
         break;
       case IdxKa:
         if (fullTable) {
           tablePIDFullKa(-999.f, -999.f);
         } else {
-          aod::pidutils::packInTable<aod::pidtof_tiny::binning>(-999.f,
-                                                                tablePIDKa);
+          aod::pidtof_tiny::binning::packInTable(-999.f, tablePIDKa);
         }
         break;
       case IdxPr:
         if (fullTable) {
           tablePIDFullPr(-999.f, -999.f);
         } else {
-          aod::pidutils::packInTable<aod::pidtof_tiny::binning>(-999.f,
-                                                                tablePIDPr);
+          aod::pidtof_tiny::binning::packInTable(-999.f, tablePIDPr);
         }
         break;
       case IdxDe:
         if (fullTable) {
           tablePIDFullDe(-999.f, -999.f);
         } else {
-          aod::pidutils::packInTable<aod::pidtof_tiny::binning>(-999.f,
-                                                                tablePIDDe);
+          aod::pidtof_tiny::binning::packInTable(-999.f, tablePIDDe);
         }
         break;
       default:
@@ -1021,7 +1016,7 @@ struct McPidTof {
                 nSigma = applyMcRecalib(pidId, trk.pt(), nSigma);
               }
             }
-            aod::pidutils::packInTable<aod::pidtof_tiny::binning>(nSigma, tablePIDPi);
+            aod::pidtof_tiny::binning::packInTable(nSigma, tablePIDPi);
             break;
           }
           case IdxKa: {
@@ -1031,7 +1026,7 @@ struct McPidTof {
                 nSigma = applyMcRecalib(pidId, trk.pt(), nSigma);
               }
             }
-            aod::pidutils::packInTable<aod::pidtof_tiny::binning>(nSigma, tablePIDKa);
+            aod::pidtof_tiny::binning::packInTable(nSigma, tablePIDKa);
             break;
           }
           case IdxPr: {
@@ -1041,7 +1036,7 @@ struct McPidTof {
                 nSigma = applyMcRecalib(pidId, trk.pt(), nSigma);
               }
             }
-            aod::pidutils::packInTable<aod::pidtof_tiny::binning>(nSigma, tablePIDPr);
+            aod::pidtof_tiny::binning::packInTable(nSigma, tablePIDPr);
             break;
           }
           case IdxDe: {
@@ -1051,7 +1046,7 @@ struct McPidTof {
                 nSigma = applyMcRecalib(IdxPr, trk.pt(), nSigma);                              // FIXME: currently postcalibrations for protons applied to deuterons, to be checked
               }
             }
-            aod::pidutils::packInTable<aod::pidtof_tiny::binning>(nSigma, tablePIDDe);
+            aod::pidtof_tiny::binning::packInTable(nSigma, tablePIDDe);
             break;
           }
           default: