diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py
index 67f1a8e3..5c754c7b 100755
--- a/vrclient_x64/gen_wrapper.py
+++ b/vrclient_x64/gen_wrapper.py
@@ -931,17 +931,17 @@ def handle_class(klass):
                 continue
             handle_method_c(klass, method, winclassname, cppname, out)
 
-        out(f'extern vtable_ptr {winclassname}_vtable;\n\n')
-        out(u'#ifndef __GNUC__\n')
-        out(u'void __asm_dummy_vtables(void) {\n')
-        out(u'#endif\n')
+        out(f'extern vtable_ptr {winclassname}_vtable;\n')
+        out(u'\n')
+        out(f'DEFINE_RTTI_DATA0({winclassname}, 0, \".?AV{klass.name}@@\")\n')
+        out(u'\n')
+        out(f'__ASM_BLOCK_BEGIN({winclassname}_vtables)\n')
         out(f'    __ASM_VTABLE({winclassname},\n')
         for method in sorted(klass.methods, key=lambda x: (x._index, -x._override)):
             out(f'        VTABLE_ADD_FUNC({winclassname}_{method.name})\n')
         out(u'    );\n')
-        out(u'#ifndef __GNUC__\n')
-        out(u'}\n')
-        out(u'#endif\n\n')
+        out(u'__ASM_BLOCK_END\n')
+        out(u'\n')
         out(f'struct w_steam_iface *create_{winclassname}(void *u_iface)\n')
         out(u'{\n')
         out(u'    struct w_steam_iface *r = HeapAlloc(GetProcessHeap(), HEAP_ZERO_MEMORY, sizeof(*r));\n')
@@ -1380,6 +1380,25 @@ for _, klass in sorted(all_classes.items()):
 generate_flatapi_c()
 
 
+for name in sorted(set(k.name for k in all_classes.values())):
+    with open(f"vrclient_x64/win{name}.c", "a") as file:
+        out = file.write
+        out(f'void init_win{name}_rtti( char *base )\n')
+        out(u'{\n')
+        out(u'#ifdef __x86_64__\n')
+
+for _, klass in sorted(all_classes.items()):
+    with open(f"vrclient_x64/win{klass.name}.c", "a") as file:
+        out = file.write
+        out(f'    init_win{klass.full_name}_rtti( base );\n')
+
+for name in sorted(set(k.name for k in all_classes.values())):
+    with open(f"vrclient_x64/win{name}.c", "a") as file:
+        out = file.write
+        out(u'#endif /* __x86_64__ */\n')
+        out(u'}\n')
+
+
 with open("vrclient_x64/vrclient_generated.h", "w") as file:
     out = file.write
 
@@ -1428,6 +1447,15 @@ with open("vrclient_x64/vrclient_generated.c", "w") as file:
     out(u'        if (!strcmp( iface_version, destructors[i].iface_version ))\n')
     out(u'            return destructors[i].dtor;\n')
     out(u'    return NULL;\n')
+    out(u'}\n\n')
+
+    for name in sorted(set(k.name for k in all_classes.values())):
+        out(f'extern void init_win{name}_rtti( char * );\n')
+    out(u'\n')
+    out(u'void init_rtti( char *base )\n')
+    out(u'{\n')
+    for name in sorted(set(k.name for k in all_classes.values())):
+        out(f'    init_win{name}_rtti( base );\n')
     out(u'}\n')
 
 
diff --git a/vrclient_x64/vrclient_x64/cxx.h b/vrclient_x64/vrclient_x64/cxx.h
index ef46ded9..701ab02f 100644
--- a/vrclient_x64/vrclient_x64/cxx.h
+++ b/vrclient_x64/vrclient_x64/cxx.h
@@ -16,44 +16,7 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, USA
  */
 
-/* Copied from dlls/msvcrt/cxx.h */
-#undef __thiscall
-
-#define __ASM_CFI(str) str
-
-#ifdef __APPLE__
-# define __ASM_NAME(name) "_" name
-# define FORCE_ALIGN
-# define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl _" #name suffix "\n\t\n_" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc\n\t.previous");
-#else
-# define __ASM_NAME(name) name
-# define FORCE_ALIGN __attribute__((__force_align_arg_pointer__))
-# define __ASM_DEFINE_FUNC(name,suffix,code) asm(".text\n\t.align 4\n\t.globl " #name suffix "\n\t.type " #name suffix ",@function\n" #name suffix ":\n\t.cfi_startproc\n\t" code "\n\t.cfi_endproc\n\t.previous");
-#endif
-
-#define __ASM_GLOBAL_FUNC(name,code) __ASM_DEFINE_FUNC(name,"",code)
-#define __ASM_STDCALL(args) ""
-
-#ifdef __i386__  /* thiscall functions are i386-specific */
-
-#define THISCALL(func) __thiscall_ ## func
-#define THISCALL_NAME(func) __ASM_NAME("__thiscall_" #func)
-#define __thiscall __stdcall FORCE_ALIGN
-#define DEFINE_THISCALL_WRAPPER(func,args) \
-    extern void THISCALL(func)(void); \
-    __ASM_GLOBAL_FUNC(__thiscall_ ## func, \
-                      "popl %eax\n\t" \
-                      "pushl %ecx\n\t" \
-                      "pushl %eax\n\t" \
-                      "jmp " __ASM_NAME(#func) __ASM_STDCALL(args) )
-#else /* __i386__ */
-
-#define THISCALL(func) func
-#define THISCALL_NAME(func) __ASM_NAME(#func)
-#define __thiscall __cdecl FORCE_ALIGN
-#define DEFINE_THISCALL_WRAPPER(func,args) /* nothing */
-
-#endif /* __i386__ */
+#include "wine/asm.h"
 
 #ifdef _WIN64
 
@@ -61,8 +24,8 @@
 
 #define __ASM_VTABLE(name,funcs) \
     __asm__(".data\n" \
-            "\t.align 8\n" \
-            "\t.quad 0\n" \
+            "\t.balign 8\n" \
+            "\t.quad " __ASM_NAME(#name "_rtti") "\n" \
             "\t.globl " __ASM_NAME(#name "_vtable") "\n" \
             __ASM_NAME(#name "_vtable") ":\n" \
             funcs "\n\t.text")
@@ -73,8 +36,8 @@
 
 #define __ASM_VTABLE(name,funcs) \
     __asm__(".data\n" \
-            "\t.align 4\n" \
-            "\t.long 0\n" \
+            "\t.balign 4\n" \
+            "\t.long " __ASM_NAME(#name "_rtti") "\n" \
             "\t.globl " __ASM_NAME(#name "_vtable") "\n" \
             __ASM_NAME(#name "_vtable") ":\n" \
             funcs "\n\t.text")
@@ -83,9 +46,9 @@
 
 #ifndef __x86_64__
 
-#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
-    static const type_info name ## _type_info = { \
-        &MSVCP_type_info_vtable, \
+#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
+    static type_info name ## _type_info = { \
+        &type_info_vtable, \
         NULL, \
         mangled_name \
     }; \
@@ -95,7 +58,10 @@ static const rtti_base_descriptor name ## _rtti_base_descriptor = { \
     base_classes_no, \
     { 0, -1, 0}, \
     64 \
-}; \
+};
+
+#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
+    DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
 \
 static const rtti_base_array name ## _rtti_base_array = { \
     { \
@@ -127,22 +93,26 @@ const rtti_object_locator name ## _rtti = { \
     &name ## _hierarchy \
 };
 
-#define DEFINE_CXX_DATA(type, base_no, cl1, cl2, dtor)  \
-\
+#define DEFINE_CXX_TYPE_INFO(type) \
 static const cxx_type_info type ## _cxx_type_info = { \
     0, \
     & type ##_type_info, \
     { 0, -1, 0 }, \
     sizeof(type), \
-    (cxx_copy_ctor)THISCALL(MSVCP_ ## type ##_copy_ctor) \
-}; \
+    (cxx_copy_ctor)THISCALL(type ##_copy_ctor) \
+};
+
+#define DEFINE_CXX_DATA(type, base_no, cl1, cl2, cl3, cl4, dtor)  \
+DEFINE_CXX_TYPE_INFO(type) \
 \
 static const cxx_type_info_table type ## _cxx_type_table = { \
     base_no+1, \
     { \
         & type ## _cxx_type_info, \
         cl1, \
-        cl2 \
+        cl2, \
+        cl3, \
+        cl4  \
     } \
 }; \
 \
@@ -155,9 +125,9 @@ static const cxx_exception_type type ## _cxx_type = { \
 
 #else
 
-#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
-    static const type_info name ## _type_info = { \
-        &MSVCP_type_info_vtable, \
+#define __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
+    static type_info name ## _type_info = { \
+        &type_info_vtable, \
         NULL, \
         mangled_name \
     }; \
@@ -167,7 +137,18 @@ static rtti_base_descriptor name ## _rtti_base_descriptor = { \
     base_classes_no, \
     { 0, -1, 0}, \
     64 \
-}; \
+};
+
+#define DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
+    __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
+    \
+    static void init_ ## name ## _rtti(char *base) \
+    { \
+        name ## _rtti_base_descriptor.type_descriptor = (char*)&name ## _type_info - base; \
+    }
+
+#define DEFINE_RTTI_DATA(name, off, base_classes_no, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
+    __DEFINE_RTTI_BASE(name, base_classes_no, mangled_name) \
 \
 static rtti_base_array name ## _rtti_base_array = { \
     { \
@@ -219,8 +200,7 @@ static void init_ ## name ## _rtti(char *base) \
     name ## _rtti.object_locator = (char*)&name ## _rtti - base; \
 }
 
-#define DEFINE_CXX_DATA(type, base_no, cl1, cl2, dtor)  \
-\
+#define DEFINE_CXX_TYPE_INFO(type) \
 static cxx_type_info type ## _cxx_type_info = { \
     0, \
     0xdeadbeef, \
@@ -229,9 +209,21 @@ static cxx_type_info type ## _cxx_type_info = { \
     0xdeadbeef \
 }; \
 \
+static void init_ ## type ## _cxx_type_info(char *base) \
+{ \
+    type ## _cxx_type_info.type_info  = (char *)&type ## _type_info - base; \
+    type ## _cxx_type_info.copy_ctor  = (char *)type ## _copy_ctor - base; \
+}
+
+#define DEFINE_CXX_DATA(type, base_no, cl1, cl2, cl3, cl4, dtor)  \
+\
+DEFINE_CXX_TYPE_INFO(type) \
+\
 static cxx_type_info_table type ## _cxx_type_table = { \
     base_no+1, \
     { \
+        0xdeadbeef, \
+        0xdeadbeef, \
         0xdeadbeef, \
         0xdeadbeef, \
         0xdeadbeef  \
@@ -247,11 +239,12 @@ static cxx_exception_type type ##_cxx_type = { \
 \
 static void init_ ## type ## _cxx(char *base) \
 { \
-    type ## _cxx_type_info.type_info  = (char *)&type ## _type_info - base; \
-    type ## _cxx_type_info.copy_ctor  = (char *)MSVCP_ ## type ## _copy_ctor - base; \
+    init_ ## type ## _cxx_type_info(base); \
     type ## _cxx_type_table.info[0]   = (char *)&type ## _cxx_type_info - base; \
     type ## _cxx_type_table.info[1]   = (char *)cl1 - base; \
     type ## _cxx_type_table.info[2]   = (char *)cl2 - base; \
+    type ## _cxx_type_table.info[3]   = (char *)cl3 - base; \
+    type ## _cxx_type_table.info[4]   = (char *)cl4 - base; \
     type ## _cxx_type.destructor      = (char *)dtor - base; \
     type ## _cxx_type.type_info_table = (char *)&type ## _cxx_type_table - base; \
 }
@@ -268,19 +261,25 @@ static void init_ ## type ## _cxx(char *base) \
     DEFINE_RTTI_DATA(name, off, 3, cl1, cl2, cl3, NULL, NULL, NULL, NULL, NULL, NULL, mangled_name)
 #define DEFINE_RTTI_DATA4(name, off, cl1, cl2, cl3, cl4, mangled_name) \
     DEFINE_RTTI_DATA(name, off, 4, cl1, cl2, cl3, cl4, NULL, NULL, NULL, NULL, NULL, mangled_name)
+#define DEFINE_RTTI_DATA5(name, off, cl1, cl2, cl3, cl4, cl5, mangled_name) \
+    DEFINE_RTTI_DATA(name, off, 5, cl1, cl2, cl3, cl4, cl5, NULL, NULL, NULL, NULL, mangled_name)
 #define DEFINE_RTTI_DATA8(name, off, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, mangled_name) \
     DEFINE_RTTI_DATA(name, off, 8, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, NULL, mangled_name)
 #define DEFINE_RTTI_DATA9(name, off, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name) \
     DEFINE_RTTI_DATA(name, off, 9, cl1, cl2, cl3, cl4, cl5, cl6, cl7, cl8, cl9, mangled_name)
 
 #define DEFINE_CXX_DATA0(name, dtor) \
-    DEFINE_CXX_DATA(name, 0, NULL, NULL, dtor)
+    DEFINE_CXX_DATA(name, 0, NULL, NULL, NULL, NULL, dtor)
 #define DEFINE_CXX_DATA1(name, cl1, dtor) \
-    DEFINE_CXX_DATA(name, 1, cl1, NULL, dtor)
+    DEFINE_CXX_DATA(name, 1, cl1, NULL, NULL, NULL, dtor)
 #define DEFINE_CXX_DATA2(name, cl1, cl2, dtor) \
-    DEFINE_CXX_DATA(name, 2, cl1, cl2, dtor)
+    DEFINE_CXX_DATA(name, 2, cl1, cl2, NULL, NULL, dtor)
+#define DEFINE_CXX_DATA3(name, cl1, cl2, cl3, dtor) \
+    DEFINE_CXX_DATA(name, 3, cl1, cl2, cl3, NULL, dtor)
+#define DEFINE_CXX_DATA4(name, cl1, cl2, cl3, cl4, dtor) \
+    DEFINE_CXX_DATA(name, 4, cl1, cl2, cl3, cl4, dtor)
 
-#ifdef __i386__
+#ifdef __ASM_USE_THISCALL_WRAPPER
 
 #define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (WINAPI*)type)&vtbl_wrapper_##off)args
 
@@ -302,7 +301,7 @@ extern void *vtbl_wrapper_56;
 
 #else
 
-#define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (__cdecl***)type)this)[0][off/4]args
+#define CALL_VTBL_FUNC(this, off, ret, type, args) ((ret (__thiscall***)type)this)[0][off/4]args
 
 #endif
 
@@ -315,21 +314,6 @@ typedef struct __exception
     int               do_free; /* Whether to free 'name' in our dtor */
 } exception;
 
