diff --git a/config.mk.dist b/config.mk.dist
index 94dc09be..3666426f 100644
--- a/config.mk.dist
+++ b/config.mk.dist
@@ -15,8 +15,7 @@ ARCH = aarch64
 # Compiler for the target
 CC ?= $(CROSS_COMPILE)gcc
 CFLAGS = -std=c99 -pipe -O3
-CFLAGS += -Wall -Wno-missing-braces
-CFLAGS += -Werror=implicit-function-declaration
+CFLAGS += -Wall -Wno-missing-braces -Werror -Wno-error=cpp -Wno-error=unused-function
 
 # Used for test case generator that is executed on the host
 HOST_CC ?= gcc
diff --git a/math/test/c23_references.h b/math/test/c23_references.h
index 9bdc6597..f63a6e6f 100644
--- a/math/test/c23_references.h
+++ b/math/test/c23_references.h
@@ -181,7 +181,7 @@ arm_math_exp2m1 (double x)
 long double
 arm_math_exp2m1l (long double x)
 {
-  return (fabs (x) < 0x1p-52)
+  return (fabsl (x) < 0x1p-52)
 	     ? (long double) x * 0x1.62e42fefa39ef35793c7673007e6p-1l
 	     : exp2l ((long double) x) - 1.0l;
 }
diff --git a/math/test/mathbench_wrappers.h b/math/test/mathbench_wrappers.h
index 0bf57f88..a9df611c 100644
--- a/math/test/mathbench_wrappers.h
+++ b/math/test/mathbench_wrappers.h
@@ -43,6 +43,7 @@ powi_wrap (double x)
 
 #if __aarch64__ && __linux__
 
+#if WANT_C23_TESTS
 __vpcs static float32x4_t
 _Z_sincospif_wrap (float32x4_t x)
 {
@@ -58,6 +59,7 @@ _Z_sincospi_wrap (float64x2_t x)
   _ZGVnN2vl8l8_sincospi (x, s, c);
   return vld1q_f64 (s) + vld1q_f64 (c);
 }
+#endif
 
 __vpcs static float64x2_t
 _Z_atan2_wrap (float64x2_t x)
@@ -275,6 +277,7 @@ y_Z_sv_pow (svfloat64_t x, svbool_t pg)
   return _ZGVsMxvv_pow (svdup_f64 (2.34), x, pg);
 }
 
+#if WANT_C23_TESTS
 static svfloat32_t
 _Z_sv_sincospif_wrap (svfloat32_t x, svbool_t pg)
 {
@@ -290,6 +293,7 @@ _Z_sv_sincospi_wrap (svfloat64_t x, svbool_t pg)
   _ZGVsMxvl8l8_sincospi (x, s, c, pg);
   return svadd_x (pg, svld1 (pg, s), svld1 (pg, c));
 }
+#endif
 
 static svfloat32_t
 _Z_sv_modff_wrap (svfloat32_t x, svbool_t pg)
@@ -373,7 +377,7 @@ _Z_sv_powk_wrap (svfloat64_t x, svbool_t pg)
 
 #endif
 
-#if __aarch64__
+#if __aarch64__ && WANT_C23_TESTS
 static float
 sincospif_wrap (float x)
 {
diff --git a/math/test/mathtest.c b/math/test/mathtest.c
index 2c9eeff6..1a02af1e 100644
--- a/math/test/mathtest.c
+++ b/math/test/mathtest.c
@@ -1157,7 +1157,7 @@ int runtest(testdetail t) {
     /* Check the result */
     {
         unsigned resultr[2], resulti[2];
-        unsigned tresultr[3], tresulti[3], wres;
+        unsigned tresultr[3], tresulti[3] = {0}, wres;
 
         switch(t.func->rettype) {
         case rt_d: