diff --git a/dlls/crtdll/crtdll.spec b/dlls/crtdll/crtdll.spec
index 478783fda6a..7479aab2972 100644
--- a/dlls/crtdll/crtdll.spec
+++ b/dlls/crtdll/crtdll.spec
@@ -30,14 +30,14 @@
 @ cdecl __dllonexit(ptr ptr ptr)
 @ cdecl __doserrno()
 @ cdecl __fpecode()
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 @ extern __mb_cur_max_dll MSVCRT___mb_cur_max
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl _abnormal_termination()
 @ cdecl _access(str long) MSVCRT__access
 @ extern _acmdln_dll MSVCRT__acmdln
@@ -141,7 +141,7 @@
 @ cdecl _initterm(ptr ptr)
 @ extern _iob MSVCRT__iob
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _isctype(long long) MSVCRT__isctype
+@ cdecl _isctype(long long)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalpha(long)
 @ stub _ismbbgraph(long)
@@ -310,8 +310,8 @@
 @ cdecl _tell(long) MSVCRT__tell
 @ cdecl _tempnam(str str) MSVCRT__tempnam
 @ extern _timezone_dll MSVCRT___timezone
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _toupper(long) MSVCRT__toupper
+@ cdecl _tolower(long)
+@ cdecl _toupper(long)
 @ extern _tzname MSVCRT__tzname
 @ cdecl _tzset() MSVCRT__tzset
 @ cdecl _ultoa(long ptr long) ntdll._ultoa
@@ -397,20 +397,20 @@
 @ cdecl gets(str) MSVCRT_gets
 @ cdecl gmtime(ptr) MSVCRT_gmtime
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
 @ cdecl iswdigit(long) MSVCRT_iswdigit
@@ -421,7 +421,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -494,8 +494,8 @@
 @ cdecl time(ptr) MSVCRT_time
 @ cdecl tmpfile() MSVCRT_tmpfile
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
 @ cdecl ungetc(long ptr) MSVCRT_ungetc
diff --git a/dlls/msvcr100/msvcr100.spec b/dlls/msvcr100/msvcr100.spec
index 234fc31a601..3acb927e903 100644
--- a/dlls/msvcr100/msvcr100.spec
+++ b/dlls/msvcr100/msvcr100.spec
@@ -595,9 +595,9 @@
 @ cdecl __getmainargs(ptr ptr ptr long ptr)
 @ extern __initenv MSVCRT___initenv
 @ cdecl __iob_func()
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 @ stub __iswcsym
 @ stub __iswcsymf
 # extern __lconv
@@ -639,7 +639,7 @@
 @ cdecl __p__iob() __iob_func
 @ stub __p__mbcasemap()
 @ cdecl __p__mbctype()
-@ cdecl __p__pctype() MSVCRT___p__pctype
+@ cdecl __p__pctype()
 @ cdecl __p__pgmptr() MSVCRT___p__pgmptr
 @ stub __p__pwctype()
 @ cdecl __p__timezone() MSVCRT___p__timezone
@@ -647,7 +647,7 @@
 @ cdecl __p__wcmdln() MSVCRT___p__wcmdln
 @ cdecl __p__wenviron() MSVCRT___p__wenviron
 @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl __pctype_func() MSVCRT___pctype_func
+@ cdecl __pctype_func()
 @ extern __pioinfo MSVCRT___pioinfo
 @ stub __pwctype_func
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
@@ -663,7 +663,7 @@
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
 @ cdecl __timezone() MSVCRT___p__timezone
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl __tzname() __p__tzname
 @ cdecl __unDName(ptr str long ptr ptr long)
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@@ -942,16 +942,16 @@
 @ cdecl _invalid_parameter_noinfo_noreturn()
 @ stub _invoke_watson
 @ extern _iob MSVCRT__iob
-@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l
-@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l
+@ cdecl _isalnum_l(long ptr)
+@ cdecl _isalpha_l(long ptr)
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l
-@ cdecl _isctype(long long) MSVCRT__isctype
-@ cdecl _isctype_l(long long ptr) MSVCRT__isctype_l
-@ cdecl _isdigit_l(long ptr) MSVCRT__isdigit_l
-@ cdecl _isgraph_l(long ptr) MSVCRT__isgraph_l
-@ cdecl _isleadbyte_l(long ptr) MSVCRT__isleadbyte_l
-@ cdecl _islower_l(long ptr) MSVCRT__islower_l
+@ cdecl _iscntrl_l(long ptr)
+@ cdecl _isctype(long long)
+@ cdecl _isctype_l(long long ptr)
+@ cdecl _isdigit_l(long ptr)
+@ cdecl _isgraph_l(long ptr)
+@ cdecl _isleadbyte_l(long ptr)
+@ cdecl _islower_l(long ptr)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalnum_l
 @ stub _ismbbalpha(long)
@@ -1012,10 +1012,10 @@
 @ stub _ismbstrail_l
 @ cdecl _isnan(double) MSVCRT__isnan
 @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
-@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
-@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l
-@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
-@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l
+@ cdecl _isprint_l(long ptr)
+@ cdecl _ispunct_l(long ptr)
+@ cdecl _isspace_l(long ptr)
+@ cdecl _isupper_l(long ptr)
 @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l
 @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l
 @ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l
@@ -1030,7 +1030,7 @@
 @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l
 @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l
 @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l
-@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l
+@ cdecl _isxdigit_l(long ptr)
 @ cdecl _itoa(long ptr long) MSVCRT__itoa
 @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s
 @ cdecl _itow(long ptr long) ntdll._itow
@@ -1391,10 +1391,10 @@
 @ cdecl _time32(ptr) MSVCRT__time32
 @ cdecl _time64(ptr) MSVCRT__time64
 @ extern _timezone MSVCRT___timezone
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _tolower_l(long ptr) MSVCRT__tolower_l
-@ cdecl _toupper(long) MSVCRT__toupper
-@ cdecl _toupper_l(long ptr) MSVCRT__toupper_l
+@ cdecl _tolower(long)
+@ cdecl _tolower_l(long ptr)
+@ cdecl _toupper(long)
+@ cdecl _toupper_l(long ptr)
 @ cdecl _towlower_l(long ptr) MSVCRT__towlower_l
 @ cdecl _towupper_l(long ptr) MSVCRT__towupper_l
 @ extern _tzname MSVCRT__tzname
@@ -1704,20 +1704,20 @@
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
 @ cdecl iswdigit(long) MSVCRT_iswdigit
@@ -1728,7 +1728,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -1835,8 +1835,8 @@
 @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
 @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
 @ cdecl ungetc(long ptr) MSVCRT_ungetc
diff --git a/dlls/msvcr110/msvcr110.spec b/dlls/msvcr110/msvcr110.spec
index e697e924ba0..56c446e8831 100644
--- a/dlls/msvcr110/msvcr110.spec
+++ b/dlls/msvcr110/msvcr110.spec
@@ -943,9 +943,9 @@
 @ cdecl __getmainargs(ptr ptr ptr long ptr)
 @ extern __initenv MSVCRT___initenv
 @ cdecl __iob_func()
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 @ stub __iswcsym
 @ stub __iswcsymf
 @ stub -arch=arm __jump_unwind
@@ -988,7 +988,7 @@
 @ cdecl __p__iob() __iob_func
 @ stub __p__mbcasemap()
 @ cdecl __p__mbctype()
-@ cdecl __p__pctype() MSVCRT___p__pctype
+@ cdecl __p__pctype()
 @ cdecl __p__pgmptr() MSVCRT___p__pgmptr
 @ stub __p__pwctype()
 @ cdecl __p__timezone() MSVCRT___p__timezone
@@ -996,7 +996,7 @@
 @ cdecl __p__wcmdln() MSVCRT___p__wcmdln
 @ cdecl __p__wenviron() MSVCRT___p__wenviron
 @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl __pctype_func() MSVCRT___pctype_func
+@ cdecl __pctype_func()
 @ extern __pioinfo MSVCRT___pioinfo
 @ stub __pwctype_func
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
@@ -1011,7 +1011,7 @@
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
 @ cdecl __timezone() MSVCRT___p__timezone
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl __tzname() __p__tzname
 @ cdecl __unDName(ptr str long ptr ptr long)
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@@ -1288,16 +1288,16 @@
 @ cdecl _invalid_parameter_noinfo_noreturn()
 @ stub _invoke_watson
 @ extern _iob MSVCRT__iob
-@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l
-@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l
+@ cdecl _isalnum_l(long ptr)
+@ cdecl _isalpha_l(long ptr)
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l
-@ cdecl _isctype(long long) MSVCRT__isctype
-@ cdecl _isctype_l(long long ptr) MSVCRT__isctype_l
-@ cdecl _isdigit_l(long ptr) MSVCRT__isdigit_l
-@ cdecl _isgraph_l(long ptr) MSVCRT__isgraph_l
-@ cdecl _isleadbyte_l(long ptr) MSVCRT__isleadbyte_l
-@ cdecl _islower_l(long ptr) MSVCRT__islower_l
+@ cdecl _iscntrl_l(long ptr)
+@ cdecl _isctype(long long)
+@ cdecl _isctype_l(long long ptr)
+@ cdecl _isdigit_l(long ptr)
+@ cdecl _isgraph_l(long ptr)
+@ cdecl _isleadbyte_l(long ptr)
+@ cdecl _islower_l(long ptr)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalnum_l
 @ stub _ismbbalpha(long)
@@ -1358,10 +1358,10 @@
 @ stub _ismbstrail_l
 @ cdecl _isnan(double) MSVCRT__isnan
 @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
-@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
-@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l
-@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
-@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l
+@ cdecl _isprint_l(long ptr)
+@ cdecl _ispunct_l(long ptr)
+@ cdecl _isspace_l(long ptr)
+@ cdecl _isupper_l(long ptr)
 @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l
 @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l
 @ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l
@@ -1376,7 +1376,7 @@
 @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l
 @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l
 @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l
-@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l
+@ cdecl _isxdigit_l(long ptr)
 @ cdecl _itoa(long ptr long) MSVCRT__itoa
 @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s
 @ cdecl _itow(long ptr long) ntdll._itow
@@ -1748,10 +1748,10 @@
 @ cdecl _time32(ptr) MSVCRT__time32
 @ cdecl _time64(ptr) MSVCRT__time64
 @ extern _timezone MSVCRT___timezone
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _tolower_l(long ptr) MSVCRT__tolower_l
-@ cdecl _toupper(long) MSVCRT__toupper
-@ cdecl _toupper_l(long ptr) MSVCRT__toupper_l
+@ cdecl _tolower(long)
+@ cdecl _tolower_l(long ptr)
+@ cdecl _toupper(long)
+@ cdecl _toupper_l(long ptr)
 @ cdecl _towlower_l(long ptr) MSVCRT__towlower_l
 @ cdecl _towupper_l(long ptr) MSVCRT__towupper_l
 @ extern _tzname MSVCRT__tzname
@@ -2062,20 +2062,20 @@
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
 @ cdecl iswdigit(long) MSVCRT_iswdigit