-/* Internal: throws selected exception */
-typedef enum __exception_type {
-    EXCEPTION_RERAISE,
-    EXCEPTION,
-    EXCEPTION_BAD_ALLOC,
-    EXCEPTION_BAD_CAST,
-    EXCEPTION_LOGIC_ERROR,
-    EXCEPTION_LENGTH_ERROR,
-    EXCEPTION_OUT_OF_RANGE,
-    EXCEPTION_INVALID_ARGUMENT,
-    EXCEPTION_RUNTIME_ERROR,
-    EXCEPTION_FAILURE,
-} exception_type;
-void throw_exception(exception_type, const char *);
-
 /* rtti */
 typedef struct __type_info
 {
@@ -338,7 +322,7 @@ typedef struct __type_info
     char               mangled[128]; /* Variable length, but we declare it large enough for static RTTI */
 } type_info;
 
-extern const vtable_ptr MSVCP_type_info_vtable;
+extern const vtable_ptr type_info_vtable;
 
 /* offsets for computing the this pointer */
 typedef struct
@@ -395,7 +379,7 @@ typedef struct
 typedef struct
 {
     UINT count;
-    const cxx_type_info *info[3];
+    const cxx_type_info *info[5];
 } cxx_type_info_table;
 
 typedef struct
@@ -451,7 +435,7 @@ typedef struct
 typedef struct
 {
     UINT count;
-    unsigned int info[3];
+    unsigned int info[5];
 } cxx_type_info_table;
 
 typedef struct
@@ -463,3 +447,30 @@ typedef struct
 } cxx_exception_type;
 
 #endif
+
+#define CREATE_TYPE_INFO_VTABLE \
+DEFINE_THISCALL_WRAPPER(type_info_vector_dtor,8) \
+void * __thiscall type_info_vector_dtor(type_info * _this, unsigned int flags) \
+{ \
+    if (flags & 2) \
+    { \
+        /* we have an array, with the number of elements stored before the first object */ \
+        INT_PTR i, *ptr = (INT_PTR *)_this - 1; \
+\
+        for (i = *ptr - 1; i >= 0; i--) free(_this[i].name); \
+        free(ptr); \
+    } \
+    else \
+    { \
+        free(_this->name); \
+        if (flags & 1) free(_this); \
+    } \
+    return _this; \
+} \
+\
+DEFINE_RTTI_DATA0( type_info, 0, ".?AVtype_info@@" ) \
+\
+__ASM_BLOCK_BEGIN(type_info_vtables) \
+    __ASM_VTABLE(type_info, \
+            VTABLE_ADD_FUNC(type_info_vector_dtor)); \
+__ASM_BLOCK_END
diff --git a/vrclient_x64/vrclient_x64/vrclient_generated.c b/vrclient_x64/vrclient_x64/vrclient_generated.c
index 6ed9c513..64c61c34 100644
--- a/vrclient_x64/vrclient_x64/vrclient_generated.c
+++ b/vrclient_x64/vrclient_x64/vrclient_generated.c
@@ -455,3 +455,50 @@ iface_destructor find_iface_destructor( const char *iface_version )
             return destructors[i].dtor;
     return NULL;
 }
+
+extern void init_winIVRApplications_rtti( char * );
+extern void init_winIVRChaperone_rtti( char * );
+extern void init_winIVRChaperoneSetup_rtti( char * );
+extern void init_winIVRClientCore_rtti( char * );
+extern void init_winIVRCompositor_rtti( char * );
+extern void init_winIVRControlPanel_rtti( char * );
+extern void init_winIVRDriverManager_rtti( char * );
+extern void init_winIVRExtendedDisplay_rtti( char * );
+extern void init_winIVRHeadsetView_rtti( char * );
+extern void init_winIVRIOBuffer_rtti( char * );
+extern void init_winIVRInput_rtti( char * );
+extern void init_winIVRMailbox_rtti( char * );
+extern void init_winIVRNotifications_rtti( char * );
+extern void init_winIVROverlay_rtti( char * );
+extern void init_winIVROverlayView_rtti( char * );
+extern void init_winIVRRenderModels_rtti( char * );
+extern void init_winIVRResources_rtti( char * );
+extern void init_winIVRScreenshots_rtti( char * );
+extern void init_winIVRSettings_rtti( char * );
+extern void init_winIVRSystem_rtti( char * );
+extern void init_winIVRTrackedCamera_rtti( char * );
+
+void init_rtti( char *base )
+{
+    init_winIVRApplications_rtti( base );
+    init_winIVRChaperone_rtti( base );
+    init_winIVRChaperoneSetup_rtti( base );
+    init_winIVRClientCore_rtti( base );
+    init_winIVRCompositor_rtti( base );
+    init_winIVRControlPanel_rtti( base );
+    init_winIVRDriverManager_rtti( base );
+    init_winIVRExtendedDisplay_rtti( base );
+    init_winIVRHeadsetView_rtti( base );
+    init_winIVRIOBuffer_rtti( base );
+    init_winIVRInput_rtti( base );
+    init_winIVRMailbox_rtti( base );
+    init_winIVRNotifications_rtti( base );
+    init_winIVROverlay_rtti( base );
+    init_winIVROverlayView_rtti( base );
+    init_winIVRRenderModels_rtti( base );
+    init_winIVRResources_rtti( base );
+    init_winIVRScreenshots_rtti( base );
+    init_winIVRSettings_rtti( base );
+    init_winIVRSystem_rtti( base );
+    init_winIVRTrackedCamera_rtti( base );
+}
diff --git a/vrclient_x64/vrclient_x64/vrclient_main.c b/vrclient_x64/vrclient_x64/vrclient_main.c
index c2a8b6c0..63f9108b 100644
--- a/vrclient_x64/vrclient_x64/vrclient_main.c
+++ b/vrclient_x64/vrclient_x64/vrclient_main.c
@@ -29,6 +29,8 @@
 
 WINE_DEFAULT_DEBUG_CHANNEL(vrclient);
 
+CREATE_TYPE_INFO_VTABLE;
+
 struct compositor_data compositor_data = {0};
 
 BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
@@ -39,6 +41,10 @@ BOOL WINAPI DllMain(HINSTANCE instance, DWORD reason, void *reserved)
     {
         case DLL_PROCESS_ATTACH:
             DisableThreadLibraryCalls(instance);
+#ifdef __x86_64__
+            init_type_info_rtti( (char *)instance );
+            init_rtti( (char *)instance );
+#endif /* __x86_64__ */
             break;
 
         case DLL_PROCESS_DETACH:
diff --git a/vrclient_x64/vrclient_x64/vrclient_private.h b/vrclient_x64/vrclient_x64/vrclient_private.h
index 04b969bd..35a4d99e 100644
--- a/vrclient_x64/vrclient_x64/vrclient_private.h
+++ b/vrclient_x64/vrclient_x64/vrclient_private.h
@@ -79,6 +79,8 @@ extern iface_constructor find_iface_constructor( const char *iface_version ) DEC
 typedef void (*iface_destructor)( struct w_steam_iface * );
 extern iface_destructor find_iface_destructor( const char *iface_version ) DECLSPEC_HIDDEN;
 
+extern void init_rtti( char *base ) DECLSPEC_HIDDEN;
+
 struct w_steam_iface *create_win_interface(const char *name, void *linux_side);
 
 struct generic_interface
diff --git a/vrclient_x64/vrclient_x64/winIVRApplications.c b/vrclient_x64/vrclient_x64/winIVRApplications.c
index 0f5d4d6a..057c73d7 100644
--- a/vrclient_x64/vrclient_x64/winIVRApplications.c
+++ b/vrclient_x64/vrclient_x64/winIVRApplications.c
@@ -303,9 +303,9 @@ const char * __thiscall winIVRApplications_IVRApplications_001_GetApplicationsTr
 
 extern vtable_ptr winIVRApplications_IVRApplications_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRApplications_IVRApplications_001, 0, ".?AVIVRApplications@@")
+
+__ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_001_vtables)
     __ASM_VTABLE(winIVRApplications_IVRApplications_001,
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_001_AddApplicationManifest)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_001_RemoveApplicationManifest)
@@ -329,9 +329,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_001_PerformApplicationPrelaunchCheck)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_001_GetApplicationsTransitionStateNameFromEnum)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRApplications_IVRApplications_001(void *u_iface)
 {
@@ -672,9 +670,9 @@ bool __thiscall winIVRApplications_IVRApplications_002_IsQuitUserPromptRequested
 
 extern vtable_ptr winIVRApplications_IVRApplications_002_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRApplications_IVRApplications_002, 0, ".?AVIVRApplications@@")
+
+__ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_002_vtables)
     __ASM_VTABLE(winIVRApplications_IVRApplications_002,
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_002_AddApplicationManifest)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_002_RemoveApplicationManifest)
@@ -697,9 +695,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_002_GetApplicationsTransitionStateNameFromEnum)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_002_IsQuitUserPromptRequested)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRApplications_IVRApplications_002(void *u_iface)
 {
@@ -1054,9 +1050,9 @@ bool __thiscall winIVRApplications_IVRApplications_003_IsQuitUserPromptRequested
 
 extern vtable_ptr winIVRApplications_IVRApplications_003_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRApplications_IVRApplications_003, 0, ".?AVIVRApplications@@")
+
+__ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_003_vtables)
     __ASM_VTABLE(winIVRApplications_IVRApplications_003,
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_003_AddApplicationManifest)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_003_RemoveApplicationManifest)
@@ -1080,9 +1076,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_003_GetApplicationsTransitionStateNameFromEnum)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_003_IsQuitUserPromptRequested)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRApplications_IVRApplications_003(void *u_iface)
 {
@@ -1466,9 +1460,9 @@ uint32_t __thiscall winIVRApplications_IVRApplications_004_LaunchInternalProcess
 
 extern vtable_ptr winIVRApplications_IVRApplications_004_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRApplications_IVRApplications_004, 0, ".?AVIVRApplications@@")
+
+__ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_004_vtables)
     __ASM_VTABLE(winIVRApplications_IVRApplications_004,
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_004_AddApplicationManifest)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_004_RemoveApplicationManifest)
@@ -1494,9 +1488,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_004_IsQuitUserPromptRequested)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_004_LaunchInternalProcess)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRApplications_IVRApplications_004(void *u_iface)
 {
@@ -1898,9 +1890,9 @@ uint32_t __thiscall winIVRApplications_IVRApplications_005_LaunchInternalProcess
 
 extern vtable_ptr winIVRApplications_IVRApplications_005_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRApplications_IVRApplications_005, 0, ".?AVIVRApplications@@")
