diff --git a/dlls/msvcp60/ios.c b/dlls/msvcp60/ios.c
index d7ad0494680..509803d4fc5 100644
--- a/dlls/msvcp60/ios.c
+++ b/dlls/msvcp60/ios.c
@@ -334,9 +334,6 @@ extern const vtable_ptr basic_streambuf_short_vtable;
 /* ??_7?$basic_filebuf@DU?$char_traits@D@std@@@std@@6B@ */
 extern const vtable_ptr basic_filebuf_char_vtable;
 
-/* ??_7?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@6B@ */
-extern const vtable_ptr basic_filebuf_wchar_vtable;
-
 /* ??_7?$basic_filebuf@GU?$char_traits@G@std@@@std@@6B@ */
 extern const vtable_ptr basic_filebuf_short_vtable;
 
@@ -476,8 +473,6 @@ DEFINE_RTTI_DATA0(basic_streambuf_short, 0,
         ".?AV?$basic_streambuf@GU?$char_traits@G@std@@@std@@")
 DEFINE_RTTI_DATA1(basic_filebuf_char, 0, &basic_streambuf_char_rtti_base_descriptor,
         ".?AV?$basic_filebuf@DU?$char_traits@D@std@@@std@@")
-DEFINE_RTTI_DATA1(basic_filebuf_wchar, 0, &basic_streambuf_wchar_rtti_base_descriptor,
-        ".?AV?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@")
 DEFINE_RTTI_DATA1(basic_filebuf_short, 0, &basic_streambuf_short_rtti_base_descriptor,
         ".?AV?$basic_filebuf@GU?$char_traits@G@std@@@std@@")
 DEFINE_RTTI_DATA1(basic_stringbuf_char, 0, &basic_streambuf_char_rtti_base_descriptor,
@@ -644,33 +639,19 @@ __ASM_BLOCK_BEGIN(ios_vtables)
             VTABLE_ADD_FUNC(basic_filebuf_char_setbuf)
             VTABLE_ADD_FUNC(basic_filebuf_char_sync)
             VTABLE_ADD_FUNC(basic_streambuf_char_imbue));
-    __ASM_VTABLE(basic_filebuf_wchar,
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_vector_dtor)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_overflow)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_pbackfail)
-            VTABLE_ADD_FUNC(basic_streambuf_wchar_showmanyc)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_underflow)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_uflow)
-            VTABLE_ADD_FUNC(basic_streambuf_wchar_xsgetn)
-            VTABLE_ADD_FUNC(basic_streambuf_wchar_xsputn)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_seekoff)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_seekpos)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_setbuf)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_sync)
-            VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue));
     __ASM_VTABLE(basic_filebuf_short,
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_vector_dtor)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_overflow)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_pbackfail)
+            VTABLE_ADD_FUNC(basic_filebuf_short_vector_dtor)
+            VTABLE_ADD_FUNC(basic_filebuf_short_overflow)
+            VTABLE_ADD_FUNC(basic_filebuf_short_pbackfail)
             VTABLE_ADD_FUNC(basic_streambuf_wchar_showmanyc)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_underflow)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_uflow)
+            VTABLE_ADD_FUNC(basic_filebuf_short_underflow)
+            VTABLE_ADD_FUNC(basic_filebuf_short_uflow)
             VTABLE_ADD_FUNC(basic_streambuf_wchar_xsgetn)
             VTABLE_ADD_FUNC(basic_streambuf_wchar_xsputn)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_seekoff)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_seekpos)
+            VTABLE_ADD_FUNC(basic_filebuf_short_seekoff)
+            VTABLE_ADD_FUNC(basic_filebuf_short_seekpos)
             VTABLE_ADD_FUNC(basic_filebuf_short_setbuf)
-            VTABLE_ADD_FUNC(basic_filebuf_wchar_sync)
+            VTABLE_ADD_FUNC(basic_filebuf_short_sync)
             VTABLE_ADD_FUNC(basic_streambuf_wchar_imbue));
     __ASM_VTABLE(basic_stringbuf_char,
             VTABLE_ADD_FUNC(basic_stringbuf_char_vector_dtor)
@@ -2797,32 +2778,10 @@ void __thiscall basic_filebuf_char_imbue(basic_filebuf_char *this, const locale
     basic_filebuf_char__Initcvt_cvt(this, codecvt_char_use_facet(loc));
 }
 
-/* ?_Stinit@?1??_Init@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA */
-/* ?_Stinit@?1??_Init@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA */
-int basic_filebuf_wchar__Init__Stinit = 0;
-
 /* ?_Stinit@?1??_Init@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@23@@Z@4HA */
 /* ?_Stinit@?1??_Init@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@23@@Z@4HA */
 int basic_filebuf_short__Init__Stinit = 0;
 
-/* ?_Init@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@12@@Z */
-/* ?_Init@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@12@@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar__Init, 12)
-void __thiscall basic_filebuf_wchar__Init(basic_filebuf_wchar *this, FILE *file, basic_filebuf__Initfl which)
-{
-    TRACE("(%p %p %d)\n", this, file, which);
-
-    this->cvt = NULL;
-    this->state0 = basic_filebuf_short__Init__Stinit;
-    this->state = basic_filebuf_short__Init__Stinit;
-    if(which == INITFL_new)
-        this->str = NULL;
-    this->close = (which == INITFL_open);
-    this->file = file;
-
-    basic_streambuf_wchar__Init_empty(&this->base);
-}
-
 /* ?_Init@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAU_iobuf@@W4_Initfl@12@@Z */
 /* ?_Init@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAU_iobuf@@W4_Initfl@12@@Z */
 DEFINE_THISCALL_WRAPPER(basic_filebuf_short__Init, 12)
@@ -2841,12 +2800,10 @@ void __thiscall basic_filebuf_short__Init(basic_filebuf_wchar *this, FILE *file,
     basic_streambuf_wchar__Init_empty(&this->base);
 }
 
-/* ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IAEXPAV?$codecvt@_WDH@2@@Z */
-/* ?_Initcvt@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@IEAAXPEAV?$codecvt@_WDH@2@@Z */
 /* ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXPAV?$codecvt@GDH@2@@Z */
 /* ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXPEAV?$codecvt@GDH@2@@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar__Initcvt_cvt, 8)
-void __thiscall basic_filebuf_wchar__Initcvt_cvt(basic_filebuf_wchar *this, codecvt_wchar *cvt)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short__Initcvt_cvt, 8)
+void __thiscall basic_filebuf_short__Initcvt_cvt(basic_filebuf_wchar *this, codecvt_wchar *cvt)
 {
     TRACE("(%p %p)\n", this, cvt);
 
@@ -2860,19 +2817,17 @@ void __thiscall basic_filebuf_wchar__Initcvt_cvt(basic_filebuf_wchar *this, code
 
 /* ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ */
 /* ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXXZ */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar__Initcvt, 4)
-void __thiscall basic_filebuf_wchar__Initcvt(basic_filebuf_wchar *this)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short__Initcvt, 4)
+void __thiscall basic_filebuf_short__Initcvt(basic_filebuf_wchar *this)
 {
     codecvt_wchar *cvt = codecvt_wchar_use_facet(IOS_LOCALE(&this->base));
-    basic_filebuf_wchar__Initcvt_cvt( this, cvt );
+    basic_filebuf_short__Initcvt_cvt( this, cvt );
 }
 
