Moved some of the STDMETHOD/STDAPI to winnt.h.
Moved the EXTERN_C macro to winnt.h.
Added a '#ifndef __WINE__' around the remaining macros.
diff --git a/include/winnt.h b/include/winnt.h
index 3cf860c..0b90e92 100644
--- a/include/winnt.h
+++ b/include/winnt.h
@@ -196,6 +196,30 @@
/**** winnt.h proper *****/
+/* Microsoft's macros for declaring functions */
+
+#ifdef __cplusplus
+# define EXTERN_C extern "C"
+#else
+# define EXTERN_C extern
+#endif
+
+#ifndef __WINE__
+#define STDMETHODCALLTYPE __stdcall
+#define STDMETHODVCALLTYPE __cdecl
+#define STDAPICALLTYPE __stdcall
+#define STDAPIVCALLTYPE __cdecl
+
+#define STDAPI EXTERN_C HRESULT STDAPICALLTYPE
+#define STDAPI_(type) EXTERN_C type STDAPICALLTYPE
+#define STDMETHODIMP HRESULT STDMETHODCALLTYPE
+#define STDMETHODIMP_(type) type STDMETHODCALLTYPE
+#define STDAPIV EXTERN_C HRESULT STDAPIVCALLTYPE
+#define STDAPIV_(type) EXTERN_C type STDAPIVCALLTYPE
+#define STDMETHODIMPV HRESULT STDMETHODVCALLTYPE
+#define STDMETHODIMPV_(type) type STDMETHODVCALLTYPE
+#endif
+
/* Define the basic types */
#ifndef VOID
#define VOID void
