diff --git a/rosapps/applications/net/tditest/tditest/tditest.c b/rosapps/applications/net/tditest/tditest/tditest.c
index a848c26866e..0f7de367642 100644
--- a/rosapps/applications/net/tditest/tditest/tditest.c
+++ b/rosapps/applications/net/tditest/tditest/tditest.c
@@ -892,9 +892,7 @@ VOID TdiUnload(
 
 
 NTSTATUS
-#ifndef _MSC_VER
-STDCALL
-#endif
+NTAPI
 DriverEntry(
     PDRIVER_OBJECT DriverObject,
     PUNICODE_STRING RegistryPath)
diff --git a/rosapps/applications/sysutils/chkdsk/chkdsk.c b/rosapps/applications/sysutils/chkdsk/chkdsk.c
index 62c97957236..4aff89f572a 100644
--- a/rosapps/applications/sysutils/chkdsk/chkdsk.c
+++ b/rosapps/applications/sysutils/chkdsk/chkdsk.c
@@ -205,7 +205,7 @@ ParseCommandLine(
 //
 //----------------------------------------------------------------------
 BOOLEAN
-STDCALL
+WINAPI
 ChkdskCallback(
 	CALLBACKCOMMAND	Command,
 	DWORD		Modifier,
diff --git a/rosapps/applications/sysutils/lsdd/lsdd.c b/rosapps/applications/sysutils/lsdd/lsdd.c
index 7ae4c98977c..ac3173fa1d4 100644
--- a/rosapps/applications/sysutils/lsdd/lsdd.c
+++ b/rosapps/applications/sysutils/lsdd/lsdd.c
@@ -31,7 +31,7 @@ static char DeviceName [DEVICE_SIZE];
 
 
 BOOL
-STDCALL
+WINAPI
 GetNextString (
 	char *	BufferIn,
 	char *	BufferOut,
diff --git a/rosapps/applications/sysutils/qssi/qssi.c b/rosapps/applications/sysutils/qssi/qssi.c
index 63226d84d48..9ef57da3ebb 100644
--- a/rosapps/applications/sysutils/qssi/qssi.c
+++ b/rosapps/applications/sysutils/qssi/qssi.c
@@ -68,7 +68,7 @@ INT (* COMMAND_CALL) (INT ArgC,LPCSTR ArgV []);
 
 
 
-VOID STDCALL PrintStatus (NTSTATUS Status);
+VOID WINAPI PrintStatus (NTSTATUS Status);
 
 #define CMD_REF(n) CMD_##n
 #define CMD_DEF(n) INT CMD_REF(n) (INT argc, LPCSTR argv [])
@@ -88,7 +88,7 @@ struct _COMMAND_DESCRIPTOR
 
 #define BIT(n,m) (((n)&(m))?'1':'0')
 LPSTR
-STDCALL
+WINAPI
 ByteToBinaryString (
 	BYTE	Byte,
 	CHAR	Binary [8]
@@ -107,7 +107,7 @@ ByteToBinaryString (
 
 /* --- */
 VOID
-STDCALL
+WINAPI
 DumpData (int Size, PVOID pData )
 {
 	PBYTE		Buffer = (PBYTE) pData;
@@ -200,7 +200,7 @@ KernelObjectName [] =
 
 
 LPTSTR
-STDCALL
+WINAPI
 HandleTypeToObjectName (
 	DWORD	HandleType
 	)
@@ -216,7 +216,7 @@ HandleTypeToObjectName (
 /* --- */
 
 int
-STDCALL
+WINAPI
 FindRequiredBufferSize (int i, int step)
 {
 	NTSTATUS	Status = STATUS_INFO_LENGTH_MISMATCH;
@@ -263,7 +263,7 @@ FindRequiredBufferSize (int i, int step)
 
 
 VOID
-STDCALL
+WINAPI
 PrintStatus (NTSTATUS Status)
 {
 	LPCSTR StatusName = NULL;
@@ -310,7 +310,7 @@ DaysOfWeek [] =
 };
 
 VOID
-STDCALL
+WINAPI
 PrintUtcDateTime (LPCSTR Template, PTIME UtcTime)
 {
 	CHAR		UtcTimeString [64];
diff --git a/rosapps/applications/sysutils/tlist/tlist.c b/rosapps/applications/sysutils/tlist/tlist.c
index aed90896c69..a4a87547167 100644
--- a/rosapps/applications/sysutils/tlist/tlist.c
+++ b/rosapps/applications/sysutils/tlist/tlist.c
@@ -63,14 +63,14 @@ void PsaiFree(void *ptr)
  NtFreeVirtualMemory(NtCurrentProcess(), &ptr, &nSize, MEM_RELEASE);
 }
 
-int STDCALL PrintBanner (VOID)
+int WINAPI PrintBanner (VOID)
 {
   printf ("ReactOS "KERNEL_RELEASE_STR" T(ask)List\n");
   printf ("Copyright (c) 2000,2001 Emanuele Aliberti\n\n");
   return EXIT_SUCCESS;
 }
 
-int STDCALL PrintSynopsys (int nRetVal)
+int WINAPI PrintSynopsys (int nRetVal)
 {
   PrintBanner ();
   printf ("Usage: tlist [-t | PID | -l]\n\n"
@@ -80,7 +80,7 @@ int STDCALL PrintSynopsys (int nRetVal)
   return nRetVal;
 }
 
-int STDCALL PrintLicense (VOID)
+int WINAPI PrintLicense (VOID)
 {
   PrintBanner ();
   printf (
@@ -100,13 +100,13 @@ int STDCALL PrintLicense (VOID)
   return EXIT_SUCCESS;
 }
 
-BOOL STDCALL AcquirePrivileges (VOID)
+BOOL WINAPI AcquirePrivileges (VOID)
 {
   /* TODO: implement it */
   return TRUE;
 }
 
-int STDCALL
+int WINAPI
 ProcessHasDescendants (
   HANDLE                      Pid,
   PSYSTEM_PROCESS_INFORMATION pInfo
@@ -132,7 +132,7 @@ ProcessHasDescendants (
 }
 
 
-BOOL STDCALL
+BOOL WINAPI
 GetProcessInfo (
   PSYSTEM_PROCESS_INFORMATION pInfo,
   LPWSTR                      * Module,
@@ -144,7 +144,7 @@ GetProcessInfo (
       return TRUE;
 }
 
-int STDCALL PrintProcessInfoDepth (
+int WINAPI PrintProcessInfoDepth (
   PSYSTEM_PROCESS_INFORMATION pInfo,
   LONG                        Depth
   )
@@ -165,7 +165,7 @@ int STDCALL PrintProcessInfoDepth (
   return EXIT_SUCCESS;
 }
 
-int STDCALL
+int WINAPI
 PrintProcessAndDescendants (
   PSYSTEM_PROCESS_INFORMATION pInfo,
   PSYSTEM_PROCESS_INFORMATION pInfoBase,
@@ -209,7 +209,7 @@ PrintProcessAndDescendants (
   return EXIT_SUCCESS;
 }
 
-int STDCALL PrintProcessList (BOOL DisplayTree)
+int WINAPI PrintProcessList (BOOL DisplayTree)
 {
   PSYSTEM_PROCESS_INFORMATION pInfo = NULL;
   PSYSTEM_PROCESS_INFORMATION pInfoBase = NULL;
@@ -251,7 +251,7 @@ int STDCALL PrintProcessList (BOOL DisplayTree)
 }
 
 
-int STDCALL PrintThreads (PSYSTEM_PROCESS_INFORMATION pInfo)
+int WINAPI PrintThreads (PSYSTEM_PROCESS_INFORMATION pInfo)
 {
   ULONG                               i = 0;
   NTSTATUS                            Status = STATUS_SUCCESS;
@@ -320,13 +320,13 @@ int STDCALL PrintThreads (PSYSTEM_PROCESS_INFORMATION pInfo)
   return EXIT_SUCCESS;
 }
 
-int STDCALL PrintModules (VOID)
+int WINAPI PrintModules (VOID)
 {
 	/* TODO */
 	return EXIT_SUCCESS;
 }
 
-PSYSTEM_PROCESS_INFORMATION STDCALL
+PSYSTEM_PROCESS_INFORMATION WINAPI
 GetProcessInfoPid (
   PSYSTEM_PROCESS_INFORMATION pInfoBase,
   HANDLE                       Pid
@@ -349,7 +349,7 @@ GetProcessInfoPid (
   return NULL;
 }
 
-int STDCALL PrintProcess (char * PidStr)
+int WINAPI PrintProcess (char * PidStr)
 {
   NTSTATUS                    Status = 0;
   HANDLE                      hProcess = 0;
diff --git a/rosapps/applications/sysutils/utils/objdir/objdir.c b/rosapps/applications/sysutils/utils/objdir/objdir.c
index 016060a774c..851ce33cc1f 100644
--- a/rosapps/applications/sysutils/utils/objdir/objdir.c
+++ b/rosapps/applications/sysutils/utils/objdir/objdir.c
@@ -28,7 +28,7 @@
 
 static
 PCHAR
-STDCALL
+WINAPI
 RawUszAsz (
 	PWCHAR	szU,
 	PCHAR	szA
@@ -44,7 +44,7 @@ RawUszAsz (
 
 static
 PWCHAR
-STDCALL
+WINAPI
 RawAszUsz (
 	PCHAR	szA,
 	PWCHAR	szW
@@ -60,7 +60,7 @@ RawAszUsz (
 
 static
 const char *
-STDCALL
+WINAPI
 StatusToName (NTSTATUS Status)
 {
 	static char RawValue [16];
@@ -94,7 +94,7 @@ StatusToName (NTSTATUS Status)
 
 
 BOOL
-STDCALL
+WINAPI
 ExpandSymbolicLink (
 	IN	PUNICODE_STRING	DirectoryName,
 	IN	PUNICODE_STRING	SymbolicLinkName,
@@ -167,7 +167,7 @@ ExpandSymbolicLink (
 
 
 BOOL
-STDCALL
+WINAPI
 ListDirectory (
 	IN	PUNICODE_STRING	DirectoryNameW,
 	IN	BOOL		Recurse
diff --git a/rosapps/applications/sysutils/utils/pice/module/privateice.c b/rosapps/applications/sysutils/utils/pice/module/privateice.c
index 918011d798b..19fb6bcd297 100644
--- a/rosapps/applications/sysutils/utils/pice/module/privateice.c
+++ b/rosapps/applications/sysutils/utils/pice/module/privateice.c
@@ -69,7 +69,7 @@ char tempPICE[1024];
 //
 //*************************************************************************
 
-NTSTATUS STDCALL pice_open(PDEVICE_OBJECT DeviceObject, PIRP Irp)
+NTSTATUS NTAPI pice_open(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 {
     DPRINT((0,"pice_open\n"));
 
@@ -89,7 +89,7 @@ NTSTATUS STDCALL pice_open(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 // pice_close()
 //
 //*************************************************************************
-NTSTATUS STDCALL pice_close(PDEVICE_OBJECT DeviceObject, PIRP Irp)
+NTSTATUS NTAPI pice_close(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 {
     DPRINT((0,"pice_close\n"));
 
@@ -108,7 +108,7 @@ NTSTATUS STDCALL pice_close(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 //
 //*************************************************************************
 
-NTSTATUS STDCALL pice_ioctl(PDEVICE_OBJECT DeviceObject, PIRP Irp)
+NTSTATUS NTAPI pice_ioctl(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 {
 //	char* pFilename = (char*) ioctl_param;
 
@@ -160,7 +160,7 @@ NTSTATUS STDCALL pice_ioctl(PDEVICE_OBJECT DeviceObject, PIRP Irp)
 }
 
 
-NTSTATUS STDCALL DriverEntry(PDRIVER_OBJECT DriverObject,
+NTSTATUS NTAPI DriverEntry(PDRIVER_OBJECT DriverObject,
 			     PUNICODE_STRING RegistryPath)
 /*
  * FUNCTION: Module entry point
diff --git a/rosapps/applications/sysutils/utils/pice/module/utils.c b/rosapps/applications/sysutils/utils/pice/module/utils.c
index 76b537aaeea..076e75fa4fd 100644
--- a/rosapps/applications/sysutils/utils/pice/module/utils.c
+++ b/rosapps/applications/sysutils/utils/pice/module/utils.c
@@ -2331,7 +2331,7 @@ size_t PICE_len( HANDLE hFile )
  */
 
 INT
-STDCALL
+WINAPI
 PICE_MultiByteToWideChar (
 	UINT	CodePage,
 	DWORD	dwFlags,
diff --git a/rosapps/applications/sysutils/utils/pice/module/utils.h b/rosapps/applications/sysutils/utils/pice/module/utils.h
index 902d2f5db93..4c9ea59e4a6 100644
--- a/rosapps/applications/sysutils/utils/pice/module/utils.h
+++ b/rosapps/applications/sysutils/utils/pice/module/utils.h
@@ -314,7 +314,7 @@ int PICE_close (HANDLE	hFile);
 size_t PICE_len( HANDLE hFile );
 WCHAR * PICE_wcscpy(WCHAR * str1,const WCHAR * str2);
 INT
-STDCALL
+WINAPI
 PICE_MultiByteToWideChar (
 	UINT	CodePage,
 	DWORD	dwFlags,
diff --git a/rosapps/templates/template/template.c b/rosapps/templates/template/template.c
index cbcf074bd41..f34c91b99ec 100644
--- a/rosapps/templates/template/template.c
+++ b/rosapps/templates/template/template.c
@@ -44,7 +44,7 @@ static PDRIVER_OBJECT DriverObject;
 
 /* FUNCTIONS ****************************************************************/
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 FsdCloseFile(PDEVICE_EXTENSION DeviceExt,
 	     PFILE_OBJECT FileObject)
 /*
@@ -55,7 +55,7 @@ FsdCloseFile(PDEVICE_EXTENSION DeviceExt,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 FsdOpenFile(PDEVICE_EXTENSION DeviceExt,
 	    PFILE_OBJECT FileObject,
 	    PWSTR FileName)
@@ -67,7 +67,7 @@ FsdOpenFile(PDEVICE_EXTENSION DeviceExt,
 }
 
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 FsdHasFileSystem(PDEVICE_OBJECT DeviceToMount)
 /*
  * FUNCTION: Tests if the device contains a filesystem that can be mounted
@@ -78,7 +78,7 @@ FsdHasFileSystem(PDEVICE_OBJECT DeviceToMount)
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 FsdMountDevice(PDEVICE_EXTENSION DeviceExt,
 	       PDEVICE_OBJECT DeviceToMount)
 /*
@@ -89,7 +89,7 @@ FsdMountDevice(PDEVICE_EXTENSION DeviceExt,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 FsdReadFile(PDEVICE_EXTENSION DeviceExt,
 	    PFILE_OBJECT FileObject,
 	    PVOID Buffer,
@@ -103,7 +103,7 @@ FsdReadFile(PDEVICE_EXTENSION DeviceExt,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 FsdClose(PDEVICE_OBJECT DeviceObject,
 	 PIRP Irp)
 {
@@ -122,7 +122,7 @@ FsdClose(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 FsdCreate(PDEVICE_OBJECT DeviceObject,
 	  PIRP Irp)
 {
@@ -142,7 +142,7 @@ FsdCreate(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 FsdWrite(PDEVICE_OBJECT DeviceObject,
 	 PIRP Irp)
 {
@@ -153,7 +153,7 @@ FsdWrite(PDEVICE_OBJECT DeviceObject,
   return(STATUS_UNSUCCESSFUL);
 }
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 FsdRead(PDEVICE_OBJECT DeviceObject,
 	PIRP Irp)
 {
@@ -210,7 +210,7 @@ FsdMount(PDEVICE_OBJECT DeviceToMount)
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 FsdFileSystemControl(PDEVICE_OBJECT DeviceObject,
 		     PIRP Irp)
 {
@@ -236,7 +236,7 @@ FsdFileSystemControl(PDEVICE_OBJECT DeviceObject,
 }
 
 
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 DriverEntry(PDRIVER_OBJECT _DriverObject,
 	    PUNICODE_STRING RegistryPath)
 /*