From 1913affb7b4ee57740a0322e6962d588ae62aca0 Mon Sep 17 00:00:00 2001
From: Piotr Caban <piotr@codeweavers.com>
Date: Thu, 3 Dec 2020 19:11:20 +0100
Subject: [PATCH] msvcrt: Remove MSVCRT_ prefix from file.c functions.

Signed-off-by: Piotr Caban <piotr@codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard@winehq.org>
---
 dlls/crtdll/crtdll.spec     | 168 +++----
 dlls/msvcr100/msvcr100.spec | 372 +++++++-------
 dlls/msvcr110/msvcr110.spec | 372 +++++++-------
 dlls/msvcr120/msvcr120.spec | 372 +++++++-------
 dlls/msvcr70/msvcr70.spec   | 236 ++++-----
 dlls/msvcr71/msvcr71.spec   | 236 ++++-----
 dlls/msvcr80/msvcr80.spec   | 372 +++++++-------
 dlls/msvcr90/msvcr90.spec   | 372 +++++++-------
 dlls/msvcrt/errno.c         |   9 +-
 dlls/msvcrt/exit.c          |   2 +-
 dlls/msvcrt/file.c          | 932 ++++++++++++++++++------------------
 dlls/msvcrt/msvcrt.h        |  14 -
 dlls/msvcrt/msvcrt.spec     | 308 ++++++------
 dlls/msvcrt/process.c       |  27 +-
 dlls/msvcrt/scanf.h         |  24 +-
 dlls/msvcrtd/msvcrtd.spec   | 230 ++++-----
 dlls/ucrtbase/ucrtbase.spec | 616 ++++++++++++------------
 include/msvcrt/io.h         |   2 +-
 include/msvcrt/stdio.h      |   2 +
 19 files changed, 2336 insertions(+), 2330 deletions(-)

diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec
index 63c83ef9a0c..efa5c022808 100644
--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
@@ -39,7 +39,7 @@
 @ cdecl __threadid() kernel32.GetCurrentThreadId
 @ cdecl __toascii(long)
 @ cdecl _abnormal_termination()
-@ cdecl _access(str long) MSVCRT__access
+@ cdecl _access(str long)
 @ extern _acmdln_dll MSVCRT__acmdln
 @ extern _aexit_rtn_dll _aexit_rtn
 @ cdecl _amsg_exit(long)
@@ -56,11 +56,11 @@
 @ cdecl _chdir(str)
 @ cdecl _chdrive(long)
 @ cdecl _chgsign(double)
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ extern _commode_dll MSVCRT__commode
 @ cdecl _control87(long long)
 @ cdecl _controlfp(long long)
@@ -68,17 +68,17 @@
 @ varargs _cprintf(str)
 @ extern _cpumode_dll CRTDLL__cpumode_dll
 @ cdecl _cputs(str)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ varargs _cscanf(str)
 @ extern _ctype MSVCRT__ctype
 @ cdecl _cwait(ptr long long)
 @ extern _daylight_dll MSVCRT___daylight
-@ cdecl _dup(long) MSVCRT__dup
-@ cdecl _dup2(long long) MSVCRT__dup2
+@ cdecl _dup(long)
+@ cdecl _dup2(long long)
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _endthread()
 @ extern _environ_dll MSVCRT__environ
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
 @ varargs _execl(str str)
@@ -91,29 +91,29 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
-@ cdecl _fdopen(long str) MSVCRT__fdopen
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filbuf(ptr) MSVCRT__filbuf
+@ cdecl _fdopen(long str)
+@ cdecl _fgetchar()
+@ cdecl _fgetwchar()
+@ cdecl _filbuf(ptr)
 # extern _fileinfo_dll
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _filelength(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst(str ptr)
 @ cdecl _findnext(long ptr)
 @ cdecl _finite(double)
-@ cdecl _flsbuf(long ptr) MSVCRT__flsbuf
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flsbuf(long ptr)
+@ cdecl _flushall()
 @ extern _fmode_dll MSVCRT__fmode
 @ cdecl _fpclass(double)
 @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr)
 @ cdecl _fpreset()
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat(long ptr) MSVCRT__fstat
+@ cdecl _fputchar(long)
+@ cdecl _fputwchar(long)
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat(long ptr)
 @ cdecl -arch=win32 _ftime(ptr) _ftime32
 @ cdecl -arch=win64 _ftime(ptr) _ftime64
 @ cdecl -arch=i386 -ret64 _ftol()
@@ -121,7 +121,7 @@
 @ cdecl -arch=win32 _futime(long ptr) _futime32
 @ cdecl -arch=win64 _futime(long ptr) _futime64
 @ cdecl _gcvt(double long str)
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _getch()
 @ cdecl _getche()
 @ cdecl _getcwd(str long)
@@ -132,7 +132,7 @@
 @ cdecl _getdrives() kernel32.GetLogicalDrives
 @ cdecl _getpid()
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
+@ cdecl _getw(ptr)
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _heapchk()
 @ cdecl _heapmin()
@@ -141,7 +141,7 @@
 @ cdecl _hypot(double double)
 @ cdecl _initterm(ptr ptr)
 @ extern _iob MSVCRT__iob
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _isctype(long long)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalpha(long)
@@ -178,12 +178,12 @@
 @ cdecl _lfind(ptr ptr ptr long ptr)
 @ cdecl _loaddll(str)
 @ cdecl -arch=i386 _local_unwind2(ptr long)
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl _lrotl(long long)
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
-@ cdecl _lseek(long long long) MSVCRT__lseek
+@ cdecl _lseek(long long long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltow(long ptr long) ntdll._ltow
 @ cdecl _makepath(ptr str str str str)
@@ -239,12 +239,12 @@
 @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy
 @ cdecl _memicmp(str str long)
 @ cdecl _mkdir(str)
-@ cdecl _mktemp(str) MSVCRT__mktemp
+@ cdecl _mktemp(str)
 @ cdecl _msize(ptr)
 @ cdecl _nextafter(double double)
 @ cdecl _onexit(ptr)
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ extern _osmajor_dll MSVCRT__winmajor
 @ extern _osminor_dll MSVCRT__winminor
 @ extern _osmode_dll CRTDLL__osmode_dll
@@ -253,28 +253,28 @@
 @ cdecl _pclose(ptr)
 @ extern _pctype_dll MSVCRT__pctype
 @ extern _pgmptr_dll MSVCRT__pgmptr
-@ cdecl _pipe(ptr long long) MSVCRT__pipe
+@ cdecl _pipe(ptr long long)
 @ cdecl _popen(str str)
 @ cdecl _purecall()
 @ cdecl _putch(long)
 @ cdecl _putenv(str)
-@ cdecl _putw(long ptr) MSVCRT__putw
+@ cdecl _putw(long ptr)
 # extern _pwctype_dll
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl _rotr(long long)
 @ cdecl _scalb(double long)
 @ cdecl _searchenv(str str ptr)
 @ cdecl _seterrormode(long)
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str)
 @ varargs _snwprintf(ptr long wstr)
-@ varargs _sopen(str long long) MSVCRT__sopen
+@ varargs _sopen(str long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -284,7 +284,7 @@
 @ cdecl _spawnvp(long str ptr)
 @ cdecl _spawnvpe(long str ptr ptr)
 @ cdecl _splitpath(str ptr ptr ptr ptr)
-@ cdecl _stat(str ptr) MSVCRT_stat
+@ cdecl _stat(str ptr)
 @ cdecl _statusfp()
 @ cdecl _strcmpi(str str) _stricmp
 @ cdecl _strdate(ptr)
@@ -308,17 +308,17 @@
 @ cdecl _swab(str str long)
 @ extern _sys_errlist MSVCRT__sys_errlist
 @ extern _sys_nerr_dll MSVCRT__sys_nerr
-@ cdecl _tell(long) MSVCRT__tell
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tell(long)
+@ cdecl _tempnam(str str)
 @ extern _timezone_dll MSVCRT___timezone
 @ cdecl _tolower(long)
 @ cdecl _toupper(long)
 @ extern _tzname MSVCRT__tzname
 @ cdecl _tzset()
 @ cdecl _ultoa(long ptr long) ntdll._ultoa
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 @ cdecl _ungetch(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
 @ cdecl -arch=win32 _utime(str ptr) _utime32
 @ cdecl -arch=win64 _utime(str ptr) _utime64
@@ -336,7 +336,7 @@
 @ extern _winmajor_dll MSVCRT__winmajor
 @ extern _winminor_dll MSVCRT__winminor
 @ extern _winver_dll MSVCRT__winver
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _write(long ptr long)
 @ cdecl _wtoi(wstr)
 @ cdecl _wtol(wstr)
 @ cdecl _y0(double)
@@ -356,7 +356,7 @@
 @ cdecl bsearch(ptr ptr long long ptr)
 @ cdecl calloc(long long)
 @ cdecl ceil(double)
-@ cdecl clearerr(ptr) MSVCRT_clearerr
+@ cdecl clearerr(ptr)
 @ cdecl clock()
 @ cdecl cos(double)
 @ cdecl cosh(double)
@@ -368,36 +368,36 @@
 @ cdecl exit(long)
 @ cdecl exp(double)
 @ cdecl fabs(double)
-@ cdecl fclose(ptr) MSVCRT_fclose
-@ cdecl feof(ptr) MSVCRT_feof
-@ cdecl ferror(ptr) MSVCRT_ferror
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
+@ cdecl fclose(ptr)
+@ cdecl feof(ptr)
+@ cdecl ferror(ptr)
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
 @ cdecl floor(double)
 @ cdecl fmod(double double)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ varargs fprintf(ptr str) MSVCRT_fprintf
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
+@ cdecl fopen(str str)
+@ varargs fprintf(ptr str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fread(ptr long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
+@ cdecl freopen(str str ptr)
 @ cdecl frexp(double ptr)
 @ varargs fscanf(ptr str)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ varargs fwprintf(ptr wstr)
+@ cdecl fwrite(ptr long long ptr)
 @ varargs fwscanf(ptr wstr)
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
-@ cdecl gets(str) MSVCRT_gets
+@ cdecl gets(str)
 @ cdecl -arch=win32 gmtime(ptr) _gmtime32
 @ cdecl -arch=win64 gmtime(ptr) _gmtime64
 @ cdecl is_wctype(long long) iswctype
@@ -449,21 +449,21 @@
 @ cdecl modf(double ptr)
 @ cdecl perror(str)
 @ cdecl pow(double double)
-@ varargs printf(str) MSVCRT_printf
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
+@ varargs printf(str)
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
 @ cdecl qsort(ptr long long ptr)
 @ cdecl raise(long)
 @ cdecl rand()
 @ cdecl realloc(ptr long)
-@ cdecl remove(str) MSVCRT_remove
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl remove(str)
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ varargs scanf(str)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl sinh(double)
@@ -499,20 +499,20 @@
 @ cdecl tanh(double)
 @ cdecl -arch=win32 time(ptr) _time32
 @ cdecl -arch=win64 time(ptr) _time64
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
+@ cdecl tmpfile()
+@ cdecl tmpnam(ptr)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towlower(long)
 @ cdecl towupper(long)
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
-@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
-@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
-@ cdecl vprintf(str ptr) MSVCRT_vprintf
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
+@ cdecl vfprintf(ptr str ptr)
+@ cdecl vfwprintf(ptr wstr ptr)
+@ cdecl vprintf(str ptr)
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl vswprintf(ptr wstr ptr) _vswprintf
-@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
+@ cdecl vwprintf(wstr ptr)
 @ cdecl wcscat(wstr wstr)
 @ cdecl wcschr(wstr long)
 @ cdecl wcscmp(wstr wstr)
@@ -535,5 +535,5 @@
 @ cdecl wcstoul(wstr ptr long)
 @ cdecl wcsxfrm(ptr wstr long)
 @ cdecl wctomb(ptr long)
-@ varargs wprintf(wstr) MSVCRT_wprintf
+@ varargs wprintf(wstr)
 @ varargs wscanf(wstr)
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 9972d1c531c..3c27eda4652 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -433,8 +433,8 @@
 @ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ thiscall -arch=i386 ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
-@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) MSVCRT__open
-@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) MSVCRT__open
+@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) _open
+@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) _open
 @ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
 @ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
 @ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
@@ -447,14 +447,14 @@
 @ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
-@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) MSVCRT__sopen
-@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) MSVCRT__sopen
+@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) _sopen
+@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) _sopen
 @ stub -arch=win32 ?_type_info_dtor_internal_method@type_info@@QAEXXZ  # public: void __thiscall type_info::_type_info_dtor_internal_method(void)
 @ stub -arch=win64 ?_type_info_dtor_internal_method@type_info@@QEAAXXZ  # public: void __cdecl type_info::_type_info_dtor_internal_method(void) __ptr64
-@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) MSVCRT__wopen
-@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) MSVCRT__wopen
-@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) MSVCRT__wsopen
-@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) MSVCRT__wsopen
+@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) _wopen
+@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) _wopen
+@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) _wsopen
+@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) _wsopen
 @ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) type_info_before
 @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) type_info_before
 @ thiscall -arch=i386 ?get_error_code@scheduler_resource_allocation_error@Concurrency@@QBEJXZ(ptr) scheduler_resource_allocation_error_get_error_code
@@ -678,8 +678,8 @@
 @ extern __winitenv MSVCRT___winitenv
 @ cdecl _abnormal_termination()
 @ cdecl -ret64 _abs64(int64)
-@ cdecl _access(str long) MSVCRT__access
-@ cdecl _access_s(str long) MSVCRT__access_s
+@ cdecl _access(str long)
+@ cdecl _access_s(str long)
 @ extern _acmdln MSVCRT__acmdln
 @ cdecl _aligned_free(ptr)
 @ cdecl _aligned_malloc(long long)
@@ -722,12 +722,12 @@
 @ cdecl _chgsign(double)
 @ cdecl -arch=!i386 _chgsignf(float)
 @ cdecl -arch=i386 -norelay _chkesp()
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
-@ cdecl _chsize_s(long int64) MSVCRT__chsize_s
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
+@ cdecl _chsize_s(long int64)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ extern _commode MSVCRT__commode
 @ cdecl _configthreadlocale(long)
 @ cdecl _control87(long long)
@@ -743,7 +743,7 @@
 @ stub _cprintf_s_l
 @ cdecl _cputs(str)
 @ cdecl _cputws(wstr)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ cdecl _create_locale(long str)
 @ cdecl -arch=i386 _crt_debugger_hook(long)
 @ cdecl -arch=arm,win64 __crt_debugger_hook(long) _crt_debugger_hook
@@ -771,8 +771,8 @@
 @ cdecl _difftime64(int64 int64)
 @ stub _dosmaperr
 @ extern _dstbias MSVCRT__dstbias
-@ cdecl _dup(long) MSVCRT__dup
-@ cdecl _dup2(long long) MSVCRT__dup2
+@ cdecl _dup(long)
+@ cdecl _dup2(long long)
 @ cdecl _dupenv_s(ptr ptr str)
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _ecvt_s(str long double long ptr ptr)
@@ -780,7 +780,7 @@
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
 @ extern _environ MSVCRT__environ
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@@ -795,20 +795,20 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
-@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fclose_nolock(ptr)
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
 @ cdecl _fcvt_s(ptr long double long ptr ptr)
-@ cdecl _fdopen(long str) MSVCRT__fdopen
-@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock
-@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filbuf(ptr) MSVCRT__filbuf
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _fdopen(long str)
+@ cdecl _fflush_nolock(ptr)
+@ cdecl _fgetc_nolock(ptr)
+@ cdecl _fgetchar()
+@ cdecl _fgetwc_nolock(ptr)
+@ cdecl _fgetwchar()
+@ cdecl _filbuf(ptr)
+@ cdecl _filelength(long)
+@ cdecl -ret64 _filelengthi64(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst32(str ptr)
 @ stub _findfirst32i64
@@ -820,8 +820,8 @@
 @ cdecl _findnext64i32(long ptr)
 @ cdecl _finite(double)
 @ cdecl -arch=!i386 _finitef(float)
-@ cdecl _flsbuf(long ptr) MSVCRT__flsbuf
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flsbuf(long ptr)
+@ cdecl _flushall()
 @ extern _fmode MSVCRT__fmode
 @ cdecl _fpclass(double)
 @ cdecl -arch=!i386 _fpclassf(float)
@@ -831,29 +831,29 @@
 @ stub _fprintf_p
 @ stub _fprintf_p_l
 @ stub _fprintf_s_l
-@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
-@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
-@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
+@ cdecl _fputc_nolock(long ptr)
+@ cdecl _fputchar(long)
+@ cdecl _fputwc_nolock(long ptr)
+@ cdecl _fputwchar(long)
+@ cdecl _fread_nolock(ptr long long ptr)
+@ cdecl _fread_nolock_s(ptr long long long ptr)
 @ cdecl _free_locale(ptr)
 @ stub _freea
 @ stub _freea_s
 @ stub _freefls
 @ varargs _fscanf_l(ptr str ptr)
 @ varargs _fscanf_s_l(ptr str ptr)
-@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
-@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
-@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat32(long ptr) MSVCRT__fstat32
-@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64
-@ cdecl _fstat64(long ptr) MSVCRT__fstat64
-@ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32
-@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock
-@ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64
-@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock
+@ cdecl _fseek_nolock(ptr long long)
+@ cdecl _fseeki64(ptr int64 long)
+@ cdecl _fseeki64_nolock(ptr int64 long)
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat32(long ptr)
+@ cdecl _fstat32i64(long ptr)
+@ cdecl _fstat64(long ptr)
+@ cdecl _fstat64i32(long ptr)
+@ cdecl _ftell_nolock(ptr)
+@ cdecl -ret64 _ftelli64(ptr)
+@ cdecl -ret64 _ftelli64_nolock(ptr)
 @ cdecl _ftime32(ptr)
 @ cdecl _ftime32_s(ptr)
 @ cdecl _ftime64(ptr)
@@ -862,11 +862,11 @@
 @ cdecl _fullpath(ptr str long)
 @ cdecl _futime32(long ptr)
 @ cdecl _futime64(long ptr)
-@ varargs _fwprintf_l(ptr wstr ptr) MSVCRT__fwprintf_l
+@ varargs _fwprintf_l(ptr wstr ptr)
 @ stub _fwprintf_p
 @ stub _fwprintf_p_l
 @ stub _fwprintf_s_l
-@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock
+@ cdecl _fwrite_nolock(ptr long long ptr)
 @ varargs _fwscanf_l(ptr wstr ptr)
 @ varargs _fwscanf_s_l(ptr wstr ptr)
 @ cdecl _gcvt(double long str)
@@ -879,7 +879,7 @@
 @ cdecl _get_fmode(ptr)
 @ cdecl _get_heap_handle()
 @ cdecl _get_invalid_parameter_handler()
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _get_output_format()
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output()
@@ -889,7 +889,7 @@
 @ cdecl _get_tzname(ptr str long long)
 @ cdecl _get_unexpected()
 @ cdecl _get_wpgmptr(ptr)
-@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock
+@ cdecl _getc_nolock(ptr) _fgetc_nolock
 @ cdecl _getch()
 @ cdecl _getch_nolock()
 @ cdecl _getche()
@@ -901,18 +901,18 @@
 @ cdecl _getdllprocaddr(long str long)
 @ cdecl _getdrive()
 @ cdecl _getdrives() kernel32.GetLogicalDrives
-@ cdecl _getmaxstdio() MSVCRT__getmaxstdio
+@ cdecl _getmaxstdio()
 @ cdecl _getmbcp()
 @ cdecl _getpid() _getpid
 @ cdecl _getptd()
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
-@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock
+@ cdecl _getw(ptr)
+@ cdecl _getwc_nolock(ptr) _fgetwc_nolock
 @ cdecl _getwch()
 @ cdecl _getwch_nolock()
 @ cdecl _getwche()
 @ cdecl _getwche_nolock()
-@ cdecl _getws(ptr) MSVCRT__getws
+@ cdecl _getws(ptr)
 @ stub _getws_s
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _gmtime32(ptr)
@@ -944,7 +944,7 @@
 @ extern _iob MSVCRT__iob
 @ cdecl _isalnum_l(long ptr)
 @ cdecl _isalpha_l(long ptr)
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _iscntrl_l(long ptr)
 @ cdecl _isctype(long long)
 @ cdecl _isctype_l(long long ptr)
@@ -1050,8 +1050,8 @@
 @ cdecl _localtime64(ptr)
 @ cdecl _localtime64_s(ptr ptr)
 @ cdecl _lock(long)
-@ cdecl _lock_file(ptr) MSVCRT__lock_file
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _lock_file(ptr)
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl -arch=!i386 _logbf(float)
 @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp
@@ -1059,8 +1059,8 @@
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
 @ stub _lsearch_s
-@ cdecl _lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _lseek(long long long)
+@ cdecl -ret64 _lseeki64(long int64 long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltoa_s(long ptr long long)
 @ cdecl _ltow(long ptr long) ntdll._ltow
@@ -1210,47 +1210,47 @@
 @ cdecl _mkdir(str)
 @ cdecl _mkgmtime32(ptr)
 @ cdecl _mkgmtime64(ptr)
-@ cdecl _mktemp(str) MSVCRT__mktemp
-@ cdecl _mktemp_s(str long) MSVCRT__mktemp_s
+@ cdecl _mktemp(str)
+@ cdecl _mktemp_s(str long)
 @ cdecl _mktime32(ptr)
 @ cdecl _mktime64(ptr)
 @ cdecl _msize(ptr)
 @ cdecl _nextafter(double double)
 @ cdecl -arch=x86_64 _nextafterf(float float)
 @ cdecl _onexit(ptr)
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ stub -arch=i386 _outp(long long)
 @ stub -arch=i386 _outpd(long long)
 @ stub -arch=i386 _outpw(long long)
 @ cdecl _pclose(ptr)
 @ extern _pctype MSVCRT__pctype
 @ extern _pgmptr MSVCRT__pgmptr
-@ cdecl _pipe(ptr long long) MSVCRT__pipe
+@ cdecl _pipe(ptr long long)
 @ cdecl _popen(str str)
 @ stub _printf_l
 @ stub _printf_p
 @ stub _printf_p_l
 @ stub _printf_s_l
 @ cdecl _purecall()
-@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock
+@ cdecl _putc_nolock(long ptr) _fputc_nolock
 @ cdecl _putch(long)
 @ cdecl _putch_nolock(long)
 @ cdecl _putenv(str)
 @ cdecl _putenv_s(str str)
-@ cdecl _putw(long ptr) MSVCRT__putw
-@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
+@ cdecl _putw(long ptr)
+@ cdecl _putwc_nolock(long ptr) _fputwc_nolock
 @ cdecl _putwch(long)
 @ cdecl _putwch_nolock(long)
-@ cdecl _putws(wstr) MSVCRT__putws
+@ cdecl _putws(wstr)
 @ extern _pwctype MSVCRT__pwctype
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 @ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw()
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl -ret64 _rotl64(int64 long)
 @ cdecl _rotr(long long)
@@ -1287,9 +1287,9 @@
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
 @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
 @ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex
-@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio
+@ cdecl _setmaxstdio(long)
 @ cdecl _setmbcp(long)
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str)
@@ -1310,8 +1310,8 @@
 @ varargs _snwscanf_l(wstr long wstr ptr)
 @ varargs _snwscanf_s(wstr long wstr)
 @ varargs _snwscanf_s_l(wstr long wstr ptr)
-@ varargs _sopen(str long long) MSVCRT__sopen
-@ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s
+@ varargs _sopen(str long long)
+@ cdecl _sopen_s(ptr str long long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -1328,10 +1328,10 @@
 @ varargs _sprintf_s_l(ptr long str ptr)
 @ varargs _sscanf_l(str str ptr)
 @ varargs _sscanf_s_l(str str ptr)
-@ cdecl _stat32(str ptr) MSVCRT__stat32
-@ cdecl _stat32i64(str ptr) MSVCRT__stat32i64
-@ cdecl _stat64(str ptr) MSVCRT_stat64
-@ cdecl _stat64i32(str ptr) MSVCRT__stat64i32
+@ cdecl _stat32(str ptr)
+@ cdecl _stat32i64(str ptr)
+@ cdecl _stat64(str ptr)
+@ cdecl _stat64i32(str ptr)
 @ cdecl _statusfp()
 @ cdecl -arch=i386 _statusfp2(ptr ptr)
 @ cdecl _strcoll_l(str str ptr)
@@ -1385,9 +1385,9 @@
 @ varargs _swscanf_s_l(wstr wstr ptr)
 @ extern _sys_errlist MSVCRT__sys_errlist
 @ extern _sys_nerr MSVCRT__sys_nerr
-@ cdecl _tell(long) MSVCRT__tell
+@ cdecl _tell(long)
 @ cdecl -ret64 _telli64(long)
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tempnam(str str)
 @ cdecl _time32(ptr)
 @ cdecl _time64(ptr)
 @ extern _timezone MSVCRT___timezone
@@ -1407,18 +1407,18 @@
 @ cdecl _ultoa_s(long ptr long long)
 @ cdecl _ultow(long ptr long) ntdll._ultow
 @ cdecl _ultow_s(long ptr long long)
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 @ stub _umask_s
-@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock
+@ cdecl _ungetc_nolock(long ptr)
 @ cdecl _ungetch(long)
 @ cdecl _ungetch_nolock(long)
-@ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock
+@ cdecl _ungetwc_nolock(long ptr)
 @ cdecl _ungetwch(long)
 @ cdecl _ungetwch_nolock(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
 @ cdecl _unlock(long)
-@ cdecl _unlock_file(ptr) MSVCRT__unlock_file
+@ cdecl _unlock_file(ptr)
 @ cdecl _utime32(str ptr)
 @ cdecl _utime64(str ptr)
 @ cdecl _vcprintf(str ptr)
@@ -1433,14 +1433,14 @@
 @ stub _vcwprintf_p_l
 @ stub _vcwprintf_s
 @ stub _vcwprintf_s_l
-@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
-@ cdecl _vfprintf_p(ptr str ptr) MSVCRT__vfprintf_p
-@ cdecl _vfprintf_p_l(ptr str ptr ptr) MSVCRT__vfprintf_p_l
-@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
-@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
-@ cdecl _vfwprintf_p(ptr wstr ptr) MSVCRT__vfwprintf_p
-@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_p_l
-@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
+@ cdecl _vfprintf_l(ptr str ptr ptr)
+@ cdecl _vfprintf_p(ptr str ptr)
+@ cdecl _vfprintf_p_l(ptr str ptr ptr)
+@ cdecl _vfprintf_s_l(ptr str ptr ptr)
+@ cdecl _vfwprintf_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_p(ptr wstr ptr)
+@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr)
 @ stub _vprintf_l
 @ stub _vprintf_p
 @ stub _vprintf_p_l
@@ -1478,15 +1478,15 @@
 @ stub _vwprintf_p
 @ stub _vwprintf_p_l
 @ stub _vwprintf_s_l
-@ cdecl _waccess(wstr long) MSVCRT__waccess
-@ cdecl _waccess_s(wstr long) MSVCRT__waccess_s
+@ cdecl _waccess(wstr long)
+@ cdecl _waccess_s(wstr long)
 @ cdecl _wasctime(ptr)
 @ cdecl _wasctime_s(ptr long ptr)
 @ cdecl _wassert(wstr wstr long)
 @ cdecl _wchdir(wstr)
-@ cdecl _wchmod(wstr long) MSVCRT__wchmod
+@ cdecl _wchmod(wstr long)
 @ extern _wcmdln MSVCRT__wcmdln
-@ cdecl _wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _wcreat(wstr long)
 @ cdecl _wcscoll_l(wstr wstr ptr)
 @ cdecl _wcsdup(wstr)
 @ cdecl _wcserror(long)
@@ -1542,7 +1542,7 @@
 @ cdecl _wexecve(wstr ptr ptr)
 @ cdecl _wexecvp(wstr ptr)
 @ cdecl _wexecvpe(wstr ptr ptr)
-@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _wfdopen(long wstr)
 @ cdecl _wfindfirst32(wstr ptr)
 @ stub _wfindfirst32i64
 @ cdecl _wfindfirst64(wstr ptr)
@@ -1551,11 +1551,11 @@
 @ stub _wfindnext32i64
 @ cdecl _wfindnext64(long ptr)
 @ cdecl _wfindnext64i32(long ptr)
-@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s
-@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s
-@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _wfopen(wstr wstr)
+@ cdecl _wfopen_s(ptr wstr wstr)
+@ cdecl _wfreopen(wstr wstr ptr)
+@ cdecl _wfreopen_s(ptr wstr wstr ptr)
+@ cdecl _wfsopen(wstr wstr long)
 @ cdecl _wfullpath(ptr wstr long)
 @ cdecl _wgetcwd(wstr long)
 @ cdecl _wgetdcwd(long wstr long)
@@ -1565,9 +1565,9 @@
 @ cdecl _wmakepath(ptr wstr wstr wstr wstr)
 @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr)
 @ cdecl _wmkdir(wstr)
-@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
-@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
-@ varargs _wopen(wstr long) MSVCRT__wopen
+@ cdecl _wmktemp(wstr)
+@ cdecl _wmktemp_s(wstr long)
+@ varargs _wopen(wstr long)
 @ cdecl _wperror(wstr)
 @ extern _wpgmptr MSVCRT__wpgmptr
 @ cdecl _wpopen(wstr wstr)
@@ -1577,17 +1577,17 @@
 @ stub _wprintf_s_l
 @ cdecl _wputenv(wstr)
 @ cdecl _wputenv_s(wstr wstr)
-@ cdecl _wremove(wstr) MSVCRT__wremove
-@ cdecl _wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _wremove(wstr)
+@ cdecl _wrename(wstr wstr)
+@ cdecl _write(long ptr long)
 @ cdecl _wrmdir(wstr)
 @ varargs _wscanf_l(wstr ptr)
 @ varargs _wscanf_s_l(wstr ptr)
 @ cdecl _wsearchenv(wstr wstr ptr)
 @ cdecl _wsearchenv_s(wstr wstr ptr long)
 @ cdecl _wsetlocale(long wstr)
-@ varargs _wsopen(wstr long long) MSVCRT__wsopen
-@ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s
+@ varargs _wsopen(wstr long long)
+@ cdecl _wsopen_s(ptr wstr long long long)
 @ varargs _wspawnl(long wstr wstr)
 @ varargs _wspawnle(long wstr wstr)
 @ varargs _wspawnlp(long wstr wstr)
@@ -1598,18 +1598,18 @@
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
 @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long)
-@ cdecl _wstat32(wstr ptr) MSVCRT__wstat32
-@ cdecl _wstat32i64(wstr ptr) MSVCRT__wstat32i64
-@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64
-@ cdecl _wstat64i32(wstr ptr) MSVCRT__wstat64i32
+@ cdecl _wstat32(wstr ptr)
+@ cdecl _wstat32i64(wstr ptr)
+@ cdecl _wstat64(wstr ptr)
+@ cdecl _wstat64i32(wstr ptr)
 @ cdecl _wstrdate(ptr)
 @ cdecl _wstrdate_s(ptr long)
 @ cdecl _wstrtime(ptr)
 @ cdecl _wstrtime_s(ptr long)
 @ cdecl _wsystem(wstr)
-@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
-@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
-@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s
+@ cdecl _wtempnam(wstr wstr)
+@ cdecl _wtmpnam(ptr)
+@ cdecl _wtmpnam_s(ptr long)
 @ cdecl _wtof(wstr)
 @ cdecl _wtof_l(wstr ptr)
 @ cdecl _wtoi(wstr)
@@ -1618,7 +1618,7 @@
 @ cdecl _wtoi_l(wstr ptr)
 @ cdecl _wtol(wstr)
 @ cdecl _wtol_l(wstr ptr)
-@ cdecl _wunlink(wstr) MSVCRT__wunlink
+@ cdecl _wunlink(wstr)
 @ cdecl _wutime32(wstr ptr)
 @ cdecl _wutime64(wstr ptr)
 @ cdecl _y0(double)
@@ -1646,8 +1646,8 @@
 @ cdecl calloc(long long)
 @ cdecl ceil(double)
 @ cdecl -arch=!i386 ceilf(float)
-@ cdecl clearerr(ptr) MSVCRT_clearerr
-@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s
+@ cdecl clearerr(ptr)
+@ cdecl clearerr_s(ptr)
 @ cdecl clock()
 @ cdecl cos(double)
 @ cdecl -arch=!i386 cosf(float)
@@ -1658,51 +1658,51 @@
 @ cdecl exp(double)
 @ cdecl -arch=!i386 expf(float)
 @ cdecl fabs(double)
-@ cdecl fclose(ptr) MSVCRT_fclose
-@ cdecl feof(ptr) MSVCRT_feof
-@ cdecl ferror(ptr) MSVCRT_ferror
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl fclose(ptr)
+@ cdecl feof(ptr)
+@ cdecl ferror(ptr)
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
+@ cdecl fgetws(ptr long ptr)
 @ cdecl floor(double)
 @ cdecl -arch=!i386 floorf(float)
 @ cdecl fmod(double double)
 @ cdecl -arch=!i386 fmodf(float float)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s
-@ varargs fprintf(ptr str) MSVCRT_fprintf
-@ varargs fprintf_s(ptr str) MSVCRT_fprintf_s
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fputws(wstr ptr) MSVCRT_fputws
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
+@ cdecl fopen(str str)
+@ cdecl fopen_s(ptr str str)
+@ varargs fprintf(ptr str)
+@ varargs fprintf_s(ptr str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fputws(wstr ptr)
+@ cdecl fread(ptr long long ptr)
+@ cdecl fread_s(ptr long long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
-@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
+@ cdecl freopen(str str ptr)
+@ cdecl freopen_s(ptr str str ptr)
 @ cdecl frexp(double ptr)
 @ varargs fscanf(ptr str)
 @ varargs fscanf_s(ptr str)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
-@ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ varargs fwprintf(ptr wstr)
+@ varargs fwprintf_s(ptr wstr)
+@ cdecl fwrite(ptr long long ptr)
 @ varargs fwscanf(ptr wstr)
 @ varargs fwscanf_s(ptr wstr)
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
 @ cdecl getenv_s(ptr ptr long str)
-@ cdecl gets(str) MSVCRT_gets
-@ cdecl gets_s(ptr long) MSVCRT_gets_s
-@ cdecl getwc(ptr) MSVCRT_getwc
-@ cdecl getwchar() MSVCRT_getwchar
+@ cdecl gets(str)
+@ cdecl gets_s(ptr long)
+@ cdecl getwc(ptr)
+@ cdecl getwchar()
 @ cdecl is_wctype(long long) iswctype
 @ cdecl isalnum(long)
 @ cdecl isalpha(long)
@@ -1761,28 +1761,28 @@
 @ cdecl perror(str)
 @ cdecl pow(double double)
 @ cdecl -arch=!i386 powf(float float)
-@ varargs printf(str) MSVCRT_printf
-@ varargs printf_s(str) MSVCRT_printf_s
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
-@ cdecl putwc(long ptr) MSVCRT_fputwc
-@ cdecl putwchar(long) MSVCRT__fputwchar
+@ varargs printf(str)
+@ varargs printf_s(str)
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
+@ cdecl putwc(long ptr) fputwc
+@ cdecl putwchar(long) _fputwchar
 @ cdecl qsort(ptr long long ptr)
 @ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
 @ cdecl rand()
 @ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
-@ cdecl remove(str) MSVCRT_remove
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl remove(str)
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ varargs scanf(str)
 @ varargs scanf_s(str)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl -arch=!i386 sinf(float)
@@ -1831,27 +1831,27 @@
 @ cdecl -arch=!i386 tanf(float)
 @ cdecl tanh(double)
 @ cdecl -arch=!i386 tanhf(float)
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
+@ cdecl tmpfile()
+@ cdecl tmpfile_s(ptr)
+@ cdecl tmpnam(ptr)
+@ cdecl tmpnam_s(ptr long)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towlower(long)
 @ cdecl towupper(long)
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
-@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
-@ cdecl vfprintf_s(ptr str ptr) MSVCRT_vfprintf_s
-@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
-@ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s
-@ cdecl vprintf(str ptr) MSVCRT_vprintf
-@ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
+@ cdecl vfprintf(ptr str ptr)
+@ cdecl vfprintf_s(ptr str ptr)
+@ cdecl vfwprintf(ptr wstr ptr)
+@ cdecl vfwprintf_s(ptr wstr ptr)
+@ cdecl vprintf(str ptr)
+@ cdecl vprintf_s(str ptr)
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl vsprintf_s(ptr long str ptr)
 @ cdecl vswprintf_s(ptr long wstr ptr)
-@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
-@ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s
+@ cdecl vwprintf(wstr ptr)
+@ cdecl vwprintf_s(wstr ptr)
 @ cdecl wcrtomb(ptr long ptr)
 @ cdecl wcrtomb_s(ptr ptr long long ptr)
 @ cdecl wcscat(wstr wstr)
@@ -1889,7 +1889,7 @@
 @ cdecl wctomb_s(ptr ptr long long)
 @ cdecl wmemcpy_s(ptr long ptr long)
 @ cdecl wmemmove_s(ptr long ptr long)
-@ varargs wprintf(wstr) MSVCRT_wprintf
-@ varargs wprintf_s(wstr) MSVCRT_wprintf_s
+@ varargs wprintf(wstr)
+@ varargs wprintf_s(wstr)
 @ varargs wscanf(wstr)
 @ varargs wscanf_s(wstr)
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index 42cd8df7806..10258b032d1 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -715,8 +715,8 @@
 @ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ thiscall -arch=i386 ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
-@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) MSVCRT__open
-@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) MSVCRT__open
+@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) _open
+@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) _open
 @ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
 @ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
 @ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
@@ -729,15 +729,15 @@
 @ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
-@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) MSVCRT__sopen
-@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) MSVCRT__sopen
+@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) _sopen
+@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) _sopen
 @ stub -arch=arm ?_type_info_dtor_internal_method@type_info@@QAAXXZ
 @ stub -arch=i386 ?_type_info_dtor_internal_method@type_info@@QAEXXZ  # public: void __thiscall type_info::_type_info_dtor_internal_method(void)
 @ stub -arch=win64 ?_type_info_dtor_internal_method@type_info@@QEAAXXZ  # public: void __cdecl type_info::_type_info_dtor_internal_method(void) __ptr64
-@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) MSVCRT__wopen
-@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) MSVCRT__wopen
-@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) MSVCRT__wsopen
-@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) MSVCRT__wsopen
+@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) _wopen
+@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) _wopen
+@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) _wsopen
+@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) _wsopen
 @ cdecl -arch=arm ?before@type_info@@QBA_NABV1@@Z(ptr ptr) type_info_before
 @ thiscall -arch=i386 ?before@type_info@@QBE_NABV1@@Z(ptr ptr) type_info_before
 @ cdecl -arch=win64 ?before@type_info@@QEBA_NAEBV1@@Z(ptr ptr) type_info_before
@@ -1026,8 +1026,8 @@
 @ extern __winitenv MSVCRT___winitenv
 @ cdecl _abnormal_termination()
 @ cdecl -ret64 _abs64(int64)
-@ cdecl _access(str long) MSVCRT__access
-@ cdecl _access_s(str long) MSVCRT__access_s
+@ cdecl _access(str long)
+@ cdecl _access_s(str long)
 @ extern _acmdln MSVCRT__acmdln
 @ cdecl _aligned_free(ptr)
 @ cdecl _aligned_malloc(long long)
@@ -1070,12 +1070,12 @@
 @ cdecl _chgsign(double)
 @ cdecl -arch=!i386 _chgsignf(float)
 @ cdecl -arch=i386 -norelay _chkesp()
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
-@ cdecl _chsize_s(long int64) MSVCRT__chsize_s
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
+@ cdecl _chsize_s(long int64)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ extern _commode MSVCRT__commode
 @ cdecl _configthreadlocale(long)
 @ cdecl _control87(long long)
@@ -1091,7 +1091,7 @@
 @ stub _cprintf_s_l
 @ cdecl _cputs(str)
 @ cdecl _cputws(wstr)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ cdecl _create_locale(long str)
 @ cdecl -arch=i386 _crt_debugger_hook(long)
 @ cdecl -arch=arm,win64 __crt_debugger_hook(long) _crt_debugger_hook
@@ -1119,15 +1119,15 @@
 @ cdecl _difftime64(int64 int64)
 @ stub _dosmaperr
 @ extern _dstbias MSVCRT__dstbias
-@ cdecl _dup(long) MSVCRT__dup
-@ cdecl _dup2(long long) MSVCRT__dup2
+@ cdecl _dup(long)
+@ cdecl _dup2(long long)
 @ cdecl _dupenv_s(ptr ptr str)
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _ecvt_s(str long double long ptr ptr)
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
 @ extern _environ MSVCRT__environ
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@@ -1142,20 +1142,20 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
-@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fclose_nolock(ptr)
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
 @ cdecl _fcvt_s(ptr long double long ptr ptr)
-@ cdecl _fdopen(long str) MSVCRT__fdopen
-@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock
-@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filbuf(ptr) MSVCRT__filbuf
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _fdopen(long str)
+@ cdecl _fflush_nolock(ptr)
+@ cdecl _fgetc_nolock(ptr)
+@ cdecl _fgetchar()
+@ cdecl _fgetwc_nolock(ptr)
+@ cdecl _fgetwchar()
+@ cdecl _filbuf(ptr)
+@ cdecl _filelength(long)
+@ cdecl -ret64 _filelengthi64(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst32(str ptr)
 @ stub _findfirst32i64
@@ -1167,8 +1167,8 @@
 @ cdecl _findnext64i32(long ptr)
 @ cdecl _finite(double)
 @ cdecl -arch=!i386 _finitef(float)
-@ cdecl _flsbuf(long ptr) MSVCRT__flsbuf
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flsbuf(long ptr)
+@ cdecl _flushall()
 @ extern _fmode MSVCRT__fmode
 @ cdecl _fpclass(double)
 @ cdecl -arch=!i386 _fpclassf(float)
@@ -1178,29 +1178,29 @@
 @ stub _fprintf_p
 @ stub _fprintf_p_l
 @ stub _fprintf_s_l
-@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
-@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
-@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
+@ cdecl _fputc_nolock(long ptr)
+@ cdecl _fputchar(long)
+@ cdecl _fputwc_nolock(long ptr)
+@ cdecl _fputwchar(long)
+@ cdecl _fread_nolock(ptr long long ptr)
+@ cdecl _fread_nolock_s(ptr long long long ptr)
 @ cdecl _free_locale(ptr)
 @ stub _freea
 @ stub _freea_s
 @ stub _freefls
 @ varargs _fscanf_l(ptr str ptr)
 @ varargs _fscanf_s_l(ptr str ptr)
-@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
-@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
-@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat32(long ptr) MSVCRT__fstat32
-@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64
-@ cdecl _fstat64(long ptr) MSVCRT__fstat64
-@ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32
-@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock
-@ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64
-@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock
+@ cdecl _fseek_nolock(ptr long long)
+@ cdecl _fseeki64(ptr int64 long)
+@ cdecl _fseeki64_nolock(ptr int64 long)
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat32(long ptr)
+@ cdecl _fstat32i64(long ptr)
+@ cdecl _fstat64(long ptr)
+@ cdecl _fstat64i32(long ptr)
+@ cdecl _ftell_nolock(ptr)
+@ cdecl -ret64 _ftelli64(ptr)
+@ cdecl -ret64 _ftelli64_nolock(ptr)
 @ cdecl _ftime32(ptr)
 @ cdecl _ftime32_s(ptr)
 @ cdecl _ftime64(ptr)
@@ -1209,11 +1209,11 @@
 @ cdecl _fullpath(ptr str long)
 @ cdecl _futime32(long ptr)
 @ cdecl _futime64(long ptr)
-@ varargs _fwprintf_l(ptr wstr ptr) MSVCRT__fwprintf_l
+@ varargs _fwprintf_l(ptr wstr ptr)
 @ stub _fwprintf_p
 @ stub _fwprintf_p_l
 @ stub _fwprintf_s_l
-@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock
+@ cdecl _fwrite_nolock(ptr long long ptr)
 @ varargs _fwscanf_l(ptr wstr ptr)
 @ varargs _fwscanf_s_l(ptr wstr ptr)
 @ cdecl _gcvt(double long str)
@@ -1226,7 +1226,7 @@
 @ cdecl _get_fmode(ptr)
 @ cdecl _get_heap_handle()
 @ cdecl _get_invalid_parameter_handler()
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _get_output_format()
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output()
@@ -1236,7 +1236,7 @@
 @ cdecl _get_tzname(ptr str long long)
 @ cdecl _get_unexpected()
 @ cdecl _get_wpgmptr(ptr)
-@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock
+@ cdecl _getc_nolock(ptr) _fgetc_nolock
 @ cdecl _getch()
 @ cdecl _getch_nolock()
 @ cdecl _getche()
@@ -1247,18 +1247,18 @@
 @ cdecl _getdllprocaddr(long str long)
 @ cdecl _getdrive()
 @ cdecl _getdrives() kernel32.GetLogicalDrives
-@ cdecl _getmaxstdio() MSVCRT__getmaxstdio
+@ cdecl _getmaxstdio()
 @ cdecl _getmbcp()
 @ cdecl _getpid() _getpid
 @ cdecl _getptd()
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
-@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock
+@ cdecl _getw(ptr)
+@ cdecl _getwc_nolock(ptr) _fgetwc_nolock
 @ cdecl _getwch()
 @ cdecl _getwch_nolock()
 @ cdecl _getwche()
 @ cdecl _getwche_nolock()
-@ cdecl _getws(ptr) MSVCRT__getws
+@ cdecl _getws(ptr)
 @ stub _getws_s
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _gmtime32(ptr)
@@ -1290,7 +1290,7 @@
 @ extern _iob MSVCRT__iob
 @ cdecl _isalnum_l(long ptr)
 @ cdecl _isalpha_l(long ptr)
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _iscntrl_l(long ptr)
 @ cdecl _isctype(long long)
 @ cdecl _isctype_l(long long ptr)
@@ -1407,8 +1407,8 @@
 @ cdecl _localtime64(ptr)
 @ cdecl _localtime64_s(ptr ptr)
 @ cdecl _lock(long)
-@ cdecl _lock_file(ptr) MSVCRT__lock_file
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _lock_file(ptr)
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl -arch=!i386 _logbf(float)
 @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp
@@ -1416,8 +1416,8 @@
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
 @ stub _lsearch_s
-@ cdecl _lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _lseek(long long long)
+@ cdecl -ret64 _lseeki64(long int64 long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltoa_s(long ptr long long)
 @ cdecl _ltow(long ptr long) ntdll._ltow
@@ -1567,47 +1567,47 @@
 @ cdecl _mkdir(str)
 @ cdecl _mkgmtime32(ptr)
 @ cdecl _mkgmtime64(ptr)
-@ cdecl _mktemp(str) MSVCRT__mktemp
-@ cdecl _mktemp_s(str long) MSVCRT__mktemp_s
+@ cdecl _mktemp(str)
+@ cdecl _mktemp_s(str long)
 @ cdecl _mktime32(ptr)
 @ cdecl _mktime64(ptr)
 @ cdecl _msize(ptr)
 @ cdecl _nextafter(double double)
 @ cdecl -arch=x86_64 _nextafterf(float float)
 @ cdecl _onexit(ptr)
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ stub -arch=i386 _outp(long long)
 @ stub -arch=i386 _outpd(long long)
 @ stub -arch=i386 _outpw(long long)
 @ cdecl _pclose(ptr)
 @ extern _pctype MSVCRT__pctype
 @ extern _pgmptr MSVCRT__pgmptr
-@ cdecl _pipe(ptr long long) MSVCRT__pipe
+@ cdecl _pipe(ptr long long)
 @ cdecl _popen(str str)
 @ stub _printf_l
 @ stub _printf_p
 @ stub _printf_p_l
 @ stub _printf_s_l
 @ cdecl _purecall()
-@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock
+@ cdecl _putc_nolock(long ptr) _fputc_nolock
 @ cdecl _putch(long)
 @ cdecl _putch_nolock(long)
 @ cdecl _putenv(str)
 @ cdecl _putenv_s(str str)
-@ cdecl _putw(long ptr) MSVCRT__putw
-@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
+@ cdecl _putw(long ptr)
+@ cdecl _putwc_nolock(long ptr) _fputwc_nolock
 @ cdecl _putwch(long)
 @ cdecl _putwch_nolock(long)
-@ cdecl _putws(wstr) MSVCRT__putws
+@ cdecl _putws(wstr)
 @ extern _pwctype MSVCRT__pwctype
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 @ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw()
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl -ret64 _rotl64(int64 long)
 @ cdecl _rotr(long long)
@@ -1644,9 +1644,9 @@
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
 @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
 @ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex
-@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio
+@ cdecl _setmaxstdio(long)
 @ cdecl _setmbcp(long)
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str)
@@ -1667,8 +1667,8 @@
 @ varargs _snwscanf_l(wstr long wstr ptr)
 @ varargs _snwscanf_s(wstr long wstr)
 @ varargs _snwscanf_s_l(wstr long wstr ptr)
-@ varargs _sopen(str long long) MSVCRT__sopen
-@ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s
+@ varargs _sopen(str long long)
+@ cdecl _sopen_s(ptr str long long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -1685,10 +1685,10 @@
 @ varargs _sprintf_s_l(ptr long str ptr)
 @ varargs _sscanf_l(str str ptr)
 @ varargs _sscanf_s_l(str str ptr)
-@ cdecl _stat32(str ptr) MSVCRT__stat32
-@ cdecl _stat32i64(str ptr) MSVCRT__stat32i64
-@ cdecl _stat64(str ptr) MSVCRT_stat64
-@ cdecl _stat64i32(str ptr) MSVCRT__stat64i32
+@ cdecl _stat32(str ptr)
+@ cdecl _stat32i64(str ptr)
+@ cdecl _stat64(str ptr)
+@ cdecl _stat64i32(str ptr)
 @ cdecl _statusfp()
 @ cdecl -arch=i386 _statusfp2(ptr ptr)
 @ cdecl _strcoll_l(str str ptr)
@@ -1742,9 +1742,9 @@
 @ varargs _swscanf_s_l(wstr wstr ptr)
 @ extern _sys_errlist MSVCRT__sys_errlist
 @ extern _sys_nerr MSVCRT__sys_nerr
-@ cdecl _tell(long) MSVCRT__tell
+@ cdecl _tell(long)
 @ cdecl -ret64 _telli64(long)
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tempnam(str str)
 @ cdecl _time32(ptr)
 @ cdecl _time64(ptr)
 @ extern _timezone MSVCRT___timezone
@@ -1764,18 +1764,18 @@
 @ cdecl _ultoa_s(long ptr long long)
 @ cdecl _ultow(long ptr long) ntdll._ultow
 @ cdecl _ultow_s(long ptr long long)
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 @ stub _umask_s
-@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock
+@ cdecl _ungetc_nolock(long ptr)
 @ cdecl _ungetch(long)
 @ cdecl _ungetch_nolock(long)
-@ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock
+@ cdecl _ungetwc_nolock(long ptr)
 @ cdecl _ungetwch(long)
 @ cdecl _ungetwch_nolock(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
 @ cdecl _unlock(long)
-@ cdecl _unlock_file(ptr) MSVCRT__unlock_file
+@ cdecl _unlock_file(ptr)
 @ cdecl _utime32(str ptr)
 @ cdecl _utime64(str ptr)
 @ cdecl _vcprintf(str ptr)
@@ -1790,14 +1790,14 @@
 @ stub _vcwprintf_p_l
 @ stub _vcwprintf_s
 @ stub _vcwprintf_s_l
-@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
-@ cdecl _vfprintf_p(ptr str ptr) MSVCRT__vfprintf_p
-@ cdecl _vfprintf_p_l(ptr str ptr ptr) MSVCRT__vfprintf_p_l
-@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
-@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
-@ cdecl _vfwprintf_p(ptr wstr ptr) MSVCRT__vfwprintf_p
-@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_p_l
-@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
+@ cdecl _vfprintf_l(ptr str ptr ptr)
+@ cdecl _vfprintf_p(ptr str ptr)
+@ cdecl _vfprintf_p_l(ptr str ptr ptr)
+@ cdecl _vfprintf_s_l(ptr str ptr ptr)
+@ cdecl _vfwprintf_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_p(ptr wstr ptr)
+@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr)
 @ stub _vprintf_l
 @ stub _vprintf_p
 @ stub _vprintf_p_l
@@ -1835,15 +1835,15 @@
 @ stub _vwprintf_p
 @ stub _vwprintf_p_l
 @ stub _vwprintf_s_l
-@ cdecl _waccess(wstr long) MSVCRT__waccess
-@ cdecl _waccess_s(wstr long) MSVCRT__waccess_s
+@ cdecl _waccess(wstr long)
+@ cdecl _waccess_s(wstr long)
 @ cdecl _wasctime(ptr)
 @ cdecl _wasctime_s(ptr long ptr)
 @ cdecl _wassert(wstr wstr long)
 @ cdecl _wchdir(wstr)
-@ cdecl _wchmod(wstr long) MSVCRT__wchmod
+@ cdecl _wchmod(wstr long)
 @ extern _wcmdln MSVCRT__wcmdln
-@ cdecl _wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _wcreat(wstr long)
 @ cdecl _wcreate_locale(long wstr)
 @ cdecl _wcscoll_l(wstr wstr ptr)
 @ cdecl _wcsdup(wstr)
@@ -1900,7 +1900,7 @@
 @ cdecl _wexecve(wstr ptr ptr)
 @ cdecl _wexecvp(wstr ptr)
 @ cdecl _wexecvpe(wstr ptr ptr)
-@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _wfdopen(long wstr)
 @ cdecl _wfindfirst32(wstr ptr)
 @ stub _wfindfirst32i64
 @ cdecl _wfindfirst64(wstr ptr)
@@ -1909,11 +1909,11 @@
 @ stub _wfindnext32i64
 @ cdecl _wfindnext64(long ptr)
 @ cdecl _wfindnext64i32(long ptr)
-@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s
-@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s
-@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _wfopen(wstr wstr)
+@ cdecl _wfopen_s(ptr wstr wstr)
+@ cdecl _wfreopen(wstr wstr ptr)
+@ cdecl _wfreopen_s(ptr wstr wstr ptr)
+@ cdecl _wfsopen(wstr wstr long)
 @ cdecl _wfullpath(ptr wstr long)
 @ cdecl _wgetcwd(wstr long)
 @ cdecl _wgetdcwd(long wstr long)
@@ -1922,9 +1922,9 @@
 @ cdecl _wmakepath(ptr wstr wstr wstr wstr)
 @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr)
 @ cdecl _wmkdir(wstr)
-@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
-@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
-@ varargs _wopen(wstr long) MSVCRT__wopen
+@ cdecl _wmktemp(wstr)
+@ cdecl _wmktemp_s(wstr long)
+@ varargs _wopen(wstr long)
 @ cdecl _wperror(wstr)
 @ extern _wpgmptr MSVCRT__wpgmptr
 @ cdecl _wpopen(wstr wstr)
@@ -1934,17 +1934,17 @@
 @ stub _wprintf_s_l
 @ cdecl _wputenv(wstr)
 @ cdecl _wputenv_s(wstr wstr)
-@ cdecl _wremove(wstr) MSVCRT__wremove
-@ cdecl _wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _wremove(wstr)
+@ cdecl _wrename(wstr wstr)
+@ cdecl _write(long ptr long)
 @ cdecl _wrmdir(wstr)
 @ varargs _wscanf_l(wstr ptr)
 @ varargs _wscanf_s_l(wstr ptr)
 @ cdecl _wsearchenv(wstr wstr ptr)
 @ cdecl _wsearchenv_s(wstr wstr ptr long)
 @ cdecl _wsetlocale(long wstr)
-@ varargs _wsopen(wstr long long) MSVCRT__wsopen
-@ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s
+@ varargs _wsopen(wstr long long)
+@ cdecl _wsopen_s(ptr wstr long long long)
 @ varargs _wspawnl(long wstr wstr)
 @ varargs _wspawnle(long wstr wstr)
 @ varargs _wspawnlp(long wstr wstr)
@@ -1955,18 +1955,18 @@
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
 @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long)
-@ cdecl _wstat32(wstr ptr) MSVCRT__wstat32
-@ cdecl _wstat32i64(wstr ptr) MSVCRT__wstat32i64
-@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64
-@ cdecl _wstat64i32(wstr ptr) MSVCRT__wstat64i32
+@ cdecl _wstat32(wstr ptr)
+@ cdecl _wstat32i64(wstr ptr)
+@ cdecl _wstat64(wstr ptr)
+@ cdecl _wstat64i32(wstr ptr)
 @ cdecl _wstrdate(ptr)
 @ cdecl _wstrdate_s(ptr long)
 @ cdecl _wstrtime(ptr)
 @ cdecl _wstrtime_s(ptr long)
 @ cdecl _wsystem(wstr)
-@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
-@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
-@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s
+@ cdecl _wtempnam(wstr wstr)
+@ cdecl _wtmpnam(ptr)
+@ cdecl _wtmpnam_s(ptr long)
 @ cdecl _wtof(wstr)
 @ cdecl _wtof_l(wstr ptr)
 @ cdecl _wtoi(wstr)
@@ -1975,7 +1975,7 @@
 @ cdecl _wtoi_l(wstr ptr)
 @ cdecl _wtol(wstr)
 @ cdecl _wtol_l(wstr ptr)
-@ cdecl _wunlink(wstr) MSVCRT__wunlink
+@ cdecl _wunlink(wstr)
 @ cdecl _wutime32(wstr ptr)
 @ cdecl _wutime64(wstr ptr)
 @ cdecl _y0(double)
@@ -2003,8 +2003,8 @@
 @ cdecl calloc(long long)
 @ cdecl ceil(double)
 @ cdecl -arch=!i386 ceilf(float)
-@ cdecl clearerr(ptr) MSVCRT_clearerr
-@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s
+@ cdecl clearerr(ptr)
+@ cdecl clearerr_s(ptr)
 @ cdecl clock()
 @ cdecl cos(double)
 @ cdecl -arch=!i386 cosf(float)
@@ -2016,51 +2016,51 @@
 @ cdecl -arch=!i386 expf(float)
 @ cdecl fabs(double)
 @ cdecl -arch=!i386 fabsf(float)
-@ cdecl fclose(ptr) MSVCRT_fclose
-@ cdecl feof(ptr) MSVCRT_feof
-@ cdecl ferror(ptr) MSVCRT_ferror
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl fclose(ptr)
+@ cdecl feof(ptr)
+@ cdecl ferror(ptr)
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
+@ cdecl fgetws(ptr long ptr)
 @ cdecl floor(double)
 @ cdecl -arch=!i386 floorf(float)
 @ cdecl fmod(double double)
 @ cdecl -arch=!i386 fmodf(float float)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s
-@ varargs fprintf(ptr str) MSVCRT_fprintf
-@ varargs fprintf_s(ptr str) MSVCRT_fprintf_s
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fputws(wstr ptr) MSVCRT_fputws
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
+@ cdecl fopen(str str)
+@ cdecl fopen_s(ptr str str)
+@ varargs fprintf(ptr str)
+@ varargs fprintf_s(ptr str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fputws(wstr ptr)
+@ cdecl fread(ptr long long ptr)
+@ cdecl fread_s(ptr long long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
-@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
+@ cdecl freopen(str str ptr)
+@ cdecl freopen_s(ptr str str ptr)
 @ cdecl frexp(double ptr)
 @ varargs fscanf(ptr str)
 @ varargs fscanf_s(ptr str)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
-@ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ varargs fwprintf(ptr wstr)
+@ varargs fwprintf_s(ptr wstr)
+@ cdecl fwrite(ptr long long ptr)
 @ varargs fwscanf(ptr wstr)
 @ varargs fwscanf_s(ptr wstr)
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
 @ cdecl getenv_s(ptr ptr long str)
-@ cdecl gets(str) MSVCRT_gets
-@ cdecl gets_s(ptr long) MSVCRT_gets_s
-@ cdecl getwc(ptr) MSVCRT_getwc
-@ cdecl getwchar() MSVCRT_getwchar
+@ cdecl gets(str)
+@ cdecl gets_s(ptr long)
+@ cdecl getwc(ptr)
+@ cdecl getwchar()
 @ cdecl is_wctype(long long) iswctype
 @ cdecl isalnum(long)
 @ cdecl isalpha(long)
@@ -2119,28 +2119,28 @@
 @ cdecl perror(str)
 @ cdecl pow(double double)
 @ cdecl -arch=!i386 powf(float float)
-@ varargs printf(str) MSVCRT_printf
-@ varargs printf_s(str) MSVCRT_printf_s
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
-@ cdecl putwc(long ptr) MSVCRT_fputwc
-@ cdecl putwchar(long) MSVCRT__fputwchar
+@ varargs printf(str)
+@ varargs printf_s(str)
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
+@ cdecl putwc(long ptr) fputwc
+@ cdecl putwchar(long) _fputwchar
 @ cdecl qsort(ptr long long ptr)
 @ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
 @ cdecl rand()
 @ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
-@ cdecl remove(str) MSVCRT_remove
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl remove(str)
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ varargs scanf(str)
 @ varargs scanf_s(str)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl -arch=!i386 sinf(float)
@@ -2189,27 +2189,27 @@
 @ cdecl -arch=!i386 tanf(float)
 @ cdecl tanh(double)
 @ cdecl -arch=!i386 tanhf(float)
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
+@ cdecl tmpfile()
+@ cdecl tmpfile_s(ptr)
+@ cdecl tmpnam(ptr)
+@ cdecl tmpnam_s(ptr long)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towlower(long)
 @ cdecl towupper(long)
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
-@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
-@ cdecl vfprintf_s(ptr str ptr) MSVCRT_vfprintf_s
-@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
-@ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s
-@ cdecl vprintf(str ptr) MSVCRT_vprintf
-@ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
+@ cdecl vfprintf(ptr str ptr)
+@ cdecl vfprintf_s(ptr str ptr)
+@ cdecl vfwprintf(ptr wstr ptr)
+@ cdecl vfwprintf_s(ptr wstr ptr)
+@ cdecl vprintf(str ptr)
+@ cdecl vprintf_s(str ptr)
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl vsprintf_s(ptr long str ptr)
 @ cdecl vswprintf_s(ptr long wstr ptr)
-@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
-@ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s
+@ cdecl vwprintf(wstr ptr)
+@ cdecl vwprintf_s(wstr ptr)
 @ cdecl wcrtomb(ptr long ptr)
 @ cdecl wcrtomb_s(ptr ptr long long ptr)
 @ cdecl wcscat(wstr wstr)
@@ -2247,7 +2247,7 @@
 @ cdecl wctomb_s(ptr ptr long long)
 @ cdecl wmemcpy_s(ptr long ptr long)
 @ cdecl wmemmove_s(ptr long ptr long)
-@ varargs wprintf(wstr) MSVCRT_wprintf
-@ varargs wprintf_s(wstr) MSVCRT_wprintf_s
+@ varargs wprintf(wstr)
+@ varargs wprintf_s(wstr)
 @ varargs wscanf(wstr)
 @ varargs wscanf_s(wstr)
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index eba6c6c2969..e4468d8a53d 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -697,8 +697,8 @@
 @ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ thiscall -arch=i386 ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
-@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) MSVCRT__open
-@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) MSVCRT__open
+@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) _open
+@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) _open
 @ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
 @ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
 @ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
@@ -711,15 +711,15 @@
 @ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
-@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) MSVCRT__sopen
-@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) MSVCRT__sopen
+@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) _sopen
+@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) _sopen
 @ stub -arch=arm ?_type_info_dtor_internal_method@type_info@@QAAXXZ
 @ stub -arch=i386 ?_type_info_dtor_internal_method@type_info@@QAEXXZ  # public: void __thiscall type_info::_type_info_dtor_internal_method(void)
 @ stub -arch=win64 ?_type_info_dtor_internal_method@type_info@@QEAAXXZ  # public: void __cdecl type_info::_type_info_dtor_internal_method(void) __ptr64
-@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) MSVCRT__wopen
-@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) MSVCRT__wopen
-@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) MSVCRT__wsopen
-@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) MSVCRT__wsopen
+@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) _wopen
+@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) _wopen
+@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) _wsopen
+@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) _wsopen
 @ cdecl -arch=arm ?before@type_info@@QBA_NABV1@@Z(ptr ptr) type_info_before
 @ thiscall -arch=i386 ?before@type_info@@QBE_NABV1@@Z(ptr ptr) type_info_before
 @ cdecl -arch=win64 ?before@type_info@@QEBA_NAEBV1@@Z(ptr ptr) type_info_before
@@ -1016,8 +1016,8 @@
 @ extern __winitenv MSVCRT___winitenv
 @ cdecl _abnormal_termination()
 @ cdecl -ret64 _abs64(int64)
-@ cdecl _access(str long) MSVCRT__access
-@ cdecl _access_s(str long) MSVCRT__access_s
+@ cdecl _access(str long)
+@ cdecl _access_s(str long)
 @ extern _acmdln MSVCRT__acmdln
 @ cdecl _aligned_free(ptr)
 @ cdecl _aligned_malloc(long long)
@@ -1061,12 +1061,12 @@
 @ cdecl _chgsign(double)
 @ cdecl _chgsignf(float)
 @ cdecl -arch=i386 -norelay _chkesp()
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
-@ cdecl _chsize_s(long int64) MSVCRT__chsize_s
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
+@ cdecl _chsize_s(long int64)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ extern _commode MSVCRT__commode
 @ cdecl _configthreadlocale(long)
 @ cdecl _control87(long long)
@@ -1082,7 +1082,7 @@
 @ stub _cprintf_s_l
 @ cdecl _cputs(str)
 @ cdecl _cputws(wstr)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ cdecl _create_locale(long str)
 @ cdecl -arch=i386 _crt_debugger_hook(long)
 @ cdecl -arch=arm,win64 __crt_debugger_hook(long) _crt_debugger_hook
@@ -1114,15 +1114,15 @@
 @ cdecl _dsign(double)
 @ extern _dstbias MSVCRT__dstbias
 @ cdecl _dtest(ptr)
-@ cdecl _dup(long) MSVCRT__dup
-@ cdecl _dup2(long long) MSVCRT__dup2
+@ cdecl _dup(long)
+@ cdecl _dup2(long long)
 @ cdecl _dupenv_s(ptr ptr str)
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _ecvt_s(str long double long ptr ptr)
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
 @ extern _environ MSVCRT__environ
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl _except1(long long double double long ptr)
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@@ -1138,24 +1138,24 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
-@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fclose_nolock(ptr)
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
 @ cdecl _fcvt_s(ptr long double long ptr ptr)
 @ cdecl _fdclass(float)
-@ cdecl _fdopen(long str) MSVCRT__fdopen
+@ cdecl _fdopen(long str)
 @ cdecl _fdpcomp(float float)
 @ cdecl _fdsign(float)
 @ cdecl _fdtest(ptr)
-@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock
-@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filbuf(ptr) MSVCRT__filbuf
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _fflush_nolock(ptr)
+@ cdecl _fgetc_nolock(ptr)
+@ cdecl _fgetchar()
+@ cdecl _fgetwc_nolock(ptr)
+@ cdecl _fgetwchar()
+@ cdecl _filbuf(ptr)
+@ cdecl _filelength(long)
+@ cdecl -ret64 _filelengthi64(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst32(str ptr)
 @ stub _findfirst32i64
@@ -1167,8 +1167,8 @@
 @ cdecl _findnext64i32(long ptr)
 @ cdecl _finite(double)
 @ cdecl -arch=!i386 _finitef(float)
-@ cdecl _flsbuf(long ptr) MSVCRT__flsbuf
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flsbuf(long ptr)
+@ cdecl _flushall()
 @ extern _fmode MSVCRT__fmode
 @ cdecl _fpclass(double)
 @ cdecl -arch=!i386 _fpclassf(float)
@@ -1178,29 +1178,29 @@
 @ stub _fprintf_p
 @ stub _fprintf_p_l
 @ stub _fprintf_s_l
-@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
-@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
-@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
+@ cdecl _fputc_nolock(long ptr)
+@ cdecl _fputchar(long)
+@ cdecl _fputwc_nolock(long ptr)
+@ cdecl _fputwchar(long)
+@ cdecl _fread_nolock(ptr long long ptr)
+@ cdecl _fread_nolock_s(ptr long long long ptr)
 @ cdecl _free_locale(ptr)
 @ stub _freea
 @ stub _freea_s
 @ stub _freefls
 @ varargs _fscanf_l(ptr str ptr)
 @ varargs _fscanf_s_l(ptr str ptr)
-@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
-@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
-@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat32(long ptr) MSVCRT__fstat32
-@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64
-@ cdecl _fstat64(long ptr) MSVCRT__fstat64
-@ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32
-@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock
-@ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64
-@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock
+@ cdecl _fseek_nolock(ptr long long)
+@ cdecl _fseeki64(ptr int64 long)
+@ cdecl _fseeki64_nolock(ptr int64 long)
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat32(long ptr)
+@ cdecl _fstat32i64(long ptr)
+@ cdecl _fstat64(long ptr)
+@ cdecl _fstat64i32(long ptr)
+@ cdecl _ftell_nolock(ptr)
+@ cdecl -ret64 _ftelli64(ptr)
+@ cdecl -ret64 _ftelli64_nolock(ptr)
 @ cdecl _ftime32(ptr)
 @ cdecl _ftime32_s(ptr)
 @ cdecl _ftime64(ptr)
@@ -1209,11 +1209,11 @@
 @ cdecl _fullpath(ptr str long)
 @ cdecl _futime32(long ptr)
 @ cdecl _futime64(long ptr)
-@ varargs _fwprintf_l(ptr wstr ptr) MSVCRT__fwprintf_l
+@ varargs _fwprintf_l(ptr wstr ptr)
 @ stub _fwprintf_p
 @ stub _fwprintf_p_l
 @ stub _fwprintf_s_l
-@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock
+@ cdecl _fwrite_nolock(ptr long long ptr)
 @ varargs _fwscanf_l(ptr wstr ptr)
 @ varargs _fwscanf_s_l(ptr wstr ptr)
 @ cdecl _gcvt(double long str)
@@ -1226,7 +1226,7 @@
 @ cdecl _get_fmode(ptr)
 @ cdecl _get_heap_handle()
 @ cdecl _get_invalid_parameter_handler()
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _get_output_format()
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output()
@@ -1236,7 +1236,7 @@
 @ cdecl _get_tzname(ptr str long long)
 @ cdecl _get_unexpected()
 @ cdecl _get_wpgmptr(ptr)
-@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock
+@ cdecl _getc_nolock(ptr) _fgetc_nolock
 @ cdecl _getch()
 @ cdecl _getch_nolock()
 @ cdecl _getche()
@@ -1247,18 +1247,18 @@
 @ cdecl _getdllprocaddr(long str long)
 @ cdecl _getdrive()
 @ cdecl _getdrives() kernel32.GetLogicalDrives
-@ cdecl _getmaxstdio() MSVCRT__getmaxstdio
+@ cdecl _getmaxstdio()
 @ cdecl _getmbcp()
 @ cdecl _getpid() _getpid
 @ cdecl _getptd()
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
-@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock
+@ cdecl _getw(ptr)
+@ cdecl _getwc_nolock(ptr) _fgetwc_nolock
 @ cdecl _getwch()
 @ cdecl _getwch_nolock()
 @ cdecl _getwche()
 @ cdecl _getwche_nolock()
-@ cdecl _getws(ptr) MSVCRT__getws
+@ cdecl _getws(ptr)
 @ stub _getws_s
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _gmtime32(ptr)
@@ -1290,7 +1290,7 @@
 @ extern _iob MSVCRT__iob
 @ cdecl _isalnum_l(long ptr)
 @ cdecl _isalpha_l(long ptr)
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _isblank_l(long ptr)
 @ cdecl _iscntrl_l(long ptr)
 @ cdecl _isctype(long long)
@@ -1417,8 +1417,8 @@
 @ cdecl _localtime64(ptr)
 @ cdecl _localtime64_s(ptr ptr)
 @ cdecl _lock(long)
-@ cdecl _lock_file(ptr) MSVCRT__lock_file
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _lock_file(ptr)
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl -arch=!i386 _logbf(float)
 @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp
@@ -1426,8 +1426,8 @@
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
 @ stub _lsearch_s
-@ cdecl _lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _lseek(long long long)
+@ cdecl -ret64 _lseeki64(long int64 long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltoa_s(long ptr long long)
 @ cdecl _ltow(long ptr long) ntdll._ltow
@@ -1577,47 +1577,47 @@
 @ cdecl _mkdir(str)
 @ cdecl _mkgmtime32(ptr)
 @ cdecl _mkgmtime64(ptr)
-@ cdecl _mktemp(str) MSVCRT__mktemp
-@ cdecl _mktemp_s(str long) MSVCRT__mktemp_s
+@ cdecl _mktemp(str)
+@ cdecl _mktemp_s(str long)
 @ cdecl _mktime32(ptr)
 @ cdecl _mktime64(ptr)
 @ cdecl _msize(ptr)
 @ cdecl _nextafter(double double)
 @ cdecl -arch=x86_64 _nextafterf(float float)
 @ cdecl _onexit(ptr)
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ stub -arch=i386 _outp(long long)
 @ stub -arch=i386 _outpd(long long)
 @ stub -arch=i386 _outpw(long long)
 @ cdecl _pclose(ptr)
 @ extern _pctype MSVCRT__pctype
 @ extern _pgmptr MSVCRT__pgmptr
-@ cdecl _pipe(ptr long long) MSVCRT__pipe
+@ cdecl _pipe(ptr long long)
 @ cdecl _popen(str str)
 @ stub _printf_l
 @ stub _printf_p
 @ stub _printf_p_l
 @ stub _printf_s_l
 @ cdecl _purecall()
-@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock
+@ cdecl _putc_nolock(long ptr) _fputc_nolock
 @ cdecl _putch(long)
 @ cdecl _putch_nolock(long)
 @ cdecl _putenv(str)
 @ cdecl _putenv_s(str str)
-@ cdecl _putw(long ptr) MSVCRT__putw
-@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
+@ cdecl _putw(long ptr)
+@ cdecl _putwc_nolock(long ptr) _fputwc_nolock
 @ cdecl _putwch(long)
 @ cdecl _putwch_nolock(long)
-@ cdecl _putws(wstr) MSVCRT__putws
+@ cdecl _putws(wstr)
 @ extern _pwctype MSVCRT__pwctype
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 @ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw()
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl -ret64 _rotl64(int64 long)
 @ cdecl _rotr(long long)
@@ -1655,9 +1655,9 @@
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
 @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
 @ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex
-@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio
+@ cdecl _setmaxstdio(long)
 @ cdecl _setmbcp(long)
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str)
@@ -1678,8 +1678,8 @@
 @ varargs _snwscanf_l(wstr long wstr ptr)
 @ varargs _snwscanf_s(wstr long wstr)
 @ varargs _snwscanf_s_l(wstr long wstr ptr)
-@ varargs _sopen(str long long) MSVCRT__sopen
-@ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s
+@ varargs _sopen(str long long)
+@ cdecl _sopen_s(ptr str long long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -1696,10 +1696,10 @@
 @ varargs _sprintf_s_l(ptr long str ptr)
 @ varargs _sscanf_l(str str ptr)
 @ varargs _sscanf_s_l(str str ptr)
-@ cdecl _stat32(str ptr) MSVCRT__stat32
-@ cdecl _stat32i64(str ptr) MSVCRT__stat32i64
-@ cdecl _stat64(str ptr) MSVCRT_stat64
-@ cdecl _stat64i32(str ptr) MSVCRT__stat64i32
+@ cdecl _stat32(str ptr)
+@ cdecl _stat32i64(str ptr)
+@ cdecl _stat64(str ptr)
+@ cdecl _stat64i32(str ptr)
 @ cdecl _statusfp()
 @ cdecl -arch=i386 _statusfp2(ptr ptr)
 @ cdecl _strcoll_l(str str ptr)
@@ -1759,9 +1759,9 @@
 @ varargs _swscanf_s_l(wstr wstr ptr)
 @ extern _sys_errlist MSVCRT__sys_errlist
 @ extern _sys_nerr MSVCRT__sys_nerr
-@ cdecl _tell(long) MSVCRT__tell
+@ cdecl _tell(long)
 @ cdecl -ret64 _telli64(long)
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tempnam(str str)
 @ cdecl _time32(ptr)
 @ cdecl _time64(ptr)
 @ extern _timezone MSVCRT___timezone
@@ -1781,18 +1781,18 @@
 @ cdecl _ultoa_s(long ptr long long)
 @ cdecl _ultow(long ptr long) ntdll._ultow
 @ cdecl _ultow_s(long ptr long long)
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 @ stub _umask_s
-@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock
+@ cdecl _ungetc_nolock(long ptr)
 @ cdecl _ungetch(long)
 @ cdecl _ungetch_nolock(long)
-@ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock
+@ cdecl _ungetwc_nolock(long ptr)
 @ cdecl _ungetwch(long)
 @ cdecl _ungetwch_nolock(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
 @ cdecl _unlock(long)
-@ cdecl _unlock_file(ptr) MSVCRT__unlock_file
+@ cdecl _unlock_file(ptr)
 @ cdecl _utime32(str ptr)
 @ cdecl _utime64(str ptr)
 @ cdecl _vacopy(ptr ptr)
@@ -1808,14 +1808,14 @@
 @ stub _vcwprintf_p_l
 @ stub _vcwprintf_s
 @ stub _vcwprintf_s_l
-@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
-@ cdecl _vfprintf_p(ptr str ptr) MSVCRT__vfprintf_p
-@ cdecl _vfprintf_p_l(ptr str ptr ptr) MSVCRT__vfprintf_p_l
-@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
-@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
-@ cdecl _vfwprintf_p(ptr wstr ptr) MSVCRT__vfwprintf_p
-@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_p_l
-@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
+@ cdecl _vfprintf_l(ptr str ptr ptr)
+@ cdecl _vfprintf_p(ptr str ptr)
+@ cdecl _vfprintf_p_l(ptr str ptr ptr)
+@ cdecl _vfprintf_s_l(ptr str ptr ptr)
+@ cdecl _vfwprintf_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_p(ptr wstr ptr)
+@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr)
 @ stub _vprintf_l
 @ stub _vprintf_p
 @ stub _vprintf_p_l
@@ -1853,15 +1853,15 @@
 @ stub _vwprintf_p
 @ stub _vwprintf_p_l
 @ stub _vwprintf_s_l
-@ cdecl _waccess(wstr long) MSVCRT__waccess
-@ cdecl _waccess_s(wstr long) MSVCRT__waccess_s
+@ cdecl _waccess(wstr long)
+@ cdecl _waccess_s(wstr long)
 @ cdecl _wasctime(ptr)
 @ cdecl _wasctime_s(ptr long ptr)
 @ cdecl _wassert(wstr wstr long)
 @ cdecl _wchdir(wstr)
-@ cdecl _wchmod(wstr long) MSVCRT__wchmod
+@ cdecl _wchmod(wstr long)
 @ extern _wcmdln MSVCRT__wcmdln
-@ cdecl _wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _wcreat(wstr long)
 @ cdecl _wcreate_locale(long wstr)
 @ cdecl _wcscoll_l(wstr wstr ptr)
 @ cdecl _wcsdup(wstr)
@@ -1924,7 +1924,7 @@
 @ cdecl _wexecve(wstr ptr ptr)
 @ cdecl _wexecvp(wstr ptr)
 @ cdecl _wexecvpe(wstr ptr ptr)
-@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _wfdopen(long wstr)
 @ cdecl _wfindfirst32(wstr ptr)
 @ stub _wfindfirst32i64
 @ cdecl _wfindfirst64(wstr ptr)
@@ -1933,11 +1933,11 @@
 @ stub _wfindnext32i64
 @ cdecl _wfindnext64(long ptr)
 @ cdecl _wfindnext64i32(long ptr)
-@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s
-@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s
-@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _wfopen(wstr wstr)
+@ cdecl _wfopen_s(ptr wstr wstr)
+@ cdecl _wfreopen(wstr wstr ptr)
+@ cdecl _wfreopen_s(ptr wstr wstr ptr)
+@ cdecl _wfsopen(wstr wstr long)
 @ cdecl _wfullpath(ptr wstr long)
 @ cdecl _wgetcwd(wstr long)
 @ cdecl _wgetdcwd(long wstr long)
@@ -1946,9 +1946,9 @@
 @ cdecl _wmakepath(ptr wstr wstr wstr wstr)
 @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr)
 @ cdecl _wmkdir(wstr)
-@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
-@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
-@ varargs _wopen(wstr long) MSVCRT__wopen
+@ cdecl _wmktemp(wstr)
+@ cdecl _wmktemp_s(wstr long)
+@ varargs _wopen(wstr long)
 @ cdecl _wperror(wstr)
 @ extern _wpgmptr MSVCRT__wpgmptr
 @ cdecl _wpopen(wstr wstr)
@@ -1958,17 +1958,17 @@
 @ stub _wprintf_s_l
 @ cdecl _wputenv(wstr)
 @ cdecl _wputenv_s(wstr wstr)
-@ cdecl _wremove(wstr) MSVCRT__wremove
-@ cdecl _wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _wremove(wstr)
+@ cdecl _wrename(wstr wstr)
+@ cdecl _write(long ptr long)
 @ cdecl _wrmdir(wstr)
 @ varargs _wscanf_l(wstr ptr)
 @ varargs _wscanf_s_l(wstr ptr)
 @ cdecl _wsearchenv(wstr wstr ptr)
 @ cdecl _wsearchenv_s(wstr wstr ptr long)
 @ cdecl _wsetlocale(long wstr)
-@ varargs _wsopen(wstr long long) MSVCRT__wsopen
-@ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s
+@ varargs _wsopen(wstr long long)
+@ cdecl _wsopen_s(ptr wstr long long long)
 @ varargs _wspawnl(long wstr wstr)
 @ varargs _wspawnle(long wstr wstr)
 @ varargs _wspawnlp(long wstr wstr)
@@ -1979,18 +1979,18 @@
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
 @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long)
-@ cdecl _wstat32(wstr ptr) MSVCRT__wstat32
-@ cdecl _wstat32i64(wstr ptr) MSVCRT__wstat32i64
-@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64
-@ cdecl _wstat64i32(wstr ptr) MSVCRT__wstat64i32
+@ cdecl _wstat32(wstr ptr)
+@ cdecl _wstat32i64(wstr ptr)
+@ cdecl _wstat64(wstr ptr)
+@ cdecl _wstat64i32(wstr ptr)
 @ cdecl _wstrdate(ptr)
 @ cdecl _wstrdate_s(ptr long)
 @ cdecl _wstrtime(ptr)
 @ cdecl _wstrtime_s(ptr long)
 @ cdecl _wsystem(wstr)
-@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
-@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
-@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s
+@ cdecl _wtempnam(wstr wstr)
+@ cdecl _wtmpnam(ptr)
+@ cdecl _wtmpnam_s(ptr long)
 @ cdecl _wtof(wstr)
 @ cdecl _wtof_l(wstr ptr)
 @ cdecl _wtoi(wstr)
@@ -2001,7 +2001,7 @@
 @ cdecl _wtol_l(wstr ptr)
 @ cdecl -ret64 _wtoll(wstr)
 @ cdecl -ret64 _wtoll_l(wstr ptr)
-@ cdecl _wunlink(wstr) MSVCRT__wunlink
+@ cdecl _wunlink(wstr)
 @ cdecl _wutime32(wstr ptr)
 @ cdecl _wutime64(wstr ptr)
 @ cdecl _y0(double)
@@ -2078,8 +2078,8 @@
 @ stub cimag
 @ stub cimagf
 @ stub cimagl
-@ cdecl clearerr(ptr) MSVCRT_clearerr
-@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s
+@ cdecl clearerr(ptr)
+@ cdecl clearerr_s(ptr)
 @ cdecl clock()
 @ stub clog
 @ stub clog10
@@ -2139,7 +2139,7 @@
 @ cdecl expm1l(double) MSVCR120_expm1l
 @ cdecl fabs(double)
 @ cdecl -arch=!i386 fabsf(float)
-@ cdecl fclose(ptr) MSVCRT_fclose
+@ cdecl fclose(ptr)
 @ cdecl fdim(double double)
 @ cdecl fdimf(float float)
 @ cdecl fdiml(double double) fdim
@@ -2148,20 +2148,20 @@
 @ stub fegetexceptflag
 @ cdecl fegetround()
 @ stub feholdexcept
-@ cdecl feof(ptr) MSVCRT_feof
+@ cdecl feof(ptr)
 @ stub feraiseexcept
-@ cdecl ferror(ptr) MSVCRT_ferror
+@ cdecl ferror(ptr)
 @ cdecl fesetenv(ptr)
 @ stub fesetexceptflag
 @ cdecl fesetround(long)
 @ stub fetestexcept
 @ stub feupdateenv
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
+@ cdecl fgetws(ptr long ptr)
 @ cdecl floor(double)
 @ cdecl -arch=!i386 floorf(float)
 @ cdecl fma(double double double)
@@ -2175,38 +2175,38 @@
 @ cdecl fminl(double double) fmin
 @ cdecl fmod(double double)
 @ cdecl -arch=!i386 fmodf(float float)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s
-@ varargs fprintf(ptr str) MSVCRT_fprintf
-@ varargs fprintf_s(ptr str) MSVCRT_fprintf_s
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fputws(wstr ptr) MSVCRT_fputws
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
+@ cdecl fopen(str str)
+@ cdecl fopen_s(ptr str str)
+@ varargs fprintf(ptr str)
+@ varargs fprintf_s(ptr str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fputws(wstr ptr)
+@ cdecl fread(ptr long long ptr)
+@ cdecl fread_s(ptr long long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
-@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
+@ cdecl freopen(str str ptr)
+@ cdecl freopen_s(ptr str str ptr)
 @ cdecl frexp(double ptr)
 @ varargs fscanf(ptr str)
 @ varargs fscanf_s(ptr str)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
-@ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ varargs fwprintf(ptr wstr)
+@ varargs fwprintf_s(ptr wstr)
+@ cdecl fwrite(ptr long long ptr)
 @ varargs fwscanf(ptr wstr)
 @ varargs fwscanf_s(ptr wstr)
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
 @ cdecl getenv_s(ptr ptr long str)
-@ cdecl gets(str) MSVCRT_gets
-@ cdecl gets_s(ptr long) MSVCRT_gets_s
-@ cdecl getwc(ptr) MSVCRT_getwc
-@ cdecl getwchar() MSVCRT_getwchar
+@ cdecl gets(str)
+@ cdecl gets_s(ptr long)
+@ cdecl getwc(ptr)
+@ cdecl getwchar()
 @ cdecl ilogb(double)
 @ cdecl ilogbf(float)
 @ cdecl ilogbl(double) MSVCR120_ilogbl
@@ -2311,13 +2311,13 @@
 @ cdecl perror(str)
 @ cdecl pow(double double)
 @ cdecl -arch=!i386 powf(float float)
-@ varargs printf(str) MSVCRT_printf
-@ varargs printf_s(str) MSVCRT_printf_s
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
-@ cdecl putwc(long ptr) MSVCRT_fputwc
-@ cdecl putwchar(long) MSVCRT__fputwchar
+@ varargs printf(str)
+@ varargs printf_s(str)
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
+@ cdecl putwc(long ptr) fputwc
+@ cdecl putwchar(long) _fputwchar
 @ cdecl qsort(ptr long long ptr)
 @ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
@@ -2327,12 +2327,12 @@
 @ cdecl remainder(double double)
 @ cdecl remainderf(float float)
 @ cdecl remainderl(double double) MSVCR120_remainderl
-@ cdecl remove(str) MSVCRT_remove
+@ cdecl remove(str)
 @ cdecl remquo(double double ptr)
 @ cdecl remquof(float float ptr)
 @ cdecl remquol(double double ptr) MSVCR120_remquol
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ cdecl rint(double)
 @ cdecl rintf(float)
 @ cdecl rintl(double) MSVCR120_rintl
@@ -2347,10 +2347,10 @@
 @ cdecl scalbnl(double long) MSVCR120_scalbnl
 @ varargs scanf(str)
 @ varargs scanf_s(str)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl -arch=!i386 sinf(float)
@@ -2408,10 +2408,10 @@
 @ cdecl tgamma(double)
 @ cdecl tgammaf(float)
 @ cdecl tgammal(double) tgamma
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
+@ cdecl tmpfile()
+@ cdecl tmpfile_s(ptr)
+@ cdecl tmpnam(ptr)
+@ cdecl tmpnam_s(ptr long)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towctrans(long long)
@@ -2420,18 +2420,18 @@
 @ cdecl trunc(double)
 @ cdecl truncf(float)
 @ cdecl truncl(double) MSVCR120_truncl
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
-@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
-@ cdecl vfprintf_s(ptr str ptr) MSVCRT_vfprintf_s
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
+@ cdecl vfprintf(ptr str ptr)
+@ cdecl vfprintf_s(ptr str ptr)
 @ stub vfscanf
 @ stub vfscanf_s
-@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
-@ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s
+@ cdecl vfwprintf(ptr wstr ptr)
+@ cdecl vfwprintf_s(ptr wstr ptr)
 @ stub vfwscanf
 @ stub vfwscanf_s
-@ cdecl vprintf(str ptr) MSVCRT_vprintf
-@ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s
+@ cdecl vprintf(str ptr)
+@ cdecl vprintf_s(str ptr)
 @ stub vscanf
 @ stub vscanf_s
 @ cdecl vsprintf(ptr str ptr)
@@ -2441,8 +2441,8 @@
 @ cdecl vswprintf_s(ptr long wstr ptr)
 @ cdecl vswscanf(ptr wstr ptr)
 @ stub vswscanf_s
-@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
-@ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s
+@ cdecl vwprintf(wstr ptr)
+@ cdecl vwprintf_s(wstr ptr)
 @ stub vwscanf
 @ stub vwscanf_s
 @ cdecl wcrtomb(ptr long ptr)
@@ -2490,7 +2490,7 @@
 @ cdecl wctype(str)
 @ cdecl wmemcpy_s(ptr long ptr long)
 @ cdecl wmemmove_s(ptr long ptr long)
-@ varargs wprintf(wstr) MSVCRT_wprintf
-@ varargs wprintf_s(wstr) MSVCRT_wprintf_s
+@ varargs wprintf(wstr)
+@ varargs wprintf_s(wstr)
 @ varargs wscanf(wstr)
 @ varargs wscanf_s(wstr)
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index 3450ff09ec3..26f02721ede 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -210,7 +210,7 @@
 @ cdecl __wgetmainargs(ptr ptr ptr long ptr)
 @ extern __winitenv MSVCRT___winitenv
 @ cdecl _abnormal_termination()
-@ cdecl _access(str long) MSVCRT__access
+@ cdecl _access(str long)
 @ extern _acmdln MSVCRT__acmdln
 @ stdcall -arch=i386 _adj_fdiv_m16i(long)
 @ stdcall -arch=i386 _adj_fdiv_m32(long)
@@ -250,11 +250,11 @@
 @ cdecl _chdrive(long)
 @ cdecl _chgsign(double)
 @ cdecl -arch=i386 -norelay _chkesp()
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ extern _commode MSVCRT__commode
 @ cdecl _control87(long long)
 @ cdecl _controlfp(long long)
@@ -262,7 +262,7 @@
 @ varargs _cprintf(str)
 @ cdecl _cputs(str)
 @ cdecl _cputws(wstr)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ varargs _cscanf(str)
 @ cdecl _ctime64(ptr)
 @ extern _ctype MSVCRT__ctype
@@ -271,13 +271,13 @@
 @ varargs _cwscanf(wstr)
 @ extern _daylight MSVCRT___daylight
 @ extern _dstbias MSVCRT__dstbias
-@ cdecl _dup(long) MSVCRT__dup
-@ cdecl _dup2(long long) MSVCRT__dup2
+@ cdecl _dup(long)
+@ cdecl _dup2(long long)
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
 @ extern _environ MSVCRT__environ
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@@ -291,16 +291,16 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
-@ cdecl _fdopen(long str) MSVCRT__fdopen
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filbuf(ptr) MSVCRT__filbuf
+@ cdecl _fdopen(long str)
+@ cdecl _fgetchar()
+@ cdecl _fgetwchar()
+@ cdecl _filbuf(ptr)
 # extern _fileinfo
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _filelength(long)
+@ cdecl -ret64 _filelengthi64(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst(str ptr)
 @ cdecl _findfirst64(str ptr)
@@ -309,18 +309,18 @@
 @ cdecl _findnext64(long ptr)
 @ cdecl _findnexti64(long ptr)
 @ cdecl _finite(double)
-@ cdecl _flsbuf(long ptr) MSVCRT__flsbuf
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flsbuf(long ptr)
+@ cdecl _flushall()
 @ extern _fmode MSVCRT__fmode
 @ cdecl _fpclass(double)
 @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr)
 @ cdecl _fpreset()
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat(long ptr) MSVCRT__fstat
-@ cdecl _fstat64(long ptr) MSVCRT__fstat64
-@ cdecl _fstati64(long ptr) MSVCRT__fstati64
+@ cdecl _fputchar(long)
+@ cdecl _fputwchar(long)
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat(long ptr)
+@ cdecl _fstat64(long ptr)
+@ cdecl _fstati64(long ptr)
 @ cdecl -arch=win32 _ftime(ptr) _ftime32
 @ cdecl -arch=win64 _ftime(ptr) _ftime64
 @ cdecl _ftime64(ptr)
@@ -330,7 +330,7 @@
 @ cdecl -arch=win64 _futime(long ptr) _futime64
 @ cdecl _futime64(long ptr)
 @ cdecl _gcvt(double long str)
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _get_sbh_threshold()
 @ cdecl _getch()
 @ cdecl _getche()
@@ -340,14 +340,14 @@
 @ cdecl _getdllprocaddr(long str long)
 @ cdecl _getdrive()
 @ cdecl _getdrives() kernel32.GetLogicalDrives
-@ cdecl _getmaxstdio() MSVCRT__getmaxstdio
+@ cdecl _getmaxstdio()
 @ cdecl _getmbcp()
 @ cdecl _getpid() _getpid
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
+@ cdecl _getw(ptr)
 @ cdecl _getwch()
 @ cdecl _getwche()
-@ cdecl _getws(ptr) MSVCRT__getws
+@ cdecl _getws(ptr)
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _gmtime64(ptr)
 @ cdecl _heapadd(ptr long)
@@ -364,7 +364,7 @@
 @ stub -arch=i386 _inpd(long)
 @ stub -arch=i386 _inpw(long)
 @ extern _iob MSVCRT__iob
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _isctype(long long)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalpha(long)
@@ -407,14 +407,14 @@
 @ cdecl -arch=i386 _local_unwind2(ptr long)
 @ cdecl _localtime64(ptr)
 @ cdecl _lock(long)
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp
 @ cdecl _lrotl(long long)
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
-@ cdecl _lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _lseek(long long long)
+@ cdecl -ret64 _lseeki64(long int64 long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltow(long ptr long) ntdll._ltow
 @ cdecl _makepath(ptr str str str str)
@@ -476,13 +476,13 @@
 @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy
 @ cdecl _memicmp(str str long)
 @ cdecl _mkdir(str)
-@ cdecl _mktemp(str) MSVCRT__mktemp
+@ cdecl _mktemp(str)
 @ cdecl _mktime64(ptr)
 @ cdecl _msize(ptr)
 @ cdecl _nextafter(double double)
 @ cdecl _onexit(ptr)
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ extern _osplatform MSVCRT__osplatform
 @ extern _osver MSVCRT__osver
 @ stub -arch=i386 _outp(long long)
@@ -491,19 +491,19 @@
 @ cdecl _pclose(ptr)
 @ extern _pctype MSVCRT__pctype
 @ extern _pgmptr MSVCRT__pgmptr
-@ cdecl _pipe(ptr long long) MSVCRT__pipe
+@ cdecl _pipe(ptr long long)
 @ cdecl _popen(str str)
 @ cdecl _purecall()
 @ cdecl _putch(long)
 @ cdecl _putenv(str)
-@ cdecl _putw(long ptr) MSVCRT__putw
+@ cdecl _putw(long ptr)
 @ cdecl _putwch(long)
-@ cdecl _putws(wstr) MSVCRT__putws
+@ cdecl _putws(wstr)
 @ extern _pwctype MSVCRT__pwctype
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 @ cdecl _resetstkoflw()
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl _rotr(long long)
 @ cdecl -arch=i386 _safe_fdiv()
@@ -522,16 +522,16 @@
 @ cdecl _seterrormode(long)
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
 @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
-@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio
+@ cdecl _setmaxstdio(long)
 @ cdecl _setmbcp(long)
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str)
 @ varargs _snscanf(str long str)
 @ varargs _snwprintf(ptr long wstr)
 @ varargs _snwscanf(wstr long wstr)
-@ varargs _sopen(str long long) MSVCRT__sopen
+@ varargs _sopen(str long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -541,9 +541,9 @@
 @ cdecl _spawnvp(long str ptr)
 @ cdecl _spawnvpe(long str ptr ptr)
 @ cdecl _splitpath(str ptr ptr ptr ptr)
-@ cdecl _stat(str ptr) MSVCRT_stat
-@ cdecl _stat64(str ptr) MSVCRT_stat64
-@ cdecl _stati64(str ptr) MSVCRT_stati64
+@ cdecl _stat(str ptr)
+@ cdecl _stat64(str ptr)
+@ cdecl _stati64(str ptr)
 @ cdecl _statusfp()
 @ cdecl _strcmpi(str str) _stricmp
 @ cdecl _strdate(ptr)
@@ -565,9 +565,9 @@
 @ cdecl _swab(str str long)
 @ extern _sys_errlist MSVCRT__sys_errlist
 @ extern _sys_nerr MSVCRT__sys_nerr
-@ cdecl _tell(long) MSVCRT__tell
+@ cdecl _tell(long)
 @ cdecl -ret64 _telli64(long)
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tempnam(str str)
 @ cdecl _time64(ptr)
 @ extern _timezone MSVCRT___timezone
 @ cdecl _tolower(long)
@@ -578,10 +578,10 @@
 @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow
 @ cdecl _ultoa(long ptr long) ntdll._ultoa
 @ cdecl _ultow(long ptr long) ntdll._ultow
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 @ cdecl _ungetch(long)
 @ cdecl _ungetwch(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
 @ cdecl _unlock(long)
 @ cdecl -arch=win32 _utime(str ptr) _utime32
@@ -591,12 +591,12 @@
 @ cdecl _vscwprintf(wstr ptr)
 @ cdecl -norelay _vsnprintf(ptr long str ptr)
 @ cdecl _vsnwprintf(ptr long wstr ptr)
-@ cdecl _waccess(wstr long) MSVCRT__waccess
+@ cdecl _waccess(wstr long)
 @ cdecl _wasctime(ptr)
 @ cdecl _wchdir(wstr)
-@ cdecl _wchmod(wstr long) MSVCRT__wchmod
+@ cdecl _wchmod(wstr long)
 @ extern _wcmdln MSVCRT__wcmdln
-@ cdecl _wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _wcreat(wstr long)
 @ cdecl _wcsdup(wstr)
 @ cdecl _wcserror(long)
 @ cdecl _wcsicmp(wstr wstr)
@@ -624,16 +624,16 @@
 @ cdecl _wexecve(wstr ptr ptr)
 @ cdecl _wexecvp(wstr ptr)
 @ cdecl _wexecvpe(wstr ptr ptr)
-@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _wfdopen(long wstr)
 @ cdecl _wfindfirst(wstr ptr)
 @ cdecl _wfindfirst64(wstr ptr)
 @ cdecl _wfindfirsti64(wstr ptr)
 @ cdecl _wfindnext(long ptr)
 @ cdecl _wfindnext64(long ptr)
 @ cdecl _wfindnexti64(long ptr)
-@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _wfopen(wstr wstr)
+@ cdecl _wfreopen(wstr wstr ptr)
+@ cdecl _wfsopen(wstr wstr long)
 @ cdecl _wfullpath(ptr wstr long)
 @ cdecl _wgetcwd(wstr long)
 @ cdecl _wgetdcwd(long wstr long)
@@ -643,19 +643,19 @@
 @ extern _winver MSVCRT__winver
 @ cdecl _wmakepath(ptr wstr wstr wstr wstr)
 @ cdecl _wmkdir(wstr)
-@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
-@ varargs _wopen(wstr long) MSVCRT__wopen
+@ cdecl _wmktemp(wstr)
+@ varargs _wopen(wstr long)
 @ cdecl _wperror(wstr)
 @ extern _wpgmptr MSVCRT__wpgmptr
 @ cdecl _wpopen(wstr wstr)
 @ cdecl _wputenv(wstr)
-@ cdecl _wremove(wstr) MSVCRT__wremove
-@ cdecl _wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _wremove(wstr)
+@ cdecl _wrename(wstr wstr)
+@ cdecl _write(long ptr long)
 @ cdecl _wrmdir(wstr)
 @ cdecl _wsearchenv(wstr wstr ptr)
 @ cdecl _wsetlocale(long wstr)
-@ varargs _wsopen(wstr long long) MSVCRT__wsopen
+@ varargs _wsopen(wstr long long)
 @ varargs _wspawnl(long wstr wstr)
 @ varargs _wspawnle(long wstr wstr)
 @ varargs _wspawnlp(long wstr wstr)
@@ -665,19 +665,19 @@
 @ cdecl _wspawnvp(long wstr ptr)
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
-@ cdecl _wstat(wstr ptr) MSVCRT__wstat
-@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64
-@ cdecl _wstati64(wstr ptr) MSVCRT__wstati64
+@ cdecl _wstat(str ptr)
+@ cdecl _wstat64(wstr ptr)
+@ cdecl _wstati64(wstr ptr)
 @ cdecl _wstrdate(ptr)
 @ cdecl _wstrtime(ptr)
 @ cdecl _wsystem(wstr)
-@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
-@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
+@ cdecl _wtempnam(wstr wstr)
+@ cdecl _wtmpnam(ptr)
 @ cdecl _wtof(wstr)
 @ cdecl _wtoi(wstr)
 @ cdecl -ret64 _wtoi64(wstr)
 @ cdecl _wtol(wstr)
-@ cdecl _wunlink(wstr) MSVCRT__wunlink
+@ cdecl _wunlink(wstr)
 @ cdecl -arch=win32 _wutime(wstr ptr) _wutime32
 @ cdecl -arch=win64 _wutime(wstr ptr) _wutime64
 @ cdecl _wutime64(wstr ptr)
@@ -698,7 +698,7 @@
 @ cdecl bsearch(ptr ptr long long ptr)
 @ cdecl calloc(long long)
 @ cdecl ceil(double)
-@ cdecl clearerr(ptr) MSVCRT_clearerr
+@ cdecl clearerr(ptr)
 @ cdecl clock()
 @ cdecl cos(double)
 @ cdecl cosh(double)
@@ -710,40 +710,40 @@
 @ cdecl exit(long)
 @ cdecl exp(double)
 @ cdecl fabs(double)
-@ cdecl fclose(ptr) MSVCRT_fclose
-@ cdecl feof(ptr) MSVCRT_feof
-@ cdecl ferror(ptr) MSVCRT_ferror
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl fclose(ptr)
+@ cdecl feof(ptr)
+@ cdecl ferror(ptr)
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
+@ cdecl fgetws(ptr long ptr)
 @ cdecl floor(double)
 @ cdecl fmod(double double)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ varargs fprintf(ptr str) MSVCRT_fprintf
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fputws(wstr ptr) MSVCRT_fputws
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
+@ cdecl fopen(str str)
+@ varargs fprintf(ptr str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fputws(wstr ptr)
+@ cdecl fread(ptr long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
+@ cdecl freopen(str str ptr)
 @ cdecl frexp(double ptr)
 @ varargs fscanf(ptr str)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ varargs fwprintf(ptr wstr)
+@ cdecl fwrite(ptr long long ptr)
 @ varargs fwscanf(ptr wstr)
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
-@ cdecl gets(str) MSVCRT_gets
-@ cdecl getwc(ptr) MSVCRT_getwc
-@ cdecl getwchar() MSVCRT_getwchar
+@ cdecl gets(str)
+@ cdecl getwc(ptr)
+@ cdecl getwchar()
 @ cdecl -arch=win32 gmtime(ptr) _gmtime32
 @ cdecl -arch=win64 gmtime(ptr) _gmtime64
 @ cdecl is_wctype(long long) iswctype
@@ -795,23 +795,23 @@
 @ cdecl modf(double ptr)
 @ cdecl perror(str)
 @ cdecl pow(double double)
-@ varargs printf(str) MSVCRT_printf
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
-@ cdecl putwc(long ptr) MSVCRT_fputwc
-@ cdecl putwchar(long) MSVCRT__fputwchar
+@ varargs printf(str)
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
+@ cdecl putwc(long ptr) fputwc
+@ cdecl putwchar(long) _fputwchar
 @ cdecl qsort(ptr long long ptr)
 @ cdecl raise(long)
 @ cdecl rand()
 @ cdecl realloc(ptr long)
-@ cdecl remove(str) MSVCRT_remove
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl remove(str)
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ varargs scanf(str)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl sinh(double)
@@ -847,20 +847,20 @@
 @ cdecl tanh(double)
 @ cdecl -arch=win32 time(ptr) _time32
 @ cdecl -arch=win64 time(ptr) _time64
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
+@ cdecl tmpfile()
+@ cdecl tmpnam(ptr)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towlower(long)
 @ cdecl towupper(long)
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
-@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
-@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
-@ cdecl vprintf(str ptr) MSVCRT_vprintf
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
+@ cdecl vfprintf(ptr str ptr)
+@ cdecl vfwprintf(ptr wstr ptr)
+@ cdecl vprintf(str ptr)
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl vswprintf(ptr wstr ptr) _vswprintf
-@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
+@ cdecl vwprintf(wstr ptr)
 @ cdecl wcscat(wstr wstr)
 @ cdecl wcschr(wstr long)
 @ cdecl wcscmp(wstr wstr)
@@ -883,5 +883,5 @@
 @ cdecl wcstoul(wstr ptr long)
 @ cdecl wcsxfrm(ptr wstr long)
 @ cdecl wctomb(ptr long)
-@ varargs wprintf(wstr) MSVCRT_wprintf
+@ varargs wprintf(wstr)
 @ varargs wscanf(wstr)
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index ec15b0f55c6..579fda550f4 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -205,7 +205,7 @@
 @ cdecl __wgetmainargs(ptr ptr ptr long ptr)
 @ extern __winitenv MSVCRT___winitenv
 @ cdecl _abnormal_termination()
-@ cdecl _access(str long) MSVCRT__access
+@ cdecl _access(str long)
 @ extern _acmdln MSVCRT__acmdln
 @ stdcall -arch=i386 _adj_fdiv_m16i(long)
 @ stdcall -arch=i386 _adj_fdiv_m32(long)
@@ -245,11 +245,11 @@
 @ cdecl _chdrive(long)
 @ cdecl _chgsign(double)
 @ cdecl -arch=i386 -norelay _chkesp()
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ extern _commode MSVCRT__commode
 @ cdecl _control87(long long)
 @ cdecl _controlfp(long long)
@@ -257,7 +257,7 @@
 @ varargs _cprintf(str)
 @ cdecl _cputs(str)
 @ cdecl _cputws(wstr)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ varargs _cscanf(str)
 @ cdecl _ctime64(ptr)
 @ cdecl _cwait(ptr long long)
@@ -265,13 +265,13 @@
 @ varargs _cwscanf(wstr)
 @ extern _daylight MSVCRT___daylight
 @ extern _dstbias MSVCRT__dstbias
-@ cdecl _dup(long) MSVCRT__dup
-@ cdecl _dup2(long long) MSVCRT__dup2
+@ cdecl _dup(long)
+@ cdecl _dup2(long long)
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
 @ extern _environ MSVCRT__environ
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@@ -285,16 +285,16 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
-@ cdecl _fdopen(long str) MSVCRT__fdopen
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filbuf(ptr) MSVCRT__filbuf
+@ cdecl _fdopen(long str)
+@ cdecl _fgetchar()
+@ cdecl _fgetwchar()
+@ cdecl _filbuf(ptr)
 # extern _fileinfo
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _filelength(long)
+@ cdecl -ret64 _filelengthi64(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst(str ptr)
 @ cdecl _findfirst64(str ptr)
@@ -303,18 +303,18 @@
 @ cdecl _findnext64(long ptr)
 @ cdecl _findnexti64(long ptr)
 @ cdecl _finite(double)
-@ cdecl _flsbuf(long ptr) MSVCRT__flsbuf
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flsbuf(long ptr)
+@ cdecl _flushall()
 @ extern _fmode MSVCRT__fmode
 @ cdecl _fpclass(double)
 @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr)
 @ cdecl _fpreset()
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat(long ptr) MSVCRT__fstat
-@ cdecl _fstat64(long ptr) MSVCRT__fstat64
-@ cdecl _fstati64(long ptr) MSVCRT__fstati64
+@ cdecl _fputchar(long)
+@ cdecl _fputwchar(long)
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat(long ptr)
+@ cdecl _fstat64(long ptr)
+@ cdecl _fstati64(long ptr)
 @ cdecl -arch=win32 _ftime(ptr) _ftime32
 @ cdecl -arch=win64 _ftime(ptr) _ftime64
 @ cdecl _ftime64(ptr)
@@ -325,7 +325,7 @@
 @ cdecl _futime64(long ptr)
 @ cdecl _gcvt(double long str)
 @ cdecl _get_heap_handle()
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _get_sbh_threshold()
 @ cdecl _getch()
 @ cdecl _getche()
@@ -335,14 +335,14 @@
 @ cdecl _getdllprocaddr(long str long)
 @ cdecl _getdrive()
 @ cdecl _getdrives() kernel32.GetLogicalDrives
-@ cdecl _getmaxstdio() MSVCRT__getmaxstdio
+@ cdecl _getmaxstdio()
 @ cdecl _getmbcp()
 @ cdecl _getpid() _getpid
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
+@ cdecl _getw(ptr)
 @ cdecl _getwch()
 @ cdecl _getwche()
-@ cdecl _getws(ptr) MSVCRT__getws
+@ cdecl _getws(ptr)
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _gmtime64(ptr)
 @ cdecl _heapadd(ptr long)
@@ -359,7 +359,7 @@
 @ stub -arch=i386 _inpd(long)
 @ stub -arch=i386 _inpw(long)
 @ extern _iob MSVCRT__iob
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _isctype(long long)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalpha(long)
@@ -402,14 +402,14 @@
 @ cdecl -arch=i386 _local_unwind2(ptr long)
 @ cdecl _localtime64(ptr)
 @ cdecl _lock(long)
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp
 @ cdecl _lrotl(long long)
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
-@ cdecl _lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _lseek(long long long)
+@ cdecl -ret64 _lseeki64(long int64 long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltow(long ptr long) ntdll._ltow
 @ cdecl _makepath(ptr str str str str)
@@ -471,13 +471,13 @@
 @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy
 @ cdecl _memicmp(str str long)
 @ cdecl _mkdir(str)
-@ cdecl _mktemp(str) MSVCRT__mktemp
+@ cdecl _mktemp(str)
 @ cdecl _mktime64(ptr)
 @ cdecl _msize(ptr)
 @ cdecl _nextafter(double double)
 @ cdecl _onexit(ptr)
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ extern _osplatform MSVCRT__osplatform
 @ extern _osver MSVCRT__osver
 @ stub -arch=i386 _outp(long long)
@@ -486,19 +486,19 @@
 @ cdecl _pclose(ptr)
 @ extern _pctype MSVCRT__pctype
 @ extern _pgmptr MSVCRT__pgmptr
-@ cdecl _pipe(ptr long long) MSVCRT__pipe
+@ cdecl _pipe(ptr long long)
 @ cdecl _popen(str str)
 @ cdecl _purecall()
 @ cdecl _putch(long)
 @ cdecl _putenv(str)
-@ cdecl _putw(long ptr) MSVCRT__putw
+@ cdecl _putw(long ptr)
 @ cdecl _putwch(long)
-@ cdecl _putws(wstr) MSVCRT__putws
+@ cdecl _putws(wstr)
 @ extern _pwctype MSVCRT__pwctype
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 @ cdecl _resetstkoflw()
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl _rotr(long long)
 @ cdecl -arch=i386 _safe_fdiv()
@@ -518,16 +518,16 @@
 @ cdecl _seterrormode(long)
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
 @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
-@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio
+@ cdecl _setmaxstdio(long)
 @ cdecl _setmbcp(long)
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str)
 @ varargs _snscanf(str long str)
 @ varargs _snwprintf(ptr long wstr)
 @ varargs _snwscanf(wstr long wstr)
-@ varargs _sopen(str long long) MSVCRT__sopen
+@ varargs _sopen(str long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -537,9 +537,9 @@
 @ cdecl _spawnvp(long str ptr)
 @ cdecl _spawnvpe(long str ptr ptr)
 @ cdecl _splitpath(str ptr ptr ptr ptr)
-@ cdecl _stat(str ptr) MSVCRT_stat
-@ cdecl _stat64(str ptr) MSVCRT_stat64
-@ cdecl _stati64(str ptr) MSVCRT_stati64
+@ cdecl _stat(str ptr)
+@ cdecl _stat64(str ptr)
+@ cdecl _stati64(str ptr)
 @ cdecl _statusfp()
 @ cdecl _strcmpi(str str) _stricmp
 @ cdecl _strdate(ptr)
@@ -561,9 +561,9 @@
 @ cdecl _swab(str str long)
 @ extern _sys_errlist MSVCRT__sys_errlist
 @ extern _sys_nerr MSVCRT__sys_nerr
-@ cdecl _tell(long) MSVCRT__tell
+@ cdecl _tell(long)
 @ cdecl -ret64 _telli64(long)
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tempnam(str str)
 @ cdecl _time64(ptr)
 @ extern _timezone MSVCRT___timezone
 @ cdecl _tolower(long)
@@ -574,10 +574,10 @@
 @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow
 @ cdecl _ultoa(long ptr long) ntdll._ultoa
 @ cdecl _ultow(long ptr long) ntdll._ultow
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 @ cdecl _ungetch(long)
 @ cdecl _ungetwch(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
 @ cdecl _unlock(long)
 @ cdecl -arch=win32 _utime(str ptr) _utime32
@@ -587,12 +587,12 @@
 @ cdecl _vscwprintf(wstr ptr)
 @ cdecl -norelay _vsnprintf(ptr long str ptr)
 @ cdecl _vsnwprintf(ptr long wstr ptr)
-@ cdecl _waccess(wstr long) MSVCRT__waccess
+@ cdecl _waccess(wstr long)
 @ cdecl _wasctime(ptr)
 @ cdecl _wchdir(wstr)
-@ cdecl _wchmod(wstr long) MSVCRT__wchmod
+@ cdecl _wchmod(wstr long)
 @ extern _wcmdln MSVCRT__wcmdln
-@ cdecl _wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _wcreat(wstr long)
 @ cdecl _wcsdup(wstr)
 @ cdecl _wcserror(long)
 @ cdecl _wcsicmp(wstr wstr)
@@ -620,16 +620,16 @@
 @ cdecl _wexecve(wstr ptr ptr)
 @ cdecl _wexecvp(wstr ptr)
 @ cdecl _wexecvpe(wstr ptr ptr)
-@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _wfdopen(long wstr)
 @ cdecl _wfindfirst(wstr ptr)
 @ cdecl _wfindfirst64(wstr ptr)
 @ cdecl _wfindfirsti64(wstr ptr)
 @ cdecl _wfindnext(long ptr)
 @ cdecl _wfindnext64(long ptr)
 @ cdecl _wfindnexti64(long ptr)
-@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _wfopen(wstr wstr)
+@ cdecl _wfreopen(wstr wstr ptr)
+@ cdecl _wfsopen(wstr wstr long)
 @ cdecl _wfullpath(ptr wstr long)
 @ cdecl _wgetcwd(wstr long)
 @ cdecl _wgetdcwd(long wstr long)
@@ -639,19 +639,19 @@
 @ extern _winver MSVCRT__winver
 @ cdecl _wmakepath(ptr wstr wstr wstr wstr)
 @ cdecl _wmkdir(wstr)
-@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
-@ varargs _wopen(wstr long) MSVCRT__wopen
+@ cdecl _wmktemp(wstr)
+@ varargs _wopen(wstr long)
 @ cdecl _wperror(wstr)
 @ extern _wpgmptr MSVCRT__wpgmptr
 @ cdecl _wpopen(wstr wstr)
 @ cdecl _wputenv(wstr)
-@ cdecl _wremove(wstr) MSVCRT__wremove
-@ cdecl _wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _wremove(wstr)
+@ cdecl _wrename(wstr wstr)
+@ cdecl _write(long ptr long)
 @ cdecl _wrmdir(wstr)
 @ cdecl _wsearchenv(wstr wstr ptr)
 @ cdecl _wsetlocale(long wstr)
-@ varargs _wsopen(wstr long long) MSVCRT__wsopen
+@ varargs _wsopen(wstr long long)
 @ varargs _wspawnl(long wstr wstr)
 @ varargs _wspawnle(long wstr wstr)
 @ varargs _wspawnlp(long wstr wstr)
@@ -661,19 +661,19 @@
 @ cdecl _wspawnvp(long wstr ptr)
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
-@ cdecl _wstat(wstr ptr) MSVCRT__wstat
-@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64
-@ cdecl _wstati64(wstr ptr) MSVCRT__wstati64
+@ cdecl _wstat(str ptr)
+@ cdecl _wstat64(wstr ptr)
+@ cdecl _wstati64(wstr ptr)
 @ cdecl _wstrdate(ptr)
 @ cdecl _wstrtime(ptr)
 @ cdecl _wsystem(wstr)
-@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
-@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
+@ cdecl _wtempnam(wstr wstr)
+@ cdecl _wtmpnam(ptr)
 @ cdecl _wtof(wstr)
 @ cdecl _wtoi(wstr)
 @ cdecl -ret64 _wtoi64(wstr)
 @ cdecl _wtol(wstr)
-@ cdecl _wunlink(wstr) MSVCRT__wunlink
+@ cdecl _wunlink(wstr)
 @ cdecl -arch=win32 _wutime(wstr ptr) _wutime32
 @ cdecl -arch=win64 _wutime(wstr ptr) _wutime64
 @ cdecl _wutime64(wstr ptr)
@@ -694,7 +694,7 @@
 @ cdecl bsearch(ptr ptr long long ptr)
 @ cdecl calloc(long long)
 @ cdecl ceil(double)
-@ cdecl clearerr(ptr) MSVCRT_clearerr
+@ cdecl clearerr(ptr)
 @ cdecl clock()
 @ cdecl cos(double)
 @ cdecl cosh(double)
@@ -706,40 +706,40 @@
 @ cdecl exit(long)
 @ cdecl exp(double)
 @ cdecl fabs(double)
-@ cdecl fclose(ptr) MSVCRT_fclose
-@ cdecl feof(ptr) MSVCRT_feof
-@ cdecl ferror(ptr) MSVCRT_ferror
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl fclose(ptr)
+@ cdecl feof(ptr)
+@ cdecl ferror(ptr)
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
+@ cdecl fgetws(ptr long ptr)
 @ cdecl floor(double)
 @ cdecl fmod(double double)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ varargs fprintf(ptr str) MSVCRT_fprintf
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fputws(wstr ptr) MSVCRT_fputws
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
+@ cdecl fopen(str str)
+@ varargs fprintf(ptr str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fputws(wstr ptr)
+@ cdecl fread(ptr long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
+@ cdecl freopen(str str ptr)
 @ cdecl frexp(double ptr)
 @ varargs fscanf(ptr str)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ varargs fwprintf(ptr wstr)
+@ cdecl fwrite(ptr long long ptr)
 @ varargs fwscanf(ptr wstr)
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
-@ cdecl gets(str) MSVCRT_gets
-@ cdecl getwc(ptr) MSVCRT_getwc
-@ cdecl getwchar() MSVCRT_getwchar
+@ cdecl gets(str)
+@ cdecl getwc(ptr)
+@ cdecl getwchar()
 @ cdecl -arch=win32 gmtime(ptr) _gmtime32
 @ cdecl -arch=win64 gmtime(ptr) _gmtime64
 @ cdecl is_wctype(long long) iswctype
@@ -790,23 +790,23 @@
 @ cdecl modf(double ptr)
 @ cdecl perror(str)
 @ cdecl pow(double double)
-@ varargs printf(str) MSVCRT_printf
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
-@ cdecl putwc(long ptr) MSVCRT_fputwc
-@ cdecl putwchar(long) MSVCRT__fputwchar
+@ varargs printf(str)
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
+@ cdecl putwc(long ptr) fputwc
+@ cdecl putwchar(long) _fputwchar
 @ cdecl qsort(ptr long long ptr)
 @ cdecl raise(long)
 @ cdecl rand()
 @ cdecl realloc(ptr long)
-@ cdecl remove(str) MSVCRT_remove
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl remove(str)
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ varargs scanf(str)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl sinh(double)
@@ -842,20 +842,20 @@
 @ cdecl tanh(double)
 @ cdecl -arch=win32 time(ptr) _time32
 @ cdecl -arch=win64 time(ptr) _time64
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
+@ cdecl tmpfile()
+@ cdecl tmpnam(ptr)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towlower(long)
 @ cdecl towupper(long)
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
-@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
-@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
-@ cdecl vprintf(str ptr) MSVCRT_vprintf
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
+@ cdecl vfprintf(ptr str ptr)
+@ cdecl vfwprintf(ptr wstr ptr)
+@ cdecl vprintf(str ptr)
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl vswprintf(ptr wstr ptr) _vswprintf
-@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
+@ cdecl vwprintf(wstr ptr)
 @ cdecl wcscat(wstr wstr)
 @ cdecl wcschr(wstr long)
 @ cdecl wcscmp(wstr wstr)
@@ -878,5 +878,5 @@
 @ cdecl wcstoul(wstr ptr long)
 @ cdecl wcsxfrm(ptr wstr long)
 @ cdecl wctomb(ptr long)
-@ varargs wprintf(wstr) MSVCRT_wprintf
+@ varargs wprintf(wstr)
 @ varargs wscanf(wstr)
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index dddf3f0d02b..5634e34d5ff 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -89,8 +89,8 @@
 @ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ thiscall -arch=i386 ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
-@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) MSVCRT__open
-@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) MSVCRT__open
+@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) _open
+@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) _open
 @ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
 @ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
 @ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
@@ -103,14 +103,14 @@
 @ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
-@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) MSVCRT__sopen
-@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) MSVCRT__sopen
+@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) _sopen
+@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) _sopen
 @ stub -arch=win32 ?_type_info_dtor_internal_method@type_info@@QAEXXZ  # public: void __thiscall type_info::_type_info_dtor_internal_method(void)
 @ stub -arch=win64 ?_type_info_dtor_internal_method@type_info@@QEAAXXZ  # public: void __cdecl type_info::_type_info_dtor_internal_method(void) __ptr64
-@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) MSVCRT__wopen
-@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) MSVCRT__wopen
-@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) MSVCRT__wsopen
-@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) MSVCRT__wsopen
+@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) _wopen
+@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) _wopen
+@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) _wsopen
+@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) _wsopen
 @ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) type_info_before
 @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) type_info_before
 @ thiscall -arch=win32 ?name@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
@@ -327,8 +327,8 @@
 @ extern __winitenv MSVCRT___winitenv
 @ cdecl _abnormal_termination()
 @ cdecl -ret64 _abs64(int64)
-@ cdecl _access(str long) MSVCRT__access
-@ cdecl _access_s(str long) MSVCRT__access_s
+@ cdecl _access(str long)
+@ cdecl _access_s(str long)
 @ extern _acmdln MSVCRT__acmdln
 @ stdcall -arch=i386 _adj_fdiv_m16i(long)
 @ stdcall -arch=i386 _adj_fdiv_m32(long)
@@ -386,12 +386,12 @@
 @ cdecl _chgsign(double)
 @ cdecl -arch=!i386 _chgsignf(float)
 @ cdecl -arch=i386 -norelay _chkesp()
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
-@ cdecl _chsize_s(long int64) MSVCRT__chsize_s
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
+@ cdecl _chsize_s(long int64)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ extern _commode MSVCRT__commode
 @ cdecl _configthreadlocale(long)
 @ cdecl _control87(long long)
@@ -407,7 +407,7 @@
 @ stub _cprintf_s_l
 @ cdecl _cputs(str)
 @ cdecl _cputws(wstr)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ cdecl _create_locale(long str)
 @ cdecl -arch=i386 _crt_debugger_hook(long)
 @ cdecl -arch=arm,win64 __crt_debugger_hook(long) _crt_debugger_hook
@@ -436,8 +436,8 @@
 @ cdecl _difftime64(int64 int64)
 @ stub _dosmaperr
 @ extern _dstbias MSVCRT__dstbias
-@ cdecl _dup(long) MSVCRT__dup
-@ cdecl _dup2(long long) MSVCRT__dup2
+@ cdecl _dup(long)
+@ cdecl _dup2(long long)
 @ cdecl _dupenv_s(ptr ptr str)
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _ecvt_s(str long double long ptr ptr)
@@ -446,7 +446,7 @@
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
 @ extern _environ MSVCRT__environ
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@@ -461,20 +461,20 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
-@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fclose_nolock(ptr)
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
 @ cdecl _fcvt_s(ptr long double long ptr ptr)
-@ cdecl _fdopen(long str) MSVCRT__fdopen
-@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock
-@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filbuf(ptr) MSVCRT__filbuf
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _fdopen(long str)
+@ cdecl _fflush_nolock(ptr)
+@ cdecl _fgetc_nolock(ptr)
+@ cdecl _fgetchar()
+@ cdecl _fgetwc_nolock(ptr)
+@ cdecl _fgetwchar()
+@ cdecl _filbuf(ptr)
+@ cdecl _filelength(long)
+@ cdecl -ret64 _filelengthi64(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst32(str ptr)
 @ stub _findfirst32i64
@@ -486,8 +486,8 @@
 @ cdecl _findnext64i32(long ptr)
 @ cdecl _finite(double)
 @ cdecl -arch=!i386 _finitef(float)
-@ cdecl _flsbuf(long ptr) MSVCRT__flsbuf
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flsbuf(long ptr)
+@ cdecl _flushall()
 @ extern _fmode MSVCRT__fmode
 @ cdecl _fpclass(double)
 @ cdecl -arch=!i386 _fpclassf(float)
@@ -497,29 +497,29 @@
 @ stub _fprintf_p
 @ stub _fprintf_p_l
 @ stub _fprintf_s_l
-@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
-@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
-@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
+@ cdecl _fputc_nolock(long ptr)
+@ cdecl _fputchar(long)
+@ cdecl _fputwc_nolock(long ptr)
+@ cdecl _fputwchar(long)
+@ cdecl _fread_nolock(ptr long long ptr)
+@ cdecl _fread_nolock_s(ptr long long long ptr)
 @ cdecl _free_locale(ptr)
 @ stub _freea
 @ stub _freea_s
 @ stub _freefls
 @ varargs _fscanf_l(ptr str ptr)
 @ varargs _fscanf_s_l(ptr str ptr)
-@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
-@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
-@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat32(long ptr) MSVCRT__fstat32
-@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64
-@ cdecl _fstat64(long ptr) MSVCRT__fstat64
-@ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32
-@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock
-@ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64
-@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock
+@ cdecl _fseek_nolock(ptr long long)
+@ cdecl _fseeki64(ptr int64 long)
+@ cdecl _fseeki64_nolock(ptr int64 long)
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat32(long ptr)
+@ cdecl _fstat32i64(long ptr)
+@ cdecl _fstat64(long ptr)
+@ cdecl _fstat64i32(long ptr)
+@ cdecl _ftell_nolock(ptr)
+@ cdecl -ret64 _ftelli64(ptr)
+@ cdecl -ret64 _ftelli64_nolock(ptr)
 @ cdecl _ftime32(ptr)
 @ cdecl _ftime32_s(ptr)
 @ cdecl _ftime64(ptr)
@@ -528,11 +528,11 @@
 @ cdecl _fullpath(ptr str long)
 @ cdecl _futime32(long ptr)
 @ cdecl _futime64(long ptr)
-@ varargs _fwprintf_l(ptr wstr ptr) MSVCRT__fwprintf_l
+@ varargs _fwprintf_l(ptr wstr ptr)
 @ stub _fwprintf_p
 @ stub _fwprintf_p_l
 @ stub _fwprintf_s_l
-@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock
+@ cdecl _fwrite_nolock(ptr long long ptr)
 @ varargs _fwscanf_l(ptr wstr ptr)
 @ varargs _fwscanf_s_l(ptr wstr ptr)
 @ cdecl _gcvt(double long str)
@@ -546,7 +546,7 @@
 @ cdecl _get_fmode(ptr)
 @ cdecl _get_heap_handle()
 @ cdecl _get_invalid_parameter_handler()
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _get_osplatform(ptr)
 @ cdecl _get_osver(ptr)
 @ cdecl _get_output_format()
@@ -562,7 +562,7 @@
 @ cdecl _get_winminor(ptr)
 @ stub _get_winver
 @ cdecl _get_wpgmptr(ptr)
-@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock
+@ cdecl _getc_nolock(ptr) _fgetc_nolock
 @ cdecl _getch()
 @ cdecl _getch_nolock()
 @ cdecl _getche()
@@ -574,18 +574,18 @@
 @ cdecl _getdllprocaddr(long str long)
 @ cdecl _getdrive()
 @ cdecl _getdrives() kernel32.GetLogicalDrives
-@ cdecl _getmaxstdio() MSVCRT__getmaxstdio
+@ cdecl _getmaxstdio()
 @ cdecl _getmbcp()
 @ cdecl _getpid() _getpid
 @ cdecl _getptd()
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
-@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock
+@ cdecl _getw(ptr)
+@ cdecl _getwc_nolock(ptr) _fgetwc_nolock
 @ cdecl _getwch()
 @ cdecl _getwch_nolock()
 @ cdecl _getwche()
 @ cdecl _getwche_nolock()
-@ cdecl _getws(ptr) MSVCRT__getws
+@ cdecl _getws(ptr)
 @ stub _getws_s
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _gmtime32(ptr)
@@ -616,7 +616,7 @@
 @ extern _iob MSVCRT__iob
 @ cdecl _isalnum_l(long ptr)
 @ cdecl _isalpha_l(long ptr)
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _iscntrl_l(long ptr)
 @ cdecl _isctype(long long)
 @ cdecl _isctype_l(long long ptr)
@@ -722,8 +722,8 @@
 @ cdecl _localtime64(ptr)
 @ cdecl _localtime64_s(ptr ptr)
 @ cdecl _lock(long)
-@ cdecl _lock_file(ptr) MSVCRT__lock_file
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _lock_file(ptr)
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl -arch=!i386 _logbf(float)
 @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp
@@ -731,8 +731,8 @@
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
 @ stub _lsearch_s
-@ cdecl _lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _lseek(long long long)
+@ cdecl -ret64 _lseeki64(long int64 long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltoa_s(long ptr long long)
 @ cdecl _ltow(long ptr long) ntdll._ltow
@@ -882,16 +882,16 @@
 @ cdecl _mkdir(str)
 @ cdecl _mkgmtime32(ptr)
 @ cdecl _mkgmtime64(ptr)
-@ cdecl _mktemp(str) MSVCRT__mktemp
-@ cdecl _mktemp_s(str long) MSVCRT__mktemp_s
+@ cdecl _mktemp(str)
+@ cdecl _mktemp_s(str long)
 @ cdecl _mktime32(ptr)
 @ cdecl _mktime64(ptr)
 @ cdecl _msize(ptr)
 @ cdecl _nextafter(double double)
 @ cdecl -arch=x86_64 _nextafterf(float float)
 @ cdecl _onexit(ptr)
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ extern _osplatform MSVCRT__osplatform
 @ extern _osver MSVCRT__osver
 @ stub -arch=i386 _outp(long long)
@@ -900,31 +900,31 @@
 @ cdecl _pclose(ptr)
 @ extern _pctype MSVCRT__pctype
 @ extern _pgmptr MSVCRT__pgmptr
-@ cdecl _pipe(ptr long long) MSVCRT__pipe
+@ cdecl _pipe(ptr long long)
 @ cdecl _popen(str str)
 @ stub _printf_l
 @ stub _printf_p
 @ stub _printf_p_l
 @ stub _printf_s_l
 @ cdecl _purecall()
-@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock
+@ cdecl _putc_nolock(long ptr) _fputc_nolock
 @ cdecl _putch(long)
 @ cdecl _putch_nolock(long)
 @ cdecl _putenv(str)
 @ cdecl _putenv_s(str str)
-@ cdecl _putw(long ptr) MSVCRT__putw
-@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
+@ cdecl _putw(long ptr)
+@ cdecl _putwc_nolock(long ptr) _fputwc_nolock
 @ cdecl _putwch(long)
 @ cdecl _putwch_nolock(long)
-@ cdecl _putws(wstr) MSVCRT__putws
+@ cdecl _putws(wstr)
 @ extern _pwctype MSVCRT__pwctype
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 @ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw()
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl -ret64 _rotl64(int64 long)
 @ cdecl _rotr(long long)
@@ -967,9 +967,9 @@
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
 @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
 @ cdecl -arch=x86_64,arm -norelay _setjmpex(ptr ptr) __wine_setjmpex
-@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio
+@ cdecl _setmaxstdio(long)
 @ cdecl _setmbcp(long)
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str)
@@ -990,8 +990,8 @@
 @ varargs _snwscanf_l(wstr long wstr ptr)
 @ varargs _snwscanf_s(wstr long wstr)
 @ varargs _snwscanf_s_l(wstr long wstr ptr)
-@ varargs _sopen(str long long) MSVCRT__sopen
-@ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s
+@ varargs _sopen(str long long)
+@ cdecl _sopen_s(ptr str long long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -1008,10 +1008,10 @@
 @ varargs _sprintf_s_l(ptr long str ptr)
 @ varargs _sscanf_l(str str ptr)
 @ varargs _sscanf_s_l(str str ptr)
-@ cdecl _stat32(str ptr) MSVCRT__stat32
-@ cdecl _stat32i64(str ptr) MSVCRT__stat32i64
-@ cdecl _stat64(str ptr) MSVCRT_stat64
-@ cdecl _stat64i32(str ptr) MSVCRT__stat64i32
+@ cdecl _stat32(str ptr)
+@ cdecl _stat32i64(str ptr)
+@ cdecl _stat64(str ptr)
+@ cdecl _stat64i32(str ptr)
 @ cdecl _statusfp()
 @ cdecl -arch=i386 _statusfp2(ptr ptr)
 @ cdecl _strcoll_l(str str ptr)
@@ -1065,9 +1065,9 @@
 @ varargs _swscanf_s_l(wstr wstr ptr)
 @ extern _sys_errlist MSVCRT__sys_errlist
 @ extern _sys_nerr MSVCRT__sys_nerr
-@ cdecl _tell(long) MSVCRT__tell
+@ cdecl _tell(long)
 @ cdecl -ret64 _telli64(long)
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tempnam(str str)
 @ cdecl _time32(ptr)
 @ cdecl _time64(ptr)
 @ extern _timezone MSVCRT___timezone
@@ -1087,18 +1087,18 @@
 @ cdecl _ultoa_s(long ptr long long)
 @ cdecl _ultow(long ptr long) ntdll._ultow
 @ cdecl _ultow_s(long ptr long long)
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 @ stub _umask_s
-@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock
+@ cdecl _ungetc_nolock(long ptr)
 @ cdecl _ungetch(long)
 @ cdecl _ungetch_nolock(long)
-@ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock
+@ cdecl _ungetwc_nolock(long ptr)
 @ cdecl _ungetwch(long)
 @ cdecl _ungetwch_nolock(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
 @ cdecl _unlock(long)
-@ cdecl _unlock_file(ptr) MSVCRT__unlock_file
+@ cdecl _unlock_file(ptr)
 @ cdecl _utime32(str ptr)
 @ cdecl _utime64(str ptr)
 @ cdecl _vcprintf(str ptr)
@@ -1113,14 +1113,14 @@
 @ stub _vcwprintf_p_l
 @ stub _vcwprintf_s
 @ stub _vcwprintf_s_l
-@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
-@ cdecl _vfprintf_p(ptr str ptr) MSVCRT__vfprintf_p
-@ cdecl _vfprintf_p_l(ptr str ptr ptr) MSVCRT__vfprintf_p_l
-@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
-@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
-@ cdecl _vfwprintf_p(ptr wstr ptr) MSVCRT__vfwprintf_p
-@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_p_l
-@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
+@ cdecl _vfprintf_l(ptr str ptr ptr)
+@ cdecl _vfprintf_p(ptr str ptr)
+@ cdecl _vfprintf_p_l(ptr str ptr ptr)
+@ cdecl _vfprintf_s_l(ptr str ptr ptr)
+@ cdecl _vfwprintf_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_p(ptr wstr ptr)
+@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr)
 @ stub _vprintf_l
 @ stub _vprintf_p
 @ stub _vprintf_p_l
@@ -1158,15 +1158,15 @@
 @ stub _vwprintf_p
 @ stub _vwprintf_p_l
 @ stub _vwprintf_s_l
-@ cdecl _waccess(wstr long) MSVCRT__waccess
-@ cdecl _waccess_s(wstr long) MSVCRT__waccess_s
+@ cdecl _waccess(wstr long)
+@ cdecl _waccess_s(wstr long)
 @ cdecl _wasctime(ptr)
 @ cdecl _wasctime_s(ptr long ptr)
 @ cdecl _wassert(wstr wstr long)
 @ cdecl _wchdir(wstr)
-@ cdecl _wchmod(wstr long) MSVCRT__wchmod
+@ cdecl _wchmod(wstr long)
 @ extern _wcmdln MSVCRT__wcmdln
-@ cdecl _wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _wcreat(wstr long)
 @ cdecl _wcscoll_l(wstr wstr ptr)
 @ cdecl _wcsdup(wstr)
 @ cdecl _wcserror(long)
@@ -1222,7 +1222,7 @@
 @ cdecl _wexecve(wstr ptr ptr)
 @ cdecl _wexecvp(wstr ptr)
 @ cdecl _wexecvpe(wstr ptr ptr)
-@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _wfdopen(long wstr)
 @ cdecl _wfindfirst32(wstr ptr)
 @ stub _wfindfirst32i64
 @ cdecl _wfindfirst64(wstr ptr)
@@ -1231,11 +1231,11 @@
 @ stub _wfindnext32i64
 @ cdecl _wfindnext64(long ptr)
 @ cdecl _wfindnext64i32(long ptr)
-@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s
-@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s
-@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _wfopen(wstr wstr)
+@ cdecl _wfopen_s(ptr wstr wstr)
+@ cdecl _wfreopen(wstr wstr ptr)
+@ cdecl _wfreopen_s(ptr wstr wstr ptr)
+@ cdecl _wfsopen(wstr wstr long)
 @ cdecl _wfullpath(ptr wstr long)
 @ cdecl _wgetcwd(wstr long)
 @ cdecl _wgetdcwd(long wstr long)
@@ -1248,9 +1248,9 @@
 @ cdecl _wmakepath(ptr wstr wstr wstr wstr)
 @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr)
 @ cdecl _wmkdir(wstr)
-@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
-@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
-@ varargs _wopen(wstr long) MSVCRT__wopen
+@ cdecl _wmktemp(wstr)
+@ cdecl _wmktemp_s(wstr long)
+@ varargs _wopen(wstr long)
 @ cdecl _wperror(wstr)
 @ extern _wpgmptr MSVCRT__wpgmptr
 @ cdecl _wpopen(wstr wstr)
@@ -1260,17 +1260,17 @@
 @ stub _wprintf_s_l
 @ cdecl _wputenv(wstr)
 @ cdecl _wputenv_s(wstr wstr)
-@ cdecl _wremove(wstr) MSVCRT__wremove
-@ cdecl _wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _wremove(wstr)
+@ cdecl _wrename(wstr wstr)
+@ cdecl _write(long ptr long)
 @ cdecl _wrmdir(wstr)
 @ varargs _wscanf_l(wstr ptr)
 @ varargs _wscanf_s_l(wstr ptr)
 @ cdecl _wsearchenv(wstr wstr ptr)
 @ cdecl _wsearchenv_s(wstr wstr ptr long)
 @ cdecl _wsetlocale(long wstr)
-@ varargs _wsopen(wstr long long) MSVCRT__wsopen
-@ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s
+@ varargs _wsopen(wstr long long)
+@ cdecl _wsopen_s(ptr wstr long long long)
 @ varargs _wspawnl(long wstr wstr)
 @ varargs _wspawnle(long wstr wstr)
 @ varargs _wspawnlp(long wstr wstr)
@@ -1281,18 +1281,18 @@
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
 @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long)
-@ cdecl _wstat32(wstr ptr) MSVCRT__wstat32
-@ cdecl _wstat32i64(wstr ptr) MSVCRT__wstat32i64
-@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64
-@ cdecl _wstat64i32(wstr ptr) MSVCRT__wstat64i32
+@ cdecl _wstat32(wstr ptr)
+@ cdecl _wstat32i64(wstr ptr)
+@ cdecl _wstat64(wstr ptr)
+@ cdecl _wstat64i32(wstr ptr)
 @ cdecl _wstrdate(ptr)
 @ cdecl _wstrdate_s(ptr long)
 @ cdecl _wstrtime(ptr)
 @ cdecl _wstrtime_s(ptr long)
 @ cdecl _wsystem(wstr)
-@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
-@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
-@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s
+@ cdecl _wtempnam(wstr wstr)
+@ cdecl _wtmpnam(ptr)
+@ cdecl _wtmpnam_s(ptr long)
 @ cdecl _wtof(wstr)
 @ cdecl _wtof_l(wstr ptr)
 @ cdecl _wtoi(wstr)
@@ -1301,7 +1301,7 @@
 @ cdecl _wtoi_l(wstr ptr)
 @ cdecl _wtol(wstr)
 @ cdecl _wtol_l(wstr ptr)
-@ cdecl _wunlink(wstr) MSVCRT__wunlink
+@ cdecl _wunlink(wstr)
 @ cdecl _wutime32(wstr ptr)
 @ cdecl _wutime64(wstr ptr)
 @ cdecl _y0(double)
@@ -1329,8 +1329,8 @@
 @ cdecl calloc(long long)
 @ cdecl ceil(double)
 @ cdecl -arch=!i386 ceilf(float)
-@ cdecl clearerr(ptr) MSVCRT_clearerr
-@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s
+@ cdecl clearerr(ptr)
+@ cdecl clearerr_s(ptr)
 @ cdecl clock()
 @ cdecl cos(double)
 @ cdecl -arch=!i386 cosf(float)
@@ -1341,51 +1341,51 @@
 @ cdecl exp(double)
 @ cdecl -arch=!i386 expf(float)
 @ cdecl fabs(double)
-@ cdecl fclose(ptr) MSVCRT_fclose
-@ cdecl feof(ptr) MSVCRT_feof
-@ cdecl ferror(ptr) MSVCRT_ferror
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl fclose(ptr)
+@ cdecl feof(ptr)
+@ cdecl ferror(ptr)
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
+@ cdecl fgetws(ptr long ptr)
 @ cdecl floor(double)
 @ cdecl -arch=!i386 floorf(float)
 @ cdecl fmod(double double)
 @ cdecl -arch=!i386 fmodf(float float)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s
-@ varargs fprintf(ptr str) MSVCRT_fprintf
-@ varargs fprintf_s(ptr str) MSVCRT_fprintf_s
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fputws(wstr ptr) MSVCRT_fputws
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
+@ cdecl fopen(str str)
+@ cdecl fopen_s(ptr str str)
+@ varargs fprintf(ptr str)
+@ varargs fprintf_s(ptr str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fputws(wstr ptr)
+@ cdecl fread(ptr long long ptr)
+@ cdecl fread_s(ptr long long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
-@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
+@ cdecl freopen(str str ptr)
+@ cdecl freopen_s(ptr str str ptr)
 @ cdecl frexp(double ptr)
 @ varargs fscanf(ptr str)
 @ varargs fscanf_s(ptr str)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
-@ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ varargs fwprintf(ptr wstr)
+@ varargs fwprintf_s(ptr wstr)
+@ cdecl fwrite(ptr long long ptr)
 @ varargs fwscanf(ptr wstr)
 @ varargs fwscanf_s(ptr wstr)
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
 @ cdecl getenv_s(ptr ptr long str)
-@ cdecl gets(str) MSVCRT_gets
-@ cdecl gets_s(ptr long) MSVCRT_gets_s
-@ cdecl getwc(ptr) MSVCRT_getwc
-@ cdecl getwchar() MSVCRT_getwchar
+@ cdecl gets(str)
+@ cdecl gets_s(ptr long)
+@ cdecl getwc(ptr)
+@ cdecl getwchar()
 @ cdecl is_wctype(long long) iswctype
 @ cdecl isalnum(long)
 @ cdecl isalpha(long)
@@ -1442,28 +1442,28 @@
 @ cdecl perror(str)
 @ cdecl pow(double double)
 @ cdecl -arch=!i386 powf(float float)
-@ varargs printf(str) MSVCRT_printf
-@ varargs printf_s(str) MSVCRT_printf_s
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
-@ cdecl putwc(long ptr) MSVCRT_fputwc
-@ cdecl putwchar(long) MSVCRT__fputwchar
+@ varargs printf(str)
+@ varargs printf_s(str)
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
+@ cdecl putwc(long ptr) fputwc
+@ cdecl putwchar(long) _fputwchar
 @ cdecl qsort(ptr long long ptr)
 @ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
 @ cdecl rand()
 @ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
-@ cdecl remove(str) MSVCRT_remove
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl remove(str)
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ varargs scanf(str)
 @ varargs scanf_s(str)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl -arch=!i386 sinf(float)
@@ -1512,27 +1512,27 @@
 @ cdecl -arch=!i386 tanf(float)
 @ cdecl tanh(double)
 @ cdecl -arch=!i386 tanhf(float)
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
+@ cdecl tmpfile()
+@ cdecl tmpfile_s(ptr)
+@ cdecl tmpnam(ptr)
+@ cdecl tmpnam_s(ptr long)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towlower(long)
 @ cdecl towupper(long)
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
-@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
-@ cdecl vfprintf_s(ptr str ptr) MSVCRT_vfprintf_s
-@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
-@ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s
-@ cdecl vprintf(str ptr) MSVCRT_vprintf
-@ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
+@ cdecl vfprintf(ptr str ptr)
+@ cdecl vfprintf_s(ptr str ptr)
+@ cdecl vfwprintf(ptr wstr ptr)
+@ cdecl vfwprintf_s(ptr wstr ptr)
+@ cdecl vprintf(str ptr)
+@ cdecl vprintf_s(str ptr)
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl vsprintf_s(ptr long str ptr)
 @ cdecl vswprintf_s(ptr long wstr ptr)
-@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
-@ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s
+@ cdecl vwprintf(wstr ptr)
+@ cdecl vwprintf_s(wstr ptr)
 @ cdecl wcrtomb(ptr long ptr)
 @ cdecl wcrtomb_s(ptr ptr long long ptr)
 @ cdecl wcscat(wstr wstr)
@@ -1568,7 +1568,7 @@
 @ cdecl wctob(long)
 @ cdecl wctomb(ptr long)
 @ cdecl wctomb_s(ptr ptr long long)
-@ varargs wprintf(wstr) MSVCRT_wprintf
-@ varargs wprintf_s(wstr) MSVCRT_wprintf_s
+@ varargs wprintf(wstr)
+@ varargs wprintf_s(wstr)
 @ varargs wscanf(wstr)
 @ varargs wscanf_s(wstr)
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 103bf564aea..8151b4ddd3c 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -89,8 +89,8 @@
 @ cdecl -arch=arm ?_name_internal_method@type_info@@QBAPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ thiscall -arch=i386 ?_name_internal_method@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
 @ cdecl -arch=win64 ?_name_internal_method@type_info@@QEBAPEBDPEAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
-@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) MSVCRT__open
-@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) MSVCRT__open
+@ varargs -arch=win32 ?_open@@YAHPBDHH@Z(str long) _open
+@ varargs -arch=win64 ?_open@@YAHPEBDHH@Z(str long) _open
 @ cdecl -arch=win32 ?_query_new_handler@@YAP6AHI@ZXZ() _query_new_handler
 @ cdecl -arch=win64 ?_query_new_handler@@YAP6AH_K@ZXZ() _query_new_handler
 @ cdecl ?_query_new_mode@@YAHXZ() _query_new_mode
@@ -103,14 +103,14 @@
 @ stub -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZH@Z  # void (__cdecl*__cdecl _set_se_translator(int))(unsigned int,struct _EXCEPTION_POINTERS * __ptr64)
 @ cdecl -arch=win32 ?_set_se_translator@@YAP6AXIPAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
 @ cdecl -arch=win64 ?_set_se_translator@@YAP6AXIPEAU_EXCEPTION_POINTERS@@@ZP6AXI0@Z@Z(ptr) _set_se_translator
-@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) MSVCRT__sopen
-@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) MSVCRT__sopen
+@ cdecl -arch=win32 ?_sopen@@YAHPBDHHH@Z(str long long long) _sopen
+@ cdecl -arch=win64 ?_sopen@@YAHPEBDHHH@Z(str long long long) _sopen
 @ stub -arch=win32 ?_type_info_dtor_internal_method@type_info@@QAEXXZ  # public: void __thiscall type_info::_type_info_dtor_internal_method(void)
 @ stub -arch=win64 ?_type_info_dtor_internal_method@type_info@@QEAAXXZ  # public: void __cdecl type_info::_type_info_dtor_internal_method(void) __ptr64
-@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) MSVCRT__wopen
-@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) MSVCRT__wopen
-@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) MSVCRT__wsopen
-@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) MSVCRT__wsopen
+@ cdecl -arch=win32 ?_wopen@@YAHPB_WHH@Z(wstr long long) _wopen
+@ cdecl -arch=win64 ?_wopen@@YAHPEB_WHH@Z(wstr long long) _wopen
+@ cdecl -arch=win32 ?_wsopen@@YAHPB_WHHH@Z(wstr long long long) _wsopen
+@ cdecl -arch=win64 ?_wsopen@@YAHPEB_WHHH@Z(wstr long long long) _wsopen
 @ thiscall -arch=i386 ?before@type_info@@QBEHABV1@@Z(ptr ptr) type_info_before
 @ cdecl -arch=win64 ?before@type_info@@QEBAHAEBV1@@Z(ptr ptr) type_info_before
 @ thiscall -arch=win32 ?name@type_info@@QBEPBDPAU__type_info_node@@@Z(ptr ptr) type_info_name_internal_method
@@ -311,8 +311,8 @@
 @ extern __winitenv MSVCRT___winitenv
 @ cdecl _abnormal_termination()
 @ cdecl -ret64 _abs64(int64)
-@ cdecl _access(str long) MSVCRT__access
-@ cdecl _access_s(str long) MSVCRT__access_s
+@ cdecl _access(str long)
+@ cdecl _access_s(str long)
 @ extern _acmdln MSVCRT__acmdln
 @ stdcall -arch=i386 _adj_fdiv_m16i(long)
 @ stdcall -arch=i386 _adj_fdiv_m32(long)
@@ -369,12 +369,12 @@
 @ cdecl _chdrive(long)
 @ cdecl _chgsign(double)
 @ cdecl -arch=i386 -norelay _chkesp()
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
-@ cdecl _chsize_s(long int64) MSVCRT__chsize_s
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
+@ cdecl _chsize_s(long int64)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ extern _commode MSVCRT__commode
 @ cdecl _configthreadlocale(long)
 @ cdecl _control87(long long)
@@ -390,7 +390,7 @@
 @ stub _cprintf_s_l
 @ cdecl _cputs(str)
 @ cdecl _cputws(wstr)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ cdecl _create_locale(long str)
 @ cdecl -arch=i386 _crt_debugger_hook(long)
 @ cdecl -arch=arm,win64 __crt_debugger_hook(long) _crt_debugger_hook
@@ -419,8 +419,8 @@
 @ cdecl _difftime64(int64 int64)
 @ stub _dosmaperr
 @ extern _dstbias MSVCRT__dstbias
-@ cdecl _dup(long) MSVCRT__dup
-@ cdecl _dup2(long long) MSVCRT__dup2
+@ cdecl _dup(long)
+@ cdecl _dup2(long long)
 @ cdecl _dupenv_s(ptr ptr str)
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _ecvt_s(str long double long ptr ptr)
@@ -429,7 +429,7 @@
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
 @ extern _environ MSVCRT__environ
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@@ -444,20 +444,20 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
-@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fclose_nolock(ptr)
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
 @ cdecl _fcvt_s(ptr long double long ptr ptr)
-@ cdecl _fdopen(long str) MSVCRT__fdopen
-@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock
-@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filbuf(ptr) MSVCRT__filbuf
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _fdopen(long str)
+@ cdecl _fflush_nolock(ptr)
+@ cdecl _fgetc_nolock(ptr)
+@ cdecl _fgetchar()
+@ cdecl _fgetwc_nolock(ptr)
+@ cdecl _fgetwchar()
+@ cdecl _filbuf(ptr)
+@ cdecl _filelength(long)
+@ cdecl -ret64 _filelengthi64(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst32(str ptr)
 @ stub _findfirst32i64
@@ -469,8 +469,8 @@
 @ cdecl _findnext64i32(long ptr)
 @ cdecl _finite(double)
 @ cdecl -arch=!i386 _finitef(float)
-@ cdecl _flsbuf(long ptr) MSVCRT__flsbuf
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flsbuf(long ptr)
+@ cdecl _flushall()
 @ extern _fmode MSVCRT__fmode
 @ cdecl _fpclass(double)
 @ cdecl -arch=!i386 _fpclassf(float)
@@ -480,29 +480,29 @@
 @ stub _fprintf_p
 @ stub _fprintf_p_l
 @ stub _fprintf_s_l
-@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
-@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
-@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
+@ cdecl _fputc_nolock(long ptr)
+@ cdecl _fputchar(long)
+@ cdecl _fputwc_nolock(long ptr)
+@ cdecl _fputwchar(long)
+@ cdecl _fread_nolock(ptr long long ptr)
+@ cdecl _fread_nolock_s(ptr long long long ptr)
 @ cdecl _free_locale(ptr)
 @ stub _freea
 @ stub _freea_s
 @ stub _freefls
 @ varargs _fscanf_l(ptr str ptr)
 @ varargs _fscanf_s_l(ptr str ptr)
-@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
-@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
-@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat32(long ptr) MSVCRT__fstat32
-@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64
-@ cdecl _fstat64(long ptr) MSVCRT__fstat64
-@ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32
-@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock
-@ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64
-@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock
+@ cdecl _fseek_nolock(ptr long long)
+@ cdecl _fseeki64(ptr int64 long)
+@ cdecl _fseeki64_nolock(ptr int64 long)
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat32(long ptr)
+@ cdecl _fstat32i64(long ptr)
+@ cdecl _fstat64(long ptr)
+@ cdecl _fstat64i32(long ptr)
+@ cdecl _ftell_nolock(ptr)
+@ cdecl -ret64 _ftelli64(ptr)
+@ cdecl -ret64 _ftelli64_nolock(ptr)
 @ cdecl _ftime32(ptr)
 @ cdecl _ftime32_s(ptr)
 @ cdecl _ftime64(ptr)
@@ -511,11 +511,11 @@
 @ cdecl _fullpath(ptr str long)
 @ cdecl _futime32(long ptr)
 @ cdecl _futime64(long ptr)
-@ varargs _fwprintf_l(ptr wstr ptr) MSVCRT__fwprintf_l
+@ varargs _fwprintf_l(ptr wstr ptr)
 @ stub _fwprintf_p
 @ stub _fwprintf_p_l
 @ stub _fwprintf_s_l
-@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock
+@ cdecl _fwrite_nolock(ptr long long ptr)
 @ varargs _fwscanf_l(ptr wstr ptr)
 @ varargs _fwscanf_s_l(ptr wstr ptr)
 @ cdecl _gcvt(double long str)
@@ -529,7 +529,7 @@
 @ cdecl _get_fmode(ptr)
 @ cdecl _get_heap_handle()
 @ cdecl _get_invalid_parameter_handler()
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _get_output_format()
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output()
@@ -540,7 +540,7 @@
 @ cdecl _get_tzname(ptr str long long)
 @ cdecl _get_unexpected()
 @ cdecl _get_wpgmptr(ptr)
-@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock
+@ cdecl _getc_nolock(ptr) _fgetc_nolock
 @ cdecl _getch()
 @ cdecl _getch_nolock()
 @ cdecl _getche()
@@ -552,18 +552,18 @@
 @ cdecl _getdllprocaddr(long str long)
 @ cdecl _getdrive()
 @ cdecl _getdrives() kernel32.GetLogicalDrives
-@ cdecl _getmaxstdio() MSVCRT__getmaxstdio
+@ cdecl _getmaxstdio()
 @ cdecl _getmbcp()
 @ cdecl _getpid() _getpid
 @ cdecl _getptd()
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
-@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock
+@ cdecl _getw(ptr)
+@ cdecl _getwc_nolock(ptr) _fgetwc_nolock
 @ cdecl _getwch()
 @ cdecl _getwch_nolock()
 @ cdecl _getwche()
 @ cdecl _getwche_nolock()
-@ cdecl _getws(ptr) MSVCRT__getws
+@ cdecl _getws(ptr)
 @ stub _getws_s
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _gmtime32(ptr)
@@ -594,7 +594,7 @@
 @ extern _iob MSVCRT__iob
 @ cdecl _isalnum_l(long ptr)
 @ cdecl _isalpha_l(long ptr)
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _iscntrl_l(long ptr)
 @ cdecl _isctype(long long)
 @ cdecl _isctype_l(long long ptr)
@@ -700,8 +700,8 @@
 @ cdecl _localtime64(ptr)
 @ cdecl _localtime64_s(ptr ptr)
 @ cdecl _lock(long)
-@ cdecl _lock_file(ptr) MSVCRT__lock_file
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _lock_file(ptr)
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl -arch=!i386 _logbf(float)
 @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp
@@ -709,8 +709,8 @@
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
 @ stub _lsearch_s
-@ cdecl _lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _lseek(long long long)
+@ cdecl -ret64 _lseeki64(long int64 long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltoa_s(long ptr long long)
 @ cdecl _ltow(long ptr long) ntdll._ltow
@@ -860,47 +860,47 @@
 @ cdecl _mkdir(str)
 @ cdecl _mkgmtime32(ptr)
 @ cdecl _mkgmtime64(ptr)
-@ cdecl _mktemp(str) MSVCRT__mktemp
-@ cdecl _mktemp_s(str long) MSVCRT__mktemp_s
+@ cdecl _mktemp(str)
+@ cdecl _mktemp_s(str long)
 @ cdecl _mktime32(ptr)
 @ cdecl _mktime64(ptr)
 @ cdecl _msize(ptr)
 @ cdecl _nextafter(double double)
 @ cdecl -arch=x86_64 _nextafterf(float float)
 @ cdecl _onexit(ptr)
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ stub -arch=i386 _outp(long long)
 @ stub -arch=i386 _outpd(long long)
 @ stub -arch=i386 _outpw(long long)
 @ cdecl _pclose(ptr)
 @ extern _pctype MSVCRT__pctype
 @ extern _pgmptr MSVCRT__pgmptr
-@ cdecl _pipe(ptr long long) MSVCRT__pipe
+@ cdecl _pipe(ptr long long)
 @ cdecl _popen(str str)
 @ stub _printf_l
 @ stub _printf_p
 @ stub _printf_p_l
 @ stub _printf_s_l
 @ cdecl _purecall()
-@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock
+@ cdecl _putc_nolock(long ptr) _fputc_nolock
 @ cdecl _putch(long)
 @ cdecl _putch_nolock(long)
 @ cdecl _putenv(str)
 @ cdecl _putenv_s(str str)
-@ cdecl _putw(long ptr) MSVCRT__putw
-@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
+@ cdecl _putw(long ptr)
+@ cdecl _putwc_nolock(long ptr) _fputwc_nolock
 @ cdecl _putwch(long)
 @ cdecl _putwch_nolock(long)
-@ cdecl _putws(wstr) MSVCRT__putws
+@ cdecl _putws(wstr)
 @ extern _pwctype MSVCRT__pwctype
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 @ cdecl _realloc_crt(ptr long) realloc
 @ cdecl _recalloc(ptr long long)
 @ stub _recalloc_crt
 @ cdecl _resetstkoflw()
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl -ret64 _rotl64(int64 long)
 @ cdecl _rotr(long long)
@@ -942,9 +942,9 @@
 @ cdecl _seterrormode(long)
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
 @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
-@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio
+@ cdecl _setmaxstdio(long)
 @ cdecl _setmbcp(long)
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str)
@@ -965,8 +965,8 @@
 @ varargs _snwscanf_l(wstr long wstr ptr)
 @ varargs _snwscanf_s(wstr long wstr)
 @ varargs _snwscanf_s_l(wstr long wstr ptr)
-@ varargs _sopen(str long long) MSVCRT__sopen
-@ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s
+@ varargs _sopen(str long long)
+@ cdecl _sopen_s(ptr str long long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -983,10 +983,10 @@
 @ varargs _sprintf_s_l(ptr long str ptr)
 @ varargs _sscanf_l(str str ptr)
 @ varargs _sscanf_s_l(str str ptr)
-@ cdecl _stat32(str ptr) MSVCRT__stat32
-@ cdecl _stat32i64(str ptr) MSVCRT__stat32i64
-@ cdecl _stat64(str ptr) MSVCRT_stat64
-@ cdecl _stat64i32(str ptr) MSVCRT__stat64i32
+@ cdecl _stat32(str ptr)
+@ cdecl _stat32i64(str ptr)
+@ cdecl _stat64(str ptr)
+@ cdecl _stat64i32(str ptr)
 @ cdecl _statusfp()
 @ cdecl -arch=i386 _statusfp2(ptr ptr)
 @ cdecl _strcoll_l(str str ptr)
@@ -1040,9 +1040,9 @@
 @ varargs _swscanf_s_l(wstr wstr ptr)
 @ extern _sys_errlist MSVCRT__sys_errlist
 @ extern _sys_nerr MSVCRT__sys_nerr
-@ cdecl _tell(long) MSVCRT__tell
+@ cdecl _tell(long)
 @ cdecl -ret64 _telli64(long)
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tempnam(str str)
 @ cdecl _time32(ptr)
 @ cdecl _time64(ptr)
 @ extern _timezone MSVCRT___timezone
@@ -1062,18 +1062,18 @@
 @ cdecl _ultoa_s(long ptr long long)
 @ cdecl _ultow(long ptr long) ntdll._ultow
 @ cdecl _ultow_s(long ptr long long)
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 @ stub _umask_s
-@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock
+@ cdecl _ungetc_nolock(long ptr)
 @ cdecl _ungetch(long)
 @ cdecl _ungetch_nolock(long)
-@ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock
+@ cdecl _ungetwc_nolock(long ptr)
 @ cdecl _ungetwch(long)
 @ cdecl _ungetwch_nolock(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
 @ cdecl _unlock(long)
-@ cdecl _unlock_file(ptr) MSVCRT__unlock_file
+@ cdecl _unlock_file(ptr)
 @ cdecl _utime32(str ptr)
 @ cdecl _utime64(str ptr)
 @ cdecl _vcprintf(str ptr)
@@ -1088,14 +1088,14 @@
 @ stub _vcwprintf_p_l
 @ stub _vcwprintf_s
 @ stub _vcwprintf_s_l
-@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
-@ cdecl _vfprintf_p(ptr str ptr) MSVCRT__vfprintf_p
-@ cdecl _vfprintf_p_l(ptr str ptr ptr) MSVCRT__vfprintf_p_l
-@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
-@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
-@ cdecl _vfwprintf_p(ptr wstr ptr) MSVCRT__vfwprintf_p
-@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_p_l
-@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
+@ cdecl _vfprintf_l(ptr str ptr ptr)
+@ cdecl _vfprintf_p(ptr str ptr)
+@ cdecl _vfprintf_p_l(ptr str ptr ptr)
+@ cdecl _vfprintf_s_l(ptr str ptr ptr)
+@ cdecl _vfwprintf_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_p(ptr wstr ptr)
+@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr)
 @ stub _vprintf_l
 @ stub _vprintf_p
 @ stub _vprintf_p_l
@@ -1133,15 +1133,15 @@
 @ stub _vwprintf_p
 @ stub _vwprintf_p_l
 @ stub _vwprintf_s_l
-@ cdecl _waccess(wstr long) MSVCRT__waccess
-@ cdecl _waccess_s(wstr long) MSVCRT__waccess_s
+@ cdecl _waccess(wstr long)
+@ cdecl _waccess_s(wstr long)
 @ cdecl _wasctime(ptr)
 @ cdecl _wasctime_s(ptr long ptr)
 @ cdecl _wassert(wstr wstr long)
 @ cdecl _wchdir(wstr)
-@ cdecl _wchmod(wstr long) MSVCRT__wchmod
+@ cdecl _wchmod(wstr long)
 @ extern _wcmdln MSVCRT__wcmdln
-@ cdecl _wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _wcreat(wstr long)
 @ cdecl _wcscoll_l(wstr wstr ptr)
 @ cdecl _wcsdup(wstr)
 @ cdecl _wcserror(long)
@@ -1197,7 +1197,7 @@
 @ cdecl _wexecve(wstr ptr ptr)
 @ cdecl _wexecvp(wstr ptr)
 @ cdecl _wexecvpe(wstr ptr ptr)
-@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _wfdopen(long wstr)
 @ cdecl _wfindfirst32(wstr ptr)
 @ stub _wfindfirst32i64
 @ cdecl _wfindfirst64(wstr ptr)
@@ -1206,11 +1206,11 @@
 @ stub _wfindnext32i64
 @ cdecl _wfindnext64(long ptr)
 @ cdecl _wfindnext64i32(long ptr)
-@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s
-@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s
-@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _wfopen(wstr wstr)
+@ cdecl _wfopen_s(ptr wstr wstr)
+@ cdecl _wfreopen(wstr wstr ptr)
+@ cdecl _wfreopen_s(ptr wstr wstr ptr)
+@ cdecl _wfsopen(wstr wstr long)
 @ cdecl _wfullpath(ptr wstr long)
 @ cdecl _wgetcwd(wstr long)
 @ cdecl _wgetdcwd(long wstr long)
@@ -1220,9 +1220,9 @@
 @ cdecl _wmakepath(ptr wstr wstr wstr wstr)
 @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr)
 @ cdecl _wmkdir(wstr)
-@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
-@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
-@ varargs _wopen(wstr long) MSVCRT__wopen
+@ cdecl _wmktemp(wstr)
+@ cdecl _wmktemp_s(wstr long)
+@ varargs _wopen(wstr long)
 @ cdecl _wperror(wstr)
 @ extern _wpgmptr MSVCRT__wpgmptr
 @ cdecl _wpopen(wstr wstr)
@@ -1232,17 +1232,17 @@
 @ stub _wprintf_s_l
 @ cdecl _wputenv(wstr)
 @ cdecl _wputenv_s(wstr wstr)
-@ cdecl _wremove(wstr) MSVCRT__wremove
-@ cdecl _wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _wremove(wstr)
+@ cdecl _wrename(wstr wstr)
+@ cdecl _write(long ptr long)
 @ cdecl _wrmdir(wstr)
 @ varargs _wscanf_l(wstr ptr)
 @ varargs _wscanf_s_l(wstr ptr)
 @ cdecl _wsearchenv(wstr wstr ptr)
 @ cdecl _wsearchenv_s(wstr wstr ptr long)
 @ cdecl _wsetlocale(long wstr)
-@ varargs _wsopen(wstr long long) MSVCRT__wsopen
-@ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s
+@ varargs _wsopen(wstr long long)
+@ cdecl _wsopen_s(ptr wstr long long long)
 @ varargs _wspawnl(long wstr wstr)
 @ varargs _wspawnle(long wstr wstr)
 @ varargs _wspawnlp(long wstr wstr)
@@ -1253,18 +1253,18 @@
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
 @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long)
-@ cdecl _wstat32(wstr ptr) MSVCRT__wstat32
-@ cdecl _wstat32i64(wstr ptr) MSVCRT__wstat32i64
-@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64
-@ cdecl _wstat64i32(wstr ptr) MSVCRT__wstat64i32
+@ cdecl _wstat32(wstr ptr)
+@ cdecl _wstat32i64(wstr ptr)
+@ cdecl _wstat64(wstr ptr)
+@ cdecl _wstat64i32(wstr ptr)
 @ cdecl _wstrdate(ptr)
 @ cdecl _wstrdate_s(ptr long)
 @ cdecl _wstrtime(ptr)
 @ cdecl _wstrtime_s(ptr long)
 @ cdecl _wsystem(wstr)
-@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
-@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
-@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s
+@ cdecl _wtempnam(wstr wstr)
+@ cdecl _wtmpnam(ptr)
+@ cdecl _wtmpnam_s(ptr long)
 @ cdecl _wtof(wstr)
 @ cdecl _wtof_l(wstr ptr)
 @ cdecl _wtoi(wstr)
@@ -1273,7 +1273,7 @@
 @ cdecl _wtoi_l(wstr ptr)
 @ cdecl _wtol(wstr)
 @ cdecl _wtol_l(wstr ptr)
-@ cdecl _wunlink(wstr) MSVCRT__wunlink
+@ cdecl _wunlink(wstr)
 @ cdecl _wutime32(wstr ptr)
 @ cdecl _wutime64(wstr ptr)
 @ cdecl _y0(double)
@@ -1301,8 +1301,8 @@
 @ cdecl calloc(long long)
 @ cdecl ceil(double)
 @ cdecl -arch=!i386 ceilf(float)
-@ cdecl clearerr(ptr) MSVCRT_clearerr
-@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s
+@ cdecl clearerr(ptr)
+@ cdecl clearerr_s(ptr)
 @ cdecl clock()
 @ cdecl cos(double)
 @ cdecl cosh(double)
@@ -1313,51 +1313,51 @@
 @ cdecl exp(double)
 @ cdecl -arch=!i386 expf(float)
 @ cdecl fabs(double)
-@ cdecl fclose(ptr) MSVCRT_fclose
-@ cdecl feof(ptr) MSVCRT_feof
-@ cdecl ferror(ptr) MSVCRT_ferror
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl fclose(ptr)
+@ cdecl feof(ptr)
+@ cdecl ferror(ptr)
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
+@ cdecl fgetws(ptr long ptr)
 @ cdecl floor(double)
 @ cdecl -arch=!i386 floorf(float)
 @ cdecl fmod(double double)
 @ cdecl -arch=!i386 fmodf(float float)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s
-@ varargs fprintf(ptr str) MSVCRT_fprintf
-@ varargs fprintf_s(ptr str) MSVCRT_fprintf_s
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fputws(wstr ptr) MSVCRT_fputws
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
+@ cdecl fopen(str str)
+@ cdecl fopen_s(ptr str str)
+@ varargs fprintf(ptr str)
+@ varargs fprintf_s(ptr str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fputws(wstr ptr)
+@ cdecl fread(ptr long long ptr)
+@ cdecl fread_s(ptr long long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
-@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
+@ cdecl freopen(str str ptr)
+@ cdecl freopen_s(ptr str str ptr)
 @ cdecl frexp(double ptr)
 @ varargs fscanf(ptr str)
 @ varargs fscanf_s(ptr str)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
-@ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ varargs fwprintf(ptr wstr)
+@ varargs fwprintf_s(ptr wstr)
+@ cdecl fwrite(ptr long long ptr)
 @ varargs fwscanf(ptr wstr)
 @ varargs fwscanf_s(ptr wstr)
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
 @ cdecl getenv_s(ptr ptr long str)
-@ cdecl gets(str) MSVCRT_gets
-@ cdecl gets_s(ptr long) MSVCRT_gets_s
-@ cdecl getwc(ptr) MSVCRT_getwc
-@ cdecl getwchar() MSVCRT_getwchar
+@ cdecl gets(str)
+@ cdecl gets_s(ptr long)
+@ cdecl getwc(ptr)
+@ cdecl getwchar()
 @ cdecl is_wctype(long long) iswctype
 @ cdecl isalnum(long)
 @ cdecl isalpha(long)
@@ -1414,28 +1414,28 @@
 @ cdecl perror(str)
 @ cdecl pow(double double)
 @ cdecl -arch=!i386 powf(float float)
-@ varargs printf(str) MSVCRT_printf
-@ varargs printf_s(str) MSVCRT_printf_s
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
-@ cdecl putwc(long ptr) MSVCRT_fputwc
-@ cdecl putwchar(long) MSVCRT__fputwchar
+@ varargs printf(str)
+@ varargs printf_s(str)
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
+@ cdecl putwc(long ptr) fputwc
+@ cdecl putwchar(long) _fputwchar
 @ cdecl qsort(ptr long long ptr)
 @ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
 @ cdecl rand()
 @ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
-@ cdecl remove(str) MSVCRT_remove
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl remove(str)
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ varargs scanf(str)
 @ varargs scanf_s(str)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl sinh(double)
@@ -1484,27 +1484,27 @@
 @ cdecl -arch=!i386 tanf(float)
 @ cdecl tanh(double)
 @ cdecl -arch=!i386 tanhf(float)
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
+@ cdecl tmpfile()
+@ cdecl tmpfile_s(ptr)
+@ cdecl tmpnam(ptr)
+@ cdecl tmpnam_s(ptr long)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towlower(long)
 @ cdecl towupper(long)
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
-@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
-@ cdecl vfprintf_s(ptr str ptr) MSVCRT_vfprintf_s
-@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
-@ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s
-@ cdecl vprintf(str ptr) MSVCRT_vprintf
-@ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
+@ cdecl vfprintf(ptr str ptr)
+@ cdecl vfprintf_s(ptr str ptr)
+@ cdecl vfwprintf(ptr wstr ptr)
+@ cdecl vfwprintf_s(ptr wstr ptr)
+@ cdecl vprintf(str ptr)
+@ cdecl vprintf_s(str ptr)
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl vsprintf_s(ptr long str ptr)
 @ cdecl vswprintf_s(ptr long wstr ptr)
-@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
-@ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s
+@ cdecl vwprintf(wstr ptr)
+@ cdecl vwprintf_s(wstr ptr)
 @ cdecl wcrtomb(ptr long ptr)
 @ cdecl wcrtomb_s(ptr ptr long long ptr)
 @ cdecl wcscat(wstr wstr)
@@ -1540,7 +1540,7 @@
 @ cdecl wctob(long)
 @ cdecl wctomb(ptr long)
 @ cdecl wctomb_s(ptr ptr long long)
-@ varargs wprintf(wstr) MSVCRT_wprintf
-@ varargs wprintf_s(wstr) MSVCRT_wprintf_s
+@ varargs wprintf(wstr)
+@ varargs wprintf_s(wstr)
 @ varargs wscanf(wstr)
 @ varargs wscanf_s(wstr)
diff --git a/dlls/msvcrt/errno.c b/dlls/msvcrt/errno.c
index c5ca6044183..592d37ced8a 100644
--- a/dlls/msvcrt/errno.c
+++ b/dlls/msvcrt/errno.c
@@ -18,6 +18,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
+#include <io.h>
 #include <stdio.h>
 #include <string.h>
 #include <stdarg.h>
@@ -340,11 +341,11 @@ void CDECL perror(const char* str)
 
     if (str && *str)
     {
-        MSVCRT__write( 2, str, strlen(str) );
-        MSVCRT__write( 2, ": ", 2 );
+        _write( 2, str, strlen(str) );
+        _write( 2, ": ", 2 );
     }
-    MSVCRT__write( 2, MSVCRT__sys_errlist[err], strlen(MSVCRT__sys_errlist[err]) );
-    MSVCRT__write( 2, "\n", 1 );
+    _write( 2, MSVCRT__sys_errlist[err], strlen(MSVCRT__sys_errlist[err]) );
+    _write( 2, "\n", 1 );
 }
 
 /*********************************************************************
diff --git a/dlls/msvcrt/exit.c b/dlls/msvcrt/exit.c
index 35ee05aea28..ee6c30356fd 100644
--- a/dlls/msvcrt/exit.c
+++ b/dlls/msvcrt/exit.c
@@ -296,7 +296,7 @@ void CDECL _wassert(const wchar_t* str, const wchar_t* file, unsigned int line)
     DoMessageBoxW(L"Assertion failed!", text);
   }
   else
-    MSVCRT_fwprintf(MSVCRT_stderr, L"Assertion failed: %ls, file %ls, line %d\n\n", str, file, line);
+    fwprintf(MSVCRT_stderr, L"Assertion failed: %ls, file %ls, line %d\n\n", str, file, line);
 
   raise(SIGABRT);
   _exit(3);
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index 7fa40409a82..1ef72c31057 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -27,8 +27,8 @@
  */
 
 #include <direct.h>
+#include <io.h>
 #include <stdarg.h>
-#include <stdio.h>
 #include <sys/types.h>
 #include <sys/utime.h>
 #include <time.h>
@@ -46,6 +46,25 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(msvcrt);
 
+#undef _fstat
+#undef _fstati64
+#undef _stat
+#undef _stati64
+#undef _wstat
+#undef _wstati64
+#undef _fstat32
+#undef _fstat32i64
+#undef _stat32i64
+#undef _stat32
+#undef _wstat32
+#undef _wstat32i64
+#undef _fstat64i32
+#undef _fstat64
+#undef _stat64
+#undef _stat64i32
+#undef _wstat64i32
+#undef _wstat64
+
 /* for stat mode, permissions apply to all,owner and group */
 #define ALL_S_IREAD  (MSVCRT__S_IREAD  | (MSVCRT__S_IREAD  >> 3) | (MSVCRT__S_IREAD  >> 6))
 #define ALL_S_IWRITE (MSVCRT__S_IWRITE | (MSVCRT__S_IWRITE >> 3) | (MSVCRT__S_IWRITE >> 6))
@@ -153,7 +172,7 @@ static CRITICAL_SECTION MSVCRT_file_cs = { &MSVCRT_file_cs_debug, -1, 0, 0, 0, 0
 #define LOCK_FILES()    do { EnterCriticalSection(&MSVCRT_file_cs); } while (0)
 #define UNLOCK_FILES()  do { LeaveCriticalSection(&MSVCRT_file_cs); } while (0)
 
-static void msvcrt_stat64_to_stat(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stat *buf)
+static void msvcrt_stat64_to_stat(const struct _stat64 *buf64, struct _stat *buf)
 {
     buf->st_dev   = buf64->st_dev;
     buf->st_ino   = buf64->st_ino;
@@ -168,7 +187,7 @@ static void msvcrt_stat64_to_stat(const struct MSVCRT__stat64 *buf64, struct MSV
     buf->st_ctime = buf64->st_ctime;
 }
 
-static void msvcrt_stat64_to_stati64(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stati64 *buf)
+static void msvcrt_stat64_to_stati64(const struct _stat64 *buf64, struct _stati64 *buf)
 {
     buf->st_dev   = buf64->st_dev;
     buf->st_ino   = buf64->st_ino;
@@ -183,7 +202,7 @@ static void msvcrt_stat64_to_stati64(const struct MSVCRT__stat64 *buf64, struct
     buf->st_ctime = buf64->st_ctime;
 }
 
-static void msvcrt_stat64_to_stat32(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stat32 *buf)
+static void msvcrt_stat64_to_stat32(const struct _stat64 *buf64, struct _stat32 *buf)
 {
     buf->st_dev   = buf64->st_dev;
     buf->st_ino   = buf64->st_ino;
@@ -198,7 +217,7 @@ static void msvcrt_stat64_to_stat32(const struct MSVCRT__stat64 *buf64, struct M
     buf->st_ctime = buf64->st_ctime;
 }
 
-static void msvcrt_stat64_to_stat64i32(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stat64i32 *buf)
+static void msvcrt_stat64_to_stat64i32(const struct _stat64 *buf64, struct _stat64i32 *buf)
 {
     buf->st_dev   = buf64->st_dev;
     buf->st_ino   = buf64->st_ino;
@@ -213,7 +232,7 @@ static void msvcrt_stat64_to_stat64i32(const struct MSVCRT__stat64 *buf64, struc
     buf->st_ctime = buf64->st_ctime;
 }
 
-static void msvcrt_stat64_to_stat32i64(const struct MSVCRT__stat64 *buf64, struct MSVCRT__stat32i64 *buf)
+static void msvcrt_stat64_to_stat32i64(const struct _stat64 *buf64, struct _stat32i64 *buf)
 {
     buf->st_dev   = buf64->st_dev;
     buf->st_ino   = buf64->st_ino;
@@ -657,7 +676,7 @@ static int msvcrt_flush_buffer(FILE* file)
     if((file->_flag & (_IOREAD|_IOWRT)) == _IOWRT &&
             file->_flag & (_IOMYBUF|MSVCRT__USERBUF)) {
         int cnt=file->_ptr-file->_base;
-        if(cnt>0 && MSVCRT__write(file->_file, file->_base, cnt) != cnt) {
+        if(cnt>0 && _write(file->_file, file->_base, cnt) != cnt) {
             file->_flag |= _IOERR;
             ret = EOF;
         } else if(file->_flag & _IORW) {
@@ -673,7 +692,7 @@ static int msvcrt_flush_buffer(FILE* file)
 /*********************************************************************
  *		_isatty (MSVCRT.@)
  */
-int CDECL MSVCRT__isatty(int fd)
+int CDECL _isatty(int fd)
 {
     TRACE(":fd (%d)\n",fd);
 
@@ -684,7 +703,7 @@ int CDECL MSVCRT__isatty(int fd)
 static BOOL msvcrt_alloc_buffer(FILE* file)
 {
     if((file->_file==STDOUT_FILENO || file->_file==STDERR_FILENO)
-            && MSVCRT__isatty(file->_file))
+            && _isatty(file->_file))
         return FALSE;
 
     file->_base = calloc(1, MSVCRT_INTERNAL_BUFSIZ);
@@ -708,7 +727,7 @@ static BOOL add_std_buffer(FILE *file)
 
     if((file->_file!=STDOUT_FILENO && file->_file!=STDERR_FILENO)
             || (file->_flag & (_IONBF | _IOMYBUF | MSVCRT__USERBUF))
-            || !MSVCRT__isatty(file->_file))
+            || !_isatty(file->_file))
         return FALSE;
 
     file->_ptr = file->_base = buffers[file->_file == STDOUT_FILENO ? 0 : 1];
@@ -790,7 +809,7 @@ FILE * CDECL __iob_func(void)
 /*********************************************************************
  *		__acrt_iob_func(UCRTBASE.@)
  */
-FILE * CDECL MSVCRT___acrt_iob_func(unsigned idx)
+FILE * CDECL __acrt_iob_func(unsigned idx)
 {
  return &MSVCRT__iob[idx];
 }
@@ -799,7 +818,7 @@ FILE * CDECL MSVCRT___acrt_iob_func(unsigned idx)
 /*********************************************************************
  *		_access (MSVCRT.@)
  */
-int CDECL MSVCRT__access(const char *filename, int mode)
+int CDECL _access(const char *filename, int mode)
 {
   DWORD attr = GetFileAttributesA(filename);
 
@@ -821,12 +840,12 @@ int CDECL MSVCRT__access(const char *filename, int mode)
 /*********************************************************************
  *		_access_s (MSVCRT.@)
  */
-int CDECL MSVCRT__access_s(const char *filename, int mode)
+int CDECL _access_s(const char *filename, int mode)
 {
   if (!MSVCRT_CHECK_PMT(filename != NULL)) return *_errno();
   if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return *_errno();
 
-  if (MSVCRT__access(filename, mode) == -1)
+  if (_access(filename, mode) == -1)
     return *_errno();
   return 0;
 }
@@ -834,7 +853,7 @@ int CDECL MSVCRT__access_s(const char *filename, int mode)
 /*********************************************************************
  *		_waccess (MSVCRT.@)
  */
-int CDECL MSVCRT__waccess(const wchar_t *filename, int mode)
+int CDECL _waccess(const wchar_t *filename, int mode)
 {
   DWORD attr = GetFileAttributesW(filename);
 
@@ -856,12 +875,12 @@ int CDECL MSVCRT__waccess(const wchar_t *filename, int mode)
 /*********************************************************************
  *		_waccess_s (MSVCRT.@)
  */
-int CDECL MSVCRT__waccess_s(const wchar_t *filename, int mode)
+int CDECL _waccess_s(const wchar_t *filename, int mode)
 {
   if (!MSVCRT_CHECK_PMT(filename != NULL)) return *_errno();
   if (!MSVCRT_CHECK_PMT((mode & ~(MSVCRT_R_OK | MSVCRT_W_OK)) == 0)) return *_errno();
 
-  if (MSVCRT__waccess(filename, mode) == -1)
+  if (_waccess(filename, mode) == -1)
     return *_errno();
   return 0;
 }
@@ -869,7 +888,7 @@ int CDECL MSVCRT__waccess_s(const wchar_t *filename, int mode)
 /*********************************************************************
  *		_chmod (MSVCRT.@)
  */
-int CDECL MSVCRT__chmod(const char *path, int flags)
+int CDECL _chmod(const char *path, int flags)
 {
   DWORD oldFlags = GetFileAttributesA(path);
 
@@ -888,7 +907,7 @@ int CDECL MSVCRT__chmod(const char *path, int flags)
 /*********************************************************************
  *		_wchmod (MSVCRT.@)
  */
-int CDECL MSVCRT__wchmod(const wchar_t *path, int flags)
+int CDECL _wchmod(const wchar_t *path, int flags)
 {
   DWORD oldFlags = GetFileAttributesW(path);
 
@@ -907,7 +926,7 @@ int CDECL MSVCRT__wchmod(const wchar_t *path, int flags)
 /*********************************************************************
  *		_unlink (MSVCRT.@)
  */
-int CDECL MSVCRT__unlink(const char *path)
+int CDECL _unlink(const char *path)
 {
   TRACE("%s\n",debugstr_a(path));
   if(DeleteFileA(path))
@@ -920,7 +939,7 @@ int CDECL MSVCRT__unlink(const char *path)
 /*********************************************************************
  *		_wunlink (MSVCRT.@)
  */
-int CDECL MSVCRT__wunlink(const wchar_t *path)
+int CDECL _wunlink(const wchar_t *path)
 {
   TRACE("(%s)\n",debugstr_w(path));
   if(DeleteFileW(path))
@@ -933,7 +952,7 @@ int CDECL MSVCRT__wunlink(const wchar_t *path)
 /*********************************************************************
  *		_commit (MSVCRT.@)
  */
-int CDECL MSVCRT__commit(int fd)
+int CDECL _commit(int fd)
 {
     ioinfo *info = get_ioinfo(fd);
     int ret;
@@ -968,9 +987,6 @@ int CDECL MSVCRT__commit(int fd)
     return ret;
 }
 
-/* flush_all_buffers calls MSVCRT_fflush which calls flush_all_buffers */
-int CDECL MSVCRT_fflush(FILE* file);
-
 /* INTERNAL: Flush all stream buffer */
 static int msvcrt_flush_all_buffers(int mask)
 {
@@ -984,7 +1000,7 @@ static int msvcrt_flush_all_buffers(int mask)
     if (file->_flag)
     {
       if(file->_flag & mask) {
-	MSVCRT_fflush(file);
+	fflush(file);
         num_flushed++;
       }
     }
@@ -998,7 +1014,7 @@ static int msvcrt_flush_all_buffers(int mask)
 /*********************************************************************
  *		_flushall (MSVCRT.@)
  */
-int CDECL MSVCRT__flushall(void)
+int CDECL _flushall(void)
 {
     return msvcrt_flush_all_buffers(_IOWRT | _IOREAD);
 }
@@ -1006,7 +1022,7 @@ int CDECL MSVCRT__flushall(void)
 /*********************************************************************
  *		fflush (MSVCRT.@)
  */
-int CDECL MSVCRT_fflush(FILE* file)
+int CDECL fflush(FILE* file)
 {
     int ret;
 
@@ -1014,9 +1030,9 @@ int CDECL MSVCRT_fflush(FILE* file)
         msvcrt_flush_all_buffers(_IOWRT);
         ret = 0;
     } else {
-        MSVCRT__lock_file(file);
-        ret = MSVCRT__fflush_nolock(file);
-        MSVCRT__unlock_file(file);
+        _lock_file(file);
+        ret = _fflush_nolock(file);
+        _unlock_file(file);
     }
 
     return ret;
@@ -1025,7 +1041,7 @@ int CDECL MSVCRT_fflush(FILE* file)
 /*********************************************************************
  *		_fflush_nolock (MSVCRT.@)
  */
-int CDECL MSVCRT__fflush_nolock(FILE* file)
+int CDECL _fflush_nolock(FILE* file)
 {
     int res;
 
@@ -1036,14 +1052,14 @@ int CDECL MSVCRT__fflush_nolock(FILE* file)
 
     res = msvcrt_flush_buffer(file);
     if(!res && (file->_flag & MSVCRT__IOCOMMIT))
-        res = MSVCRT__commit(file->_file) ? EOF : 0;
+        res = _commit(file->_file) ? EOF : 0;
     return res;
 }
 
 /*********************************************************************
  *		_close (MSVCRT.@)
  */
-int CDECL MSVCRT__close(int fd)
+int CDECL _close(int fd)
 {
   ioinfo *info = get_ioinfo(fd);
   int ret;
@@ -1082,7 +1098,7 @@ int CDECL MSVCRT__close(int fd)
  * indicate file descriptors duplicated with _dup and _dup2 are always
  * inheritable.
  */
-int CDECL MSVCRT__dup2(int od, int nd)
+int CDECL _dup2(int od, int nd)
 {
   ioinfo *info_od, *info_nd;
   int ret;
@@ -1114,7 +1130,7 @@ int CDECL MSVCRT__dup2(int od, int nd)
       int wxflag = info_od->wxflag & ~MSVCRT__O_NOINHERIT;
 
       if (info_nd->wxflag & WX_OPEN)
-        MSVCRT__close(nd);
+        _close(nd);
 
       msvcrt_set_fd(info_nd, handle, wxflag);
       /* _dup2 returns 0, not nd, on success */
@@ -1140,12 +1156,12 @@ int CDECL MSVCRT__dup2(int od, int nd)
 /*********************************************************************
  *		_dup (MSVCRT.@)
  */
-int CDECL MSVCRT__dup(int od)
+int CDECL _dup(int od)
 {
   int fd, ret;
   ioinfo *info = get_ioinfo_alloc(&fd);
  
-  if (MSVCRT__dup2(od, fd) == 0)
+  if (_dup2(od, fd) == 0)
     ret = fd;
   else
     ret = -1;
@@ -1156,7 +1172,7 @@ int CDECL MSVCRT__dup(int od)
 /*********************************************************************
  *		_eof (MSVCRT.@)
  */
-int CDECL MSVCRT__eof(int fd)
+int CDECL _eof(int fd)
 {
   ioinfo *info = get_ioinfo(fd);
   DWORD curpos,endpos;
@@ -1196,7 +1212,7 @@ int CDECL MSVCRT__eof(int fd)
 /*********************************************************************
  *		_fcloseall (MSVCRT.@)
  */
-int CDECL MSVCRT__fcloseall(void)
+int CDECL _fcloseall(void)
 {
   int num_closed = 0, i;
   FILE *file;
@@ -1205,7 +1221,7 @@ int CDECL MSVCRT__fcloseall(void)
   for (i = 3; i < MSVCRT_stream_idx; i++) {
     file = msvcrt_get_file(i);
 
-    if (file->_flag && !MSVCRT_fclose(file))
+    if (file->_flag && !fclose(file))
       num_closed++;
   }
   UNLOCK_FILES();
@@ -1220,8 +1236,8 @@ void msvcrt_free_io(void)
     unsigned int i;
     int j;
 
-    MSVCRT__flushall();
-    MSVCRT__fcloseall();
+    _flushall();
+    _fcloseall();
 
     for(i=0; i<ARRAY_SIZE(MSVCRT___pioinfo); i++)
     {
@@ -1253,7 +1269,7 @@ void msvcrt_free_io(void)
 /*********************************************************************
  *		_lseeki64 (MSVCRT.@)
  */
-__int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence)
+__int64 CDECL _lseeki64(int fd, __int64 offset, int whence)
 {
   ioinfo *info = get_ioinfo(fd);
   LARGE_INTEGER ofs;
@@ -1301,15 +1317,15 @@ __int64 CDECL MSVCRT__lseeki64(int fd, __int64 offset, int whence)
 /*********************************************************************
  *		_lseek (MSVCRT.@)
  */
-LONG CDECL MSVCRT__lseek(int fd, LONG offset, int whence)
+__msvcrt_long CDECL _lseek(int fd, __msvcrt_long offset, int whence)
 {
-    return MSVCRT__lseeki64(fd, offset, whence);
+    return _lseeki64(fd, offset, whence);
 }
 
 /*********************************************************************
  *              _lock_file (MSVCRT.@)
  */
-void CDECL MSVCRT__lock_file(FILE *file)
+void CDECL _lock_file(FILE *file)
 {
     if(file>=MSVCRT__iob && file<MSVCRT__iob+_IOB_ENTRIES)
         _lock(_STREAM_LOCKS+(file-MSVCRT__iob));
@@ -1320,7 +1336,7 @@ void CDECL MSVCRT__lock_file(FILE *file)
 /*********************************************************************
  *              _unlock_file (MSVCRT.@)
  */
-void CDECL MSVCRT__unlock_file(FILE *file)
+void CDECL _unlock_file(FILE *file)
 {
     if(file>=MSVCRT__iob && file<MSVCRT__iob+_IOB_ENTRIES)
         _unlock(_STREAM_LOCKS+(file-MSVCRT__iob));
@@ -1333,7 +1349,7 @@ void CDECL MSVCRT__unlock_file(FILE *file)
  *
  * This is untested; the underlying LockFile doesn't work yet.
  */
-int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes)
+int CDECL _locking(int fd, int mode, __msvcrt_long nbytes)
 {
   ioinfo *info = get_ioinfo(fd);
   BOOL ret;
@@ -1353,7 +1369,7 @@ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes)
     return -1;
   }
 
-  TRACE(":fd (%d) by 0x%08x mode %s\n",
+  TRACE(":fd (%d) by 0x%08Ix mode %s\n",
         fd,nbytes,(mode==MSVCRT__LK_UNLCK)?"_LK_UNLCK":
         (mode==MSVCRT__LK_LOCK)?"_LK_LOCK":
         (mode==MSVCRT__LK_NBLCK)?"_LK_NBLCK":
@@ -1391,13 +1407,13 @@ int CDECL MSVCRT__locking(int fd, int mode, LONG nbytes)
 /*********************************************************************
  *		_fseeki64 (MSVCRT.@)
  */
-int CDECL MSVCRT__fseeki64(FILE* file, __int64 offset, int whence)
+int CDECL _fseeki64(FILE* file, __int64 offset, int whence)
 {
     int ret;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__fseeki64_nolock(file, offset, whence);
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _fseeki64_nolock(file, offset, whence);
+    _unlock_file(file);
 
     return ret;
 }
@@ -1405,13 +1421,13 @@ int CDECL MSVCRT__fseeki64(FILE* file, __int64 offset, int whence)
 /*********************************************************************
  *		_fseeki64_nolock (MSVCRT.@)
  */
-int CDECL MSVCRT__fseeki64_nolock(FILE* file, __int64 offset, int whence)
+int CDECL _fseeki64_nolock(FILE* file, __int64 offset, int whence)
 {
   int ret;
 
   if(whence == SEEK_CUR && file->_flag & _IOREAD ) {
       whence = SEEK_SET;
-      offset += MSVCRT__ftelli64_nolock(file);
+      offset += _ftelli64_nolock(file);
   }
 
   /* Flush output if needed */
@@ -1422,7 +1438,7 @@ int CDECL MSVCRT__fseeki64_nolock(FILE* file, __int64 offset, int whence)
   }
   /* Clear end of file flag */
   file->_flag &= ~_IOEOF;
-  ret = (MSVCRT__lseeki64(file->_file,offset,whence) == -1)?-1:0;
+  ret = (_lseeki64(file->_file,offset,whence) == -1)?-1:0;
 
   return ret;
 }
@@ -1430,23 +1446,23 @@ int CDECL MSVCRT__fseeki64_nolock(FILE* file, __int64 offset, int whence)
 /*********************************************************************
  *		fseek (MSVCRT.@)
  */
-int CDECL MSVCRT_fseek(FILE* file, __msvcrt_long offset, int whence)
+int CDECL fseek(FILE* file, __msvcrt_long offset, int whence)
 {
-    return MSVCRT__fseeki64( file, offset, whence );
+    return _fseeki64( file, offset, whence );
 }
 
 /*********************************************************************
  *		_fseek_nolock (MSVCRT.@)
  */
-int CDECL MSVCRT__fseek_nolock(FILE* file, __msvcrt_long offset, int whence)
+int CDECL _fseek_nolock(FILE* file, __msvcrt_long offset, int whence)
 {
-    return MSVCRT__fseeki64_nolock( file, offset, whence );
+    return _fseeki64_nolock( file, offset, whence );
 }
 
 /*********************************************************************
  *		_chsize_s (MSVCRT.@)
  */
-int CDECL MSVCRT__chsize_s(int fd, __int64 size)
+int CDECL _chsize_s(int fd, __int64 size)
 {
     ioinfo *info;
     __int64 cur, pos;
@@ -1461,10 +1477,10 @@ int CDECL MSVCRT__chsize_s(int fd, __int64 size)
     if (info->handle != INVALID_HANDLE_VALUE)
     {
         /* save the current file pointer */
-        cur = MSVCRT__lseeki64(fd, 0, SEEK_CUR);
+        cur = _lseeki64(fd, 0, SEEK_CUR);
         if (cur >= 0)
         {
-            pos = MSVCRT__lseeki64(fd, size, SEEK_SET);
+            pos = _lseeki64(fd, size, SEEK_SET);
             if (pos >= 0)
             {
                 ret = SetEndOfFile(info->handle);
@@ -1472,7 +1488,7 @@ int CDECL MSVCRT__chsize_s(int fd, __int64 size)
             }
 
             /* restore the file pointer */
-            MSVCRT__lseeki64(fd, cur, SEEK_SET);
+            _lseeki64(fd, cur, SEEK_SET);
         }
     }
 
@@ -1483,50 +1499,50 @@ int CDECL MSVCRT__chsize_s(int fd, __int64 size)
 /*********************************************************************
  *		_chsize (MSVCRT.@)
  */
-int CDECL MSVCRT__chsize(int fd, __msvcrt_long size)
+int CDECL _chsize(int fd, __msvcrt_long size)
 {
     /* _chsize_s returns errno on failure but _chsize should return -1 */
-    return MSVCRT__chsize_s( fd, size ) == 0 ? 0 : -1;
+    return _chsize_s( fd, size ) == 0 ? 0 : -1;
 }
 
 /*********************************************************************
  *		clearerr (MSVCRT.@)
  */
-void CDECL MSVCRT_clearerr(FILE* file)
+void CDECL clearerr(FILE* file)
 {
   TRACE(":file (%p) fd (%d)\n",file,file->_file);
 
-  MSVCRT__lock_file(file);
+  _lock_file(file);
   file->_flag &= ~(_IOERR | _IOEOF);
-  MSVCRT__unlock_file(file);
+  _unlock_file(file);
 }
 
 /*********************************************************************
  *		clearerr_s (MSVCRT.@)
  */
-int CDECL MSVCRT_clearerr_s(FILE* file)
+int CDECL clearerr_s(FILE* file)
 {
   TRACE(":file (%p)\n",file);
 
   if (!MSVCRT_CHECK_PMT(file != NULL)) return EINVAL;
 
-  MSVCRT__lock_file(file);
+  _lock_file(file);
   file->_flag &= ~(_IOERR | _IOEOF);
-  MSVCRT__unlock_file(file);
+  _unlock_file(file);
   return 0;
 }
 
 /*********************************************************************
  *		rewind (MSVCRT.@)
  */
-void CDECL MSVCRT_rewind(FILE* file)
+void CDECL rewind(FILE* file)
 {
   TRACE(":file (%p) fd (%d)\n",file,file->_file);
 
-  MSVCRT__lock_file(file);
-  MSVCRT__fseek_nolock(file, 0L, SEEK_SET);
-  MSVCRT_clearerr(file);
-  MSVCRT__unlock_file(file);
+  _lock_file(file);
+  _fseek_nolock(file, 0L, SEEK_SET);
+  clearerr(file);
+  _unlock_file(file);
 }
 
 static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_flags)
@@ -1643,14 +1659,14 @@ static int msvcrt_get_flags(const wchar_t* mode, int *open_flags, int* stream_fl
 /*********************************************************************
  *		_fdopen (MSVCRT.@)
  */
-FILE* CDECL MSVCRT__fdopen(int fd, const char *mode)
+FILE* CDECL _fdopen(int fd, const char *mode)
 {
     FILE *ret;
     wchar_t *modeW = NULL;
 
     if (mode && !(modeW = msvcrt_wstrdupa(mode))) return NULL;
 
-    ret = MSVCRT__wfdopen(fd, modeW);
+    ret = _wfdopen(fd, modeW);
 
     free(modeW);
     return ret;
@@ -1659,7 +1675,7 @@ FILE* CDECL MSVCRT__fdopen(int fd, const char *mode)
 /*********************************************************************
  *		_wfdopen (MSVCRT.@)
  */
-FILE* CDECL MSVCRT__wfdopen(int fd, const wchar_t *mode)
+FILE* CDECL _wfdopen(int fd, const wchar_t *mode)
 {
   int open_flags, stream_flags;
   FILE* file;
@@ -1683,16 +1699,16 @@ FILE* CDECL MSVCRT__wfdopen(int fd, const wchar_t *mode)
 /*********************************************************************
  *		_filelength (MSVCRT.@)
  */
-LONG CDECL MSVCRT__filelength(int fd)
+__msvcrt_long CDECL _filelength(int fd)
 {
-  LONG curPos = MSVCRT__lseek(fd, 0, SEEK_CUR);
+  LONG curPos = _lseek(fd, 0, SEEK_CUR);
   if (curPos != -1)
   {
-    LONG endPos = MSVCRT__lseek(fd, 0, SEEK_END);
+    LONG endPos = _lseek(fd, 0, SEEK_END);
     if (endPos != -1)
     {
       if (endPos != curPos)
-        MSVCRT__lseek(fd, curPos, SEEK_SET);
+        _lseek(fd, curPos, SEEK_SET);
       return endPos;
     }
   }
@@ -1702,16 +1718,16 @@ LONG CDECL MSVCRT__filelength(int fd)
 /*********************************************************************
  *		_filelengthi64 (MSVCRT.@)
  */
-__int64 CDECL MSVCRT__filelengthi64(int fd)
+__int64 CDECL _filelengthi64(int fd)
 {
-  __int64 curPos = MSVCRT__lseeki64(fd, 0, SEEK_CUR);
+  __int64 curPos = _lseeki64(fd, 0, SEEK_CUR);
   if (curPos != -1)
   {
-    __int64 endPos = MSVCRT__lseeki64(fd, 0, SEEK_END);
+    __int64 endPos = _lseeki64(fd, 0, SEEK_END);
     if (endPos != -1)
     {
       if (endPos != curPos)
-        MSVCRT__lseeki64(fd, curPos, SEEK_SET);
+        _lseeki64(fd, curPos, SEEK_SET);
       return endPos;
     }
   }
@@ -1721,7 +1737,7 @@ __int64 CDECL MSVCRT__filelengthi64(int fd)
 /*********************************************************************
  *		_fileno (MSVCRT.@)
  */
-int CDECL MSVCRT__fileno(FILE* file)
+int CDECL _fileno(FILE* file)
 {
   TRACE(":FILE* (%p) fd (%d)\n",file,file->_file);
   return file->_file;
@@ -1730,7 +1746,7 @@ int CDECL MSVCRT__fileno(FILE* file)
 /*********************************************************************
  *		_fstat64 (MSVCRT.@)
  */
-int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf)
+int CDECL _fstat64(int fd, struct _stat64* buf)
 {
   ioinfo *info = get_ioinfo(fd);
   DWORD dw;
@@ -1753,7 +1769,7 @@ int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf)
   }
 
   memset(&hfi, 0, sizeof(hfi));
-  memset(buf, 0, sizeof(struct MSVCRT__stat64));
+  memset(buf, 0, sizeof(struct _stat64));
   type = GetFileType(info->handle);
   if (type == FILE_TYPE_PIPE)
   {
@@ -1795,25 +1811,25 @@ int CDECL MSVCRT__fstat64(int fd, struct MSVCRT__stat64* buf)
 /*********************************************************************
  *		_fstati64 (MSVCRT.@)
  */
-int CDECL MSVCRT__fstati64(int fd, struct MSVCRT__stati64* buf)
+int CDECL _fstati64(int fd, struct _stati64* buf)
 {
   int ret;
-  struct MSVCRT__stat64 buf64;
+  struct _stat64 buf64;
 
-  ret = MSVCRT__fstat64(fd, &buf64);
+  ret = _fstat64(fd, &buf64);
   if (!ret)
     msvcrt_stat64_to_stati64(&buf64, buf);
   return ret;
 }
 
 /*********************************************************************
- *		_fstat (MSVCRT.@)
+ *             _fstat (MSVCRT.@)
  */
-int CDECL MSVCRT__fstat(int fd, struct MSVCRT__stat* buf)
+int CDECL _fstat(int fd, struct _stat* buf)
 { int ret;
-  struct MSVCRT__stat64 buf64;
+  struct _stat64 buf64;
 
-  ret = MSVCRT__fstat64(fd, &buf64);
+  ret = _fstat64(fd, &buf64);
   if (!ret)
       msvcrt_stat64_to_stat(&buf64, buf);
   return ret;
@@ -1822,12 +1838,12 @@ int CDECL MSVCRT__fstat(int fd, struct MSVCRT__stat* buf)
 /*********************************************************************
  *		_fstat32 (MSVCR80.@)
  */
-int CDECL MSVCRT__fstat32(int fd, struct MSVCRT__stat32* buf)
+int CDECL _fstat32(int fd, struct _stat32* buf)
 {
     int ret;
-    struct MSVCRT__stat64 buf64;
+    struct _stat64 buf64;
 
-    ret = MSVCRT__fstat64(fd, &buf64);
+    ret = _fstat64(fd, &buf64);
     if (!ret)
         msvcrt_stat64_to_stat32(&buf64, buf);
     return ret;
@@ -1836,12 +1852,12 @@ int CDECL MSVCRT__fstat32(int fd, struct MSVCRT__stat32* buf)
 /*********************************************************************
  *		_fstat32i64 (MSVCR80.@)
  */
-int CDECL MSVCRT__fstat32i64(int fd, struct MSVCRT__stat32i64* buf)
+int CDECL _fstat32i64(int fd, struct _stat32i64* buf)
 {
     int ret;
-    struct MSVCRT__stat64 buf64;
+    struct _stat64 buf64;
 
-    ret = MSVCRT__fstat64(fd, &buf64);
+    ret = _fstat64(fd, &buf64);
     if (!ret)
         msvcrt_stat64_to_stat32i64(&buf64, buf);
     return ret;
@@ -1850,12 +1866,12 @@ int CDECL MSVCRT__fstat32i64(int fd, struct MSVCRT__stat32i64* buf)
 /*********************************************************************
  *		_fstat64i32 (MSVCR80.@)
  */
-int CDECL MSVCRT__fstat64i32(int fd, struct MSVCRT__stat64i32* buf)
+int CDECL _fstat64i32(int fd, struct _stat64i32* buf)
 {
     int ret;
-    struct MSVCRT__stat64 buf64;
+    struct _stat64 buf64;
 
-    ret = MSVCRT__fstat64(fd, &buf64);
+    ret = _fstat64(fd, &buf64);
     if (!ret)
         msvcrt_stat64_to_stat64i32(&buf64, buf);
     return ret;
@@ -1909,7 +1925,7 @@ int CDECL _futime32(int fd, struct __utimbuf32 *t)
 /*********************************************************************
  *		_get_osfhandle (MSVCRT.@)
  */
-intptr_t CDECL MSVCRT__get_osfhandle(int fd)
+intptr_t CDECL _get_osfhandle(int fd)
 {
   HANDLE hand = get_ioinfo_nolock(fd)->handle;
   TRACE(":fd (%d) handle (%p)\n",fd,hand);
@@ -1922,7 +1938,7 @@ intptr_t CDECL MSVCRT__get_osfhandle(int fd)
 /*********************************************************************
  *		_mktemp_s (MSVCRT.@)
  */
-int CDECL MSVCRT__mktemp_s(char *pattern, size_t size)
+int CDECL _mktemp_s(char *pattern, size_t size)
 {
     DWORD len, xno, id;
 
@@ -1961,7 +1977,7 @@ int CDECL MSVCRT__mktemp_s(char *pattern, size_t size)
 /*********************************************************************
  *		_mktemp (MSVCRT.@)
  */
-char * CDECL MSVCRT__mktemp(char *pattern)
+char * CDECL _mktemp(char *pattern)
 {
   int numX = 0;
   char *retVal = pattern;
@@ -1997,7 +2013,7 @@ char * CDECL MSVCRT__mktemp(char *pattern)
 /*********************************************************************
  *		_wmktemp_s (MSVCRT.@)
  */
-int CDECL MSVCRT__wmktemp_s(wchar_t *pattern, size_t size)
+int CDECL _wmktemp_s(wchar_t *pattern, size_t size)
 {
     DWORD len, xno, id;
 
@@ -2036,7 +2052,7 @@ int CDECL MSVCRT__wmktemp_s(wchar_t *pattern, size_t size)
 /*********************************************************************
  *		_wmktemp (MSVCRT.@)
  */
-wchar_t * CDECL MSVCRT__wmktemp(wchar_t *pattern)
+wchar_t * CDECL _wmktemp(wchar_t *pattern)
 {
   int numX = 0;
   wchar_t *retVal = pattern;
@@ -2104,7 +2120,7 @@ static unsigned split_oflags(unsigned oflags)
 /*********************************************************************
  *              _pipe (MSVCRT.@)
  */
-int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode)
+int CDECL _pipe(int *pfds, unsigned int psize, int textmode)
 {
   int ret = -1;
   SECURITY_ATTRIBUTES sa;
@@ -2136,7 +2152,7 @@ int CDECL MSVCRT__pipe(int *pfds, unsigned int psize, int textmode)
       }
       else
       {
-        MSVCRT__close(pfds[0]);
+        _close(pfds[0]);
         CloseHandle(writeHandle);
         *_errno() = EMFILE;
       }
@@ -2178,7 +2194,7 @@ static int check_bom(HANDLE h, int oflags, BOOL seek)
 /*********************************************************************
  *              _wsopen_dispatch (UCRTBASE.@)
  */
-int CDECL MSVCRT__wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pmode,
+int CDECL _wsopen_dispatch( const wchar_t* path, int oflags, int shflags, int pmode,
     int *fd, int secure )
 {
   DWORD access = 0, creation = 0, attrib;
@@ -2346,15 +2362,15 @@ int CDECL MSVCRT__wsopen_dispatch( const wchar_t* path, int oflags, int shflags,
 /*********************************************************************
  *              _wsopen_s (MSVCRT.@)
  */
-int CDECL MSVCRT__wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int pmode )
+int CDECL _wsopen_s( int *fd, const wchar_t* path, int oflags, int shflags, int pmode )
 {
-    return MSVCRT__wsopen_dispatch( path, oflags, shflags, pmode, fd, 1 );
+    return _wsopen_dispatch( path, oflags, shflags, pmode, fd, 1 );
 }
 
 /*********************************************************************
  *              _wsopen (MSVCRT.@)
  */
-int WINAPIV MSVCRT__wsopen( const wchar_t *path, int oflags, int shflags, ... )
+int WINAPIV _wsopen( const wchar_t *path, int oflags, int shflags, ... )
 {
   int pmode;
   int fd;
@@ -2370,14 +2386,14 @@ int WINAPIV MSVCRT__wsopen( const wchar_t *path, int oflags, int shflags, ... )
   else
     pmode = 0;
 
-  return MSVCRT__wsopen_dispatch(path, oflags, shflags, pmode, &fd, 0) ? -1 : fd;
+  return _wsopen_dispatch(path, oflags, shflags, pmode, &fd, 0) ? -1 : fd;
 }
 
 
 /*********************************************************************
  *              _sopen_dispatch (UCRTBASE.@)
  */
-int CDECL MSVCRT__sopen_dispatch( const char *path, int oflags, int shflags,
+int CDECL _sopen_dispatch( const char *path, int oflags, int shflags,
     int pmode, int *fd, int secure)
 {
     wchar_t *pathW;
@@ -2389,7 +2405,7 @@ int CDECL MSVCRT__sopen_dispatch( const char *path, int oflags, int shflags,
     if(!MSVCRT_CHECK_PMT(path && (pathW = msvcrt_wstrdupa(path))))
         return EINVAL;
 
-    ret = MSVCRT__wsopen_dispatch(pathW, oflags, shflags, pmode, fd, secure);
+    ret = _wsopen_dispatch(pathW, oflags, shflags, pmode, fd, secure);
     free(pathW);
     return ret;
 }
@@ -2397,15 +2413,15 @@ int CDECL MSVCRT__sopen_dispatch( const char *path, int oflags, int shflags,
 /*********************************************************************
  *              _sopen_s (MSVCRT.@)
  */
-int CDECL MSVCRT__sopen_s( int *fd, const char *path, int oflags, int shflags, int pmode )
+int CDECL _sopen_s( int *fd, const char *path, int oflags, int shflags, int pmode )
 {
-    return MSVCRT__sopen_dispatch(path, oflags, shflags, pmode, fd, 1);
+    return _sopen_dispatch(path, oflags, shflags, pmode, fd, 1);
 }
 
 /*********************************************************************
  *              _sopen (MSVCRT.@)
  */
-int WINAPIV MSVCRT__sopen( const char *path, int oflags, int shflags, ... )
+int WINAPIV _sopen( const char *path, int oflags, int shflags, ... )
 {
   int pmode;
   int fd;
@@ -2421,13 +2437,13 @@ int WINAPIV MSVCRT__sopen( const char *path, int oflags, int shflags, ... )
   else
     pmode = 0;
 
-  return MSVCRT__sopen_dispatch(path, oflags, shflags, pmode, &fd, 0) ? -1 : fd;
+  return _sopen_dispatch(path, oflags, shflags, pmode, &fd, 0) ? -1 : fd;
 }
 
 /*********************************************************************
  *              _open (MSVCRT.@)
  */
-int WINAPIV MSVCRT__open( const char *path, int flags, ... )
+int WINAPIV _open( const char *path, int flags, ... )
 {
   __ms_va_list ap;
 
@@ -2437,16 +2453,16 @@ int WINAPIV MSVCRT__open( const char *path, int flags, ... )
     __ms_va_start(ap, flags);
     pmode = va_arg(ap, int);
     __ms_va_end(ap);
-    return MSVCRT__sopen( path, flags, MSVCRT__SH_DENYNO, pmode );
+    return _sopen( path, flags, MSVCRT__SH_DENYNO, pmode );
   }
   else
-    return MSVCRT__sopen( path, flags, MSVCRT__SH_DENYNO);
+    return _sopen( path, flags, MSVCRT__SH_DENYNO);
 }
 
 /*********************************************************************
  *              _wopen (MSVCRT.@)
  */
-int WINAPIV MSVCRT__wopen(const wchar_t *path,int flags,...)
+int WINAPIV _wopen(const wchar_t *path,int flags,...)
 {
   __ms_va_list ap;
 
@@ -2456,34 +2472,34 @@ int WINAPIV MSVCRT__wopen(const wchar_t *path,int flags,...)
     __ms_va_start(ap, flags);
     pmode = va_arg(ap, int);
     __ms_va_end(ap);
-    return MSVCRT__wsopen( path, flags, MSVCRT__SH_DENYNO, pmode );
+    return _wsopen( path, flags, MSVCRT__SH_DENYNO, pmode );
   }
   else
-    return MSVCRT__wsopen( path, flags, MSVCRT__SH_DENYNO);
+    return _wsopen( path, flags, MSVCRT__SH_DENYNO);
 }
 
 /*********************************************************************
  *		_creat (MSVCRT.@)
  */
-int CDECL MSVCRT__creat(const char *path, int pmode)
+int CDECL _creat(const char *path, int pmode)
 {
   int flags = MSVCRT__O_CREAT | MSVCRT__O_TRUNC | MSVCRT__O_RDWR;
-  return MSVCRT__open(path, flags, pmode);
+  return _open(path, flags, pmode);
 }
 
 /*********************************************************************
  *		_wcreat (MSVCRT.@)
  */
-int CDECL MSVCRT__wcreat(const wchar_t *path, int pmode)
+int CDECL _wcreat(const wchar_t *path, int pmode)
 {
   int flags = MSVCRT__O_CREAT | MSVCRT__O_TRUNC | MSVCRT__O_RDWR;
-  return MSVCRT__wopen(path, flags, pmode);
+  return _wopen(path, flags, pmode);
 }
 
 /*********************************************************************
  *		_open_osfhandle (MSVCRT.@)
  */
-int CDECL MSVCRT__open_osfhandle(intptr_t handle, int oflags)
+int CDECL _open_osfhandle(intptr_t handle, int oflags)
 {
   DWORD flags;
   int fd;
@@ -2520,7 +2536,7 @@ int CDECL MSVCRT__open_osfhandle(intptr_t handle, int oflags)
 /*********************************************************************
  *		_rmtmp (MSVCRT.@)
  */
-int CDECL MSVCRT__rmtmp(void)
+int CDECL _rmtmp(void)
 {
   int num_removed = 0, i;
   FILE *file;
@@ -2531,7 +2547,7 @@ int CDECL MSVCRT__rmtmp(void)
 
     if (file->_tmpfname)
     {
-      MSVCRT_fclose(file);
+      fclose(file);
       num_removed++;
     }
   }
@@ -2893,7 +2909,7 @@ static int read_i(int fd, ioinfo *fdinfo, void *buf, unsigned int count)
 /*********************************************************************
  *		_read (MSVCRT.@)
  */
-int CDECL MSVCRT__read(int fd, void *buf, unsigned int count)
+int CDECL _read(int fd, void *buf, unsigned int count)
 {
     ioinfo *info;
     int num_read;
@@ -2912,7 +2928,7 @@ int CDECL MSVCRT__read(int fd, void *buf, unsigned int count)
 /*********************************************************************
  *		_setmode (MSVCRT.@)
  */
-int CDECL MSVCRT__setmode(int fd,int mode)
+int CDECL _setmode(int fd,int mode)
 {
     ioinfo *info = get_ioinfo(fd);
     int ret = info->wxflag & WX_TEXT ? MSVCRT__O_TEXT : MSVCRT__O_BINARY;
@@ -2953,7 +2969,7 @@ int CDECL MSVCRT__setmode(int fd,int mode)
 /*********************************************************************
  *		_stat64 (MSVCRT.@)
  */
-int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf)
+int CDECL _stat64(const char* path, struct _stat64 * buf)
 {
   DWORD dw;
   WIN32_FILE_ATTRIBUTE_DATA hfi;
@@ -3035,26 +3051,26 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf)
 /*********************************************************************
  *		_stati64 (MSVCRT.@)
  */
-int CDECL MSVCRT_stati64(const char* path, struct MSVCRT__stati64 * buf)
+int CDECL _stati64(const char* path, struct _stati64 * buf)
 {
   int ret;
-  struct MSVCRT__stat64 buf64;
+  struct _stat64 buf64;
 
-  ret = MSVCRT_stat64(path, &buf64);
+  ret = _stat64(path, &buf64);
   if (!ret)
     msvcrt_stat64_to_stati64(&buf64, buf);
   return ret;
 }
 
 /*********************************************************************
- *		_stat (MSVCRT.@)
+ *             _stat (MSVCRT.@)
  */
-int CDECL MSVCRT_stat(const char* path, struct MSVCRT__stat * buf)
+int CDECL _stat(const char* path, struct _stat * buf)
 {
   int ret;
-  struct MSVCRT__stat64 buf64;
+  struct _stat64 buf64;
 
-  ret = MSVCRT_stat64( path, &buf64);
+  ret = _stat64( path, &buf64);
   if (!ret)
       msvcrt_stat64_to_stat(&buf64, buf);
   return ret;
@@ -3065,12 +3081,12 @@ int CDECL MSVCRT_stat(const char* path, struct MSVCRT__stat * buf)
 /*********************************************************************
  *  _stat32 (MSVCR80.@)
  */
-int CDECL MSVCRT__stat32(const char *path, struct MSVCRT__stat32 *buf)
+int CDECL _stat32(const char *path, struct _stat32 *buf)
 {
     int ret;
-    struct MSVCRT__stat64 buf64;
+    struct _stat64 buf64;
 
-    ret = MSVCRT_stat64(path, &buf64);
+    ret = _stat64(path, &buf64);
     if (!ret)
         msvcrt_stat64_to_stat32(&buf64, buf);
     return ret;
@@ -3079,12 +3095,12 @@ int CDECL MSVCRT__stat32(const char *path, struct MSVCRT__stat32 *buf)
 /*********************************************************************
  *  _stat32i64 (MSVCR80.@)
  */
-int CDECL MSVCRT__stat32i64(const char *path, struct MSVCRT__stat32i64 *buf)
+int CDECL _stat32i64(const char *path, struct _stat32i64 *buf)
 {
     int ret;
-    struct MSVCRT__stat64 buf64;
+    struct _stat64 buf64;
 
-    ret = MSVCRT_stat64(path, &buf64);
+    ret = _stat64(path, &buf64);
     if (!ret)
         msvcrt_stat64_to_stat32i64(&buf64, buf);
     return ret;
@@ -3093,12 +3109,12 @@ int CDECL MSVCRT__stat32i64(const char *path, struct MSVCRT__stat32i64 *buf)
 /*********************************************************************
  * _stat64i32 (MSVCR80.@)
  */
-int CDECL MSVCRT__stat64i32(const char* path, struct MSVCRT__stat64i32 *buf)
+int CDECL _stat64i32(const char* path, struct _stat64i32 *buf)
 {
     int ret;
-    struct MSVCRT__stat64 buf64;
+    struct _stat64 buf64;
 
-    ret = MSVCRT_stat64(path, &buf64);
+    ret = _stat64(path, &buf64);
     if (!ret)
         msvcrt_stat64_to_stat64i32(&buf64, buf);
     return ret;
@@ -3109,7 +3125,7 @@ int CDECL MSVCRT__stat64i32(const char* path, struct MSVCRT__stat64i32 *buf)
 /*********************************************************************
  *		_wstat64 (MSVCRT.@)
  */
-int CDECL MSVCRT__wstat64(const wchar_t* path, struct MSVCRT__stat64 * buf)
+int CDECL _wstat64(const wchar_t* path, struct _stat64 * buf)
 {
   DWORD dw;
   WIN32_FILE_ATTRIBUTE_DATA hfi;
@@ -3186,26 +3202,26 @@ int CDECL MSVCRT__wstat64(const wchar_t* path, struct MSVCRT__stat64 * buf)
 /*********************************************************************
  *		_wstati64 (MSVCRT.@)
  */
-int CDECL MSVCRT__wstati64(const wchar_t* path, struct MSVCRT__stati64 * buf)
+int CDECL _wstati64(const wchar_t* path, struct _stati64 * buf)
 {
   int ret;
-  struct MSVCRT__stat64 buf64;
+  struct _stat64 buf64;
 
-  ret = MSVCRT__wstat64(path, &buf64);
+  ret = _wstat64(path, &buf64);
   if (!ret)
     msvcrt_stat64_to_stati64(&buf64, buf);
   return ret;
 }
 
 /*********************************************************************
- *		_wstat (MSVCRT.@)
+ *             _wstat (MSVCRT.@)
  */
-int CDECL MSVCRT__wstat(const wchar_t* path, struct MSVCRT__stat * buf)
+int CDECL _wstat(const wchar_t* path, struct _stat * buf)
 {
   int ret;
-  struct MSVCRT__stat64 buf64;
+  struct _stat64 buf64;
 
-  ret = MSVCRT__wstat64( path, &buf64 );
+  ret = _wstat64( path, &buf64 );
   if (!ret) msvcrt_stat64_to_stat(&buf64, buf);
   return ret;
 }
@@ -3215,12 +3231,12 @@ int CDECL MSVCRT__wstat(const wchar_t* path, struct MSVCRT__stat * buf)
 /*********************************************************************
  *  _wstat32 (MSVCR80.@)
  */
-int CDECL MSVCRT__wstat32(const wchar_t *path, struct MSVCRT__stat32 *buf)
+int CDECL _wstat32(const wchar_t *path, struct _stat32 *buf)
 {
     int ret;
-    struct MSVCRT__stat64 buf64;
+    struct _stat64 buf64;
 
-    ret = MSVCRT__wstat64(path, &buf64);
+    ret = _wstat64(path, &buf64);
     if (!ret)
         msvcrt_stat64_to_stat32(&buf64, buf);
     return ret;
@@ -3229,12 +3245,12 @@ int CDECL MSVCRT__wstat32(const wchar_t *path, struct MSVCRT__stat32 *buf)
 /*********************************************************************
  *  _wstat32i64 (MSVCR80.@)
  */
-int CDECL MSVCRT__wstat32i64(const wchar_t *path, struct MSVCRT__stat32i64 *buf)
+int CDECL _wstat32i64(const wchar_t *path, struct _stat32i64 *buf)
 {
     int ret;
-    struct MSVCRT__stat64 buf64;
+    struct _stat64 buf64;
 
-    ret = MSVCRT__wstat64(path, &buf64);
+    ret = _wstat64(path, &buf64);
     if (!ret)
         msvcrt_stat64_to_stat32i64(&buf64, buf);
     return ret;
@@ -3243,12 +3259,12 @@ int CDECL MSVCRT__wstat32i64(const wchar_t *path, struct MSVCRT__stat32i64 *buf)
 /*********************************************************************
  * _wstat64i32 (MSVCR80.@)
  */
-int CDECL MSVCRT__wstat64i32(const wchar_t *path, struct MSVCRT__stat64i32 *buf)
+int CDECL _wstat64i32(const wchar_t *path, struct _stat64i32 *buf)
 {
     int ret;
-    struct MSVCRT__stat64 buf64;
+    struct _stat64 buf64;
 
-    ret = MSVCRT__wstat64(path, &buf64);
+    ret = _wstat64(path, &buf64);
     if (!ret)
         msvcrt_stat64_to_stat64i32(&buf64, buf);
     return ret;
@@ -3259,9 +3275,9 @@ int CDECL MSVCRT__wstat64i32(const wchar_t *path, struct MSVCRT__stat64i32 *buf)
 /*********************************************************************
  *		_tell (MSVCRT.@)
  */
-__msvcrt_long CDECL MSVCRT__tell(int fd)
+__msvcrt_long CDECL _tell(int fd)
 {
-  return MSVCRT__lseek(fd, 0, SEEK_CUR);
+  return _lseek(fd, 0, SEEK_CUR);
 }
 
 /*********************************************************************
@@ -3269,13 +3285,13 @@ __msvcrt_long CDECL MSVCRT__tell(int fd)
  */
 __int64 CDECL _telli64(int fd)
 {
-  return MSVCRT__lseeki64(fd, 0, SEEK_CUR);
+  return _lseeki64(fd, 0, SEEK_CUR);
 }
 
 /*********************************************************************
  *		_tempnam (MSVCRT.@)
  */
-char * CDECL MSVCRT__tempnam(const char *dir, const char *prefix)
+char * CDECL _tempnam(const char *dir, const char *prefix)
 {
   char tmpbuf[MAX_PATH];
   const char *tmp_dir = getenv("TMP");
@@ -3296,7 +3312,7 @@ char * CDECL MSVCRT__tempnam(const char *dir, const char *prefix)
 /*********************************************************************
  *		_wtempnam (MSVCRT.@)
  */
-wchar_t * CDECL MSVCRT__wtempnam(const wchar_t *dir, const wchar_t *prefix)
+wchar_t * CDECL _wtempnam(const wchar_t *dir, const wchar_t *prefix)
 {
   wchar_t tmpbuf[MAX_PATH];
   const wchar_t *tmp_dir = _wgetenv(L"TMP");
@@ -3317,7 +3333,7 @@ wchar_t * CDECL MSVCRT__wtempnam(const wchar_t *dir, const wchar_t *prefix)
 /*********************************************************************
  *		_umask (MSVCRT.@)
  */
-int CDECL MSVCRT__umask(int umask)
+int CDECL _umask(int umask)
 {
   int old_umask = MSVCRT_umask;
   TRACE("(%d)\n",umask);
@@ -3330,12 +3346,12 @@ int CDECL MSVCRT__umask(int umask)
  */
 int CDECL _utime64(const char* path, struct __utimbuf64 *t)
 {
-  int fd = MSVCRT__open(path, MSVCRT__O_WRONLY | MSVCRT__O_BINARY);
+  int fd = _open(path, MSVCRT__O_WRONLY | MSVCRT__O_BINARY);
 
   if (fd > 0)
   {
     int retVal = _futime64(fd, t);
-    MSVCRT__close(fd);
+    _close(fd);
     return retVal;
   }
   return -1;
@@ -3362,12 +3378,12 @@ int CDECL _utime32(const char* path, struct __utimbuf32 *t)
  */
 int CDECL _wutime64(const wchar_t* path, struct __utimbuf64 *t)
 {
-  int fd = MSVCRT__wopen(path, MSVCRT__O_WRONLY | MSVCRT__O_BINARY);
+  int fd = _wopen(path, MSVCRT__O_WRONLY | MSVCRT__O_BINARY);
 
   if (fd > 0)
   {
     int retVal = _futime64(fd, t);
-    MSVCRT__close(fd);
+    _close(fd);
     return retVal;
   }
   return -1;
@@ -3392,7 +3408,7 @@ int CDECL _wutime32(const wchar_t* path, struct __utimbuf32 *t)
 /*********************************************************************
  *		_write (MSVCRT.@)
  */
-int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
+int CDECL _write(int fd, const void* buf, unsigned int count)
 {
     ioinfo *info = get_ioinfo(fd);
     HANDLE hand = info->handle;
@@ -3415,7 +3431,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
 
     /* If appending, go to EOF */
     if (info->wxflag & WX_APPEND)
-        MSVCRT__lseek(fd, 0, FILE_END);
+        _lseek(fd, 0, FILE_END);
 
     if (!(info->wxflag & WX_TEXT))
     {
@@ -3432,7 +3448,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
         return num_written;
     }
 
-    if (MSVCRT__isatty(fd)) console = VerifyConsoleIoHandle(hand);
+    if (_isatty(fd)) console = VerifyConsoleIoHandle(hand);
     for (i = 0; i < count;)
     {
         const char *s = buf;
@@ -3565,32 +3581,32 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
 /*********************************************************************
  *		_putw (MSVCRT.@)
  */
-int CDECL MSVCRT__putw(int val, FILE* file)
+int CDECL _putw(int val, FILE* file)
 {
   int len;
 
-  MSVCRT__lock_file(file);
-  len = MSVCRT__write(file->_file, &val, sizeof(val));
+  _lock_file(file);
+  len = _write(file->_file, &val, sizeof(val));
   if (len == sizeof(val)) {
-    MSVCRT__unlock_file(file);
+    _unlock_file(file);
     return val;
   }
 
   file->_flag |= _IOERR;
-  MSVCRT__unlock_file(file);
+  _unlock_file(file);
   return EOF;
 }
 
 /*********************************************************************
  *		fclose (MSVCRT.@)
  */
-int CDECL MSVCRT_fclose(FILE* file)
+int CDECL fclose(FILE* file)
 {
   int ret;
 
-  MSVCRT__lock_file(file);
-  ret = MSVCRT__fclose_nolock(file);
-  MSVCRT__unlock_file(file);
+  _lock_file(file);
+  ret = _fclose_nolock(file);
+  _unlock_file(file);
 
   return ret;
 }
@@ -3598,7 +3614,7 @@ int CDECL MSVCRT_fclose(FILE* file)
 /*********************************************************************
  *		_fclose_nolock (MSVCRT.@)
  */
-int CDECL MSVCRT__fclose_nolock(FILE* file)
+int CDECL _fclose_nolock(FILE* file)
 {
   int r, flag;
 
@@ -3613,11 +3629,11 @@ int CDECL MSVCRT__fclose_nolock(FILE* file)
   file->_tmpfname = NULL;
   /* flush stdio buffers */
   if(file->_flag & _IOWRT)
-      MSVCRT__fflush_nolock(file);
+      _fflush_nolock(file);
   if(file->_flag & _IOMYBUF)
       free(file->_base);
 
-  r=MSVCRT__close(file->_file);
+  r=_close(file->_file);
   file->_flag = 0;
 
   return ((r == -1) || (flag & _IOERR) ? EOF : 0);
@@ -3626,7 +3642,7 @@ int CDECL MSVCRT__fclose_nolock(FILE* file)
 /*********************************************************************
  *		feof (MSVCRT.@)
  */
-int CDECL MSVCRT_feof(FILE* file)
+int CDECL feof(FILE* file)
 {
     return file->_flag & _IOEOF;
 }
@@ -3634,7 +3650,7 @@ int CDECL MSVCRT_feof(FILE* file)
 /*********************************************************************
  *		ferror (MSVCRT.@)
  */
-int CDECL MSVCRT_ferror(FILE* file)
+int CDECL ferror(FILE* file)
 {
     return file->_flag & _IOERR;
 }
@@ -3642,7 +3658,7 @@ int CDECL MSVCRT_ferror(FILE* file)
 /*********************************************************************
  *		_filbuf (MSVCRT.@)
  */
-int CDECL MSVCRT__filbuf(FILE* file)
+int CDECL _filbuf(FILE* file)
 {
     unsigned char c;
 
@@ -3662,14 +3678,14 @@ int CDECL MSVCRT__filbuf(FILE* file)
 
     if(!(file->_flag & (_IOMYBUF | MSVCRT__USERBUF))) {
         int r;
-        if ((r = MSVCRT__read(file->_file,&c,1)) != 1) {
+        if ((r = _read(file->_file,&c,1)) != 1) {
             file->_flag |= (r == 0) ? _IOEOF : _IOERR;
             return EOF;
         }
 
         return c;
     } else {
-        file->_cnt = MSVCRT__read(file->_file, file->_base, file->_bufsiz);
+        file->_cnt = _read(file->_file, file->_base, file->_bufsiz);
         if(file->_cnt<=0) {
             file->_flag |= (file->_cnt == 0) ? _IOEOF : _IOERR;
             file->_cnt = 0;
@@ -3686,13 +3702,13 @@ int CDECL MSVCRT__filbuf(FILE* file)
 /*********************************************************************
  *		fgetc (MSVCRT.@)
  */
-int CDECL MSVCRT_fgetc(FILE* file)
+int CDECL fgetc(FILE* file)
 {
     int ret;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__fgetc_nolock(file);
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _fgetc_nolock(file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -3700,7 +3716,7 @@ int CDECL MSVCRT_fgetc(FILE* file)
 /*********************************************************************
  *		_fgetc_nolock (MSVCRT.@)
  */
-int CDECL MSVCRT__fgetc_nolock(FILE* file)
+int CDECL _fgetc_nolock(FILE* file)
 {
   unsigned char *i;
   unsigned int j;
@@ -3710,7 +3726,7 @@ int CDECL MSVCRT__fgetc_nolock(FILE* file)
     i = (unsigned char *)file->_ptr++;
     j = *i;
   } else
-    j = MSVCRT__filbuf(file);
+    j = _filbuf(file);
 
   return j;
 }
@@ -3718,15 +3734,15 @@ int CDECL MSVCRT__fgetc_nolock(FILE* file)
 /*********************************************************************
  *		_fgetchar (MSVCRT.@)
  */
-int CDECL MSVCRT__fgetchar(void)
+int CDECL _fgetchar(void)
 {
-  return MSVCRT_fgetc(MSVCRT_stdin);
+  return fgetc(MSVCRT_stdin);
 }
 
 /*********************************************************************
  *		fgets (MSVCRT.@)
  */
-char * CDECL MSVCRT_fgets(char *s, int size, FILE* file)
+char * CDECL fgets(char *s, int size, FILE* file)
 {
   int    cc = EOF;
   char * buf_start = s;
@@ -3734,9 +3750,9 @@ char * CDECL MSVCRT_fgets(char *s, int size, FILE* file)
   TRACE(":file(%p) fd (%d) str (%p) len (%d)\n",
 	file,file->_file,s,size);
 
-  MSVCRT__lock_file(file);
+  _lock_file(file);
 
-  while ((size >1) && (cc = MSVCRT__fgetc_nolock(file)) != EOF && cc != '\n')
+  while ((size >1) && (cc = _fgetc_nolock(file)) != EOF && cc != '\n')
     {
       *s++ = (char)cc;
       size --;
@@ -3744,27 +3760,27 @@ char * CDECL MSVCRT_fgets(char *s, int size, FILE* file)
   if ((cc == EOF) && (s == buf_start)) /* If nothing read, return 0*/
   {
     TRACE(":nothing read\n");
-    MSVCRT__unlock_file(file);
+    _unlock_file(file);
     return NULL;
   }
   if ((cc != EOF) && (size > 1))
     *s++ = cc;
   *s = '\0';
   TRACE(":got %s\n", debugstr_a(buf_start));
-  MSVCRT__unlock_file(file);
+  _unlock_file(file);
   return buf_start;
 }
 
 /*********************************************************************
  *		fgetwc (MSVCRT.@)
  */
-wint_t CDECL MSVCRT_fgetwc(FILE* file)
+wint_t CDECL fgetwc(FILE* file)
 {
     wint_t ret;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__fgetwc_nolock(file);
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _fgetwc_nolock(file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -3772,7 +3788,7 @@ wint_t CDECL MSVCRT_fgetwc(FILE* file)
 /*********************************************************************
  *		_fgetwc_nolock (MSVCRT.@)
  */
-wint_t CDECL MSVCRT__fgetwc_nolock(FILE* file)
+wint_t CDECL _fgetwc_nolock(FILE* file)
 {
     wint_t ret;
     int ch;
@@ -3782,7 +3798,7 @@ wint_t CDECL MSVCRT__fgetwc_nolock(FILE* file)
         char *p;
 
         for(p=(char*)&ret; (wint_t*)p<&ret+1; p++) {
-            ch = MSVCRT__fgetc_nolock(file);
+            ch = _fgetc_nolock(file);
             if(ch == EOF) {
                 ret = WEOF;
                 break;
@@ -3793,11 +3809,11 @@ wint_t CDECL MSVCRT__fgetwc_nolock(FILE* file)
         char mbs[MB_LEN_MAX];
         int len = 0;
 
-        ch = MSVCRT__fgetc_nolock(file);
+        ch = _fgetc_nolock(file);
         if(ch != EOF) {
             mbs[0] = (char)ch;
             if(isleadbyte((unsigned char)mbs[0])) {
-                ch = MSVCRT__fgetc_nolock(file);
+                ch = _fgetc_nolock(file);
                 if(ch != EOF) {
                     mbs[1] = (char)ch;
                     len = 2;
@@ -3817,56 +3833,56 @@ wint_t CDECL MSVCRT__fgetwc_nolock(FILE* file)
 /*********************************************************************
  *		_getw (MSVCRT.@)
  */
-int CDECL MSVCRT__getw(FILE* file)
+int CDECL _getw(FILE* file)
 {
   char *ch;
   int i, k;
   unsigned int j;
   ch = (char *)&i;
 
-  MSVCRT__lock_file(file);
+  _lock_file(file);
   for (j=0; j<sizeof(int); j++) {
-    k = MSVCRT__fgetc_nolock(file);
+    k = _fgetc_nolock(file);
     if (k == EOF) {
       file->_flag |= _IOEOF;
-      MSVCRT__unlock_file(file);
+      _unlock_file(file);
       return EOF;
     }
     ch[j] = k;
   }
 
-  MSVCRT__unlock_file(file);
+  _unlock_file(file);
   return i;
 }
 
 /*********************************************************************
  *		getwc (MSVCRT.@)
  */
-wint_t CDECL MSVCRT_getwc(FILE* file)
+wint_t CDECL getwc(FILE* file)
 {
-  return MSVCRT_fgetwc(file);
+  return fgetwc(file);
 }
 
 /*********************************************************************
  *		_fgetwchar (MSVCRT.@)
  */
-wint_t CDECL MSVCRT__fgetwchar(void)
+wint_t CDECL _fgetwchar(void)
 {
-  return MSVCRT_fgetwc(MSVCRT_stdin);
+  return fgetwc(MSVCRT_stdin);
 }
 
 /*********************************************************************
  *		getwchar (MSVCRT.@)
  */
-wint_t CDECL MSVCRT_getwchar(void)
+wint_t CDECL getwchar(void)
 {
-  return MSVCRT__fgetwchar();
+  return _fgetwchar();
 }
 
 /*********************************************************************
  *              fgetws (MSVCRT.@)
  */
-wchar_t * CDECL MSVCRT_fgetws(wchar_t *s, int size, FILE* file)
+wchar_t * CDECL fgetws(wchar_t *s, int size, FILE* file)
 {
   wint_t cc = WEOF;
   wchar_t * buf_start = s;
@@ -3874,9 +3890,9 @@ wchar_t * CDECL MSVCRT_fgetws(wchar_t *s, int size, FILE* file)
   TRACE(":file(%p) fd (%d) str (%p) len (%d)\n",
         file,file->_file,s,size);
 
-  MSVCRT__lock_file(file);
+  _lock_file(file);
 
-  while ((size >1) && (cc = MSVCRT__fgetwc_nolock(file)) != WEOF && cc != '\n')
+  while ((size >1) && (cc = _fgetwc_nolock(file)) != WEOF && cc != '\n')
     {
       *s++ = cc;
       size --;
@@ -3884,21 +3900,21 @@ wchar_t * CDECL MSVCRT_fgetws(wchar_t *s, int size, FILE* file)
   if ((cc == WEOF) && (s == buf_start)) /* If nothing read, return 0*/
   {
     TRACE(":nothing read\n");
-    MSVCRT__unlock_file(file);
+    _unlock_file(file);
     return NULL;
   }
   if ((cc != WEOF) && (size > 1))
     *s++ = cc;
   *s = 0;
   TRACE(":got %s\n", debugstr_w(buf_start));
-  MSVCRT__unlock_file(file);
+  _unlock_file(file);
   return buf_start;
 }
 
 /*********************************************************************
  *		_flsbuf (MSVCRT.@)
  */
-int CDECL MSVCRT__flsbuf(int c, FILE* file)
+int CDECL _flsbuf(int c, FILE* file)
 {
     /* Flush output buffer */
     if(!(file->_flag & (_IONBF | _IOMYBUF | MSVCRT__USERBUF))) {
@@ -3941,7 +3957,7 @@ int CDECL MSVCRT__flsbuf(int c, FILE* file)
         int len;
         /* set _cnt to 0 for unbuffered FILEs */
         file->_cnt = 0;
-        len = MSVCRT__write(file->_file, &cc, 1);
+        len = _write(file->_file, &cc, 1);
         if (len == 1)
             return c & 0xff;
         file->_flag |= _IOERR;
@@ -3952,13 +3968,13 @@ int CDECL MSVCRT__flsbuf(int c, FILE* file)
 /*********************************************************************
  *		fwrite (MSVCRT.@)
  */
-size_t CDECL MSVCRT_fwrite(const void *ptr, size_t size, size_t nmemb, FILE* file)
+size_t CDECL fwrite(const void *ptr, size_t size, size_t nmemb, FILE* file)
 {
     size_t ret;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__fwrite_nolock(ptr, size, nmemb, file);
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _fwrite_nolock(ptr, size, nmemb, file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -3966,7 +3982,7 @@ size_t CDECL MSVCRT_fwrite(const void *ptr, size_t size, size_t nmemb, FILE* fil
 /*********************************************************************
  *		_fwrite_nolock (MSVCRT.@)
  */
-size_t CDECL MSVCRT__fwrite_nolock(const void *ptr, size_t size, size_t nmemb, FILE* file)
+size_t CDECL _fwrite_nolock(const void *ptr, size_t size, size_t nmemb, FILE* file)
 {
     size_t wrcnt=size * nmemb;
     int written = 0;
@@ -4004,7 +4020,7 @@ size_t CDECL MSVCRT__fwrite_nolock(const void *ptr, size_t size, size_t nmemb, F
             if(msvcrt_flush_buffer(file) == EOF)
                 break;
 
-            if(MSVCRT__write(file->_file, ptr, pcnt) <= 0) {
+            if(_write(file->_file, ptr, pcnt) <= 0) {
                 file->_flag |= _IOERR;
                 break;
             }
@@ -4012,7 +4028,7 @@ size_t CDECL MSVCRT__fwrite_nolock(const void *ptr, size_t size, size_t nmemb, F
             wrcnt -= pcnt;
             ptr = (const char*)ptr + pcnt;
         } else {
-            if(MSVCRT__flsbuf(*(const char*)ptr, file) == EOF)
+            if(_flsbuf(*(const char*)ptr, file) == EOF)
                 break;
             written++;
             wrcnt--;
@@ -4026,13 +4042,13 @@ size_t CDECL MSVCRT__fwrite_nolock(const void *ptr, size_t size, size_t nmemb, F
 /*********************************************************************
  *		fputwc (MSVCRT.@)
  */
-wint_t CDECL MSVCRT_fputwc(wint_t wc, FILE* file)
+wint_t CDECL fputwc(wint_t wc, FILE* file)
 {
     wint_t ret;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__fputwc_nolock(wc, file);
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _fputwc_nolock(wc, file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -4040,7 +4056,7 @@ wint_t CDECL MSVCRT_fputwc(wint_t wc, FILE* file)
 /*********************************************************************
  *		_fputwc_nolock (MSVCRT.@)
  */
-wint_t CDECL MSVCRT__fputwc_nolock(wint_t wc, FILE* file)
+wint_t CDECL _fputwc_nolock(wint_t wc, FILE* file)
 {
     wchar_t mwc=wc;
     ioinfo *fdinfo;
@@ -4053,11 +4069,11 @@ wint_t CDECL MSVCRT__fputwc_nolock(wint_t wc, FILE* file)
         int char_len;
 
         char_len = wctomb(buf, mwc);
-        if(char_len!=-1 && MSVCRT__fwrite_nolock(buf, char_len, 1, file)==1)
+        if(char_len!=-1 && _fwrite_nolock(buf, char_len, 1, file)==1)
             ret = wc;
         else
             ret = WEOF;
-    }else if(MSVCRT__fwrite_nolock(&mwc, sizeof(mwc), 1, file) == 1) {
+    }else if(_fwrite_nolock(&mwc, sizeof(mwc), 1, file) == 1) {
         ret = wc;
     }else {
         ret = WEOF;
@@ -4069,15 +4085,15 @@ wint_t CDECL MSVCRT__fputwc_nolock(wint_t wc, FILE* file)
 /*********************************************************************
  *		_fputwchar (MSVCRT.@)
  */
-wint_t CDECL MSVCRT__fputwchar(wint_t wc)
+wint_t CDECL _fputwchar(wint_t wc)
 {
-  return MSVCRT_fputwc(wc, MSVCRT_stdout);
+  return fputwc(wc, MSVCRT_stdout);
 }
 
 /*********************************************************************
  *		_wfsopen (MSVCRT.@)
  */
-FILE * CDECL MSVCRT__wfsopen(const wchar_t *path, const wchar_t *mode, int share)
+FILE * CDECL _wfsopen(const wchar_t *path, const wchar_t *mode, int share)
 {
   FILE* file;
   int open_flags, stream_flags, fd;
@@ -4089,7 +4105,7 @@ FILE * CDECL MSVCRT__wfsopen(const wchar_t *path, const wchar_t *mode, int share
       return NULL;
 
   LOCK_FILES();
-  fd = MSVCRT__wsopen(path, open_flags, share, MSVCRT__S_IREAD | MSVCRT__S_IWRITE);
+  fd = _wsopen(path, open_flags, share, MSVCRT__S_IREAD | MSVCRT__S_IWRITE);
   if (fd < 0)
     file = NULL;
   else if ((file = msvcrt_alloc_fp()) && msvcrt_init_fp(file, fd, stream_flags)
@@ -4103,7 +4119,7 @@ FILE * CDECL MSVCRT__wfsopen(const wchar_t *path, const wchar_t *mode, int share
 
   TRACE(":got (%p)\n",file);
   if (fd >= 0 && !file)
-    MSVCRT__close(fd);
+    _close(fd);
   UNLOCK_FILES();
   return file;
 }
@@ -4111,7 +4127,7 @@ FILE * CDECL MSVCRT__wfsopen(const wchar_t *path, const wchar_t *mode, int share
 /*********************************************************************
  *		_fsopen (MSVCRT.@)
  */
-FILE * CDECL MSVCRT__fsopen(const char *path, const char *mode, int share)
+FILE * CDECL _fsopen(const char *path, const char *mode, int share)
 {
     FILE *ret;
     wchar_t *pathW = NULL, *modeW = NULL;
@@ -4129,7 +4145,7 @@ FILE * CDECL MSVCRT__fsopen(const char *path, const char *mode, int share)
         return NULL;
     }
 
-    ret = MSVCRT__wfsopen(pathW, modeW, share);
+    ret = _wfsopen(pathW, modeW, share);
 
     free(pathW);
     free(modeW);
@@ -4139,22 +4155,22 @@ FILE * CDECL MSVCRT__fsopen(const char *path, const char *mode, int share)
 /*********************************************************************
  *		fopen (MSVCRT.@)
  */
-FILE * CDECL MSVCRT_fopen(const char *path, const char *mode)
+FILE * CDECL fopen(const char *path, const char *mode)
 {
-    return MSVCRT__fsopen( path, mode, MSVCRT__SH_DENYNO );
+    return _fsopen( path, mode, MSVCRT__SH_DENYNO );
 }
 
 /*********************************************************************
  *              fopen_s (MSVCRT.@)
  */
-int CDECL MSVCRT_fopen_s(FILE** pFile,
+int CDECL fopen_s(FILE** pFile,
         const char *filename, const char *mode)
 {
     if (!MSVCRT_CHECK_PMT(pFile != NULL)) return EINVAL;
     if (!MSVCRT_CHECK_PMT(filename != NULL)) return EINVAL;
     if (!MSVCRT_CHECK_PMT(mode != NULL)) return EINVAL;
 
-    *pFile = MSVCRT_fopen(filename, mode);
+    *pFile = fopen(filename, mode);
 
     if(!*pFile)
         return *_errno();
@@ -4164,22 +4180,22 @@ int CDECL MSVCRT_fopen_s(FILE** pFile,
 /*********************************************************************
  *		_wfopen (MSVCRT.@)
  */
-FILE * CDECL MSVCRT__wfopen(const wchar_t *path, const wchar_t *mode)
+FILE * CDECL _wfopen(const wchar_t *path, const wchar_t *mode)
 {
-    return MSVCRT__wfsopen( path, mode, MSVCRT__SH_DENYNO );
+    return _wfsopen( path, mode, MSVCRT__SH_DENYNO );
 }
 
 /*********************************************************************
  *		_wfopen_s (MSVCRT.@)
  */
-int CDECL MSVCRT__wfopen_s(FILE** pFile, const wchar_t *filename,
+int CDECL _wfopen_s(FILE** pFile, const wchar_t *filename,
         const wchar_t *mode)
 {
     if (!MSVCRT_CHECK_PMT(pFile != NULL)) return EINVAL;
     if (!MSVCRT_CHECK_PMT(filename != NULL)) return EINVAL;
     if (!MSVCRT_CHECK_PMT(mode != NULL)) return EINVAL;
 
-    *pFile = MSVCRT__wfopen(filename, mode);
+    *pFile = _wfopen(filename, mode);
 
     if(!*pFile)
         return *_errno();
@@ -4189,13 +4205,13 @@ int CDECL MSVCRT__wfopen_s(FILE** pFile, const wchar_t *filename,
 /*********************************************************************
  *		fputc (MSVCRT.@)
  */
-int CDECL MSVCRT_fputc(int c, FILE* file)
+int CDECL fputc(int c, FILE* file)
 {
     int ret;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__fputc_nolock(c, file);
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _fputc_nolock(c, file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -4203,7 +4219,7 @@ int CDECL MSVCRT_fputc(int c, FILE* file)
 /*********************************************************************
  *		_fputc_nolock (MSVCRT.@)
  */
-int CDECL MSVCRT__fputc_nolock(int c, FILE* file)
+int CDECL _fputc_nolock(int c, FILE* file)
 {
   int res;
 
@@ -4219,7 +4235,7 @@ int CDECL MSVCRT__fputc_nolock(int c, FILE* file)
       return c & 0xff;
     }
   } else {
-    res = MSVCRT__flsbuf(c, file);
+    res = _flsbuf(c, file);
     return res;
   }
 }
@@ -4227,21 +4243,21 @@ int CDECL MSVCRT__fputc_nolock(int c, FILE* file)
 /*********************************************************************
  *		_fputchar (MSVCRT.@)
  */
-int CDECL MSVCRT__fputchar(int c)
+int CDECL _fputchar(int c)
 {
-  return MSVCRT_fputc(c, MSVCRT_stdout);
+  return fputc(c, MSVCRT_stdout);
 }
 
 /*********************************************************************
  *		fread (MSVCRT.@)
  */
-size_t CDECL MSVCRT_fread(void *ptr, size_t size, size_t nmemb, FILE* file)
+size_t CDECL fread(void *ptr, size_t size, size_t nmemb, FILE* file)
 {
     size_t ret;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__fread_nolock(ptr, size, nmemb, file);
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _fread_nolock(ptr, size, nmemb, file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -4249,7 +4265,7 @@ size_t CDECL MSVCRT_fread(void *ptr, size_t size, size_t nmemb, FILE* file)
 /*********************************************************************
  *		_fread_nolock (MSVCRT.@)
  */
-size_t CDECL MSVCRT__fread_nolock(void *ptr, size_t size, size_t nmemb, FILE* file)
+size_t CDECL _fread_nolock(void *ptr, size_t size, size_t nmemb, FILE* file)
 {
   size_t rcnt=size * nmemb;
   size_t read=0;
@@ -4282,7 +4298,7 @@ size_t CDECL MSVCRT__fread_nolock(void *ptr, size_t size, size_t nmemb, FILE* fi
   {
     int i;
     if (!file->_cnt && rcnt<file->_bufsiz && (file->_flag & (_IOMYBUF | MSVCRT__USERBUF))) {
-      i = MSVCRT__read(file->_file, file->_base, file->_bufsiz);
+      i = _read(file->_file, file->_base, file->_bufsiz);
       file->_ptr = file->_base;
       if (i != -1) {
           file->_cnt = i;
@@ -4299,11 +4315,11 @@ size_t CDECL MSVCRT__fread_nolock(void *ptr, size_t size, size_t nmemb, FILE* fi
         file->_ptr += i;
       }
     } else if (rcnt > INT_MAX) {
-      i = MSVCRT__read(file->_file, ptr, INT_MAX);
+      i = _read(file->_file, ptr, INT_MAX);
     } else if (rcnt < (file->_bufsiz ? file->_bufsiz : MSVCRT_INTERNAL_BUFSIZ)) {
-      i = MSVCRT__read(file->_file, ptr, rcnt);
+      i = _read(file->_file, ptr, rcnt);
     } else {
-      i = MSVCRT__read(file->_file, ptr, rcnt - rcnt % (file->_bufsiz ? file->_bufsiz : MSVCRT_INTERNAL_BUFSIZ));
+      i = _read(file->_file, ptr, rcnt - rcnt % (file->_bufsiz ? file->_bufsiz : MSVCRT_INTERNAL_BUFSIZ));
     }
     pread += i;
     rcnt -= i;
@@ -4330,7 +4346,7 @@ size_t CDECL MSVCRT__fread_nolock(void *ptr, size_t size, size_t nmemb, FILE* fi
 /*********************************************************************
  *		fread_s (MSVCR80.@)
  */
-size_t CDECL MSVCRT_fread_s(void *buf, size_t buf_size, size_t elem_size,
+size_t CDECL fread_s(void *buf, size_t buf_size, size_t elem_size,
         size_t count, FILE *stream)
 {
     size_t ret;
@@ -4342,9 +4358,9 @@ size_t CDECL MSVCRT_fread_s(void *buf, size_t buf_size, size_t elem_size,
     }
     if(!elem_size || !count) return 0;
 
-    MSVCRT__lock_file(stream);
-    ret = MSVCRT__fread_nolock_s(buf, buf_size, elem_size, count, stream);
-    MSVCRT__unlock_file(stream);
+    _lock_file(stream);
+    ret = _fread_nolock_s(buf, buf_size, elem_size, count, stream);
+    _unlock_file(stream);
 
     return ret;
 }
@@ -4352,7 +4368,7 @@ size_t CDECL MSVCRT_fread_s(void *buf, size_t buf_size, size_t elem_size,
 /*********************************************************************
  *		_fread_nolock_s (MSVCR80.@)
  */
-size_t CDECL MSVCRT__fread_nolock_s(void *buf, size_t buf_size, size_t elem_size,
+size_t CDECL _fread_nolock_s(void *buf, size_t buf_size, size_t elem_size,
         size_t count, FILE *stream)
 {
     size_t bytes_left, buf_pos;
@@ -4379,11 +4395,11 @@ size_t CDECL MSVCRT__fread_nolock_s(void *buf, size_t buf_size, size_t elem_size
                 return 0;
             }
 
-            MSVCRT__fread_nolock((char*)buf+buf_pos, 1, size, stream);
+            _fread_nolock((char*)buf+buf_pos, 1, size, stream);
             buf_pos += size;
             bytes_left -= size;
         }else {
-            int c = MSVCRT__filbuf(stream);
+            int c = _filbuf(stream);
 
             if(c == EOF)
                 break;
@@ -4407,7 +4423,7 @@ size_t CDECL MSVCRT__fread_nolock_s(void *buf, size_t buf_size, size_t elem_size
  *		_wfreopen (MSVCRT.@)
  *
  */
-FILE* CDECL MSVCRT__wfreopen(const wchar_t *path, const wchar_t *mode, FILE* file)
+FILE* CDECL _wfreopen(const wchar_t *path, const wchar_t *mode, FILE* file)
 {
     int open_flags, stream_flags, fd;
 
@@ -4418,10 +4434,10 @@ FILE* CDECL MSVCRT__wfreopen(const wchar_t *path, const wchar_t *mode, FILE* fil
         file = NULL;
     else
     {
-        MSVCRT_fclose(file);
+        fclose(file);
         if (msvcrt_get_flags(mode, &open_flags, &stream_flags) == -1)
             file = NULL;
-        else if((fd = MSVCRT__wopen(path, open_flags, MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) < 0)
+        else if((fd = _wopen(path, open_flags, MSVCRT__S_IREAD | MSVCRT__S_IWRITE)) < 0)
             file = NULL;
         else if(msvcrt_init_fp(file, fd, stream_flags) == -1)
         {
@@ -4436,7 +4452,7 @@ FILE* CDECL MSVCRT__wfreopen(const wchar_t *path, const wchar_t *mode, FILE* fil
 /*********************************************************************
  *      _wfreopen_s (MSVCRT.@)
  */
-int CDECL MSVCRT__wfreopen_s(FILE** pFile,
+int CDECL _wfreopen_s(FILE** pFile,
         const wchar_t *path, const wchar_t *mode, FILE* file)
 {
     if (!MSVCRT_CHECK_PMT(pFile != NULL)) return EINVAL;
@@ -4444,7 +4460,7 @@ int CDECL MSVCRT__wfreopen_s(FILE** pFile,
     if (!MSVCRT_CHECK_PMT(mode != NULL)) return EINVAL;
     if (!MSVCRT_CHECK_PMT(file != NULL)) return EINVAL;
 
-    *pFile = MSVCRT__wfreopen(path, mode, file);
+    *pFile = _wfreopen(path, mode, file);
 
     if(!*pFile)
         return *_errno();
@@ -4455,7 +4471,7 @@ int CDECL MSVCRT__wfreopen_s(FILE** pFile,
  *      freopen (MSVCRT.@)
  *
  */
-FILE* CDECL MSVCRT_freopen(const char *path, const char *mode, FILE* file)
+FILE* CDECL freopen(const char *path, const char *mode, FILE* file)
 {
     FILE *ret;
     wchar_t *pathW = NULL, *modeW = NULL;
@@ -4467,7 +4483,7 @@ FILE* CDECL MSVCRT_freopen(const char *path, const char *mode, FILE* file)
         return NULL;
     }
 
-    ret = MSVCRT__wfreopen(pathW, modeW, file);
+    ret = _wfreopen(pathW, modeW, file);
 
     free(pathW);
     free(modeW);
@@ -4477,7 +4493,7 @@ FILE* CDECL MSVCRT_freopen(const char *path, const char *mode, FILE* file)
 /*********************************************************************
  *      freopen_s (MSVCRT.@)
  */
-int CDECL MSVCRT_freopen_s(FILE** pFile,
+int CDECL freopen_s(FILE** pFile,
         const char *path, const char *mode, FILE* file)
 {
     if (!MSVCRT_CHECK_PMT(pFile != NULL)) return EINVAL;
@@ -4485,7 +4501,7 @@ int CDECL MSVCRT_freopen_s(FILE** pFile,
     if (!MSVCRT_CHECK_PMT(mode != NULL)) return EINVAL;
     if (!MSVCRT_CHECK_PMT(file != NULL)) return EINVAL;
 
-    *pFile = MSVCRT_freopen(path, mode, file);
+    *pFile = freopen(path, mode, file);
 
     if(!*pFile)
         return *_errno();
@@ -4495,11 +4511,11 @@ int CDECL MSVCRT_freopen_s(FILE** pFile,
 /*********************************************************************
  *		fsetpos (MSVCRT.@)
  */
-int CDECL MSVCRT_fsetpos(FILE* file, fpos_t *pos)
+int CDECL fsetpos(FILE* file, fpos_t *pos)
 {
   int ret;
 
-  MSVCRT__lock_file(file);
+  _lock_file(file);
   msvcrt_flush_buffer(file);
 
   /* Reset direction of i/o */
@@ -4507,21 +4523,21 @@ int CDECL MSVCRT_fsetpos(FILE* file, fpos_t *pos)
         file->_flag &= ~(_IOREAD|_IOWRT);
   }
 
-  ret = (MSVCRT__lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0;
-  MSVCRT__unlock_file(file);
+  ret = (_lseeki64(file->_file,*pos,SEEK_SET) == -1) ? -1 : 0;
+  _unlock_file(file);
   return ret;
 }
 
 /*********************************************************************
  *		_ftelli64 (MSVCRT.@)
  */
-__int64 CDECL MSVCRT__ftelli64(FILE* file)
+__int64 CDECL _ftelli64(FILE* file)
 {
     __int64 ret;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__ftelli64_nolock(file);
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _ftelli64_nolock(file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -4529,7 +4545,7 @@ __int64 CDECL MSVCRT__ftelli64(FILE* file)
 /*********************************************************************
  *		_ftelli64_nolock (MSVCRT.@)
  */
-__int64 CDECL MSVCRT__ftelli64_nolock(FILE* file)
+__int64 CDECL _ftelli64_nolock(FILE* file)
 {
     __int64 pos;
 
@@ -4548,7 +4564,7 @@ __int64 CDECL MSVCRT__ftelli64_nolock(FILE* file)
                         pos++;
             }
         } else if(!file->_cnt) { /* nothing to do */
-        } else if(MSVCRT__lseeki64(file->_file, 0, SEEK_END)==pos) {
+        } else if(_lseeki64(file->_file, 0, SEEK_END)==pos) {
             int i;
 
             pos -= file->_cnt;
@@ -4560,7 +4576,7 @@ __int64 CDECL MSVCRT__ftelli64_nolock(FILE* file)
         } else {
             char *p;
 
-            if(MSVCRT__lseeki64(file->_file, pos, SEEK_SET) != pos)
+            if(_lseeki64(file->_file, pos, SEEK_SET) != pos)
                 return -1;
 
             pos -= file->_bufsiz;
@@ -4583,27 +4599,27 @@ __int64 CDECL MSVCRT__ftelli64_nolock(FILE* file)
 /*********************************************************************
  *		ftell (MSVCRT.@)
  */
-LONG CDECL MSVCRT_ftell(FILE* file)
+__msvcrt_long CDECL ftell(FILE* file)
 {
-  return MSVCRT__ftelli64(file);
+  return _ftelli64(file);
 }
 
 #if _MSVCR_VER >= 80
 /*********************************************************************
  *		_ftell_nolock (MSVCR80.@)
  */
-LONG CDECL MSVCRT__ftell_nolock(FILE* file)
+__msvcrt_long CDECL _ftell_nolock(FILE* file)
 {
-  return MSVCRT__ftelli64_nolock(file);
+  return _ftelli64_nolock(file);
 }
 #endif
 
 /*********************************************************************
  *		fgetpos (MSVCRT.@)
  */
-int CDECL MSVCRT_fgetpos(FILE* file, fpos_t *pos)
+int CDECL fgetpos(FILE* file, fpos_t *pos)
 {
-    *pos = MSVCRT__ftelli64(file);
+    *pos = _ftelli64(file);
     if(*pos == -1)
         return -1;
     return 0;
@@ -4612,67 +4628,67 @@ int CDECL MSVCRT_fgetpos(FILE* file, fpos_t *pos)
 /*********************************************************************
  *		fputs (MSVCRT.@)
  */
-int CDECL MSVCRT_fputs(const char *s, FILE* file)
+int CDECL fputs(const char *s, FILE* file)
 {
     size_t len = strlen(s);
     int ret;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__fwrite_nolock(s, sizeof(*s), len, file) == len ? 0 : EOF;
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _fwrite_nolock(s, sizeof(*s), len, file) == len ? 0 : EOF;
+    _unlock_file(file);
     return ret;
 }
 
 /*********************************************************************
  *		fputws (MSVCRT.@)
  */
-int CDECL MSVCRT_fputws(const wchar_t *s, FILE* file)
+int CDECL fputws(const wchar_t *s, FILE* file)
 {
     size_t i, len = wcslen(s);
     BOOL tmp_buf;
     int ret;
 
-    MSVCRT__lock_file(file);
+    _lock_file(file);
     if (!(get_ioinfo_nolock(file->_file)->wxflag & WX_TEXT)) {
-        ret = MSVCRT__fwrite_nolock(s,sizeof(*s),len,file) == len ? 0 : EOF;
-        MSVCRT__unlock_file(file);
+        ret = _fwrite_nolock(s,sizeof(*s),len,file) == len ? 0 : EOF;
+        _unlock_file(file);
         return ret;
     }
 
     tmp_buf = add_std_buffer(file);
     for (i=0; i<len; i++) {
-        if(MSVCRT__fputwc_nolock(s[i], file) == WEOF) {
+        if(_fputwc_nolock(s[i], file) == WEOF) {
             if(tmp_buf) remove_std_buffer(file);
-            MSVCRT__unlock_file(file);
+            _unlock_file(file);
             return WEOF;
         }
     }
 
     if(tmp_buf) remove_std_buffer(file);
-    MSVCRT__unlock_file(file);
+    _unlock_file(file);
     return 0;
 }
 
 /*********************************************************************
  *		getchar (MSVCRT.@)
  */
-int CDECL MSVCRT_getchar(void)
+int CDECL getchar(void)
 {
-  return MSVCRT_fgetc(MSVCRT_stdin);
+  return fgetc(MSVCRT_stdin);
 }
 
 /*********************************************************************
  *		getc (MSVCRT.@)
  */
-int CDECL MSVCRT_getc(FILE* file)
+int CDECL getc(FILE* file)
 {
-  return MSVCRT_fgetc(file);
+  return fgetc(file);
 }
 
 /*********************************************************************
  *		gets_s (MSVCR80.@)
  */
-char * CDECL MSVCRT_gets_s(char *buf, size_t len)
+char * CDECL gets_s(char *buf, size_t len)
 {
     char *buf_start = buf;
     int cc;
@@ -4680,10 +4696,10 @@ char * CDECL MSVCRT_gets_s(char *buf, size_t len)
     if (!MSVCRT_CHECK_PMT(buf != NULL)) return NULL;
     if (!MSVCRT_CHECK_PMT(len != 0)) return NULL;
 
-    MSVCRT__lock_file(MSVCRT_stdin);
-    for(cc = MSVCRT__fgetc_nolock(MSVCRT_stdin);
+    _lock_file(MSVCRT_stdin);
+    for(cc = _fgetc_nolock(MSVCRT_stdin);
             len != 0 && cc != EOF && cc != '\n';
-            cc = MSVCRT__fgetc_nolock(MSVCRT_stdin))
+            cc = _fgetc_nolock(MSVCRT_stdin))
     {
         if (cc != '\r')
         {
@@ -4691,7 +4707,7 @@ char * CDECL MSVCRT_gets_s(char *buf, size_t len)
             len--;
         }
     }
-    MSVCRT__unlock_file(MSVCRT_stdin);
+    _unlock_file(MSVCRT_stdin);
 
     if (!len)
     {
@@ -4714,27 +4730,27 @@ char * CDECL MSVCRT_gets_s(char *buf, size_t len)
 /*********************************************************************
  *              gets (MSVCRT.@)
  */
-char * CDECL MSVCRT_gets(char *buf)
+char * CDECL gets(char *buf)
 {
-    return MSVCRT_gets_s(buf, -1);
+    return gets_s(buf, -1);
 }
 
 /*********************************************************************
  *		_getws (MSVCRT.@)
  */
-wchar_t* CDECL MSVCRT__getws(wchar_t* buf)
+wchar_t* CDECL _getws(wchar_t* buf)
 {
     wint_t cc;
     wchar_t* ws = buf;
 
-    MSVCRT__lock_file(MSVCRT_stdin);
-    for (cc = MSVCRT__fgetwc_nolock(MSVCRT_stdin); cc != WEOF && cc != '\n';
-         cc = MSVCRT__fgetwc_nolock(MSVCRT_stdin))
+    _lock_file(MSVCRT_stdin);
+    for (cc = _fgetwc_nolock(MSVCRT_stdin); cc != WEOF && cc != '\n';
+         cc = _fgetwc_nolock(MSVCRT_stdin))
     {
         if (cc != '\r')
             *buf++ = (wchar_t)cc;
     }
-    MSVCRT__unlock_file(MSVCRT_stdin);
+    _unlock_file(MSVCRT_stdin);
 
     if ((cc == WEOF) && (ws == buf))
     {
@@ -4750,57 +4766,57 @@ wchar_t* CDECL MSVCRT__getws(wchar_t* buf)
 /*********************************************************************
  *		putc (MSVCRT.@)
  */
-int CDECL MSVCRT_putc(int c, FILE* file)
+int CDECL putc(int c, FILE* file)
 {
-  return MSVCRT_fputc(c, file);
+  return fputc(c, file);
 }
 
 /*********************************************************************
  *		putchar (MSVCRT.@)
  */
-int CDECL MSVCRT_putchar(int c)
+int CDECL putchar(int c)
 {
-  return MSVCRT_fputc(c, MSVCRT_stdout);
+  return fputc(c, MSVCRT_stdout);
 }
 
 /*********************************************************************
  *		puts (MSVCRT.@)
  */
-int CDECL MSVCRT_puts(const char *s)
+int CDECL puts(const char *s)
 {
     size_t len = strlen(s);
     int ret;
 
-    MSVCRT__lock_file(MSVCRT_stdout);
-    if(MSVCRT__fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) {
-        MSVCRT__unlock_file(MSVCRT_stdout);
+    _lock_file(MSVCRT_stdout);
+    if(_fwrite_nolock(s, sizeof(*s), len, MSVCRT_stdout) != len) {
+        _unlock_file(MSVCRT_stdout);
         return EOF;
     }
 
-    ret = MSVCRT__fwrite_nolock("\n",1,1,MSVCRT_stdout) == 1 ? 0 : EOF;
-    MSVCRT__unlock_file(MSVCRT_stdout);
+    ret = _fwrite_nolock("\n",1,1,MSVCRT_stdout) == 1 ? 0 : EOF;
+    _unlock_file(MSVCRT_stdout);
     return ret;
 }
 
 /*********************************************************************
  *		_putws (MSVCRT.@)
  */
-int CDECL MSVCRT__putws(const wchar_t *s)
+int CDECL _putws(const wchar_t *s)
 {
     int ret;
 
-    MSVCRT__lock_file(MSVCRT_stdout);
-    ret = MSVCRT_fputws(s, MSVCRT_stdout);
+    _lock_file(MSVCRT_stdout);
+    ret = fputws(s, MSVCRT_stdout);
     if(ret >= 0)
-        ret = MSVCRT__fputwc_nolock('\n', MSVCRT_stdout);
-    MSVCRT__unlock_file(MSVCRT_stdout);
+        ret = _fputwc_nolock('\n', MSVCRT_stdout);
+    _unlock_file(MSVCRT_stdout);
     return ret >= 0 ? 0 : WEOF;
 }
 
 /*********************************************************************
  *		remove (MSVCRT.@)
  */
-int CDECL MSVCRT_remove(const char *path)
+int CDECL remove(const char *path)
 {
   TRACE("(%s)\n",path);
   if (DeleteFileA(path))
@@ -4813,7 +4829,7 @@ int CDECL MSVCRT_remove(const char *path)
 /*********************************************************************
  *		_wremove (MSVCRT.@)
  */
-int CDECL MSVCRT__wremove(const wchar_t *path)
+int CDECL _wremove(const wchar_t *path)
 {
   TRACE("(%s)\n",debugstr_w(path));
   if (DeleteFileW(path))
@@ -4826,7 +4842,7 @@ int CDECL MSVCRT__wremove(const wchar_t *path)
 /*********************************************************************
  *		rename (MSVCRT.@)
  */
-int CDECL MSVCRT_rename(const char *oldpath,const char *newpath)
+int CDECL rename(const char *oldpath,const char *newpath)
 {
   TRACE(":from %s to %s\n",oldpath,newpath);
   if (MoveFileExA(oldpath, newpath, MOVEFILE_COPY_ALLOWED))
@@ -4839,7 +4855,7 @@ int CDECL MSVCRT_rename(const char *oldpath,const char *newpath)
 /*********************************************************************
  *		_wrename (MSVCRT.@)
  */
-int CDECL MSVCRT__wrename(const wchar_t *oldpath,const wchar_t *newpath)
+int CDECL _wrename(const wchar_t *oldpath,const wchar_t *newpath)
 {
   TRACE(":from %s to %s\n",debugstr_w(oldpath),debugstr_w(newpath));
   if (MoveFileExW(oldpath, newpath, MOVEFILE_COPY_ALLOWED))
@@ -4852,15 +4868,15 @@ int CDECL MSVCRT__wrename(const wchar_t *oldpath,const wchar_t *newpath)
 /*********************************************************************
  *		setvbuf (MSVCRT.@)
  */
-int CDECL MSVCRT_setvbuf(FILE* file, char *buf, int mode, size_t size)
+int CDECL setvbuf(FILE* file, char *buf, int mode, size_t size)
 {
     if(!MSVCRT_CHECK_PMT(file != NULL)) return -1;
     if(!MSVCRT_CHECK_PMT(mode==_IONBF || mode==_IOFBF || mode==_IOLBF)) return -1;
     if(!MSVCRT_CHECK_PMT(mode==_IONBF || (size>=2 && size<=INT_MAX))) return -1;
 
-    MSVCRT__lock_file(file);
+    _lock_file(file);
 
-    MSVCRT__fflush_nolock(file);
+    _fflush_nolock(file);
     if(file->_flag & _IOMYBUF)
         free(file->_base);
     file->_flag &= ~(_IONBF | _IOMYBUF | MSVCRT__USERBUF);
@@ -4878,23 +4894,23 @@ int CDECL MSVCRT_setvbuf(FILE* file, char *buf, int mode, size_t size)
         file->_base = file->_ptr = malloc(size);
         if(!file->_base) {
             file->_bufsiz = 0;
-            MSVCRT__unlock_file(file);
+            _unlock_file(file);
             return -1;
         }
 
         file->_flag |= _IOMYBUF;
         file->_bufsiz = size;
     }
-    MSVCRT__unlock_file(file);
+    _unlock_file(file);
     return 0;
 }
 
 /*********************************************************************
  *		setbuf (MSVCRT.@)
  */
-void CDECL MSVCRT_setbuf(FILE* file, char *buf)
+void CDECL setbuf(FILE* file, char *buf)
 {
-  MSVCRT_setvbuf(file, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
+  setvbuf(file, buf, buf ? _IOFBF : _IONBF, BUFSIZ);
 }
 
 static int tmpnam_helper(char *s, size_t size, int *tmpnam_unique, int tmp_max)
@@ -4946,7 +4962,7 @@ static int tmpnam_helper(char *s, size_t size, int *tmpnam_unique, int tmp_max)
     return 0;
 }
 
-int CDECL MSVCRT_tmpnam_s(char *s, size_t size)
+int CDECL tmpnam_s(char *s, size_t size)
 {
     return tmpnam_helper(s, size, &tmpnam_s_unique, TMP_MAX_S);
 }
@@ -4954,7 +4970,7 @@ int CDECL MSVCRT_tmpnam_s(char *s, size_t size)
 /*********************************************************************
  *		tmpnam (MSVCRT.@)
  */
-char * CDECL MSVCRT_tmpnam(char *s)
+char * CDECL tmpnam(char *s)
 {
   if (!s) {
     thread_data_t *data = msvcrt_get_thread_data();
@@ -5020,7 +5036,7 @@ static int wtmpnam_helper(wchar_t *s, size_t size, int *tmpnam_unique, int tmp_m
 /*********************************************************************
  *              _wtmpnam_s (MSVCRT.@)
  */
-int CDECL MSVCRT__wtmpnam_s(wchar_t *s, size_t size)
+int CDECL _wtmpnam_s(wchar_t *s, size_t size)
 {
     return wtmpnam_helper(s, size, &tmpnam_s_unique, TMP_MAX_S);
 }
@@ -5028,7 +5044,7 @@ int CDECL MSVCRT__wtmpnam_s(wchar_t *s, size_t size)
 /*********************************************************************
  *              _wtmpnam (MSVCRT.@)
  */
-wchar_t * CDECL MSVCRT__wtmpnam(wchar_t *s)
+wchar_t * CDECL _wtmpnam(wchar_t *s)
 {
     if (!s) {
         thread_data_t *data = msvcrt_get_thread_data();
@@ -5045,14 +5061,14 @@ wchar_t * CDECL MSVCRT__wtmpnam(wchar_t *s)
 /*********************************************************************
  *		tmpfile (MSVCRT.@)
  */
-FILE* CDECL MSVCRT_tmpfile(void)
+FILE* CDECL tmpfile(void)
 {
-  char *filename = MSVCRT__tempnam(",", "t");
+  char *filename = _tempnam(",", "t");
   int fd;
   FILE* file = NULL;
 
   LOCK_FILES();
-  fd = MSVCRT__open(filename, MSVCRT__O_CREAT | MSVCRT__O_BINARY | MSVCRT__O_RDWR | MSVCRT__O_TEMPORARY,
+  fd = _open(filename, MSVCRT__O_CREAT | MSVCRT__O_BINARY | MSVCRT__O_RDWR | MSVCRT__O_TEMPORARY,
           MSVCRT__S_IREAD | MSVCRT__S_IWRITE);
   if (fd != -1 && (file = msvcrt_alloc_fp()))
   {
@@ -5065,7 +5081,7 @@ FILE* CDECL MSVCRT_tmpfile(void)
   }
 
   if(fd != -1 && !file)
-      MSVCRT__close(fd);
+      _close(fd);
   free(filename);
   UNLOCK_FILES();
   return file;
@@ -5074,39 +5090,39 @@ FILE* CDECL MSVCRT_tmpfile(void)
 /*********************************************************************
  *      tmpfile_s (MSVCRT.@)
  */
-int CDECL MSVCRT_tmpfile_s(FILE** file)
+int CDECL tmpfile_s(FILE** file)
 {
     if (!MSVCRT_CHECK_PMT(file != NULL)) return EINVAL;
 
-    *file = MSVCRT_tmpfile();
+    *file = tmpfile();
     return 0;
 }
 
 static int puts_clbk_file_a(void *file, int len, const char *str)
 {
-    return MSVCRT_fwrite(str, sizeof(char), len, file);
+    return fwrite(str, sizeof(char), len, file);
 }
 
 static int puts_clbk_file_w(void *file, int len, const wchar_t *str)
 {
     int i, ret;
 
-    MSVCRT__lock_file(file);
+    _lock_file(file);
 
     if(!(get_ioinfo_nolock(((FILE*)file)->_file)->wxflag & WX_TEXT)) {
-        ret = MSVCRT__fwrite_nolock(str, sizeof(wchar_t), len, file);
-        MSVCRT__unlock_file(file);
+        ret = _fwrite_nolock(str, sizeof(wchar_t), len, file);
+        _unlock_file(file);
         return ret;
     }
 
     for(i=0; i<len; i++) {
-        if(MSVCRT__fputwc_nolock(str[i], file) == WEOF) {
-            MSVCRT__unlock_file(file);
+        if(_fputwc_nolock(str[i], file) == WEOF) {
+            _unlock_file(file);
             return -1;
         }
     }
 
-    MSVCRT__unlock_file(file);
+    _unlock_file(file);
     return len;
 }
 
@@ -5131,13 +5147,13 @@ static int vfprintf_helper(DWORD options, FILE* file, const char *format,
             options &= ~MSVCRT_PRINTF_POSITIONAL_PARAMS;
     }
 
-    MSVCRT__lock_file(file);
+    _lock_file(file);
     tmp_buf = add_std_buffer(file);
     ret = pf_printf_a(puts_clbk_file_a, file, format, locale, options,
             options & MSVCRT_PRINTF_POSITIONAL_PARAMS ? arg_clbk_positional : arg_clbk_valist,
             options & MSVCRT_PRINTF_POSITIONAL_PARAMS ? args_ctx : NULL, &valist);
     if(tmp_buf) remove_std_buffer(file);
-    MSVCRT__unlock_file(file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -5163,13 +5179,13 @@ static int vfwprintf_helper(DWORD options, FILE* file, const wchar_t *format,
             options &= ~MSVCRT_PRINTF_POSITIONAL_PARAMS;
     }
 
-    MSVCRT__lock_file(file);
+    _lock_file(file);
     tmp_buf = add_std_buffer(file);
     ret = pf_printf_w(puts_clbk_file_w, file, format, locale, options,
             options & MSVCRT_PRINTF_POSITIONAL_PARAMS ? arg_clbk_positional : arg_clbk_valist,
             options & MSVCRT_PRINTF_POSITIONAL_PARAMS ? args_ctx : NULL, &valist);
     if(tmp_buf) remove_std_buffer(file);
-    MSVCRT__unlock_file(file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -5177,7 +5193,7 @@ static int vfwprintf_helper(DWORD options, FILE* file, const wchar_t *format,
 /*********************************************************************
  *    _vfprintf_s_l (MSVCRT.@)
  */
-int CDECL MSVCRT__vfprintf_s_l(FILE* file, const char *format,
+int CDECL _vfprintf_s_l(FILE* file, const char *format,
         _locale_t locale, __ms_va_list valist)
 {
     return vfprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, locale, valist);
@@ -5186,7 +5202,7 @@ int CDECL MSVCRT__vfprintf_s_l(FILE* file, const char *format,
 /*********************************************************************
  *    _vfwprintf_s_l (MSVCRT.@)
  */
-int CDECL MSVCRT__vfwprintf_s_l(FILE* file, const wchar_t *format,
+int CDECL _vfwprintf_s_l(FILE* file, const wchar_t *format,
         _locale_t locale, __ms_va_list valist)
 {
     return vfwprintf_helper(MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER, file, format, locale, valist);
@@ -5195,7 +5211,7 @@ int CDECL MSVCRT__vfwprintf_s_l(FILE* file, const wchar_t *format,
 /*********************************************************************
  *		vfprintf (MSVCRT.@)
  */
-int CDECL MSVCRT_vfprintf(FILE* file, const char *format, __ms_va_list valist)
+int CDECL vfprintf(FILE* file, const char *format, __ms_va_list valist)
 {
     return vfprintf_helper(0, file, format, NULL, valist);
 }
@@ -5203,15 +5219,15 @@ int CDECL MSVCRT_vfprintf(FILE* file, const char *format, __ms_va_list valist)
 /*********************************************************************
  *		vfprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT_vfprintf_s(FILE* file, const char *format, __ms_va_list valist)
+int CDECL vfprintf_s(FILE* file, const char *format, __ms_va_list valist)
 {
-    return MSVCRT__vfprintf_s_l(file, format, NULL, valist);
+    return _vfprintf_s_l(file, format, NULL, valist);
 }
 
 /*********************************************************************
  *		vfwprintf (MSVCRT.@)
  */
-int CDECL MSVCRT_vfwprintf(FILE* file, const wchar_t *format, __ms_va_list valist)
+int CDECL vfwprintf(FILE* file, const wchar_t *format, __ms_va_list valist)
 {
     return vfwprintf_helper(0, file, format, NULL, valist);
 }
@@ -5219,9 +5235,9 @@ int CDECL MSVCRT_vfwprintf(FILE* file, const wchar_t *format, __ms_va_list valis
 /*********************************************************************
  *		vfwprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT_vfwprintf_s(FILE* file, const wchar_t *format, __ms_va_list valist)
+int CDECL vfwprintf_s(FILE* file, const wchar_t *format, __ms_va_list valist)
 {
-    return MSVCRT__vfwprintf_s_l(file, format, NULL, valist);
+    return _vfwprintf_s_l(file, format, NULL, valist);
 }
 
 #if _MSVCR_VER >= 140
@@ -5229,7 +5245,7 @@ int CDECL MSVCRT_vfwprintf_s(FILE* file, const wchar_t *format, __ms_va_list val
 /*********************************************************************
  *              __stdio_common_vfprintf (UCRTBASE.@)
  */
-int CDECL MSVCRT__stdio_common_vfprintf(unsigned __int64 options, FILE *file, const char *format,
+int CDECL _stdio_common_vfprintf(unsigned __int64 options, FILE *file, const char *format,
                                         _locale_t locale, __ms_va_list valist)
 {
     if (options & ~UCRTBASE_PRINTF_MASK)
@@ -5241,7 +5257,7 @@ int CDECL MSVCRT__stdio_common_vfprintf(unsigned __int64 options, FILE *file, co
 /*********************************************************************
  *              __stdio_common_vfprintf_s (UCRTBASE.@)
  */
-int CDECL MSVCRT__stdio_common_vfprintf_s(unsigned __int64 options, FILE *file, const char *format,
+int CDECL __stdio_common_vfprintf_s(unsigned __int64 options, FILE *file, const char *format,
                                           _locale_t locale, __ms_va_list valist)
 {
     if (options & ~UCRTBASE_PRINTF_MASK)
@@ -5254,7 +5270,7 @@ int CDECL MSVCRT__stdio_common_vfprintf_s(unsigned __int64 options, FILE *file,
 /*********************************************************************
  *              __stdio_common_vfwprintf (UCRTBASE.@)
  */
-int CDECL MSVCRT__stdio_common_vfwprintf(unsigned __int64 options, FILE *file, const wchar_t *format,
+int CDECL __stdio_common_vfwprintf(unsigned __int64 options, FILE *file, const wchar_t *format,
                                          _locale_t locale, __ms_va_list valist)
 {
     if (options & ~UCRTBASE_PRINTF_MASK)
@@ -5266,7 +5282,7 @@ int CDECL MSVCRT__stdio_common_vfwprintf(unsigned __int64 options, FILE *file, c
 /*********************************************************************
  *              __stdio_common_vfwprintf_s (UCRTBASE.@)
  */
-int CDECL MSVCRT__stdio_common_vfwprintf_s(unsigned __int64 options, FILE *file, const wchar_t *format,
+int CDECL __stdio_common_vfwprintf_s(unsigned __int64 options, FILE *file, const wchar_t *format,
                                            _locale_t locale, __ms_va_list valist)
 {
     if (options & ~UCRTBASE_PRINTF_MASK)
@@ -5281,7 +5297,7 @@ int CDECL MSVCRT__stdio_common_vfwprintf_s(unsigned __int64 options, FILE *file,
 /*********************************************************************
  *    _vfprintf_l (MSVCRT.@)
  */
-int CDECL MSVCRT__vfprintf_l(FILE* file, const char *format,
+int CDECL _vfprintf_l(FILE* file, const char *format,
         _locale_t locale, __ms_va_list valist)
 {
     return vfprintf_helper(0, file, format, locale, valist);
@@ -5290,7 +5306,7 @@ int CDECL MSVCRT__vfprintf_l(FILE* file, const char *format,
 /*********************************************************************
  *              _vfwprintf_l (MSVCRT.@)
  */
-int CDECL MSVCRT__vfwprintf_l(FILE* file, const wchar_t *format,
+int CDECL _vfwprintf_l(FILE* file, const wchar_t *format,
         _locale_t locale, __ms_va_list valist)
 {
     return vfwprintf_helper(0, file, format, locale, valist);
@@ -5299,7 +5315,7 @@ int CDECL MSVCRT__vfwprintf_l(FILE* file, const wchar_t *format,
 /*********************************************************************
  *    _vfprintf_p_l (MSVCRT.@)
  */
-int CDECL MSVCRT__vfprintf_p_l(FILE* file, const char *format,
+int CDECL _vfprintf_p_l(FILE* file, const char *format,
         _locale_t locale, __ms_va_list valist)
 {
     return vfprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER,
@@ -5309,15 +5325,15 @@ int CDECL MSVCRT__vfprintf_p_l(FILE* file, const char *format,
 /*********************************************************************
  *    _vfprintf_p (MSVCRT.@)
  */
-int CDECL MSVCRT__vfprintf_p(FILE* file, const char *format, __ms_va_list valist)
+int CDECL _vfprintf_p(FILE* file, const char *format, __ms_va_list valist)
 {
-    return MSVCRT__vfprintf_p_l(file, format, NULL, valist);
+    return _vfprintf_p_l(file, format, NULL, valist);
 }
 
 /*********************************************************************
  *    _vfwprintf_p_l (MSVCRT.@)
  */
-int CDECL MSVCRT__vfwprintf_p_l(FILE* file, const wchar_t *format,
+int CDECL _vfwprintf_p_l(FILE* file, const wchar_t *format,
         _locale_t locale, __ms_va_list valist)
 {
     return vfwprintf_helper(MSVCRT_PRINTF_POSITIONAL_PARAMS | MSVCRT_PRINTF_INVOKE_INVALID_PARAM_HANDLER,
@@ -5327,52 +5343,52 @@ int CDECL MSVCRT__vfwprintf_p_l(FILE* file, const wchar_t *format,
 /*********************************************************************
  *    _vfwprintf_p (MSVCRT.@)
  */
-int CDECL MSVCRT__vfwprintf_p(FILE* file, const wchar_t *format, __ms_va_list valist)
+int CDECL _vfwprintf_p(FILE* file, const wchar_t *format, __ms_va_list valist)
 {
-    return MSVCRT__vfwprintf_p_l(file, format, NULL, valist);
+    return _vfwprintf_p_l(file, format, NULL, valist);
 }
 
 /*********************************************************************
  *		vprintf (MSVCRT.@)
  */
-int CDECL MSVCRT_vprintf(const char *format, __ms_va_list valist)
+int CDECL vprintf(const char *format, __ms_va_list valist)
 {
-  return MSVCRT_vfprintf(MSVCRT_stdout,format,valist);
+  return vfprintf(MSVCRT_stdout,format,valist);
 }
 
 /*********************************************************************
  *		vprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT_vprintf_s(const char *format, __ms_va_list valist)
+int CDECL vprintf_s(const char *format, __ms_va_list valist)
 {
-  return MSVCRT_vfprintf_s(MSVCRT_stdout,format,valist);
+  return vfprintf_s(MSVCRT_stdout,format,valist);
 }
 
 /*********************************************************************
  *		vwprintf (MSVCRT.@)
  */
-int CDECL MSVCRT_vwprintf(const wchar_t *format, __ms_va_list valist)
+int CDECL vwprintf(const wchar_t *format, __ms_va_list valist)
 {
-  return MSVCRT_vfwprintf(MSVCRT_stdout,format,valist);
+  return vfwprintf(MSVCRT_stdout,format,valist);
 }
 
 /*********************************************************************
  *		vwprintf_s (MSVCRT.@)
  */
-int CDECL MSVCRT_vwprintf_s(const wchar_t *format, __ms_va_list valist)
+int CDECL vwprintf_s(const wchar_t *format, __ms_va_list valist)
 {
-  return MSVCRT_vfwprintf_s(MSVCRT_stdout,format,valist);
+  return vfwprintf_s(MSVCRT_stdout,format,valist);
 }
 
 /*********************************************************************
  *		fprintf (MSVCRT.@)
  */
-int WINAPIV MSVCRT_fprintf(FILE* file, const char *format, ...)
+int WINAPIV fprintf(FILE* file, const char *format, ...)
 {
     __ms_va_list valist;
     int res;
     __ms_va_start(valist, format);
-    res = MSVCRT_vfprintf(file, format, valist);
+    res = vfprintf(file, format, valist);
     __ms_va_end(valist);
     return res;
 }
@@ -5380,12 +5396,12 @@ int WINAPIV MSVCRT_fprintf(FILE* file, const char *format, ...)
 /*********************************************************************
  *		fprintf_s (MSVCRT.@)
  */
-int WINAPIV MSVCRT_fprintf_s(FILE* file, const char *format, ...)
+int WINAPIV fprintf_s(FILE* file, const char *format, ...)
 {
     __ms_va_list valist;
     int res;
     __ms_va_start(valist, format);
-    res = MSVCRT_vfprintf_s(file, format, valist);
+    res = vfprintf_s(file, format, valist);
     __ms_va_end(valist);
     return res;
 }
@@ -5393,12 +5409,12 @@ int WINAPIV MSVCRT_fprintf_s(FILE* file, const char *format, ...)
 /*********************************************************************
  *		fwprintf (MSVCRT.@)
  */
-int WINAPIV MSVCRT_fwprintf(FILE* file, const wchar_t *format, ...)
+int WINAPIV fwprintf(FILE* file, const wchar_t *format, ...)
 {
     __ms_va_list valist;
     int res;
     __ms_va_start(valist, format);
-    res = MSVCRT_vfwprintf(file, format, valist);
+    res = vfwprintf(file, format, valist);
     __ms_va_end(valist);
     return res;
 }
@@ -5406,12 +5422,12 @@ int WINAPIV MSVCRT_fwprintf(FILE* file, const wchar_t *format, ...)
 /*********************************************************************
  *		fwprintf_s (MSVCRT.@)
  */
-int WINAPIV MSVCRT_fwprintf_s(FILE* file, const wchar_t *format, ...)
+int WINAPIV fwprintf_s(FILE* file, const wchar_t *format, ...)
 {
     __ms_va_list valist;
     int res;
     __ms_va_start(valist, format);
-    res = MSVCRT_vfwprintf_s(file, format, valist);
+    res = vfwprintf_s(file, format, valist);
     __ms_va_end(valist);
     return res;
 }
@@ -5419,12 +5435,12 @@ int WINAPIV MSVCRT_fwprintf_s(FILE* file, const wchar_t *format, ...)
 /*********************************************************************
  *              _fwprintf_l (MSVCRT.@)
  */
-int WINAPIV MSVCRT__fwprintf_l(FILE* file, const wchar_t *format, _locale_t locale, ...)
+int WINAPIV _fwprintf_l(FILE* file, const wchar_t *format, _locale_t locale, ...)
 {
     __ms_va_list valist;
     int res;
     __ms_va_start(valist, locale);
-    res = MSVCRT__vfwprintf_l(file, format, locale, valist);
+    res = _vfwprintf_l(file, format, locale, valist);
     __ms_va_end(valist);
     return res;
 }
@@ -5432,12 +5448,12 @@ int WINAPIV MSVCRT__fwprintf_l(FILE* file, const wchar_t *format, _locale_t loca
 /*********************************************************************
  *		printf (MSVCRT.@)
  */
-int WINAPIV MSVCRT_printf(const char *format, ...)
+int WINAPIV printf(const char *format, ...)
 {
     __ms_va_list valist;
     int res;
     __ms_va_start(valist, format);
-    res = MSVCRT_vfprintf(MSVCRT_stdout, format, valist);
+    res = vfprintf(MSVCRT_stdout, format, valist);
     __ms_va_end(valist);
     return res;
 }
@@ -5445,12 +5461,12 @@ int WINAPIV MSVCRT_printf(const char *format, ...)
 /*********************************************************************
  *		printf_s (MSVCRT.@)
  */
-int WINAPIV MSVCRT_printf_s(const char *format, ...)
+int WINAPIV printf_s(const char *format, ...)
 {
     __ms_va_list valist;
     int res;
     __ms_va_start(valist, format);
-    res = MSVCRT_vprintf_s(format, valist);
+    res = vprintf_s(format, valist);
     __ms_va_end(valist);
     return res;
 }
@@ -5458,15 +5474,15 @@ int WINAPIV MSVCRT_printf_s(const char *format, ...)
 /*********************************************************************
  *		ungetc (MSVCRT.@)
  */
-int CDECL MSVCRT_ungetc(int c, FILE * file)
+int CDECL ungetc(int c, FILE * file)
 {
     int ret;
 
     if(!MSVCRT_CHECK_PMT(file != NULL)) return EOF;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__ungetc_nolock(c, file);
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _ungetc_nolock(c, file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -5474,7 +5490,7 @@ int CDECL MSVCRT_ungetc(int c, FILE * file)
 /*********************************************************************
  *		_ungetc_nolock (MSVCRT.@)
  */
-int CDECL MSVCRT__ungetc_nolock(int c, FILE * file)
+int CDECL _ungetc_nolock(int c, FILE * file)
 {
     if(!MSVCRT_CHECK_PMT(file != NULL)) return EOF;
 
@@ -5509,15 +5525,15 @@ int CDECL MSVCRT__ungetc_nolock(int c, FILE * file)
 /*********************************************************************
  *              ungetwc (MSVCRT.@)
  */
-wint_t CDECL MSVCRT_ungetwc(wint_t wc, FILE * file)
+wint_t CDECL ungetwc(wint_t wc, FILE * file)
 {
     wint_t ret;
 
     if(!MSVCRT_CHECK_PMT(file != NULL)) return WEOF;
 
-    MSVCRT__lock_file(file);
-    ret = MSVCRT__ungetwc_nolock(wc, file);
-    MSVCRT__unlock_file(file);
+    _lock_file(file);
+    ret = _ungetwc_nolock(wc, file);
+    _unlock_file(file);
 
     return ret;
 }
@@ -5525,7 +5541,7 @@ wint_t CDECL MSVCRT_ungetwc(wint_t wc, FILE * file)
 /*********************************************************************
  *              _ungetwc_nolock (MSVCRT.@)
  */
-wint_t CDECL MSVCRT__ungetwc_nolock(wint_t wc, FILE * file)
+wint_t CDECL _ungetwc_nolock(wint_t wc, FILE * file)
 {
     wchar_t mwc = wc;
 
@@ -5539,7 +5555,7 @@ wint_t CDECL MSVCRT__ungetwc_nolock(wint_t wc, FILE * file)
         int i;
 
         for(i=sizeof(wchar_t)-1;i>=0;i--) {
-            if(pp[i] != MSVCRT__ungetc_nolock(pp[i],file))
+            if(pp[i] != _ungetc_nolock(pp[i],file))
                 return WEOF;
         }
     }else {
@@ -5551,7 +5567,7 @@ wint_t CDECL MSVCRT__ungetwc_nolock(wint_t wc, FILE * file)
             return WEOF;
 
         for(len--; len>=0; len--) {
-            if(mbs[len] != MSVCRT__ungetc_nolock(mbs[len], file))
+            if(mbs[len] != _ungetc_nolock(mbs[len], file))
                 return WEOF;
         }
     }
@@ -5562,12 +5578,12 @@ wint_t CDECL MSVCRT__ungetwc_nolock(wint_t wc, FILE * file)
 /*********************************************************************
  *		wprintf (MSVCRT.@)
  */
-int WINAPIV MSVCRT_wprintf(const wchar_t *format, ...)
+int WINAPIV wprintf(const wchar_t *format, ...)
 {
     __ms_va_list valist;
     int res;
     __ms_va_start(valist, format);
-    res = MSVCRT_vwprintf(format, valist);
+    res = vwprintf(format, valist);
     __ms_va_end(valist);
     return res;
 }
@@ -5575,12 +5591,12 @@ int WINAPIV MSVCRT_wprintf(const wchar_t *format, ...)
 /*********************************************************************
  *		wprintf_s (MSVCRT.@)
  */
-int WINAPIV MSVCRT_wprintf_s(const wchar_t *format, ...)
+int WINAPIV wprintf_s(const wchar_t *format, ...)
 {
     __ms_va_list valist;
     int res;
     __ms_va_start(valist, format);
-    res = MSVCRT_vwprintf_s(format, valist);
+    res = vwprintf_s(format, valist);
     __ms_va_end(valist);
     return res;
 }
@@ -5588,7 +5604,7 @@ int WINAPIV MSVCRT_wprintf_s(const wchar_t *format, ...)
 /*********************************************************************
  *		_getmaxstdio (MSVCRT.@)
  */
-int CDECL MSVCRT__getmaxstdio(void)
+int CDECL _getmaxstdio(void)
 {
     return MSVCRT_max_streams;
 }
@@ -5596,7 +5612,7 @@ int CDECL MSVCRT__getmaxstdio(void)
 /*********************************************************************
  *		_setmaxstdio (MSVCRT.@)
  */
-int CDECL MSVCRT__setmaxstdio(int newmax)
+int CDECL _setmaxstdio(int newmax)
 {
     TRACE("%d\n", newmax);
 
@@ -5611,7 +5627,7 @@ int CDECL MSVCRT__setmaxstdio(int newmax)
 /*********************************************************************
  *		_get_stream_buffer_pointers (UCRTBASE.@)
  */
-int CDECL MSVCRT__get_stream_buffer_pointers(FILE *file, char*** base,
+int CDECL _get_stream_buffer_pointers(FILE *file, char*** base,
                                              char*** ptr, int** count)
 {
     if (base)
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index 566c0fa66e6..257497b72a2 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -604,17 +604,11 @@ struct MSVCRT__stat64 {
 
 int __cdecl      MSVCRT_iswdigit(wint_t);
 
-void __cdecl     MSVCRT__lock_file(FILE*);
-void __cdecl     MSVCRT__unlock_file(FILE*);
-int __cdecl      MSVCRT_fgetc(FILE*);
 int __cdecl      MSVCRT__fgetc_nolock(FILE*);
 int __cdecl      MSVCRT__fputc_nolock(int,FILE*);
-int __cdecl      MSVCRT_ungetc(int,FILE*);
 int __cdecl      MSVCRT__ungetc_nolock(int,FILE*);
-wint_t __cdecl MSVCRT_fgetwc(FILE*);
 wint_t __cdecl MSVCRT__fgetwc_nolock(FILE*);
 wint_t __cdecl MSVCRT__fputwc_nolock(wint_t,FILE*);
-wint_t __cdecl MSVCRT_ungetwc(wint_t,FILE*);
 wint_t __cdecl MSVCRT__ungetwc_nolock(wint_t, FILE*);
 int __cdecl      MSVCRT__fseeki64_nolock(FILE*,__int64,int);
 __int64 __cdecl  MSVCRT__ftelli64(FILE* file);
@@ -622,15 +616,12 @@ __int64 __cdecl  MSVCRT__ftelli64_nolock(FILE*);
 size_t __cdecl MSVCRT__fread_nolock(void*,size_t,size_t,FILE*);
 size_t __cdecl MSVCRT__fread_nolock_s(void*,size_t,size_t,size_t,FILE*);
 size_t __cdecl MSVCRT__fwrite_nolock(const void*,size_t,size_t,FILE*);
-int __cdecl      MSVCRT_fclose(FILE*);
 int __cdecl      MSVCRT__fclose_nolock(FILE*);
 int __cdecl      MSVCRT__fflush_nolock(FILE*);
 FILE* __cdecl MSVCRT__iob_func(void);
 __time32_t __cdecl MSVCRT__time32(__time32_t*);
 __time64_t __cdecl MSVCRT__time64(__time64_t*);
 FILE*   __cdecl MSVCRT__fdopen(int, const char *);
-FILE*   __cdecl MSVCRT__wfdopen(int, const wchar_t *);
-int            WINAPIV MSVCRT_fwprintf(FILE *file, const wchar_t *format, ...);
 
 #define MSVCRT__ENABLE_PER_THREAD_LOCALE 1
 #define MSVCRT__DISABLE_PER_THREAD_LOCALE 2
@@ -644,7 +635,6 @@ void free_locinfo(pthreadlocinfo) DECLSPEC_HIDDEN;
 void free_mbcinfo(pthreadmbcinfo) DECLSPEC_HIDDEN;
 int __cdecl __crtLCMapStringA(LCID, DWORD, const char*, int, char*, int, unsigned int, int) DECLSPEC_HIDDEN;
 
-int            __cdecl MSVCRT__write(int,const void*,unsigned int);
 int            __cdecl _getch(void);
 int            __cdecl _ismbblead(unsigned int);
 int            __cdecl _ismbblead_l(unsigned int, _locale_t);
@@ -662,10 +652,6 @@ wchar_t*** __cdecl MSVCRT___p__wenviron(void);
 char*   __cdecl MSVCRT__strdate(char* date);
 char*   __cdecl MSVCRT__strtime(char* date);
 int     __cdecl _setmbcp(int);
-int     __cdecl MSVCRT__close(int);
-int     __cdecl MSVCRT__dup(int);
-int     __cdecl MSVCRT__dup2(int, int);
-int     __cdecl MSVCRT__pipe(int *, unsigned int, int);
 void __cdecl    MSVCRT__wsearchenv(const wchar_t*, const wchar_t*, wchar_t*);
 int __cdecl      MSVCRT__towupper_l(wint_t,_locale_t);
 int __cdecl      MSVCRT__towlower_l(wint_t,_locale_t);
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 3714eb51511..e2b61403321 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -297,8 +297,8 @@
 @ extern __winitenv MSVCRT___winitenv
 @ cdecl _abnormal_termination()
 @ cdecl -ret64 _abs64(int64)
-@ cdecl _access(str long) MSVCRT__access
-@ cdecl _access_s(str long) MSVCRT__access_s
+@ cdecl _access(str long)
+@ cdecl _access_s(str long)
 @ extern _acmdln MSVCRT__acmdln
 @ stdcall -arch=i386 _adj_fdiv_m16i(long)
 @ stdcall -arch=i386 _adj_fdiv_m32(long)
@@ -354,14 +354,14 @@
 @ cdecl _chgsign(double)
 @ cdecl -arch=!i386 _chgsignf(float)
 @ cdecl -arch=i386 -norelay _chkesp()
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
-@ cdecl _chsize_s(long int64) MSVCRT__chsize_s
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
+@ cdecl _chsize_s(long int64)
 # stub _chvalidator(long long)
 # stub _chvalidator_l(ptr long long)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ extern _commode MSVCRT__commode
 @ cdecl _control87(long long)
 @ cdecl _controlfp(long long)
@@ -376,7 +376,7 @@
 # stub _cprintf_s_l(str ptr)
 @ cdecl _cputs(str)
 @ cdecl _cputws(wstr)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ cdecl _create_locale(long str)
 # stub _crtAssertBusy
 # stub _crtBreakAlloc
@@ -405,14 +405,14 @@
 @ cdecl _difftime32(long long)
 @ cdecl _difftime64(int64 int64)
 @ extern _dstbias MSVCRT__dstbias
-@ cdecl _dup (long) MSVCRT__dup
-@ cdecl _dup2 (long long) MSVCRT__dup2
+@ cdecl _dup (long) _dup
+@ cdecl _dup2 (long long) _dup2
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _ecvt_s(str long double long ptr ptr)
 @ cdecl _endthread ()
 @ cdecl _endthreadex(long)
 @ extern _environ MSVCRT__environ
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@@ -428,17 +428,17 @@
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
 # stub _expand_dbg(ptr long long str long)
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
 @ cdecl _fcvt_s(ptr long double long ptr ptr)
-@ cdecl _fdopen(long str) MSVCRT__fdopen
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filbuf(ptr) MSVCRT__filbuf
+@ cdecl _fdopen(long str)
+@ cdecl _fgetchar()
+@ cdecl _fgetwchar()
+@ cdecl _filbuf(ptr)
 # extern _fileinfo
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _filelength(long)
+@ cdecl -ret64 _filelengthi64(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst(str ptr)
 @ cdecl _findfirst32(str ptr)
@@ -452,8 +452,8 @@
 @ cdecl _findnexti64(long ptr)
 @ cdecl _finite(double)
 @ cdecl -arch=!i386 _finitef(float)
-@ cdecl _flsbuf(long ptr) MSVCRT__flsbuf
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flsbuf(long ptr)
+@ cdecl _flushall()
 @ extern _fmode MSVCRT__fmode
 @ cdecl _fpclass(double)
 @ cdecl -arch=!i386 _fpclassf(float)
@@ -463,20 +463,20 @@
 # stub _fprintf_p(ptr str)
 # stub _fprintf_p_l(ptr str ptr)
 # stub _fprintf_s_l(ptr str ptr)
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
+@ cdecl _fputchar(long)
+@ cdecl _fputwchar(long)
 # stub _free_dbg(ptr long)
 @ cdecl _free_locale(ptr)
 # stub _freea(ptr)
 # stub _freea_s
 @ varargs _fscanf_l(ptr str ptr)
 @ varargs _fscanf_s_l(ptr str ptr)
-@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat(long ptr) MSVCRT__fstat
-@ cdecl _fstat64(long ptr) MSVCRT__fstat64
-@ cdecl _fstati64(long ptr) MSVCRT__fstati64
-@ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64
+@ cdecl _fseeki64(ptr int64 long)
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat(long ptr)
+@ cdecl _fstat64(long ptr)
+@ cdecl _fstati64(long ptr)
+@ cdecl -ret64 _ftelli64(ptr)
 @ cdecl -arch=win32 _ftime(ptr) _ftime32
 @ cdecl -arch=win64 _ftime(ptr) _ftime64
 @ cdecl _ftime32(ptr)
@@ -493,7 +493,7 @@
 @ cdecl -arch=win64 _futime(long ptr) _futime64
 @ cdecl _futime32(long ptr)
 @ cdecl _futime64(long ptr)
-@ varargs _fwprintf_l(ptr wstr ptr) MSVCRT__fwprintf_l
+@ varargs _fwprintf_l(ptr wstr ptr)
 # stub _fwprintf_p(ptr wstr)
 # stub _fwprintf_p_l(ptr wstr ptr)
 # stub _fwprintf_s_l(ptr wstr ptr)
@@ -508,7 +508,7 @@
 # stub _get_fileinfo(ptr)
 @ cdecl _get_fmode(ptr)
 @ cdecl _get_heap_handle()
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _get_osplatform(ptr)
 @ cdecl _get_osver(ptr)
 @ cdecl _get_output_format()
@@ -530,14 +530,14 @@
 @ cdecl _getdllprocaddr(long str long)
 @ cdecl _getdrive()
 @ cdecl _getdrives() kernel32.GetLogicalDrives
-@ cdecl _getmaxstdio() MSVCRT__getmaxstdio
+@ cdecl _getmaxstdio()
 @ cdecl _getmbcp()
 @ cdecl _getpid() _getpid
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
+@ cdecl _getw(ptr)
 @ cdecl _getwch()
 @ cdecl _getwche()
-@ cdecl _getws(ptr) MSVCRT__getws
+@ cdecl _getws(ptr)
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _gmtime32(ptr)
 @ cdecl _gmtime32_s(ptr ptr)
@@ -564,7 +564,7 @@
 @ extern _iob MSVCRT__iob
 @ cdecl _isalnum_l(long ptr)
 @ cdecl _isalpha_l(long ptr)
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _iscntrl_l(long ptr)
 @ cdecl _isctype(long long)
 @ cdecl _isctype_l(long long ptr)
@@ -667,8 +667,8 @@
 @ cdecl _localtime64(ptr)
 @ cdecl _localtime64_s(ptr ptr)
 @ cdecl _lock(long)
-@ cdecl _lock_file(ptr) MSVCRT__lock_file
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _lock_file(ptr)
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl -arch=!i386 _logbf(float)
 @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp
@@ -676,8 +676,8 @@
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
 # stub _lsearch_s(ptr ptr ptr long ptr ptr)
-@ cdecl _lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _lseek(long long long)
+@ cdecl -ret64 _lseeki64(long int64 long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltoa_s(long ptr long long)
 @ cdecl _ltow(long ptr long) ntdll._ltow
@@ -832,8 +832,8 @@
 @ cdecl -arch=win64 _mkgmtime(ptr) _mkgmtime64
 @ cdecl _mkgmtime32(ptr)
 @ cdecl _mkgmtime64(ptr)
-@ cdecl _mktemp(str) MSVCRT__mktemp
-@ cdecl _mktemp_s(str long) MSVCRT__mktemp_s
+@ cdecl _mktemp(str)
+@ cdecl _mktemp_s(str long)
 @ cdecl _mktime32(ptr)
 @ cdecl _mktime64(ptr)
 @ cdecl _msize(ptr)
@@ -842,8 +842,8 @@
 @ cdecl _nextafter(double double)
 @ cdecl -arch=x86_64 _nextafterf(float float)
 @ cdecl _onexit(ptr)
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ extern _osplatform MSVCRT__osplatform
 @ extern _osver MSVCRT__osver
 @ stub -arch=i386 _outp(long long)
@@ -852,7 +852,7 @@
 @ cdecl _pclose (ptr) _pclose
 @ extern _pctype MSVCRT__pctype
 @ extern _pgmptr MSVCRT__pgmptr
-@ cdecl _pipe (ptr long long) MSVCRT__pipe
+@ cdecl _pipe (ptr long long) _pipe
 @ cdecl _popen (str str) _popen
 # stub _printf_l(str ptr)
 # stub _printf_p(str)
@@ -862,15 +862,15 @@
 @ cdecl _putch(long)
 @ cdecl _putenv(str)
 @ cdecl _putenv_s(str str)
-@ cdecl _putw(long ptr) MSVCRT__putw
+@ cdecl _putw(long ptr)
 @ cdecl _putwch(long)
-@ cdecl _putws(wstr) MSVCRT__putws
+@ cdecl _putws(wstr)
 @ extern _pwctype MSVCRT__pwctype
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 # stub _realloc_dbg(ptr long long str long)
 @ cdecl _resetstkoflw()
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl -ret64 _rotl64(int64 long)
 @ cdecl _rotr(long long)
@@ -906,9 +906,9 @@
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
 @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
 @ cdecl -arch=x86_64,arm,arm64 -norelay _setjmpex(ptr ptr) __wine_setjmpex
-@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio
+@ cdecl _setmaxstdio(long)
 @ cdecl _setmbcp(long)
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str)
@@ -929,8 +929,8 @@
 @ varargs _snwscanf_l(wstr long wstr ptr)
 @ varargs _snwscanf_s(wstr long wstr)
 @ varargs _snwscanf_s_l(wstr long wstr ptr)
-@ varargs _sopen(str long long) MSVCRT__sopen
-@ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s
+@ varargs _sopen(str long long)
+@ cdecl _sopen_s(ptr str long long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -946,9 +946,9 @@
 @ varargs _sprintf_s_l(ptr long str ptr)
 @ varargs _sscanf_l(str str ptr)
 @ varargs _sscanf_s_l(str str ptr)
-@ cdecl _stat(str ptr) MSVCRT_stat
-@ cdecl _stat64(str ptr) MSVCRT_stat64
-@ cdecl _stati64(str ptr) MSVCRT_stati64
+@ cdecl _stat(str ptr)
+@ cdecl _stat64(str ptr)
+@ cdecl _stati64(str ptr)
 @ cdecl _statusfp()
 @ cdecl _strcmpi(str str) _stricmp
 @ cdecl _strcoll_l(str str ptr)
@@ -1001,9 +1001,9 @@
 @ varargs _swscanf_s_l(wstr wstr ptr)
 @ extern _sys_errlist MSVCRT__sys_errlist
 @ extern _sys_nerr MSVCRT__sys_nerr
-@ cdecl _tell(long) MSVCRT__tell
+@ cdecl _tell(long)
 @ cdecl -ret64 _telli64(long)
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tempnam(str str)
 # stub _tempnam_dbg(str str long str long)
 @ cdecl _time32(ptr)
 @ cdecl _time64(ptr)
@@ -1024,14 +1024,14 @@
 @ cdecl _ultoa_s(long ptr long long)
 @ cdecl _ultow(long ptr long) ntdll._ultow
 @ cdecl _ultow_s(long ptr long long)
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 # stub _umask_s(long ptr)
 @ cdecl _ungetch(long)
 @ cdecl _ungetwch(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
 @ cdecl _unlock(long)
-@ cdecl _unlock_file(ptr) MSVCRT__unlock_file
+@ cdecl _unlock_file(ptr)
 @ cdecl _utime32(str ptr)
 @ cdecl _utime64(str ptr)
 @ cdecl _vcprintf(str ptr)
@@ -1046,14 +1046,14 @@
 # stub _vcwprintf_p_l(wstr ptr ptr)
 # stub _vcwprintf_s(wstr ptr)
 # stub _vcwprintf_s_l(wstr ptr ptr)
-@ cdecl _vfprintf_l(ptr str ptr ptr) MSVCRT__vfprintf_l
-@ cdecl _vfprintf_p(ptr str ptr) MSVCRT__vfprintf_p
-@ cdecl _vfprintf_p_l(ptr str ptr ptr) MSVCRT__vfprintf_p_l
-@ cdecl _vfprintf_s_l(ptr str ptr ptr) MSVCRT__vfprintf_s_l
-@ cdecl _vfwprintf_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_l
-@ cdecl _vfwprintf_p(ptr wstr ptr) MSVCRT__vfwprintf_p
-@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_p_l
-@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr) MSVCRT__vfwprintf_s_l
+@ cdecl _vfprintf_l(ptr str ptr ptr)
+@ cdecl _vfprintf_p(ptr str ptr)
+@ cdecl _vfprintf_p_l(ptr str ptr ptr)
+@ cdecl _vfprintf_s_l(ptr str ptr ptr)
+@ cdecl _vfwprintf_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_p(ptr wstr ptr)
+@ cdecl _vfwprintf_p_l(ptr wstr ptr ptr)
+@ cdecl _vfwprintf_s_l(ptr wstr ptr ptr)
 # stub _vprintf_l(str ptr ptr)
 # stub _vprintf_p(str ptr)
 # stub _vprintf_p_l(str ptr ptr)
@@ -1090,15 +1090,15 @@
 # stub _vwprintf_p(wstr ptr)
 # stub _vwprintf_p_l(wstr ptr ptr)
 # stub _vwprintf_s_l(wstr ptr ptr)
-@ cdecl _waccess(wstr long) MSVCRT__waccess
-@ cdecl _waccess_s(wstr long) MSVCRT__waccess_s
+@ cdecl _waccess(wstr long)
+@ cdecl _waccess_s(wstr long)
 @ cdecl _wasctime(ptr)
 @ cdecl _wasctime_s(ptr long ptr)
 @ cdecl _wassert(wstr wstr long)
 @ cdecl _wchdir(wstr)
-@ cdecl _wchmod(wstr long) MSVCRT__wchmod
+@ cdecl _wchmod(wstr long)
 @ extern _wcmdln MSVCRT__wcmdln
-@ cdecl _wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _wcreat(wstr long)
 @ cdecl _wcscoll_l(wstr wstr ptr)
 @ cdecl _wcsdup(wstr)
 # stub _wcsdup_dbg(wstr long str long)
@@ -1156,7 +1156,7 @@
 @ cdecl _wexecve(wstr ptr ptr)
 @ cdecl _wexecvp(wstr ptr)
 @ cdecl _wexecvpe(wstr ptr ptr)
-@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _wfdopen(long wstr)
 @ cdecl _wfindfirst(wstr ptr)
 @ cdecl _wfindfirst32(wstr ptr)
 @ cdecl _wfindfirst64(wstr ptr)
@@ -1166,11 +1166,11 @@
 @ cdecl _wfindnext64(long ptr)
 @ cdecl _wfindnext64i32(long ptr)
 @ cdecl _wfindnexti64(long ptr)
-@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s
-@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s
-@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _wfopen(wstr wstr)
+@ cdecl _wfopen_s(ptr wstr wstr)
+@ cdecl _wfreopen(wstr wstr ptr)
+@ cdecl _wfreopen_s(ptr wstr wstr ptr)
+@ cdecl _wfsopen(wstr wstr long)
 @ cdecl _wfullpath(ptr wstr long)
 # stub _wfullpath_dbg(ptr wstr long long str long)
 @ cdecl _wgetcwd(wstr long)
@@ -1184,9 +1184,9 @@
 @ cdecl _wmakepath(ptr wstr wstr wstr wstr)
 @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr)
 @ cdecl _wmkdir(wstr)
-@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
-@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
-@ varargs _wopen(wstr long) MSVCRT__wopen
+@ cdecl _wmktemp(wstr)
+@ cdecl _wmktemp_s(wstr long)
+@ varargs _wopen(wstr long)
 # stub _woutput_s
 @ cdecl _wperror(wstr)
 @ extern _wpgmptr MSVCRT__wpgmptr
@@ -1197,17 +1197,17 @@
 # stub _wprintf_s_l(wstr ptr)
 @ cdecl _wputenv(wstr)
 @ cdecl _wputenv_s(wstr wstr)
-@ cdecl _wremove(wstr) MSVCRT__wremove
-@ cdecl _wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _wremove(wstr)
+@ cdecl _wrename(wstr wstr)
+@ cdecl _write(long ptr long)
 @ cdecl _wrmdir(wstr)
 @ varargs _wscanf_l(wstr ptr)
 @ varargs _wscanf_s_l(wstr ptr)
 @ cdecl _wsearchenv(wstr wstr ptr)
 @ cdecl _wsearchenv_s(wstr wstr ptr long)
 @ cdecl _wsetlocale(long wstr)
-@ varargs _wsopen(wstr long long) MSVCRT__wsopen
-@ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s
+@ varargs _wsopen(wstr long long)
+@ cdecl _wsopen_s(ptr wstr long long long)
 @ varargs _wspawnl(long wstr wstr)
 @ varargs _wspawnle(long wstr wstr)
 @ varargs _wspawnlp(long wstr wstr)
@@ -1218,18 +1218,18 @@
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
 @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long)
-@ cdecl _wstat(wstr ptr) MSVCRT__wstat
-@ cdecl _wstati64(wstr ptr) MSVCRT__wstati64
-@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64
+@ cdecl _wstat(str ptr)
+@ cdecl _wstati64(wstr ptr)
+@ cdecl _wstat64(wstr ptr)
 @ cdecl _wstrdate(ptr)
 @ cdecl _wstrdate_s(ptr long)
 @ cdecl _wstrtime(ptr)
 @ cdecl _wstrtime_s(ptr long)
 @ cdecl _wsystem(wstr)
-@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
+@ cdecl _wtempnam(wstr wstr)
 # stub _wtempnam_dbg(wstr wstr long str long)
-@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
-@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s
+@ cdecl _wtmpnam(ptr)
+@ cdecl _wtmpnam_s(ptr long)
 @ cdecl _wtof(wstr)
 @ cdecl _wtof_l(wstr ptr)
 @ cdecl _wtoi(wstr)
@@ -1238,7 +1238,7 @@
 @ cdecl _wtoi_l(wstr ptr)
 @ cdecl _wtol(wstr)
 @ cdecl _wtol_l(wstr ptr)
-@ cdecl _wunlink(wstr) MSVCRT__wunlink
+@ cdecl _wunlink(wstr)
 @ cdecl -arch=win32 _wutime(wstr ptr) _wutime32
 @ cdecl -arch=win64 _wutime(wstr ptr) _wutime64
 @ cdecl _wutime32(wstr ptr)
@@ -1268,8 +1268,8 @@
 @ cdecl calloc(long long)
 @ cdecl ceil(double)
 @ cdecl -arch=!i386 ceilf(float)
-@ cdecl clearerr(ptr) MSVCRT_clearerr
-@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s
+@ cdecl clearerr(ptr)
+@ cdecl clearerr_s(ptr)
 @ cdecl clock()
 @ cdecl cos(double)
 @ cdecl cosh(double)
@@ -1285,52 +1285,52 @@
 @ cdecl -arch=!i386 expf(float)
 @ cdecl fabs(double)
 @ cdecl -arch=!i386 fabsf(float)
-@ cdecl fclose(ptr) MSVCRT_fclose
-@ cdecl feof(ptr) MSVCRT_feof
-@ cdecl ferror(ptr) MSVCRT_ferror
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl fclose(ptr)
+@ cdecl feof(ptr)
+@ cdecl ferror(ptr)
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
+@ cdecl fgetws(ptr long ptr)
 @ cdecl floor(double)
 @ cdecl -arch=!i386 floorf(float)
 @ cdecl fma(double double double)
 @ cdecl -arch=!i386 fmaf(float float float)
 @ cdecl fmod(double double)
 @ cdecl -arch=!i386 fmodf(float float)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s
-@ varargs fprintf(ptr str) MSVCRT_fprintf
-@ varargs fprintf_s(ptr str) MSVCRT_fprintf_s
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fputws(wstr ptr) MSVCRT_fputws
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
+@ cdecl fopen(str str)
+@ cdecl fopen_s(ptr str str)
+@ varargs fprintf(ptr str)
+@ varargs fprintf_s(ptr str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fputws(wstr ptr)
+@ cdecl fread(ptr long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
-@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
+@ cdecl freopen(str str ptr)
+@ cdecl freopen_s(ptr str str ptr)
 @ cdecl frexp(double ptr)
 @ cdecl -arch=x86_64 frexpf(float ptr)
 @ varargs fscanf(ptr str)
 @ varargs fscanf_s(ptr str)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
-@ varargs fwprintf_s(ptr wstr) MSVCRT_fwprintf_s
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ varargs fwprintf(ptr wstr)
+@ varargs fwprintf_s(ptr wstr)
+@ cdecl fwrite(ptr long long ptr)
 @ varargs fwscanf(ptr wstr)
 @ varargs fwscanf_s(ptr wstr)
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
 @ cdecl getenv_s(ptr ptr long str)
-@ cdecl gets(str) MSVCRT_gets
-@ cdecl getwc(ptr) MSVCRT_getwc
-@ cdecl getwchar() MSVCRT_getwchar
+@ cdecl gets(str)
+@ cdecl getwc(ptr)
+@ cdecl getwchar()
 @ cdecl -arch=win32 gmtime(ptr) _gmtime32
 @ cdecl -arch=win64 gmtime(ptr) _gmtime64
 @ cdecl is_wctype(long long) iswctype
@@ -1394,28 +1394,28 @@
 @ cdecl perror(str)
 @ cdecl pow(double double)
 @ cdecl -arch=!i386 powf(float float)
-@ varargs printf(str) MSVCRT_printf
-@ varargs printf_s(str) MSVCRT_printf_s
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
-@ cdecl putwc(long ptr) MSVCRT_fputwc
-@ cdecl putwchar(long) MSVCRT__fputwchar
+@ varargs printf(str)
+@ varargs printf_s(str)
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
+@ cdecl putwc(long ptr) fputwc
+@ cdecl putwchar(long) _fputwchar
 @ cdecl qsort(ptr long long ptr)
 @ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl raise(long)
 @ cdecl rand()
 @ cdecl rand_s(ptr)
 @ cdecl realloc(ptr long)
-@ cdecl remove(str) MSVCRT_remove
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl remove(str)
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ varargs scanf(str)
 @ varargs scanf_s(str)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl sinh(double)
@@ -1467,30 +1467,30 @@
 @ cdecl -arch=!i386 tanhf(float)
 @ cdecl -arch=win32 time(ptr) _time32
 @ cdecl -arch=win64 time(ptr) _time64
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
+@ cdecl tmpfile()
+@ cdecl tmpfile_s(ptr)
+@ cdecl tmpnam(ptr)
+@ cdecl tmpnam_s(ptr long)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towlower(long)
 @ cdecl towupper(long)
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
 # stub utime
-@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
-@ cdecl vfprintf_s(ptr str ptr) MSVCRT_vfprintf_s
-@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
-@ cdecl vfwprintf_s(ptr wstr ptr) MSVCRT_vfwprintf_s
-@ cdecl vprintf(str ptr) MSVCRT_vprintf
-@ cdecl vprintf_s(str ptr) MSVCRT_vprintf_s
+@ cdecl vfprintf(ptr str ptr)
+@ cdecl vfprintf_s(ptr str ptr)
+@ cdecl vfwprintf(ptr wstr ptr)
+@ cdecl vfwprintf_s(ptr wstr ptr)
+@ cdecl vprintf(str ptr)
+@ cdecl vprintf_s(str ptr)
 @ cdecl vsnprintf(ptr long str ptr) _vsnprintf
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl vsprintf_s(ptr long str ptr)
 @ cdecl vswprintf(ptr wstr ptr) _vswprintf
 @ cdecl vswprintf_s(ptr long wstr ptr)
-@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
-@ cdecl vwprintf_s(wstr ptr) MSVCRT_vwprintf_s
+@ cdecl vwprintf(wstr ptr)
+@ cdecl vwprintf_s(wstr ptr)
 @ cdecl wcrtomb(ptr long ptr)
 @ cdecl wcrtomb_s(ptr ptr long long ptr)
 @ cdecl wcscat(wstr wstr)
@@ -1526,7 +1526,7 @@
 @ cdecl wctob(long)
 @ cdecl wctomb(ptr long)
 @ cdecl wctomb_s(ptr ptr long long)
-@ varargs wprintf(wstr) MSVCRT_wprintf
-@ varargs wprintf_s(wstr) MSVCRT_wprintf_s
+@ varargs wprintf(wstr)
+@ varargs wprintf_s(wstr)
 @ varargs wscanf(wstr)
 @ varargs wscanf_s(wstr)
diff --git a/dlls/msvcrt/process.c b/dlls/msvcrt/process.c
index 54f39bc6bd7..cd56d3992aa 100644
--- a/dlls/msvcrt/process.c
+++ b/dlls/msvcrt/process.c
@@ -27,6 +27,7 @@
  * -No check for maximum path/argument/environment size is done
  */
 
+#include <io.h>
 #include <process.h>
 #include <stdarg.h>
 
@@ -1074,7 +1075,7 @@ FILE* CDECL _wpopen(const wchar_t* command, const wchar_t* mode)
         break;
     }
   }
-  if (MSVCRT__pipe(fds, 0, textmode) == -1)
+  if (_pipe(fds, 0, textmode) == -1)
     return NULL;
 
   fdToDup = readPipe ? 1 : 0;
@@ -1099,12 +1100,12 @@ FILE* CDECL _wpopen(const wchar_t* command, const wchar_t* mode)
   }
   else container = popen_handles+i;
 
-  if ((fdStdHandle = MSVCRT__dup(fdToDup)) == -1)
+  if ((fdStdHandle = _dup(fdToDup)) == -1)
     goto error;
-  if (MSVCRT__dup2(fds[fdToDup], fdToDup) != 0)
+  if (_dup2(fds[fdToDup], fdToDup) != 0)
     goto error;
 
-  MSVCRT__close(fds[fdToDup]);
+  _close(fds[fdToDup]);
 
   if (!(comspec = msvcrt_get_comspec())) goto error;
   len = wcslen(comspec) + wcslen(command) + 5;
@@ -1122,28 +1123,28 @@ FILE* CDECL _wpopen(const wchar_t* command, const wchar_t* mode)
   if ((container->proc = (HANDLE)msvcrt_spawn(MSVCRT__P_NOWAIT, comspec, fullcmd, NULL, 1))
           == INVALID_HANDLE_VALUE)
   {
-    MSVCRT__close(fds[fdToOpen]);
+    _close(fds[fdToOpen]);
     ret = NULL;
   }
   else
   {
-    ret = MSVCRT__wfdopen(fds[fdToOpen], mode);
+    ret = _wfdopen(fds[fdToOpen], mode);
     if (!ret)
-      MSVCRT__close(fds[fdToOpen]);
+      _close(fds[fdToOpen]);
     container->f = ret;
   }
   _unlock(_POPEN_LOCK);
   HeapFree(GetProcessHeap(), 0, comspec);
   HeapFree(GetProcessHeap(), 0, fullcmd);
-  MSVCRT__dup2(fdStdHandle, fdToDup);
-  MSVCRT__close(fdStdHandle);
+  _dup2(fdStdHandle, fdToDup);
+  _close(fdStdHandle);
   return ret;
 
 error:
   _unlock(_POPEN_LOCK);
-  if (fdStdHandle != -1) MSVCRT__close(fdStdHandle);
-  MSVCRT__close(fds[0]);
-  MSVCRT__close(fds[1]);
+  if (fdStdHandle != -1) _close(fdStdHandle);
+  _close(fds[0]);
+  _close(fds[1]);
   return NULL;
 }
 
@@ -1201,7 +1202,7 @@ int CDECL _pclose(FILE* file)
   popen_handles[i].f = NULL;
   _unlock(_POPEN_LOCK);
 
-  MSVCRT_fclose(file);
+  fclose(file);
   if(WaitForSingleObject(h, INFINITE)==WAIT_FAILED || !GetExitCodeProcess(h, &i))
   {
     msvcrt_set_errno(GetLastError());
diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h
index b69c87ecf30..d9b29821121 100644
--- a/dlls/msvcrt/scanf.h
+++ b/dlls/msvcrt/scanf.h
@@ -48,8 +48,8 @@
 #define _STRTOD_NAME_(func) console_ ## func
 #define _GETC_(file) (consumed++, _getch())
 #define _UNGETC_(nch, file) do { _ungetch(nch); consumed--; } while(0)
-#define _LOCK_FILE_(file) MSVCRT__lock_file(MSVCRT_stdin)
-#define _UNLOCK_FILE_(file) MSVCRT__unlock_file(MSVCRT_stdin)
+#define _LOCK_FILE_(file) _lock_file(MSVCRT_stdin)
+#define _UNLOCK_FILE_(file) _unlock_file(MSVCRT_stdin)
 #ifdef WIDE_SCANF
 #ifdef SECURE
 #define _FUNCTION_ static int vcwscanf_s_l(const wchar_t *format, _locale_t locale, __ms_va_list ap)
@@ -120,24 +120,24 @@
 #endif /* STRING_LEN */
 #else /* STRING */
 #ifdef WIDE_SCANF
-#define _GETC_FUNC_(file) MSVCRT_fgetwc(file)
+#define _GETC_FUNC_(file) fgetwc(file)
 #define _STRTOD_NAME_(func) filew_ ## func
-#define _GETC_(file) (consumed++, MSVCRT_fgetwc(file))
-#define _UNGETC_(nch, file) do { MSVCRT_ungetwc(nch, file); consumed--; } while(0)
-#define _LOCK_FILE_(file) MSVCRT__lock_file(file)
-#define _UNLOCK_FILE_(file) MSVCRT__unlock_file(file)
+#define _GETC_(file) (consumed++, fgetwc(file))
+#define _UNGETC_(nch, file) do { ungetwc(nch, file); consumed--; } while(0)
+#define _LOCK_FILE_(file) _lock_file(file)
+#define _UNLOCK_FILE_(file) _unlock_file(file)
 #ifdef SECURE
 #define _FUNCTION_ static int vfwscanf_s_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap)
 #else  /* SECURE */
 #define _FUNCTION_ static int vfwscanf_l(FILE* file, const wchar_t *format, _locale_t locale, __ms_va_list ap)
 #endif /* SECURE */
 #else /* WIDE_SCANF */
-#define _GETC_FUNC_(file) MSVCRT_fgetc(file)
+#define _GETC_FUNC_(file) fgetc(file)
 #define _STRTOD_NAME_(func) file_ ## func
-#define _GETC_(file) (consumed++, MSVCRT_fgetc(file))
-#define _UNGETC_(nch, file) do { MSVCRT_ungetc(nch, file); consumed--; } while(0)
-#define _LOCK_FILE_(file) MSVCRT__lock_file(file)
-#define _UNLOCK_FILE_(file) MSVCRT__unlock_file(file)
+#define _GETC_(file) (consumed++, fgetc(file))
+#define _UNGETC_(nch, file) do { ungetc(nch, file); consumed--; } while(0)
+#define _LOCK_FILE_(file) _lock_file(file)
+#define _UNLOCK_FILE_(file) _unlock_file(file)
 #ifdef SECURE
 #define _FUNCTION_ static int vfscanf_s_l(FILE* file, const char *format, _locale_t locale, __ms_va_list ap)
 #else  /* SECURE */
diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec
index c06bd44f759..c3d7a338b1b 100644
--- a/dlls/msvcrtd/msvcrtd.spec
+++ b/dlls/msvcrtd/msvcrtd.spec
@@ -198,7 +198,7 @@
 @ cdecl __wgetmainargs(ptr ptr ptr long ptr)
 @ extern __winitenv MSVCRT___winitenv
 @ cdecl _abnormal_termination()
-@ cdecl _access(str long) MSVCRT__access
+@ cdecl _access(str long)
 @ extern _acmdln MSVCRT__acmdln
 @ stdcall -arch=i386 _adj_fdiv_m16i(long)
 @ stdcall -arch=i386 _adj_fdiv_m32(long)
@@ -233,18 +233,18 @@
 @ cdecl _chdrive(long)
 @ cdecl _chgsign(double)
 @ cdecl -arch=i386 -norelay _chkesp()
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ extern _commode MSVCRT__commode
 @ cdecl _control87(long long)
 @ cdecl _controlfp(long long)
 @ cdecl _copysign(double double)
 @ varargs _cprintf(str)
 @ cdecl _cputs(str)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ extern _crtAssertBusy
 @ extern _crtBreakAlloc
 @ extern _crtDbgFlag
@@ -253,13 +253,13 @@
 @ cdecl _cwait(ptr long long)
 @ extern _daylight MSVCRT___daylight
 @ extern _dstbias MSVCRT__dstbias
-@ cdecl _dup(long) MSVCRT__dup
-@ cdecl _dup2(long long) MSVCRT__dup2
+@ cdecl _dup(long)
+@ cdecl _dup2(long long)
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
 @ extern _environ MSVCRT__environ
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
 @ cdecl -arch=i386 _except_handler3(ptr ptr ptr ptr)
@@ -274,34 +274,34 @@
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
 @ cdecl _expand_dbg(ptr long) _expand
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
-@ cdecl _fdopen(long str) MSVCRT__fdopen
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filbuf(ptr) MSVCRT__filbuf
+@ cdecl _fdopen(long str)
+@ cdecl _fgetchar()
+@ cdecl _fgetwchar()
+@ cdecl _filbuf(ptr)
 # extern _fileinfo
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _filelength(long)
+@ cdecl -ret64 _filelengthi64(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst(str ptr)
 @ cdecl _findfirsti64(str ptr)
 @ cdecl _findnext(long ptr)
 @ cdecl _findnexti64(long ptr)
 @ cdecl _finite(double)
-@ cdecl _flsbuf(long ptr) MSVCRT__flsbuf
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flsbuf(long ptr)
+@ cdecl _flushall()
 @ extern _fmode MSVCRT__fmode
 @ cdecl _fpclass(double)
 @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr)
 @ cdecl _fpreset()
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
+@ cdecl _fputchar(long)
+@ cdecl _fputwchar(long)
 @ cdecl _free_dbg(ptr) free
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat(long ptr) MSVCRT__fstat
-@ cdecl _fstati64(long ptr) MSVCRT__fstati64
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat(long ptr)
+@ cdecl _fstati64(long ptr)
 @ cdecl -arch=win32 _ftime(ptr) _ftime32
 @ cdecl -arch=win64 _ftime(ptr) _ftime64
 @ cdecl -arch=i386 -ret64 _ftol()
@@ -309,7 +309,7 @@
 @ cdecl -arch=win32 _futime(long ptr) _futime32
 @ cdecl -arch=win64 _futime(long ptr) _futime64
 @ cdecl _gcvt(double long str)
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _get_sbh_threshold()
 @ cdecl _getch()
 @ cdecl _getche()
@@ -319,12 +319,12 @@
 @ cdecl _getdllprocaddr(long str long)
 @ cdecl _getdrive()
 @ cdecl _getdrives() kernel32.GetLogicalDrives
-@ cdecl _getmaxstdio() MSVCRT__getmaxstdio
+@ cdecl _getmaxstdio()
 @ cdecl _getmbcp()
 @ cdecl _getpid()
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
-@ cdecl _getws(ptr) MSVCRT__getws
+@ cdecl _getw(ptr)
+@ cdecl _getws(ptr)
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _heapadd(ptr long)
 @ cdecl _heapchk()
@@ -340,7 +340,7 @@
 @ stub -arch=i386 _inpd(long)
 @ stub -arch=i386 _inpw(long)
 @ extern _iob MSVCRT__iob
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _isctype(long long)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalpha(long)
@@ -383,14 +383,14 @@
 @ cdecl -arch=x86_64 _local_unwind(ptr ptr)
 @ cdecl -arch=i386 _local_unwind2(ptr long)
 @ cdecl _lock(long)
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp
 @ cdecl _lrotl(long long)
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
-@ cdecl _lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _lseek(long long long)
+@ cdecl -ret64 _lseeki64(long int64 long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltow(long ptr long) ntdll._ltow
 @ cdecl _makepath(ptr str str str str)
@@ -453,13 +453,13 @@
 @ cdecl _memccpy(ptr ptr long long) ntdll._memccpy
 @ cdecl _memicmp(str str long)
 @ cdecl _mkdir(str)
-@ cdecl _mktemp(str) MSVCRT__mktemp
+@ cdecl _mktemp(str)
 @ cdecl _msize(ptr)
 @ cdecl _msize_dbg(ptr) _msize
 @ cdecl _nextafter(double double)
 @ cdecl _onexit(ptr)
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ extern _osver MSVCRT__osver
 @ stub -arch=i386 _outp(long long)
 @ stub -arch=i386 _outpd(long long)
@@ -467,18 +467,18 @@
 @ cdecl _pclose(ptr)
 @ extern _pctype MSVCRT__pctype
 @ extern _pgmptr MSVCRT__pgmptr
-@ cdecl _pipe(ptr long long) MSVCRT__pipe
+@ cdecl _pipe(ptr long long)
 @ cdecl _popen(str str)
 @ cdecl _purecall()
 @ cdecl _putch(long)
 @ cdecl _putenv(str)
-@ cdecl _putw(long ptr) MSVCRT__putw
-@ cdecl _putws(wstr) MSVCRT__putws
+@ cdecl _putw(long ptr)
+@ cdecl _putws(wstr)
 @ extern _pwctype MSVCRT__pwctype
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 @ cdecl _realloc_dbg(ptr long) realloc
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl _rotr(long long)
 @ cdecl -arch=i386 _safe_fdiv()
@@ -494,14 +494,14 @@
 @ cdecl _seterrormode(long)
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay _setjmp(ptr) MSVCRT__setjmp
 @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
-@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio
+@ cdecl _setmaxstdio(long)
 @ cdecl _setmbcp(long)
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
 @ varargs _snprintf(ptr long str)
 @ varargs _snwprintf(ptr long wstr)
-@ varargs _sopen(str long long) MSVCRT__sopen
+@ varargs _sopen(str long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -511,8 +511,8 @@
 @ cdecl _spawnvp(long str ptr)
 @ cdecl _spawnvpe(long str ptr ptr)
 @ cdecl _splitpath(str ptr ptr ptr ptr)
-@ cdecl _stat(str ptr) MSVCRT_stat
-@ cdecl _stati64(str ptr) MSVCRT_stati64
+@ cdecl _stat(str ptr)
+@ cdecl _stati64(str ptr)
 @ cdecl _statusfp()
 @ cdecl _strcmpi(str str) _stricmp
 @ cdecl _strdate(ptr)
@@ -532,9 +532,9 @@
 @ cdecl _swab(str str long)
 @ extern _sys_errlist MSVCRT__sys_errlist
 @ extern _sys_nerr MSVCRT__sys_nerr
-@ cdecl _tell(long) MSVCRT__tell
+@ cdecl _tell(long)
 @ cdecl -ret64 _telli64(long)
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tempnam(str str)
 @ extern _timezone MSVCRT___timezone
 @ cdecl _tolower(long)
 @ cdecl _toupper(long)
@@ -544,21 +544,21 @@
 @ cdecl _ui64tow(int64 ptr long) ntdll._ui64tow
 @ cdecl _ultoa(long ptr long) ntdll._ultoa
 @ cdecl _ultow(long ptr long) ntdll._ultow
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 @ cdecl _ungetch(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
 @ cdecl _unlock(long)
 @ cdecl -arch=win32 _utime(str ptr) _utime32
 @ cdecl -arch=win64 _utime(str ptr) _utime64
 @ cdecl _vsnprintf(ptr long str ptr)
 @ cdecl _vsnwprintf(ptr long wstr ptr)
-@ cdecl _waccess(wstr long) MSVCRT__waccess
+@ cdecl _waccess(wstr long)
 @ cdecl _wasctime(ptr)
 @ cdecl _wchdir(wstr)
-@ cdecl _wchmod(wstr long) MSVCRT__wchmod
+@ cdecl _wchmod(wstr long)
 @ extern _wcmdln MSVCRT__wcmdln
-@ cdecl _wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _wcreat(wstr long)
 @ cdecl _wcsdup(wstr)
 @ cdecl _wcsicmp(wstr wstr)
 @ cdecl _wcsicoll(wstr wstr)
@@ -581,14 +581,14 @@
 @ cdecl _wexecve(wstr ptr ptr)
 @ cdecl _wexecvp(wstr ptr)
 @ cdecl _wexecvpe(wstr ptr ptr)
-@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _wfdopen(long wstr)
 @ cdecl _wfindfirst(wstr ptr)
 @ cdecl _wfindfirsti64(wstr ptr)
 @ cdecl _wfindnext(long ptr)
 @ cdecl _wfindnexti64(long ptr)
-@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _wfopen(wstr wstr)
+@ cdecl _wfreopen(wstr wstr ptr)
+@ cdecl _wfsopen(wstr wstr long)
 @ cdecl _wfullpath(ptr wstr long)
 @ cdecl _wgetcwd(wstr long)
 @ cdecl _wgetdcwd(long wstr long)
@@ -598,19 +598,19 @@
 @ extern _winver MSVCRT__winver
 @ cdecl _wmakepath(ptr wstr wstr wstr wstr)
 @ cdecl _wmkdir(wstr)
-@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
-@ varargs _wopen(wstr long) MSVCRT__wopen
+@ cdecl _wmktemp(wstr)
+@ varargs _wopen(wstr long)
 @ cdecl _wperror(wstr)
 @ extern _wpgmptr MSVCRT__wpgmptr
 @ cdecl _wpopen(wstr wstr)
 @ cdecl _wputenv(wstr)
-@ cdecl _wremove(wstr) MSVCRT__wremove
-@ cdecl _wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _wremove(wstr)
+@ cdecl _wrename(wstr wstr)
+@ cdecl _write(long ptr long)
 @ cdecl _wrmdir(wstr)
 @ cdecl _wsearchenv(wstr wstr ptr)
 @ cdecl _wsetlocale(long wstr)
-@ varargs _wsopen(wstr long long) MSVCRT__wsopen
+@ varargs _wsopen(wstr long long)
 @ varargs _wspawnl(long wstr wstr)
 @ varargs _wspawnle(long wstr wstr)
 @ varargs _wspawnlp(long wstr wstr)
@@ -620,17 +620,17 @@
 @ cdecl _wspawnvp(long wstr ptr)
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
-@ cdecl _wstat(wstr ptr) MSVCRT__wstat
-@ cdecl _wstati64(wstr ptr) MSVCRT__wstati64
+@ cdecl _wstat(str ptr)
+@ cdecl _wstati64(wstr ptr)
 @ cdecl _wstrdate(ptr)
 @ cdecl _wstrtime(ptr)
 @ cdecl _wsystem(wstr)
-@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
-@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
+@ cdecl _wtempnam(wstr wstr)
+@ cdecl _wtmpnam(ptr)
 @ cdecl _wtoi(wstr)
 @ cdecl -ret64 _wtoi64(wstr)
 @ cdecl _wtol(wstr)
-@ cdecl _wunlink(wstr) MSVCRT__wunlink
+@ cdecl _wunlink(wstr)
 @ cdecl -arch=win32 _wutime(wstr ptr) _wutime32
 @ cdecl -arch=win64 _wutime(wstr ptr) _wutime64
 @ cdecl _y0(double)
@@ -650,7 +650,7 @@
 @ cdecl bsearch(ptr ptr long long ptr)
 @ cdecl calloc(long long)
 @ cdecl ceil(double)
-@ cdecl clearerr(ptr) MSVCRT_clearerr
+@ cdecl clearerr(ptr)
 @ cdecl clock()
 @ cdecl cos(double)
 @ cdecl cosh(double)
@@ -662,40 +662,40 @@
 @ cdecl exit(long)
 @ cdecl exp(double)
 @ cdecl fabs(double)
-@ cdecl fclose(ptr) MSVCRT_fclose
-@ cdecl feof(ptr) MSVCRT_feof
-@ cdecl ferror(ptr) MSVCRT_ferror
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl fclose(ptr)
+@ cdecl feof(ptr)
+@ cdecl ferror(ptr)
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
+@ cdecl fgetws(ptr long ptr)
 @ cdecl floor(double)
 @ cdecl fmod(double double)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ varargs fprintf(ptr str) MSVCRT_fprintf
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fputws(wstr ptr) MSVCRT_fputws
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
+@ cdecl fopen(str str)
+@ varargs fprintf(ptr str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fputws(wstr ptr)
+@ cdecl fread(ptr long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
+@ cdecl freopen(str str ptr)
 @ cdecl frexp(double ptr)
 @ varargs fscanf(ptr str)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ varargs fwprintf(ptr wstr) MSVCRT_fwprintf
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ varargs fwprintf(ptr wstr)
+@ cdecl fwrite(ptr long long ptr)
 @ varargs fwscanf(ptr wstr)
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
-@ cdecl gets(str) MSVCRT_gets
-@ cdecl getwc(ptr) MSVCRT_getwc
-@ cdecl getwchar() MSVCRT_getwchar
+@ cdecl gets(str)
+@ cdecl getwc(ptr)
+@ cdecl getwchar()
 @ cdecl -arch=win32 gmtime(ptr) _gmtime32
 @ cdecl -arch=win64 gmtime(ptr) _gmtime64
 @ cdecl is_wctype(long long) iswctype
@@ -747,23 +747,23 @@
 @ cdecl modf(double ptr)
 @ cdecl perror(str)
 @ cdecl pow(double double)
-@ varargs printf(str) MSVCRT_printf
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
-@ cdecl putwc(long ptr) MSVCRT_fputwc
-@ cdecl putwchar(long) MSVCRT__fputwchar
+@ varargs printf(str)
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
+@ cdecl putwc(long ptr) fputwc
+@ cdecl putwchar(long) _fputwchar
 @ cdecl qsort(ptr long long ptr)
 @ cdecl raise(long)
 @ cdecl rand()
 @ cdecl realloc(ptr long)
-@ cdecl remove(str) MSVCRT_remove
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl remove(str)
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ varargs scanf(str)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl sinh(double)
@@ -799,20 +799,20 @@
 @ cdecl tanh(double)
 @ cdecl -arch=win32 time(ptr) _time32
 @ cdecl -arch=win64 time(ptr) _time64
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
+@ cdecl tmpfile()
+@ cdecl tmpnam(ptr)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towlower(long)
 @ cdecl towupper(long)
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
-@ cdecl vfprintf(ptr str ptr) MSVCRT_vfprintf
-@ cdecl vfwprintf(ptr wstr ptr) MSVCRT_vfwprintf
-@ cdecl vprintf(str ptr) MSVCRT_vprintf
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
+@ cdecl vfprintf(ptr str ptr)
+@ cdecl vfwprintf(ptr wstr ptr)
+@ cdecl vprintf(str ptr)
 @ cdecl vsprintf(ptr str ptr)
 @ cdecl vswprintf(ptr wstr ptr) _vswprintf
-@ cdecl vwprintf(wstr ptr) MSVCRT_vwprintf
+@ cdecl vwprintf(wstr ptr)
 @ cdecl wcscat(wstr wstr)
 @ cdecl wcschr(wstr long)
 @ cdecl wcscmp(wstr wstr)
@@ -835,5 +835,5 @@
 @ cdecl wcstoul(wstr ptr long)
 @ cdecl wcsxfrm(ptr wstr long)
 @ cdecl wctomb(ptr long)
-@ varargs wprintf(wstr) MSVCRT_wprintf
+@ varargs wprintf(wstr)
 @ varargs wscanf(wstr)
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index 6dd14251745..d4197ae7be5 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -72,7 +72,7 @@
 @ cdecl ___lc_locale_name_func()
 @ cdecl ___mb_cur_max_func()
 @ cdecl ___mb_cur_max_l_func(ptr)
-@ cdecl __acrt_iob_func(long) MSVCRT___acrt_iob_func
+@ cdecl __acrt_iob_func(long)
 @ cdecl __conio_common_vcprintf(int64 str ptr ptr)
 @ stub __conio_common_vcprintf_p
 @ stub __conio_common_vcprintf_s
@@ -146,13 +146,13 @@
 @ cdecl __std_type_info_destroy_list(ptr)
 @ cdecl __std_type_info_hash(ptr)
 @ cdecl __std_type_info_name(ptr ptr)
-@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf
+@ cdecl __stdio_common_vfprintf(int64 ptr str ptr ptr) _stdio_common_vfprintf
 @ stub __stdio_common_vfprintf_p
-@ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf_s
+@ cdecl __stdio_common_vfprintf_s(int64 ptr str ptr ptr)
 @ cdecl __stdio_common_vfscanf(int64 ptr str ptr ptr)
-@ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf
+@ cdecl __stdio_common_vfwprintf(int64 ptr wstr ptr ptr)
 @ stub __stdio_common_vfwprintf_p
-@ cdecl __stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf_s
+@ cdecl __stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr)
 @ cdecl __stdio_common_vfwscanf(int64 ptr wstr ptr ptr)
 @ cdecl __stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr)
 @ cdecl __stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr)
@@ -179,8 +179,8 @@
 @ cdecl __wcserror_s(ptr long wstr)
 @ stub __wcsncnt
 @ cdecl -ret64 _abs64(int64)
-@ cdecl _access(str long) MSVCRT__access
-@ cdecl _access_s(str long) MSVCRT__access_s
+@ cdecl _access(str long)
+@ cdecl _access_s(str long)
 @ cdecl _aligned_free(ptr)
 @ cdecl _aligned_malloc(long long)
 @ cdecl _aligned_msize(ptr long long)
@@ -222,12 +222,12 @@
 @ cdecl _chgsign(double)
 @ cdecl _chgsignf(float)
 @ cdecl -arch=i386 -norelay _chkesp()
-@ cdecl _chmod(str long) MSVCRT__chmod
-@ cdecl _chsize(long long) MSVCRT__chsize
-@ cdecl _chsize_s(long int64) MSVCRT__chsize_s
+@ cdecl _chmod(str long)
+@ cdecl _chsize(long long)
+@ cdecl _chsize_s(long int64)
 @ cdecl _clearfp()
-@ cdecl _close(long) MSVCRT__close
-@ cdecl _commit(long) MSVCRT__commit
+@ cdecl _close(long)
+@ cdecl _commit(long)
 @ cdecl _configthreadlocale(long)
 @ cdecl _configure_narrow_argv(long)
 @ cdecl _configure_wide_argv(long)
@@ -238,7 +238,7 @@
 @ cdecl _copysignf(float float)
 @ cdecl _cputs(str)
 @ cdecl _cputws(wstr)
-@ cdecl _creat(str long) MSVCRT__creat
+@ cdecl _creat(str long)
 @ cdecl _create_locale(long str)
 @ cdecl _crt_at_quick_exit(ptr)
 @ cdecl _crt_atexit(ptr)
@@ -262,14 +262,14 @@
 @ stub _dsin
 @ cdecl _dtest(ptr)
 @ stub _dunscale
-@ cdecl _dup(long) MSVCRT__dup
-@ cdecl _dup2(long long) MSVCRT__dup2
+@ cdecl _dup(long)
+@ cdecl _dup2(long long)
 @ cdecl _dupenv_s(ptr ptr str)
 @ cdecl _ecvt(double long ptr ptr)
 @ cdecl _ecvt_s(str long double long ptr ptr)
 @ cdecl _endthread()
 @ cdecl _endthreadex(long)
-@ cdecl _eof(long) MSVCRT__eof
+@ cdecl _eof(long)
 @ cdecl _errno()
 @ cdecl _except1(long long double double long ptr)
 @ cdecl -arch=i386 _except_handler2(ptr ptr ptr ptr)
@@ -286,8 +286,8 @@
 @ cdecl _execvpe(str ptr ptr)
 @ cdecl _exit(long)
 @ cdecl _expand(ptr long)
-@ cdecl _fclose_nolock(ptr) MSVCRT__fclose_nolock
-@ cdecl _fcloseall() MSVCRT__fcloseall
+@ cdecl _fclose_nolock(ptr)
+@ cdecl _fcloseall()
 @ cdecl _fcvt(double long ptr ptr)
 @ cdecl _fcvt_s(ptr long double long ptr ptr)
 @ stub _fd_int
@@ -295,7 +295,7 @@
 @ stub _fdexp
 @ stub _fdlog
 @ stub _fdnorm
-@ cdecl _fdopen(long str) MSVCRT__fdopen
+@ cdecl _fdopen(long str)
 @ cdecl _fdpcomp(float float)
 @ stub _fdpoly
 @ stub _fdscale
@@ -303,14 +303,14 @@
 @ stub _fdsin
 @ cdecl _fdtest(ptr)
 @ stub _fdunscale
-@ cdecl _fflush_nolock(ptr) MSVCRT__fflush_nolock
-@ cdecl _fgetc_nolock(ptr) MSVCRT__fgetc_nolock
-@ cdecl _fgetchar() MSVCRT__fgetchar
-@ cdecl _fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock
-@ cdecl _fgetwchar() MSVCRT__fgetwchar
-@ cdecl _filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _fileno(ptr) MSVCRT__fileno
+@ cdecl _fflush_nolock(ptr)
+@ cdecl _fgetc_nolock(ptr)
+@ cdecl _fgetchar()
+@ cdecl _fgetwc_nolock(ptr)
+@ cdecl _fgetwchar()
+@ cdecl _filelength(long)
+@ cdecl -ret64 _filelengthi64(long)
+@ cdecl _fileno(ptr)
 @ cdecl _findclose(long)
 @ cdecl _findfirst32(str ptr)
 @ stub _findfirst32i64
@@ -322,30 +322,30 @@
 @ cdecl _findnext64i32(long ptr)
 @ cdecl _finite(double)
 @ cdecl -arch=!i386 _finitef(float)
-@ cdecl _flushall() MSVCRT__flushall
+@ cdecl _flushall()
 @ cdecl _fpclass(double)
 @ cdecl -arch=!i386 _fpclassf(float)
 @ cdecl -arch=i386,x86_64,arm,arm64 _fpieee_flt(long ptr ptr)
 @ cdecl _fpreset()
-@ cdecl _fputc_nolock(long ptr) MSVCRT__fputc_nolock
-@ cdecl _fputchar(long) MSVCRT__fputchar
-@ cdecl _fputwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _fputwchar(long) MSVCRT__fputwchar
-@ cdecl _fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
-@ cdecl _fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
+@ cdecl _fputc_nolock(long ptr)
+@ cdecl _fputchar(long)
+@ cdecl _fputwc_nolock(long ptr)
+@ cdecl _fputwchar(long)
+@ cdecl _fread_nolock(ptr long long ptr)
+@ cdecl _fread_nolock_s(ptr long long long ptr)
 @ cdecl _free_base(ptr)
 @ cdecl _free_locale(ptr)
-@ cdecl _fseek_nolock(ptr long long) MSVCRT__fseek_nolock
-@ cdecl _fseeki64(ptr int64 long) MSVCRT__fseeki64
-@ cdecl _fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock
-@ cdecl _fsopen(str str long) MSVCRT__fsopen
-@ cdecl _fstat32(long ptr) MSVCRT__fstat32
-@ cdecl _fstat32i64(long ptr) MSVCRT__fstat32i64
-@ cdecl _fstat64(long ptr) MSVCRT__fstat64
-@ cdecl _fstat64i32(long ptr) MSVCRT__fstat64i32
-@ cdecl _ftell_nolock(ptr) MSVCRT__ftell_nolock
-@ cdecl -ret64 _ftelli64(ptr) MSVCRT__ftelli64
-@ cdecl -ret64 _ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock
+@ cdecl _fseek_nolock(ptr long long)
+@ cdecl _fseeki64(ptr int64 long)
+@ cdecl _fseeki64_nolock(ptr int64 long)
+@ cdecl _fsopen(str str long)
+@ cdecl _fstat32(long ptr)
+@ cdecl _fstat32i64(long ptr)
+@ cdecl _fstat64(long ptr)
+@ cdecl _fstat64i32(long ptr)
+@ cdecl _ftell_nolock(ptr)
+@ cdecl -ret64 _ftelli64(ptr)
+@ cdecl -ret64 _ftelli64_nolock(ptr)
 @ cdecl _ftime32(ptr)
 @ cdecl _ftime32_s(ptr)
 @ cdecl _ftime64(ptr)
@@ -354,7 +354,7 @@
 @ cdecl _fullpath(ptr str long)
 @ cdecl _futime32(long ptr)
 @ cdecl _futime64(long ptr)
-@ cdecl _fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock
+@ cdecl _fwrite_nolock(ptr long long ptr)
 @ cdecl _gcvt(double long str)
 @ cdecl _gcvt_s(ptr long double long)
 @ cdecl -arch=win64 _get_FMA3_enable()
@@ -369,11 +369,11 @@
 @ cdecl _get_initial_wide_environment()
 @ cdecl _get_invalid_parameter_handler()
 @ cdecl _get_narrow_winmain_command_line()
-@ cdecl _get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _get_osfhandle(long)
 @ cdecl _get_pgmptr(ptr)
 @ cdecl _get_printf_count_output()
 @ cdecl _get_purecall_handler()
-@ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers
+@ cdecl _get_stream_buffer_pointers(ptr ptr ptr ptr)
 @ cdecl _get_terminate()
 @ cdecl _get_thread_local_invalid_parameter_handler()
 @ cdecl _get_timezone(ptr)
@@ -381,7 +381,7 @@
 @ cdecl _get_unexpected()
 @ cdecl _get_wide_winmain_command_line()
 @ cdecl _get_wpgmptr(ptr)
-@ cdecl _getc_nolock(ptr) MSVCRT__fgetc_nolock
+@ cdecl _getc_nolock(ptr) _fgetc_nolock
 @ cdecl _getch()
 @ cdecl _getch_nolock()
 @ cdecl _getche()
@@ -392,17 +392,17 @@
 @ cdecl _getdllprocaddr(long str long)
 @ cdecl _getdrive()
 @ cdecl _getdrives() kernel32.GetLogicalDrives
-@ cdecl _getmaxstdio() MSVCRT__getmaxstdio
+@ cdecl _getmaxstdio()
 @ cdecl _getmbcp()
 @ cdecl _getpid() _getpid
 @ stub _getsystime(ptr)
-@ cdecl _getw(ptr) MSVCRT__getw
-@ cdecl _getwc_nolock(ptr) MSVCRT__fgetwc_nolock
+@ cdecl _getw(ptr)
+@ cdecl _getwc_nolock(ptr) _fgetwc_nolock
 @ cdecl _getwch()
 @ cdecl _getwch_nolock()
 @ cdecl _getwche()
 @ cdecl _getwche_nolock()
-@ cdecl _getws(ptr) MSVCRT__getws
+@ cdecl _getws(ptr)
 @ stub _getws_s
 @ cdecl -arch=i386 _global_unwind2(ptr)
 @ cdecl _gmtime32(ptr)
@@ -429,7 +429,7 @@
 @ stub _is_exception_typeof
 @ cdecl _isalnum_l(long ptr)
 @ cdecl _isalpha_l(long ptr)
-@ cdecl _isatty(long) MSVCRT__isatty
+@ cdecl _isatty(long)
 @ cdecl _isblank_l(long ptr)
 @ cdecl _iscntrl_l(long ptr)
 @ cdecl _isctype(long long)
@@ -562,9 +562,9 @@
 @ cdecl _localtime32_s(ptr ptr)
 @ cdecl _localtime64(ptr)
 @ cdecl _localtime64_s(ptr ptr)
-@ cdecl _lock_file(ptr) MSVCRT__lock_file
+@ cdecl _lock_file(ptr)
 @ cdecl _lock_locales()
-@ cdecl _locking(long long long) MSVCRT__locking
+@ cdecl _locking(long long long)
 @ cdecl _logb(double)
 @ cdecl -arch=!i386 _logbf(float)
 @ cdecl -arch=i386 _longjmpex(ptr long) MSVCRT_longjmp
@@ -572,8 +572,8 @@
 @ cdecl _lrotr(long long)
 @ cdecl _lsearch(ptr ptr ptr long ptr)
 @ stub _lsearch_s
-@ cdecl _lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _lseek(long long long)
+@ cdecl -ret64 _lseeki64(long int64 long)
 @ cdecl _ltoa(long ptr long) ntdll._ltoa
 @ cdecl _ltoa_s(long ptr long long)
 @ cdecl _ltow(long ptr long) ntdll._ltow
@@ -723,8 +723,8 @@
 @ cdecl _mkdir(str)
 @ cdecl _mkgmtime32(ptr)
 @ cdecl _mkgmtime64(ptr)
-@ cdecl _mktemp(str) MSVCRT__mktemp
-@ cdecl _mktemp_s(str long) MSVCRT__mktemp_s
+@ cdecl _mktemp(str)
+@ cdecl _mktemp_s(str long)
 @ cdecl _mktime32(ptr)
 @ cdecl _mktime64(ptr)
 @ cdecl _msize(ptr)
@@ -758,7 +758,7 @@
 @ cdecl _o____lc_collate_cp_func() ___lc_collate_cp_func
 @ cdecl _o____lc_locale_name_func() ___lc_locale_name_func
 @ cdecl _o____mb_cur_max_func() ___mb_cur_max_func
-@ cdecl _o___acrt_iob_func(long) MSVCRT___acrt_iob_func
+@ cdecl _o___acrt_iob_func(long) __acrt_iob_func
 @ cdecl _o___conio_common_vcprintf(int64 str ptr ptr) __conio_common_vcprintf
 @ stub _o___conio_common_vcprintf_p
 @ stub _o___conio_common_vcprintf_s
@@ -810,13 +810,13 @@
 @ cdecl _o___std_exception_destroy(ptr) __std_exception_destroy
 @ cdecl _o___std_type_info_destroy_list(ptr) __std_type_info_destroy_list
 @ cdecl _o___std_type_info_name(ptr ptr) __std_type_info_name
-@ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf
+@ cdecl _o___stdio_common_vfprintf(int64 ptr str ptr ptr) _stdio_common_vfprintf
 @ stub _o___stdio_common_vfprintf_p
-@ cdecl _o___stdio_common_vfprintf_s(int64 ptr str ptr ptr) MSVCRT__stdio_common_vfprintf_s
+@ cdecl _o___stdio_common_vfprintf_s(int64 ptr str ptr ptr) __stdio_common_vfprintf_s
 @ cdecl _o___stdio_common_vfscanf(int64 ptr str ptr ptr) __stdio_common_vfscanf
-@ cdecl _o___stdio_common_vfwprintf(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf
+@ cdecl _o___stdio_common_vfwprintf(int64 ptr wstr ptr ptr) __stdio_common_vfwprintf
 @ stub _o___stdio_common_vfwprintf_p
-@ cdecl _o___stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) MSVCRT__stdio_common_vfwprintf_s
+@ cdecl _o___stdio_common_vfwprintf_s(int64 ptr wstr ptr ptr) __stdio_common_vfwprintf_s
 @ cdecl _o___stdio_common_vfwscanf(int64 ptr wstr ptr ptr) __stdio_common_vfwscanf
 @ cdecl _o___stdio_common_vsnprintf_s(int64 ptr long long str ptr ptr) __stdio_common_vsnprintf_s
 @ cdecl _o___stdio_common_vsnwprintf_s(int64 ptr long long wstr ptr ptr) __stdio_common_vsnwprintf_s
@@ -831,8 +831,8 @@
 @ cdecl _o___timezone() __p__timezone
 @ cdecl _o___tzname() __p__tzname
 @ cdecl _o___wcserror(wstr) __wcserror
-@ cdecl _o__access(str long) MSVCRT__access
-@ cdecl _o__access_s(str long) MSVCRT__access_s
+@ cdecl _o__access(str long) _access
+@ cdecl _o__access_s(str long) _access_s
 @ cdecl _o__aligned_free(ptr) _aligned_free
 @ cdecl _o__aligned_malloc(long long) _aligned_malloc
 @ cdecl _o__aligned_msize(ptr long long) _aligned_msize
@@ -866,18 +866,18 @@
 @ stub _o__cgetws_s
 @ cdecl _o__chdir(str) _chdir
 @ cdecl _o__chdrive(long) _chdrive
-@ cdecl _o__chmod(str long) MSVCRT__chmod
-@ cdecl _o__chsize(long long) MSVCRT__chsize
-@ cdecl _o__chsize_s(long int64) MSVCRT__chsize_s
-@ cdecl _o__close(long) MSVCRT__close
-@ cdecl _o__commit(long) MSVCRT__commit
+@ cdecl _o__chmod(str long) _chmod
+@ cdecl _o__chsize(long long) _chsize
+@ cdecl _o__chsize_s(long int64) _chsize_s
+@ cdecl _o__close(long) _close
+@ cdecl _o__commit(long) _commit
 @ cdecl _o__configthreadlocale(long) _configthreadlocale
 @ cdecl _o__configure_narrow_argv(long) _configure_narrow_argv
 @ cdecl _o__configure_wide_argv(long) _configure_wide_argv
 @ cdecl _o__controlfp_s(ptr long long) _controlfp_s
 @ cdecl _o__cputs(str) _cputs
 @ cdecl _o__cputws(wstr) _cputws
-@ cdecl _o__creat(str long) MSVCRT__creat
+@ cdecl _o__creat(str long) _creat
 @ cdecl _o__create_locale(long str) _create_locale
 @ cdecl _o__crt_atexit(ptr) _crt_atexit
 @ cdecl _o__ctime32_s(str long ptr) _ctime32_s
@@ -896,14 +896,14 @@
 @ stub _o__dsin
 @ cdecl _o__dtest(ptr) _dtest
 @ stub _o__dunscale
-@ cdecl _o__dup(long) MSVCRT__dup
-@ cdecl _o__dup2(long long) MSVCRT__dup2
+@ cdecl _o__dup(long) _dup
+@ cdecl _o__dup2(long long) _dup2
 @ cdecl _o__dupenv_s(ptr ptr str) _dupenv_s
 @ cdecl _o__ecvt(double long ptr ptr) _ecvt
 @ cdecl _o__ecvt_s(str long double long ptr ptr) _ecvt_s
 @ cdecl _o__endthread() _endthread
 @ cdecl _o__endthreadex(long) _endthreadex
-@ cdecl _o__eof(long) MSVCRT__eof
+@ cdecl _o__eof(long) _eof
 @ cdecl _o__errno() _errno
 @ cdecl _o__except1(long long double double long ptr) _except1
 @ cdecl _o__execute_onexit_table(ptr) _execute_onexit_table
@@ -913,28 +913,28 @@
 @ cdecl _o__execvpe(str ptr ptr) _execvpe
 @ cdecl _o__exit(long) _exit
 @ cdecl _o__expand(ptr long) _expand
-@ cdecl _o__fclose_nolock(ptr) MSVCRT__fclose_nolock
-@ cdecl _o__fcloseall() MSVCRT__fcloseall
+@ cdecl _o__fclose_nolock(ptr) _fclose_nolock
+@ cdecl _o__fcloseall() _fcloseall
 @ cdecl _o__fcvt(double long ptr ptr) _fcvt
 @ cdecl _o__fcvt_s(ptr long double long ptr ptr) _fcvt_s
 @ stub _o__fd_int
 @ cdecl _o__fdclass(float) _fdclass
 @ stub _o__fdexp
 @ stub _o__fdlog
-@ cdecl _o__fdopen(long str) MSVCRT__fdopen
+@ cdecl _o__fdopen(long str) _fdopen
 @ cdecl _o__fdpcomp(float float) _fdpcomp
 @ stub _o__fdpoly
 @ stub _o__fdscale
 @ cdecl _o__fdsign(float) _fdsign
 @ stub _o__fdsin
-@ cdecl _o__fflush_nolock(ptr) MSVCRT__fflush_nolock
-@ cdecl _o__fgetc_nolock(ptr) MSVCRT__fgetc_nolock
-@ cdecl _o__fgetchar() MSVCRT__fgetchar
-@ cdecl _o__fgetwc_nolock(ptr) MSVCRT__fgetwc_nolock
-@ cdecl _o__fgetwchar() MSVCRT__fgetwchar
-@ cdecl _o__filelength(long) MSVCRT__filelength
-@ cdecl -ret64 _o__filelengthi64(long) MSVCRT__filelengthi64
-@ cdecl _o__fileno(ptr) MSVCRT__fileno
+@ cdecl _o__fflush_nolock(ptr) _fflush_nolock
+@ cdecl _o__fgetc_nolock(ptr) _fgetc_nolock
+@ cdecl _o__fgetchar() _fgetchar
+@ cdecl _o__fgetwc_nolock(ptr) _fgetwc_nolock
+@ cdecl _o__fgetwchar() _fgetwchar
+@ cdecl _o__filelength(long) _filelength
+@ cdecl -ret64 _o__filelengthi64(long) _filelengthi64
+@ cdecl _o__fileno(ptr) _fileno
 @ cdecl _o__findclose(long) _findclose
 @ cdecl _o__findfirst32(str ptr) _findfirst32
 @ stub _o__findfirst32i64
@@ -944,28 +944,28 @@
 @ stub _o__findnext32i64
 @ cdecl _o__findnext64(long ptr) _findnext64
 @ cdecl _o__findnext64i32(long ptr) _findnext64i32
-@ cdecl _o__flushall() MSVCRT__flushall
+@ cdecl _o__flushall() _flushall
 @ cdecl _o__fpclass(double) _fpclass
 @ cdecl -arch=!i386 _o__fpclassf(float) _fpclassf
-@ cdecl _o__fputc_nolock(long ptr) MSVCRT__fputc_nolock
-@ cdecl _o__fputchar(long) MSVCRT__fputchar
-@ cdecl _o__fputwc_nolock(long ptr) MSVCRT__fputwc_nolock
-@ cdecl _o__fputwchar(long) MSVCRT__fputwchar
-@ cdecl _o__fread_nolock(ptr long long ptr) MSVCRT__fread_nolock
-@ cdecl _o__fread_nolock_s(ptr long long long ptr) MSVCRT__fread_nolock_s
+@ cdecl _o__fputc_nolock(long ptr) _fputc_nolock
+@ cdecl _o__fputchar(long) _fputchar
+@ cdecl _o__fputwc_nolock(long ptr) _fputwc_nolock
+@ cdecl _o__fputwchar(long) _fputwchar
+@ cdecl _o__fread_nolock(ptr long long ptr) _fread_nolock
+@ cdecl _o__fread_nolock_s(ptr long long long ptr) _fread_nolock_s
 @ cdecl _o__free_base(ptr) _free_base
 @ cdecl _o__free_locale(ptr) _free_locale
-@ cdecl _o__fseek_nolock(ptr long long) MSVCRT__fseek_nolock
-@ cdecl _o__fseeki64(ptr int64 long) MSVCRT__fseeki64
-@ cdecl _o__fseeki64_nolock(ptr int64 long) MSVCRT__fseeki64_nolock
-@ cdecl _o__fsopen(str str long) MSVCRT__fsopen
-@ cdecl _o__fstat32(long ptr) MSVCRT__fstat32
-@ cdecl _o__fstat32i64(long ptr) MSVCRT__fstat32i64
-@ cdecl _o__fstat64(long ptr) MSVCRT__fstat64
-@ cdecl _o__fstat64i32(long ptr) MSVCRT__fstat64i32
-@ cdecl _o__ftell_nolock(ptr) MSVCRT__ftell_nolock
-@ cdecl -ret64 _o__ftelli64(ptr) MSVCRT__ftelli64
-@ cdecl -ret64 _o__ftelli64_nolock(ptr) MSVCRT__ftelli64_nolock
+@ cdecl _o__fseek_nolock(ptr long long) _fseek_nolock
+@ cdecl _o__fseeki64(ptr int64 long) _fseeki64
+@ cdecl _o__fseeki64_nolock(ptr int64 long) _fseeki64_nolock
+@ cdecl _o__fsopen(str str long) _fsopen
+@ cdecl _o__fstat32(long ptr) _fstat32
+@ cdecl _o__fstat32i64(long ptr) _fstat32i64
+@ cdecl _o__fstat64(long ptr) _fstat64
+@ cdecl _o__fstat64i32(long ptr) _fstat64i32
+@ cdecl _o__ftell_nolock(ptr) _ftell_nolock
+@ cdecl -ret64 _o__ftelli64(ptr) _ftelli64
+@ cdecl -ret64 _o__ftelli64_nolock(ptr) _ftelli64_nolock
 @ cdecl _o__ftime32(ptr) _ftime32
 @ cdecl _o__ftime32_s(ptr) _ftime32_s
 @ cdecl _o__ftime64(ptr) _ftime64
@@ -973,7 +973,7 @@
 @ cdecl _o__fullpath(ptr str long) _fullpath
 @ cdecl _o__futime32(long ptr) _futime32
 @ cdecl _o__futime64(long ptr) _futime64
-@ cdecl _o__fwrite_nolock(ptr long long ptr) MSVCRT__fwrite_nolock
+@ cdecl _o__fwrite_nolock(ptr long long ptr) _fwrite_nolock
 @ cdecl _o__gcvt(double long str) _gcvt
 @ cdecl _o__gcvt_s(ptr long double long) _gcvt_s
 @ cdecl _o__get_daylight(ptr) _get_daylight
@@ -986,16 +986,16 @@
 @ cdecl _o__get_initial_wide_environment() _get_initial_wide_environment
 @ cdecl _o__get_invalid_parameter_handler() _get_invalid_parameter_handler
 @ cdecl _o__get_narrow_winmain_command_line() _get_narrow_winmain_command_line
-@ cdecl _o__get_osfhandle(long) MSVCRT__get_osfhandle
+@ cdecl _o__get_osfhandle(long) _get_osfhandle
 @ cdecl _o__get_pgmptr(ptr) _get_pgmptr
-@ cdecl _o__get_stream_buffer_pointers(ptr ptr ptr ptr) MSVCRT__get_stream_buffer_pointers
+@ cdecl _o__get_stream_buffer_pointers(ptr ptr ptr ptr) _get_stream_buffer_pointers
 @ cdecl _o__get_terminate() _get_terminate
 @ cdecl _o__get_thread_local_invalid_parameter_handler() _get_thread_local_invalid_parameter_handler
 @ cdecl _o__get_timezone(ptr) _get_timezone
 @ cdecl _o__get_tzname(ptr str long long) _get_tzname
 @ cdecl _o__get_wide_winmain_command_line() _get_wide_winmain_command_line
 @ cdecl _o__get_wpgmptr(ptr) _get_wpgmptr
-@ cdecl _o__getc_nolock(ptr) MSVCRT__fgetc_nolock
+@ cdecl _o__getc_nolock(ptr) _fgetc_nolock
 @ cdecl _o__getch() _getch
 @ cdecl _o__getch_nolock() _getch_nolock
 @ cdecl _o__getche() _getche
@@ -1008,13 +1008,13 @@
 @ cdecl _o__getdrives() kernel32.GetLogicalDrives
 @ cdecl _o__getmbcp() _getmbcp
 @ stub _o__getsystime
-@ cdecl _o__getw(ptr) MSVCRT__getw
-@ cdecl _o__getwc_nolock(ptr) MSVCRT__fgetwc_nolock
+@ cdecl _o__getw(ptr) _getw
+@ cdecl _o__getwc_nolock(ptr) _fgetwc_nolock
 @ cdecl _o__getwch() _getwch
 @ cdecl _o__getwch_nolock() _getwch_nolock
 @ cdecl _o__getwche() _getwche
 @ cdecl _o__getwche_nolock() _getwche_nolock
-@ cdecl _o__getws(ptr) MSVCRT__getws
+@ cdecl _o__getws(ptr) _getws
 @ stub _o__getws_s
 @ cdecl _o__gmtime32(ptr) _gmtime32
 @ cdecl _o__gmtime32_s(ptr ptr) _gmtime32_s
@@ -1033,7 +1033,7 @@
 @ cdecl _o__initialize_wide_environment() _initialize_wide_environment
 @ cdecl _o__invalid_parameter_noinfo() _invalid_parameter_noinfo
 @ cdecl _o__invalid_parameter_noinfo_noreturn() _invalid_parameter_noinfo_noreturn
-@ cdecl _o__isatty(long) MSVCRT__isatty
+@ cdecl _o__isatty(long) _isatty
 @ cdecl _o__isctype(long long) _isctype
 @ cdecl _o__isctype_l(long long ptr) _isctype_l
 @ cdecl _o__isleadbyte_l(long ptr) _isleadbyte_l
@@ -1137,14 +1137,14 @@
 @ cdecl _o__localtime32_s(ptr ptr) _localtime32_s
 @ cdecl _o__localtime64(ptr) _localtime64
 @ cdecl _o__localtime64_s(ptr ptr) _localtime64_s
-@ cdecl _o__lock_file(ptr) MSVCRT__lock_file
-@ cdecl _o__locking(long long long) MSVCRT__locking
+@ cdecl _o__lock_file(ptr) _lock_file
+@ cdecl _o__locking(long long long) _locking
 @ cdecl _o__logb(double) _logb
 @ cdecl -arch=!i386 _o__logbf(float) _logbf
 @ cdecl _o__lsearch(ptr ptr ptr long ptr) _lsearch
 @ stub _o__lsearch_s
-@ cdecl _o__lseek(long long long) MSVCRT__lseek
-@ cdecl -ret64 _o__lseeki64(long int64 long) MSVCRT__lseeki64
+@ cdecl _o__lseek(long long long) _lseek
+@ cdecl -ret64 _o__lseeki64(long int64 long) _lseeki64
 @ cdecl _o__ltoa(long ptr long) ntdll._ltoa
 @ cdecl _o__ltoa_s(long ptr long long) _ltoa_s
 @ cdecl _o__ltow(long ptr long) ntdll._ltow
@@ -1291,35 +1291,35 @@
 @ cdecl _o__mkdir(str) _mkdir
 @ cdecl _o__mkgmtime32(ptr) _mkgmtime32
 @ cdecl _o__mkgmtime64(ptr) _mkgmtime64
-@ cdecl _o__mktemp(str) MSVCRT__mktemp
-@ cdecl _o__mktemp_s(str long) MSVCRT__mktemp_s
+@ cdecl _o__mktemp(str) _mktemp
+@ cdecl _o__mktemp_s(str long) _mktemp_s
 @ cdecl _o__mktime32(ptr) _mktime32
 @ cdecl _o__mktime64(ptr) _mktime64
 @ cdecl _o__msize(ptr) _msize
 @ cdecl _o__nextafter(double double) _nextafter
 @ cdecl -arch=x86_64 _o__nextafterf(float float) _nextafterf
-@ cdecl _o__open_osfhandle(long long) MSVCRT__open_osfhandle
+@ cdecl _o__open_osfhandle(long long) _open_osfhandle
 @ cdecl _o__pclose(ptr) _pclose
-@ cdecl _o__pipe(ptr long long) MSVCRT__pipe
+@ cdecl _o__pipe(ptr long long) _pipe
 @ cdecl _o__popen(str str) _popen
 @ cdecl _o__purecall() _purecall
-@ cdecl _o__putc_nolock(long ptr) MSVCRT__fputc_nolock
+@ cdecl _o__putc_nolock(long ptr) _fputc_nolock
 @ cdecl _o__putch(long) _putch
 @ cdecl _o__putch_nolock(long) _putch_nolock
 @ cdecl _o__putenv(str) _putenv
 @ cdecl _o__putenv_s(str str) _putenv_s
-@ cdecl _o__putw(long ptr) MSVCRT__putw
-@ cdecl _o__putwc_nolock(long ptr) MSVCRT__fputwc_nolock
+@ cdecl _o__putw(long ptr) _putw
+@ cdecl _o__putwc_nolock(long ptr) _fputwc_nolock
 @ cdecl _o__putwch(long) _putwch
 @ cdecl _o__putwch_nolock(long) _putwch_nolock
-@ cdecl _o__putws(wstr) MSVCRT__putws
-@ cdecl _o__read(long ptr long) MSVCRT__read
+@ cdecl _o__putws(wstr) _putws
+@ cdecl _o__read(long ptr long) _read
 @ cdecl _o__realloc_base(ptr long) _realloc_base
 @ cdecl _o__recalloc(ptr long long) _recalloc
 @ cdecl _o__register_onexit_function(ptr ptr) _register_onexit_function
 @ cdecl _o__resetstkoflw() _resetstkoflw
 @ cdecl _o__rmdir(str) _rmdir
-@ cdecl _o__rmtmp() MSVCRT__rmtmp
+@ cdecl _o__rmtmp() _rmtmp
 @ cdecl _o__scalb(double long) _scalb
 @ cdecl -arch=x86_64 _o__scalbf(float long) _scalbf
 @ cdecl _o__searchenv(str str ptr) _searchenv
@@ -1337,22 +1337,22 @@
 @ cdecl _o__set_thread_local_invalid_parameter_handler(ptr) _set_thread_local_invalid_parameter_handler
 @ cdecl _o__seterrormode(long) _seterrormode
 @ cdecl _o__setmbcp(long) _setmbcp
-@ cdecl _o__setmode(long long) MSVCRT__setmode
+@ cdecl _o__setmode(long long) _setmode
 @ stub _o__setsystime
 @ cdecl _o__sleep(long) _sleep
-@ varargs _o__sopen(str long long) MSVCRT__sopen
-@ cdecl _o__sopen_dispatch(str long long long ptr long) MSVCRT__sopen_dispatch
-@ cdecl _o__sopen_s(ptr str long long long) MSVCRT__sopen_s
+@ varargs _o__sopen(str long long) _sopen
+@ cdecl _o__sopen_dispatch(str long long long ptr long) _sopen_dispatch
+@ cdecl _o__sopen_s(ptr str long long long) _sopen_s
 @ cdecl _o__spawnv(long str ptr) _spawnv
 @ cdecl _o__spawnve(long str ptr ptr) _spawnve
 @ cdecl _o__spawnvp(long str ptr) _spawnvp
 @ cdecl _o__spawnvpe(long str ptr ptr) _spawnvpe
 @ cdecl _o__splitpath(str ptr ptr ptr ptr) _splitpath
 @ cdecl _o__splitpath_s(str ptr long ptr long ptr long ptr long) _splitpath_s
-@ cdecl _o__stat32(str ptr) MSVCRT__stat32
-@ cdecl _o__stat32i64(str ptr) MSVCRT__stat32i64
-@ cdecl _o__stat64(str ptr) MSVCRT_stat64
-@ cdecl _o__stat64i32(str ptr) MSVCRT__stat64i32
+@ cdecl _o__stat32(str ptr) _stat32
+@ cdecl _o__stat32i64(str ptr) _stat32i64
+@ cdecl _o__stat64(str ptr) _stat64
+@ cdecl _o__stat64i32(str ptr) _stat64i32
 @ cdecl _o__strcoll_l(str str ptr) _strcoll_l
 @ cdecl _o__strdate(ptr) _strdate
 @ cdecl _o__strdate_s(ptr long) _strdate_s
@@ -1395,7 +1395,7 @@
 @ cdecl _o__strupr_s_l(str long ptr) _strupr_s_l
 @ cdecl _o__strxfrm_l(ptr str long ptr) _strxfrm_l
 @ cdecl _o__swab(str str long) _swab
-@ cdecl _o__tell(long) MSVCRT__tell
+@ cdecl _o__tell(long) _tell
 @ cdecl -ret64 _o__telli64(long) _telli64
 @ cdecl _o__timespec32_get(ptr long) _timespec32_get
 @ cdecl _o__timespec64_get(ptr long) _timespec64_get
@@ -1414,26 +1414,26 @@
 @ cdecl _o__ultoa_s(long ptr long long) _ultoa_s
 @ cdecl _o__ultow(long ptr long) ntdll._ultow
 @ cdecl _o__ultow_s(long ptr long long) _ultow_s
-@ cdecl _o__umask(long) MSVCRT__umask
+@ cdecl _o__umask(long) _umask
 @ stub _o__umask_s
-@ cdecl _o__ungetc_nolock(long ptr) MSVCRT__ungetc_nolock
+@ cdecl _o__ungetc_nolock(long ptr) _ungetc_nolock
 @ cdecl _o__ungetch(long) _ungetch
 @ cdecl _o__ungetch_nolock(long) _ungetch_nolock
-@ cdecl _o__ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock
+@ cdecl _o__ungetwc_nolock(long ptr) _ungetwc_nolock
 @ cdecl _o__ungetwch(long) _ungetwch
 @ cdecl _o__ungetwch_nolock(long) _ungetwch_nolock
-@ cdecl _o__unlink(str) MSVCRT__unlink
+@ cdecl _o__unlink(str) _unlink
 @ cdecl _o__unloaddll(long) _unloaddll
-@ cdecl _o__unlock_file(ptr) MSVCRT__unlock_file
+@ cdecl _o__unlock_file(ptr) _unlock_file
 @ cdecl _o__utime32(str ptr) _utime32
 @ cdecl _o__utime64(str ptr) _utime64
-@ cdecl _o__waccess(wstr long) MSVCRT__waccess
-@ cdecl _o__waccess_s(wstr long) MSVCRT__waccess_s
+@ cdecl _o__waccess(wstr long) _waccess
+@ cdecl _o__waccess_s(wstr long) _waccess_s
 @ cdecl _o__wasctime(ptr) _wasctime
 @ cdecl _o__wasctime_s(ptr long ptr) _wasctime_s
 @ cdecl _o__wchdir(wstr) _wchdir
-@ cdecl _o__wchmod(wstr long) MSVCRT__wchmod
-@ cdecl _o__wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _o__wchmod(wstr long) _wchmod
+@ cdecl _o__wcreat(wstr long) _wcreat
 @ cdecl _o__wcreate_locale(long wstr) _wcreate_locale
 @ cdecl _o__wcscoll_l(wstr wstr ptr) _wcscoll_l
 @ cdecl _o__wcsdup(wstr) _wcsdup
@@ -1487,7 +1487,7 @@
 @ cdecl _o__wexecve(wstr ptr ptr) _wexecve
 @ cdecl _o__wexecvp(wstr ptr) _wexecvp
 @ cdecl _o__wexecvpe(wstr ptr ptr) _wexecvpe
-@ cdecl _o__wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _o__wfdopen(long wstr) _wfdopen
 @ cdecl _o__wfindfirst32(wstr ptr) _wfindfirst32
 @ stub _o__wfindfirst32i64
 @ cdecl _o__wfindfirst64(wstr ptr) _wfindfirst64
@@ -1496,11 +1496,11 @@
 @ stub _o__wfindnext32i64
 @ cdecl _o__wfindnext64(long ptr) _wfindnext64
 @ cdecl _o__wfindnext64i32(long ptr) _wfindnext64i32
-@ cdecl _o__wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _o__wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s
-@ cdecl _o__wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _o__wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s
-@ cdecl _o__wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _o__wfopen(wstr wstr) _wfopen
+@ cdecl _o__wfopen_s(ptr wstr wstr) _wfopen_s
+@ cdecl _o__wfreopen(wstr wstr ptr) _wfreopen
+@ cdecl _o__wfreopen_s(ptr wstr wstr ptr) _wfreopen_s
+@ cdecl _o__wfsopen(wstr wstr long) _wfsopen
 @ cdecl _o__wfullpath(ptr wstr long) _wfullpath
 @ cdecl _o__wgetcwd(wstr long) _wgetcwd
 @ cdecl _o__wgetdcwd(long wstr long) _wgetdcwd
@@ -1509,37 +1509,37 @@
 @ cdecl _o__wmakepath(ptr wstr wstr wstr wstr) _wmakepath
 @ cdecl _o__wmakepath_s(ptr long wstr wstr wstr wstr) _wmakepath_s
 @ cdecl _o__wmkdir(wstr) _wmkdir
-@ cdecl _o__wmktemp(wstr) MSVCRT__wmktemp
-@ cdecl _o__wmktemp_s(wstr long) MSVCRT__wmktemp_s
+@ cdecl _o__wmktemp(wstr) _wmktemp
+@ cdecl _o__wmktemp_s(wstr long) _wmktemp_s
 @ cdecl _o__wperror(wstr) _wperror
 @ cdecl _o__wpopen(wstr wstr) _wpopen
 @ cdecl _o__wputenv(wstr) _wputenv
 @ cdecl _o__wputenv_s(wstr wstr) _wputenv_s
-@ cdecl _o__wremove(wstr) MSVCRT__wremove
-@ cdecl _o__wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _o__write(long ptr long) MSVCRT__write
+@ cdecl _o__wremove(wstr) _wremove
+@ cdecl _o__wrename(wstr wstr) _wrename
+@ cdecl _o__write(long ptr long) _write
 @ cdecl _o__wrmdir(wstr) _wrmdir
 @ cdecl _o__wsearchenv(wstr wstr ptr) _wsearchenv
 @ cdecl _o__wsearchenv_s(wstr wstr ptr long) _wsearchenv_s
 @ cdecl _o__wsetlocale(long wstr) _wsetlocale
-@ cdecl _o__wsopen_dispatch(wstr long long long ptr long) MSVCRT__wsopen_dispatch
-@ cdecl _o__wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s
+@ cdecl _o__wsopen_dispatch(wstr long long long ptr long) _wsopen_dispatch
+@ cdecl _o__wsopen_s(ptr wstr long long long) _wsopen_s
 @ cdecl _o__wspawnv(long wstr ptr) _wspawnv
 @ cdecl _o__wspawnve(long wstr ptr ptr) _wspawnve
 @ cdecl _o__wspawnvp(long wstr ptr) _wspawnvp
 @ cdecl _o__wspawnvpe(long wstr ptr ptr) _wspawnvpe
 @ cdecl _o__wsplitpath(wstr ptr ptr ptr ptr) _wsplitpath
 @ cdecl _o__wsplitpath_s(wstr ptr long ptr long ptr long ptr long) _wsplitpath_s
-@ cdecl _o__wstat32(wstr ptr) MSVCRT__wstat32
-@ cdecl _o__wstat32i64(wstr ptr) MSVCRT__wstat32i64
-@ cdecl _o__wstat64(wstr ptr) MSVCRT__wstat64
-@ cdecl _o__wstat64i32(wstr ptr) MSVCRT__wstat64i32
+@ cdecl _o__wstat32(wstr ptr) _wstat32
+@ cdecl _o__wstat32i64(wstr ptr) _wstat32i64
+@ cdecl _o__wstat64(wstr ptr) _wstat64
+@ cdecl _o__wstat64i32(wstr ptr) _wstat64i32
 @ cdecl _o__wstrdate(ptr) _wstrdate
 @ cdecl _o__wstrdate_s(ptr long) _wstrdate_s
 @ cdecl _o__wstrtime(ptr) _wstrtime
 @ cdecl _o__wstrtime_s(ptr long) _wstrtime_s
 @ cdecl _o__wsystem(wstr) _wsystem
-@ cdecl _o__wtmpnam_s(ptr long) MSVCRT__wtmpnam_s
+@ cdecl _o__wtmpnam_s(ptr long) _wtmpnam_s
 @ cdecl _o__wtof(wstr) _wtof
 @ cdecl _o__wtof_l(wstr ptr) _wtof_l
 @ cdecl _o__wtoi(wstr) _wtoi
@@ -1550,7 +1550,7 @@
 @ cdecl _o__wtol_l(wstr ptr) _wtol_l
 @ cdecl -ret64 _o__wtoll(wstr) _wtoll
 @ cdecl -ret64 _o__wtoll_l(wstr ptr) _wtoll_l
-@ cdecl _o__wunlink(wstr) MSVCRT__wunlink
+@ cdecl _o__wunlink(wstr) _wunlink
 @ cdecl _o__wutime32(wstr ptr) _wutime32
 @ cdecl _o__wutime64(wstr ptr) _wutime64
 @ cdecl _o__y0(double) _y0
@@ -1588,8 +1588,8 @@
 @ cdecl _o_cbrtf(float) cbrtf
 @ cdecl _o_ceil(double) ceil
 @ cdecl -arch=!i386 _o_ceilf(float) ceilf
-@ cdecl _o_clearerr(ptr) MSVCRT_clearerr
-@ cdecl _o_clearerr_s(ptr) MSVCRT_clearerr_s
+@ cdecl _o_clearerr(ptr) clearerr
+@ cdecl _o_clearerr_s(ptr) clearerr_s
 @ cdecl _o_cos(double) cos
 @ cdecl -arch=!i386 _o_cosf(float) cosf
 @ cdecl _o_cosh(double) cosh
@@ -1607,15 +1607,15 @@
 @ cdecl _o_exp2l(double) MSVCR120_exp2l
 @ cdecl -arch=!i386 _o_expf(float) expf
 @ cdecl _o_fabs(double) fabs
-@ cdecl _o_fclose(ptr) MSVCRT_fclose
-@ cdecl _o_feof(ptr) MSVCRT_feof
-@ cdecl _o_ferror(ptr) MSVCRT_ferror
-@ cdecl _o_fflush(ptr) MSVCRT_fflush
-@ cdecl _o_fgetc(ptr) MSVCRT_fgetc
-@ cdecl _o_fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl _o_fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl _o_fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl _o_fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl _o_fclose(ptr) fclose
+@ cdecl _o_feof(ptr) feof
+@ cdecl _o_ferror(ptr) ferror
+@ cdecl _o_fflush(ptr) fflush
+@ cdecl _o_fgetc(ptr) fgetc
+@ cdecl _o_fgetpos(ptr ptr) fgetpos
+@ cdecl _o_fgets(ptr long ptr) fgets
+@ cdecl _o_fgetwc(ptr) fgetwc
+@ cdecl _o_fgetws(ptr long ptr) fgetws
 @ cdecl _o_floor(double) floor
 @ cdecl -arch=!i386 _o_floorf(float) floorf
 @ cdecl _o_fma(double double double) fma
@@ -1623,30 +1623,30 @@
 @ cdecl _o_fmal(double double double) fma
 @ cdecl _o_fmod(double double) fmod
 @ cdecl -arch=!i386 _o_fmodf(float float) fmodf
-@ cdecl _o_fopen(str str) MSVCRT_fopen
-@ cdecl _o_fopen_s(ptr str str) MSVCRT_fopen_s
-@ cdecl _o_fputc(long ptr) MSVCRT_fputc
-@ cdecl _o_fputs(str ptr) MSVCRT_fputs
-@ cdecl _o_fputwc(long ptr) MSVCRT_fputwc
-@ cdecl _o_fputws(wstr ptr) MSVCRT_fputws
-@ cdecl _o_fread(ptr long long ptr) MSVCRT_fread
-@ cdecl _o_fread_s(ptr long long long ptr) MSVCRT_fread_s
+@ cdecl _o_fopen(str str) fopen
+@ cdecl _o_fopen_s(ptr str str) fopen_s
+@ cdecl _o_fputc(long ptr) fputc
+@ cdecl _o_fputs(str ptr) fputs
+@ cdecl _o_fputwc(long ptr) fputwc
+@ cdecl _o_fputws(wstr ptr) fputws
+@ cdecl _o_fread(ptr long long ptr) fread
+@ cdecl _o_fread_s(ptr long long long ptr) fread_s
 @ cdecl _o_free(ptr) free
-@ cdecl _o_freopen(str str ptr) MSVCRT_freopen
-@ cdecl _o_freopen_s(ptr str str ptr) MSVCRT_freopen_s
+@ cdecl _o_freopen(str str ptr) freopen
+@ cdecl _o_freopen_s(ptr str str ptr) freopen_s
 @ cdecl _o_frexp(double ptr) frexp
-@ cdecl _o_fseek(ptr long long) MSVCRT_fseek
-@ cdecl _o_fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl _o_ftell(ptr) MSVCRT_ftell
-@ cdecl _o_fwrite(ptr long long ptr) MSVCRT_fwrite
-@ cdecl _o_getc(ptr) MSVCRT_getc
-@ cdecl _o_getchar() MSVCRT_getchar
+@ cdecl _o_fseek(ptr long long) fseek
+@ cdecl _o_fsetpos(ptr ptr) fsetpos
+@ cdecl _o_ftell(ptr) ftell
+@ cdecl _o_fwrite(ptr long long ptr) fwrite
+@ cdecl _o_getc(ptr) getc
+@ cdecl _o_getchar() getchar
 @ cdecl _o_getenv(str) getenv
 @ cdecl _o_getenv_s(ptr ptr long str) getenv_s
-@ cdecl _o_gets(str) MSVCRT_gets
-@ cdecl _o_gets_s(ptr long) MSVCRT_gets_s
-@ cdecl _o_getwc(ptr) MSVCRT_getwc
-@ cdecl _o_getwchar() MSVCRT_getwchar
+@ cdecl _o_gets(str) gets
+@ cdecl _o_gets_s(ptr long) gets_s
+@ cdecl _o_getwc(ptr) getwc
+@ cdecl _o_getwchar() getwchar
 @ cdecl _o_hypot(double double) _hypot
 @ cdecl _o_is_wctype(long long) iswctype
 @ cdecl _o_isalnum(long) isalnum
@@ -1735,11 +1735,11 @@
 @ cdecl _o_nexttowardl(double double) MSVCRT_nexttoward
 @ cdecl _o_pow(double double) pow
 @ cdecl -arch=!i386 _o_powf(float float) powf
-@ cdecl _o_putc(long ptr) MSVCRT_putc
-@ cdecl _o_putchar(long) MSVCRT_putchar
-@ cdecl _o_puts(str) MSVCRT_puts
-@ cdecl _o_putwc(long ptr) MSVCRT_fputwc
-@ cdecl _o_putwchar(long) MSVCRT__fputwchar
+@ cdecl _o_putc(long ptr) putc
+@ cdecl _o_putchar(long) putchar
+@ cdecl _o_puts(str) puts
+@ cdecl _o_putwc(long ptr) fputwc
+@ cdecl _o_putwchar(long) _fputwchar
 @ cdecl _o_qsort(ptr long long ptr) qsort
 @ cdecl _o_qsort_s(ptr long long ptr ptr) qsort_s
 @ cdecl _o_raise(long) raise
@@ -1749,12 +1749,12 @@
 @ cdecl _o_remainder(double double) remainder
 @ cdecl _o_remainderf(float float) remainderf
 @ cdecl _o_remainderl(double double) MSVCR120_remainderl
-@ cdecl _o_remove(str) MSVCRT_remove
+@ cdecl _o_remove(str) remove
 @ cdecl _o_remquo(double double ptr) remquo
 @ cdecl _o_remquof(float float ptr) remquof
 @ cdecl _o_remquol(double double ptr) MSVCR120_remquol
-@ cdecl _o_rename(str str) MSVCRT_rename
-@ cdecl _o_rewind(ptr) MSVCRT_rewind
+@ cdecl _o_rename(str str) rename
+@ cdecl _o_rewind(ptr) rewind
 @ cdecl _o_rint(double) rint
 @ cdecl _o_rintf(float) rintf
 @ cdecl _o_rintl(double) MSVCR120_rintl
@@ -1768,9 +1768,9 @@
 @ cdecl _o_scalbnf(float long) _scalbf
 @ cdecl _o_scalbnl(double long) MSVCR120_scalbnl
 @ cdecl _o_set_terminate(ptr) set_terminate
-@ cdecl _o_setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl _o_setbuf(ptr ptr) setbuf
 @ cdecl _o_setlocale(long str) setlocale
-@ cdecl _o_setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl _o_setvbuf(ptr str long long) setvbuf
 @ cdecl _o_sin(double) sin
 @ cdecl -arch=!i386 _o_sinf(float) sinf
 @ cdecl _o_sinh(double) sinh
@@ -1804,14 +1804,14 @@
 @ cdecl _o_tgamma(double) tgamma
 @ cdecl _o_tgammaf(float) tgammaf
 @ cdecl _o_tgammal(double) tgamma
-@ cdecl _o_tmpfile_s(ptr) MSVCRT_tmpfile_s
-@ cdecl _o_tmpnam_s(ptr long) MSVCRT_tmpnam_s
+@ cdecl _o_tmpfile_s(ptr) tmpfile_s
+@ cdecl _o_tmpnam_s(ptr long) tmpnam_s
 @ cdecl _o_tolower(long) tolower
 @ cdecl _o_toupper(long) toupper
 @ cdecl _o_towlower(long) towlower
 @ cdecl _o_towupper(long) towupper
-@ cdecl _o_ungetc(long ptr) MSVCRT_ungetc
-@ cdecl _o_ungetwc(long ptr) MSVCRT_ungetwc
+@ cdecl _o_ungetc(long ptr) ungetc
+@ cdecl _o_ungetwc(long ptr) ungetwc
 @ cdecl _o_wcrtomb(ptr long ptr) wcrtomb
 @ cdecl _o_wcrtomb_s(ptr ptr long long ptr) wcrtomb_s
 @ cdecl _o_wcscat_s(wstr long wstr) wcscat_s
@@ -1839,33 +1839,33 @@
 @ cdecl _o_wctomb_s(ptr ptr long long) wctomb_s
 @ cdecl _o_wmemcpy_s(ptr long ptr long) wmemcpy_s
 @ cdecl _o_wmemmove_s(ptr long ptr long) wmemmove_s
-@ varargs _open(str long) MSVCRT__open
-@ cdecl _open_osfhandle(long long) MSVCRT__open_osfhandle
+@ varargs _open(str long)
+@ cdecl _open_osfhandle(long long)
 @ cdecl _pclose(ptr)
-@ cdecl _pipe(ptr long long) MSVCRT__pipe
+@ cdecl _pipe(ptr long long)
 @ cdecl _popen(str str)
 @ cdecl _purecall()
-@ cdecl _putc_nolock(long ptr) MSVCRT__fputc_nolock
+@ cdecl _putc_nolock(long ptr) _fputc_nolock
 @ cdecl _putch(long)
 @ cdecl _putch_nolock(long)
 @ cdecl _putenv(str)
 @ cdecl _putenv_s(str str)
-@ cdecl _putw(long ptr) MSVCRT__putw
-@ cdecl _putwc_nolock(long ptr) MSVCRT__fputwc_nolock
+@ cdecl _putw(long ptr)
+@ cdecl _putwc_nolock(long ptr) _fputwc_nolock
 @ cdecl _putwch(long)
 @ cdecl _putwch_nolock(long)
-@ cdecl _putws(wstr) MSVCRT__putws
+@ cdecl _putws(wstr)
 @ stub _query_app_type
 @ cdecl _query_new_handler()
 @ cdecl _query_new_mode()
-@ cdecl _read(long ptr long) MSVCRT__read
+@ cdecl _read(long ptr long)
 @ cdecl _realloc_base(ptr long)
 @ cdecl _recalloc(ptr long long)
 @ cdecl _register_onexit_function(ptr ptr)
 @ cdecl _register_thread_local_exe_atexit_callback(ptr)
 @ cdecl _resetstkoflw()
 @ cdecl _rmdir(str)
-@ cdecl _rmtmp() MSVCRT__rmtmp
+@ cdecl _rmtmp()
 @ cdecl _rotl(long long)
 @ cdecl -ret64 _rotl64(int64 long)
 @ cdecl _rotr(long long)
@@ -1896,14 +1896,14 @@
 @ cdecl _set_thread_local_invalid_parameter_handler(ptr)
 @ cdecl _seterrormode(long)
 @ cdecl -arch=i386 -norelay _setjmp3(ptr long) MSVCRT__setjmp3
-@ cdecl _setmaxstdio(long) MSVCRT__setmaxstdio
+@ cdecl _setmaxstdio(long)
 @ cdecl _setmbcp(long)
-@ cdecl _setmode(long long) MSVCRT__setmode
+@ cdecl _setmode(long long)
 @ stub _setsystime(ptr long)
 @ cdecl _sleep(long)
-@ varargs _sopen(str long long) MSVCRT__sopen
-@ cdecl _sopen_dispatch(str long long long ptr long) MSVCRT__sopen_dispatch
-@ cdecl _sopen_s(ptr str long long long) MSVCRT__sopen_s
+@ varargs _sopen(str long long)
+@ cdecl _sopen_dispatch(str long long long ptr long)
+@ cdecl _sopen_s(ptr str long long long)
 @ varargs _spawnl(long str str)
 @ varargs _spawnle(long str str)
 @ varargs _spawnlp(long str str)
@@ -1914,10 +1914,10 @@
 @ cdecl _spawnvpe(long str ptr ptr)
 @ cdecl _splitpath(str ptr ptr ptr ptr)
 @ cdecl _splitpath_s(str ptr long ptr long ptr long ptr long)
-@ cdecl _stat32(str ptr) MSVCRT__stat32
-@ cdecl _stat32i64(str ptr) MSVCRT__stat32i64
-@ cdecl _stat64(str ptr) MSVCRT_stat64
-@ cdecl _stat64i32(str ptr) MSVCRT__stat64i32
+@ cdecl _stat32(str ptr)
+@ cdecl _stat32i64(str ptr)
+@ cdecl _stat64(str ptr)
+@ cdecl _stat64i32(str ptr)
 @ cdecl _statusfp()
 @ cdecl -arch=i386 _statusfp2(ptr ptr)
 @ cdecl _strcoll_l(str str ptr)
@@ -1967,9 +1967,9 @@
 @ cdecl _strupr_s_l(str long ptr)
 @ cdecl _strxfrm_l(ptr str long ptr)
 @ cdecl _swab(str str long)
-@ cdecl _tell(long) MSVCRT__tell
+@ cdecl _tell(long)
 @ cdecl -ret64 _telli64(long)
-@ cdecl _tempnam(str str) MSVCRT__tempnam
+@ cdecl _tempnam(str str)
 @ cdecl _time32(ptr)
 @ cdecl _time64(ptr)
 @ cdecl _timespec32_get(ptr long)
@@ -1989,28 +1989,28 @@
 @ cdecl _ultoa_s(long ptr long long)
 @ cdecl _ultow(long ptr long) ntdll._ultow
 @ cdecl _ultow_s(long ptr long long)
-@ cdecl _umask(long) MSVCRT__umask
+@ cdecl _umask(long)
 @ stub _umask_s
-@ cdecl _ungetc_nolock(long ptr) MSVCRT__ungetc_nolock
+@ cdecl _ungetc_nolock(long ptr)
 @ cdecl _ungetch(long)
 @ cdecl _ungetch_nolock(long)
-@ cdecl _ungetwc_nolock(long ptr) MSVCRT__ungetwc_nolock
+@ cdecl _ungetwc_nolock(long ptr)
 @ cdecl _ungetwch(long)
 @ cdecl _ungetwch_nolock(long)
-@ cdecl _unlink(str) MSVCRT__unlink
+@ cdecl _unlink(str)
 @ cdecl _unloaddll(long)
-@ cdecl _unlock_file(ptr) MSVCRT__unlock_file
+@ cdecl _unlock_file(ptr)
 @ cdecl _unlock_locales()
 @ cdecl _utime32(str ptr)
 @ cdecl _utime64(str ptr)
-@ cdecl _waccess(wstr long) MSVCRT__waccess
-@ cdecl _waccess_s(wstr long) MSVCRT__waccess_s
+@ cdecl _waccess(wstr long)
+@ cdecl _waccess_s(wstr long)
 @ cdecl _wasctime(ptr)
 @ cdecl _wasctime_s(ptr long ptr)
 @ cdecl _wassert(wstr wstr long)
 @ cdecl _wchdir(wstr)
-@ cdecl _wchmod(wstr long) MSVCRT__wchmod
-@ cdecl _wcreat(wstr long) MSVCRT__wcreat
+@ cdecl _wchmod(wstr long)
+@ cdecl _wcreat(wstr long)
 @ cdecl _wcreate_locale(long wstr)
 @ cdecl _wcscoll_l(wstr wstr ptr)
 @ cdecl _wcsdup(wstr)
@@ -2072,7 +2072,7 @@
 @ cdecl _wexecve(wstr ptr ptr)
 @ cdecl _wexecvp(wstr ptr)
 @ cdecl _wexecvpe(wstr ptr ptr)
-@ cdecl _wfdopen(long wstr) MSVCRT__wfdopen
+@ cdecl _wfdopen(long wstr)
 @ cdecl _wfindfirst32(wstr ptr)
 @ stub _wfindfirst32i64
 @ cdecl _wfindfirst64(wstr ptr)
@@ -2081,11 +2081,11 @@
 @ stub _wfindnext32i64
 @ cdecl _wfindnext64(long ptr)
 @ cdecl _wfindnext64i32(long ptr)
-@ cdecl _wfopen(wstr wstr) MSVCRT__wfopen
-@ cdecl _wfopen_s(ptr wstr wstr) MSVCRT__wfopen_s
-@ cdecl _wfreopen(wstr wstr ptr) MSVCRT__wfreopen
-@ cdecl _wfreopen_s(ptr wstr wstr ptr) MSVCRT__wfreopen_s
-@ cdecl _wfsopen(wstr wstr long) MSVCRT__wfsopen
+@ cdecl _wfopen(wstr wstr)
+@ cdecl _wfopen_s(ptr wstr wstr)
+@ cdecl _wfreopen(wstr wstr ptr)
+@ cdecl _wfreopen_s(ptr wstr wstr ptr)
+@ cdecl _wfsopen(wstr wstr long)
 @ cdecl _wfullpath(ptr wstr long)
 @ cdecl _wgetcwd(wstr long)
 @ cdecl _wgetdcwd(long wstr long)
@@ -2094,23 +2094,23 @@
 @ cdecl _wmakepath(ptr wstr wstr wstr wstr)
 @ cdecl _wmakepath_s(ptr long wstr wstr wstr wstr)
 @ cdecl _wmkdir(wstr)
-@ cdecl _wmktemp(wstr) MSVCRT__wmktemp
-@ cdecl _wmktemp_s(wstr long) MSVCRT__wmktemp_s
-@ varargs _wopen(wstr long) MSVCRT__wopen
+@ cdecl _wmktemp(wstr)
+@ cdecl _wmktemp_s(wstr long)
+@ varargs _wopen(wstr long)
 @ cdecl _wperror(wstr)
 @ cdecl _wpopen(wstr wstr)
 @ cdecl _wputenv(wstr)
 @ cdecl _wputenv_s(wstr wstr)
-@ cdecl _wremove(wstr) MSVCRT__wremove
-@ cdecl _wrename(wstr wstr) MSVCRT__wrename
-@ cdecl _write(long ptr long) MSVCRT__write
+@ cdecl _wremove(wstr)
+@ cdecl _wrename(wstr wstr)
+@ cdecl _write(long ptr long)
 @ cdecl _wrmdir(wstr)
 @ cdecl _wsearchenv(wstr wstr ptr)
 @ cdecl _wsearchenv_s(wstr wstr ptr long)
 @ cdecl _wsetlocale(long wstr)
-@ varargs _wsopen(wstr long long) MSVCRT__wsopen
-@ cdecl _wsopen_dispatch(wstr long long long ptr long) MSVCRT__wsopen_dispatch
-@ cdecl _wsopen_s(ptr wstr long long long) MSVCRT__wsopen_s
+@ varargs _wsopen(wstr long long)
+@ cdecl _wsopen_dispatch(wstr long long long ptr long)
+@ cdecl _wsopen_s(ptr wstr long long long)
 @ varargs _wspawnl(long wstr wstr)
 @ varargs _wspawnle(long wstr wstr)
 @ varargs _wspawnlp(long wstr wstr)
@@ -2121,18 +2121,18 @@
 @ cdecl _wspawnvpe(long wstr ptr ptr)
 @ cdecl _wsplitpath(wstr ptr ptr ptr ptr)
 @ cdecl _wsplitpath_s(wstr ptr long ptr long ptr long ptr long)
-@ cdecl _wstat32(wstr ptr) MSVCRT__wstat32
-@ cdecl _wstat32i64(wstr ptr) MSVCRT__wstat32i64
-@ cdecl _wstat64(wstr ptr) MSVCRT__wstat64
-@ cdecl _wstat64i32(wstr ptr) MSVCRT__wstat64i32
+@ cdecl _wstat32(wstr ptr)
+@ cdecl _wstat32i64(wstr ptr)
+@ cdecl _wstat64(wstr ptr)
+@ cdecl _wstat64i32(wstr ptr)
 @ cdecl _wstrdate(ptr)
 @ cdecl _wstrdate_s(ptr long)
 @ cdecl _wstrtime(ptr)
 @ cdecl _wstrtime_s(ptr long)
 @ cdecl _wsystem(wstr)
-@ cdecl _wtempnam(wstr wstr) MSVCRT__wtempnam
-@ cdecl _wtmpnam(ptr) MSVCRT__wtmpnam
-@ cdecl _wtmpnam_s(ptr long) MSVCRT__wtmpnam_s
+@ cdecl _wtempnam(wstr wstr)
+@ cdecl _wtmpnam(ptr)
+@ cdecl _wtmpnam_s(ptr long)
 @ cdecl _wtof(wstr)
 @ cdecl _wtof_l(wstr ptr)
 @ cdecl _wtoi(wstr)
@@ -2143,7 +2143,7 @@
 @ cdecl _wtol_l(wstr ptr)
 @ cdecl -ret64 _wtoll(wstr)
 @ cdecl -ret64 _wtoll_l(wstr ptr)
-@ cdecl _wunlink(wstr) MSVCRT__wunlink
+@ cdecl _wunlink(wstr)
 @ cdecl _wutime32(wstr ptr)
 @ cdecl _wutime64(wstr ptr)
 @ cdecl _y0(double)
@@ -2221,8 +2221,8 @@
 @ stub cimag
 @ stub cimagf
 @ stub cimagl
-@ cdecl clearerr(ptr) MSVCRT_clearerr
-@ cdecl clearerr_s(ptr) MSVCRT_clearerr_s
+@ cdecl clearerr(ptr)
+@ cdecl clearerr_s(ptr)
 @ cdecl clock()
 @ stub clog
 @ stub clog10
@@ -2282,7 +2282,7 @@
 @ cdecl expm1l(double) MSVCR120_expm1l
 @ cdecl fabs(double)
 @ cdecl -arch=arm,arm64 fabsf(float)
-@ cdecl fclose(ptr) MSVCRT_fclose
+@ cdecl fclose(ptr)
 @ cdecl fdim(double double)
 @ cdecl fdimf(float float)
 @ cdecl fdiml(double double) fdim
@@ -2291,18 +2291,18 @@
 @ stub fegetexceptflag
 @ cdecl fegetround()
 @ stub feholdexcept
-@ cdecl feof(ptr) MSVCRT_feof
-@ cdecl ferror(ptr) MSVCRT_ferror
+@ cdecl feof(ptr)
+@ cdecl ferror(ptr)
 @ cdecl fesetenv(ptr)
 @ stub fesetexceptflag
 @ cdecl fesetround(long)
 @ stub fetestexcept
-@ cdecl fflush(ptr) MSVCRT_fflush
-@ cdecl fgetc(ptr) MSVCRT_fgetc
-@ cdecl fgetpos(ptr ptr) MSVCRT_fgetpos
-@ cdecl fgets(ptr long ptr) MSVCRT_fgets
-@ cdecl fgetwc(ptr) MSVCRT_fgetwc
-@ cdecl fgetws(ptr long ptr) MSVCRT_fgetws
+@ cdecl fflush(ptr)
+@ cdecl fgetc(ptr)
+@ cdecl fgetpos(ptr ptr)
+@ cdecl fgets(ptr long ptr)
+@ cdecl fgetwc(ptr)
+@ cdecl fgetws(ptr long ptr)
 @ cdecl floor(double)
 @ cdecl -arch=!i386 floorf(float)
 @ cdecl fma(double double double)
@@ -2316,30 +2316,30 @@
 @ cdecl fminl(double double) fmin
 @ cdecl fmod(double double)
 @ cdecl -arch=!i386 fmodf(float float)
-@ cdecl fopen(str str) MSVCRT_fopen
-@ cdecl fopen_s(ptr str str) MSVCRT_fopen_s
-@ cdecl fputc(long ptr) MSVCRT_fputc
-@ cdecl fputs(str ptr) MSVCRT_fputs
-@ cdecl fputwc(long ptr) MSVCRT_fputwc
-@ cdecl fputws(wstr ptr) MSVCRT_fputws
-@ cdecl fread(ptr long long ptr) MSVCRT_fread
-@ cdecl fread_s(ptr long long long ptr) MSVCRT_fread_s
+@ cdecl fopen(str str)
+@ cdecl fopen_s(ptr str str)
+@ cdecl fputc(long ptr)
+@ cdecl fputs(str ptr)
+@ cdecl fputwc(long ptr)
+@ cdecl fputws(wstr ptr)
+@ cdecl fread(ptr long long ptr)
+@ cdecl fread_s(ptr long long long ptr)
 @ cdecl free(ptr)
-@ cdecl freopen(str str ptr) MSVCRT_freopen
-@ cdecl freopen_s(ptr str str ptr) MSVCRT_freopen_s
+@ cdecl freopen(str str ptr)
+@ cdecl freopen_s(ptr str str ptr)
 @ cdecl frexp(double ptr)
-@ cdecl fseek(ptr long long) MSVCRT_fseek
-@ cdecl fsetpos(ptr ptr) MSVCRT_fsetpos
-@ cdecl ftell(ptr) MSVCRT_ftell
-@ cdecl fwrite(ptr long long ptr) MSVCRT_fwrite
-@ cdecl getc(ptr) MSVCRT_getc
-@ cdecl getchar() MSVCRT_getchar
+@ cdecl fseek(ptr long long)
+@ cdecl fsetpos(ptr ptr)
+@ cdecl ftell(ptr)
+@ cdecl fwrite(ptr long long ptr)
+@ cdecl getc(ptr)
+@ cdecl getchar()
 @ cdecl getenv(str)
 @ cdecl getenv_s(ptr ptr long str)
-@ cdecl gets(str) MSVCRT_gets
-@ cdecl gets_s(ptr long) MSVCRT_gets_s
-@ cdecl getwc(ptr) MSVCRT_getwc
-@ cdecl getwchar() MSVCRT_getwchar
+@ cdecl gets(str)
+@ cdecl gets_s(ptr long)
+@ cdecl getwc(ptr)
+@ cdecl getwchar()
 @ cdecl hypot(double double) _hypot
 @ cdecl ilogb(double)
 @ cdecl ilogbf(float)
@@ -2447,11 +2447,11 @@
 @ cdecl perror(str)
 @ cdecl pow(double double)
 @ cdecl -arch=!i386 powf(float float)
-@ cdecl putc(long ptr) MSVCRT_putc
-@ cdecl putchar(long) MSVCRT_putchar
-@ cdecl puts(str) MSVCRT_puts
-@ cdecl putwc(long ptr) MSVCRT_fputwc
-@ cdecl putwchar(long) MSVCRT__fputwchar
+@ cdecl putc(long ptr)
+@ cdecl putchar(long)
+@ cdecl puts(str)
+@ cdecl putwc(long ptr) fputwc
+@ cdecl putwchar(long) _fputwchar
 @ cdecl qsort(ptr long long ptr)
 @ cdecl qsort_s(ptr long long ptr ptr)
 @ cdecl quick_exit(long)
@@ -2462,12 +2462,12 @@
 @ cdecl remainder(double double)
 @ cdecl remainderf(float float)
 @ cdecl remainderl(double double) MSVCR120_remainderl
-@ cdecl remove(str) MSVCRT_remove
+@ cdecl remove(str)
 @ cdecl remquo(double double ptr)
 @ cdecl remquof(float float ptr)
 @ cdecl remquol(double double ptr) MSVCR120_remquol
-@ cdecl rename(str str) MSVCRT_rename
-@ cdecl rewind(ptr) MSVCRT_rewind
+@ cdecl rename(str str)
+@ cdecl rewind(ptr)
 @ cdecl rint(double)
 @ cdecl rintf(float)
 @ cdecl rintl(double) MSVCR120_rintl
@@ -2482,10 +2482,10 @@
 @ cdecl scalbnl(double long) MSVCR120_scalbnl
 @ cdecl set_terminate(ptr)
 @ cdecl set_unexpected(ptr)
-@ cdecl setbuf(ptr ptr) MSVCRT_setbuf
+@ cdecl setbuf(ptr ptr)
 @ cdecl -arch=arm,x86_64 -norelay -private setjmp(ptr) MSVCRT__setjmp
 @ cdecl setlocale(long str)
-@ cdecl setvbuf(ptr str long long) MSVCRT_setvbuf
+@ cdecl setvbuf(ptr str long long)
 @ cdecl signal(long long)
 @ cdecl sin(double)
 @ cdecl -arch=!i386 sinf(float)
@@ -2537,10 +2537,10 @@
 @ cdecl tgamma(double)
 @ cdecl tgammaf(float)
 @ cdecl tgammal(double) tgamma
-@ cdecl tmpfile() MSVCRT_tmpfile
-@ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
-@ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
+@ cdecl tmpfile()
+@ cdecl tmpfile_s(ptr)
+@ cdecl tmpnam(ptr)
+@ cdecl tmpnam_s(ptr long)
 @ cdecl tolower(long)
 @ cdecl toupper(long)
 @ cdecl towctrans(long long)
@@ -2550,8 +2550,8 @@
 @ cdecl truncf(float)
 @ cdecl truncl(double) MSVCR120_truncl
 @ stub unexpected
-@ cdecl ungetc(long ptr) MSVCRT_ungetc
-@ cdecl ungetwc(long ptr) MSVCRT_ungetwc
+@ cdecl ungetc(long ptr)
+@ cdecl ungetwc(long ptr)
 @ cdecl wcrtomb(ptr long ptr)
 @ cdecl wcrtomb_s(ptr ptr long long ptr)
 @ cdecl wcscat(wstr wstr)
diff --git a/include/msvcrt/io.h b/include/msvcrt/io.h
index 369744d7e1d..2d4a9e61e0b 100644
--- a/include/msvcrt/io.h
+++ b/include/msvcrt/io.h
@@ -61,7 +61,7 @@ extern "C" {
 
 _ACRTIMP int         __cdecl _access(const char*,int);
 _ACRTIMP int         __cdecl _chmod(const char*,int);
-_ACRTIMP int         __cdecl _chsize(int,__msvcrt_ulong);
+_ACRTIMP int         __cdecl _chsize(int,__msvcrt_long);
 _ACRTIMP int         __cdecl _chsize_s(int,__int64);
 _ACRTIMP int         __cdecl _close(int);
 _ACRTIMP int         __cdecl _commit(int);
diff --git a/include/msvcrt/stdio.h b/include/msvcrt/stdio.h
index a674a2a5de8..7dd177e9052 100644
--- a/include/msvcrt/stdio.h
+++ b/include/msvcrt/stdio.h
@@ -88,6 +88,8 @@ _ACRTIMP int    __cdecl _setmaxstdio(int);
 _ACRTIMP char*  __cdecl _tempnam(const char*,const char*);
 _ACRTIMP int    __cdecl _unlink(const char*);
 
+_ACRTIMP void __cdecl _lock_file(FILE*);
+_ACRTIMP void __cdecl _unlock_file(FILE*);
 _ACRTIMP size_t __cdecl _fread_nolock(void*,size_t,size_t,FILE*);
 _ACRTIMP size_t __cdecl _fread_nolock_s(void*,size_t,size_t,size_t,FILE*);
 _ACRTIMP size_t __cdecl _fwrite_nolock(const void*,size_t,size_t,FILE*);