+
+__ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_005_vtables)
     __ASM_VTABLE(winIVRApplications_IVRApplications_005,
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_005_AddApplicationManifest)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_005_RemoveApplicationManifest)
@@ -1927,9 +1919,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_005_IsQuitUserPromptRequested)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_005_LaunchInternalProcess)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRApplications_IVRApplications_005(void *u_iface)
 {
@@ -2432,9 +2422,9 @@ uint32_t __thiscall winIVRApplications_IVRApplications_006_GetCurrentSceneProces
 
 extern vtable_ptr winIVRApplications_IVRApplications_006_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRApplications_IVRApplications_006, 0, ".?AVIVRApplications@@")
+
+__ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_006_vtables)
     __ASM_VTABLE(winIVRApplications_IVRApplications_006,
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_006_AddApplicationManifest)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_006_RemoveApplicationManifest)
@@ -2468,9 +2458,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_006_LaunchInternalProcess)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_006_GetCurrentSceneProcessId)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRApplications_IVRApplications_006(void *u_iface)
 {
@@ -2968,9 +2956,9 @@ uint32_t __thiscall winIVRApplications_IVRApplications_007_GetCurrentSceneProces
 
 extern vtable_ptr winIVRApplications_IVRApplications_007_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRApplications_IVRApplications_007, 0, ".?AVIVRApplications@@")
+
+__ASM_BLOCK_BEGIN(winIVRApplications_IVRApplications_007_vtables)
     __ASM_VTABLE(winIVRApplications_IVRApplications_007,
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_007_AddApplicationManifest)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_007_RemoveApplicationManifest)
@@ -3003,9 +2991,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_007_LaunchInternalProcess)
         VTABLE_ADD_FUNC(winIVRApplications_IVRApplications_007_GetCurrentSceneProcessId)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRApplications_IVRApplications_007(void *u_iface)
 {
@@ -3075,3 +3061,15 @@ void destroy_winIVRApplications_IVRApplications_007_FnTable(struct w_steam_iface
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRApplications_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRApplications_IVRApplications_001_rtti( base );
+    init_winIVRApplications_IVRApplications_002_rtti( base );
+    init_winIVRApplications_IVRApplications_003_rtti( base );
+    init_winIVRApplications_IVRApplications_004_rtti( base );
+    init_winIVRApplications_IVRApplications_005_rtti( base );
+    init_winIVRApplications_IVRApplications_006_rtti( base );
+    init_winIVRApplications_IVRApplications_007_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRChaperone.c b/vrclient_x64/vrclient_x64/winIVRChaperone.c
index ba551f2b..14b57c7c 100644
--- a/vrclient_x64/vrclient_x64/winIVRChaperone.c
+++ b/vrclient_x64/vrclient_x64/winIVRChaperone.c
@@ -125,9 +125,9 @@ void __thiscall winIVRChaperone_IVRChaperone_002_ForceBoundsVisible(struct w_ste
 
 extern vtable_ptr winIVRChaperone_IVRChaperone_002_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRChaperone_IVRChaperone_002, 0, ".?AVIVRChaperone@@")
+
+__ASM_BLOCK_BEGIN(winIVRChaperone_IVRChaperone_002_vtables)
     __ASM_VTABLE(winIVRChaperone_IVRChaperone_002,
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_002_GetCalibrationState)
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_002_GetSoftBoundsInfo)
@@ -139,9 +139,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_002_AreBoundsVisible)
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_002_ForceBoundsVisible)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRChaperone_IVRChaperone_002(void *u_iface)
 {
@@ -296,9 +294,9 @@ void __thiscall winIVRChaperone_IVRChaperone_003_ForceBoundsVisible(struct w_ste
 
 extern vtable_ptr winIVRChaperone_IVRChaperone_003_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRChaperone_IVRChaperone_003, 0, ".?AVIVRChaperone@@")
+
+__ASM_BLOCK_BEGIN(winIVRChaperone_IVRChaperone_003_vtables)
     __ASM_VTABLE(winIVRChaperone_IVRChaperone_003,
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_003_GetCalibrationState)
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_003_GetPlayAreaSize)
@@ -309,9 +307,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_003_AreBoundsVisible)
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_003_ForceBoundsVisible)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRChaperone_IVRChaperone_003(void *u_iface)
 {
@@ -477,9 +473,9 @@ void __thiscall winIVRChaperone_IVRChaperone_004_ResetZeroPose(struct w_steam_if
 
 extern vtable_ptr winIVRChaperone_IVRChaperone_004_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRChaperone_IVRChaperone_004, 0, ".?AVIVRChaperone@@")
+
+__ASM_BLOCK_BEGIN(winIVRChaperone_IVRChaperone_004_vtables)
     __ASM_VTABLE(winIVRChaperone_IVRChaperone_004,
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_004_GetCalibrationState)
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_004_GetPlayAreaSize)
@@ -491,9 +487,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_004_ForceBoundsVisible)
         VTABLE_ADD_FUNC(winIVRChaperone_IVRChaperone_004_ResetZeroPose)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRChaperone_IVRChaperone_004(void *u_iface)
 {
@@ -542,3 +536,11 @@ void destroy_winIVRChaperone_IVRChaperone_004_FnTable(struct w_steam_iface *obje
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRChaperone_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRChaperone_IVRChaperone_002_rtti( base );
+    init_winIVRChaperone_IVRChaperone_003_rtti( base );
+    init_winIVRChaperone_IVRChaperone_004_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRChaperoneSetup.c b/vrclient_x64/vrclient_x64/winIVRChaperoneSetup.c
index 914f123a..ec9bd1c6 100644
--- a/vrclient_x64/vrclient_x64/winIVRChaperoneSetup.c
+++ b/vrclient_x64/vrclient_x64/winIVRChaperoneSetup.c
@@ -220,9 +220,9 @@ bool __thiscall winIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveWallTagInfo(st
 
 extern vtable_ptr winIVRChaperoneSetup_IVRChaperoneSetup_004_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRChaperoneSetup_IVRChaperoneSetup_004, 0, ".?AVIVRChaperoneSetup@@")
+
+__ASM_BLOCK_BEGIN(winIVRChaperoneSetup_IVRChaperoneSetup_004_vtables)
     __ASM_VTABLE(winIVRChaperoneSetup_IVRChaperoneSetup_004,
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_004_CommitWorkingCopy)
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_004_RevertWorkingCopy)
@@ -241,9 +241,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingWallTagInfo)
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveWallTagInfo)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_004(void *u_iface)
 {
@@ -567,9 +565,9 @@ bool __thiscall winIVRChaperoneSetup_IVRChaperoneSetup_005_ImportFromBufferToWor
 
 extern vtable_ptr winIVRChaperoneSetup_IVRChaperoneSetup_005_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRChaperoneSetup_IVRChaperoneSetup_005, 0, ".?AVIVRChaperoneSetup@@")