@@ -2086,7 +2086,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -2193,8 +2193,8 @@
 @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
 @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
 @ cdecl ungetc(long ptr) MSVCRT_ungetc
diff --git a/dlls/msvcr120/msvcr120.spec b/dlls/msvcr120/msvcr120.spec
index 96231134528..56a46eb0124 100644
--- a/dlls/msvcr120/msvcr120.spec
+++ b/dlls/msvcr120/msvcr120.spec
@@ -933,9 +933,9 @@
 @ cdecl __getmainargs(ptr ptr ptr long ptr)
 @ extern __initenv MSVCRT___initenv
 @ cdecl __iob_func()
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 @ stub __iswcsym
 @ stub __iswcsymf
 @ stub -arch=arm __jump_unwind
@@ -978,7 +978,7 @@
 @ cdecl __p__iob() __iob_func
 @ stub __p__mbcasemap()
 @ cdecl __p__mbctype()
-@ cdecl __p__pctype() MSVCRT___p__pctype
+@ cdecl __p__pctype()
 @ cdecl __p__pgmptr() MSVCRT___p__pgmptr
 @ stub __p__pwctype()
 @ cdecl __p__timezone() MSVCRT___p__timezone
@@ -986,7 +986,7 @@
 @ cdecl __p__wcmdln() MSVCRT___p__wcmdln
 @ cdecl __p__wenviron() MSVCRT___p__wenviron
 @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl __pctype_func() MSVCRT___pctype_func
+@ cdecl __pctype_func()
 @ extern __pioinfo MSVCRT___pioinfo
 @ stub __pwctype_func
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
@@ -1001,7 +1001,7 @@
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
 @ cdecl __timezone() MSVCRT___p__timezone
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl __tzname() __p__tzname
 @ cdecl __unDName(ptr str long ptr ptr long)
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@@ -1288,17 +1288,17 @@
 @ cdecl _invalid_parameter_noinfo_noreturn()
 @ stub _invoke_watson
 @ extern _iob MSVCRT__iob
-@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l
-@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l
+@ cdecl _isalnum_l(long ptr)
+@ cdecl _isalpha_l(long ptr)
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _isblank_l(long ptr) MSVCRT__isblank_l
-@ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l
-@ cdecl _isctype(long long) MSVCRT__isctype
-@ cdecl _isctype_l(long long ptr) MSVCRT__isctype_l
-@ cdecl _isdigit_l(long ptr) MSVCRT__isdigit_l
-@ cdecl _isgraph_l(long ptr) MSVCRT__isgraph_l
-@ cdecl _isleadbyte_l(long ptr) MSVCRT__isleadbyte_l
-@ cdecl _islower_l(long ptr) MSVCRT__islower_l
+@ cdecl _isblank_l(long ptr)
+@ cdecl _iscntrl_l(long ptr)
+@ cdecl _isctype(long long)
+@ cdecl _isctype_l(long long ptr)
+@ cdecl _isdigit_l(long ptr)
+@ cdecl _isgraph_l(long ptr)
+@ cdecl _isleadbyte_l(long ptr)
+@ cdecl _islower_l(long ptr)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalnum_l
 @ stub _ismbbalpha(long)
@@ -1363,10 +1363,10 @@
 @ stub _ismbstrail_l
 @ cdecl _isnan(double) MSVCRT__isnan
 @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
-@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
-@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l
-@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
-@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l
+@ cdecl _isprint_l(long ptr)
+@ cdecl _ispunct_l(long ptr)
+@ cdecl _isspace_l(long ptr)
+@ cdecl _isupper_l(long ptr)
 @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l
 @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l
 @ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l
@@ -1382,7 +1382,7 @@
 @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l
 @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l
 @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l
-@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l
+@ cdecl _isxdigit_l(long ptr)
 @ cdecl _itoa(long ptr long) MSVCRT__itoa
 @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s
 @ cdecl _itow(long ptr long) ntdll._itow
@@ -1765,10 +1765,10 @@
 @ cdecl _time32(ptr) MSVCRT__time32
 @ cdecl _time64(ptr) MSVCRT__time64
 @ extern _timezone MSVCRT___timezone
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _tolower_l(long ptr) MSVCRT__tolower_l
-@ cdecl _toupper(long) MSVCRT__toupper
-@ cdecl _toupper_l(long ptr) MSVCRT__toupper_l
+@ cdecl _tolower(long)
+@ cdecl _tolower_l(long ptr)
+@ cdecl _toupper(long)
+@ cdecl _toupper_l(long ptr)
 @ cdecl _towlower_l(long ptr) MSVCRT__towlower_l
 @ cdecl _towupper_l(long ptr) MSVCRT__towupper_l
 @ extern _tzname MSVCRT__tzname
