diff --git a/apps/mathlib/math/Matrix.hpp b/apps/mathlib/math/Matrix.hpp
index 4d77316534..f19db15eca 100644
--- a/apps/mathlib/math/Matrix.hpp
+++ b/apps/mathlib/math/Matrix.hpp
@@ -39,7 +39,9 @@
 
 #pragma once
 
-#ifdef ARM_MATH_CM4
+#include <nuttx/config.h>
+
+#if defined(CONFIG_ARCH_CORTEXM4) && defined(CONFIG_ARCH_FPU)
 #include "arm/Matrix.hpp"
 #else
 #include "generic/Matrix.hpp"
diff --git a/apps/mathlib/math/Vector.hpp b/apps/mathlib/math/Vector.hpp
index 773bd50323..73de793d51 100644
--- a/apps/mathlib/math/Vector.hpp
+++ b/apps/mathlib/math/Vector.hpp
@@ -39,7 +39,9 @@
 
 #pragma once
 
-#ifdef ARM_MATH_CM4
+#include <nuttx/config.h>
+
+#if defined(CONFIG_ARCH_CORTEXM4) && defined(CONFIG_ARCH_FPU)
 #include "arm/Vector.hpp"
 #else
 #include "generic/Vector.hpp"