-/* ?close@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAEPAV12@XZ */
-/* ?close@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAAPEAV12@XZ */
 /* ?close@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@XZ */
 /* ?close@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@XZ */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_close, 4)
-basic_filebuf_wchar* __thiscall basic_filebuf_wchar_close(basic_filebuf_wchar *this)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_close, 4)
+basic_filebuf_wchar* __thiscall basic_filebuf_short_close(basic_filebuf_wchar *this)
 {
     basic_filebuf_wchar *ret = this;
 
@@ -2881,25 +2836,10 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_close(basic_filebuf_wchar *t
     if(!this->file || fclose(this->file))
         return NULL;
 
-    basic_filebuf_wchar__Init(this, NULL, INITFL_close);
+    basic_filebuf_short__Init(this, NULL, INITFL_close);
     return ret;
 }
 
-/* ??0?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAE@PAU_iobuf@@@Z */
-/* ??0?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAA@PEAU_iobuf@@@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_ctor_file, 8)
-basic_filebuf_wchar* __thiscall basic_filebuf_wchar_ctor_file(basic_filebuf_wchar *this, FILE *file)
-{
-    TRACE("(%p %p)\n", this, file);
-
-    basic_streambuf_wchar_ctor(&this->base);
-    this->base.vtable = &basic_filebuf_wchar_vtable;
-
-    locale_ctor(&this->loc);
-    basic_filebuf_wchar__Init(this, file, INITFL_new);
-    return this;
-}
-
 /* ??0?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAE@PAU_iobuf@@@Z */
 /* ??0?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAA@PEAU_iobuf@@@Z */
 DEFINE_THISCALL_WRAPPER(basic_filebuf_short_ctor_file, 8)
@@ -2915,14 +2855,6 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_ctor_file(basic_filebuf_wcha
     return this;
 }
 
-/* ??_F?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAEXXZ */
-/* ??_F?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAAXXZ */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_ctor, 4)
-basic_filebuf_wchar* __thiscall basic_filebuf_wchar_ctor(basic_filebuf_wchar *this)
-{
-    return basic_filebuf_wchar_ctor_file(this, NULL);
-}
-
 /* ??_F?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEXXZ */
 /* ??_F?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAXXZ */
 DEFINE_THISCALL_WRAPPER(basic_filebuf_short_ctor, 4)
@@ -2931,18 +2863,6 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_ctor(basic_filebuf_wchar *th
     return basic_filebuf_short_ctor_file(this, NULL);
 }
 
-/* ??0?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAE@W4_Uninitialized@1@@Z */
-/* ??0?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAA@W4_Uninitialized@1@@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_ctor_uninitialized, 8)
-basic_filebuf_wchar* __thiscall basic_filebuf_wchar_ctor_uninitialized(basic_filebuf_wchar *this, int uninitialized)
-{
-    TRACE("(%p %d)\n", this, uninitialized);
-
-    basic_streambuf_wchar_ctor(&this->base);
-    this->base.vtable = &basic_filebuf_wchar_vtable;
-    return this;
-}
-
 /* ??0?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAE@W4_Uninitialized@1@@Z */
 /* ??0?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAA@W4_Uninitialized@1@@Z */
 DEFINE_THISCALL_WRAPPER(basic_filebuf_short_ctor_uninitialized, 8)
@@ -2956,17 +2876,15 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_ctor_uninitialized(basic_fil
     return this;
 }
 
-/* ??1?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@UAE@XZ */
-/* ??1?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@UEAA@XZ */
 /* ??1?$basic_filebuf@GU?$char_traits@G@std@@@std@@UAE@XZ */
 /* ??1?$basic_filebuf@GU?$char_traits@G@std@@@std@@UEAA@XZ */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_dtor, 4)
-void __thiscall basic_filebuf_wchar_dtor(basic_filebuf_wchar *this)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_dtor, 4)
+void __thiscall basic_filebuf_short_dtor(basic_filebuf_wchar *this)
 {
     TRACE("(%p)\n", this);
 
     if(this->close)
-        basic_filebuf_wchar_close(this);
+        basic_filebuf_short_close(this);
     if(this->str) {
         MSVCP_basic_string_char_dtor(this->str);
         operator_delete(this->str);
@@ -2975,8 +2893,8 @@ void __thiscall basic_filebuf_wchar_dtor(basic_filebuf_wchar *this)
     basic_streambuf_wchar_dtor(&this->base);
 }
 
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_vector_dtor, 8)
-basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wchar *this, unsigned int flags)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_vector_dtor, 8)
+basic_filebuf_wchar* __thiscall basic_filebuf_short_vector_dtor(basic_filebuf_wchar *this, unsigned int flags)
 {
     TRACE("(%p %x)\n", this, flags);
     if(flags & 2) {
@@ -2984,10 +2902,10 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wc
         INT_PTR i, *ptr = (INT_PTR *)this-1;
 
         for(i=*ptr-1; i>=0; i--)
-            basic_filebuf_wchar_dtor(this+i);
+            basic_filebuf_short_dtor(this+i);
         operator_delete(ptr);
     } else {
-        basic_filebuf_wchar_dtor(this);
+        basic_filebuf_short_dtor(this);
         if(flags & 1)
             operator_delete(this);
     }
@@ -2995,39 +2913,15 @@ basic_filebuf_wchar* __thiscall basic_filebuf_wchar_vector_dtor(basic_filebuf_wc
     return this;
 }
 
-/* ?is_open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QBE_NXZ */
-/* ?is_open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEBA_NXZ */
 /* ?is_open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QBE_NXZ */
 /* ?is_open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEBA_NXZ */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_is_open, 4)
