diff --git a/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c b/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c
index 6a8856eaad5..f5874f49903 100644
--- a/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c
+++ b/rostests/apitests/gdi32api/tests/GdiGetCharDimensions.c
@@ -1,4 +1,4 @@
-LONG STDCALL GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);
+LONG WINAPI GdiGetCharDimensions(HDC, LPTEXTMETRICW, LONG *);
 
 INT
 Test_GdiGetCharDimensions(PTESTINFO pti)
diff --git a/rostests/apitests/user32api/tests/InitializeLpkHooks.c b/rostests/apitests/user32api/tests/InitializeLpkHooks.c
index bdfe900cdce..85e6d7a4667 100644
--- a/rostests/apitests/user32api/tests/InitializeLpkHooks.c
+++ b/rostests/apitests/user32api/tests/InitializeLpkHooks.c
@@ -27,7 +27,7 @@ int Count_myLpkTabbedTextOut = 0;
 int Count_myLpkPSMTextOut = 0;
 int Count_myLpkDrawTextEx = 0;
 
-DWORD STDCALL myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, 
+DWORD WINAPI myLpkTabbedTextOut (LPVOID x1,LPVOID x2,LPVOID x3, LPVOID x4, LPVOID x5, LPVOID x6, LPVOID x7, LPVOID x8, 
                                    LPVOID x9, LPVOID x10, LPVOID x11, LPVOID x12)
 {
     Count_myLpkTabbedTextOut++;
@@ -55,7 +55,7 @@ typedef struct _USER32_INTERN_INITALIZEHOOKS
     PLPK_LPEDITCONTROL_LIST fpListLpkEditControl;
 } USER32_INTERN_INITALIZEHOOKS, *PUSER32_INTERN_INITALIZEHOOKS;
 
-VOID STDCALL InitializeLpkHooks (PUSER32_INTERN_INITALIZEHOOKS);
+VOID WINAPI InitializeLpkHooks (PUSER32_INTERN_INITALIZEHOOKS);
 
 INT
 Test_InitializeLpkHooks(PTESTINFO pti)
diff --git a/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c b/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c
index 98a45a44af4..7a51f87e940 100644
--- a/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c
+++ b/rostests/apitests/w32knapi/ntuser/NtUserCountClipboardFormats.c
@@ -1,5 +1,5 @@
 /* First the call stub */
-DWORD STDCALL
+DWORD WINAPI
 NtUserCountClipboardFormats(VOID)
 {
 	DWORD p;
diff --git a/rostests/apitests/w32knapi/w32knapi.c b/rostests/apitests/w32knapi/w32knapi.c
index fa20eefcde7..90c3dfd9b5e 100644
--- a/rostests/apitests/w32knapi/w32knapi.c
+++ b/rostests/apitests/w32knapi/w32knapi.c
@@ -13,7 +13,7 @@ MyGdiQueryTable()
 	return pPeb->GdiSharedHandleTable;
 }
 
-static DWORD STDCALL
+static DWORD WINAPI
 IntSyscall(FARPROC proc, UINT cParams, PVOID pFirstParam)
 {
 	DWORD ret;
diff --git a/rostests/regtests_by_casper/regtests/regtests.c b/rostests/regtests_by_casper/regtests/regtests.c
index ccda2f93d66..1f753a96641 100644
--- a/rostests/regtests_by_casper/regtests/regtests.c
+++ b/rostests/regtests_by_casper/regtests/regtests.c
@@ -8,32 +8,32 @@
  */
 #include <windows.h>
 
-HMODULE STDCALL
+HMODULE WINAPI
 _GetModuleHandleA(LPCSTR lpModuleName)
 {
   return GetModuleHandleA(lpModuleName);
 }
 
-FARPROC STDCALL
+FARPROC WINAPI
 _GetProcAddress(HMODULE hModule,
   LPCSTR lpProcName)
 {
   return GetProcAddress(hModule, lpProcName);
 }
 
-HINSTANCE STDCALL
+HINSTANCE WINAPI
 _LoadLibraryA(LPCSTR lpLibFileName)
 {
   return LoadLibraryA(lpLibFileName);
 }
 
-VOID STDCALL
+VOID WINAPI
 _ExitProcess(UINT uExitCode)
 {
   ExitProcess(uExitCode);
 }
 
-HANDLE STDCALL
+HANDLE WINAPI
 _CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize,
               LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter,
               DWORD dwCreationFlags, LPDWORD lpThreadId)
