diff --git a/include/basetyps.h b/include/basetyps.h
index d55005fbd79..94875334b00 100644
--- a/include/basetyps.h
+++ b/include/basetyps.h
@@ -26,10 +26,10 @@
 # define EXTERN_C extern
 #endif
 
-#define STDMETHODCALLTYPE  __stdcall
-#define STDMETHODVCALLTYPE __cdecl
-#define STDAPICALLTYPE     __stdcall
-#define STDAPIVCALLTYPE    __cdecl
+#define STDMETHODCALLTYPE  WINAPI
+#define STDMETHODVCALLTYPE WINAPIV
+#define STDAPICALLTYPE     WINAPI
+#define STDAPIVCALLTYPE    WINAPIV
 #define STDAPI             EXTERN_C HRESULT STDAPICALLTYPE
 #define STDAPI_(t)         EXTERN_C t STDAPICALLTYPE
 #define STDMETHODIMP       HRESULT STDMETHODCALLTYPE
diff --git a/include/winnt.h b/include/winnt.h
index 20e8a8518ba..115cc294f73 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -412,10 +412,10 @@ extern "C++" { \
 # define EXTERN_C    extern
 #endif
 
-#define STDMETHODCALLTYPE       __stdcall
-#define STDMETHODVCALLTYPE      __cdecl
-#define STDAPICALLTYPE          __stdcall
-#define STDAPIVCALLTYPE         __cdecl
+#define STDMETHODCALLTYPE       WINAPI
+#define STDMETHODVCALLTYPE      WINAPIV
+#define STDAPICALLTYPE          WINAPI
+#define STDAPIVCALLTYPE         WINAPIV
 
 #define STDAPI                  EXTERN_C HRESULT STDAPICALLTYPE
 #define STDAPI_(type)           EXTERN_C type STDAPICALLTYPE