-bool __thiscall basic_filebuf_wchar_is_open(const basic_filebuf_wchar *this)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_is_open, 4)
+bool __thiscall basic_filebuf_short_is_open(const basic_filebuf_wchar *this)
 {
     TRACE("(%p)\n", this);
     return this->file != NULL;
 }
 
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAEPAV12@PB_WHH@Z */
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAAPEAV12@PEB_WHH@Z */
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAEPAV12@PBGHH@Z */
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAAPEAV12@PEBGHH@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_open_wchar, 16)
-basic_filebuf_wchar* __thiscall basic_filebuf_wchar_open_wchar(basic_filebuf_wchar *this, const wchar_t *name, int mode, int prot)
-{
-    FILE *f = NULL;
-
-    TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot);
-
-    if(basic_filebuf_wchar_is_open(this))
-        return NULL;
-
-    if(!(f = _Fiopen_wchar(name, mode, prot)))
-        return NULL;
-
-    basic_filebuf_wchar__Init(this, f, INITFL_open);
-    basic_filebuf_wchar__Initcvt_cvt(this, codecvt_wchar_use_facet(IOS_LOCALE(&this->base)));
-    return this;
-}
-
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PB_WHH@Z */
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEB_WHH@Z */
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBGHH@Z */
@@ -3039,27 +2933,17 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_open_wchar(basic_filebuf_wch
 
     TRACE("(%p %s %d %d)\n", this, debugstr_w(name), mode, prot);
 
-    if(basic_filebuf_wchar_is_open(this))
+    if(basic_filebuf_short_is_open(this))
         return NULL;
 
     if(!(f = _Fiopen_wchar(name, mode, prot)))
         return NULL;
 
     basic_filebuf_short__Init(this, f, INITFL_open);
-    basic_filebuf_wchar__Initcvt_cvt(this, codecvt_short_use_facet(IOS_LOCALE(&this->base)));
+    basic_filebuf_short__Initcvt_cvt(this, codecvt_short_use_facet(IOS_LOCALE(&this->base)));
     return this;
 }
 
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAEPAV12@PB_WI@Z */
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAAPEAV12@PEB_WI@Z */
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAEPAV12@PBGI@Z */
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAAPEAV12@PEBGI@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_open_wchar_mode, 12)
-basic_filebuf_wchar* __thiscall basic_filebuf_wchar_open_wchar_mode(basic_filebuf_wchar *this, const wchar_t *name, unsigned int mode)
-{
-    return basic_filebuf_wchar_open_wchar(this, name, mode, SH_DENYNO);
-}
-
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PB_WI@Z */
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEB_WI@Z */
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBGI@Z */
@@ -3070,20 +2954,6 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_open_wchar_mode(basic_filebu
     return basic_filebuf_short_open_wchar(this, name, mode, SH_DENYNO);
 }
 
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAEPAV12@PBDHH@Z */
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAAPEAV12@PEBDHH@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_open, 16)
-basic_filebuf_wchar* __thiscall basic_filebuf_wchar_open(basic_filebuf_wchar *this, const char *name, int mode, int prot)
-{
-    wchar_t nameW[FILENAME_MAX];
-
-    TRACE("(%p %s %d %d)\n", this, name, mode, prot);
-
-    if(mbstowcs_s(NULL, nameW, FILENAME_MAX, name, FILENAME_MAX-1) != 0)
-        return NULL;
-    return basic_filebuf_wchar_open_wchar(this, nameW, mode, prot);
-}
-
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDHH@Z */
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDHH@Z */
 DEFINE_THISCALL_WRAPPER(basic_filebuf_short_open, 16)
@@ -3100,37 +2970,25 @@ basic_filebuf_wchar* __thiscall basic_filebuf_short_open(basic_filebuf_wchar *th
 
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDF@Z */
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDF@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_open_mode_old, 12)
-basic_filebuf_wchar* __thiscall basic_filebuf_wchar_open_mode_old(basic_filebuf_wchar *this, const char *name, short mode)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_open_mode_old, 12)
+basic_filebuf_wchar* __thiscall basic_filebuf_short_open_mode_old(basic_filebuf_wchar *this, const char *name, short mode)
 {
     TRACE("(%p %p %d)\n", this, name, mode);
-    return basic_filebuf_wchar_open(this, name, mode, SH_DENYNO);
+    return basic_filebuf_short_open(this, name, mode, SH_DENYNO);
 }
 
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDH@Z */
 /* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDH@Z */
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QAEPAV12@PBDI@Z */
-/* ?open@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@QEAAPEAV12@PEBDI@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_open_mode, 12)
-basic_filebuf_wchar* __thiscall basic_filebuf_wchar_open_mode(basic_filebuf_wchar *this, const char *name, unsigned int mode)
-{
-    return basic_filebuf_wchar_open(this, name, mode, SH_DENYNO);
-}
-
-/* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDI@Z */
-/* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDI@Z */
 DEFINE_THISCALL_WRAPPER(basic_filebuf_short_open_mode, 12)
 basic_filebuf_wchar* __thiscall basic_filebuf_short_open_mode(basic_filebuf_wchar *this, const char *name, unsigned int mode)
 {
     return basic_filebuf_short_open(this, name, mode, SH_DENYNO);
 }
 
-/* ?overflow@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MAEGG@Z */
-/* ?overflow@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MEAAGG@Z */
 /* ?overflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGG@Z */
 /* ?overflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGG@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_overflow, 8)
-unsigned short __thiscall basic_filebuf_wchar_overflow(basic_filebuf_wchar *this, unsigned short c)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_overflow, 8)
+unsigned short __thiscall basic_filebuf_short_overflow(basic_filebuf_wchar *this, unsigned short c)
 {
     char *ptr, *to_next;
     wchar_t ch = c;
@@ -3140,7 +2998,7 @@ unsigned short __thiscall basic_filebuf_wchar_overflow(basic_filebuf_wchar *this
 
     TRACE("(%p %d)\n", this, c);
 
-    if(!basic_filebuf_wchar_is_open(this))
+    if(!basic_filebuf_short_is_open(this))
         return WEOF;
     if(c == WEOF)
         return !c;
@@ -3171,16 +3029,14 @@ unsigned short __thiscall basic_filebuf_wchar_overflow(basic_filebuf_wchar *this
     }
 }
 
-/* ?pbackfail@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MAEGG@Z */
-/* ?pbackfail@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MEAAGG@Z */
 /* ?pbackfail@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGG@Z */
 /* ?pbackfail@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGG@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_pbackfail, 8)
-unsigned short __thiscall basic_filebuf_wchar_pbackfail(basic_filebuf_wchar *this, unsigned short c)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_pbackfail, 8)
+unsigned short __thiscall basic_filebuf_short_pbackfail(basic_filebuf_wchar *this, unsigned short c)
 {
     TRACE("(%p %d)\n", this, c);
 
-    if(!basic_filebuf_wchar_is_open(this))
+    if(!basic_filebuf_short_is_open(this))
         return WEOF;
 
     if(basic_streambuf_wchar_gptr(&this->base)>basic_streambuf_wchar_eback(&this->base)
@@ -3211,12 +3067,10 @@ unsigned short __thiscall basic_filebuf_wchar_pbackfail(basic_filebuf_wchar *thi
     return WEOF;
 }
 
-/* ?uflow@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ */
-/* ?uflow@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ */
 /* ?uflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ */
 /* ?uflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGXZ */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_uflow, 4)
-unsigned short __thiscall basic_filebuf_wchar_uflow(basic_filebuf_wchar *this)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_uflow, 4)
+unsigned short __thiscall basic_filebuf_short_uflow(basic_filebuf_wchar *this)
 {
     wchar_t ch, *to_next;
     const char *buf_next;
@@ -3224,7 +3078,7 @@ unsigned short __thiscall basic_filebuf_wchar_uflow(basic_filebuf_wchar *this)
 
     TRACE("(%p)\n", this);
 
-    if(!basic_filebuf_wchar_is_open(this))
+    if(!basic_filebuf_short_is_open(this))
         return WEOF;
 
     if(basic_streambuf_wchar_gptr(&this->base) < basic_streambuf_wchar_egptr(&this->base))
@@ -3257,12 +3111,10 @@ unsigned short __thiscall basic_filebuf_wchar_uflow(basic_filebuf_wchar *this)
     }
 }
 
-/* ?underflow@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MAEGXZ */
-/* ?underflow@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MEAAGXZ */
 /* ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ */
 /* ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGXZ */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_underflow, 4)
