diff --git a/Common/DataModel/GloCCDBObjects.h b/Common/DataModel/GloCCDBObjects.h
index 4612f8ba02a..21b8bb7d610 100644
--- a/Common/DataModel/GloCCDBObjects.h
+++ b/Common/DataModel/GloCCDBObjects.h
@@ -59,6 +59,9 @@
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/Logger.h>
 
+#include <TBufferFile.h> // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
+#include <TClass.h>      // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
+
 #include <cstdint>
 #include <string>
 #include <string_view>
diff --git a/Common/DataModel/TpcCCDBObjects.h b/Common/DataModel/TpcCCDBObjects.h
index 19b455e0234..9449946ff6c 100644
--- a/Common/DataModel/TpcCCDBObjects.h
+++ b/Common/DataModel/TpcCCDBObjects.h
@@ -29,6 +29,9 @@
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
 
+#include <TBufferFile.h> // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
+#include <TClass.h>      // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
+
 namespace o2::aod
 {
 namespace ccdbTpc
diff --git a/Common/DataModel/TrackTunerCCDBObjects.h b/Common/DataModel/TrackTunerCCDBObjects.h
index 2e4817efff3..5c27ea2f9eb 100644
--- a/Common/DataModel/TrackTunerCCDBObjects.h
+++ b/Common/DataModel/TrackTunerCCDBObjects.h
@@ -28,6 +28,8 @@
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
 
+#include <TBufferFile.h> // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
+#include <TClass.h>      // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
 #include <TList.h>
 
 namespace o2::aod
diff --git a/PWGEM/PhotonMeson/DataModel/EventTables.h b/PWGEM/PhotonMeson/DataModel/EventTables.h
index 93630002fc5..0d58611d8a5 100644
--- a/PWGEM/PhotonMeson/DataModel/EventTables.h
+++ b/PWGEM/PhotonMeson/DataModel/EventTables.h
@@ -23,8 +23,8 @@
 #include <EMCALCalib/BadChannelMap.h>
 #include <Framework/AnalysisDataModel.h>
 
-#include <TBufferFile.h> // IWYU pragma: keep
-#include <TClass.h>      // IWYU pragma: keep
+#include <TBufferFile.h> // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
+#include <TClass.h>      // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
 
 #include <Rtypes.h> // for BIT
 
diff --git a/PWGEM/PhotonMeson/DataModel/bcWiseTables.h b/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
index e1effd5871f..d2eed4b2f58 100644
--- a/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
+++ b/PWGEM/PhotonMeson/DataModel/bcWiseTables.h
@@ -19,8 +19,8 @@
 #include <DataFormatsParameters/GRPLHCIFData.h>
 #include <Framework/AnalysisDataModel.h>
 
-#include <TBufferFile.h> // IWYU pragma: keep
-#include <TClass.h>      // IWYU pragma: keep
+#include <TBufferFile.h> // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
+#include <TClass.h>      // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
 
 #include <array>
 #include <cmath>
diff --git a/Tutorials/src/ccdbtableaccess.cxx b/Tutorials/src/ccdbtableaccess.cxx
index 5c703e4d1dd..3cd86168e8f 100644
--- a/Tutorials/src/ccdbtableaccess.cxx
+++ b/Tutorials/src/ccdbtableaccess.cxx
@@ -21,6 +21,9 @@
 #include <Framework/InitContext.h>
 #include <Framework/runDataProcessing.h>
 
+#include <TBufferFile.h> // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
+#include <TClass.h>      // IWYU pragma: keep (needed by DECLARE_SOA_CCDB_COLUMN...)
+
 using namespace o2::framework;
 using namespace o2::header;
 using namespace o2;