diff --git a/PWGUD/Core/DGCutparHolderLinkDef.h b/PWGUD/Core/DGCutparHolderLinkDef.h
index b6b7c63efca..722796d015f 100644
--- a/PWGUD/Core/DGCutparHolderLinkDef.h
+++ b/PWGUD/Core/DGCutparHolderLinkDef.h
@@ -8,12 +8,10 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#ifndef PWGUD_CORE_DGCUTPARHOLDERLINKDEF_H_
-#define PWGUD_CORE_DGCUTPARHOLDERLINKDEF_H_
+
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
 #pragma link C++ class DGCutparHolder + ;
-
-#endif // PWGUD_CORE_DGCUTPARHOLDERLINKDEF_H_
diff --git a/PWGUD/Core/DGPIDSelectorLinkDef.h b/PWGUD/Core/DGPIDSelectorLinkDef.h
index 2d0b181ba19..837079914e1 100644
--- a/PWGUD/Core/DGPIDSelectorLinkDef.h
+++ b/PWGUD/Core/DGPIDSelectorLinkDef.h
@@ -9,6 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+// NOLINT(build/header_guard)
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/PWGUD/Core/FITCutParHolderLinkDef.h b/PWGUD/Core/FITCutParHolderLinkDef.h
index 3194a6754b2..5e0644779cb 100644
--- a/PWGUD/Core/FITCutParHolderLinkDef.h
+++ b/PWGUD/Core/FITCutParHolderLinkDef.h
@@ -13,12 +13,9 @@
 // \author Sandor Lokos, sandor.lokos@cern.ch
 // \since  March 2026
 
-#ifndef PWGUD_CORE_FITCUTPARHOLDERLINKDEF_H_
-#define PWGUD_CORE_FITCUTPARHOLDERLINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
 #pragma link C++ class FITCutParHolder + ;
-
-#endif // PWGUD_CORE_FITCUTPARHOLDERLINKDEF_H_
diff --git a/PWGUD/Core/SGCutParHolderLinkDef.h b/PWGUD/Core/SGCutParHolderLinkDef.h
index 5dcadadc69e..f5d3a6f5a82 100644
--- a/PWGUD/Core/SGCutParHolderLinkDef.h
+++ b/PWGUD/Core/SGCutParHolderLinkDef.h
@@ -9,12 +9,9 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef PWGUD_CORE_SGCUTPARHOLDERLINKDEF_H_
-#define PWGUD_CORE_SGCUTPARHOLDERLINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
 #pragma link C++ class SGCutParHolder + ;
-
-#endif // PWGUD_CORE_SGCUTPARHOLDERLINKDEF_H_
diff --git a/PWGUD/Core/UDFSParserLinkDef.h b/PWGUD/Core/UDFSParserLinkDef.h
index f7caf1a0ab0..8f6e10eabd6 100644
--- a/PWGUD/Core/UDFSParserLinkDef.h
+++ b/PWGUD/Core/UDFSParserLinkDef.h
@@ -8,12 +8,10 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#ifndef PWGUD_CORE_UDFSPARSERLINKDEF_H_
-#define PWGUD_CORE_UDFSPARSERLINKDEF_H_
+
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
 #pragma link C++ class UDFSParser + ;
-
-#endif // PWGUD_CORE_UDFSPARSERLINKDEF_H_
diff --git a/PWGUD/Core/UDGoodRunSelectorLinkDef.h b/PWGUD/Core/UDGoodRunSelectorLinkDef.h
index c26b4622809..c439e2e1094 100644
--- a/PWGUD/Core/UDGoodRunSelectorLinkDef.h
+++ b/PWGUD/Core/UDGoodRunSelectorLinkDef.h
@@ -9,6 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+// NOLINT(build/header_guard)
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/PWGUD/Core/UPCCutparHolderLinkDef.h b/PWGUD/Core/UPCCutparHolderLinkDef.h
index 49d4802838d..6391b991669 100644
--- a/PWGUD/Core/UPCCutparHolderLinkDef.h
+++ b/PWGUD/Core/UPCCutparHolderLinkDef.h
@@ -9,6 +9,8 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
+// NOLINT(build/header_guard)
+
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
diff --git a/PWGUD/Core/decayTreeLinkDef.h b/PWGUD/Core/decayTreeLinkDef.h
index 92d99ccf1bc..6ed7643f91b 100644
--- a/PWGUD/Core/decayTreeLinkDef.h
+++ b/PWGUD/Core/decayTreeLinkDef.h
@@ -8,12 +8,10 @@
 // In applying this license CERN does not waive the privileges and immunities
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
-#ifndef PWGUD_CORE_DECAYTREELINKDEF_H_
-#define PWGUD_CORE_DECAYTREELINKDEF_H_
+
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
 #pragma link off all functions;
 #pragma link C++ class decayTree + ;
-
-#endif // PWGUD_CORE_DECAYTREELINKDEF_H_
diff --git a/PWGUD/Tasks/sgFITAnalyzer.cxx b/PWGUD/Tasks/sgFITAnalyzer.cxx
index de44924b0a2..39aa9c2486a 100644
--- a/PWGUD/Tasks/sgFITAnalyzer.cxx
+++ b/PWGUD/Tasks/sgFITAnalyzer.cxx
@@ -37,6 +37,7 @@
 
 #include <cstdint>
 #include <cstdlib>
+#include <string>
 #include <vector>
 
 using namespace o2;
diff --git a/PWGUD/Tasks/sgSpectraAnalyzer.cxx b/PWGUD/Tasks/sgSpectraAnalyzer.cxx
index b17c699970f..2d0d577bb84 100644
--- a/PWGUD/Tasks/sgSpectraAnalyzer.cxx
+++ b/PWGUD/Tasks/sgSpectraAnalyzer.cxx
@@ -33,6 +33,7 @@
 
 #include <cstdlib>
 #include <iostream>
+#include <string>
 #include <utility>
 #include <vector>