diff --git a/reactos/lib/ntdll/dbg/dbgui.c b/reactos/lib/ntdll/dbg/dbgui.c
index 478030e312f..33c37b26eb8 100644
--- a/reactos/lib/ntdll/dbg/dbgui.c
+++ b/reactos/lib/ntdll/dbg/dbgui.c
@@ -40,7 +40,7 @@ DebugPrint(IN PANSI_STRING DebugString,
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 DbgUiConnectToDbg(VOID)
 {
     OBJECT_ATTRIBUTES ObjectAttributes;
@@ -66,7 +66,7 @@ DbgUiConnectToDbg(VOID)
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 DbgUiContinue(PCLIENT_ID ClientId,
               ULONG ContinueStatus)
 {
@@ -95,7 +95,7 @@ DbgUiWaitStateChange(PDBGUI_WAIT_STATE_CHANGE DbgUiWaitStateCange,
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 DbgUiRemoteBreakin(VOID)
 {
     /* Make sure a debugger is enabled; if so, breakpoint */
@@ -109,7 +109,7 @@ DbgUiRemoteBreakin(VOID)
  * @implemented
  */
 NTSTATUS
-STDCALL
+NTAPI
 DbgUiIssueRemoteBreakin(HANDLE Process)
 {
     HANDLE hThread;
diff --git a/reactos/lib/ntdll/inc/ntdll.h b/reactos/lib/ntdll/inc/ntdll.h
index 7676b2b1edd..d4fd4a38a72 100644
--- a/reactos/lib/ntdll/inc/ntdll.h
+++ b/reactos/lib/ntdll/inc/ntdll.h
@@ -14,6 +14,7 @@
 
 /* C Headers */
 #define _CTYPE_DISABLE_MACROS
+#define _CRT_SECURE_NO_DEPRECATE
 #define _INC_SWPRINTF_INL_
 #include <limits.h>
 #include <stdio.h>
diff --git a/reactos/lib/ntdll/inc/ntdllp.h b/reactos/lib/ntdll/inc/ntdllp.h
index 7b8dad8d3d8..53a981547c0 100644
--- a/reactos/lib/ntdll/inc/ntdllp.h
+++ b/reactos/lib/ntdll/inc/ntdllp.h
@@ -9,7 +9,7 @@
 /* INCLUDES ******************************************************************/
 
 /* FIXME: Cleanup this mess */
-typedef NTSTATUS (STDCALL *PEPFUNC)(PPEB);
+typedef NTSTATUS (NTAPI *PEPFUNC)(PPEB);
 NTSTATUS LdrMapSections(HANDLE ProcessHandle,
 			PVOID ImageBase,
 			HANDLE SectionHandle,
@@ -24,7 +24,7 @@ PEPFUNC LdrPEStartup (PVOID  ImageBase,
 		      PLDR_DATA_TABLE_ENTRY* Module,
 		      PWSTR FullDosName);
 typedef BOOL 
-(STDCALL *PDLLMAIN_FUNC)(HANDLE hInst,
+(NTAPI *PDLLMAIN_FUNC)(HANDLE hInst,
                          ULONG ul_reason_for_call,
                          LPVOID lpReserved);
 
diff --git a/reactos/lib/ntdll/ldr/res.c b/reactos/lib/ntdll/ldr/res.c
index 1ca20792193..d3478b3e8e1 100644
--- a/reactos/lib/ntdll/ldr/res.c
+++ b/reactos/lib/ntdll/ldr/res.c
@@ -85,7 +85,7 @@ PushLanguage(WORD *list, int pos, WORD lang)
 				    RESOURCE_DATA_LEVEL,
 				    &ResourceDataEntry);
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrFindResource_U(PVOID BaseAddress,
                   PLDR_RESOURCE_INFO ResourceInfo,
                   ULONG Level,
@@ -260,7 +260,7 @@ found:;
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrAccessResource(IN  PVOID BaseAddress,
                   IN  PIMAGE_RESOURCE_DATA_ENTRY ResourceDataEntry,
                   OUT PVOID* Resource OPTIONAL,
@@ -311,7 +311,7 @@ LdrAccessResource(IN  PVOID BaseAddress,
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrFindResourceDirectory_U(IN PVOID BaseAddress,
                            IN PLDR_RESOURCE_INFO info,
                            IN ULONG level,
diff --git a/reactos/lib/ntdll/ldr/startup.c b/reactos/lib/ntdll/ldr/startup.c
index c96e3bae870..2baddd27db2 100644
--- a/reactos/lib/ntdll/ldr/startup.c
+++ b/reactos/lib/ntdll/ldr/startup.c
@@ -17,7 +17,7 @@
 
 VOID RtlInitializeHeapManager (VOID);
 VOID LdrpInitLoader(VOID);
-VOID STDCALL RtlpInitDeferedCriticalSection(VOID);
+VOID NTAPI RtlpInitDeferedCriticalSection(VOID);
 
 /* GLOBALS *******************************************************************/
 
@@ -240,7 +240,7 @@ finish:
 /* FUNCTIONS *****************************************************************/
 
 VOID
-STDCALL
+NTAPI
 LdrpInit(PCONTEXT Context,
          PVOID SystemArgument1,
          PVOID SystemArgument2)
diff --git a/reactos/lib/ntdll/ldr/utils.c b/reactos/lib/ntdll/ldr/utils.c
index 80461b4ed87..1fbb165e180 100644
--- a/reactos/lib/ntdll/ldr/utils.c
+++ b/reactos/lib/ntdll/ldr/utils.c
@@ -271,7 +271,7 @@ LdrpInitializeTlsForProccess(VOID)
                TlsData->TlsDataSize = TlsDirectory->EndAddressOfRawData - TlsDirectory->StartAddressOfRawData;
                TlsData->TlsZeroSize = TlsDirectory->SizeOfZeroFill;
                if (TlsDirectory->AddressOfCallBacks)
-                 TlsData->TlsAddressOfCallBacks = *TlsDirectory->AddressOfCallBacks;
+                 TlsData->TlsAddressOfCallBacks = *(PIMAGE_TLS_CALLBACK*)TlsDirectory->AddressOfCallBacks;
                else
                  TlsData->TlsAddressOfCallBacks = NULL;
                TlsData->Module = Module;
@@ -722,7 +722,7 @@ LdrpMapDllImageFile(IN PWSTR SearchPath OPTIONAL,
  *
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrLoadDll (IN PWSTR SearchPath OPTIONAL,
             IN ULONG LoadFlags,
             IN PUNICODE_STRING Name,
@@ -775,7 +775,7 @@ LdrLoadDll (IN PWSTR SearchPath OPTIONAL,
  *
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrFindEntryForAddress(PVOID Address,
                        PLDR_DATA_TABLE_ENTRY *Module)
 {
@@ -2217,7 +2217,7 @@ LdrpUnloadModule(PLDR_DATA_TABLE_ENTRY Module,
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrUnloadDll (IN PVOID BaseAddress)
 {
    PLDR_DATA_TABLE_ENTRY Module;
@@ -2246,7 +2246,7 @@ LdrUnloadDll (IN PVOID BaseAddress)
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress)
 {
     PLIST_ENTRY ModuleListHead;
@@ -2284,7 +2284,7 @@ LdrDisableThreadCalloutsForDll(IN PVOID BaseAddress)
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrGetDllHandle(IN PWSTR DllPath OPTIONAL,
                 IN PULONG DllCharacteristics,
                 IN PUNICODE_STRING DllName,
@@ -2320,7 +2320,7 @@ LdrGetDllHandle(IN PWSTR DllPath OPTIONAL,
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrGetProcedureAddress (IN PVOID BaseAddress,
                         IN PANSI_STRING Name,
                         IN ULONG Ordinal,
@@ -2523,7 +2523,7 @@ LdrpAttachProcess(VOID)
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrShutdownProcess (VOID)
 {
   LdrpDetachProcess(TRUE);
@@ -2584,7 +2584,7 @@ LdrpAttachThread (VOID)
 /*
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrShutdownThread (VOID)
 {
    PLIST_ENTRY ModuleListHead;
@@ -2642,7 +2642,7 @@ LdrShutdownThread (VOID)
  *
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrQueryProcessModuleInformation(IN PMODULE_INFORMATION ModuleInformation OPTIONAL,
                                  IN ULONG Size OPTIONAL,
                                  OUT PULONG ReturnedSize)
@@ -2839,7 +2839,7 @@ LdrpGetResidentSize(PIMAGE_NT_HEADERS NTHeaders)
  *
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrVerifyImageMatchesChecksum (IN HANDLE FileHandle,
                                ULONG Unknown1,
                                ULONG Unknown2,
@@ -2933,7 +2933,7 @@ LdrVerifyImageMatchesChecksum (IN HANDLE FileHandle,
  *
  * @implemented
  */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 LdrQueryImageFileExecutionOptions (IN PUNICODE_STRING SubKey,
                                    IN PCWSTR ValueName,
                                    IN ULONG Type,
@@ -3064,7 +3064,7 @@ LdrQueryImageFileExecutionOptions (IN PUNICODE_STRING SubKey,
 }
 
 
-PIMAGE_BASE_RELOCATION STDCALL
+PIMAGE_BASE_RELOCATION NTAPI
 LdrProcessRelocationBlock(IN PVOID Address,
 			  IN USHORT Count,
 			  IN PUSHORT TypeOffset,
diff --git a/reactos/lib/ntdll/main/dispatch.c b/reactos/lib/ntdll/main/dispatch.c
index 1be0021494e..9738e6e9b94 100644
--- a/reactos/lib/ntdll/main/dispatch.c
+++ b/reactos/lib/ntdll/main/dispatch.c
@@ -12,7 +12,7 @@
 #define NDEBUG
 #include <debug.h>
 
-typedef NTSTATUS (STDCALL *USER_CALL)(PVOID Argument, ULONG ArgumentLength);
+typedef NTSTATUS (NTAPI *USER_CALL)(PVOID Argument, ULONG ArgumentLength);
 
 /* FUNCTIONS ****************************************************************/
 
@@ -20,7 +20,7 @@ typedef NTSTATUS (STDCALL *USER_CALL)(PVOID Argument, ULONG ArgumentLength);
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord,
                           PCONTEXT Context)
 {
@@ -53,7 +53,7 @@ KiUserExceptionDispatcher(PEXCEPTION_RECORD ExceptionRecord,
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 KiRaiseUserExceptionDispatcher(VOID)
 {
     EXCEPTION_RECORD ExceptionRecord;
@@ -72,7 +72,7 @@ KiRaiseUserExceptionDispatcher(VOID)
  * @implemented
  */
 VOID
-STDCALL
+NTAPI
 KiUserCallbackDispatcher(ULONG Index,
                          PVOID Argument,
                          ULONG ArgumentLength)
diff --git a/reactos/lib/ntdll/rtl/libsupp.c b/reactos/lib/ntdll/rtl/libsupp.c
index 8508c8d4efb..954bcb50c78 100644
--- a/reactos/lib/ntdll/rtl/libsupp.c
+++ b/reactos/lib/ntdll/rtl/libsupp.c
@@ -42,14 +42,14 @@ RtlpSetInDbgPrint(IN BOOLEAN NewValue)
 }
 
 KPROCESSOR_MODE
-STDCALL
+NTAPI
 RtlpGetMode()
 {
    return UserMode;
 }
 
 PPEB
-STDCALL
+NTAPI
 RtlpCurrentPeb(VOID)
 {
     return NtCurrentPeb();
@@ -58,7 +58,7 @@ RtlpCurrentPeb(VOID)
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 RtlAcquirePebLock(VOID)
 {
    PPEB Peb = NtCurrentPeb ();
@@ -68,7 +68,7 @@ RtlAcquirePebLock(VOID)
 /*
  * @implemented
  */
-VOID STDCALL
+VOID NTAPI
 RtlReleasePebLock(VOID)
 {
    PPEB Peb = NtCurrentPeb ();
@@ -79,7 +79,7 @@ RtlReleasePebLock(VOID)
 * @implemented
 */
 ULONG
-STDCALL
+NTAPI
 RtlGetNtGlobalFlags(VOID)
 {
     PPEB pPeb = NtCurrentPeb();
@@ -87,7 +87,7 @@ RtlGetNtGlobalFlags(VOID)
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 RtlDeleteHeapLock(
     PRTL_CRITICAL_SECTION CriticalSection)
 {
@@ -95,7 +95,7 @@ RtlDeleteHeapLock(
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 RtlEnterHeapLock(
     PRTL_CRITICAL_SECTION CriticalSection)
 {
@@ -103,7 +103,7 @@ RtlEnterHeapLock(
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 RtlInitializeHeapLock(
     PRTL_CRITICAL_SECTION CriticalSection)
 {
@@ -111,7 +111,7 @@ RtlInitializeHeapLock(
 }
 
 NTSTATUS
-STDCALL
+NTAPI
 RtlLeaveHeapLock(
     PRTL_CRITICAL_SECTION CriticalSection)
 {
@@ -119,7 +119,7 @@ RtlLeaveHeapLock(
 }
 
 PVOID
-STDCALL
+NTAPI
 RtlpAllocateMemory(UINT Bytes,
                    ULONG Tag)
 {
@@ -132,7 +132,7 @@ RtlpAllocateMemory(UINT Bytes,
 
 
 VOID
-STDCALL
+NTAPI
 RtlpFreeMemory(PVOID Mem,
                ULONG Tag)
 {
diff --git a/reactos/lib/ntdll/rtl/version.c b/reactos/lib/ntdll/rtl/version.c
index 70c11c44fa6..6150c8933ba 100644
--- a/reactos/lib/ntdll/rtl/version.c
+++ b/reactos/lib/ntdll/rtl/version.c
@@ -42,7 +42,7 @@
  * @implemented
  */
 
-BOOLEAN STDCALL
+BOOLEAN NTAPI
 RtlGetNtProductType(PNT_PRODUCT_TYPE ProductType)
 {
   *ProductType = SharedUserData->NtProductType;
@@ -70,7 +70,7 @@ RtlGetNtProductType(PNT_PRODUCT_TYPE ProductType)
  * @implemented
  */
 
-void STDCALL
+void NTAPI
 RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build)
 {
 	PPEB pPeb = NtCurrentPeb();
@@ -102,7 +102,7 @@ RtlGetNtVersionNumbers(LPDWORD major, LPDWORD minor, LPDWORD build)
 /*
 * @implemented
 */
-NTSTATUS STDCALL
+NTSTATUS NTAPI
 RtlGetVersion(RTL_OSVERSIONINFOW *Info)
 {
    if (Info->dwOSVersionInfoSize == sizeof(RTL_OSVERSIONINFOW) ||