+
+__ASM_BLOCK_BEGIN(winIVRChaperoneSetup_IVRChaperoneSetup_005_vtables)
     __ASM_VTABLE(winIVRChaperoneSetup_IVRChaperoneSetup_005,
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_005_CommitWorkingCopy)
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_005_RevertWorkingCopy)
@@ -592,9 +590,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_005_ExportLiveToBuffer)
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_005_ImportFromBufferToWorking)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_005(void *u_iface)
 {
@@ -913,9 +909,9 @@ void __thiscall winIVRChaperoneSetup_IVRChaperoneSetup_006_RoomSetupStarting(str
 
 extern vtable_ptr winIVRChaperoneSetup_IVRChaperoneSetup_006_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRChaperoneSetup_IVRChaperoneSetup_006, 0, ".?AVIVRChaperoneSetup@@")
+
+__ASM_BLOCK_BEGIN(winIVRChaperoneSetup_IVRChaperoneSetup_006_vtables)
     __ASM_VTABLE(winIVRChaperoneSetup_IVRChaperoneSetup_006,
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_006_CommitWorkingCopy)
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_006_RevertWorkingCopy)
@@ -938,9 +934,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_006_HideWorkingSetPreview)
         VTABLE_ADD_FUNC(winIVRChaperoneSetup_IVRChaperoneSetup_006_RoomSetupStarting)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRChaperoneSetup_IVRChaperoneSetup_006(void *u_iface)
 {
@@ -1000,3 +994,11 @@ void destroy_winIVRChaperoneSetup_IVRChaperoneSetup_006_FnTable(struct w_steam_i
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRChaperoneSetup_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRChaperoneSetup_IVRChaperoneSetup_004_rtti( base );
+    init_winIVRChaperoneSetup_IVRChaperoneSetup_005_rtti( base );
+    init_winIVRChaperoneSetup_IVRChaperoneSetup_006_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRClientCore.c b/vrclient_x64/vrclient_x64/winIVRClientCore.c
index 71de788e..175efe3a 100644
--- a/vrclient_x64/vrclient_x64/winIVRClientCore.c
+++ b/vrclient_x64/vrclient_x64/winIVRClientCore.c
@@ -64,9 +64,9 @@ const char * __thiscall winIVRClientCore_IVRClientCore_002_GetIDForVRInitError(s
 
 extern vtable_ptr winIVRClientCore_IVRClientCore_002_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRClientCore_IVRClientCore_002, 0, ".?AVIVRClientCore@@")
+
+__ASM_BLOCK_BEGIN(winIVRClientCore_IVRClientCore_002_vtables)
     __ASM_VTABLE(winIVRClientCore_IVRClientCore_002,
         VTABLE_ADD_FUNC(winIVRClientCore_IVRClientCore_002_Init)
         VTABLE_ADD_FUNC(winIVRClientCore_IVRClientCore_002_Cleanup)
@@ -76,9 +76,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRClientCore_IVRClientCore_002_GetEnglishStringForHmdError)
         VTABLE_ADD_FUNC(winIVRClientCore_IVRClientCore_002_GetIDForVRInitError)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRClientCore_IVRClientCore_002(void *u_iface)
 {
@@ -181,9 +179,9 @@ const char * __thiscall winIVRClientCore_IVRClientCore_003_GetIDForVRInitError(s
 
 extern vtable_ptr winIVRClientCore_IVRClientCore_003_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRClientCore_IVRClientCore_003, 0, ".?AVIVRClientCore@@")
+
+__ASM_BLOCK_BEGIN(winIVRClientCore_IVRClientCore_003_vtables)
     __ASM_VTABLE(winIVRClientCore_IVRClientCore_003,
         VTABLE_ADD_FUNC(winIVRClientCore_IVRClientCore_003_Init)
         VTABLE_ADD_FUNC(winIVRClientCore_IVRClientCore_003_Cleanup)
@@ -193,9 +191,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRClientCore_IVRClientCore_003_GetEnglishStringForHmdError)
         VTABLE_ADD_FUNC(winIVRClientCore_IVRClientCore_003_GetIDForVRInitError)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRClientCore_IVRClientCore_003(void *u_iface)
 {
@@ -242,3 +238,10 @@ void destroy_winIVRClientCore_IVRClientCore_003_FnTable(struct w_steam_iface *ob
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRClientCore_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRClientCore_IVRClientCore_002_rtti( base );
+    init_winIVRClientCore_IVRClientCore_003_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRCompositor.c b/vrclient_x64/vrclient_x64/winIVRCompositor.c
index fccc8ebd..2e03d00e 100644
--- a/vrclient_x64/vrclient_x64/winIVRCompositor.c
+++ b/vrclient_x64/vrclient_x64/winIVRCompositor.c
@@ -325,9 +325,9 @@ uint32_t __thiscall winIVRCompositor_IVRCompositor_005_GetTrackingSpace(struct w
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_005_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_005, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_005_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_005,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_005_GetLastError)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_005_SetVSync)
@@ -354,9 +354,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_005_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_005_GetTrackingSpace)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_005(void *u_iface)
 {
@@ -679,9 +677,9 @@ bool __thiscall winIVRCompositor_IVRCompositor_006_CanRenderScene(struct w_steam
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_006_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_006, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_006_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_006,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_006_GetLastError)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_006_SetVSync)
@@ -704,9 +702,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_006_GetCurrentSceneFocusProcess)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_006_CanRenderScene)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_006(void *u_iface)
 {
@@ -1014,9 +1010,9 @@ bool __thiscall winIVRCompositor_IVRCompositor_007_CanRenderScene(struct w_steam
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_007_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_007, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_007_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_007,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_007_GetLastError)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_007_SetVSync)
@@ -1038,9 +1034,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_007_GetCurrentSceneFocusProcess)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_007_CanRenderScene)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_007(void *u_iface)
 {
@@ -1435,9 +1429,9 @@ uint32_t __thiscall winIVRCompositor_IVRCompositor_008_GetLastFrameRenderer(stru
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_008_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_008, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_008_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_008,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_008_GetLastError)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_008_SetVSync)
@@ -1466,9 +1460,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_008_GetFrameTimeRemaining)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_008_GetLastFrameRenderer)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_008(void *u_iface)
 {
@@ -1808,9 +1800,9 @@ void __thiscall winIVRCompositor_IVRCompositor_009_CompositorDumpImages(struct w
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_009_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_009, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_009_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_009,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_009_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_009_GetTrackingSpace)
@@ -1837,9 +1829,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_009_IsMirrorWindowVisible)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_009_CompositorDumpImages)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_009(void *u_iface)
 {
@@ -2177,9 +2167,9 @@ void __thiscall winIVRCompositor_IVRCompositor_010_CompositorDumpImages(struct w
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_010_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_010, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_010_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_010,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_010_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_010_GetTrackingSpace)
@@ -2206,9 +2196,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_010_IsMirrorWindowVisible)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_010_CompositorDumpImages)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_010(void *u_iface)
 {
@@ -2546,9 +2534,9 @@ void __thiscall winIVRCompositor_IVRCompositor_011_CompositorDumpImages(struct w
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_011_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_011, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_011_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_011,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_011_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_011_GetTrackingSpace)
@@ -2575,9 +2563,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_011_IsMirrorWindowVisible)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_011_CompositorDumpImages)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_011(void *u_iface)
 {
@@ -2942,9 +2928,9 @@ bool __thiscall winIVRCompositor_IVRCompositor_012_ShouldAppRenderWithLowResourc
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_012_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_012, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_012_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_012,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_012_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_012_GetTrackingSpace)
@@ -2973,9 +2959,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_012_CompositorDumpImages)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_012_ShouldAppRenderWithLowResources)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_012(void *u_iface)
 {
@@ -3354,9 +3338,9 @@ void __thiscall winIVRCompositor_IVRCompositor_013_ForceInterleavedReprojectionO
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_013_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_013, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_013_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_013,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_013_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_013_GetTrackingSpace)
@@ -3386,9 +3370,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_013_ShouldAppRenderWithLowResources)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_013_ForceInterleavedReprojectionOn)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_013(void *u_iface)
 {
@@ -3791,9 +3773,9 @@ void __thiscall winIVRCompositor_IVRCompositor_014_SuspendRendering(struct w_ste
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_014_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_014, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_014_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_014,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_014_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_014_GetTrackingSpace)
@@ -3825,9 +3807,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_014_ForceReconnectProcess)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_014_SuspendRendering)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_014(void *u_iface)
 {
@@ -4340,9 +4320,9 @@ void __thiscall winIVRCompositor_IVRCompositor_015_UnlockGLSharedTextureForAcces
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_015_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_015, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_015_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_015,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_015_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_015_GetTrackingSpace)
@@ -4382,9 +4362,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_015_LockGLSharedTextureForAccess)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_015_UnlockGLSharedTextureForAccess)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_015(void *u_iface)
 {
@@ -4865,9 +4843,9 @@ void __thiscall winIVRCompositor_IVRCompositor_016_UnlockGLSharedTextureForAcces
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_016_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_016, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_016_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_016,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_016_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_016_GetTrackingSpace)
@@ -4905,9 +4883,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_016_LockGLSharedTextureForAccess)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_016_UnlockGLSharedTextureForAccess)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_016(void *u_iface)
 {
@@ -5400,9 +5376,9 @@ void __thiscall winIVRCompositor_IVRCompositor_017_UnlockGLSharedTextureForAcces
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_017_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_017, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_017_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_017,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_017_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_017_GetTrackingSpace)
@@ -5441,9 +5417,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_017_LockGLSharedTextureForAccess)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_017_UnlockGLSharedTextureForAccess)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_017(void *u_iface)
 {
@@ -5963,9 +5937,9 @@ void __thiscall winIVRCompositor_IVRCompositor_018_UnlockGLSharedTextureForAcces
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_018_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_018, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_018_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_018,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_018_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_018_GetTrackingSpace)
@@ -6006,9 +5980,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_018_LockGLSharedTextureForAccess)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_018_UnlockGLSharedTextureForAccess)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_018(void *u_iface)
 {
@@ -6547,9 +6519,9 @@ extern uint32_t __thiscall winIVRCompositor_IVRCompositor_019_GetVulkanDeviceExt
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_019_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_019, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_019_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_019,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_019_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_019_GetTrackingSpace)
@@ -6592,9 +6564,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_019_GetVulkanInstanceExtensionsRequired)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_019_GetVulkanDeviceExtensionsRequired)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_019(void *u_iface)
 {
@@ -7147,9 +7117,9 @@ extern uint32_t __thiscall winIVRCompositor_IVRCompositor_020_GetVulkanDeviceExt
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_020_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_020, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_020_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_020,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_020_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_020_GetTrackingSpace)
@@ -7193,9 +7163,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_020_GetVulkanInstanceExtensionsRequired)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_020_GetVulkanDeviceExtensionsRequired)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_020(void *u_iface)
 {
@@ -7773,9 +7741,9 @@ uint32_t __thiscall winIVRCompositor_IVRCompositor_021_SubmitExplicitTimingData(
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_021_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_021, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_021_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_021,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_021_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_021_GetTrackingSpace)
@@ -7821,9 +7789,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_021_SetExplicitTimingMode)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_021_SubmitExplicitTimingData)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_021(void *u_iface)
 {
@@ -8439,9 +8405,9 @@ bool __thiscall winIVRCompositor_IVRCompositor_022_IsCurrentSceneFocusAppLoading
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_022_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_022, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_022_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_022,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_022_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_022_GetTrackingSpace)
@@ -8490,9 +8456,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_022_IsMotionSmoothingSupported)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_022_IsCurrentSceneFocusAppLoading)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_022(void *u_iface)
 {
@@ -9140,9 +9104,9 @@ void __thiscall winIVRCompositor_IVRCompositor_024_ClearStageOverride(struct w_s
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_024_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_024, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_024_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_024,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_024_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_024_GetTrackingSpace)
@@ -9193,9 +9157,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_024_SetStageOverride_Async)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_024_ClearStageOverride)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_024(void *u_iface)
 {
@@ -9888,9 +9850,9 @@ uint32_t __thiscall winIVRCompositor_IVRCompositor_026_GetPosesForFrame(struct w
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_026_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_026, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_026_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_026,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_026_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_026_GetTrackingSpace)
@@ -9944,9 +9906,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_026_GetLastPosePredictionIDs)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_026_GetPosesForFrame)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_026(void *u_iface)
 {
@@ -10655,9 +10615,9 @@ uint32_t __thiscall winIVRCompositor_IVRCompositor_027_GetPosesForFrame(struct w
 
 extern vtable_ptr winIVRCompositor_IVRCompositor_027_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRCompositor_IVRCompositor_027, 0, ".?AVIVRCompositor@@")
+
+__ASM_BLOCK_BEGIN(winIVRCompositor_IVRCompositor_027_vtables)
     __ASM_VTABLE(winIVRCompositor_IVRCompositor_027,
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_027_SetTrackingSpace)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_027_GetTrackingSpace)
@@ -10711,9 +10671,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_027_GetLastPosePredictionIDs)
         VTABLE_ADD_FUNC(winIVRCompositor_IVRCompositor_027_GetPosesForFrame)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRCompositor_IVRCompositor_027(void *u_iface)
 {
@@ -10804,3 +10762,29 @@ void destroy_winIVRCompositor_IVRCompositor_027_FnTable(struct w_steam_iface *ob
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRCompositor_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRCompositor_IVRCompositor_005_rtti( base );
+    init_winIVRCompositor_IVRCompositor_006_rtti( base );
+    init_winIVRCompositor_IVRCompositor_007_rtti( base );
+    init_winIVRCompositor_IVRCompositor_008_rtti( base );
+    init_winIVRCompositor_IVRCompositor_009_rtti( base );
+    init_winIVRCompositor_IVRCompositor_010_rtti( base );
+    init_winIVRCompositor_IVRCompositor_011_rtti( base );
+    init_winIVRCompositor_IVRCompositor_012_rtti( base );
+    init_winIVRCompositor_IVRCompositor_013_rtti( base );
+    init_winIVRCompositor_IVRCompositor_014_rtti( base );
+    init_winIVRCompositor_IVRCompositor_015_rtti( base );
+    init_winIVRCompositor_IVRCompositor_016_rtti( base );
+    init_winIVRCompositor_IVRCompositor_017_rtti( base );
+    init_winIVRCompositor_IVRCompositor_018_rtti( base );
+    init_winIVRCompositor_IVRCompositor_019_rtti( base );
+    init_winIVRCompositor_IVRCompositor_020_rtti( base );
+    init_winIVRCompositor_IVRCompositor_021_rtti( base );
+    init_winIVRCompositor_IVRCompositor_022_rtti( base );
+    init_winIVRCompositor_IVRCompositor_024_rtti( base );
+    init_winIVRCompositor_IVRCompositor_026_rtti( base );
+    init_winIVRCompositor_IVRCompositor_027_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRControlPanel.c b/vrclient_x64/vrclient_x64/winIVRControlPanel.c
index 1230fac6..7acb10cd 100644
--- a/vrclient_x64/vrclient_x64/winIVRControlPanel.c
+++ b/vrclient_x64/vrclient_x64/winIVRControlPanel.c
@@ -376,9 +376,9 @@ void __thiscall winIVRControlPanel_IVRControlPanel_006_undoc28(struct w_steam_if
 
 extern vtable_ptr winIVRControlPanel_IVRControlPanel_006_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRControlPanel_IVRControlPanel_006, 0, ".?AVIVRControlPanel@@")
+
+__ASM_BLOCK_BEGIN(winIVRControlPanel_IVRControlPanel_006_vtables)
     __ASM_VTABLE(winIVRControlPanel_IVRControlPanel_006,
         VTABLE_ADD_FUNC(winIVRControlPanel_IVRControlPanel_006_undoc1)
         VTABLE_ADD_FUNC(winIVRControlPanel_IVRControlPanel_006_undoc2)
@@ -409,9 +409,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRControlPanel_IVRControlPanel_006_undoc27)
         VTABLE_ADD_FUNC(winIVRControlPanel_IVRControlPanel_006_undoc28)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRControlPanel_IVRControlPanel_006(void *u_iface)
 {
@@ -479,3 +477,9 @@ void destroy_winIVRControlPanel_IVRControlPanel_006_FnTable(struct w_steam_iface
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRControlPanel_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRControlPanel_IVRControlPanel_006_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRDriverManager.c b/vrclient_x64/vrclient_x64/winIVRDriverManager.c
index b0f14a63..16bf7b0c 100644
--- a/vrclient_x64/vrclient_x64/winIVRDriverManager.c
+++ b/vrclient_x64/vrclient_x64/winIVRDriverManager.c
@@ -66,18 +66,16 @@ bool __thiscall winIVRDriverManager_IVRDriverManager_001_IsEnabled(struct w_stea
 
 extern vtable_ptr winIVRDriverManager_IVRDriverManager_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRDriverManager_IVRDriverManager_001, 0, ".?AVIVRDriverManager@@")
+
+__ASM_BLOCK_BEGIN(winIVRDriverManager_IVRDriverManager_001_vtables)
     __ASM_VTABLE(winIVRDriverManager_IVRDriverManager_001,
         VTABLE_ADD_FUNC(winIVRDriverManager_IVRDriverManager_001_GetDriverCount)
         VTABLE_ADD_FUNC(winIVRDriverManager_IVRDriverManager_001_GetDriverName)
         VTABLE_ADD_FUNC(winIVRDriverManager_IVRDriverManager_001_GetDriverHandle)
         VTABLE_ADD_FUNC(winIVRDriverManager_IVRDriverManager_001_IsEnabled)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRDriverManager_IVRDriverManager_001(void *u_iface)
 {
@@ -121,3 +119,9 @@ void destroy_winIVRDriverManager_IVRDriverManager_001_FnTable(struct w_steam_ifa
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRDriverManager_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRDriverManager_IVRDriverManager_001_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRExtendedDisplay.c b/vrclient_x64/vrclient_x64/winIVRExtendedDisplay.c
index fded6bd2..6046d245 100644
--- a/vrclient_x64/vrclient_x64/winIVRExtendedDisplay.c
+++ b/vrclient_x64/vrclient_x64/winIVRExtendedDisplay.c
@@ -57,17 +57,15 @@ void __thiscall winIVRExtendedDisplay_IVRExtendedDisplay_001_GetDXGIOutputInfo(s
 
 extern vtable_ptr winIVRExtendedDisplay_IVRExtendedDisplay_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRExtendedDisplay_IVRExtendedDisplay_001, 0, ".?AVIVRExtendedDisplay@@")
+
+__ASM_BLOCK_BEGIN(winIVRExtendedDisplay_IVRExtendedDisplay_001_vtables)
     __ASM_VTABLE(winIVRExtendedDisplay_IVRExtendedDisplay_001,
         VTABLE_ADD_FUNC(winIVRExtendedDisplay_IVRExtendedDisplay_001_GetWindowBounds)
         VTABLE_ADD_FUNC(winIVRExtendedDisplay_IVRExtendedDisplay_001_GetEyeOutputViewport)
         VTABLE_ADD_FUNC(winIVRExtendedDisplay_IVRExtendedDisplay_001_GetDXGIOutputInfo)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRExtendedDisplay_IVRExtendedDisplay_001(void *u_iface)
 {
@@ -110,3 +108,9 @@ void destroy_winIVRExtendedDisplay_IVRExtendedDisplay_001_FnTable(struct w_steam
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRExtendedDisplay_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRExtendedDisplay_IVRExtendedDisplay_001_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRHeadsetView.c b/vrclient_x64/vrclient_x64/winIVRHeadsetView.c
index edb87839..1412e0d3 100644
--- a/vrclient_x64/vrclient_x64/winIVRHeadsetView.c
+++ b/vrclient_x64/vrclient_x64/winIVRHeadsetView.c
@@ -125,9 +125,9 @@ void __thiscall winIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewBlendRange(st
 
 extern vtable_ptr winIVRHeadsetView_IVRHeadsetView_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRHeadsetView_IVRHeadsetView_001, 0, ".?AVIVRHeadsetView@@")
+
+__ASM_BLOCK_BEGIN(winIVRHeadsetView_IVRHeadsetView_001_vtables)
     __ASM_VTABLE(winIVRHeadsetView_IVRHeadsetView_001,
         VTABLE_ADD_FUNC(winIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewSize)
         VTABLE_ADD_FUNC(winIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewSize)
@@ -139,9 +139,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewBlendRange)
         VTABLE_ADD_FUNC(winIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewBlendRange)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRHeadsetView_IVRHeadsetView_001(void *u_iface)
 {
@@ -190,3 +188,9 @@ void destroy_winIVRHeadsetView_IVRHeadsetView_001_FnTable(struct w_steam_iface *
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRHeadsetView_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRHeadsetView_IVRHeadsetView_001_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRIOBuffer.c b/vrclient_x64/vrclient_x64/winIVRIOBuffer.c
index 11755100..24dc884f 100644
--- a/vrclient_x64/vrclient_x64/winIVRIOBuffer.c
+++ b/vrclient_x64/vrclient_x64/winIVRIOBuffer.c
@@ -87,9 +87,9 @@ uint64_t __thiscall winIVRIOBuffer_IVRIOBuffer_001_PropertyContainer(struct w_st
 
 extern vtable_ptr winIVRIOBuffer_IVRIOBuffer_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRIOBuffer_IVRIOBuffer_001, 0, ".?AVIVRIOBuffer@@")
+
+__ASM_BLOCK_BEGIN(winIVRIOBuffer_IVRIOBuffer_001_vtables)
     __ASM_VTABLE(winIVRIOBuffer_IVRIOBuffer_001,
         VTABLE_ADD_FUNC(winIVRIOBuffer_IVRIOBuffer_001_Open)
         VTABLE_ADD_FUNC(winIVRIOBuffer_IVRIOBuffer_001_Close)
@@ -97,9 +97,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRIOBuffer_IVRIOBuffer_001_Write)
         VTABLE_ADD_FUNC(winIVRIOBuffer_IVRIOBuffer_001_PropertyContainer)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRIOBuffer_IVRIOBuffer_001(void *u_iface)
 {
@@ -236,9 +234,9 @@ bool __thiscall winIVRIOBuffer_IVRIOBuffer_002_HasReaders(struct w_steam_iface *
 
 extern vtable_ptr winIVRIOBuffer_IVRIOBuffer_002_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRIOBuffer_IVRIOBuffer_002, 0, ".?AVIVRIOBuffer@@")
+
+__ASM_BLOCK_BEGIN(winIVRIOBuffer_IVRIOBuffer_002_vtables)
     __ASM_VTABLE(winIVRIOBuffer_IVRIOBuffer_002,
         VTABLE_ADD_FUNC(winIVRIOBuffer_IVRIOBuffer_002_Open)
         VTABLE_ADD_FUNC(winIVRIOBuffer_IVRIOBuffer_002_Close)
@@ -247,9 +245,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRIOBuffer_IVRIOBuffer_002_PropertyContainer)
         VTABLE_ADD_FUNC(winIVRIOBuffer_IVRIOBuffer_002_HasReaders)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRIOBuffer_IVRIOBuffer_002(void *u_iface)
 {
@@ -295,3 +291,10 @@ void destroy_winIVRIOBuffer_IVRIOBuffer_002_FnTable(struct w_steam_iface *object
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRIOBuffer_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRIOBuffer_IVRIOBuffer_001_rtti( base );
+    init_winIVRIOBuffer_IVRIOBuffer_002_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRInput.c b/vrclient_x64/vrclient_x64/winIVRInput.c
index 6e02c59b..76fdede0 100644
--- a/vrclient_x64/vrclient_x64/winIVRInput.c
+++ b/vrclient_x64/vrclient_x64/winIVRInput.c
@@ -279,9 +279,9 @@ uint32_t __thiscall winIVRInput_IVRInput_003_ShowBindingsForActionSet(struct w_s
 
 extern vtable_ptr winIVRInput_IVRInput_003_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRInput_IVRInput_003, 0, ".?AVIVRInput@@")
+
+__ASM_BLOCK_BEGIN(winIVRInput_IVRInput_003_vtables)
     __ASM_VTABLE(winIVRInput_IVRInput_003,
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_003_SetActionManifestPath)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_003_GetActionSetHandle)
@@ -301,9 +301,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_003_ShowActionOrigins)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_003_ShowBindingsForActionSet)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRInput_IVRInput_003(void *u_iface)
 {
@@ -638,9 +636,9 @@ uint32_t __thiscall winIVRInput_IVRInput_004_ShowBindingsForActionSet(struct w_s
 
 extern vtable_ptr winIVRInput_IVRInput_004_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRInput_IVRInput_004, 0, ".?AVIVRInput@@")
+
+__ASM_BLOCK_BEGIN(winIVRInput_IVRInput_004_vtables)
     __ASM_VTABLE(winIVRInput_IVRInput_004,
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_004_SetActionManifestPath)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_004_GetActionSetHandle)
@@ -661,9 +659,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_004_ShowActionOrigins)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_004_ShowBindingsForActionSet)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRInput_IVRInput_004(void *u_iface)
 {
@@ -1098,9 +1094,9 @@ bool __thiscall winIVRInput_IVRInput_005_IsUsingLegacyInput(struct w_steam_iface
 
 extern vtable_ptr winIVRInput_IVRInput_005_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRInput_IVRInput_005, 0, ".?AVIVRInput@@")
+
+__ASM_BLOCK_BEGIN(winIVRInput_IVRInput_005_vtables)
     __ASM_VTABLE(winIVRInput_IVRInput_005,
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_005_SetActionManifestPath)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_005_GetActionSetHandle)
@@ -1128,9 +1124,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_005_ShowBindingsForActionSet)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_005_IsUsingLegacyInput)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRInput_IVRInput_005(void *u_iface)
 {
@@ -1590,9 +1584,9 @@ bool __thiscall winIVRInput_IVRInput_006_IsUsingLegacyInput(struct w_steam_iface
 
 extern vtable_ptr winIVRInput_IVRInput_006_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRInput_IVRInput_006, 0, ".?AVIVRInput@@")
+
+__ASM_BLOCK_BEGIN(winIVRInput_IVRInput_006_vtables)
     __ASM_VTABLE(winIVRInput_IVRInput_006,
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_006_SetActionManifestPath)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_006_GetActionSetHandle)
@@ -1621,9 +1615,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_006_ShowBindingsForActionSet)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_006_IsUsingLegacyInput)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRInput_IVRInput_006(void *u_iface)
 {
@@ -2117,9 +2109,9 @@ uint32_t __thiscall winIVRInput_IVRInput_007_OpenBindingUI(struct w_steam_iface
 
 extern vtable_ptr winIVRInput_IVRInput_007_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRInput_IVRInput_007, 0, ".?AVIVRInput@@")
+
+__ASM_BLOCK_BEGIN(winIVRInput_IVRInput_007_vtables)
     __ASM_VTABLE(winIVRInput_IVRInput_007,
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_007_SetActionManifestPath)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_007_GetActionSetHandle)
@@ -2150,9 +2142,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_007_IsUsingLegacyInput)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_007_OpenBindingUI)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRInput_IVRInput_007(void *u_iface)
 {
@@ -2707,9 +2697,9 @@ uint32_t __thiscall winIVRInput_IVRInput_010_GetBindingVariant(struct w_steam_if
 
 extern vtable_ptr winIVRInput_IVRInput_010_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRInput_IVRInput_010, 0, ".?AVIVRInput@@")
+
+__ASM_BLOCK_BEGIN(winIVRInput_IVRInput_010_vtables)
     __ASM_VTABLE(winIVRInput_IVRInput_010,
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_010_SetActionManifestPath)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_010_GetActionSetHandle)
@@ -2744,9 +2734,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_010_OpenBindingUI)
         VTABLE_ADD_FUNC(winIVRInput_IVRInput_010_GetBindingVariant)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRInput_IVRInput_010(void *u_iface)
 {
@@ -2818,3 +2806,14 @@ void destroy_winIVRInput_IVRInput_010_FnTable(struct w_steam_iface *object)
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRInput_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRInput_IVRInput_003_rtti( base );
+    init_winIVRInput_IVRInput_004_rtti( base );
+    init_winIVRInput_IVRInput_005_rtti( base );
+    init_winIVRInput_IVRInput_006_rtti( base );
+    init_winIVRInput_IVRInput_007_rtti( base );
+    init_winIVRInput_IVRInput_010_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRMailbox.c b/vrclient_x64/vrclient_x64/winIVRMailbox.c
index bf46629f..06130459 100644
--- a/vrclient_x64/vrclient_x64/winIVRMailbox.c
+++ b/vrclient_x64/vrclient_x64/winIVRMailbox.c
@@ -59,18 +59,16 @@ uint32_t __thiscall winIVRMailbox_IVRMailbox_001_undoc4(struct w_steam_iface *_t
 
 extern vtable_ptr winIVRMailbox_IVRMailbox_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRMailbox_IVRMailbox_001, 0, ".?AVIVRMailbox@@")
+
+__ASM_BLOCK_BEGIN(winIVRMailbox_IVRMailbox_001_vtables)
     __ASM_VTABLE(winIVRMailbox_IVRMailbox_001,
         VTABLE_ADD_FUNC(winIVRMailbox_IVRMailbox_001_undoc1)
         VTABLE_ADD_FUNC(winIVRMailbox_IVRMailbox_001_undoc2)
         VTABLE_ADD_FUNC(winIVRMailbox_IVRMailbox_001_undoc3)
         VTABLE_ADD_FUNC(winIVRMailbox_IVRMailbox_001_undoc4)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRMailbox_IVRMailbox_001(void *u_iface)
 {
@@ -114,3 +112,9 @@ void destroy_winIVRMailbox_IVRMailbox_001_FnTable(struct w_steam_iface *object)
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRMailbox_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRMailbox_IVRMailbox_001_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRNotifications.c b/vrclient_x64/vrclient_x64/winIVRNotifications.c
index becf577c..c7610974 100644
--- a/vrclient_x64/vrclient_x64/winIVRNotifications.c
+++ b/vrclient_x64/vrclient_x64/winIVRNotifications.c
@@ -60,17 +60,15 @@ uint32_t __thiscall winIVRNotifications_IVRNotifications_001_DismissNotification
 
 extern vtable_ptr winIVRNotifications_IVRNotifications_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRNotifications_IVRNotifications_001, 0, ".?AVIVRNotifications@@")
+
+__ASM_BLOCK_BEGIN(winIVRNotifications_IVRNotifications_001_vtables)
     __ASM_VTABLE(winIVRNotifications_IVRNotifications_001,
         VTABLE_ADD_FUNC(winIVRNotifications_IVRNotifications_001_GetErrorString)
         VTABLE_ADD_FUNC(winIVRNotifications_IVRNotifications_001_CreateNotification)
         VTABLE_ADD_FUNC(winIVRNotifications_IVRNotifications_001_DismissNotification)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRNotifications_IVRNotifications_001(void *u_iface)
 {
@@ -150,16 +148,14 @@ uint32_t __thiscall winIVRNotifications_IVRNotifications_002_RemoveNotification(
 
 extern vtable_ptr winIVRNotifications_IVRNotifications_002_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRNotifications_IVRNotifications_002, 0, ".?AVIVRNotifications@@")
+
+__ASM_BLOCK_BEGIN(winIVRNotifications_IVRNotifications_002_vtables)
     __ASM_VTABLE(winIVRNotifications_IVRNotifications_002,
         VTABLE_ADD_FUNC(winIVRNotifications_IVRNotifications_002_CreateNotification)
         VTABLE_ADD_FUNC(winIVRNotifications_IVRNotifications_002_RemoveNotification)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRNotifications_IVRNotifications_002(void *u_iface)
 {
@@ -201,3 +197,10 @@ void destroy_winIVRNotifications_IVRNotifications_002_FnTable(struct w_steam_ifa
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRNotifications_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRNotifications_IVRNotifications_001_rtti( base );
+    init_winIVRNotifications_IVRNotifications_002_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVROverlay.c b/vrclient_x64/vrclient_x64/winIVROverlay.c
index dc6d9bb8..f9eb89d1 100644
--- a/vrclient_x64/vrclient_x64/winIVROverlay.c
+++ b/vrclient_x64/vrclient_x64/winIVROverlay.c
@@ -564,9 +564,9 @@ uint32_t __thiscall winIVROverlay_IVROverlay_001_GetSystemOverlaySceneProcess(st
 
 extern vtable_ptr winIVROverlay_IVROverlay_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_001, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_001_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_001,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_001_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_001_CreateOverlay)
@@ -609,9 +609,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_001_SetSystemOverlaySceneProcess)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_001_GetSystemOverlaySceneProcess)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_001(void *u_iface)
 {
@@ -1280,9 +1278,9 @@ uint32_t __thiscall winIVROverlay_IVROverlay_002_GetDashboardOverlaySceneProcess
 
 extern vtable_ptr winIVROverlay_IVROverlay_002_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_002, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_002_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_002,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_002_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_002_CreateOverlay)
@@ -1327,9 +1325,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_002_SetDashboardOverlaySceneProcess)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_002_GetDashboardOverlaySceneProcess)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_002(void *u_iface)
 {
@@ -2061,9 +2057,9 @@ void __thiscall winIVROverlay_IVROverlay_003_ShowDashboard(struct w_steam_iface
 
 extern vtable_ptr winIVROverlay_IVROverlay_003_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_003, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_003_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_003,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_003_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_003_CreateOverlay)
@@ -2112,9 +2108,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_003_GetDashboardOverlaySceneProcess)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_003_ShowDashboard)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_003(void *u_iface)
 {
@@ -2880,9 +2874,9 @@ void __thiscall winIVROverlay_IVROverlay_004_ShowDashboard(struct w_steam_iface
 
 extern vtable_ptr winIVROverlay_IVROverlay_004_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_004, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_004_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_004,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_004_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_004_CreateOverlay)
@@ -2933,9 +2927,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_004_GetDashboardOverlaySceneProcess)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_004_ShowDashboard)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_004(void *u_iface)
 {
@@ -3759,9 +3751,9 @@ void __thiscall winIVROverlay_IVROverlay_005_HideKeyboard(struct w_steam_iface *
 
 extern vtable_ptr winIVROverlay_IVROverlay_005_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_005, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_005_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_005,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_005_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_005_CreateOverlay)
@@ -3816,9 +3808,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_005_GetKeyboardText)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_005_HideKeyboard)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_005(void *u_iface)
 {
@@ -4721,9 +4711,9 @@ void __thiscall winIVROverlay_IVROverlay_007_HideKeyboard(struct w_steam_iface *
 
 extern vtable_ptr winIVROverlay_IVROverlay_007_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_007, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_007_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_007,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_007_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_007_CreateOverlay)
@@ -4783,9 +4773,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_007_GetKeyboardText)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_007_HideKeyboard)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_007(void *u_iface)
 {
@@ -5735,9 +5723,9 @@ void __thiscall winIVROverlay_IVROverlay_008_SetKeyboardPositionForOverlay(struc
 
 extern vtable_ptr winIVROverlay_IVROverlay_008_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_008, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_008_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_008,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_008_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_008_CreateOverlay)
@@ -5800,9 +5788,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_008_SetKeyboardTransformAbsolute)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_008_SetKeyboardPositionForOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_008(void *u_iface)
 {
@@ -6799,9 +6785,9 @@ void __thiscall winIVROverlay_IVROverlay_010_SetKeyboardPositionForOverlay(struc
 
 extern vtable_ptr winIVROverlay_IVROverlay_010_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_010, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_010_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_010,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_010_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_010_CreateOverlay)
@@ -6867,9 +6853,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_010_SetKeyboardTransformAbsolute)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_010_SetKeyboardPositionForOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_010(void *u_iface)
 {
@@ -7930,9 +7914,9 @@ void __thiscall winIVROverlay_IVROverlay_011_SetKeyboardPositionForOverlay(struc
 
 extern vtable_ptr winIVROverlay_IVROverlay_011_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_011, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_011_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_011,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_011_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_011_CreateOverlay)
@@ -8002,9 +7986,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_011_SetKeyboardTransformAbsolute)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_011_SetKeyboardPositionForOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_011(void *u_iface)
 {
@@ -9084,9 +9066,9 @@ void __thiscall winIVROverlay_IVROverlay_012_SetKeyboardPositionForOverlay(struc
 
 extern vtable_ptr winIVROverlay_IVROverlay_012_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_012, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_012_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_012,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_012_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_012_CreateOverlay)
@@ -9157,9 +9139,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_012_SetKeyboardTransformAbsolute)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_012_SetKeyboardPositionForOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_012(void *u_iface)
 {
@@ -10312,9 +10292,9 @@ uint32_t __thiscall winIVROverlay_IVROverlay_013_SetOverlayIntersectionMask(stru
 
 extern vtable_ptr winIVROverlay_IVROverlay_013_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_013, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_013_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_013,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_013_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_013_CreateOverlay)
@@ -10390,9 +10370,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_013_SetKeyboardPositionForOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_013_SetOverlayIntersectionMask)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_013(void *u_iface)
 {
@@ -11583,9 +11561,9 @@ uint32_t __thiscall winIVROverlay_IVROverlay_014_ShowMessageOverlay(struct w_ste
 
 extern vtable_ptr winIVROverlay_IVROverlay_014_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_014, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_014_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_014,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_014_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_014_CreateOverlay)
@@ -11663,9 +11641,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_014_GetOverlayFlags)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_014_ShowMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_014(void *u_iface)
 {
@@ -12945,9 +12921,9 @@ void __thiscall winIVROverlay_IVROverlay_016_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_016_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_016, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_016_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_016,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_016_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_016_CreateOverlay)
@@ -13031,9 +13007,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_016_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_016_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_016(void *u_iface)
 {
@@ -14351,9 +14325,9 @@ void __thiscall winIVROverlay_IVROverlay_017_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_017_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_017, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_017_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_017,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_017_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_017_CreateOverlay)
@@ -14439,9 +14413,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_017_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_017_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_017(void *u_iface)
 {
@@ -15747,9 +15719,9 @@ void __thiscall winIVROverlay_IVROverlay_018_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_018_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_018, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_018_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_018,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_018_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_018_CreateOverlay)
@@ -15834,9 +15806,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_018_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_018_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_018(void *u_iface)
 {
@@ -17141,9 +17111,9 @@ void __thiscall winIVROverlay_IVROverlay_019_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_019_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_019, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_019_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_019,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_019_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_019_CreateOverlay)
@@ -17228,9 +17198,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_019_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_019_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_019(void *u_iface)
 {
@@ -18510,9 +18478,9 @@ void __thiscall winIVROverlay_IVROverlay_020_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_020_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_020, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_020_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_020,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_020_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_020_CreateOverlay)
@@ -18595,9 +18563,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_020_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_020_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_020(void *u_iface)
 {
@@ -19819,9 +19785,9 @@ void __thiscall winIVROverlay_IVROverlay_021_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_021_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_021, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_021_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_021,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_021_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_021_CreateOverlay)
@@ -19900,9 +19866,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_021_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_021_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_021(void *u_iface)
 {
@@ -21205,9 +21169,9 @@ void __thiscall winIVROverlay_IVROverlay_022_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_022_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_022, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_022_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_022,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_022_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_022_CreateOverlay)
@@ -21292,9 +21256,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_022_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_022_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_022(void *u_iface)
 {
@@ -22539,9 +22501,9 @@ void __thiscall winIVROverlay_IVROverlay_024_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_024_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_024, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_024_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_024,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_024_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_024_CreateOverlay)
@@ -22622,9 +22584,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_024_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_024_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_024(void *u_iface)
 {
@@ -23882,9 +23842,9 @@ void __thiscall winIVROverlay_IVROverlay_025_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_025_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_025, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_025_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_025,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_025_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_025_CreateOverlay)
@@ -23966,9 +23926,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_025_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_025_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_025(void *u_iface)
 {
@@ -25268,9 +25226,9 @@ void __thiscall winIVROverlay_IVROverlay_026_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_026_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_026, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_026_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_026,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_026_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_026_CreateOverlay)
@@ -25355,9 +25313,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_026_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_026_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_026(void *u_iface)
 {
@@ -26630,9 +26586,9 @@ void __thiscall winIVROverlay_IVROverlay_027_CloseMessageOverlay(struct w_steam_
 
 extern vtable_ptr winIVROverlay_IVROverlay_027_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlay_IVROverlay_027, 0, ".?AVIVROverlay@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlay_IVROverlay_027_vtables)
     __ASM_VTABLE(winIVROverlay_IVROverlay_027,
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_027_FindOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_027_CreateOverlay)
@@ -26715,9 +26671,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_027_ShowMessageOverlay)
         VTABLE_ADD_FUNC(winIVROverlay_IVROverlay_027_CloseMessageOverlay)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlay_IVROverlay_027(void *u_iface)
 {
@@ -26837,3 +26791,31 @@ void destroy_winIVROverlay_IVROverlay_027_FnTable(struct w_steam_iface *object)
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVROverlay_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVROverlay_IVROverlay_001_rtti( base );
+    init_winIVROverlay_IVROverlay_002_rtti( base );
+    init_winIVROverlay_IVROverlay_003_rtti( base );
+    init_winIVROverlay_IVROverlay_004_rtti( base );
+    init_winIVROverlay_IVROverlay_005_rtti( base );
+    init_winIVROverlay_IVROverlay_007_rtti( base );
+    init_winIVROverlay_IVROverlay_008_rtti( base );
+    init_winIVROverlay_IVROverlay_010_rtti( base );
+    init_winIVROverlay_IVROverlay_011_rtti( base );
+    init_winIVROverlay_IVROverlay_012_rtti( base );
+    init_winIVROverlay_IVROverlay_013_rtti( base );
+    init_winIVROverlay_IVROverlay_014_rtti( base );
+    init_winIVROverlay_IVROverlay_016_rtti( base );
+    init_winIVROverlay_IVROverlay_017_rtti( base );
+    init_winIVROverlay_IVROverlay_018_rtti( base );
+    init_winIVROverlay_IVROverlay_019_rtti( base );
+    init_winIVROverlay_IVROverlay_020_rtti( base );
+    init_winIVROverlay_IVROverlay_021_rtti( base );
+    init_winIVROverlay_IVROverlay_022_rtti( base );
+    init_winIVROverlay_IVROverlay_024_rtti( base );
+    init_winIVROverlay_IVROverlay_025_rtti( base );
+    init_winIVROverlay_IVROverlay_026_rtti( base );
+    init_winIVROverlay_IVROverlay_027_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVROverlayView.c b/vrclient_x64/vrclient_x64/winIVROverlayView.c
index 137fb060..3179e0b7 100644
--- a/vrclient_x64/vrclient_x64/winIVROverlayView.c
+++ b/vrclient_x64/vrclient_x64/winIVROverlayView.c
@@ -68,18 +68,16 @@ bool __thiscall winIVROverlayView_IVROverlayView_003_IsViewingPermitted(struct w
 
 extern vtable_ptr winIVROverlayView_IVROverlayView_003_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVROverlayView_IVROverlayView_003, 0, ".?AVIVROverlayView@@")
+
+__ASM_BLOCK_BEGIN(winIVROverlayView_IVROverlayView_003_vtables)
     __ASM_VTABLE(winIVROverlayView_IVROverlayView_003,
         VTABLE_ADD_FUNC(winIVROverlayView_IVROverlayView_003_AcquireOverlayView)
         VTABLE_ADD_FUNC(winIVROverlayView_IVROverlayView_003_ReleaseOverlayView)
         VTABLE_ADD_FUNC(winIVROverlayView_IVROverlayView_003_PostOverlayEvent)
         VTABLE_ADD_FUNC(winIVROverlayView_IVROverlayView_003_IsViewingPermitted)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVROverlayView_IVROverlayView_003(void *u_iface)
 {
@@ -123,3 +121,9 @@ void destroy_winIVROverlayView_IVROverlayView_003_FnTable(struct w_steam_iface *
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVROverlayView_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVROverlayView_IVROverlayView_003_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRRenderModels.c b/vrclient_x64/vrclient_x64/winIVRRenderModels.c
index 674a55cd..58089a18 100644
--- a/vrclient_x64/vrclient_x64/winIVRRenderModels.c
+++ b/vrclient_x64/vrclient_x64/winIVRRenderModels.c
@@ -66,18 +66,16 @@ uint32_t __thiscall winIVRRenderModels_IVRRenderModels_001_GetRenderModelCount(s
 
 extern vtable_ptr winIVRRenderModels_IVRRenderModels_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRRenderModels_IVRRenderModels_001, 0, ".?AVIVRRenderModels@@")
+
+__ASM_BLOCK_BEGIN(winIVRRenderModels_IVRRenderModels_001_vtables)
     __ASM_VTABLE(winIVRRenderModels_IVRRenderModels_001,
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_001_LoadRenderModel)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_001_FreeRenderModel)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_001_GetRenderModelName)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_001_GetRenderModelCount)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRRenderModels_IVRRenderModels_001(void *u_iface)
 {
@@ -254,9 +252,9 @@ bool __thiscall winIVRRenderModels_IVRRenderModels_002_RenderModelHasComponent(s
 
 extern vtable_ptr winIVRRenderModels_IVRRenderModels_002_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRRenderModels_IVRRenderModels_002, 0, ".?AVIVRRenderModels@@")
+
+__ASM_BLOCK_BEGIN(winIVRRenderModels_IVRRenderModels_002_vtables)
     __ASM_VTABLE(winIVRRenderModels_IVRRenderModels_002,
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_002_LoadRenderModel)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_002_FreeRenderModel)
@@ -271,9 +269,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_002_GetComponentState)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_002_RenderModelHasComponent)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRRenderModels_IVRRenderModels_002(void *u_iface)
 {
@@ -465,9 +461,9 @@ bool __thiscall winIVRRenderModels_IVRRenderModels_004_RenderModelHasComponent(s
 
 extern vtable_ptr winIVRRenderModels_IVRRenderModels_004_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRRenderModels_IVRRenderModels_004, 0, ".?AVIVRRenderModels@@")
+
+__ASM_BLOCK_BEGIN(winIVRRenderModels_IVRRenderModels_004_vtables)
     __ASM_VTABLE(winIVRRenderModels_IVRRenderModels_004,
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_004_LoadRenderModel_Async)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_004_FreeRenderModel)
@@ -484,9 +480,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_004_GetComponentState)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_004_RenderModelHasComponent)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRRenderModels_IVRRenderModels_004(void *u_iface)
 {
@@ -728,9 +722,9 @@ const char * __thiscall winIVRRenderModels_IVRRenderModels_005_GetRenderModelErr
 
 extern vtable_ptr winIVRRenderModels_IVRRenderModels_005_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRRenderModels_IVRRenderModels_005, 0, ".?AVIVRRenderModels@@")
