diff --git a/include/spdk/crc32.h b/include/spdk/crc32.h
index dbe961f12..83df6fdb6 100644
--- a/include/spdk/crc32.h
+++ b/include/spdk/crc32.h
@@ -46,22 +46,6 @@
 extern "C" {
 #endif
 
-#if defined(__aarch64__) || defined(__AARCH64__)
-#ifdef __ARM_FEATURE_CRC32
-#define SPDK_HAVE_ARM_CRC
-#include <arm_acle.h>
-#endif
-#endif
-
-#if defined(__x86_64__) && defined(__SSE4_2__)
-#ifdef SPDK_CONFIG_ISAL
-#define SPDK_HAVE_ISAL
-#include <isa-l/include/crc.h>
-#else
-#define SPDK_HAVE_SSE4_2
-#include <x86intrin.h>
-#endif
-#endif
 /**
  * IEEE CRC-32 polynomial (bit reflected)
  */
diff --git a/lib/util/crc32c.c b/lib/util/crc32c.c
index 65c8a673c..babb3c730 100644
--- a/lib/util/crc32c.c
+++ b/lib/util/crc32c.c
@@ -33,6 +33,23 @@
 
 #include "spdk/crc32.h"
 
+#if defined(__aarch64__) || defined(__AARCH64__)
+#ifdef __ARM_FEATURE_CRC32
+#define SPDK_HAVE_ARM_CRC
+#include <arm_acle.h>
+#endif
+#endif
+
+#if defined(__x86_64__) && defined(__SSE4_2__)
+#ifdef SPDK_CONFIG_ISAL
+#define SPDK_HAVE_ISAL
+#include <isa-l/include/crc.h>
+#else
+#define SPDK_HAVE_SSE4_2
+#include <x86intrin.h>
+#endif
+#endif
+
 #ifdef SPDK_HAVE_ISAL
 
 uint32_t