diff --git a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
index 2c137287ae5..90393b66e16 100644
--- a/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
+++ b/dlls/ntoskrnl.exe/ntoskrnl.exe.spec
@@ -759,10 +759,10 @@
 @ stdcall NtNotifyChangeDirectoryFile(long long ptr ptr ptr ptr long long long) ntdll.NtNotifyChangeDirectoryFile
 @ stdcall NtOpenFile(ptr long ptr ptr long long) ntdll.NtOpenFile
 @ stdcall NtOpenProcess(ptr long ptr ptr) ntdll.NtOpenProcess
-@ stdcall NtOpenProcessToken(long long long) ntdll.NtOpenProcessToken
+@ stdcall NtOpenProcessToken(long long ptr) ntdll.NtOpenProcessToken
 @ stdcall NtOpenProcessTokenEx(long long long ptr) ntdll.NtOpenProcessTokenEx
 @ stdcall NtOpenThread(ptr long ptr ptr) ntdll.NtOpenThread
-@ stdcall NtOpenThreadToken(long long long long) ntdll.NtOpenThreadToken
+@ stdcall NtOpenThreadToken(long long long ptr) ntdll.NtOpenThreadToken
 @ stdcall NtOpenThreadTokenEx(long long long long ptr) ntdll.NtOpenThreadTokenEx
 @ stdcall NtQueryDirectoryFile(long long ptr ptr ptr ptr long long long ptr long) ntdll.NtQueryDirectoryFile
 @ stdcall NtQueryEaFile(long ptr ptr long long ptr long ptr long) ntdll.NtQueryEaFile
@@ -775,7 +775,7 @@
 @ stdcall NtQuerySecurityObject(long long long long long) ntdll.NtQuerySecurityObject
 @ stdcall NtQuerySystemInformation(long long long long) ntdll.NtQuerySystemInformation
 @ stdcall NtQueryVolumeInformationFile(long ptr ptr long long) ntdll.NtQueryVolumeInformationFile
-@ stdcall NtReadFile(long long long long long long long long long) ntdll.NtReadFile
+@ stdcall NtReadFile(long long ptr ptr ptr ptr long ptr ptr) ntdll.NtReadFile
 @ stub NtRequestPort
 @ stdcall NtRequestWaitReplyPort(ptr ptr ptr) ntdll.NtRequestWaitReplyPort
 @ stdcall NtSetEaFile(long ptr ptr long) ntdll.NtSetEaFile
@@ -946,7 +946,7 @@
 @ stdcall RtlAreBitsClear(ptr long long) ntdll.RtlAreBitsClear
 @ stdcall RtlAreBitsSet(ptr long long) ntdll.RtlAreBitsSet
 @ stdcall RtlAssert(ptr ptr long long) ntdll.RtlAssert
-@ stdcall -register RtlCaptureContext(ptr) ntdll.RtlCaptureContext
+@ stdcall -norelay RtlCaptureContext(ptr) ntdll.RtlCaptureContext
 @ stdcall RtlCaptureStackBackTrace(long long ptr ptr) ntdll.RtlCaptureStackBackTrace
 @ stdcall RtlCharToInteger(ptr long ptr) ntdll.RtlCharToInteger
 @ stdcall RtlCheckRegistryKey(long ptr) ntdll.RtlCheckRegistryKey
@@ -959,9 +959,9 @@
 @ stdcall RtlCompareUnicodeString(ptr ptr long) ntdll.RtlCompareUnicodeString
 @ stdcall RtlCompressBuffer(long ptr long ptr long long ptr ptr) ntdll.RtlCompressBuffer
 @ stub RtlCompressChunks
-@ stdcall -ret64 RtlConvertLongToLargeInteger(long) ntdll.RtlConvertLongToLargeInteger
+@ stdcall -arch=win32 -ret64 RtlConvertLongToLargeInteger(long) ntdll.RtlConvertLongToLargeInteger
 @ stdcall RtlConvertSidToUnicodeString(ptr ptr long) ntdll.RtlConvertSidToUnicodeString