@@ -2213,21 +2213,21 @@
 @ cdecl -ret64 imaxabs(int64) MSVCRT_imaxabs
 @ stub imaxdiv
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl isblank(long) MSVCRT_isblank
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl isblank(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswblank(long) MSVCRT_iswblank
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
@@ -2239,7 +2239,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -2412,8 +2412,8 @@
 @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
 @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towctrans(long long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
diff --git a/dlls/msvcr70/msvcr70.spec b/dlls/msvcr70/msvcr70.spec
index 35406607883..0093cb0a43d 100644
--- a/dlls/msvcr70/msvcr70.spec
+++ b/dlls/msvcr70/msvcr70.spec
@@ -152,9 +152,9 @@
 @ cdecl __getmainargs(ptr ptr ptr long ptr)
 @ extern __initenv MSVCRT___initenv
 @ cdecl __iob_func()
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 # extern __lc_clike
 @ extern __lc_codepage MSVCRT___lc_codepage
 @ extern __lc_collate_cp MSVCRT___lc_collate_cp
@@ -179,7 +179,7 @@
 @ stub __p__mbcasemap()
 @ cdecl __p__mbctype()
 @ cdecl __p__osver()
-@ cdecl __p__pctype() MSVCRT___p__pctype
+@ cdecl __p__pctype()
 @ cdecl __p__pgmptr() MSVCRT___p__pgmptr
 @ stub __p__pwctype()
 @ cdecl __p__timezone() MSVCRT___p__timezone
@@ -190,7 +190,7 @@
 @ cdecl __p__winminor()
 @ cdecl __p__winver()
 @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl __pctype_func() MSVCRT___pctype_func
+@ cdecl __pctype_func()
 @ extern __pioinfo MSVCRT___pioinfo
 @ stub __pwctype_func
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
@@ -201,7 +201,7 @@
 @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl __unDName(ptr str long ptr ptr long)
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
 @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@@ -364,7 +364,7 @@
 @ stub -arch=i386 _inpw(long)
 @ extern _iob MSVCRT__iob
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _isctype(long long) MSVCRT__isctype
+@ cdecl _isctype(long long)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalpha(long)
 @ stub _ismbbgraph(long)
@@ -569,8 +569,8 @@
 @ cdecl _tempnam(str str) MSVCRT__tempnam
 @ cdecl _time64(ptr) MSVCRT__time64
 @ extern _timezone MSVCRT___timezone
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _toupper(long) MSVCRT__toupper
+@ cdecl _tolower(long)
+@ cdecl _toupper(long)
 @ extern _tzname MSVCRT__tzname
 @ cdecl _tzset() MSVCRT__tzset
 @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa
@@ -742,20 +742,20 @@
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl gmtime(ptr) MSVCRT_gmtime
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
 @ cdecl iswdigit(long) MSVCRT_iswdigit
@@ -766,7 +766,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -841,8 +841,8 @@
 @ cdecl time(ptr) MSVCRT_time
 @ cdecl tmpfile() MSVCRT_tmpfile
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
 @ cdecl ungetc(long ptr) MSVCRT_ungetc
diff --git a/dlls/msvcr71/msvcr71.spec b/dlls/msvcr71/msvcr71.spec
index 6a1bfd180b2..15337909632 100644
--- a/dlls/msvcr71/msvcr71.spec
+++ b/dlls/msvcr71/msvcr71.spec
@@ -147,9 +147,9 @@
 @ cdecl __getmainargs(ptr ptr ptr long ptr)
 @ extern __initenv MSVCRT___initenv
 @ cdecl __iob_func()
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 # extern __lc_clike
 @ extern __lc_codepage MSVCRT___lc_codepage
 @ extern __lc_collate_cp MSVCRT___lc_collate_cp
@@ -174,7 +174,7 @@
 @ stub __p__mbcasemap()
 @ cdecl __p__mbctype()
 @ cdecl __p__osver()
-@ cdecl __p__pctype() MSVCRT___p__pctype
+@ cdecl __p__pctype()
 @ cdecl __p__pgmptr() MSVCRT___p__pgmptr
 @ stub __p__pwctype()
 @ cdecl __p__timezone() MSVCRT___p__timezone
@@ -185,7 +185,7 @@
 @ cdecl __p__winminor()
 @ cdecl __p__winver()
 @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl __pctype_func() MSVCRT___pctype_func
+@ cdecl __pctype_func()
 @ extern __pioinfo MSVCRT___pioinfo
 @ stub __pwctype_func
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
@@ -196,7 +196,7 @@
 @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl __unDName(ptr str long ptr ptr long)
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
 @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@@ -359,7 +359,7 @@
 @ stub -arch=i386 _inpw(long)
 @ extern _iob MSVCRT__iob
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _isctype(long long) MSVCRT__isctype
+@ cdecl _isctype(long long)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalpha(long)
 @ stub _ismbbgraph(long)
@@ -565,8 +565,8 @@
 @ cdecl _tempnam(str str) MSVCRT__tempnam
 @ cdecl _time64(ptr) MSVCRT__time64
 @ extern _timezone MSVCRT___timezone
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _toupper(long) MSVCRT__toupper
+@ cdecl _tolower(long)
+@ cdecl _toupper(long)
 @ extern _tzname MSVCRT__tzname
 @ cdecl _tzset() MSVCRT__tzset
 @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa
@@ -738,20 +738,20 @@
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl gmtime(ptr) MSVCRT_gmtime
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
 @ cdecl iswdigit(long) MSVCRT_iswdigit
@@ -762,7 +762,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -837,8 +837,8 @@
 @ cdecl time(ptr) MSVCRT_time
 @ cdecl tmpfile() MSVCRT_tmpfile
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
 @ cdecl ungetc(long ptr) MSVCRT_ungetc
diff --git a/dlls/msvcr80/msvcr80.spec b/dlls/msvcr80/msvcr80.spec
index 77d6d326b4c..2a4e397296e 100644
--- a/dlls/msvcr80/msvcr80.spec
+++ b/dlls/msvcr80/msvcr80.spec
@@ -234,9 +234,9 @@
 @ cdecl __getmainargs(ptr ptr ptr long ptr)
 @ extern __initenv MSVCRT___initenv
 @ cdecl __iob_func()
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 @ stub __iswcsym
 @ stub __iswcsymf
 # extern __lc_clike
@@ -285,7 +285,7 @@
 @ cdecl __p__mbctype()
 @ stub __p__osplatform
 @ cdecl __p__osver()
-@ cdecl __p__pctype() MSVCRT___p__pctype
+@ cdecl __p__pctype()
 @ cdecl __p__pgmptr() MSVCRT___p__pgmptr
 @ stub __p__pwctype()
 @ cdecl __p__timezone() MSVCRT___p__timezone
@@ -296,7 +296,7 @@
 @ cdecl __p__winminor()
 @ cdecl __p__winver()
 @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl __pctype_func() MSVCRT___pctype_func
+@ cdecl __pctype_func()
 @ extern __pioinfo MSVCRT___pioinfo
 @ stub __pwctype_func
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
@@ -312,7 +312,7 @@
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
 @ cdecl __timezone() MSVCRT___p__timezone
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl __tzname() __p__tzname
 @ cdecl __unDName(ptr str long ptr ptr long)
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@@ -614,16 +614,16 @@
 @ cdecl _invalid_parameter_noinfo()
 @ stub _invoke_watson
 @ extern _iob MSVCRT__iob
-@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l
-@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l
+@ cdecl _isalnum_l(long ptr)
+@ cdecl _isalpha_l(long ptr)
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l
-@ cdecl _isctype(long long) MSVCRT__isctype
-@ cdecl _isctype_l(long long ptr) MSVCRT__isctype_l
-@ cdecl _isdigit_l(long ptr) MSVCRT__isdigit_l
-@ cdecl _isgraph_l(long ptr) MSVCRT__isgraph_l
-@ cdecl _isleadbyte_l(long ptr) MSVCRT__isleadbyte_l
-@ cdecl _islower_l(long ptr) MSVCRT__islower_l
+@ cdecl _iscntrl_l(long ptr)
+@ cdecl _isctype(long long)
+@ cdecl _isctype_l(long long ptr)
+@ cdecl _isdigit_l(long ptr)
+@ cdecl _isgraph_l(long ptr)
+@ cdecl _isleadbyte_l(long ptr)
+@ cdecl _islower_l(long ptr)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalnum_l
 @ stub _ismbbalpha(long)
@@ -684,10 +684,10 @@
 @ stub _ismbstrail_l
 @ cdecl _isnan(double) MSVCRT__isnan
 @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
-@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
-@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l
-@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
-@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l
+@ cdecl _isprint_l(long ptr)
+@ cdecl _ispunct_l(long ptr)
+@ cdecl _isspace_l(long ptr)
+@ cdecl _isupper_l(long ptr)
 @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l
 @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l
 @ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l
@@ -702,7 +702,7 @@
 @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l
 @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l
 @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l
-@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l
+@ cdecl _isxdigit_l(long ptr)
 @ cdecl _itoa(long ptr long) MSVCRT__itoa
 @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s
 @ cdecl _itow(long ptr long) ntdll._itow
@@ -1071,10 +1071,10 @@
 @ cdecl _time32(ptr) MSVCRT__time32
 @ cdecl _time64(ptr) MSVCRT__time64
 @ extern _timezone MSVCRT___timezone
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _tolower_l(long ptr) MSVCRT__tolower_l
-@ cdecl _toupper(long) MSVCRT__toupper
-@ cdecl _toupper_l(long ptr) MSVCRT__toupper_l
+@ cdecl _tolower(long)
+@ cdecl _tolower_l(long ptr)
+@ cdecl _toupper(long)
+@ cdecl _toupper_l(long ptr)
 @ cdecl _towlower_l(long ptr) MSVCRT__towlower_l
 @ cdecl _towupper_l(long ptr) MSVCRT__towupper_l
 @ extern _tzname MSVCRT__tzname
@@ -1387,20 +1387,20 @@
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
 @ cdecl iswdigit(long) MSVCRT_iswdigit
@@ -1411,7 +1411,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -1516,8 +1516,8 @@
 @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
 @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
 @ cdecl ungetc(long ptr) MSVCRT_ungetc
diff --git a/dlls/msvcr90/msvcr90.spec b/dlls/msvcr90/msvcr90.spec
index 5e6ca7f29ae..51c681eff52 100644
--- a/dlls/msvcr90/msvcr90.spec
+++ b/dlls/msvcr90/msvcr90.spec
@@ -223,9 +223,9 @@
 @ cdecl __getmainargs(ptr ptr ptr long ptr)
 @ extern __initenv MSVCRT___initenv
 @ cdecl __iob_func()
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 @ stub __iswcsym
 @ stub __iswcsymf
 # extern __lc_clike
@@ -272,7 +272,7 @@
 @ cdecl __p__iob() __iob_func
 @ stub __p__mbcasemap()
 @ cdecl __p__mbctype()
-@ cdecl __p__pctype() MSVCRT___p__pctype
+@ cdecl __p__pctype()
 @ cdecl __p__pgmptr() MSVCRT___p__pgmptr
 @ stub __p__pwctype()
 @ cdecl __p__timezone() MSVCRT___p__timezone
@@ -280,7 +280,7 @@
 @ cdecl __p__wcmdln() MSVCRT___p__wcmdln
 @ cdecl __p__wenviron() MSVCRT___p__wenviron
 @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl __pctype_func() MSVCRT___pctype_func
+@ cdecl __pctype_func()
 @ extern __pioinfo MSVCRT___pioinfo
 @ stub __pwctype_func
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
@@ -296,7 +296,7 @@
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
 @ cdecl __timezone() MSVCRT___p__timezone
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl __tzname() __p__tzname
 @ cdecl __unDName(ptr str long ptr ptr long)
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@@ -592,16 +592,16 @@
 @ cdecl _invalid_parameter_noinfo()
 @ stub _invoke_watson
 @ extern _iob MSVCRT__iob
-@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l
-@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l
+@ cdecl _isalnum_l(long ptr)
+@ cdecl _isalpha_l(long ptr)
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l
-@ cdecl _isctype(long long) MSVCRT__isctype
-@ cdecl _isctype_l(long long ptr) MSVCRT__isctype_l
-@ cdecl _isdigit_l(long ptr) MSVCRT__isdigit_l
-@ cdecl _isgraph_l(long ptr) MSVCRT__isgraph_l
-@ cdecl _isleadbyte_l(long ptr) MSVCRT__isleadbyte_l
-@ cdecl _islower_l(long ptr) MSVCRT__islower_l
+@ cdecl _iscntrl_l(long ptr)
+@ cdecl _isctype(long long)
+@ cdecl _isctype_l(long long ptr)
+@ cdecl _isdigit_l(long ptr)
+@ cdecl _isgraph_l(long ptr)
+@ cdecl _isleadbyte_l(long ptr)
+@ cdecl _islower_l(long ptr)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalnum_l
 @ stub _ismbbalpha(long)
@@ -662,10 +662,10 @@
 @ stub _ismbstrail_l
 @ cdecl _isnan(double) MSVCRT__isnan
 @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
-@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
-@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l
-@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
-@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l
+@ cdecl _isprint_l(long ptr)
+@ cdecl _ispunct_l(long ptr)
+@ cdecl _isspace_l(long ptr)
+@ cdecl _isupper_l(long ptr)
 @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l
 @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l
 @ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l
@@ -680,7 +680,7 @@
 @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l
 @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l
 @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l
-@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l
+@ cdecl _isxdigit_l(long ptr)
 @ cdecl _itoa(long ptr long) MSVCRT__itoa
 @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s
 @ cdecl _itow(long ptr long) ntdll._itow
@@ -1046,10 +1046,10 @@
 @ cdecl _time32(ptr) MSVCRT__time32
 @ cdecl _time64(ptr) MSVCRT__time64
 @ extern _timezone MSVCRT___timezone
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _tolower_l(long ptr) MSVCRT__tolower_l
-@ cdecl _toupper(long) MSVCRT__toupper
-@ cdecl _toupper_l(long ptr) MSVCRT__toupper_l
+@ cdecl _tolower(long)
+@ cdecl _tolower_l(long ptr)
+@ cdecl _toupper(long)
+@ cdecl _toupper_l(long ptr)
 @ cdecl _towlower_l(long ptr) MSVCRT__towlower_l
 @ cdecl _towupper_l(long ptr) MSVCRT__towupper_l
 @ extern _tzname MSVCRT__tzname
@@ -1359,20 +1359,20 @@
 @ cdecl getwc(ptr) MSVCRT_getwc
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
 @ cdecl iswdigit(long) MSVCRT_iswdigit
@@ -1383,7 +1383,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -1488,8 +1488,8 @@
 @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
 @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
 @ cdecl ungetc(long ptr) MSVCRT_ungetc
diff --git a/dlls/msvcrt/ctype.c b/dlls/msvcrt/ctype.c
index 6d2e069a8df..7fc778eca4a 100644
--- a/dlls/msvcrt/ctype.c
+++ b/dlls/msvcrt/ctype.c
@@ -130,7 +130,7 @@ WORD *MSVCRT__pwctype = MSVCRT__wctype + 1;
 /*********************************************************************
  *		__p__pctype (MSVCRT.@)
  */
-unsigned short** CDECL MSVCRT___p__pctype(void)
+unsigned short** CDECL __p__pctype(void)
 {
     return &get_locinfo()->pctype;
 }
@@ -138,7 +138,7 @@ unsigned short** CDECL MSVCRT___p__pctype(void)
 /*********************************************************************
  *		__pctype_func (MSVCRT.@)
  */
-const unsigned short* CDECL MSVCRT___pctype_func(void)
+const unsigned short* CDECL __pctype_func(void)
 {
     return get_locinfo()->pctype;
 }
@@ -146,7 +146,7 @@ const unsigned short* CDECL MSVCRT___pctype_func(void)
 /*********************************************************************
  *		_isctype_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isctype_l(int c, int type, _locale_t locale)
+int CDECL _isctype_l(int c, int type, _locale_t locale)
 {
   pthreadlocinfo locinfo;
 
@@ -179,223 +179,223 @@ int CDECL MSVCRT__isctype_l(int c, int type, _locale_t locale)
 /*********************************************************************
  *              _isctype (MSVCRT.@)
  */
-int CDECL MSVCRT__isctype(int c, int type)
+int CDECL _isctype(int c, int type)
 {
-    return MSVCRT__isctype_l(c, type, NULL);
+    return _isctype_l(c, type, NULL);
 }
 
 /*********************************************************************
  *		_isalnum_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isalnum_l(int c, _locale_t locale)
+int CDECL _isalnum_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _ALPHA | _DIGIT, locale );
+  return _isctype_l( c, _ALPHA | _DIGIT, locale );
 }
 
 /*********************************************************************
  *		isalnum (MSVCRT.@)
  */
-int CDECL MSVCRT_isalnum(int c)
+int CDECL isalnum(int c)
 {
-  return MSVCRT__isctype( c, _ALPHA | _DIGIT );
+  return _isctype( c, _ALPHA | _DIGIT );
 }
 
 /*********************************************************************
  *		_isalpha_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isalpha_l(int c, _locale_t locale)
+int CDECL _isalpha_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _ALPHA, locale );
+  return _isctype_l( c, _ALPHA, locale );
 }
 
 /*********************************************************************
  *		isalpha (MSVCRT.@)
  */
-int CDECL MSVCRT_isalpha(int c)
+int CDECL isalpha(int c)
 {
-  return MSVCRT__isctype( c, _ALPHA );
+  return _isctype( c, _ALPHA );
 }
 
 /*********************************************************************
  *		_iscntrl_l (MSVCRT.@)
  */
-int CDECL MSVCRT__iscntrl_l(int c, _locale_t locale)
+int CDECL _iscntrl_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _CONTROL, locale );
+  return _isctype_l( c, _CONTROL, locale );
 }
 
 /*********************************************************************
  *		iscntrl (MSVCRT.@)
  */