-unsigned short __thiscall basic_filebuf_wchar_underflow(basic_filebuf_wchar *this)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_underflow, 4)
+unsigned short __thiscall basic_filebuf_short_underflow(basic_filebuf_wchar *this)
 {
     unsigned short ret;
 
@@ -3279,19 +3131,17 @@ unsigned short __thiscall basic_filebuf_wchar_underflow(basic_filebuf_wchar *thi
 
 /* ?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z */
 /* ?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z */
-/* ?seekoff@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MAE?AV?$fpos@H@2@JHH@Z */
-/* ?seekoff@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MEAA?AV?$fpos@H@2@_JHH@Z */
 /* ?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@JHH@Z */
 /* ?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAA?AV?$fpos@H@2@_JHH@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_seekoff, 20)
-fpos_int* __thiscall basic_filebuf_wchar_seekoff(basic_filebuf_wchar *this,
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_seekoff, 20)
+fpos_int* __thiscall basic_filebuf_short_seekoff(basic_filebuf_wchar *this,
         fpos_int *ret, streamoff off, int way, int mode)
 {
     fpos_t pos;
 
     TRACE("(%p %p %Id %d %d)\n", this, ret, off, way, mode);
 
-    if(!basic_filebuf_wchar_is_open(this) || fseek(this->file, off, way)) {
+    if(!basic_filebuf_short_is_open(this) || fseek(this->file, off, way)) {
         ret->off = -1;
         ret->pos = 0;
         ret->state = 0;
@@ -3305,19 +3155,17 @@ fpos_int* __thiscall basic_filebuf_wchar_seekoff(basic_filebuf_wchar *this,
     return ret;
 }
 
-/* ?seekpos@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MAE?AV?$fpos@H@2@V32@H@Z */
-/* ?seekpos@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MEAA?AV?$fpos@H@2@V32@H@Z */
 /* ?seekpos@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@V32@H@Z */
 /* ?seekpos@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAA?AV?$fpos@H@2@V32@H@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_seekpos, 36)
-fpos_int* __thiscall basic_filebuf_wchar_seekpos(basic_filebuf_wchar *this,
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_seekpos, 36)
+fpos_int* __thiscall basic_filebuf_short_seekpos(basic_filebuf_wchar *this,
         fpos_int *ret, fpos_int pos, int mode)
 {
     fpos_t fpos;
 
     TRACE("(%p %p %s %d)\n", this, ret, debugstr_fpos_int(&pos), mode);
 
-    if(!basic_filebuf_wchar_is_open(this) || fseek(this->file, (LONG)pos.pos, SEEK_SET)
+    if(!basic_filebuf_short_is_open(this) || fseek(this->file, (LONG)pos.pos, SEEK_SET)
             || (pos.off && fseek(this->file, pos.off, SEEK_CUR))) {
         ret->off = -1;
         ret->pos = 0;
@@ -3332,23 +3180,6 @@ fpos_int* __thiscall basic_filebuf_wchar_seekpos(basic_filebuf_wchar *this,
     return ret;
 }
 
-/* ?setbuf@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MAEPAV?$basic_streambuf@_WU?$char_traits@_W@std@@@2@PA_WH@Z */
-/* ?setbuf@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MEAAPEAV?$basic_streambuf@_WU?$char_traits@_W@std@@@2@PEA_W_J@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_setbuf, 12)
-basic_streambuf_wchar* __thiscall basic_filebuf_wchar_setbuf(basic_filebuf_wchar *this, wchar_t *buf, streamsize count)
-{
-    TRACE("(%p %p %Id)\n", this, buf, count);
-
-    if(!basic_filebuf_wchar_is_open(this))
-        return NULL;
-
-    if(setvbuf(this->file, (char*)buf, (buf==NULL && count==0) ? _IONBF : _IOFBF, count*sizeof(wchar_t)))
-        return NULL;
-
-    basic_filebuf_wchar__Init(this, this->file, INITFL_open);
-    return &this->base;
-}
-
 /* ?setbuf@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEPAV?$basic_streambuf@GU?$char_traits@G@std@@@2@PAGH@Z */
 /* ?setbuf@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAPEAV?$basic_streambuf@GU?$char_traits@G@std@@@2@PEAG_J@Z */
 DEFINE_THISCALL_WRAPPER(basic_filebuf_short_setbuf, 12)
@@ -3356,7 +3187,7 @@ basic_streambuf_wchar* __thiscall basic_filebuf_short_setbuf(basic_filebuf_wchar
 {
     TRACE("(%p %p %Id)\n", this, buf, count);
 
-    if(!basic_filebuf_wchar_is_open(this))
+    if(!basic_filebuf_short_is_open(this))
         return NULL;
 
     if(setvbuf(this->file, (char*)buf, (buf==NULL && count==0) ? _IONBF : _IOFBF, count*sizeof(wchar_t)))
@@ -3366,16 +3197,14 @@ basic_streambuf_wchar* __thiscall basic_filebuf_short_setbuf(basic_filebuf_wchar
     return &this->base;
 }
 
-/* ?sync@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MAEHXZ */
-/* ?sync@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MEAAHXZ */
 /* ?sync@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEHXZ */
 /* ?sync@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAHXZ */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_sync, 4)
-int __thiscall basic_filebuf_wchar_sync(basic_filebuf_wchar *this)
+DEFINE_THISCALL_WRAPPER(basic_filebuf_short_sync, 4)
+int __thiscall basic_filebuf_short_sync(basic_filebuf_wchar *this)
 {
     TRACE("(%p)\n", this);
 
-    if(!basic_filebuf_wchar_is_open(this))
+    if(!basic_filebuf_short_is_open(this))
         return 0;
 
     if(call_basic_streambuf_wchar_overflow(&this->base, WEOF) == WEOF)
@@ -3383,22 +3212,13 @@ int __thiscall basic_filebuf_wchar_sync(basic_filebuf_wchar *this)
     return fflush(this->file);
 }
 
-/* ?imbue@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MAEXABVlocale@2@@Z */
-/* ?imbue@?$basic_filebuf@_WU?$char_traits@_W@std@@@std@@MEAAXAEBVlocale@2@@Z */
-DEFINE_THISCALL_WRAPPER(basic_filebuf_wchar_imbue, 8)
-void __thiscall basic_filebuf_wchar_imbue(basic_filebuf_wchar *this, const locale *loc)
-{
-    TRACE("(%p %p)\n", this, loc);
-    basic_filebuf_wchar__Initcvt_cvt(this, codecvt_wchar_use_facet(loc));
-}
-
 /* ?imbue@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEXABVlocale@2@@Z */
 /* ?imbue@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAXAEBVlocale@2@@Z */
 DEFINE_THISCALL_WRAPPER(basic_filebuf_short_imbue, 8)
 void __thiscall basic_filebuf_short_imbue(basic_filebuf_wchar *this, const locale *loc)
 {
     TRACE("(%p %p)\n", this, loc);
-    basic_filebuf_wchar__Initcvt_cvt(this, codecvt_short_use_facet(loc));
+    basic_filebuf_short__Initcvt_cvt(this, codecvt_short_use_facet(loc));
 }
 
 /* ?_Getstate@?$basic_stringbuf@DU?$char_traits@D@std@@V?$allocator@D@2@@std@@AAEHH@Z */
@@ -9834,7 +9654,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor(basic_ofstream_wchar
         basic_ios = basic_ostream_short_get_basic_ios(&this->base);
     }
 
-    basic_filebuf_wchar_ctor(&this->filebuf);
+    basic_filebuf_short_ctor(&this->filebuf);
     basic_ostream_short_ctor(&this->base, &this->filebuf.base, FALSE, TRUE, FALSE);
     basic_ios->base.vtable = &basic_ofstream_short_vtable;
     return this;
@@ -9858,7 +9678,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_file(
         basic_ios = basic_ostream_short_get_basic_ios(&this->base);
     }
 
-    basic_filebuf_wchar_ctor_file(&this->filebuf, file);
+    basic_filebuf_short_ctor_file(&this->filebuf, file);
     basic_ostream_short_ctor(&this->base, &this->filebuf.base, FALSE, TRUE, FALSE);
     basic_ios->base.vtable = &basic_ofstream_short_vtable;
     return this;
@@ -9884,7 +9704,7 @@ basic_ofstream_wchar* __thiscall basic_ofstream_short_ctor_name(basic_ofstream_w
 
     basic_ofstream_short_ctor(this, virt_init);
 
-    if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_out, _SH_DENYNO)) {
+    if(!basic_filebuf_short_open(&this->filebuf, name, mode|OPENMODE_out, _SH_DENYNO)) {
         basic_ios_wchar *basic_ios = basic_ostream_short_get_basic_ios(&this->base);
         basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit);
     }
@@ -9901,7 +9721,7 @@ void __thiscall basic_ofstream_short_dtor(basic_ios_wchar *base)
     TRACE("(%p)\n", this);
 
     basic_ostream_short_dtor(basic_ostream_short_to_basic_ios(&this->base));
-    basic_filebuf_wchar_dtor(&this->filebuf);
+    basic_filebuf_short_dtor(&this->filebuf);
 }
 
 /* ??_D?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAEXXZ */
@@ -9945,7 +9765,7 @@ void __thiscall basic_ofstream_short_close(basic_ofstream_wchar *this)
 {
     TRACE("(%p)\n", this);
 
-    if(!basic_filebuf_wchar_close(&this->filebuf)) {
+    if(!basic_filebuf_short_close(&this->filebuf)) {
         basic_ios_wchar *basic_ios = basic_ostream_short_get_basic_ios(&this->base);
         basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit);
     }
@@ -9957,7 +9777,7 @@ DEFINE_THISCALL_WRAPPER(basic_ofstream_short_is_open, 4)
 bool __thiscall basic_ofstream_short_is_open(const basic_ofstream_wchar *this)
 {
     TRACE("(%p)\n", this);
-    return basic_filebuf_wchar_is_open(&this->filebuf);
+    return basic_filebuf_short_is_open(&this->filebuf);
 }
 
 /* ?open@?$basic_ofstream@GU?$char_traits@G@std@@@std@@QAEXPBDH@Z */
@@ -9968,7 +9788,7 @@ void __thiscall basic_ofstream_short_open(basic_ofstream_wchar *this,
 {
     TRACE("(%p %s %d)\n", this, name, mode);
 
-    if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_out, _SH_DENYNO)) {
+    if(!basic_filebuf_short_open(&this->filebuf, name, mode|OPENMODE_out, _SH_DENYNO)) {
         basic_ios_wchar *basic_ios = basic_ostream_short_get_basic_ios(&this->base);
         basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit);
     }
@@ -10204,7 +10024,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor(basic_ifstream_wchar
         basic_ios = basic_istream_short_get_basic_ios(&this->base);
     }
 
-    basic_filebuf_wchar_ctor(&this->filebuf);
+    basic_filebuf_short_ctor(&this->filebuf);
     basic_istream_short_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
     basic_ios->base.vtable = &basic_ifstream_short_vtable;
     return this;
@@ -10228,7 +10048,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_file(
         basic_ios = basic_istream_short_get_basic_ios(&this->base);
     }
 
-    basic_filebuf_wchar_ctor_file(&this->filebuf, file);
+    basic_filebuf_short_ctor_file(&this->filebuf, file);
     basic_istream_short_ctor(&this->base, &this->filebuf.base, FALSE, FALSE);
     basic_ios->base.vtable = &basic_ifstream_short_vtable;
     return this;
@@ -10254,7 +10074,7 @@ basic_ifstream_wchar* __thiscall basic_ifstream_short_ctor_name(basic_ifstream_w
 
     basic_ifstream_short_ctor(this, virt_init);
 
-    if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) {
+    if(!basic_filebuf_short_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) {
         basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base);
         basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit);
     }
@@ -10271,7 +10091,7 @@ void __thiscall basic_ifstream_short_dtor(basic_ios_wchar *base)
     TRACE("(%p)\n", this);
 
     basic_istream_short_dtor(basic_istream_short_to_basic_ios(&this->base));
-    basic_filebuf_wchar_dtor(&this->filebuf);
+    basic_filebuf_short_dtor(&this->filebuf);
 }
 
 /* ??_D?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAEXXZ */
