diff --git a/crypto/internal.h b/crypto/internal.h
index 87b69dab..76d39b74 100644
--- a/crypto/internal.h
+++ b/crypto/internal.h
@@ -116,14 +116,14 @@
 #include <assert.h>
 #include <string.h>
 
+#if !defined(__cplusplus)
 #if defined(_MSC_VER)
-#if !defined(__cplusplus) || _MSC_VER < 1900
 #define alignas(x) __declspec(align(x))
 #define alignof __alignof
-#endif
 #else
 #include <stdalign.h>
 #endif
+#endif
 
 #if !defined(OPENSSL_NO_THREADS) && \
     (!defined(OPENSSL_WINDOWS) || defined(__MINGW32__))