diff --git a/PWGUD/Core/UDHelpers.h b/PWGUD/Core/UDHelpers.h
index d52ba7e2f5c..d9d6a1dd131 100644
--- a/PWGUD/Core/UDHelpers.h
+++ b/PWGUD/Core/UDHelpers.h
@@ -23,12 +23,12 @@
 #include "Common/DataModel/EventSelection.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "CommonConstants/LHCConstants.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "DataFormatsFT0/Digit.h"
-#include "Framework/Logger.h"
+#include <CommonConstants/LHCConstants.h>
+#include <DataFormatsFIT/Triggers.h>
+#include <DataFormatsFT0/Digit.h>
+#include <Framework/Logger.h>
 
-#include "TLorentzVector.h"
+#include <TLorentzVector.h>
 
 #include <algorithm>
 #include <bitset>
diff --git a/PWGUD/DataModel/UDTables.h b/PWGUD/DataModel/UDTables.h
index f129bda8215..cfbbb7af50f 100644
--- a/PWGUD/DataModel/UDTables.h
+++ b/PWGUD/DataModel/UDTables.h
@@ -25,10 +25,10 @@
 #include "Common/DataModel/PIDResponseTPC.h"
 #include "Common/DataModel/TrackSelectionTables.h"
 
-#include "Framework/ASoA.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/DataTypes.h"
-#include "MathUtils/Utils.h"
+#include <Framework/ASoA.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/DataTypes.h>
+#include <MathUtils/Utils.h>
 
 #include <cmath>
 #include <vector>
diff --git a/PWGUD/TableProducer/SGCandProducer.cxx b/PWGUD/TableProducer/SGCandProducer.cxx
index f69acb28e16..96b801d05df 100644
--- a/PWGUD/TableProducer/SGCandProducer.cxx
+++ b/PWGUD/TableProducer/SGCandProducer.cxx
@@ -27,20 +27,20 @@
 #include "Common/CCDB/ctpRateFetcher.h"
 #include "Common/DataModel/EventSelection.h"
 
-#include "CCDB/BasicCCDBManager.h"
-#include "CommonConstants/LHCConstants.h"
-#include "DataFormatsFIT/Triggers.h"
-#include "DataFormatsParameters/AggregatedRunInfo.h"
-#include "DataFormatsParameters/GRPLHCIFData.h"
-#include "DataFormatsParameters/GRPMagField.h"
-#include "DataFormatsParameters/GRPObject.h"
-#include "Framework/ASoA.h"
-#include "Framework/ASoAHelpers.h"
-#include "Framework/AnalysisDataModel.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/runDataProcessing.h"
-#include "ReconstructionDataFormats/Vertex.h"
+#include <CCDB/BasicCCDBManager.h>
+#include <CommonConstants/LHCConstants.h>
+#include <DataFormatsFIT/Triggers.h>
+#include <DataFormatsParameters/AggregatedRunInfo.h>
+#include <DataFormatsParameters/GRPLHCIFData.h>
+#include <DataFormatsParameters/GRPMagField.h>
+#include <DataFormatsParameters/GRPObject.h>
+#include <Framework/ASoA.h>
+#include <Framework/ASoAHelpers.h>
+#include <Framework/AnalysisDataModel.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/runDataProcessing.h>
+#include <ReconstructionDataFormats/Vertex.h>
 
 #include <algorithm>
 #include <cmath>
diff --git a/PWGUD/Tasks/upcFITMultiplicity.cxx b/PWGUD/Tasks/upcFITMultiplicity.cxx
index 25b1d5c910a..0bfc167cd23 100644
--- a/PWGUD/Tasks/upcFITMultiplicity.cxx
+++ b/PWGUD/Tasks/upcFITMultiplicity.cxx
@@ -13,19 +13,25 @@
 // \author Sandor Lokos, sandor.lokos@cern.ch
 // \since March 2026
 
-#include "PWGUD/Core/SGSelector.h"
-#include "PWGUD/Core/UDHelpers.h"
-#include "PWGUD/DataModel/UDTables.h"
-
-#include "FT0Base/Geometry.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/Logger.h"
-#include "Framework/runDataProcessing.h"
-
-#include <array>
-#include <cmath>
-#include <cstdint>
+#include
+  "PWGUD/Core/SGSelector.h"
+  "
+#include
+  "PWGUD/Core/UDHelpers.h"
+  "
+#include
+  "PWGUD/DataModel/UDTables.h"
+  "
+
+#include <FT0Base/Geometry.h">
+#include <Framework/AnalysisTask.h">
+#include <Framework/HistogramRegistry.h">
+#include <Framework/Logger.h">
+#include <Framework/runDataProcessing.h">
+
+#include <array>>
+#include <cmath>>
+#include <cstdint>>
 
 using namespace o2;
 using namespace o2::framework;
diff --git a/PWGUD/Tasks/upcTestFITBitMapping.cxx b/PWGUD/Tasks/upcTestFITBitMapping.cxx
index 91f91e67411..106eee63a83 100644
--- a/PWGUD/Tasks/upcTestFITBitMapping.cxx
+++ b/PWGUD/Tasks/upcTestFITBitMapping.cxx
@@ -17,11 +17,11 @@
 #include "PWGUD/Core/UDHelpers.h"
 #include "PWGUD/DataModel/UDTables.h"
 
-#include "FT0Base/Geometry.h"
-#include "Framework/AnalysisTask.h"
-#include "Framework/HistogramRegistry.h"
-#include "Framework/Logger.h"
-#include "Framework/runDataProcessing.h"
+#include <FT0Base/Geometry.h>
+#include <Framework/AnalysisTask.h>
+#include <Framework/HistogramRegistry.h>
+#include <Framework/Logger.h>
+#include <Framework/runDataProcessing.h>
 
 #include <array>
 #include <cmath>