@@ -10315,7 +10135,7 @@ void __thiscall basic_ifstream_short_close(basic_ifstream_wchar *this)
 {
     TRACE("(%p)\n", this);
 
-    if(!basic_filebuf_wchar_close(&this->filebuf)) {
+    if(!basic_filebuf_short_close(&this->filebuf)) {
         basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base);
         basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit);
     }
@@ -10327,7 +10147,7 @@ DEFINE_THISCALL_WRAPPER(basic_ifstream_short_is_open, 4)
 bool __thiscall basic_ifstream_short_is_open(const basic_ifstream_wchar *this)
 {
     TRACE("(%p)\n", this);
-    return basic_filebuf_wchar_is_open(&this->filebuf);
+    return basic_filebuf_short_is_open(&this->filebuf);
 }
 
 /* ?open@?$basic_ifstream@GU?$char_traits@G@std@@@std@@QAEXPBDH@Z */
@@ -10338,7 +10158,7 @@ void __thiscall basic_ifstream_short_open(basic_ifstream_wchar *this,
 {
     TRACE("(%p %s %d)\n", this, name, mode);
 
-    if(!basic_filebuf_wchar_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) {
+    if(!basic_filebuf_short_open(&this->filebuf, name, mode|OPENMODE_in, _SH_DENYNO)) {
         basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base);
         basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit);
     }
@@ -10577,7 +10397,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor(basic_fstream_wchar *th
         basic_ios = basic_istream_short_get_basic_ios(&this->base.base1);
     }
 
-    basic_filebuf_wchar_ctor(&this->filebuf);
+    basic_filebuf_short_ctor(&this->filebuf);
     basic_iostream_short_ctor(&this->base, &this->filebuf.base, FALSE);
     basic_ios->base.vtable = &basic_fstream_short_vtable;
     return this;
@@ -10602,7 +10422,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_file(basic_fstream_wcha
         basic_ios = basic_istream_short_get_basic_ios(&this->base.base1);
     }
 
-    basic_filebuf_wchar_ctor_file(&this->filebuf, file);
+    basic_filebuf_short_ctor_file(&this->filebuf, file);
     basic_iostream_short_ctor(&this->base, &this->filebuf.base, FALSE);
     basic_ios->base.vtable = &basic_fstream_short_vtable;
     return this;
@@ -10628,7 +10448,7 @@ basic_fstream_wchar* __thiscall basic_fstream_short_ctor_name(basic_fstream_wcha
 
     basic_fstream_short_ctor(this, virt_init);
 
-    if(!basic_filebuf_wchar_open(&this->filebuf, name, mode, _SH_DENYNO)) {
+    if(!basic_filebuf_short_open(&this->filebuf, name, mode, _SH_DENYNO)) {
         basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base.base1);
         basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit);
     }
@@ -10645,7 +10465,7 @@ void __thiscall basic_fstream_short_dtor(basic_ios_wchar *base)
     TRACE("(%p)\n", this);
 
     basic_iostream_short_dtor(basic_iostream_short_to_basic_ios(&this->base));
-    basic_filebuf_wchar_dtor(&this->filebuf);
+    basic_filebuf_short_dtor(&this->filebuf);
 }
 
 /* ??_D?$basic_fstream@GU?$char_traits@G@std@@@std@@QAEXXZ */
