diff --git a/rijndael_simd.cpp b/rijndael_simd.cpp
index 36ad06ac..bd7bbe53 100644
--- a/rijndael_simd.cpp
+++ b/rijndael_simd.cpp
@@ -23,23 +23,26 @@
 #include "pch.h"
 #include "config.h"
 #include "misc.h"
-#include "adv_simd.h"
 
 #if (CRYPTOPP_AESNI_AVAILABLE)
+# include "adv_simd.h"
 # include <smmintrin.h>
 # include <wmmintrin.h>
 #endif
 
 #if (CRYPTOPP_ARM_NEON_AVAILABLE)
+# include "adv_simd.h"
 # include <arm_neon.h>
 #endif
 
 #if (CRYPTOPP_ARM_ACLE_AVAILABLE)
+# include "adv_simd.h"
 # include <stdint.h>
 # include <arm_acle.h>
 #endif
 
 #if defined(CRYPTOPP_POWER8_AES_AVAILABLE)
+# include "adv_simd.h"
 # include "ppc_simd.h"
 #endif
 
diff --git a/sm4_simd.cpp b/sm4_simd.cpp
index f0d39ae2..64a10b09 100644
--- a/sm4_simd.cpp
+++ b/sm4_simd.cpp
@@ -15,18 +15,13 @@
 
 #include "sm4.h"
 #include "misc.h"
-#include "adv_simd.h"
 
 // Uncomment for benchmarking C++ against SSE.
 // Do so in both simon.cpp and simon-simd.cpp.
 // #undef CRYPTOPP_AESNI_AVAILABLE
 
-#if (CRYPTOPP_SSE2_INTRIN_AVAILABLE)
-# include <xmmintrin.h>
-# include <emmintrin.h>
-#endif
-
 #if (CRYPTOPP_AESNI_AVAILABLE)
+# include "adv_simd.h"
 # include <tmmintrin.h>
 # include <wmmintrin.h>
 #endif