-@ stdcall -ret64 RtlConvertUlongToLargeInteger(long) ntdll.RtlConvertUlongToLargeInteger
+@ stdcall -arch=win32 -ret64 RtlConvertUlongToLargeInteger(long) ntdll.RtlConvertUlongToLargeInteger
 @ stdcall RtlCopyLuid(ptr ptr) ntdll.RtlCopyLuid
 @ stub RtlCopyRangeList
 @ stdcall RtlCopySid(long ptr ptr) ntdll.RtlCopySid
@@ -992,9 +992,9 @@
 @ stdcall RtlDestroyHeap(long) ntdll.RtlDestroyHeap
 @ stdcall RtlDowncaseUnicodeString(ptr ptr long) ntdll.RtlDowncaseUnicodeString
 @ stdcall RtlEmptyAtomTable(ptr long) ntdll.RtlEmptyAtomTable
-@ stdcall -ret64 RtlEnlargedIntegerMultiply(long long) ntdll.RtlEnlargedIntegerMultiply
-@ stdcall RtlEnlargedUnsignedDivide(int64 long ptr) ntdll.RtlEnlargedUnsignedDivide
-@ stdcall -ret64 RtlEnlargedUnsignedMultiply(long long) ntdll.RtlEnlargedUnsignedMultiply
+@ stdcall -arch=win32 -ret64 RtlEnlargedIntegerMultiply(long long) ntdll.RtlEnlargedIntegerMultiply
+@ stdcall -arch=win32 RtlEnlargedUnsignedDivide(int64 long ptr) ntdll.RtlEnlargedUnsignedDivide
+@ stdcall -arch=win32 -ret64 RtlEnlargedUnsignedMultiply(long long) ntdll.RtlEnlargedUnsignedMultiply
 @ stub RtlEnumerateGenericTable
 @ stub RtlEnumerateGenericTableAvl
 @ stub RtlEnumerateGenericTableLikeADirectory
@@ -1004,9 +1004,9 @@
 @ stdcall RtlEqualSid(long long) ntdll.RtlEqualSid
 @ stdcall RtlEqualString(ptr ptr long) ntdll.RtlEqualString
 @ stdcall RtlEqualUnicodeString(ptr ptr long) ntdll.RtlEqualUnicodeString
-@ stdcall -ret64 RtlExtendedIntegerMultiply(int64 long) ntdll.RtlExtendedIntegerMultiply
-@ stdcall -ret64 RtlExtendedLargeIntegerDivide(int64 long ptr) ntdll.RtlExtendedLargeIntegerDivide
-@ stdcall -ret64 RtlExtendedMagicDivide(int64 int64 long) ntdll.RtlExtendedMagicDivide
+@ stdcall -arch=win32 -ret64 RtlExtendedIntegerMultiply(int64 long) ntdll.RtlExtendedIntegerMultiply
+@ stdcall -arch=win32 -ret64 RtlExtendedLargeIntegerDivide(int64 long ptr) ntdll.RtlExtendedLargeIntegerDivide
+@ stdcall -arch=win32 -ret64 RtlExtendedMagicDivide(int64 int64 long) ntdll.RtlExtendedMagicDivide
 @ stdcall RtlFillMemory(ptr long long) ntdll.RtlFillMemory
 @ stdcall RtlFillMemoryUlong(ptr long long) ntdll.RtlFillMemoryUlong
 @ stdcall RtlFindClearBits(ptr long long) ntdll.RtlFindClearBits
@@ -1071,7 +1071,7 @@
 @ stub RtlInvertRangeList
 @ stdcall RtlIpv4AddressToStringA(ptr ptr) ntdll.RtlIpv4AddressToStringA
 @ stdcall RtlIpv4AddressToStringExA(ptr long ptr ptr) ntdll.RtlIpv4AddressToStringExA
