diff --git a/config.compat b/config.compat
index 3f1dd093..4e7271a4 100644
--- a/config.compat
+++ b/config.compat
@@ -473,7 +473,7 @@ NAMESPACE_END
 		#define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 0
 	#endif
 
-	#if !defined(CRYPTOPP_DISABLE_SSE3) && (_MSC_VER >= 1400 || CRYPTOPP_GCC_VERSION >= 40102 || defined(__SSSE3__))
+	#if !defined(CRYPTOPP_DISABLE_SSE3) && (_MSC_VER >= 1400 || (defined(__SSE3__) && defined(__SSSE3__)))
 		#define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 1
 	#else
 		#define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0
diff --git a/config.h b/config.h
index c8920928..f0d43680 100644
--- a/config.h
+++ b/config.h
@@ -473,7 +473,7 @@ NAMESPACE_END
 		#define CRYPTOPP_BOOL_SSE2_ASM_AVAILABLE 0
 	#endif
 
-	#if !defined(CRYPTOPP_DISABLE_SSE3) && (_MSC_VER >= 1400 || CRYPTOPP_GCC_VERSION >= 40102 || defined(__SSSE3__))
+	#if !defined(CRYPTOPP_DISABLE_SSE3) && (_MSC_VER >= 1400 || (defined(__SSE3__) && defined(__SSSE3__)))
 		#define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 1
 	#else
 		#define CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE 0
diff --git a/cpu.h b/cpu.h
index 61db67e9..8d5b931a 100644
--- a/cpu.h
+++ b/cpu.h
@@ -38,7 +38,7 @@
 // PUSHFB needs Clang 3.3 and Apple Clang 5.0.
 // #if (defined(__SSE3__) || defined(__SSSE3__)) || defined(__INTEL_COMPILER) || (CRYPTOPP_LLVM_CLANG_VERSION >= 30300) || (CRYPTOPP_APPLE_CLANG_VERSION >= 50000)
 #if CRYPTOPP_BOOL_SSSE3_ASM_AVAILABLE
-#  include <tmmintrin.h>    // _mm_shuffle_epi16
+#  include <tmmintrin.h>    // _mm_shuffle_pi8, _mm_shuffle_epi8
 #endif // tmmintrin.h
 
 // PEXTRD needs Clang 3.3 and Apple Clang 5.0.