diff --git a/cham_simd.cpp b/cham_simd.cpp
index bf698d90..7fcaece1 100644
--- a/cham_simd.cpp
+++ b/cham_simd.cpp
@@ -26,8 +26,9 @@
 # include <ammintrin.h>
 #endif
 
-#ifdef __AVX512F__
+#if defined(__AVX512F__)
 # define CRYPTOPP_AVX512_ROTATE 1
+# include <immintrin.h>
 #endif
 
 // Squash MS LNK4221 and libtool warnings
diff --git a/lea_simd.cpp b/lea_simd.cpp
index 8278330e..11a6dd3b 100644
--- a/lea_simd.cpp
+++ b/lea_simd.cpp
@@ -10,7 +10,6 @@
 
 #include "lea.h"
 #include "misc.h"
-#include "adv_simd.h"
 
 // Uncomment for benchmarking C++ against SSE or NEON.
 // Do so in both simon.cpp and simon-simd.cpp.
@@ -18,6 +17,7 @@
 // #undef CRYPTOPP_ARM_NEON_AVAILABLE
 
 #if (CRYPTOPP_SSSE3_AVAILABLE)
+# include "adv_simd.h"
 # include <pmmintrin.h>
 # include <tmmintrin.h>
 #endif
@@ -26,12 +26,13 @@
 # include <ammintrin.h>
 #endif
 
-#if defined(__AVX512F__) && defined(__AVX512VL__)
+#if defined(__AVX512F__)
 # define CRYPTOPP_AVX512_ROTATE 1
 # include <immintrin.h>
 #endif
 
 #if (CRYPTOPP_ARM_NEON_AVAILABLE)
+# include "adv_simd.h"
 # include <arm_neon.h>
 #endif
 
@@ -58,6 +59,7 @@
 
 #undef CRYPTOPP_POWER8_AVAILABLE
 #if defined(CRYPTOPP_POWER8_AVAILABLE)
+# include "adv_simd.h"
 # include "ppc_simd.h"
 #endif