diff --git a/src/libsodium/crypto_generichash/blake2/sse/blake2b-round.h b/src/libsodium/crypto_generichash/blake2/sse/blake2b-round.h
index 200b066a..9e844efa 100644
--- a/src/libsodium/crypto_generichash/blake2/sse/blake2b-round.h
+++ b/src/libsodium/crypto_generichash/blake2/sse/blake2b-round.h
@@ -24,7 +24,6 @@
 
 
 /* Microarchitecture-specific macros */
-#ifndef HAVE_XOP
 #ifdef HAVE_SSSE3
 #define _mm_roti_epi64(x, c) \
     (-(c) == 32) ? _mm_shuffle_epi32((x), _MM_SHUFFLE(2,3,0,1))  \
@@ -33,9 +32,6 @@
     : (-(c) == 63) ? _mm_xor_si128(_mm_srli_epi64((x), -(c)), _mm_add_epi64((x), (x)))  \
     : _mm_xor_si128(_mm_srli_epi64((x), -(c)), _mm_slli_epi64((x), 64-(-(c))))
 #else
-#define _mm_roti_epi64(r, c) _mm_xor_si128(_mm_srli_epi64( (r), -(c) ),_mm_slli_epi64( (r), 64-(-(c)) ))
-#endif
-#else
 /* ... */
 #endif
 
diff --git a/src/libsodium/crypto_generichash/blake2/sse/blake2b.c b/src/libsodium/crypto_generichash/blake2/sse/blake2b.c
index 03e37720..2657b8d8 100644
--- a/src/libsodium/crypto_generichash/blake2/sse/blake2b.c
+++ b/src/libsodium/crypto_generichash/blake2/sse/blake2b.c
@@ -30,12 +30,6 @@
 #if defined(HAVE_SSE41)
 #include <smmintrin.h>
 #endif
-#if defined(HAVE_AVX)
-#include <immintrin.h>
-#endif
-#if defined(HAVE_XOP)
-#include <x86intrin.h>
-#endif
 
 #include "blake2b-round.h"
 
@@ -256,7 +250,7 @@ static inline int blake2b_compress( blake2b_state *S, const uint8_t block[BLAKE2
   __m128i row4l, row4h;
   __m128i b0, b1;
   __m128i t0, t1;
-#if defined(HAVE_SSSE3) && !defined(HAVE_XOP)
+#if defined(HAVE_SSSE3)
   const __m128i r16 = _mm_setr_epi8( 2, 3, 4, 5, 6, 7, 0, 1, 10, 11, 12, 13, 14, 15, 8, 9 );
   const __m128i r24 = _mm_setr_epi8( 3, 4, 5, 6, 7, 0, 1, 2, 11, 12, 13, 14, 15, 8, 9, 10 );
 #endif