diff --git a/CMakeLists.txt b/CMakeLists.txt
index 59c6e6e2..9cd6ad96 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -564,8 +564,8 @@ install(FILES ${hs_HEADERS} DESTINATION "${CMAKE_INSTALL_INCLUDEDIR}/hs")
 set (hs_exec_common_SRCS
     src/alloc.c
     src/scratch.c
-    src/util/cpuid_flags.c
-    src/util/cpuid_flags.h
+    src/util/arch/x86/cpuid_flags.c
+    src/util/arch/x86/cpuid_flags.h
     src/util/multibit.c
     )
 
diff --git a/src/dispatcher.c b/src/dispatcher.c
index a786b806..76ed37a1 100644
--- a/src/dispatcher.c
+++ b/src/dispatcher.c
@@ -30,7 +30,9 @@
 #include "hs_common.h"
 #include "hs_runtime.h"
 #include "ue2common.h"
-#include "util/cpuid_inline.h"
+#if defined(ARCH_X86_64)
+#include "util/arch/x86/cpuid_inline.h"
+#endif
 #include "util/join.h"
 
 #if defined(DISABLE_AVX512_DISPATCH)
diff --git a/src/hs.cpp b/src/hs.cpp
index ab54105c..a0cb9bb3 100644
--- a/src/hs.cpp
+++ b/src/hs.cpp
@@ -44,8 +44,10 @@
 #include "parser/prefilter.h"
 #include "parser/unsupported.h"
 #include "util/compile_error.h"
-#include "util/cpuid_flags.h"
-#include "util/cpuid_inline.h"
+#if defined(ARCH_X86_64)
+#include "util/arch/x86/cpuid_flags.h"
+#include "util/arch/x86/cpuid_inline.h"
+#endif
 #include "util/depth.h"
 #include "util/popcount.h"
 #include "util/target_info.h"
diff --git a/src/hs_valid_platform.c b/src/hs_valid_platform.c
index 59ad3f3a..7a022607 100644
--- a/src/hs_valid_platform.c
+++ b/src/hs_valid_platform.c
@@ -26,9 +26,11 @@
  * POSSIBILITY OF SUCH DAMAGE.
  */
 
+#include "config.h"
 #include "hs_common.h"
-#include "util/cpuid_flags.h"
-#include "util/cpuid_inline.h"
+#if defined(ARCH_X86_64)
+#include "util/arch/x86/cpuid_inline.h"
+#endif
 
 HS_PUBLIC_API
 hs_error_t HS_CDECL hs_valid_platform(void) {
diff --git a/src/util/cpuid_flags.c b/src/util/arch/x86/cpuid_flags.c
similarity index 100%
rename from src/util/cpuid_flags.c
rename to src/util/arch/x86/cpuid_flags.c
diff --git a/src/util/cpuid_flags.h b/src/util/arch/x86/cpuid_flags.h
similarity index 100%
rename from src/util/cpuid_flags.h
rename to src/util/arch/x86/cpuid_flags.h
diff --git a/src/util/cpuid_inline.h b/src/util/arch/x86/cpuid_inline.h
similarity index 100%
rename from src/util/cpuid_inline.h
rename to src/util/arch/x86/cpuid_inline.h
diff --git a/src/util/target_info.cpp b/src/util/target_info.cpp
index 3a41e020..6eab701d 100644
--- a/src/util/target_info.cpp
+++ b/src/util/target_info.cpp
@@ -29,7 +29,9 @@
 
 #include "hs_compile.h" // for various hs_platform_info flags
 #include "target_info.h"
-#include "util/cpuid_flags.h"
+#if defined(ARCH_X86_64)
+#include "util/arch/x86/cpuid_flags.h"
+#endif
 
 namespace ue2 {