+
+__ASM_BLOCK_BEGIN(winIVRRenderModels_IVRRenderModels_005_vtables)
     __ASM_VTABLE(winIVRRenderModels_IVRRenderModels_005,
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_005_LoadRenderModel_Async)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_005_FreeRenderModel)
@@ -751,9 +745,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_005_GetRenderModelOriginalPath)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_005_GetRenderModelErrorNameFromEnum)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRRenderModels_IVRRenderModels_005(void *u_iface)
 {
@@ -1016,9 +1008,9 @@ const char * __thiscall winIVRRenderModels_IVRRenderModels_006_GetRenderModelErr
 
 extern vtable_ptr winIVRRenderModels_IVRRenderModels_006_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRRenderModels_IVRRenderModels_006, 0, ".?AVIVRRenderModels@@")
+
+__ASM_BLOCK_BEGIN(winIVRRenderModels_IVRRenderModels_006_vtables)
     __ASM_VTABLE(winIVRRenderModels_IVRRenderModels_006,
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_006_FreeRenderModel)
@@ -1040,9 +1032,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_006_GetRenderModelOriginalPath)
         VTABLE_ADD_FUNC(winIVRRenderModels_IVRRenderModels_006_GetRenderModelErrorNameFromEnum)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRRenderModels_IVRRenderModels_006(void *u_iface)
 {
@@ -1101,3 +1091,13 @@ void destroy_winIVRRenderModels_IVRRenderModels_006_FnTable(struct w_steam_iface
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRRenderModels_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRRenderModels_IVRRenderModels_001_rtti( base );
+    init_winIVRRenderModels_IVRRenderModels_002_rtti( base );
+    init_winIVRRenderModels_IVRRenderModels_004_rtti( base );
+    init_winIVRRenderModels_IVRRenderModels_005_rtti( base );
+    init_winIVRRenderModels_IVRRenderModels_006_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRResources.c b/vrclient_x64/vrclient_x64/winIVRResources.c
index 5e2fc119..9fce2545 100644
--- a/vrclient_x64/vrclient_x64/winIVRResources.c
+++ b/vrclient_x64/vrclient_x64/winIVRResources.c
@@ -44,16 +44,14 @@ uint32_t __thiscall winIVRResources_IVRResources_001_GetResourceFullPath(struct
 
 extern vtable_ptr winIVRResources_IVRResources_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRResources_IVRResources_001, 0, ".?AVIVRResources@@")
+
+__ASM_BLOCK_BEGIN(winIVRResources_IVRResources_001_vtables)
     __ASM_VTABLE(winIVRResources_IVRResources_001,
         VTABLE_ADD_FUNC(winIVRResources_IVRResources_001_LoadSharedResource)
         VTABLE_ADD_FUNC(winIVRResources_IVRResources_001_GetResourceFullPath)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRResources_IVRResources_001(void *u_iface)
 {
@@ -95,3 +93,9 @@ void destroy_winIVRResources_IVRResources_001_FnTable(struct w_steam_iface *obje
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRResources_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRResources_IVRResources_001_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRScreenshots.c b/vrclient_x64/vrclient_x64/winIVRScreenshots.c
index 26449ad8..87ede894 100644
--- a/vrclient_x64/vrclient_x64/winIVRScreenshots.c
+++ b/vrclient_x64/vrclient_x64/winIVRScreenshots.c
@@ -132,9 +132,9 @@ uint32_t __thiscall winIVRScreenshots_IVRScreenshots_001_SubmitScreenshot(struct
 
 extern vtable_ptr winIVRScreenshots_IVRScreenshots_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRScreenshots_IVRScreenshots_001, 0, ".?AVIVRScreenshots@@")
+
+__ASM_BLOCK_BEGIN(winIVRScreenshots_IVRScreenshots_001_vtables)
     __ASM_VTABLE(winIVRScreenshots_IVRScreenshots_001,
         VTABLE_ADD_FUNC(winIVRScreenshots_IVRScreenshots_001_RequestScreenshot)
         VTABLE_ADD_FUNC(winIVRScreenshots_IVRScreenshots_001_HookScreenshot)
@@ -144,9 +144,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRScreenshots_IVRScreenshots_001_TakeStereoScreenshot)
         VTABLE_ADD_FUNC(winIVRScreenshots_IVRScreenshots_001_SubmitScreenshot)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRScreenshots_IVRScreenshots_001(void *u_iface)
 {
@@ -193,3 +191,9 @@ void destroy_winIVRScreenshots_IVRScreenshots_001_FnTable(struct w_steam_iface *
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRScreenshots_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRScreenshots_IVRScreenshots_001_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRSettings.c b/vrclient_x64/vrclient_x64/winIVRSettings.c
index 43f2430d..b08673fd 100644
--- a/vrclient_x64/vrclient_x64/winIVRSettings.c
+++ b/vrclient_x64/vrclient_x64/winIVRSettings.c
@@ -192,9 +192,9 @@ void __thiscall winIVRSettings_IVRSettings_001_RemoveKeyInSection(struct w_steam
 
 extern vtable_ptr winIVRSettings_IVRSettings_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSettings_IVRSettings_001, 0, ".?AVIVRSettings@@")
+
+__ASM_BLOCK_BEGIN(winIVRSettings_IVRSettings_001_vtables)
     __ASM_VTABLE(winIVRSettings_IVRSettings_001,
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_001_GetSettingsErrorNameFromEnum)
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_001_Sync)
@@ -209,9 +209,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_001_RemoveSection)
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_001_RemoveKeyInSection)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSettings_IVRSettings_001(void *u_iface)
 {
@@ -443,9 +441,9 @@ void __thiscall winIVRSettings_IVRSettings_002_RemoveKeyInSection(struct w_steam
 
 extern vtable_ptr winIVRSettings_IVRSettings_002_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSettings_IVRSettings_002, 0, ".?AVIVRSettings@@")
+
+__ASM_BLOCK_BEGIN(winIVRSettings_IVRSettings_002_vtables)
     __ASM_VTABLE(winIVRSettings_IVRSettings_002,
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_002_GetSettingsErrorNameFromEnum)
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_002_Sync)
@@ -460,9 +458,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_002_RemoveSection)
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_002_RemoveKeyInSection)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSettings_IVRSettings_002(void *u_iface)
 {
@@ -680,9 +676,9 @@ void __thiscall winIVRSettings_IVRSettings_003_RemoveKeyInSection(struct w_steam
 
 extern vtable_ptr winIVRSettings_IVRSettings_003_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSettings_IVRSettings_003, 0, ".?AVIVRSettings@@")
+
+__ASM_BLOCK_BEGIN(winIVRSettings_IVRSettings_003_vtables)
     __ASM_VTABLE(winIVRSettings_IVRSettings_003,
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_003_GetSettingsErrorNameFromEnum)
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_003_SetBool)
@@ -696,9 +692,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_003_RemoveSection)
         VTABLE_ADD_FUNC(winIVRSettings_IVRSettings_003_RemoveKeyInSection)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSettings_IVRSettings_003(void *u_iface)
 {
@@ -749,3 +743,11 @@ void destroy_winIVRSettings_IVRSettings_003_FnTable(struct w_steam_iface *object
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRSettings_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRSettings_IVRSettings_001_rtti( base );
+    init_winIVRSettings_IVRSettings_002_rtti( base );
+    init_winIVRSettings_IVRSettings_003_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRSystem.c b/vrclient_x64/vrclient_x64/winIVRSystem.c
index f41319cc..b6be2e7c 100644
--- a/vrclient_x64/vrclient_x64/winIVRSystem.c
+++ b/vrclient_x64/vrclient_x64/winIVRSystem.c
@@ -536,9 +536,9 @@ bool __thiscall winIVRSystem_IVRSystem_003_IsInputFocusCapturedByAnotherProcess(
 
 extern vtable_ptr winIVRSystem_IVRSystem_003_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_003, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_003_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_003,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_003_GetWindowBounds)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_003_GetRecommendedRenderTargetSize)
@@ -579,9 +579,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_003_ReleaseInputFocus)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_003_IsInputFocusCapturedByAnotherProcess)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_003(void *u_iface)
 {
@@ -1160,9 +1158,9 @@ uint32_t __thiscall winIVRSystem_IVRSystem_004_DriverDebugRequest(struct w_steam
 
 extern vtable_ptr winIVRSystem_IVRSystem_004_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_004, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_004_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_004,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_004_GetWindowBounds)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_004_GetRecommendedRenderTargetSize)