-@ stdcall RtlIpv4AddressToStringExW(ptr ptr ptr ptr) ntdll.RtlIpv4AddressToStringExW
+@ stdcall RtlIpv4AddressToStringExW(ptr long ptr ptr) ntdll.RtlIpv4AddressToStringExW
 @ stdcall RtlIpv4AddressToStringW(ptr ptr) ntdll.RtlIpv4AddressToStringW
 @ stub RtlIpv4StringToAddressA
 @ stub RtlIpv4StringToAddressExA
@@ -1090,13 +1090,13 @@
 @ stdcall RtlIsNameLegalDOS8Dot3(ptr ptr ptr) ntdll.RtlIsNameLegalDOS8Dot3
 @ stub RtlIsRangeAvailable
 @ stub RtlIsValidOemCharacter
-@ stdcall -ret64 RtlLargeIntegerAdd(int64 int64) ntdll.RtlLargeIntegerAdd
-@ stdcall -ret64 RtlLargeIntegerArithmeticShift(int64 long) ntdll.RtlLargeIntegerArithmeticShift
-@ stdcall -ret64 RtlLargeIntegerDivide(int64 int64 ptr) ntdll.RtlLargeIntegerDivide
-@ stdcall -ret64 RtlLargeIntegerNegate(int64) ntdll.RtlLargeIntegerNegate
-@ stdcall -ret64 RtlLargeIntegerShiftLeft(int64 long) ntdll.RtlLargeIntegerShiftLeft
-@ stdcall -ret64 RtlLargeIntegerShiftRight(int64 long) ntdll.RtlLargeIntegerShiftRight
-@ stdcall -ret64 RtlLargeIntegerSubtract(int64 int64) ntdll.RtlLargeIntegerSubtract
+@ stdcall -arch=win32 -ret64 RtlLargeIntegerAdd(int64 int64) ntdll.RtlLargeIntegerAdd
+@ stdcall -arch=win32 -ret64 RtlLargeIntegerArithmeticShift(int64 long) ntdll.RtlLargeIntegerArithmeticShift
+@ stdcall -arch=win32 -ret64 RtlLargeIntegerDivide(int64 int64 ptr) ntdll.RtlLargeIntegerDivide
+@ stdcall -arch=win32 -ret64 RtlLargeIntegerNegate(int64) ntdll.RtlLargeIntegerNegate
+@ stdcall -arch=win32 -ret64 RtlLargeIntegerShiftLeft(int64 long) ntdll.RtlLargeIntegerShiftLeft
+@ stdcall -arch=win32 -ret64 RtlLargeIntegerShiftRight(int64 long) ntdll.RtlLargeIntegerShiftRight
+@ stdcall -arch=win32 -ret64 RtlLargeIntegerSubtract(int64 int64) ntdll.RtlLargeIntegerSubtract
 @ stdcall RtlLengthRequiredSid(long) ntdll.RtlLengthRequiredSid
 @ stdcall RtlLengthSecurityDescriptor(ptr) ntdll.RtlLengthSecurityDescriptor
 @ stdcall RtlLengthSid(ptr) ntdll.RtlLengthSid
@@ -1325,12 +1325,12 @@
 @ stdcall ZwOpenJobObject(ptr long ptr) ntdll.ZwOpenJobObject
 @ stdcall ZwOpenKey(ptr long ptr) ntdll.ZwOpenKey
 @ stdcall ZwOpenProcess(ptr long ptr ptr) ntdll.ZwOpenProcess
-@ stdcall ZwOpenProcessToken(long long long) ntdll.ZwOpenProcessToken
+@ stdcall ZwOpenProcessToken(long long ptr) ntdll.ZwOpenProcessToken
 @ stdcall ZwOpenProcessTokenEx(long long long ptr) ntdll.ZwOpenProcessTokenEx
 @ stdcall ZwOpenSection(ptr long ptr) ntdll.ZwOpenSection
 @ stdcall ZwOpenSymbolicLinkObject(ptr long ptr) ntdll.ZwOpenSymbolicLinkObject
 @ stdcall ZwOpenThread(ptr long ptr ptr) ntdll.ZwOpenThread
