diff --git a/include/rpcndr.h b/include/rpcndr.h
index 99200acd1dd..f7955667038 100644
--- a/include/rpcndr.h
+++ b/include/rpcndr.h
@@ -429,7 +429,7 @@ typedef struct _MIDL_STUBLESS_PROXY_INFO
 } MIDL_STUBLESS_PROXY_INFO, *PMIDL_STUBLESS_PROXY_INFO;
 
 
-#if defined(__i386__) && !defined(__MSC_VER) && !defined(__MINGW32__) && !defined(__CYGWIN__)
+#if defined(__i386__) && !defined(_MSC_VER) && !defined(__MINGW32__) && !defined(__CYGWIN__)
 /* Calling convention for returning structures/unions is different between Windows and gcc on i386 */
 typedef LONG_PTR CLIENT_CALL_RETURN;
 #else
diff --git a/include/winnt.h b/include/winnt.h
index f785d337407..93fd70aab28 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -154,7 +154,7 @@ extern "C" {
 # define DECLSPEC_EXPORT
 #endif
 
-#if defined(__MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__)
+#if defined(_MSC_VER) || defined(__MINGW32__) || defined(__CYGWIN__)
 # define DECLSPEC_HIDDEN
 #elif defined(__GNUC__) && ((__GNUC__ > 3) || ((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)))
 # define DECLSPEC_HIDDEN __attribute__((visibility ("hidden")))