@@ -1201,9 +1199,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_004_IsInputFocusCapturedByAnotherProcess)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_004_DriverDebugRequest)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_004(void *u_iface)
 {
@@ -1796,9 +1792,9 @@ uint32_t __thiscall winIVRSystem_IVRSystem_005_DriverDebugRequest(struct w_steam
 
 extern vtable_ptr winIVRSystem_IVRSystem_005_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_005, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_005_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_005,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_005_GetWindowBounds)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_005_GetRecommendedRenderTargetSize)
@@ -1838,9 +1834,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_005_IsInputFocusCapturedByAnotherProcess)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_005_DriverDebugRequest)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_005(void *u_iface)
 {
@@ -2498,9 +2492,9 @@ bool __thiscall winIVRSystem_IVRSystem_006_SetDisplayVisibility(struct w_steam_i
 
 extern vtable_ptr winIVRSystem_IVRSystem_006_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_006, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_006_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_006,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_006_GetWindowBounds)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_006_GetRecommendedRenderTargetSize)
@@ -2545,9 +2539,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_006_IsDisplayOnDesktop)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_006_SetDisplayVisibility)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_006(void *u_iface)
 {
@@ -3202,9 +3194,9 @@ void __thiscall winIVRSystem_IVRSystem_009_AcknowledgeQuit_UserPrompt(struct w_s
 
 extern vtable_ptr winIVRSystem_IVRSystem_009_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_009, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_009_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_009,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_009_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_009_GetProjectionMatrix)
@@ -3249,9 +3241,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_009_AcknowledgeQuit_Exiting)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_009_AcknowledgeQuit_UserPrompt)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_009(void *u_iface)
 {
@@ -3956,9 +3946,9 @@ void __thiscall winIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelCha
 
 extern vtable_ptr winIVRSystem_IVRSystem_010_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_010, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_010_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_010,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_010_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_010_GetProjectionMatrix)
