diff --git a/src/VecSim/spaces/space_aux.cpp b/src/VecSim/spaces/space_aux.cpp
index 14ec126e6..052712d1c 100644
--- a/src/VecSim/spaces/space_aux.cpp
+++ b/src/VecSim/spaces/space_aux.cpp
@@ -1,8 +1,13 @@
 #include "space_aux.h"
+#include "cpu_features_macros.h"
+
+#ifdef CPU_FEATURES_ARCH_X86_64
+#include "cpuinfo_x86.h"
+#endif // CPU_FEATURES_ARCH_X86_64
 
 Arch_Optimization getArchitectureOptimization() {
 
-#ifdef CPU_FEATURES_ARCH_X86
+#ifdef CPU_FEATURES_ARCH_X86_64
 #include "cpuinfo_x86.h"
     cpu_features::X86Features features = cpu_features::GetX86Info().features;
     if (features.avx512f) {
@@ -13,7 +18,7 @@ Arch_Optimization getArchitectureOptimization() {
                features.sse4_2 || features.sse4a) {
         return ARCH_OPT_SSE;
     }
-#endif // CPU_FEATURES_ARCH_X86
+#endif // CPU_FEATURES_ARCH_X86_64
 
     return ARCH_OPT_NONE;
 }
diff --git a/tests/unit/test_spaces.cpp b/tests/unit/test_spaces.cpp
index fffe8668c..c6dfb4dbb 100644
--- a/tests/unit/test_spaces.cpp
+++ b/tests/unit/test_spaces.cpp
@@ -1,4 +1,5 @@
 #include "gtest/gtest.h"
+#include "cpu_features_macros.h"
 #include "VecSim/spaces/space_aux.h"
 #include "VecSim/spaces/IP/IP.h"
 #include "VecSim/spaces/IP/IP_SSE.h"
@@ -21,7 +22,7 @@ class SpacesTest : public ::testing::Test {
     void TearDown() override {}
 };
 
-#ifdef CPU_FEATURES_ARCH_X86
+#ifdef CPU_FEATURES_ARCH_X86_64
 // This test will trigger the "Residuals" function for dimension > 16, for each optimization.
 TEST_F(SpacesTest, l2_17) {
     Arch_Optimization optimization = getArchitectureOptimization();
@@ -121,4 +122,4 @@ TEST_F(SpacesTest, ip_9) {
         ASSERT_TRUE(false);
     }
 }
-#endif // CPU_FEATURES_ARCH_X86
+#endif // CPU_FEATURES_ARCH_X86_64