diff --git a/adv-simd.h b/adv-simd.h
index 666cff5d..ff7e21f3 100644
--- a/adv-simd.h
+++ b/adv-simd.h
@@ -51,8 +51,13 @@
 # include <arm_acle.h>
 #endif
 
+#if (CRYPTOPP_SSE2_INTRIN_AVAILABLE)
+# include <emmintrin.h>
+# include <xmmintrin.h>
+#endif
+
 // SunCC needs CRYPTOPP_SSSE3_AVAILABLE, too
-#if (CRYPTOPP_SSE2_INTRIN_AVAILABLE || CRYPTOPP_SSSE3_AVAILABLE)
+#if (CRYPTOPP_SSSE3_AVAILABLE)
 # include <emmintrin.h>
 # include <pmmintrin.h>
 # include <xmmintrin.h>
diff --git a/cpu.cpp b/cpu.cpp
index bda6523c..6c82fdc8 100644
--- a/cpu.cpp
+++ b/cpu.cpp
@@ -317,7 +317,7 @@ void DetectX86Features()
 	CRYPTOPP_CONSTANT(AVX_FLAG = (3 << 27))
 	if ((cpuid1[2] & AVX_FLAG) == AVX_FLAG)
 	{
-#if defined(__GNUC__) || defined(__SUNPRO_CC)
+#if defined(__GNUC__) || defined(__SUNPRO_CC) || defined(__BORLANDC__)
 		// https://gcc.gnu.org/bugzilla/show_bug.cgi?id=71659 and
 		// http://www.agner.org/optimize/vectorclass/read.php?i=65
 		word32 a=0, d=0;