@@ -4007,9 +3997,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_010_PerformanceTestEnableCapture)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_010(void *u_iface)
 {
@@ -4720,9 +4708,9 @@ void __thiscall winIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelCha
 
 extern vtable_ptr winIVRSystem_IVRSystem_011_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_011, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_011_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_011,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_011_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_011_GetProjectionMatrix)
@@ -4771,9 +4759,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_011_PerformanceTestEnableCapture)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_011(void *u_iface)
 {
@@ -5460,9 +5446,9 @@ void __thiscall winIVRSystem_IVRSystem_012_AcknowledgeQuit_UserPrompt(struct w_s
 
 extern vtable_ptr winIVRSystem_IVRSystem_012_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_012, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_012_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_012,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_012_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_012_GetProjectionMatrix)
@@ -5509,9 +5495,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_012_AcknowledgeQuit_Exiting)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_012_AcknowledgeQuit_UserPrompt)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_012(void *u_iface)
 {
@@ -6199,9 +6183,9 @@ void __thiscall winIVRSystem_IVRSystem_014_AcknowledgeQuit_UserPrompt(struct w_s
 
 extern vtable_ptr winIVRSystem_IVRSystem_014_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_014, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_014_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_014,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_014_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_014_GetProjectionMatrix)
@@ -6248,9 +6232,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_014_AcknowledgeQuit_Exiting)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_014_AcknowledgeQuit_UserPrompt)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_014(void *u_iface)
 {
@@ -6937,9 +6919,9 @@ void __thiscall winIVRSystem_IVRSystem_015_AcknowledgeQuit_UserPrompt(struct w_s
 
 extern vtable_ptr winIVRSystem_IVRSystem_015_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_015, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_015_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_015,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_015_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_015_GetProjectionMatrix)
@@ -6986,9 +6968,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_015_AcknowledgeQuit_Exiting)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_015_AcknowledgeQuit_UserPrompt)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_015(void *u_iface)
 {
@@ -7688,9 +7668,9 @@ void __thiscall winIVRSystem_IVRSystem_016_AcknowledgeQuit_UserPrompt(struct w_s
 
 extern vtable_ptr winIVRSystem_IVRSystem_016_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_016, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_016_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_016,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_016_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_016_GetProjectionMatrix)
@@ -7738,9 +7718,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_016_AcknowledgeQuit_Exiting)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_016_AcknowledgeQuit_UserPrompt)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_016(void *u_iface)
 {
@@ -8431,9 +8409,9 @@ void __thiscall winIVRSystem_IVRSystem_017_AcknowledgeQuit_UserPrompt(struct w_s
 
 extern vtable_ptr winIVRSystem_IVRSystem_017_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_017, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_017_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_017,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_017_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_017_GetProjectionMatrix)
@@ -8481,9 +8459,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_017_AcknowledgeQuit_Exiting)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_017_AcknowledgeQuit_UserPrompt)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_017(void *u_iface)
 {
@@ -9205,9 +9181,9 @@ void __thiscall winIVRSystem_IVRSystem_019_AcknowledgeQuit_UserPrompt(struct w_s
 
 extern vtable_ptr winIVRSystem_IVRSystem_019_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_019, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_019_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_019,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_019_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_019_GetProjectionMatrix)
@@ -9257,9 +9233,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_019_AcknowledgeQuit_Exiting)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_019_AcknowledgeQuit_UserPrompt)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_019(void *u_iface)
 {
@@ -9993,9 +9967,9 @@ const char * __thiscall winIVRSystem_IVRSystem_020_GetRuntimeVersion(struct w_st
 
 extern vtable_ptr winIVRSystem_IVRSystem_020_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_020, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_020_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_020,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_020_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_020_GetProjectionMatrix)
@@ -10046,9 +10020,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_020_GetAppContainerFilePaths)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_020_GetRuntimeVersion)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_020(void *u_iface)
 {
@@ -10772,9 +10744,9 @@ const char * __thiscall winIVRSystem_IVRSystem_021_GetRuntimeVersion(struct w_st
 
 extern vtable_ptr winIVRSystem_IVRSystem_021_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_021, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_021_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_021,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_021_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_021_GetProjectionMatrix)
@@ -10824,9 +10796,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_021_GetAppContainerFilePaths)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_021_GetRuntimeVersion)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_021(void *u_iface)
 {
@@ -11538,9 +11508,9 @@ const char * __thiscall winIVRSystem_IVRSystem_022_GetRuntimeVersion(struct w_st
 
 extern vtable_ptr winIVRSystem_IVRSystem_022_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRSystem_IVRSystem_022, 0, ".?AVIVRSystem@@")
+
+__ASM_BLOCK_BEGIN(winIVRSystem_IVRSystem_022_vtables)
     __ASM_VTABLE(winIVRSystem_IVRSystem_022,
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_022_GetRecommendedRenderTargetSize)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_022_GetProjectionMatrix)
@@ -11589,9 +11559,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_022_GetAppContainerFilePaths)
         VTABLE_ADD_FUNC(winIVRSystem_IVRSystem_022_GetRuntimeVersion)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRSystem_IVRSystem_022(void *u_iface)
 {
@@ -11677,3 +11645,24 @@ void destroy_winIVRSystem_IVRSystem_022_FnTable(struct w_steam_iface *object)
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRSystem_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRSystem_IVRSystem_003_rtti( base );
+    init_winIVRSystem_IVRSystem_004_rtti( base );
+    init_winIVRSystem_IVRSystem_005_rtti( base );
+    init_winIVRSystem_IVRSystem_006_rtti( base );
+    init_winIVRSystem_IVRSystem_009_rtti( base );
+    init_winIVRSystem_IVRSystem_010_rtti( base );
+    init_winIVRSystem_IVRSystem_011_rtti( base );
+    init_winIVRSystem_IVRSystem_012_rtti( base );
+    init_winIVRSystem_IVRSystem_014_rtti( base );
+    init_winIVRSystem_IVRSystem_015_rtti( base );
+    init_winIVRSystem_IVRSystem_016_rtti( base );
+    init_winIVRSystem_IVRSystem_017_rtti( base );
+    init_winIVRSystem_IVRSystem_019_rtti( base );
+    init_winIVRSystem_IVRSystem_020_rtti( base );
+    init_winIVRSystem_IVRSystem_021_rtti( base );
+    init_winIVRSystem_IVRSystem_022_rtti( base );
+#endif /* __x86_64__ */
+}
diff --git a/vrclient_x64/vrclient_x64/winIVRTrackedCamera.c b/vrclient_x64/vrclient_x64/winIVRTrackedCamera.c
index b2ef24a4..245b98a6 100644
--- a/vrclient_x64/vrclient_x64/winIVRTrackedCamera.c
+++ b/vrclient_x64/vrclient_x64/winIVRTrackedCamera.c
@@ -265,9 +265,9 @@ bool __thiscall winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraProjection(str
 
 extern vtable_ptr winIVRTrackedCamera_IVRTrackedCamera_001_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRTrackedCamera_IVRTrackedCamera_001, 0, ".?AVIVRTrackedCamera@@")
