diff --git a/CMakeLists.txt b/CMakeLists.txt
index 9cd6ad96..e5078848 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -694,7 +694,6 @@ set (hs_exec_SRCS
     src/util/exhaust.h
     src/util/fatbit.h
     src/util/join.h
-    src/util/masked_move.h
     src/util/multibit.h
     src/util/multibit.c
     src/util/multibit_compress.h
@@ -716,7 +715,8 @@ set (hs_exec_SRCS
 
 set (hs_exec_avx2_SRCS
     src/fdr/teddy_avx2.c
-    src/util/masked_move.c
+    src/util/arch/x86/masked_move.c
+    src/util/arch/x86/masked_move.h
 )
 
 
diff --git a/src/hwlm/noodle_engine.c b/src/hwlm/noodle_engine.c
index d4f6902a..da61dfe8 100644
--- a/src/hwlm/noodle_engine.c
+++ b/src/hwlm/noodle_engine.c
@@ -39,10 +39,13 @@
 #include "util/compare.h"
 #include "util/intrinsics.h"
 #include "util/join.h"
-#include "util/masked_move.h"
 #include "util/partial_store.h"
 #include "util/simd_utils.h"
 
+#if defined(HAVE_AVX2)
+#include "util/arch/x86/masked_move.h"
+#endif
+
 #include <ctype.h>
 #include <stdbool.h>
 #include <string.h>
diff --git a/src/util/arch/x86/masked_move.h b/src/util/arch/x86/masked_move.h
index 4c877ca9..c46ad144 100644
--- a/src/util/arch/x86/masked_move.h
+++ b/src/util/arch/x86/masked_move.h
@@ -29,12 +29,12 @@
 #ifndef MASKED_MOVE_H
 #define MASKED_MOVE_H
 
-#include "arch.h"
+#include "x86.h"
 
 #if defined(HAVE_AVX2)
 
-#include "unaligned.h"
-#include "simd_utils.h"
+#include "util/unaligned.h"
+#include "util/simd_utils.h"
 
 #ifdef __cplusplus
 extern "C" {