diff --git a/blake2b_simd.cpp b/blake2b_simd.cpp
index ff138321..b246824c 100644
--- a/blake2b_simd.cpp
+++ b/blake2b_simd.cpp
@@ -32,6 +32,11 @@
 # undef CRYPTOPP_ALTIVEC_AVAILABLE
 #endif
 
+#if defined(__XOP__)
+# include <immintrin.h>
+# include <ammintrin.h>
+#endif
+
 #if (CRYPTOPP_SSE41_AVAILABLE)
 # include <emmintrin.h>
 # include <tmmintrin.h>
diff --git a/keccak_simd.cpp b/keccak_simd.cpp
index 45674ac2..ae2f2095 100644
--- a/keccak_simd.cpp
+++ b/keccak_simd.cpp
@@ -26,6 +26,11 @@
 # include <tmmintrin.h>
 #endif
 
+#if defined(__XOP__)
+# include <immintrin.h>
+# include <ammintrin.h>
+#endif
+
 // Squash MS LNK4221 and libtool warnings
 extern const char KECCAK_SIMD_FNAME[] = __FILE__;
 
diff --git a/simon128_simd.cpp b/simon128_simd.cpp
index 5331c351..4b551f8f 100644
--- a/simon128_simd.cpp
+++ b/simon128_simd.cpp
@@ -23,6 +23,7 @@
 #endif
 
 #if defined(__XOP__)
+# include <immintrin.h>
 # include <ammintrin.h>
 #endif
 
diff --git a/speck128_simd.cpp b/speck128_simd.cpp
index 2c356346..fb3eb1e6 100644
--- a/speck128_simd.cpp
+++ b/speck128_simd.cpp
@@ -23,6 +23,7 @@
 #endif
 
 #if defined(__XOP__)
+# include <immintrin.h>
 # include <ammintrin.h>
 #endif