+
+__ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_001_vtables)
     __ASM_VTABLE(winIVRTrackedCamera_IVRTrackedCamera_001,
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_001_HasCamera)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraFirmwareDescription)
@@ -288,9 +288,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraDistortion)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_001_GetCameraProjection)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRTrackedCamera_IVRTrackedCamera_001(void *u_iface)
 {
@@ -475,9 +473,9 @@ uint32_t __thiscall winIVRTrackedCamera_IVRTrackedCamera_002_GetVideoStreamFrame
 
 extern vtable_ptr winIVRTrackedCamera_IVRTrackedCamera_002_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRTrackedCamera_IVRTrackedCamera_002, 0, ".?AVIVRTrackedCamera@@")
+
+__ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_002_vtables)
     __ASM_VTABLE(winIVRTrackedCamera_IVRTrackedCamera_002,
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_002_GetCameraErrorNameFromEnum)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_002_HasCamera)
@@ -488,9 +486,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_002_ReleaseVideoStreamingService)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_002_GetVideoStreamFrameBuffer)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRTrackedCamera_IVRTrackedCamera_002(void *u_iface)
 {
@@ -731,9 +727,9 @@ uint32_t __thiscall winIVRTrackedCamera_IVRTrackedCamera_003_ReleaseVideoStreamT
 
 extern vtable_ptr winIVRTrackedCamera_IVRTrackedCamera_003_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRTrackedCamera_IVRTrackedCamera_003, 0, ".?AVIVRTrackedCamera@@")
+
+__ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_003_vtables)
     __ASM_VTABLE(winIVRTrackedCamera_IVRTrackedCamera_003,
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_003_GetCameraErrorNameFromEnum)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_003_HasCamera)
@@ -748,9 +744,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureGL)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_003_ReleaseVideoStreamTextureGL)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRTrackedCamera_IVRTrackedCamera_003(void *u_iface)
 {
@@ -995,9 +989,9 @@ uint32_t __thiscall winIVRTrackedCamera_IVRTrackedCamera_004_ReleaseVideoStreamT
 
 extern vtable_ptr winIVRTrackedCamera_IVRTrackedCamera_004_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRTrackedCamera_IVRTrackedCamera_004, 0, ".?AVIVRTrackedCamera@@")
+
+__ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_004_vtables)
     __ASM_VTABLE(winIVRTrackedCamera_IVRTrackedCamera_004,
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_004_GetCameraErrorNameFromEnum)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_004_HasCamera)
@@ -1012,9 +1006,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamTextureGL)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_004_ReleaseVideoStreamTextureGL)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRTrackedCamera_IVRTrackedCamera_004(void *u_iface)
 {
@@ -1261,9 +1253,9 @@ uint32_t __thiscall winIVRTrackedCamera_IVRTrackedCamera_005_ReleaseVideoStreamT
 
 extern vtable_ptr winIVRTrackedCamera_IVRTrackedCamera_005_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRTrackedCamera_IVRTrackedCamera_005, 0, ".?AVIVRTrackedCamera@@")
+
+__ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_005_vtables)
     __ASM_VTABLE(winIVRTrackedCamera_IVRTrackedCamera_005,
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_005_GetCameraErrorNameFromEnum)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_005_HasCamera)
@@ -1278,9 +1270,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamTextureGL)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_005_ReleaseVideoStreamTextureGL)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRTrackedCamera_IVRTrackedCamera_005(void *u_iface)
 {
@@ -1551,9 +1541,9 @@ uint32_t __thiscall winIVRTrackedCamera_IVRTrackedCamera_006_GetCameraTrackingSp
 
 extern vtable_ptr winIVRTrackedCamera_IVRTrackedCamera_006_vtable;
 
-#ifndef __GNUC__
-void __asm_dummy_vtables(void) {
-#endif
+DEFINE_RTTI_DATA0(winIVRTrackedCamera_IVRTrackedCamera_006, 0, ".?AVIVRTrackedCamera@@")
+
+__ASM_BLOCK_BEGIN(winIVRTrackedCamera_IVRTrackedCamera_006_vtables)
     __ASM_VTABLE(winIVRTrackedCamera_IVRTrackedCamera_006,
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_006_GetCameraErrorNameFromEnum)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_006_HasCamera)
@@ -1570,9 +1560,7 @@ void __asm_dummy_vtables(void) {
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_006_SetCameraTrackingSpace)
         VTABLE_ADD_FUNC(winIVRTrackedCamera_IVRTrackedCamera_006_GetCameraTrackingSpace)
     );
-#ifndef __GNUC__
-}
-#endif
+__ASM_BLOCK_END
 
 struct w_steam_iface *create_winIVRTrackedCamera_IVRTrackedCamera_006(void *u_iface)
 {
@@ -1626,3 +1614,14 @@ void destroy_winIVRTrackedCamera_IVRTrackedCamera_006_FnTable(struct w_steam_ifa
     HeapFree(GetProcessHeap(), 0, object);
 }
 
+void init_winIVRTrackedCamera_rtti( char *base )
+{
+#ifdef __x86_64__
+    init_winIVRTrackedCamera_IVRTrackedCamera_001_rtti( base );
+    init_winIVRTrackedCamera_IVRTrackedCamera_002_rtti( base );
+    init_winIVRTrackedCamera_IVRTrackedCamera_003_rtti( base );
+    init_winIVRTrackedCamera_IVRTrackedCamera_004_rtti( base );
+    init_winIVRTrackedCamera_IVRTrackedCamera_005_rtti( base );
+    init_winIVRTrackedCamera_IVRTrackedCamera_006_rtti( base );
+#endif /* __x86_64__ */
+}