@@ -10689,7 +10509,7 @@ void __thiscall basic_fstream_short_close(basic_fstream_wchar *this)
 {
     TRACE("(%p)\n", this);
 
-    if(!basic_filebuf_wchar_close(&this->filebuf)) {
+    if(!basic_filebuf_short_close(&this->filebuf)) {
         basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base.base1);
         basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit);
     }
@@ -10701,18 +10521,18 @@ DEFINE_THISCALL_WRAPPER(basic_fstream_short_is_open, 4)
 bool __thiscall basic_fstream_short_is_open(const basic_fstream_wchar *this)
 {
     TRACE("(%p)\n", this);
-    return basic_filebuf_wchar_is_open(&this->filebuf);
+    return basic_filebuf_short_is_open(&this->filebuf);
 }
 
-/* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDH@Z */
-/* ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDH@Z */
+/* ?open@?$basic_fstream@GU?$char_traits@G@std@@@std@@QAEXPBDH@Z */
+/* ?open@?$basic_fstream@GU?$char_traits@G@std@@@std@@QEAAXPEBDH@Z */
 DEFINE_THISCALL_WRAPPER(basic_fstream_short_open, 12)
 void __thiscall basic_fstream_short_open(basic_fstream_wchar *this,
         const char *name, int mode)
 {
     TRACE("(%p %s %d)\n", this, name, mode);
 
-    if(!basic_filebuf_wchar_open(&this->filebuf, name, mode, _SH_DENYNO)) {
+    if(!basic_filebuf_short_open(&this->filebuf, name, mode, _SH_DENYNO)) {
         basic_ios_wchar *basic_ios = basic_istream_short_get_basic_ios(&this->base.base1);
         basic_ios_wchar_setstate(basic_ios, IOSTATE_failbit);
     }
@@ -12520,7 +12340,6 @@ void init_io(void *base)
     init_basic_streambuf_wchar_rtti(base);
     init_basic_streambuf_short_rtti(base);
     init_basic_filebuf_char_rtti(base);
-    init_basic_filebuf_wchar_rtti(base);
     init_basic_filebuf_short_rtti(base);
     init_basic_stringbuf_char_rtti(base);
     init_basic_stringbuf_short_rtti(base);
@@ -12578,23 +12397,23 @@ void free_io(void)
     basic_filebuf_char_dtor(&filebuf_char_stdin);
 
     basic_istream_short_vbase_dtor(&ucin.obj);
-    basic_filebuf_wchar_dtor(&filebuf_short_stdin);
+    basic_filebuf_short_dtor(&filebuf_short_stdin);
 
     basic_ostream_char_vbase_dtor(&cout.obj);
     basic_filebuf_char_dtor(&filebuf_char_stdout);
 
     basic_ostream_short_vbase_dtor(&ucout.obj);
-    basic_filebuf_wchar_dtor(&filebuf_short_stdout);
+    basic_filebuf_short_dtor(&filebuf_short_stdout);
 
     basic_ostream_char_vbase_dtor(&cerr.obj);
     basic_filebuf_char_dtor(&filebuf_char_stderr);
 
     basic_ostream_short_vbase_dtor(&ucerr.obj);
-    basic_filebuf_wchar_dtor(&filebuf_short_stderr);
+    basic_filebuf_short_dtor(&filebuf_short_stderr);
 
     basic_ostream_char_vbase_dtor(&MSVCP_clog.obj);
     basic_filebuf_char_dtor(&filebuf_char_log);
 
     basic_ostream_short_vbase_dtor(&uclog.obj);
-    basic_filebuf_wchar_dtor(&filebuf_short_log);
+    basic_filebuf_short_dtor(&filebuf_short_log);
 }
diff --git a/dlls/msvcp60/msvcp60.spec b/dlls/msvcp60/msvcp60.spec
index e8d8c7c1f4f..117e807199e 100644
--- a/dlls/msvcp60/msvcp60.spec
+++ b/dlls/msvcp60/msvcp60.spec
@@ -929,8 +929,8 @@
 @ stub -arch=win64 ??1?$_Mpunct@G@std@@UEAA@XZ
 @ thiscall -arch=win32 ??1?$basic_filebuf@DU?$char_traits@D@std@@@std@@UAE@XZ(ptr) basic_filebuf_char_dtor
 @ cdecl -arch=win64 ??1?$basic_filebuf@DU?$char_traits@D@std@@@std@@UEAA@XZ(ptr) basic_filebuf_char_dtor
-@ thiscall -arch=win32 ??1?$basic_filebuf@GU?$char_traits@G@std@@@std@@UAE@XZ(ptr) basic_filebuf_wchar_dtor
-@ cdecl -arch=win64 ??1?$basic_filebuf@GU?$char_traits@G@std@@@std@@UEAA@XZ(ptr) basic_filebuf_wchar_dtor
+@ thiscall -arch=win32 ??1?$basic_filebuf@GU?$char_traits@G@std@@@std@@UAE@XZ(ptr) basic_filebuf_short_dtor
+@ cdecl -arch=win64 ??1?$basic_filebuf@GU?$char_traits@G@std@@@std@@UEAA@XZ(ptr) basic_filebuf_short_dtor
 @ thiscall -arch=win32 ??1?$basic_fstream@DU?$char_traits@D@std@@@std@@UAE@XZ(ptr) basic_fstream_char_dtor
 @ cdecl -arch=win64 ??1?$basic_fstream@DU?$char_traits@D@std@@@std@@UEAA@XZ(ptr) basic_fstream_char_dtor
 @ thiscall -arch=win32 ??1?$basic_fstream@GU?$char_traits@G@std@@@std@@UAE@XZ(ptr) basic_fstream_short_dtor
@@ -2285,8 +2285,8 @@
 @ extern ?_Init_cnt@_Winit@std@@0HA _Winit__Init_cnt
 @ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IAEXXZ(ptr) basic_filebuf_char__Initcvt
 @ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@DU?$char_traits@D@std@@@std@@IEAAXXZ(ptr) basic_filebuf_char__Initcvt
-@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ(ptr) basic_filebuf_wchar__Initcvt
-@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXXZ(ptr) basic_filebuf_wchar__Initcvt
+@ thiscall -arch=win32 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IAEXXZ(ptr) basic_filebuf_short__Initcvt
+@ cdecl -arch=win64 ?_Initcvt@?$basic_filebuf@GU?$char_traits@G@std@@@std@@IEAAXXZ(ptr) basic_filebuf_short__Initcvt
 @ stub -arch=win32 ?_Iput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AAVios_base@2@DPADI@Z
 @ stub -arch=win64 ?_Iput@?$num_put@DV?$ostreambuf_iterator@DU?$char_traits@D@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@DU?$char_traits@D@std@@@2@V32@AEAVios_base@2@DPEAD_K@Z
 @ stub -arch=win32 ?_Iput@?$num_put@GV?$ostreambuf_iterator@GU?$char_traits@G@std@@@std@@@std@@KA?AV?$ostreambuf_iterator@GU?$char_traits@G@std@@@2@V32@AAVios_base@2@GPADI@Z
@@ -2518,8 +2518,8 @@
 @ extern ?clog@std@@3V?$basic_ostream@DU?$char_traits@D@std@@@1@A MSVCP_clog
 @ thiscall -arch=win32 ?close@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@XZ(ptr) basic_filebuf_char_close
 @ cdecl -arch=win64 ?close@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@XZ(ptr) basic_filebuf_char_close
-@ thiscall -arch=win32 ?close@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@XZ(ptr) basic_filebuf_wchar_close
-@ cdecl -arch=win64 ?close@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@XZ(ptr) basic_filebuf_wchar_close
+@ thiscall -arch=win32 ?close@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@XZ(ptr) basic_filebuf_short_close
+@ cdecl -arch=win64 ?close@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@XZ(ptr) basic_filebuf_short_close
 @ thiscall -arch=win32 ?close@?$basic_fstream@DU?$char_traits@D@std@@@std@@QAEXXZ(ptr) basic_fstream_char_close
 @ cdecl -arch=win64 ?close@?$basic_fstream@DU?$char_traits@D@std@@@std@@QEAAXXZ(ptr) basic_fstream_char_close
 @ thiscall -arch=win32 ?close@?$basic_fstream@GU?$char_traits@G@std@@@std@@QAEXXZ(ptr) basic_fstream_short_close
@@ -3371,8 +3371,8 @@
 @ cdecl -arch=win64 ?is@?$ctype@G@std@@QEBA_NFG@Z(ptr long long) ctype_wchar_is_ch
 @ thiscall -arch=win32 ?is_open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QBE_NXZ(ptr) basic_filebuf_char_is_open
 @ cdecl -arch=win64 ?is_open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEBA_NXZ(ptr) basic_filebuf_char_is_open
-@ thiscall -arch=win32 ?is_open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QBE_NXZ(ptr) basic_filebuf_wchar_is_open
-@ cdecl -arch=win64 ?is_open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEBA_NXZ(ptr) basic_filebuf_wchar_is_open
+@ thiscall -arch=win32 ?is_open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QBE_NXZ(ptr) basic_filebuf_short_is_open
+@ cdecl -arch=win64 ?is_open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEBA_NXZ(ptr) basic_filebuf_short_is_open
 @ thiscall -arch=win32 ?is_open@?$basic_fstream@DU?$char_traits@D@std@@@std@@QBE_NXZ(ptr) basic_fstream_char_is_open
 @ cdecl -arch=win64 ?is_open@?$basic_fstream@DU?$char_traits@D@std@@@std@@QEBA_NXZ(ptr) basic_fstream_char_is_open
 @ thiscall -arch=win32 ?is_open@?$basic_fstream@GU?$char_traits@G@std@@@std@@QBE_NXZ(ptr) basic_fstream_short_is_open
@@ -3502,10 +3502,10 @@
 @ cdecl -arch=win64 ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@PEBDF@Z(ptr str long) basic_filebuf_char_open_mode_old
 @ thiscall -arch=win32 ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QAEPAV12@PBDH@Z(ptr str long) basic_filebuf_char_open_mode
 @ cdecl -arch=win64 ?open@?$basic_filebuf@DU?$char_traits@D@std@@@std@@QEAAPEAV12@PEBDH@Z(ptr str long) basic_filebuf_char_open_mode
-@ thiscall -arch=win32 ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDF@Z(ptr str long) basic_filebuf_wchar_open_mode_old
-@ cdecl -arch=win64 ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDF@Z(ptr str long) basic_filebuf_wchar_open_mode_old
-@ thiscall -arch=win32 ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDH@Z(ptr str long) basic_filebuf_wchar_open_mode
-@ cdecl -arch=win64 ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDH@Z(ptr str long) basic_filebuf_wchar_open_mode
+@ thiscall -arch=win32 ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDF@Z(ptr str long) basic_filebuf_short_open_mode_old
+@ cdecl -arch=win64 ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDF@Z(ptr str long) basic_filebuf_short_open_mode_old
+@ thiscall -arch=win32 ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QAEPAV12@PBDH@Z(ptr str long) basic_filebuf_short_open_mode
+@ cdecl -arch=win64 ?open@?$basic_filebuf@GU?$char_traits@G@std@@@std@@QEAAPEAV12@PEBDH@Z(ptr str long) basic_filebuf_short_open_mode
 @ thiscall -arch=win32 ?open@?$basic_fstream@DU?$char_traits@D@std@@@std@@QAEXPBDF@Z(ptr str long) basic_fstream_char_open_old
 @ cdecl -arch=win64 ?open@?$basic_fstream@DU?$char_traits@D@std@@@std@@QEAAXPEBDF@Z(ptr str long) basic_fstream_char_open_old
 @ thiscall -arch=win32 ?open@?$basic_fstream@DU?$char_traits@D@std@@@std@@QAEXPBDH@Z(ptr str long) basic_fstream_char_open
@@ -3548,8 +3548,8 @@
 @ cdecl -arch=win64 ?out@?$codecvt@GDH@std@@QEBAHAEAHPEBG1AEAPEBGPEAD3AEAPEAD@Z(ptr ptr ptr ptr ptr ptr ptr ptr) codecvt_wchar_out
 @ thiscall -arch=win32 ?overflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHH@Z(ptr long) basic_filebuf_char_overflow
 @ cdecl -arch=win64 ?overflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHH@Z(ptr long) basic_filebuf_char_overflow
-@ thiscall -arch=win32 ?overflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGG@Z(ptr long) basic_filebuf_wchar_overflow
-@ cdecl -arch=win64 ?overflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGG@Z(ptr long) basic_filebuf_wchar_overflow
+@ thiscall -arch=win32 ?overflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGG@Z(ptr long) basic_filebuf_short_overflow
+@ cdecl -arch=win64 ?overflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGG@Z(ptr long) basic_filebuf_short_overflow
 @ thiscall -arch=win32 ?overflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHH@Z(ptr long) basic_streambuf_char_overflow
 @ cdecl -arch=win64 ?overflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHH@Z(ptr long) basic_streambuf_char_overflow
 @ thiscall -arch=win32 ?overflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEGG@Z(ptr long) basic_streambuf_wchar_overflow
@@ -3562,8 +3562,8 @@
 @ cdecl -arch=win64 ?overflow@strstreambuf@std@@MEAAHH@Z(ptr long) strstreambuf_overflow
 @ thiscall -arch=win32 ?pbackfail@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHH@Z(ptr long) basic_filebuf_char_pbackfail
 @ cdecl -arch=win64 ?pbackfail@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHH@Z(ptr long) basic_filebuf_char_pbackfail
-@ thiscall -arch=win32 ?pbackfail@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGG@Z(ptr long) basic_filebuf_wchar_pbackfail
-@ cdecl -arch=win64 ?pbackfail@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGG@Z(ptr long) basic_filebuf_wchar_pbackfail
+@ thiscall -arch=win32 ?pbackfail@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGG@Z(ptr long) basic_filebuf_short_pbackfail
+@ cdecl -arch=win64 ?pbackfail@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGG@Z(ptr long) basic_filebuf_short_pbackfail
 @ thiscall -arch=win32 ?pbackfail@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHH@Z(ptr long) basic_streambuf_char_pbackfail
 @ cdecl -arch=win64 ?pbackfail@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHH@Z(ptr long) basic_streambuf_char_pbackfail
 @ thiscall -arch=win32 ?pbackfail@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEGG@Z(ptr long) basic_streambuf_wchar_pbackfail
@@ -3918,8 +3918,8 @@
 @ cdecl -arch=win64 ?seekg@?$basic_istream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@_JW4seekdir@ios_base@2@@Z(ptr long long) basic_istream_short_seekg
 @ thiscall -arch=win32 ?seekoff@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_filebuf_char_seekoff
 @ cdecl -arch=win64 ?seekoff@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_filebuf_char_seekoff
-@ thiscall -arch=win32 ?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_filebuf_wchar_seekoff
-@ cdecl -arch=win64 ?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_filebuf_wchar_seekoff
+@ thiscall -arch=win32 ?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_filebuf_short_seekoff
+@ cdecl -arch=win64 ?seekoff@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_filebuf_short_seekoff
 @ thiscall -arch=win32 ?seekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_streambuf_char_seekoff
 @ cdecl -arch=win64 ?seekoff@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA?AV?$fpos@H@2@_JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_streambuf_char_seekoff
 @ thiscall -arch=win32 ?seekoff@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@JW4seekdir@ios_base@2@H@Z(ptr ptr long long long) basic_streambuf_wchar_seekoff
@@ -3940,8 +3940,8 @@
 @ stub -arch=win64 ?seekp@?$basic_ostream@GU?$char_traits@G@std@@@std@@QEAAAEAV12@_JW4seekdir@ios_base@2@@Z
 @ thiscall -arch=win32 ?seekpos@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@V32@H@Z(ptr ptr long long int64 long long long) basic_filebuf_char_seekpos
 @ cdecl -arch=win64 ?seekpos@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAA?AV?$fpos@H@2@V32@H@Z(ptr ptr ptr long) basic_filebuf_char_seekpos
-@ thiscall -arch=win32 ?seekpos@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@V32@H@Z(ptr ptr long long int64 long long long) basic_filebuf_wchar_seekpos
-@ cdecl -arch=win64 ?seekpos@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAA?AV?$fpos@H@2@V32@H@Z(ptr ptr ptr long) basic_filebuf_wchar_seekpos
+@ thiscall -arch=win32 ?seekpos@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@V32@H@Z(ptr ptr long long int64 long long long) basic_filebuf_short_seekpos
+@ cdecl -arch=win64 ?seekpos@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAA?AV?$fpos@H@2@V32@H@Z(ptr ptr ptr long) basic_filebuf_short_seekpos
 @ thiscall -arch=win32 ?seekpos@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAE?AV?$fpos@H@2@V32@H@Z(ptr ptr long long int64 long long long) basic_streambuf_char_seekpos
 @ cdecl -arch=win64 ?seekpos@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAA?AV?$fpos@H@2@V32@H@Z(ptr ptr ptr long) basic_streambuf_char_seekpos
 @ thiscall -arch=win32 ?seekpos@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAE?AV?$fpos@H@2@V32@H@Z(ptr ptr long long int64 long long long) basic_streambuf_wchar_seekpos
@@ -4113,8 +4113,8 @@
 @ cdecl -arch=win64 ?swap@?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@std@@QEAAXAEAV12@@Z(ptr ptr) basic_string_wchar_swap
 @ thiscall -arch=win32 ?sync@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_sync
 @ cdecl -arch=win64 ?sync@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_sync
-@ thiscall -arch=win32 ?sync@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEHXZ(ptr) basic_filebuf_wchar_sync
-@ cdecl -arch=win64 ?sync@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAHXZ(ptr) basic_filebuf_wchar_sync
+@ thiscall -arch=win32 ?sync@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEHXZ(ptr) basic_filebuf_short_sync
+@ cdecl -arch=win64 ?sync@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAHXZ(ptr) basic_filebuf_short_sync
 @ thiscall -arch=win32 ?sync@?$basic_istream@DU?$char_traits@D@std@@@std@@QAEHXZ(ptr) basic_istream_char_sync
 @ cdecl -arch=win64 ?sync@?$basic_istream@DU?$char_traits@D@std@@@std@@QEAAHXZ(ptr) basic_istream_char_sync
 @ thiscall -arch=win32 ?sync@?$basic_istream@GU?$char_traits@G@std@@@std@@QAEHXZ(ptr) basic_istream_short_sync
@@ -4186,8 +4186,8 @@
 @ cdecl -arch=win64 ?truename@?$numpunct@G@std@@QEBA?AV?$basic_string@GU?$char_traits@G@std@@V?$allocator@G@2@@2@XZ(ptr ptr) numpunct_wchar_truename
 @ thiscall -arch=win32 ?uflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_uflow
 @ cdecl -arch=win64 ?uflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_uflow
-@ thiscall -arch=win32 ?uflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_uflow
-@ cdecl -arch=win64 ?uflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGXZ(ptr) basic_filebuf_wchar_uflow
+@ thiscall -arch=win32 ?uflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_filebuf_short_uflow
+@ cdecl -arch=win64 ?uflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGXZ(ptr) basic_filebuf_short_uflow
 @ thiscall -arch=win32 ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_uflow
 @ cdecl -arch=win64 ?uflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_uflow
 @ thiscall -arch=win32 ?uflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_uflow
@@ -4195,8 +4195,8 @@
 @ cdecl ?uncaught_exception@std@@YA_NXZ() MSVCP__uncaught_exception
 @ thiscall -arch=win32 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_filebuf_char_underflow
 @ cdecl -arch=win64 ?underflow@?$basic_filebuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_filebuf_char_underflow
-@ thiscall -arch=win32 ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_filebuf_wchar_underflow
-@ cdecl -arch=win64 ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGXZ(ptr) basic_filebuf_wchar_underflow
+@ thiscall -arch=win32 ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_filebuf_short_underflow
+@ cdecl -arch=win64 ?underflow@?$basic_filebuf@GU?$char_traits@G@std@@@std@@MEAAGXZ(ptr) basic_filebuf_short_underflow
 @ thiscall -arch=win32 ?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MAEHXZ(ptr) basic_streambuf_char_underflow
 @ cdecl -arch=win64 ?underflow@?$basic_streambuf@DU?$char_traits@D@std@@@std@@MEAAHXZ(ptr) basic_streambuf_char_underflow
 @ thiscall -arch=win32 ?underflow@?$basic_streambuf@GU?$char_traits@G@std@@@std@@MAEGXZ(ptr) basic_streambuf_wchar_underflow