diff --git a/.clang-tidy b/.clang-tidy
index b2f304c5498279d31078465317912dc36f07ed40..615da704bf7aa96444ddd726d45865c21a779084 100644
--- a/.clang-tidy
+++ b/.clang-tidy
@@ -1,5 +1,5 @@
 #
-# SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+# SPDX-FileCopyrightText: Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 #
 # SPDX-License-Identifier: Apache-2.0
 #
@@ -21,6 +21,8 @@ Checks: >
   -bugprone-easily-swappable-parameters,
   -cppcoreguidelines-avoid-magic-numbers,
   -llvm-header-guard,
+  -modernize-use-trailing-return-type,
   -readability-function-cognitive-complexity,
   -readability-identifier-length,
   -readability-magic-numbers,
+  -readability-math-missing-parentheses,
diff --git a/kai/ukernels/matmul/matmul_clamp_f32_qsi8d32p_qsi4c32p/kai_matmul_clamp_f32_qsi8d32p1x8_qsi4c32p4x8_1x4x32_neon_dotprod.c b/kai/ukernels/matmul/matmul_clamp_f32_qsi8d32p_qsi4c32p/kai_matmul_clamp_f32_qsi8d32p1x8_qsi4c32p4x8_1x4x32_neon_dotprod.c
index 69096ff732778cd4898d91568cda70d008d86b93..6aa84defa819229cc5447547451299d57227a506 100644
--- a/kai/ukernels/matmul/matmul_clamp_f32_qsi8d32p_qsi4c32p/kai_matmul_clamp_f32_qsi8d32p1x8_qsi4c32p4x8_1x4x32_neon_dotprod.c
+++ b/kai/ukernels/matmul/matmul_clamp_f32_qsi8d32p_qsi4c32p/kai_matmul_clamp_f32_qsi8d32p1x8_qsi4c32p4x8_1x4x32_neon_dotprod.c
@@ -10,6 +10,7 @@
 #include "kai_matmul_clamp_f32_qsi8d32p1x8_qsi4c32p4x8_1x4x32_neon_dotprod.h"
 
 #include <arm_neon.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #include "kai/kai_common.h"
diff --git a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qai8dxp_f16_neon.c b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qai8dxp_f16_neon.c
index 14f4768edeedddcdf28b201fce6fc505190b028f..e941a926eda0db56ddea35a4c3f4574c67fce4d0 100644
--- a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qai8dxp_f16_neon.c
+++ b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qai8dxp_f16_neon.c
@@ -15,6 +15,7 @@
 #include <arm_neon.h>
 #include <float.h>
 #include <math.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #include "kai/kai_common.h"
diff --git a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qai8dxp_f32.c b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qai8dxp_f32.c
index 4f7c756c8a429b16161fb915ba614e6d4d1301af..eed1da2848a76f45f7cb4557334086963c195b96 100644
--- a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qai8dxp_f32.c
+++ b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qai8dxp_f32.c
@@ -10,6 +10,7 @@
 #endif
 #include <float.h>
 #include <math.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #include "kai/kai_common.h"
diff --git a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32p_f32.c b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32p_f32.c
index a75daf27eb3e9561ddb0a149f07857ae41fcad5b..de57678d648cd7fb0d0bd2260cd1e8017c991fb9 100644
--- a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32p_f32.c
+++ b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32p_f32.c
@@ -1,11 +1,12 @@
 //
-// SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+// SPDX-FileCopyrightText: Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 //
 // SPDX-License-Identifier: Apache-2.0
 //
 #include "kai_lhs_quant_pack_qsi8d32p_f32.h"
 
 #include <math.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #include "kai/kai_common.h"
diff --git a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32p_f32_neon.c b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32p_f32_neon.c
index 70298754445c783e55af8d34724f5d8cfc013ca4..736c80867a0ed94e688cb7b933da472c769e7674 100644
--- a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32p_f32_neon.c
+++ b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32p_f32_neon.c
@@ -1,5 +1,5 @@
 //
-// SPDX-FileCopyrightText: Copyright 2024 Arm Limited and/or its affiliates <open-source-office@arm.com>
+// SPDX-FileCopyrightText: Copyright 2024-2025 Arm Limited and/or its affiliates <open-source-office@arm.com>
 //
 // SPDX-License-Identifier: Apache-2.0
 //
@@ -11,6 +11,7 @@
 #include "kai_lhs_quant_pack_qsi8d32p_f32_neon.h"
 
 #include <math.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #include "kai/kai_common.h"
diff --git a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32pscalef32_f16_neon.c b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32pscalef32_f16_neon.c
index 288d778ba8660e4dc616bf3b53293e757c538a9e..5096f29e4c8d8331c6b97475a816e19819f2cbc1 100644
--- a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32pscalef32_f16_neon.c
+++ b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32pscalef32_f16_neon.c
@@ -13,6 +13,7 @@
 #include <arm_neon.h>
 #include <float.h>
 #include <math.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #include "kai/kai_common.h"
diff --git a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32pscalef32_f32_neon.c b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32pscalef32_f32_neon.c
index 0854148e0d08c87a5877d880f9434b53bedded1a..13571b59164f4b37b2b6780fa3bc1f13bdbc4608 100644
--- a/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32pscalef32_f32_neon.c
+++ b/kai/ukernels/matmul/pack/kai_lhs_quant_pack_qsi8d32pscalef32_f32_neon.c
@@ -12,6 +12,7 @@
 
 #include <arm_neon.h>
 #include <float.h>
+#include <stddef.h>
 #include <stdint.h>
 
 #include "kai/kai_common.h"