diff --git a/CMakeLists.txt b/CMakeLists.txt
index f4d1cc9f..c1db4dfa 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -569,7 +569,7 @@ set (hs_exec_common_SRCS
     src/alloc.c
     src/scratch.c
     src/util/arch/x86/cpuid_flags.c
-    src/util/arch/x86/cpuid_flags.h
+    src/util/arch/common/cpuid_flags.h
     src/util/multibit.c
     )
 
diff --git a/src/hs.cpp b/src/hs.cpp
index a0cb9bb3..7898cf46 100644
--- a/src/hs.cpp
+++ b/src/hs.cpp
@@ -44,9 +44,10 @@
 #include "parser/prefilter.h"
 #include "parser/unsupported.h"
 #include "util/compile_error.h"
+#include "util/arch/common/cpuid_flags.h"
 #if defined(ARCH_X86_64)
-#include "util/arch/x86/cpuid_flags.h"
 #include "util/arch/x86/cpuid_inline.h"
+#elif defined(ARCH_ARM32) || defined(ARCH_AARCH64)
 #endif
 #include "util/depth.h"
 #include "util/popcount.h"
diff --git a/src/util/arch/x86/cpuid_flags.h b/src/util/arch/common/cpuid_flags.h
similarity index 95%
rename from src/util/arch/x86/cpuid_flags.h
rename to src/util/arch/common/cpuid_flags.h
index 527c6d52..68e427dd 100644
--- a/src/util/arch/x86/cpuid_flags.h
+++ b/src/util/arch/common/cpuid_flags.h
@@ -31,7 +31,7 @@
 
 #include "ue2common.h"
 
-#if !defined(_WIN32) && !defined(CPUID_H_)
+#if (defined(ARCH_IA32) || defined(ARCH_X86_64)) && !defined(_WIN32) && !defined(CPUID_H_)
 #include <cpuid.h>
  /* system header doesn't have a header guard */
 #define CPUID_H_
diff --git a/src/util/target_info.cpp b/src/util/target_info.cpp
index 6eab701d..5253755b 100644
--- a/src/util/target_info.cpp
+++ b/src/util/target_info.cpp
@@ -29,8 +29,9 @@
 
 #include "hs_compile.h" // for various hs_platform_info flags
 #include "target_info.h"
-#if defined(ARCH_X86_64)
-#include "util/arch/x86/cpuid_flags.h"
+#include "util/arch/common/cpuid_flags.h"
+#if defined(ARCH_IA32) || defined(ARCH_X86_64)
+#elif defined(ARCH_ARM32) || defined(ARCH_AARCH64)
 #endif
 
 namespace ue2 {