-@ stdcall ZwOpenThreadToken(long long long long) ntdll.ZwOpenThreadToken
+@ stdcall ZwOpenThreadToken(long long long ptr) ntdll.ZwOpenThreadToken
 @ stdcall ZwOpenThreadTokenEx(long long long long ptr) ntdll.ZwOpenThreadTokenEx
 @ stdcall ZwOpenTimer(ptr long ptr) ntdll.ZwOpenTimer
 @ stdcall ZwPowerInformation(long ptr long ptr long) ntdll.ZwPowerInformation
@@ -1357,7 +1357,7 @@
 @ stdcall ZwQuerySystemInformation(long long long long) ntdll.ZwQuerySystemInformation
 @ stdcall ZwQueryValueKey(long ptr long ptr long ptr) ntdll.ZwQueryValueKey
 @ stdcall ZwQueryVolumeInformationFile(long ptr ptr long long) ntdll.ZwQueryVolumeInformationFile
-@ stdcall ZwReadFile(long long long long long long long long long) ntdll.ZwReadFile
+@ stdcall ZwReadFile(long long ptr ptr ptr ptr long ptr ptr) ntdll.ZwReadFile
 @ stdcall ZwReplaceKey(ptr long ptr) ntdll.ZwReplaceKey
 @ stdcall ZwRequestWaitReplyPort(ptr ptr ptr) ntdll.ZwRequestWaitReplyPort
 @ stdcall ZwResetEvent(long ptr) ntdll.ZwResetEvent
@@ -1391,31 +1391,31 @@
 @ stdcall ZwWaitForSingleObject(long long long) ntdll.ZwWaitForSingleObject
 @ stdcall ZwWriteFile(long long ptr ptr ptr ptr long ptr ptr) ntdll.ZwWriteFile
 @ stdcall ZwYieldExecution() ntdll.ZwYieldExecution
-@ cdecl -private _CIcos() msvcrt._CIcos
-@ cdecl -private _CIsin() msvcrt._CIsin
-@ cdecl -private _CIsqrt() msvcrt._CIsqrt
+@ cdecl -private -arch=i386 _CIcos() msvcrt._CIcos
+@ cdecl -private -arch=i386 _CIsin() msvcrt._CIsin
+@ cdecl -private -arch=i386 _CIsqrt() msvcrt._CIsqrt
 @ cdecl -private _abnormal_termination() msvcrt._abnormal_termination
-@ stdcall -private -ret64 _alldiv(int64 int64) ntdll._alldiv
+@ stdcall -private -arch=i386 -ret64 _alldiv(int64 int64) ntdll._alldiv
 @ stub _alldvrm
-@ stdcall -private -ret64 _allmul(int64 int64) ntdll._allmul
-@ stdcall -private -i386 -norelay _alloca_probe() ntdll._alloca_probe
-@ stdcall -private -ret64 _allrem(int64 int64) ntdll._allrem
+@ stdcall -private -arch=i386 -ret64 _allmul(int64 int64) ntdll._allmul
+@ stdcall -private -arch=i386 -norelay _alloca_probe() ntdll._alloca_probe
+@ stdcall -private -arch=i386 -ret64 _allrem(int64 int64) ntdll._allrem
 @ stub _allshl
 @ stub _allshr
-@ stdcall -private -ret64 _aulldiv(int64 int64) ntdll._aulldiv
+@ stdcall -private -arch=i386 -ret64 _aulldiv(int64 int64) ntdll._aulldiv
 @ stub _aulldvrm
-@ stdcall -private -ret64 _aullrem(int64 int64) ntdll._aullrem
+@ stdcall -private -arch=i386 -ret64 _aullrem(int64 int64) ntdll._aullrem
 @ stub _aullshr