-int CDECL MSVCRT_iscntrl(int c)
+int CDECL iscntrl(int c)
 {
-  return MSVCRT__isctype( c, _CONTROL );
+  return _isctype( c, _CONTROL );
 }
 
 /*********************************************************************
  *		_isdigit_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isdigit_l(int c, _locale_t locale)
+int CDECL _isdigit_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _DIGIT, locale );
+  return _isctype_l( c, _DIGIT, locale );
 }
 
 /*********************************************************************
  *		isdigit (MSVCRT.@)
  */
-int CDECL MSVCRT_isdigit(int c)
+int CDECL isdigit(int c)
 {
-  return MSVCRT__isctype( c, _DIGIT );
+  return _isctype( c, _DIGIT );
 }
 
 /*********************************************************************
  *		_isgraph_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isgraph_l(int c, _locale_t locale)
+int CDECL _isgraph_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _ALPHA | _DIGIT | _PUNCT, locale );
+  return _isctype_l( c, _ALPHA | _DIGIT | _PUNCT, locale );
 }
 
 /*********************************************************************
  *		isgraph (MSVCRT.@)
  */
-int CDECL MSVCRT_isgraph(int c)
+int CDECL isgraph(int c)
 {
-  return MSVCRT__isctype( c, _ALPHA | _DIGIT | _PUNCT );
+  return _isctype( c, _ALPHA | _DIGIT | _PUNCT );
 }
 
 /*********************************************************************
  *		_isleadbyte_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isleadbyte_l(int c, _locale_t locale)
+int CDECL _isleadbyte_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _LEADBYTE, locale );
+  return _isctype_l( c, _LEADBYTE, locale );
 }
 
 /*********************************************************************
  *		isleadbyte (MSVCRT.@)
  */
-int CDECL MSVCRT_isleadbyte(int c)
+int CDECL isleadbyte(int c)
 {
-  return MSVCRT__isctype( c, _LEADBYTE );
+  return _isctype( c, _LEADBYTE );
 }
 
 /*********************************************************************
  *		_islower_l (MSVCRT.@)
  */
-int CDECL MSVCRT__islower_l(int c, _locale_t locale)
+int CDECL _islower_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _LOWER, locale );
+  return _isctype_l( c, _LOWER, locale );
 }
 
 /*********************************************************************
  *		islower (MSVCRT.@)
  */
-int CDECL MSVCRT_islower(int c)
+int CDECL islower(int c)
 {
-  return MSVCRT__isctype( c, _LOWER );
+  return _isctype( c, _LOWER );
 }
 
 /*********************************************************************
  *		_isprint_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isprint_l(int c, _locale_t locale)
+int CDECL _isprint_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _ALPHA | _DIGIT | _BLANK | _PUNCT, locale );
+  return _isctype_l( c, _ALPHA | _DIGIT | _BLANK | _PUNCT, locale );
 }
 
 /*********************************************************************
  *		isprint (MSVCRT.@)
  */
-int CDECL MSVCRT_isprint(int c)
+int CDECL isprint(int c)
 {
-  return MSVCRT__isctype( c, _ALPHA | _DIGIT | _BLANK | _PUNCT );
+  return _isctype( c, _ALPHA | _DIGIT | _BLANK | _PUNCT );
 }
 
 /*********************************************************************
  *		ispunct (MSVCRT.@)
  */
-int CDECL MSVCRT_ispunct(int c)
+int CDECL ispunct(int c)
 {
-  return MSVCRT__isctype( c, _PUNCT );
+  return _isctype( c, _PUNCT );
 }
 
 /*********************************************************************
  *		_ispunct_l (MSVCR80.@)
  */
-int CDECL MSVCRT__ispunct_l(int c, _locale_t locale)
+int CDECL _ispunct_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _PUNCT, locale );
+  return _isctype_l( c, _PUNCT, locale );
 }
 
 /*********************************************************************
  *		_isspace_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isspace_l(int c, _locale_t locale)
+int CDECL _isspace_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _SPACE, locale );
+  return _isctype_l( c, _SPACE, locale );
 }
 
 /*********************************************************************
  *		isspace (MSVCRT.@)
  */
-int CDECL MSVCRT_isspace(int c)
+int CDECL isspace(int c)
 {
-  return MSVCRT__isctype( c, _SPACE );
+  return _isctype( c, _SPACE );
 }
 
 /*********************************************************************
  *		_isupper_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isupper_l(int c, _locale_t locale)
+int CDECL _isupper_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _UPPER, locale );
+  return _isctype_l( c, _UPPER, locale );
 }
 
 /*********************************************************************
  *		isupper (MSVCRT.@)
  */
-int CDECL MSVCRT_isupper(int c)
+int CDECL isupper(int c)
 {
-  return MSVCRT__isctype( c, _UPPER );
+  return _isctype( c, _UPPER );
 }
 
 /*********************************************************************
  *		_isxdigit_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isxdigit_l(int c, _locale_t locale)
+int CDECL _isxdigit_l(int c, _locale_t locale)
 {
-  return MSVCRT__isctype_l( c, _HEX, locale );
+  return _isctype_l( c, _HEX, locale );
 }
 
 /*********************************************************************
  *		isxdigit (MSVCRT.@)
  */
-int CDECL MSVCRT_isxdigit(int c)
+int CDECL isxdigit(int c)
 {
-  return MSVCRT__isctype( c, _HEX );
+  return _isctype( c, _HEX );
 }
 
 /*********************************************************************
  *		_isblank_l (MSVCRT.@)
  */
-int CDECL MSVCRT__isblank_l(int c, _locale_t locale)
+int CDECL _isblank_l(int c, _locale_t locale)
 {
-  return c == '\t' || MSVCRT__isctype_l( c, _BLANK, locale );
+  return c == '\t' || _isctype_l( c, _BLANK, locale );
 }
 
 /*********************************************************************
  *		isblank (MSVCRT.@)
  */
-int CDECL MSVCRT_isblank(int c)
+int CDECL isblank(int c)
 {
-  return c == '\t' || MSVCRT__isctype( c, _BLANK );
+  return c == '\t' || _isctype( c, _BLANK );
 }
 
 /*********************************************************************
  *		__isascii (MSVCRT.@)
  */
-int CDECL MSVCRT___isascii(int c)
+int CDECL __isascii(int c)
 {
   return ((unsigned)c < 0x80);
 }
@@ -403,7 +403,7 @@ int CDECL MSVCRT___isascii(int c)
 /*********************************************************************
  *		__toascii (MSVCRT.@)
  */
-int CDECL MSVCRT___toascii(int c)
+int CDECL __toascii(int c)
 {
   return (unsigned)c & 0x7f;
 }
@@ -412,7 +412,7 @@ int CDECL MSVCRT___toascii(int c)
  *		iswascii (MSVCRT.@)
  *
  */
-int CDECL MSVCRT_iswascii(wchar_t c)
+int CDECL iswascii(wchar_t c)
 {
   return ((unsigned)c < 0x80);
 }
@@ -420,23 +420,23 @@ int CDECL MSVCRT_iswascii(wchar_t c)
 /*********************************************************************
  *		__iscsym (MSVCRT.@)
  */
-int CDECL MSVCRT___iscsym(int c)
+int CDECL __iscsym(int c)
 {
-  return (c < 127 && (MSVCRT_isalnum(c) || c == '_'));
+  return (c < 127 && (isalnum(c) || c == '_'));
 }
 
 /*********************************************************************
  *		__iscsymf (MSVCRT.@)
  */
-int CDECL MSVCRT___iscsymf(int c)
+int CDECL __iscsymf(int c)
 {
-  return (c < 127 && (MSVCRT_isalpha(c) || c == '_'));
+  return (c < 127 && (isalpha(c) || c == '_'));
 }
 
 /*********************************************************************
  *		_toupper_l (MSVCRT.@)
  */