@@ -42,31 +42,31 @@ _CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize,
                       lpParameter, dwCreationFlags, lpThreadId);
 }
 
-WINBOOL STDCALL
+WINBOOL WINAPI
 _TerminateThread(HANDLE hThread, DWORD dwExitCode)
 {
   return TerminateThread(hThread, dwExitCode);
 }
 
-DWORD STDCALL
+DWORD WINAPI
 _WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds)
 {
   return WaitForSingleObject(hHandle, dwMilliseconds);
 }
 
-DWORD STDCALL
+DWORD WINAPI
 _GetLastError()
 {
   return GetLastError();
 }
 
-VOID STDCALL
+VOID WINAPI
 _CloseHandle(HANDLE handle)
 {
   CloseHandle (handle);
 }
 
-BOOL STDCALL
+BOOL WINAPI
 _GetThreadTimes(HANDLE hThread, LPFILETIME lpCreationTime,
 	            LPFILETIME lpExitTime, LPFILETIME lpKernelTime,
 	            LPFILETIME lpUserTime)
@@ -75,31 +75,31 @@ _GetThreadTimes(HANDLE hThread, LPFILETIME lpCreationTime,
                         lpKernelTime, lpUserTime);
 }
 
-BOOL STDCALL
+BOOL WINAPI
 _SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass)
 {
   return SetPriorityClass(hProcess, dwPriorityClass);
 }
 
-BOOL STDCALL
+BOOL WINAPI
 _SetThreadPriority(HANDLE hThread, int nPriority)
 {
   return SetThreadPriority(hThread, nPriority);
 }
 
-HANDLE STDCALL
+HANDLE WINAPI
 _GetCurrentProcess()
 {
   return GetCurrentProcess();
 }
 
-HANDLE STDCALL
+HANDLE WINAPI
 _GetCurrentThread()
 {
   return GetCurrentThread();
 }
 
-VOID STDCALL
+VOID WINAPI
 _Sleep(DWORD dwMilliseconds)
 {
   return Sleep(dwMilliseconds);
diff --git a/rostests/regtests_by_casper/shared/regtests.c b/rostests/regtests_by_casper/shared/regtests.c
index 3513911b600..767fea63822 100644
--- a/rostests/regtests_by_casper/shared/regtests.c
+++ b/rostests/regtests_by_casper/shared/regtests.c
@@ -227,7 +227,7 @@ AddTest(TestRoutine Routine)
   InsertTailList(&AllTests, &Test->ListEntry);
 }
 