-@ cdecl -private -i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
-@ cdecl -private -i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
-@ cdecl -private -i386 _global_unwind2(ptr) msvcrt._global_unwind2
+@ cdecl -private -arch=i386 _except_handler2(ptr ptr ptr ptr) msvcrt._except_handler2
+@ cdecl -private -arch=i386 _except_handler3(ptr ptr ptr ptr) msvcrt._except_handler3
+@ cdecl -private -arch=i386 _global_unwind2(ptr) msvcrt._global_unwind2
 @ cdecl -private _itoa(long ptr long) msvcrt._itoa
 @ cdecl -private _itow(long ptr long) msvcrt._itow
 @ cdecl -private -arch=x86_64 _local_unwind(ptr ptr) msvcrt._local_unwind
 @ cdecl -private -arch=i386 _local_unwind2(ptr long) msvcrt._local_unwind2
 @ cdecl -private _purecall() msvcrt._purecall
-@ varargs -private _snprintf(str long str) msvcrt._snprintf
-@ varargs -private _snwprintf(wstr long wstr) msvcrt._snwprintf
+@ varargs -private _snprintf(ptr long str) msvcrt._snprintf
+@ varargs -private _snwprintf(ptr long wstr) msvcrt._snwprintf
 @ cdecl -private _stricmp(str str) msvcrt._stricmp
 @ cdecl -private _strlwr(str) msvcrt._strlwr
 @ cdecl -private _strnicmp(str str long) msvcrt._strnicmp
@@ -1423,8 +1423,8 @@
 @ cdecl -private _strrev(str) msvcrt._strrev
 @ cdecl -private _strset(str long) msvcrt._strset
 @ cdecl -private _strupr(str) msvcrt._strupr
-@ cdecl -private _vsnprintf(ptr long ptr ptr) msvcrt._vsnprintf
-@ cdecl -private _vsnwprintf(ptr long wstr long) msvcrt._vsnwprintf
+@ cdecl -private _vsnprintf(ptr long str ptr) msvcrt._vsnprintf
+@ cdecl -private _vsnwprintf(ptr long wstr ptr) msvcrt._vsnwprintf
 @ cdecl -private _wcsicmp(wstr wstr) msvcrt._wcsicmp
 @ cdecl -private _wcslwr(wstr) msvcrt._wcslwr
 @ cdecl -private _wcsnicmp(wstr wstr long) msvcrt._wcsnicmp
@@ -1440,7 +1440,7 @@
 @ cdecl -private isupper(long) msvcrt.isupper
 @ cdecl -private isxdigit(long) msvcrt.isxdigit
 @ cdecl -private mbstowcs(ptr str long) msvcrt.mbstowcs
-@ cdecl -private mbtowc(wstr str long) msvcrt.mbtowc
+@ cdecl -private mbtowc(ptr str long) msvcrt.mbtowc
 @ cdecl -private memchr(ptr long long) msvcrt.memchr
 @ cdecl -private memcpy(ptr ptr long) msvcrt.memcpy
 @ cdecl -private memmove(ptr ptr long) msvcrt.memmove
@@ -1460,7 +1460,7 @@
 @ cdecl -private strrchr(str long) msvcrt.strrchr
 @ cdecl -private strspn(str str) msvcrt.strspn
 @ cdecl -private strstr(str str) msvcrt.strstr
-@ varargs -private swprintf(wstr wstr) msvcrt.swprintf
+@ varargs -private swprintf(ptr wstr) msvcrt.swprintf
 @ cdecl -private tolower(long) msvcrt.tolower
 @ cdecl -private toupper(long) msvcrt.toupper
 @ cdecl -private towlower(long) msvcrt.towlower
diff --git a/tools/make_specfiles b/tools/make_specfiles
index cbadaba43fb..fe407da5553 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -148,6 +148,11 @@ my @dll_groups =
   "version",
   "api-ms-win-downlevel-version-l1-1-0",
  ],
+ [
+  "msvcrt",
+  "ntdll",
+  "ntoskrnl.exe"
+ ],
 );
 
 my $update_flags = 0;
@@ -256,6 +261,10 @@ sub update_spec_file($)
         {
             $flags = $parent{flags};
             $flags =~ s/-ordinal\s*// if $descr{ordinal} eq "@";
+            if ($descr{flags} =~ /-private/)  # preserve -private flag
+            {
+                $flags = "-private " . $flags unless $flags =~ /-private/;
+            }
         }
 
         if ($parent{callconv} ne "stub" || $parent{args})