-int CDECL MSVCRT__toupper_l(int c, _locale_t locale)
+int CDECL _toupper_l(int c, _locale_t locale)
 {
     pthreadlocinfo locinfo;
     unsigned char str[2], *p = str, ret[2];
@@ -472,17 +472,17 @@ int CDECL MSVCRT__toupper_l(int c, _locale_t locale)
 /*********************************************************************
  *		toupper (MSVCRT.@)
  */
-int CDECL MSVCRT_toupper(int c)
+int CDECL toupper(int c)
 {
     if(initial_locale)
         return c>='a' && c<='z' ? c-'a'+'A' : c;
-    return MSVCRT__toupper_l(c, NULL);
+    return _toupper_l(c, NULL);
 }
 
 /*********************************************************************
  *		_toupper (MSVCRT.@)
  */
-int CDECL MSVCRT__toupper(int c)
+int CDECL _toupper(int c)
 {
     return c - 0x20;  /* sic */
 }
@@ -490,7 +490,7 @@ int CDECL MSVCRT__toupper(int c)
 /*********************************************************************
  *              _tolower_l (MSVCRT.@)
  */
-int CDECL MSVCRT__tolower_l(int c, _locale_t locale)
+int CDECL _tolower_l(int c, _locale_t locale)
 {
     pthreadlocinfo locinfo;
     unsigned char str[2], *p = str, ret[2];
@@ -526,17 +526,17 @@ int CDECL MSVCRT__tolower_l(int c, _locale_t locale)
 /*********************************************************************
  *              tolower (MSVCRT.@)
  */
-int CDECL MSVCRT_tolower(int c)
+int CDECL tolower(int c)
 {
     if(initial_locale)
         return c>='A' && c<='Z' ? c-'A'+'a' : c;
-    return MSVCRT__tolower_l(c, NULL);
+    return _tolower_l(c, NULL);
 }
 
 /*********************************************************************
  *		_tolower (MSVCRT.@)
  */
-int CDECL MSVCRT__tolower(int c)
+int CDECL _tolower(int c)
 {
     return c + 0x20;  /* sic */
 }
diff --git a/dlls/msvcrt/file.c b/dlls/msvcrt/file.c
index bc1305e5228..6ebe1fede83 100644
--- a/dlls/msvcrt/file.c
+++ b/dlls/msvcrt/file.c
@@ -2989,8 +2989,8 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf)
                  Also a letter as first char isn't enough to be classified
 		 as a drive letter
   */
-  if (MSVCRT_isalpha(*path)&& (*(path+1)==':'))
-    buf->st_dev = buf->st_rdev = MSVCRT__toupper_l(*path, NULL) - 'A'; /* drive num */
+  if (isalpha(*path)&& (*(path+1)==':'))
+    buf->st_dev = buf->st_rdev = _toupper_l(*path, NULL) - 'A'; /* drive num */
   else
     buf->st_dev = buf->st_rdev = MSVCRT__getdrive() - 1;
 
@@ -3003,9 +3003,9 @@ int CDECL MSVCRT_stat64(const char* path, struct MSVCRT__stat64 * buf)
     /* executable? */
     if (plen > 6 && path[plen-4] == '.')  /* shortest exe: "\x.exe" */
     {
-      unsigned int ext = MSVCRT__tolower_l(path[plen-1], NULL) |
-          (MSVCRT__tolower_l(path[plen-2], NULL) << 8) |
-          (MSVCRT__tolower_l(path[plen-3], NULL) << 16);
+      unsigned int ext = _tolower_l(path[plen-1], NULL) |
+          (_tolower_l(path[plen-2], NULL) << 8) |
+          (_tolower_l(path[plen-3], NULL) << 16);
       if (ext == EXE || ext == BAT || ext == CMD || ext == COM)
           mode |= ALL_S_IEXEC;
     }
@@ -3452,7 +3452,7 @@ int CDECL MSVCRT__write(int fd, const void* buf, unsigned int count)
             for (; i < count && j < sizeof(conv)-1 &&
                     len < (sizeof(lfbuf) - 1) / sizeof(WCHAR); i++, j++, len++)
             {
-                if (MSVCRT_isleadbyte((unsigned char)s[i]))
+                if (isleadbyte((unsigned char)s[i]))
                 {
                     conv[j++] = s[i++];
 
@@ -3791,7 +3791,7 @@ wint_t CDECL MSVCRT__fgetwc_nolock(FILE* file)
         ch = MSVCRT__fgetc_nolock(file);
         if(ch != EOF) {
             mbs[0] = (char)ch;
-            if(MSVCRT_isleadbyte((unsigned char)mbs[0])) {
+            if(isleadbyte((unsigned char)mbs[0])) {
                 ch = MSVCRT__fgetc_nolock(file);
                 if(ch != EOF) {
                     mbs[1] = (char)ch;
diff --git a/dlls/msvcrt/mbcs.c b/dlls/msvcrt/mbcs.c
index 772527daf82..a5f18d14075 100644
--- a/dlls/msvcrt/mbcs.c
+++ b/dlls/msvcrt/mbcs.c
@@ -447,7 +447,7 @@ unsigned int CDECL _mbctolower(unsigned int c)
       FIXME("Handle MBC chars\n");
       return c;
     }
-    return MSVCRT__tolower_l(c, NULL); /* ASCII CP or SB char */
+    return _tolower_l(c, NULL); /* ASCII CP or SB char */
 }
 
 /*********************************************************************
@@ -460,7 +460,7 @@ unsigned int CDECL _mbctoupper(unsigned int c)
       FIXME("Handle MBC chars\n");
       return c;
     }
-    return MSVCRT__toupper_l(c, NULL); /* ASCII CP or SB char */
+    return _toupper_l(c, NULL); /* ASCII CP or SB char */
 }
 
 /*********************************************************************
@@ -1741,7 +1741,7 @@ int CDECL _mbbtype_l(unsigned char c, int type, _locale_t locale)
         return _ismbbtrail_l(c, locale) ? _MBC_TRAIL : _MBC_ILLEGAL;
     else
         return _ismbblead_l(c, locale) ? _MBC_LEAD
-                : MSVCRT__isprint_l(c, locale) ? _MBC_SINGLE : _MBC_ILLEGAL;
+                : _isprint_l(c, locale) ? _MBC_SINGLE : _MBC_ILLEGAL;
 }
 
 /*********************************************************************
@@ -2036,7 +2036,7 @@ unsigned char* CDECL _mbslwr(unsigned char* s)
       *s++=c;
     }
   }
-  else for ( ; *s; s++) *s = MSVCRT__tolower_l(*s, NULL);
+  else for ( ; *s; s++) *s = _tolower_l(*s, NULL);
   return ret;
 }
 
@@ -2070,7 +2070,7 @@ int CDECL _mbslwr_s(unsigned char* s, size_t len)
       *s++=c;
     }
   }
-  else for ( ; *s && len > 0; s++, len--) *s = MSVCRT__tolower_l(*s, NULL);
+  else for ( ; *s && len > 0; s++, len--) *s = _tolower_l(*s, NULL);
   if (*s)
   {
     *s = '\0';
@@ -2104,7 +2104,7 @@ unsigned char* CDECL _mbsupr(unsigned char* s)
       *s++=c;
     }
   }
-  else for ( ; *s; s++) *s = MSVCRT__toupper_l(*s, NULL);
+  else for ( ; *s; s++) *s = _toupper_l(*s, NULL);
   return ret;
 }
 
@@ -2138,7 +2138,7 @@ int CDECL _mbsupr_s(unsigned char* s, size_t len)
       *s++=c;
     }
   }
-  else for ( ; *s && len > 0; s++, len--) *s = MSVCRT__toupper_l(*s, NULL);
+  else for ( ; *s && len > 0; s++, len--) *s = _toupper_l(*s, NULL);
   if (*s)
   {
     *s = '\0';
@@ -2320,7 +2320,7 @@ int CDECL MSVCRT_mblen(const char* str, size_t size)
     if(get_locinfo()->mb_cur_max == 1)
       return 1; /* ASCII CP */
 
-    return !MSVCRT_isleadbyte((unsigned char)*str) ? 1 : (size>1 ? 2 : -1);
+    return !isleadbyte((unsigned char)*str) ? 1 : (size>1 ? 2 : -1);
   }
   return 0;
 }
@@ -2338,7 +2338,7 @@ size_t CDECL MSVCRT_mbrlen(const char *str, size_t len, mbstate_t *state)
 
     if(get_locinfo()->mb_cur_max == 1) {
         return 1;
-    }else if(!s && MSVCRT_isleadbyte((unsigned char)*str)) {
+    }else if(!s && isleadbyte((unsigned char)*str)) {
         if(len == 1) {
             s = (unsigned char)*str;
             ret = -2;
@@ -2416,7 +2416,7 @@ int CDECL MSVCRT_mbtowc_l(wchar_t *dst, const char* str, size_t n, _locale_t loc
         if(dst) *dst = (unsigned char)*str;
         return 1;
     }
-    if(n>=2 && MSVCRT__isleadbyte_l((unsigned char)*str, locale)) {
+    if(n>=2 && _isleadbyte_l((unsigned char)*str, locale)) {
         if(!MultiByteToWideChar(locinfo->lc_codepage, 0, str, 2, &tmpdst, 1))
             return -1;
         if(dst) *dst = tmpdst;
@@ -2474,7 +2474,7 @@ size_t CDECL MSVCRT_mbrtowc(wchar_t *dst, const char *str,
 
     if(locinfo->mb_cur_max == 1) {
         tmpstr[len++] = *str;
-    }else if(!s && MSVCRT_isleadbyte((unsigned char)*str)) {
+    }else if(!s && isleadbyte((unsigned char)*str)) {
         if(n == 1) {
             s = (unsigned char)*str;
             len = -2;
@@ -2547,7 +2547,7 @@ size_t CDECL MSVCRT__mbstowcs_l(wchar_t *wcstr, const char *mbstr,
         if(mbstr[size] == '\0')
             break;
 
-        size += (MSVCRT__isleadbyte_l((unsigned char)mbstr[size], locale) ? 2 : 1);
+        size += (_isleadbyte_l((unsigned char)mbstr[size], locale) ? 2 : 1);
     }
 
     if(size) {
diff --git a/dlls/msvcrt/msvcrt.h b/dlls/msvcrt/msvcrt.h
index c9a64d7b22b..4648f96d024 100644
--- a/dlls/msvcrt/msvcrt.h
+++ b/dlls/msvcrt/msvcrt.h
@@ -642,15 +642,9 @@ struct MSVCRT__stat64 {
 #define MSVCRT__NLSCMPERROR ((unsigned int)0x7fffffff)
 
 int __cdecl      MSVCRT_atoi(const char *str);
-int __cdecl      MSVCRT_isalpha(int c);
-int __cdecl      MSVCRT_isdigit(int c);
-int __cdecl      MSVCRT_isspace(int c);
 int __cdecl      MSVCRT_iswalpha(wint_t);
 int __cdecl      MSVCRT_iswspace(wint_t);
 int __cdecl      MSVCRT_iswdigit(wint_t);
-int __cdecl      MSVCRT_isleadbyte(int);
-int __cdecl      MSVCRT__isleadbyte_l(int, _locale_t);
-int __cdecl      MSVCRT__isspace_l(int, _locale_t);
 int __cdecl      MSVCRT__iswspace_l(wchar_t, _locale_t);
 
 void __cdecl     MSVCRT__lock_file(FILE*);
@@ -751,11 +745,8 @@ int     __cdecl MSVCRT__pipe(int *, unsigned int, int);
 wchar_t* __cdecl MSVCRT__wgetenv(const wchar_t*);
 void __cdecl    MSVCRT__wsearchenv(const wchar_t*, const wchar_t*, wchar_t*);
 intptr_t __cdecl MSVCRT__spawnvpe(int, const char*, const char* const*, const char* const*);
-int __cdecl      MSVCRT__toupper_l(int,_locale_t);
-int __cdecl      MSVCRT__tolower_l(int,_locale_t);
 int __cdecl      MSVCRT__towupper_l(wint_t,_locale_t);
 int __cdecl      MSVCRT__towlower_l(wint_t,_locale_t);
-int __cdecl      MSVCRT__toupper(int); /* only use on lower-case ASCII characters */
 int __cdecl      MSVCRT__stricmp(const char*, const char*);
 int __cdecl      MSVCRT__strnicmp(const char*, const char*, size_t);
 int __cdecl      MSVCRT__strnicoll_l(const char*, const char*, size_t, _locale_t);
@@ -773,7 +764,6 @@ int __cdecl MSVCRT_wcsncmp(const wchar_t*, const wchar_t*, size_t);
 int __cdecl MSVCRT__wcsnicmp(const wchar_t*, const wchar_t*, size_t);
 int __cdecl MSVCRT_towlower(wint_t);
 int __cdecl MSVCRT_towupper(wint_t);
-int __cdecl MSVCRT__isprint_l(int c, _locale_t locale);
 int __cdecl MSVCRT__iswalnum_l(wchar_t, _locale_t);
 int __cdecl MSVCRT__iswdigit_l(wchar_t, _locale_t);
 int __cdecl MSVCRT__iswgraph_l(wchar_t, _locale_t);
diff --git a/dlls/msvcrt/msvcrt.spec b/dlls/msvcrt/msvcrt.spec
index 70266a3fd3b..278c749ecbe 100644
--- a/dlls/msvcrt/msvcrt.spec
+++ b/dlls/msvcrt/msvcrt.spec
@@ -215,9 +215,9 @@
 @ cdecl __getmainargs(ptr ptr ptr long ptr)
 @ extern __initenv MSVCRT___initenv
 @ cdecl __iob_func()
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 @ extern __lc_codepage MSVCRT___lc_codepage
 @ stub __lc_collate
 @ extern __lc_collate_cp MSVCRT___lc_collate_cp
@@ -263,7 +263,7 @@
 @ stub -arch=i386 __p__mbcasemap()
 @ cdecl -arch=i386 __p__mbctype()
 @ cdecl -arch=i386 __p__osver()
-@ cdecl -arch=i386 __p__pctype() MSVCRT___p__pctype
+@ cdecl -arch=i386 __p__pctype()
 @ cdecl -arch=i386 __p__pgmptr() MSVCRT___p__pgmptr
 @ stub -arch=i386 __p__pwctype()
 @ cdecl -arch=i386 __p__timezone() MSVCRT___p__timezone
@@ -274,7 +274,7 @@
 @ cdecl -arch=i386 __p__winminor()
 @ cdecl -arch=i386 __p__winver()
 @ cdecl -arch=i386 __p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl __pctype_func() MSVCRT___pctype_func
+@ cdecl __pctype_func()
 @ extern __pioinfo MSVCRT___pioinfo
 # stub __pwctype_func()
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
@@ -284,7 +284,7 @@
 @ cdecl __strncnt(str long) MSVCRT___strncnt
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl __uncaught_exception() MSVCRT___uncaught_exception
 @ cdecl __unDName(ptr str long ptr ptr long)
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@@ -561,16 +561,16 @@
 @ stub -arch=i386 _inpw(long)
 @ cdecl _invalid_parameter(wstr wstr wstr long long)
 @ extern _iob MSVCRT__iob
-@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l
-@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l
+@ cdecl _isalnum_l(long ptr)
+@ cdecl _isalpha_l(long ptr)
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l
-@ cdecl _isctype(long long) MSVCRT__isctype
-@ cdecl _isctype_l(long long ptr) MSVCRT__isctype_l
-@ cdecl _isdigit_l(long ptr) MSVCRT__isdigit_l
-@ cdecl _isgraph_l(long ptr) MSVCRT__isgraph_l
-@ cdecl _isleadbyte_l(long ptr) MSVCRT__isleadbyte_l
-@ cdecl _islower_l(long ptr) MSVCRT__islower_l
+@ cdecl _iscntrl_l(long ptr)
+@ cdecl _isctype(long long)
+@ cdecl _isctype_l(long long ptr)
+@ cdecl _isdigit_l(long ptr)
+@ cdecl _isgraph_l(long ptr)
+@ cdecl _isleadbyte_l(long ptr)
+@ cdecl _islower_l(long ptr)
 @ stub _ismbbalnum(long)
 # stub _ismbbalnum_l(long ptr)
 @ stub _ismbbalpha(long)
@@ -631,9 +631,9 @@
 # stub _ismbstrail_l(long ptr)
 @ cdecl _isnan(double) MSVCRT__isnan
 @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
-@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
-@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
-@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l
+@ cdecl _isprint_l(long ptr)
+@ cdecl _isspace_l(long ptr)
+@ cdecl _isupper_l(long ptr)
 @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l
 @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l
 @ cdecl _iswcntrl_l(long ptr) MSVCRT__iswcntrl_l
@@ -646,7 +646,7 @@
 @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l
 @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l
 @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l
-@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l
+@ cdecl _isxdigit_l(long ptr)
 @ cdecl _itoa(long ptr long) MSVCRT__itoa
 @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s
 @ cdecl _itow(long ptr long) ntdll._itow
@@ -1006,10 +1006,10 @@
 @ cdecl _time32(ptr) MSVCRT__time32
 @ cdecl _time64(ptr) MSVCRT__time64
 @ extern _timezone MSVCRT___timezone
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _tolower_l(long ptr) MSVCRT__tolower_l
-@ cdecl _toupper(long) MSVCRT__toupper
-@ cdecl _toupper_l(long ptr) MSVCRT__toupper_l
+@ cdecl _tolower(long)
+@ cdecl _tolower_l(long ptr)
+@ cdecl _toupper(long)
+@ cdecl _toupper_l(long ptr)
 @ cdecl _towlower_l(long ptr) MSVCRT__towlower_l
 @ cdecl _towupper_l(long ptr) MSVCRT__towupper_l
 @ extern _tzname MSVCRT__tzname
@@ -1328,20 +1328,20 @@
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl gmtime(ptr) MSVCRT_gmtime
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
 @ cdecl iswdigit(long) MSVCRT_iswdigit
@@ -1352,7 +1352,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -1462,8 +1462,8 @@
 @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
 @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
 @ cdecl ungetc(long ptr) MSVCRT_ungetc
diff --git a/dlls/msvcrt/scanf.h b/dlls/msvcrt/scanf.h
index 0207ff7d61e..04f85491cb4 100644
--- a/dlls/msvcrt/scanf.h
+++ b/dlls/msvcrt/scanf.h
@@ -36,7 +36,7 @@
 #define _CHAR_ char
 #define _EOF_ EOF
 #define _EOF_RET EOF
-#define _ISSPACE_(c) MSVCRT_isspace(c)
+#define _ISSPACE_(c) isspace(c)
 #define _WIDE2SUPPORTED_(c) c /* FIXME: convert wide char to char */
 #define _CHAR2SUPPORTED_(c) c /* No conversion needed (char to char) */
 #define _CHAR2DIGIT_(c, base) char2digit((c), (base))
diff --git a/dlls/msvcrt/string.c b/dlls/msvcrt/string.c
index 2da3b83622a..36a9026c0a2 100644
--- a/dlls/msvcrt/string.c
+++ b/dlls/msvcrt/string.c
@@ -95,7 +95,7 @@ int CDECL MSVCRT__strlwr_s_l(char *str, size_t len, _locale_t locale)
     {
         while (*str)
         {
-            *str = MSVCRT__tolower_l((unsigned char)*str, locale);
+            *str = _tolower_l((unsigned char)*str, locale);
             str++;
         }
     }
@@ -174,7 +174,7 @@ int CDECL MSVCRT__strupr_s_l(char *str, size_t len, _locale_t locale)
     {
         while (*str)
         {
-            *str = MSVCRT__toupper_l((unsigned char)*str, locale);
+            *str = _toupper_l((unsigned char)*str, locale);
             str++;
         }
     }
@@ -763,12 +763,12 @@ static struct fpnum fpnum_parse_bnum(wchar_t (*get)(void *ctx), void (*unget)(vo
     }
 
 #if _MSVCR_VER >= 140
-    if(nch == _infinity[0] || nch == MSVCRT__toupper(_infinity[0]))
+    if(nch == _infinity[0] || nch == _toupper(_infinity[0]))
         str_match = _infinity;
-    if(nch == _nan[0] || nch == MSVCRT__toupper(_nan[0]))
+    if(nch == _nan[0] || nch == _toupper(_nan[0]))
         str_match = _nan;
     while(str_match && nch != WEOF &&
-            (nch == str_match[matched] || nch == MSVCRT__toupper(str_match[matched]))) {
+            (nch == str_match[matched] || nch == _toupper(str_match[matched]))) {
         nch = get(ctx);
         matched++;
     }
@@ -1024,7 +1024,7 @@ static inline double strtod_helper(const char *str, char **end, _locale_t locale
         locinfo = locale->locinfo;
 
     p = str;
-    while(MSVCRT__isspace_l((unsigned char)*p, locale))
+    while(_isspace_l((unsigned char)*p, locale))
         p++;
     beg = p;
 
@@ -1453,7 +1453,7 @@ int CDECL __STRINGTOLD_L( MSVCRT__LDOUBLE *value, char **endptr,
         locinfo = locale->locinfo;
 
     p = str;
-    while (MSVCRT__isspace_l((unsigned char)*p, locale))
+    while (_isspace_l((unsigned char)*p, locale))
         p++;
     beg = p;
 
@@ -1537,7 +1537,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, _loca
     if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0;
     if (!MSVCRT_CHECK_PMT(base <= 36)) return 0;
 
-    while(MSVCRT__isspace_l((unsigned char)*nptr, locale)) nptr++;
+    while(_isspace_l((unsigned char)*nptr, locale)) nptr++;
 
     if(*nptr == '-') {
         negative = TRUE;
@@ -1545,7 +1545,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, _loca
     } else if(*nptr == '+')
         nptr++;
 
-    if((base==0 || base==16) && *nptr=='0' && MSVCRT__tolower_l(*(nptr+1), locale)=='x') {
+    if((base==0 || base==16) && *nptr=='0' && _tolower_l(*(nptr+1), locale)=='x') {
         base = 16;
         nptr += 2;
     }
@@ -1558,7 +1558,7 @@ __int64 CDECL MSVCRT_strtoi64_l(const char *nptr, char **endptr, int base, _loca
     }
 
     while(*nptr) {
-        char cur = MSVCRT__tolower_l(*nptr, locale);
+        char cur = _tolower_l(*nptr, locale);
         int v;
 
         if(cur>='0' && cur<='9') {
@@ -1630,7 +1630,7 @@ int __cdecl MSVCRT_atoi(const char *str)
     if(!str)
         return 0;
 
-    while(MSVCRT__isspace_l((unsigned char)*str, NULL)) str++;
+    while(_isspace_l((unsigned char)*str, NULL)) str++;
 
     if(*str == '+') {
         str++;
@@ -1789,7 +1789,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b
     if (!MSVCRT_CHECK_PMT(base == 0 || base >= 2)) return 0;
     if (!MSVCRT_CHECK_PMT(base <= 36)) return 0;
 
-    while(MSVCRT__isspace_l((unsigned char)*nptr, locale)) nptr++;
+    while(_isspace_l((unsigned char)*nptr, locale)) nptr++;
 
     if(*nptr == '-') {
         negative = TRUE;
@@ -1797,7 +1797,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b
     } else if(*nptr == '+')
         nptr++;
 
-    if((base==0 || base==16) && *nptr=='0' && MSVCRT__tolower_l(*(nptr+1), locale)=='x') {
+    if((base==0 || base==16) && *nptr=='0' && _tolower_l(*(nptr+1), locale)=='x') {
         base = 16;
         nptr += 2;
     }
@@ -1810,7 +1810,7 @@ unsigned __int64 CDECL MSVCRT_strtoui64_l(const char *nptr, char **endptr, int b
     }
 
     while(*nptr) {
-        char cur = MSVCRT__tolower_l(*nptr, locale);
+        char cur = _tolower_l(*nptr, locale);
         int v;
 
         if(cur>='0' && cur<='9') {
@@ -2679,8 +2679,8 @@ int __cdecl MSVCRT__strnicmp_l(const char *s1, const char *s2,
     }
 
     do {
-        c1 = MSVCRT__tolower_l((unsigned char)*s1++, locale);
-        c2 = MSVCRT__tolower_l((unsigned char)*s2++, locale);
+        c1 = _tolower_l((unsigned char)*s1++, locale);
+        c2 = _tolower_l((unsigned char)*s2++, locale);
     }while(--count && c1 && c1==c2);
 
     return c1-c2;
@@ -2771,7 +2771,7 @@ int __cdecl MSVCRT__memicmp_l(const char *s1, const char *s2, size_t len, _local
 
     while (len--)
     {
-        if ((ret = MSVCRT__tolower_l(*s1, locale) - MSVCRT__tolower_l(*s2, locale)))
+        if ((ret = _tolower_l(*s1, locale) - _tolower_l(*s2, locale)))
             break;
         s1++;
         s2++;
diff --git a/dlls/msvcrt/time.c b/dlls/msvcrt/time.c
index 287069cfe1e..9a0a8b43129 100644
--- a/dlls/msvcrt/time.c
+++ b/dlls/msvcrt/time.c
@@ -1195,7 +1195,7 @@ static size_t strftime_impl(STRFTIME_CHAR *str, size_t max,
 
     for(ret=0; *format && ret<max; format++) {
         if(*format != '%') {
-            if(MSVCRT__isleadbyte_l((unsigned char)*format, loc)) {
+            if(_isleadbyte_l((unsigned char)*format, loc)) {
                 str[ret++] = *(format++);
                 if(ret == max) continue;
                 if(!MSVCRT_CHECK_PMT(str[ret]))
diff --git a/dlls/msvcrt/undname.c b/dlls/msvcrt/undname.c
index 8d44751c9e5..92cbf805489 100644
--- a/dlls/msvcrt/undname.c
+++ b/dlls/msvcrt/undname.c
@@ -854,7 +854,7 @@ static BOOL demangle_datatype(struct parsed_symbol* sym, struct datatype_t* ct,
         if (!get_modified_type(ct, sym, pmt_ref, in_args ? dt : 'P', in_args)) goto done;
         break;
     case 'P': /* Pointer */
-        if (MSVCRT_isdigit(*sym->current))
+        if (isdigit(*sym->current))
 	{
             /* FIXME:
              *   P6 = Function pointer
diff --git a/dlls/msvcrtd/msvcrtd.spec b/dlls/msvcrtd/msvcrtd.spec
index eef7755ed79..1fed2fc07ef 100644
--- a/dlls/msvcrtd/msvcrtd.spec
+++ b/dlls/msvcrtd/msvcrtd.spec
@@ -142,9 +142,9 @@
 @ cdecl __fpecode()
 @ cdecl __getmainargs(ptr ptr ptr long ptr)
 @ extern __initenv MSVCRT___initenv
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 @ extern __lc_codepage MSVCRT___lc_codepage
 @ extern __lc_collate_cp MSVCRT___lc_collate_cp
 @ extern __lc_handle MSVCRT___lc_handle
@@ -171,7 +171,7 @@
 @ stub __p__mbcasemap()
 @ cdecl __p__mbctype()
 @ cdecl __p__osver()
-@ cdecl __p__pctype() MSVCRT___p__pctype
+@ cdecl __p__pctype()
 @ cdecl __p__pgmptr() MSVCRT___p__pgmptr
 @ stub __p__pwctype()
 @ cdecl __p__timezone() MSVCRT___p__timezone
@@ -182,7 +182,7 @@
 @ cdecl __p__winminor()
 @ cdecl __p__winver()
 @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl __pctype_func() MSVCRT___pctype_func
+@ cdecl __pctype_func()
 @ extern __pioinfo MSVCRT___pioinfo
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
 @ cdecl __set_app_type(long) MSVCRT___set_app_type
@@ -190,7 +190,7 @@
 @ cdecl __setusermatherr(ptr) MSVCRT___setusermatherr
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl __unDName(ptr str long ptr ptr long)
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
 @ extern __unguarded_readlc_active MSVCRT___unguarded_readlc_active
@@ -340,7 +340,7 @@
 @ stub -arch=i386 _inpw(long)
 @ extern _iob MSVCRT__iob
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _isctype(long long) MSVCRT__isctype
+@ cdecl _isctype(long long)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalpha(long)
 @ stub _ismbbgraph(long)
@@ -535,8 +535,8 @@
 @ cdecl -ret64 _telli64(long)
 @ cdecl _tempnam(str str) MSVCRT__tempnam
 @ extern _timezone MSVCRT___timezone
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _toupper(long) MSVCRT__toupper
+@ cdecl _tolower(long)
+@ cdecl _toupper(long)
 @ extern _tzname MSVCRT__tzname
 @ cdecl _tzset() MSVCRT__tzset
 @ cdecl _ui64toa(int64 ptr long) ntdll._ui64toa
@@ -694,20 +694,20 @@
 @ cdecl getwchar() MSVCRT_getwchar
 @ cdecl gmtime(ptr) MSVCRT_gmtime
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
 @ cdecl iswdigit(long) MSVCRT_iswdigit
@@ -718,7 +718,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -793,8 +793,8 @@
 @ cdecl time(ptr) MSVCRT_time
 @ cdecl tmpfile() MSVCRT_tmpfile
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
 @ cdecl ungetc(long ptr) MSVCRT_ungetc
diff --git a/dlls/ucrtbase/ucrtbase.spec b/dlls/ucrtbase/ucrtbase.spec
index a3f0c9d95eb..424abccdcda 100644
--- a/dlls/ucrtbase/ucrtbase.spec
+++ b/dlls/ucrtbase/ucrtbase.spec
@@ -95,9 +95,9 @@
 @ stub __intrinsic_abnormal_termination
 @ cdecl -arch=i386,x86_64,arm,arm64 -norelay __intrinsic_setjmp(ptr) MSVCRT__setjmp
 @ cdecl -arch=x86_64,arm64 -norelay __intrinsic_setjmpex(ptr ptr) __wine_setjmpex
-@ cdecl __isascii(long) MSVCRT___isascii
-@ cdecl __iscsym(long) MSVCRT___iscsym
-@ cdecl __iscsymf(long) MSVCRT___iscsymf
+@ cdecl __isascii(long)
+@ cdecl __iscsym(long)
+@ cdecl __iscsymf(long)
 @ stub __iswcsym
 @ stub __iswcsymf
 @ cdecl -arch=i386 -norelay __libm_sse2_acos() MSVCRT___libm_sse2_acos
@@ -134,7 +134,7 @@
 @ cdecl __p__wcmdln() MSVCRT___p__wcmdln
 @ cdecl __p__wenviron() MSVCRT___p__wenviron
 @ cdecl __p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl __pctype_func() MSVCRT___pctype_func
+@ cdecl __pctype_func()
 @ cdecl __processing_throw()
 @ stub __pwctype_func
 @ cdecl __pxcptinfoptrs() MSVCRT___pxcptinfoptrs
@@ -170,7 +170,7 @@
 @ cdecl __threadhandle() kernel32.GetCurrentThread
 @ cdecl __threadid() kernel32.GetCurrentThreadId
 @ cdecl __timezone() MSVCRT___p__timezone
-@ cdecl __toascii(long) MSVCRT___toascii
+@ cdecl __toascii(long)
 @ cdecl __tzname() __p__tzname
 @ cdecl __unDName(ptr str long ptr ptr long)
 @ cdecl __unDNameEx(ptr str long ptr ptr ptr long)
@@ -427,17 +427,17 @@
 @ cdecl _invalid_parameter_noinfo_noreturn()
 @ stub _invoke_watson
 @ stub _is_exception_typeof
-@ cdecl _isalnum_l(long ptr) MSVCRT__isalnum_l
-@ cdecl _isalpha_l(long ptr) MSVCRT__isalpha_l
+@ cdecl _isalnum_l(long ptr)
+@ cdecl _isalpha_l(long ptr)
 @ cdecl _isatty(long) MSVCRT__isatty
-@ cdecl _isblank_l(long ptr) MSVCRT__isblank_l
-@ cdecl _iscntrl_l(long ptr) MSVCRT__iscntrl_l
-@ cdecl _isctype(long long) MSVCRT__isctype
-@ cdecl _isctype_l(long long ptr) MSVCRT__isctype_l
-@ cdecl _isdigit_l(long ptr) MSVCRT__isdigit_l
-@ cdecl _isgraph_l(long ptr) MSVCRT__isgraph_l
-@ cdecl _isleadbyte_l(long ptr) MSVCRT__isleadbyte_l
-@ cdecl _islower_l(long ptr) MSVCRT__islower_l
+@ cdecl _isblank_l(long ptr)
+@ cdecl _iscntrl_l(long ptr)
+@ cdecl _isctype(long long)
+@ cdecl _isctype_l(long long ptr)
+@ cdecl _isdigit_l(long ptr)
+@ cdecl _isgraph_l(long ptr)
+@ cdecl _isleadbyte_l(long ptr)
+@ cdecl _islower_l(long ptr)
 @ stub _ismbbalnum(long)
 @ stub _ismbbalnum_l
 @ stub _ismbbalpha(long)
@@ -502,10 +502,10 @@
 @ stub _ismbstrail_l
 @ cdecl _isnan(double) MSVCRT__isnan
 @ cdecl -arch=x86_64 _isnanf(float) MSVCRT__isnanf
-@ cdecl _isprint_l(long ptr) MSVCRT__isprint_l
-@ cdecl _ispunct_l(long ptr) MSVCRT__ispunct_l
-@ cdecl _isspace_l(long ptr) MSVCRT__isspace_l
-@ cdecl _isupper_l(long ptr) MSVCRT__isupper_l
+@ cdecl _isprint_l(long ptr)
+@ cdecl _ispunct_l(long ptr)
+@ cdecl _isspace_l(long ptr)
+@ cdecl _isupper_l(long ptr)
 @ cdecl _iswalnum_l(long ptr) MSVCRT__iswalnum_l
 @ cdecl _iswalpha_l(long ptr) MSVCRT__iswalpha_l
 @ cdecl _iswblank_l(long ptr) MSVCRT__iswblank_l
@@ -521,7 +521,7 @@
 @ cdecl _iswspace_l(long ptr) MSVCRT__iswspace_l
 @ cdecl _iswupper_l(long ptr) MSVCRT__iswupper_l
 @ cdecl _iswxdigit_l(long ptr) MSVCRT__iswxdigit_l
-@ cdecl _isxdigit_l(long ptr) MSVCRT__isxdigit_l
+@ cdecl _isxdigit_l(long ptr)
 @ cdecl _itoa(long ptr long) MSVCRT__itoa
 @ cdecl _itoa_s(long ptr long long) MSVCRT__itoa_s
 @ cdecl _itow(long ptr long) ntdll._itow
@@ -804,7 +804,7 @@
 @ cdecl _o___p__wcmdln() MSVCRT___p__wcmdln
 @ cdecl _o___p__wenviron() MSVCRT___p__wenviron
 @ cdecl _o___p__wpgmptr() MSVCRT___p__wpgmptr
-@ cdecl _o___pctype_func() MSVCRT___pctype_func
+@ cdecl _o___pctype_func() __pctype_func
 @ stub _o___pwctype_func
 @ cdecl _o___std_exception_copy(ptr ptr) MSVCRT___std_exception_copy
 @ cdecl _o___std_exception_destroy(ptr) MSVCRT___std_exception_destroy
@@ -1034,9 +1034,9 @@
 @ 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__isctype(long long) MSVCRT__isctype
-@ cdecl _o__isctype_l(long long ptr) MSVCRT__isctype_l
-@ cdecl _o__isleadbyte_l(long ptr) MSVCRT__isleadbyte_l
+@ cdecl _o__isctype(long long) _isctype
+@ cdecl _o__isctype_l(long long ptr) _isctype_l
+@ cdecl _o__isleadbyte_l(long ptr) _isleadbyte_l
 @ stub _o__ismbbalnum
 @ stub _o__ismbbalnum_l
 @ stub _o__ismbbalpha
@@ -1399,10 +1399,10 @@
 @ cdecl -ret64 _o__telli64(long) _telli64
 @ cdecl _o__timespec32_get(ptr long) _timespec32_get
 @ cdecl _o__timespec64_get(ptr long) _timespec64_get
-@ cdecl _o__tolower(long) MSVCRT__tolower
-@ cdecl _o__tolower_l(long ptr) MSVCRT__tolower_l
-@ cdecl _o__toupper(long) MSVCRT__toupper
-@ cdecl _o__toupper_l(long ptr) MSVCRT__toupper_l
+@ cdecl _o__tolower(long) _tolower
+@ cdecl _o__tolower_l(long ptr) _tolower_l
+@ cdecl _o__toupper(long) _toupper
+@ cdecl _o__toupper_l(long ptr) _toupper_l
 @ cdecl _o__towlower_l(long ptr) MSVCRT__towlower_l
 @ cdecl _o__towupper_l(long ptr) MSVCRT__towupper_l
 @ cdecl _o__tzset() MSVCRT__tzset
@@ -1649,21 +1649,21 @@
 @ cdecl _o_getwchar() MSVCRT_getwchar
 @ cdecl _o_hypot(double double) _hypot
 @ cdecl _o_is_wctype(long long) MSVCRT_iswctype
-@ cdecl _o_isalnum(long) MSVCRT_isalnum
-@ cdecl _o_isalpha(long) MSVCRT_isalpha
-@ cdecl _o_isblank(long) MSVCRT_isblank
-@ cdecl _o_iscntrl(long) MSVCRT_iscntrl
-@ cdecl _o_isdigit(long) MSVCRT_isdigit
-@ cdecl _o_isgraph(long) MSVCRT_isgraph
-@ cdecl _o_isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl _o_islower(long) MSVCRT_islower
-@ cdecl _o_isprint(long) MSVCRT_isprint
-@ cdecl _o_ispunct(long) MSVCRT_ispunct
-@ cdecl _o_isspace(long) MSVCRT_isspace
-@ cdecl _o_isupper(long) MSVCRT_isupper
+@ cdecl _o_isalnum(long) isalnum
+@ cdecl _o_isalpha(long) isalpha
+@ cdecl _o_isblank(long) isblank
+@ cdecl _o_iscntrl(long) iscntrl
+@ cdecl _o_isdigit(long) isdigit
+@ cdecl _o_isgraph(long) isgraph
+@ cdecl _o_isleadbyte(long) isleadbyte
+@ cdecl _o_islower(long) islower
+@ cdecl _o_isprint(long) isprint
+@ cdecl _o_ispunct(long) ispunct
+@ cdecl _o_isspace(long) isspace
+@ cdecl _o_isupper(long) isupper
 @ cdecl _o_iswalnum(long) MSVCRT_iswalnum
 @ cdecl _o_iswalpha(long) MSVCRT_iswalpha
-@ cdecl _o_iswascii(long) MSVCRT_iswascii
+@ cdecl _o_iswascii(long) iswascii
 @ cdecl _o_iswblank(long) MSVCRT_iswblank
 @ cdecl _o_iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl _o_iswctype(long long) MSVCRT_iswctype
@@ -1675,7 +1675,7 @@
 @ cdecl _o_iswspace(long) MSVCRT_iswspace
 @ cdecl _o_iswupper(long) MSVCRT_iswupper
 @ cdecl _o_iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl _o_isxdigit(long) MSVCRT_isxdigit
+@ cdecl _o_isxdigit(long) isxdigit
 @ cdecl _o_ldexp(double long) MSVCRT_ldexp
 @ cdecl _o_lgamma(double) MSVCR120_lgamma
 @ cdecl _o_lgammaf(float) MSVCR120_lgammaf
@@ -1806,8 +1806,8 @@
 @ cdecl _o_tgammal(double) MSVCR120_tgamma
 @ cdecl _o_tmpfile_s(ptr) MSVCRT_tmpfile_s
 @ cdecl _o_tmpnam_s(ptr long) MSVCRT_tmpnam_s
-@ cdecl _o_tolower(long) MSVCRT_tolower
-@ cdecl _o_toupper(long) MSVCRT_toupper
+@ cdecl _o_tolower(long) tolower
+@ cdecl _o_toupper(long) toupper
 @ cdecl _o_towlower(long) MSVCRT_towlower
 @ cdecl _o_towupper(long) MSVCRT_towupper
 @ cdecl _o_ungetc(long ptr) MSVCRT_ungetc
@@ -1974,10 +1974,10 @@
 @ cdecl _time64(ptr) MSVCRT__time64
 @ cdecl _timespec32_get(ptr long)
 @ cdecl _timespec64_get(ptr long)
-@ cdecl _tolower(long) MSVCRT__tolower
-@ cdecl _tolower_l(long ptr) MSVCRT__tolower_l
-@ cdecl _toupper(long) MSVCRT__toupper
-@ cdecl _toupper_l(long ptr) MSVCRT__toupper_l
+@ cdecl _tolower(long)
+@ cdecl _tolower_l(long ptr)
+@ cdecl _toupper(long)
+@ cdecl _toupper_l(long ptr)
 @ cdecl _towlower_l(long ptr) MSVCRT__towlower_l
 @ cdecl _towupper_l(long ptr) MSVCRT__towupper_l
 @ cdecl _tzset() MSVCRT__tzset
@@ -2347,21 +2347,21 @@
 @ cdecl -ret64 imaxabs(int64) MSVCRT_imaxabs
 @ stub imaxdiv
 @ cdecl is_wctype(long long) MSVCRT_iswctype
-@ cdecl isalnum(long) MSVCRT_isalnum
-@ cdecl isalpha(long) MSVCRT_isalpha
-@ cdecl isblank(long) MSVCRT_isblank
-@ cdecl iscntrl(long) MSVCRT_iscntrl
-@ cdecl isdigit(long) MSVCRT_isdigit
-@ cdecl isgraph(long) MSVCRT_isgraph
-@ cdecl isleadbyte(long) MSVCRT_isleadbyte
-@ cdecl islower(long) MSVCRT_islower
-@ cdecl isprint(long) MSVCRT_isprint
-@ cdecl ispunct(long) MSVCRT_ispunct
-@ cdecl isspace(long) MSVCRT_isspace
-@ cdecl isupper(long) MSVCRT_isupper
+@ cdecl isalnum(long)
+@ cdecl isalpha(long)
+@ cdecl isblank(long)
+@ cdecl iscntrl(long)
+@ cdecl isdigit(long)
+@ cdecl isgraph(long)
+@ cdecl isleadbyte(long)
+@ cdecl islower(long)
+@ cdecl isprint(long)
+@ cdecl ispunct(long)
+@ cdecl isspace(long)
+@ cdecl isupper(long)
 @ cdecl iswalnum(long) MSVCRT_iswalnum
 @ cdecl iswalpha(long) MSVCRT_iswalpha
-@ cdecl iswascii(long) MSVCRT_iswascii
+@ cdecl iswascii(long)
 @ cdecl iswblank(long) MSVCRT_iswblank
 @ cdecl iswcntrl(long) MSVCRT_iswcntrl
 @ cdecl iswctype(long long) MSVCRT_iswctype
@@ -2373,7 +2373,7 @@
 @ cdecl iswspace(long) MSVCRT_iswspace
 @ cdecl iswupper(long) MSVCRT_iswupper
 @ cdecl iswxdigit(long) MSVCRT_iswxdigit
-@ cdecl isxdigit(long) MSVCRT_isxdigit
+@ cdecl isxdigit(long)
 @ cdecl labs(long) MSVCRT_labs
 @ cdecl ldexp(double long) MSVCRT_ldexp
 @ cdecl -ret64 ldiv(long long) MSVCRT_ldiv
@@ -2541,8 +2541,8 @@
 @ cdecl tmpfile_s(ptr) MSVCRT_tmpfile_s
 @ cdecl tmpnam(ptr) MSVCRT_tmpnam
 @ cdecl tmpnam_s(ptr long) MSVCRT_tmpnam_s
-@ cdecl tolower(long) MSVCRT_tolower
-@ cdecl toupper(long) MSVCRT_toupper
+@ cdecl tolower(long)
+@ cdecl toupper(long)
 @ cdecl towctrans(long long)
 @ cdecl towlower(long) MSVCRT_towlower
 @ cdecl towupper(long) MSVCRT_towupper
diff --git a/include/msvcrt/corecrt_wctype.h b/include/msvcrt/corecrt_wctype.h
index 9db8c9758b0..9d7b61a3302 100644
--- a/include/msvcrt/corecrt_wctype.h
+++ b/include/msvcrt/corecrt_wctype.h
@@ -24,6 +24,7 @@ extern "C" {
 #define _LEADBYTE     0x8000
 #define _ALPHA       (0x0100|_UPPER|_LOWER)  /* (C1_ALPHA|_UPPER|_LOWER) */
 
+_ACRTIMP int     __cdecl _isleadbyte_l(int,_locale_t);
 _ACRTIMP int     __cdecl _iswblank_l(wint_t,_locale_t);
 _ACRTIMP int     __cdecl _iswctype_l(wint_t,wctype_t,_locale_t);
 _ACRTIMP wchar_t __cdecl _towlower_l(wchar_t,_locale_t);
diff --git a/include/msvcrt/ctype.h b/include/msvcrt/ctype.h
index 3da9e4693f2..be99f7409e4 100644
--- a/include/msvcrt/ctype.h
+++ b/include/msvcrt/ctype.h
@@ -36,8 +36,10 @@ _ACRTIMP int __cdecl isdigit(int);
 _ACRTIMP int __cdecl isgraph(int);
 _ACRTIMP int __cdecl islower(int);
 _ACRTIMP int __cdecl isprint(int);
+_ACRTIMP int __cdecl _isprint_l(int,_locale_t);
 _ACRTIMP int __cdecl ispunct(int);
 _ACRTIMP int __cdecl isspace(int);
+_ACRTIMP int __cdecl _isspace_l(int,_locale_t);
 _ACRTIMP int __cdecl isupper(int);
 _ACRTIMP int __cdecl isxdigit(int);
 _ACRTIMP int __cdecl tolower(int);