-PVOID STDCALL
+PVOID WINAPI
 FrameworkGetHook(ULONG index)
 {
   return FrameworkGetHookInternal(index);
diff --git a/rostests/regtests_by_casper/shared/regtests.h b/rostests/regtests_by_casper/shared/regtests.h
index eeca12f68e1..ae7bfea8a0c 100644
--- a/rostests/regtests_by_casper/shared/regtests.h
+++ b/rostests/regtests_by_casper/shared/regtests.h
@@ -11,7 +11,7 @@
 #include <stdio.h>
 #include <string.h>
 
-typedef DWORD (STDCALL _LPTHREAD_START_ROUTINE)(LPVOID lpParameter);
+typedef DWORD (WINAPI _LPTHREAD_START_ROUTINE)(LPVOID lpParameter);
 
 typedef struct __FILETIME
 {
@@ -164,7 +164,7 @@ typedef void (*TestOutputRoutine)(char *Buffer);
 *  OutputRoutine - Output routine.
  * TestName - If NULL all tests are run. If non-NULL specifies the test to be run
  */
-typedef void (STDCALL *TestDriverMain)(TestOutputRoutine OutputRoutine, char *TestName);
+typedef void (WINAPI *TestDriverMain)(TestOutputRoutine OutputRoutine, char *TestName);
 
 typedef struct __TEST
 {
@@ -189,56 +189,56 @@ typedef struct __API_DESCRIPTION
 extern _API_DESCRIPTION ExternalDependencies[];
 extern ULONG MaxExternalDependency;
 
-HANDLE STDCALL
+HANDLE WINAPI
 _GetModuleHandleA(LPCSTR lpModuleName);
 
-PVOID STDCALL
+PVOID WINAPI
 _GetProcAddress(HANDLE hModule,
   LPCSTR lpProcName);
 
-HANDLE STDCALL
+HANDLE WINAPI
 _LoadLibraryA(LPCSTR lpLibFileName);
 
-VOID STDCALL
+VOID WINAPI
 _ExitProcess(UINT uExitCode);
 
-HANDLE STDCALL
+HANDLE WINAPI
 _CreateThread(LPSECURITY_ATTRIBUTES lpThreadAttributes, DWORD dwStackSize,
               _LPTHREAD_START_ROUTINE lpStartAddress, LPVOID lpParameter,
               DWORD dwCreationFlags, LPDWORD lpThreadId);
 
-BOOL STDCALL
+BOOL WINAPI
 _TerminateThread(HANDLE hThread, DWORD dwExitCode);
 
-DWORD STDCALL
+DWORD WINAPI
 _WaitForSingleObject(HANDLE hHandle, DWORD dwMilliseconds);
 
-DWORD STDCALL
+DWORD WINAPI
 _GetLastError();
 
-VOID STDCALL
+VOID WINAPI
 _CloseHandle(HANDLE handle);
 
-BOOL STDCALL
+BOOL WINAPI
 _GetThreadTimes(HANDLE hThread,
                 _LPFILETIME lpCreationTime,
                 _LPFILETIME lpExitTime,
                 _LPFILETIME lpKernelTime,
                 _LPFILETIME lpUserTime);
 
-BOOL STDCALL
+BOOL WINAPI
 _SetPriorityClass(HANDLE hProcess, DWORD dwPriorityClass);
 
-BOOL STDCALL
+BOOL WINAPI
 _SetThreadPriority(HANDLE hThread, int nPriority);
 
-HANDLE STDCALL
+HANDLE WINAPI
 _GetCurrentProcess();
 
-HANDLE STDCALL
+HANDLE WINAPI
 _GetCurrentThread();
 
-VOID STDCALL
+VOID WINAPI
 _Sleep(DWORD dwMilliseconds);
 
 
diff --git a/rostests/tests/apc/apc.c b/rostests/tests/apc/apc.c
index 8ff1c00b6c6..5b45c37e772 100644
--- a/rostests/tests/apc/apc.c
+++ b/rostests/tests/apc/apc.c
@@ -8,7 +8,7 @@
 HANDLE OutputHandle;
 HANDLE InputHandle;
 
-VOID STDCALL
+VOID WINAPI
 ApcRoutine(PVOID Context,
 	   PIO_STATUS_BLOCK IoStatus,
 	   ULONG Reserved)
diff --git a/rostests/tests/button/buttontst.c b/rostests/tests/button/buttontst.c
index c12887b6aee..57cf7973464 100644
--- a/rostests/tests/button/buttontst.c
+++ b/rostests/tests/button/buttontst.c
@@ -50,7 +50,7 @@ LRESULT CALLBACK TestWndProc(
    }
 }
 
-int STDCALL WinMain(
+int WINAPI WinMain(
     HINSTANCE hInstance,
     HINSTANCE hPrevInstance,
     LPSTR lpCmdLine,
diff --git a/rostests/tests/capclock/capclock.c b/rostests/tests/capclock/capclock.c
index 326da118b13..4d69e3ec611 100644
--- a/rostests/tests/capclock/capclock.c
+++ b/rostests/tests/capclock/capclock.c
@@ -15,7 +15,7 @@ static BOOL CALLBACK DialogFunc(HWND,UINT,WPARAM,LPARAM);
 static VOID CALLBACK TimerProc(HWND,UINT,UINT,DWORD);
 
 
-INT STDCALL WinMain (HINSTANCE hinst, HINSTANCE hinstPrev, LPSTR lpCmdLine, INT nCmdShow)
+INT WINAPI WinMain (HINSTANCE hinst, HINSTANCE hinstPrev, LPSTR lpCmdLine, INT nCmdShow)
 {
 	WNDCLASS wc;
 
diff --git a/rostests/tests/lantst/lantest.cpp b/rostests/tests/lantst/lantest.cpp
index 6b678a244bd..4c3f8042f43 100644
--- a/rostests/tests/lantst/lantest.cpp
+++ b/rostests/tests/lantst/lantest.cpp
@@ -59,7 +59,7 @@ int byte_till_end( char *Packet, int PktLen ) {
 #define ETYPE_ARP  WH2N(0x0806)
 
 extern "C"
-NTSTATUS STDCALL NtCreateFile(
+NTSTATUS NTAPI NtCreateFile(
     PHANDLE FileHandle,
     ACCESS_MASK DesiredAccess,
     POBJECT_ATTRIBUTES ObjectAttributes,
diff --git a/rostests/tests/lpctst/conport.c b/rostests/tests/lpctst/conport.c
index a3d310136cb..cfe7523bafe 100644
--- a/rostests/tests/lpctst/conport.c
+++ b/rostests/tests/lpctst/conport.c
@@ -31,7 +31,7 @@
 #define LPC_CONNECT_FLAG5 0x00010000
 
 NTSTATUS
-(STDCALL * ConnectPort)(
+(WINAPI * ConnectPort)(
 	OUT	PHANDLE			PortHandle,
 	IN	PUNICODE_STRING		PortName,
 	IN	POBJECT_ATTRIBUTES	ObjectAttributes,
@@ -43,7 +43,7 @@ NTSTATUS
 	);
 
 NTSTATUS
-(STDCALL * QueryObject)(
+(WINAPI * QueryObject)(
 	IN	HANDLE	ObjectHandle,
 	IN	CINT	ObjectInformationClass,
 	OUT	PVOID	ObjectInformation,
@@ -52,7 +52,7 @@ NTSTATUS
 	);
 
 NTSTATUS
-(STDCALL * YieldExecution)(VOID);
+(WINAPI * YieldExecution)(VOID);
 
 #define BUF_SIZE 1024
 #define MAXARG   1000000
diff --git a/rostests/tests/lpctst/creport.c b/rostests/tests/lpctst/creport.c
index ab0f028e3bc..352a29571f9 100644
--- a/rostests/tests/lpctst/creport.c
+++ b/rostests/tests/lpctst/creport.c
@@ -23,7 +23,7 @@
 #define LPC_CONNECT_FLAG5 0x00010000
 
 NTSTATUS
-(STDCALL * CreatePort)(
+(WINAPI * CreatePort)(
 	/*OUT	PHANDLE			PortHandle,*/
 	PVOID	Buffer,
 	IN	POBJECT_ATTRIBUTES	PortAttributes	OPTIONAL,
@@ -33,7 +33,7 @@ NTSTATUS
 	);
 
 NTSTATUS
-(STDCALL * QueryObject)(
+(WINAPI * QueryObject)(
 	IN	HANDLE	ObjectHandle,
 	IN	CINT	ObjectInformationClass,
 	OUT	PVOID	ObjectInformation,
@@ -42,7 +42,7 @@ NTSTATUS
 	);
 
 NTSTATUS
-(STDCALL * YieldExecution)(VOID);
+(WINAPI * YieldExecution)(VOID);
 
 #define BUF_SIZE 1024
 #define MAXARG   5000000
diff --git a/rostests/tests/lpctst/dumpinfo.c b/rostests/tests/lpctst/dumpinfo.c
index 404c2cdae40..0e7f2af9870 100644
--- a/rostests/tests/lpctst/dumpinfo.c
+++ b/rostests/tests/lpctst/dumpinfo.c
@@ -25,7 +25,7 @@
 
 extern
 NTSTATUS
-(STDCALL * QueryObject)(
+(WINAPI * QueryObject)(
 	IN	HANDLE	ObjectHandle,
 	IN	CINT	ObjectInformationClass,
 	OUT	PVOID	ObjectInformation,
@@ -35,7 +35,7 @@ NTSTATUS
 
 extern
 NTSTATUS
-(STDCALL * QueryInformationPort)(
+(WINAPI * QueryInformationPort)(
 	IN	HANDLE	PortHandle,
 	IN	CINT	PortInformationClass,	/* guess */
 	OUT	PVOID	PortInformation,	/* guess */
diff --git a/rostests/tests/polytest/polytest.cpp b/rostests/tests/polytest/polytest.cpp
index c05293f3df5..93004fe4649 100644
--- a/rostests/tests/polytest/polytest.cpp
+++ b/rostests/tests/polytest/polytest.cpp
@@ -17,7 +17,6 @@
 #include <assert.h>
 
 #define FASTCALL
-#define STDCALL
 #define INT int
 #define CLIPOBJ int
 #define SURFOBJ int
@@ -501,7 +500,7 @@ POLYGONFILL_UpdateScanline(FILL_EDGE* pEdge, int Scanline)
 */
 static
 void
-STDCALL
+WINAPI
 POLYGONFILL_BuildActiveList ( int Scanline, FILL_EDGE_LIST* list, FILL_EDGE** ActiveHead )
 {
   int i;
@@ -526,7 +525,7 @@ POLYGONFILL_BuildActiveList ( int Scanline, FILL_EDGE_LIST* list, FILL_EDGE** Ac
 */
 static
 void
-STDCALL
+WINAPI
 POLYGONFILL_FillScanLineAlternate(
   PDC dc,
   int ScanLine,
@@ -574,7 +573,7 @@ POLYGONFILL_FillScanLineAlternate(
 
 static
 void
-STDCALL
+WINAPI
 POLYGONFILL_FillScanLineWinding(
   PDC dc,
   int ScanLine,
@@ -674,7 +673,7 @@ POLYGONFILL_FillScanLineWinding(
 //The direction of each edge of the polygon is important.
 
 BOOL
-STDCALL
+WINAPI
 FillPolygon(
   PDC dc,
   SURFOBJ *SurfObj,
@@ -689,7 +688,7 @@ FillPolygon(
   int ScanLine;
 
   void
-  STDCALL
+  WINAPI
   (*FillScanLine)(
     PDC dc,
     int ScanLine,
diff --git a/rostests/tests/statst/statst.c b/rostests/tests/statst/statst.c
index 080b77baddb..a51a67979d7 100644
--- a/rostests/tests/statst/statst.c
+++ b/rostests/tests/statst/statst.c
@@ -108,7 +108,7 @@ LRESULT CALLBACK TestWndProc(
    }
 }
 
-int STDCALL WinMain(
+int WINAPI WinMain(
     HINSTANCE hInstance,
     HINSTANCE hPrevInstance,
     LPSTR lpCmdLine,
diff --git a/rostests/tests/suspend/suspend.c b/rostests/tests/suspend/suspend.c
index a1f8a0697b7..93b9a833dca 100644
--- a/rostests/tests/suspend/suspend.c
+++ b/rostests/tests/suspend/suspend.c
@@ -11,7 +11,7 @@
 static volatile DWORD z;
 static volatile DWORD x=0;
 
-static NTSTATUS STDCALL
+static NTSTATUS WINAPI
 thread_1(PVOID Param)
 {
   DWORD y=0;
diff --git a/rostests/tests/terminate/terminate.c b/rostests/tests/terminate/terminate.c
index 7fd749f6b89..73ad49dd682 100644
--- a/rostests/tests/terminate/terminate.c
+++ b/rostests/tests/terminate/terminate.c
@@ -11,7 +11,7 @@
 static volatile DWORD z;
 static volatile DWORD x=0;
 
-static NTSTATUS STDCALL
+static NTSTATUS WINAPI
 thread_1(PVOID Param)
 {
   DWORD y=0;
diff --git a/rostests/win32/kernel32/tests/CreateFile.c b/rostests/win32/kernel32/tests/CreateFile.c
index 392ebd662df..b5d0f6334b8 100644
--- a/rostests/win32/kernel32/tests/CreateFile.c
+++ b/rostests/win32/kernel32/tests/CreateFile.c
@@ -67,7 +67,7 @@ static CreateFileTest_Parameters CreateFileTests[] =
 
 static CreateFileTest_Parameters *CurrentTest;
 
-static NTSTATUS STDCALL
+static NTSTATUS WINAPI
 MockNtCreateFile(PHANDLE FileHandle,
   ACCESS_MASK DesiredAccess,
   POBJECT_ATTRIBUTES ObjectAttributes,
diff --git a/rostests/win32/user32/drawcaption/drawcap.c b/rostests/win32/user32/drawcaption/drawcap.c
index 5c6b1e11c18..601d49f1520 100644
--- a/rostests/win32/user32/drawcaption/drawcap.c
+++ b/rostests/win32/user32/drawcaption/drawcap.c
@@ -25,7 +25,7 @@ WCHAR CaptWndClass[] = L"captwnd_class";
 HINSTANCE hInst;
 INT testnum = 0;
 
-//BOOL STDCALL (*DrawCaptionTemp) (
+//BOOL WINAPI (*DrawCaptionTemp) (
 //		 HWND        hwnd,
 //		 HDC         hdc,
 //		 const RECT *rect,