diff --git a/PWGUD/DataModel/UDTruegapsideTables.h b/PWGUD/DataModel/UDTruegapsideTables.h
index 79255e3dc78..e0d2ff0d639 100644
--- a/PWGUD/DataModel/UDTruegapsideTables.h
+++ b/PWGUD/DataModel/UDTruegapsideTables.h
@@ -19,15 +19,6 @@
 
 #include <Framework/ASoA.h>
 #include <Framework/AnalysisDataModel.h>
-#include <Framework/AnalysisHelpers.h>
-#include <Framework/AnalysisTask.h>
-#include <Framework/BinningPolicy.h>
-#include <Framework/Configurable.h>
-#include <Framework/GroupedCombinations.h>
-#include <Framework/HistogramRegistry.h>
-#include <Framework/HistogramSpec.h>
-#include <Framework/InitContext.h>
-#include <Framework/runDataProcessing.h>
 
 namespace o2::aod
 {
diff --git a/PWGUD/TableProducer/trueGapProducer.cxx b/PWGUD/TableProducer/trueGapProducer.cxx
index bb059d15b78..da5a6e45203 100644
--- a/PWGUD/TableProducer/trueGapProducer.cxx
+++ b/PWGUD/TableProducer/trueGapProducer.cxx
@@ -22,9 +22,7 @@
 #include <Framework/AnalysisDataModel.h>
 #include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
-#include <Framework/BinningPolicy.h>
 #include <Framework/Configurable.h>
-#include <Framework/GroupedCombinations.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
 #include <Framework/InitContext.h>
diff --git a/PWGUD/TableProducer/upcCandProducerSemiFwd.cxx b/PWGUD/TableProducer/upcCandProducerSemiFwd.cxx
index 958c2e8e796..cb6146aee7b 100644
--- a/PWGUD/TableProducer/upcCandProducerSemiFwd.cxx
+++ b/PWGUD/TableProducer/upcCandProducerSemiFwd.cxx
@@ -20,6 +20,10 @@
 #include "PWGUD/Core/UPCHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
 
+#include "Common/DataModel/PIDResponseTOF.h"
+#include "Common/DataModel/PIDResponseTPC.h"
+#include "Common/DataModel/TrackSelectionTables.h"
+
 #include <CCDB/BasicCCDBManager.h>
 #include <CCDB/CcdbApi.h>
 #include <CommonConstants/LHCConstants.h>
@@ -45,6 +49,7 @@
 #include <TH1.h>
 #include <TMath.h>
 
+#include <cmath>
 #include <cstdint>
 #include <cstdlib>
 #include <map>
diff --git a/PWGUD/Tasks/flowLongRangeCorrUpc.cxx b/PWGUD/Tasks/flowLongRangeCorrUpc.cxx
index 4b2aafbdaf4..bf6bc60ef98 100644
--- a/PWGUD/Tasks/flowLongRangeCorrUpc.cxx
+++ b/PWGUD/Tasks/flowLongRangeCorrUpc.cxx
@@ -21,6 +21,7 @@
 
 #include "Common/Core/RecoDecay.h"
 
+#include <CCDB/BasicCCDBManager.h>
 #include <CommonConstants/MathConstants.h>
 #include <FT0Base/Geometry.h> // o2::ft0::Geometry
 #include <Framework/ASoA.h>
@@ -35,9 +36,10 @@
 #include <Framework/InitContext.h>
 #include <Framework/runDataProcessing.h>
 
+#include <TH3.h>
 #include <TRandom3.h>
-#include <TString.h>
 
+#include <chrono>
 #include <cmath>
 #include <cstdint>
 #include <cstdlib>
diff --git a/PWGUD/Tasks/upcFwdJpsiRl.cxx b/PWGUD/Tasks/upcFwdJpsiRl.cxx
index 8f42e1e8cb4..82a21c69137 100644
--- a/PWGUD/Tasks/upcFwdJpsiRl.cxx
+++ b/PWGUD/Tasks/upcFwdJpsiRl.cxx
@@ -29,14 +29,16 @@
 #include <Framework/AnalysisHelpers.h>
 #include <Framework/AnalysisTask.h>
 #include <Framework/Configurable.h>
+#include <Framework/DataTypes.h>
 #include <Framework/HistogramRegistry.h>
 #include <Framework/HistogramSpec.h>
 #include <Framework/InitContext.h>
 #include <Framework/OutputObjHeader.h>
 #include <Framework/runDataProcessing.h>
 
-#include <Math/Vector4D.h>
-#include <Math/VectorUtil.h>
+#include <Math/GenVector/VectorUtil.h>
+#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
+#include <Math/Vector4Dfwd.h>
 #include <TRandom3.h>
 
 #include <cmath>
diff --git a/PWGUD/Tasks/upcSemiFwdJpsiRl.cxx b/PWGUD/Tasks/upcSemiFwdJpsiRl.cxx
index eb77adce860..e9e1dfe834a 100644
--- a/PWGUD/Tasks/upcSemiFwdJpsiRl.cxx
+++ b/PWGUD/Tasks/upcSemiFwdJpsiRl.cxx
@@ -32,8 +32,9 @@
 #include <Framework/OutputObjHeader.h>
 #include <Framework/runDataProcessing.h>
 
-#include <Math/Vector4D.h>
-#include <Math/VectorUtil.h>
+#include <Math/GenVector/VectorUtil.h>
+#include <Math/Vector4D.h> // IWYU pragma: keep (do not replace with Math/Vector4Dfwd.h)
+#include <Math/Vector4Dfwd.h>
 #include <TRandom3.h>
 
 #include <cmath>