diff --git a/Common/CCDB/AnalysisCCDBLinkDef.h b/Common/CCDB/AnalysisCCDBLinkDef.h
index bb2da231284..b8253021f88 100644
--- a/Common/CCDB/AnalysisCCDBLinkDef.h
+++ b/Common/CCDB/AnalysisCCDBLinkDef.h
@@ -14,8 +14,7 @@
 ///
 /// \author Evgeny Kryshen <evgeny.kryshen@cern.ch>
 
-#ifndef COMMON_CCDB_ANALYSISCCDBLINKDEF_H_
-#define COMMON_CCDB_ANALYSISCCDBLINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -24,5 +23,3 @@
 #pragma link C++ class EventSelectionParams + ;
 #pragma link C++ class TriggerAliases + ;
 #pragma link C++ class std::map < uint64_t, uint32_t> + ;
-
-#endif // COMMON_CCDB_ANALYSISCCDBLINKDEF_H_
diff --git a/Common/Core/AnalysisCoreLinkDef.h b/Common/Core/AnalysisCoreLinkDef.h
index b376ccc7f10..21eb52ac586 100644
--- a/Common/Core/AnalysisCoreLinkDef.h
+++ b/Common/Core/AnalysisCoreLinkDef.h
@@ -9,8 +9,7 @@
 // granted to it by virtue of its status as an Intergovernmental Organization
 // or submit itself to any jurisdiction.
 
-#ifndef COMMON_CORE_ANALYSISCORELINKDEF_H_
-#define COMMON_CORE_ANALYSISCORELINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link off all globals;
 #pragma link off all classes;
@@ -25,5 +24,3 @@
 #pragma link C++ class o2::pid::tpc::Response + ;
 
 #pragma link C++ class OrbitRange + ;
-
-#endif // COMMON_CORE_ANALYSISCORELINKDEF_H_
diff --git a/Common/Core/EventFilteringUtilsLinkDef.h b/Common/Core/EventFilteringUtilsLinkDef.h
index 3f029b8aa9a..394c051784f 100644
--- a/Common/Core/EventFilteringUtilsLinkDef.h
+++ b/Common/Core/EventFilteringUtilsLinkDef.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/Common/Core/FFitWeightsLinkDef.h b/Common/Core/FFitWeightsLinkDef.h
index 1960be8f4df..3c604376da9 100644
--- a/Common/Core/FFitWeightsLinkDef.h
+++ b/Common/Core/FFitWeightsLinkDef.h
@@ -14,9 +14,6 @@
 ///
 /// \author Joachim C. K. B. Hansen
 
-#ifndef COMMON_CORE_FFITWEIGHTSLINKDEF_H_
-#define COMMON_CORE_FFITWEIGHTSLINKDEF_H_
+// NOLINT(build/header_guard)
 
 #pragma link C++ class FFitWeights + ;
-
-#endif // COMMON_CORE_FFITWEIGHTSLINKDEF_H_
diff --git a/Common/DataModel/Centrality.h b/Common/DataModel/Centrality.h
index 3bdf839eed8..a7f073fde92 100644
--- a/Common/DataModel/Centrality.h
+++ b/Common/DataModel/Centrality.h
@@ -100,18 +100,22 @@ using BCCentFT0C = BCCentFT0Cs::iterator;
 
 template <typename T>
 concept HasRun2Centrality = requires(T&& t) {
+  // NOLINTBEGIN(readability/braces)
   { t.centRun2V0M() };
   { t.centRun2CL0() };
   { t.centRun2CL1() };
+  // NOLINTEND(readability/braces)
 };
 
 template <typename T>
 concept HasCentrality = requires(T&& t) {
+  // NOLINTBEGIN(readability/braces)
   { t.centFV0A() };
   { t.centFT0M() };
   { t.centFT0A() };
   { t.centFT0C() };
   { t.centNTPV() };
+  // NOLINTEND(readability/braces)
 };
 
 } // namespace o2::aod
diff --git a/Common/Tools/Multiplicity/multToolsLinkDef.h b/Common/Tools/Multiplicity/multToolsLinkDef.h
index f8740f5afcb..2f2cd969c20 100644
--- a/Common/Tools/Multiplicity/multToolsLinkDef.h
+++ b/Common/Tools/Multiplicity/multToolsLinkDef.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/Common/Tools/trackSelectionRequestLinkDef.h b/Common/Tools/trackSelectionRequestLinkDef.h
index ae9e95b415b..93b201ce15a 100644
--- a/Common/Tools/trackSelectionRequestLinkDef.h
+++ b/Common/Tools/trackSelectionRequestLinkDef.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;