diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py
index f3d8431e..e02cb4b6 100755
--- a/vrclient_x64/gen_wrapper.py
+++ b/vrclient_x64/gen_wrapper.py
@@ -279,6 +279,25 @@ class Class:
 
         return self._methods
 
+    @property
+    def full_name(self):
+        return f'{self.spelling}_{self.version}'
+
+    def write_definition(self, out, prefix):
+        out(f'struct {prefix}{self.full_name}\n')
+        out(u'{\n')
+        out(u'#ifdef __cplusplus\n')
+        for method in self.methods:
+            types = [declspec(p, "", prefix if prefix != "cpp" else None)
+                     for p in method.get_arguments()]
+            if type(method) is Destructor:
+                out(f'    virtual ~{prefix}{self.full_name}( {", ".join(types)} ) = 0;\n')
+            else:
+                method_name = f'{declspec(method.result_type, "", None)} {method.spelling}'
+                out(f'    virtual {method_name}( {", ".join(types)} ) = 0;\n')
+        out(u'#endif /* __cplusplus */\n')
+        out(u'};\n\n')
+
     def get_children(self):
         return self._cursor.get_children()
 
@@ -308,8 +327,8 @@ def param_needs_conversion(decl):
            struct_needs_conversion(decl)
 
 
-def callconv(cursor):
-    if type(cursor) is not Cursor:
+def callconv(cursor, prefix):
+    if type(cursor) is not Cursor or prefix is None:
         return ''
     canon = cursor.type.get_canonical()
     if canon.kind != TypeKind.POINTER:
@@ -327,15 +346,15 @@ def callconv(cursor):
                 .replace('S_CALLTYPE', '__cdecl')
 
 
-def declspec_func(decl, name):
-    ret = declspec(decl.get_result(), "")
-    params = [declspec(a, "") for a in decl.argument_types()]
+def declspec_func(decl, name, prefix):
+    ret = declspec(decl.get_result(), "", prefix)
+    params = [declspec(a, "", prefix) for a in decl.argument_types()]
     params = ", ".join(params) if len(params) else "void"
     return f'{ret} ({name})({params})'
 
 
-def declspec(decl, name):
-    call = callconv(decl)
+def declspec(decl, name, prefix):
+    call = callconv(decl, prefix)
     if type(decl) is Cursor:
         decl = decl.type
     if 'VRControllerState_t' not in decl.spelling: # FIXME
@@ -343,13 +362,13 @@ def declspec(decl, name):
 
     const = 'const ' if decl.is_const_qualified() else ''
     if decl.kind == TypeKind.FUNCTIONPROTO:
-        return declspec_func(decl, name)
+        return declspec_func(decl, name, prefix)
     if decl.kind in (TypeKind.POINTER, TypeKind.LVALUEREFERENCE):
         decl = decl.get_pointee()
-        return declspec(decl, f"*{call}{const}{name}")
+        return declspec(decl, f"*{call}{const}{name}", prefix)
     if decl.kind == TypeKind.CONSTANTARRAY:
         decl, count = decl.element_type, decl.element_count
-        return declspec(decl, f"({const}{name})[{count}]")
+        return declspec(decl, f"({const}{name})[{count}]", prefix)
 
     if len(name):
         name = f' {name}'
@@ -363,9 +382,9 @@ def declspec(decl, name):
     real_name = real_name.removeprefix("const ")
     real_name = real_name.removeprefix("vr::")
 
-    if real_name in SDK_STRUCTS:
+    if prefix == "win" and real_name in SDK_STRUCTS:
         type_name = f"win{real_name}_{display_sdkver(sdkver)}"
-    elif struct_needs_conversion(decl.get_canonical()) \
+    elif prefix == "win" and struct_needs_conversion(decl.get_canonical()) \
          and not decl.is_const_qualified(): # FIXME
         type_name = f"win{real_name}_{display_sdkver(sdkver)}"
     else:
@@ -387,11 +406,11 @@ def handle_method_hpp(method, cppname, out):
     returns_record = method.result_type.get_canonical().kind == TypeKind.RECORD
 
     ret = "*_ret" if returns_record else "_ret"
-    ret = f'{declspec(method.result_type, ret)}'
+    ret = f'{declspec(method.result_type, ret, "win")}'
 
     names = [p.spelling if p.spelling != "" else f'_{chr(0x61 + i)}'
              for i, p in enumerate(method.get_arguments())]
-    params = [declspec(p, names[i]) for i, p in enumerate(method.get_arguments())]
+    params = [declspec(p, names[i], "win") for i, p in enumerate(method.get_arguments())]
 
     if method.result_type.kind != TypeKind.VOID:
         params = [ret] + params
@@ -419,6 +438,7 @@ def handle_method_cpp(method, classname, cppname, out):
 
     out(f'void {cppname}_{method.name}( struct {cppname}_{method.name}_params *params )\n')
     out(u'{\n')
+    out(f'    struct {cppname} *iface = (struct {cppname} *)params->linux_side;\n')
 
     need_unwrap = {}
     need_output = {}
@@ -427,14 +447,14 @@ def handle_method_cpp(method, classname, cppname, out):
         type_name = strip_ns(underlying_typename(param))
 
         if param.type.kind != TypeKind.POINTER:
-            out(f'    {type_name} lin_{name};\n')
+            out(f'    {declspec(param, f"lin_{name}", None).removeprefix("const ")};\n')
             out(f'    win_to_lin_struct_{param.type.spelling}_{display_sdkver(sdkver)}( &params->{name}, &lin_{name} );\n')
             continue
 
         pointee = param.type.get_pointee()
         if pointee.kind == TypeKind.POINTER:
             need_output[name] = param
-            out(f'    {type_name} *lin_{name};\n')
+            out(f'    {declspec(pointee, f"lin_{name}", None).removeprefix("const ")};\n')
             continue
 
         if type_name in SDK_STRUCTS:
@@ -444,7 +464,7 @@ def handle_method_cpp(method, classname, cppname, out):
         if not pointee.is_const_qualified():
             need_output[name] = param
 
-        out(f'    {type_name} lin_{name};\n')
+        out(f'    {declspec(pointee, f"lin_{name}", None).removeprefix("const ")};\n')
         out(f'    if (params->{name})\n')
         out(f'        struct_{type_name}_{display_sdkver(sdkver)}_win_to_lin( params->{name}, &lin_{name} );\n')
 
@@ -484,11 +504,12 @@ def handle_method_cpp(method, classname, cppname, out):
         if name in size_fixup: return f"lin_{name}"
         if name in need_unwrap: return f'struct_{type_name}_{display_sdkver(sdkver)}_unwrap( params->{name} )'
         if name in need_convert: return f"params->{name} ? {pfx}lin_{name} : nullptr"
-        if param.type.kind == TypeKind.LVALUEREFERENCE: return f'*params->{name}'
-        return f"({param.type.spelling})params->{name}"
+        if underlying_type(param.type.get_canonical()).kind is TypeKind.FUNCTIONPROTO:
+            return f'({declspec(param, "", None)})params->{name}'
+        return f'params->{name}'
 
     params = [param_call(n, p) for n, p in zip(names[1:], method.get_arguments())]
-    out(f'(({classname}*)params->linux_side)->{method.spelling}({", ".join(params)});\n')
+    out(f'iface->{method.spelling}( {", ".join(params)} );\n')
 
     for name, param in sorted(need_output.items()):
         type_name = strip_ns(underlying_typename(param))
@@ -521,14 +542,14 @@ def handle_method_c(klass, method, winclassname, cppname, out):
     returns_record = method.result_type.get_canonical().kind == TypeKind.RECORD
 
     ret = "*" if returns_record else ""
-    ret = f'{declspec(method.result_type, ret)} '
+    ret = f'{declspec(method.result_type, ret, "win")} '
 
     names = [p.spelling if p.spelling != "" else f'_{chr(0x61 + i)}'
              for i, p in enumerate(method.get_arguments())]
-    params = [declspec(p, names[i]) for i, p in enumerate(method.get_arguments())]
+    params = [declspec(p, names[i], "win") for i, p in enumerate(method.get_arguments())]
 
     if returns_record:
-        params = [f'{declspec(method.result_type, "*_ret")}'] + params
+        params = [f'{declspec(method.result_type, "*_ret", "win")}'] + params
         names = ['_ret'] + names
 
     params = ['struct w_steam_iface *_this'] + params
@@ -600,6 +621,8 @@ def handle_class(klass):
         out(u'extern "C" {\n')
         out(u'#endif\n')
 
+        out(f'struct {cppname};\n')
+
         for method in klass.methods:
             if type(method) is Destructor:
                 continue
@@ -625,7 +648,9 @@ def handle_class(klass):
         out(f'#include "{cppname}.h"\n')
         out(u'#ifdef __cplusplus\n')
         out(u'extern "C" {\n')
-        out(u'#endif\n')
+        out(u'#endif\n\n')
+
+        klass.write_definition(out, "cpp")
 
         for method in klass.methods:
             if type(method) is Destructor:
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_001.cpp b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_001.cpp
index d6f9f634..dc43c01e 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_001.cpp
@@ -9,109 +9,158 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRApplications_IVRApplications_001
+{
+#ifdef __cplusplus
+    virtual uint32_t AddApplicationManifest( const char *, bool ) = 0;
+    virtual uint32_t RemoveApplicationManifest( const char * ) = 0;
+    virtual bool IsApplicationInstalled( const char * ) = 0;
+    virtual uint32_t GetApplicationCount(  ) = 0;
+    virtual uint32_t GetApplicationKeyByIndex( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationKeyByProcessId( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t LaunchApplication( const char * ) = 0;
+    virtual uint32_t LaunchDashboardOverlay( const char * ) = 0;
+    virtual uint32_t IdentifyApplication( uint32_t, const char * ) = 0;
+    virtual uint32_t GetApplicationProcessId( const char * ) = 0;
+    virtual const char * GetApplicationsErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t GetApplicationPropertyString( const char *, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual bool GetApplicationPropertyBool( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetHomeApplication( char *, uint32_t ) = 0;
+    virtual uint32_t SetHomeApplication( const char * ) = 0;
+    virtual uint32_t SetApplicationAutoLaunch( const char *, bool ) = 0;
+    virtual bool GetApplicationAutoLaunch( const char * ) = 0;
+    virtual uint32_t GetStartingApplication( char *, uint32_t ) = 0;
+    virtual uint32_t GetTransitionState(  ) = 0;
+    virtual uint32_t PerformApplicationPrelaunchCheck( const char * ) = 0;
+    virtual const char * GetApplicationsTransitionStateNameFromEnum( uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRApplications_IVRApplications_001_AddApplicationManifest( struct cppIVRApplications_IVRApplications_001_AddApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->AddApplicationManifest((const char *)params->pchApplicationManifestFullPath, (bool)params->bTemporary);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->AddApplicationManifest( params->pchApplicationManifestFullPath, params->bTemporary );
 }
 
 void cppIVRApplications_IVRApplications_001_RemoveApplicationManifest( struct cppIVRApplications_IVRApplications_001_RemoveApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->RemoveApplicationManifest((const char *)params->pchApplicationManifestFullPath);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->RemoveApplicationManifest( params->pchApplicationManifestFullPath );
 }
 
 void cppIVRApplications_IVRApplications_001_IsApplicationInstalled( struct cppIVRApplications_IVRApplications_001_IsApplicationInstalled_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsApplicationInstalled((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->IsApplicationInstalled( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_001_GetApplicationCount( struct cppIVRApplications_IVRApplications_001_GetApplicationCount_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationCount();
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetApplicationCount(  );
 }
 
 void cppIVRApplications_IVRApplications_001_GetApplicationKeyByIndex( struct cppIVRApplications_IVRApplications_001_GetApplicationKeyByIndex_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByIndex((uint32_t)params->unApplicationIndex, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByIndex( params->unApplicationIndex, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_001_GetApplicationKeyByProcessId( struct cppIVRApplications_IVRApplications_001_GetApplicationKeyByProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByProcessId((uint32_t)params->unProcessId, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByProcessId( params->unProcessId, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_001_LaunchApplication( struct cppIVRApplications_IVRApplications_001_LaunchApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchApplication((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->LaunchApplication( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_001_LaunchDashboardOverlay( struct cppIVRApplications_IVRApplications_001_LaunchDashboardOverlay_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchDashboardOverlay((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->LaunchDashboardOverlay( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_001_IdentifyApplication( struct cppIVRApplications_IVRApplications_001_IdentifyApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IdentifyApplication((uint32_t)params->unProcessId, (const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->IdentifyApplication( params->unProcessId, params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_001_GetApplicationProcessId( struct cppIVRApplications_IVRApplications_001_GetApplicationProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationProcessId((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetApplicationProcessId( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_001_GetApplicationsErrorNameFromEnum( struct cppIVRApplications_IVRApplications_001_GetApplicationsErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsErrorNameFromEnum((vr::EVRApplicationError)params->error);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetApplicationsErrorNameFromEnum( params->error );
 }
 
 void cppIVRApplications_IVRApplications_001_GetApplicationPropertyString( struct cppIVRApplications_IVRApplications_001_GetApplicationPropertyString_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyString((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (char *)params->pchPropertyValueBuffer, (uint32_t)params->unPropertyValueBufferLen, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyString( params->pchAppKey, params->eProperty, params->pchPropertyValueBuffer, params->unPropertyValueBufferLen, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_001_GetApplicationPropertyBool( struct cppIVRApplications_IVRApplications_001_GetApplicationPropertyBool_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyBool((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyBool( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_001_GetHomeApplication( struct cppIVRApplications_IVRApplications_001_GetHomeApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetHomeApplication((char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetHomeApplication( params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_001_SetHomeApplication( struct cppIVRApplications_IVRApplications_001_SetHomeApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->SetHomeApplication((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->SetHomeApplication( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_001_SetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_001_SetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->SetApplicationAutoLaunch((const char *)params->pchAppKey, (bool)params->bAutoLaunch);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->SetApplicationAutoLaunch( params->pchAppKey, params->bAutoLaunch );
 }
 
 void cppIVRApplications_IVRApplications_001_GetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_001_GetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationAutoLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetApplicationAutoLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_001_GetStartingApplication( struct cppIVRApplications_IVRApplications_001_GetStartingApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetStartingApplication((char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetStartingApplication( params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_001_GetTransitionState( struct cppIVRApplications_IVRApplications_001_GetTransitionState_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetTransitionState();
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetTransitionState(  );
 }
 
 void cppIVRApplications_IVRApplications_001_PerformApplicationPrelaunchCheck( struct cppIVRApplications_IVRApplications_001_PerformApplicationPrelaunchCheck_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->PerformApplicationPrelaunchCheck((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->PerformApplicationPrelaunchCheck( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_001_GetApplicationsTransitionStateNameFromEnum( struct cppIVRApplications_IVRApplications_001_GetApplicationsTransitionStateNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsTransitionStateNameFromEnum((vr::EVRApplicationTransitionState)params->state);
+    struct cppIVRApplications_IVRApplications_001 *iface = (struct cppIVRApplications_IVRApplications_001 *)params->linux_side;
+    params->_ret = iface->GetApplicationsTransitionStateNameFromEnum( params->state );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_001.h b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_001.h
index 343d461c..e80de16f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRApplications_IVRApplications_001;
 struct cppIVRApplications_IVRApplications_001_AddApplicationManifest_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_002.cpp b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_002.cpp
index d75cc0af..48e1e8f2 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_002.cpp
@@ -9,104 +9,151 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRApplications_IVRApplications_002
+{
+#ifdef __cplusplus
+    virtual uint32_t AddApplicationManifest( const char *, bool ) = 0;
+    virtual uint32_t RemoveApplicationManifest( const char * ) = 0;
+    virtual bool IsApplicationInstalled( const char * ) = 0;
+    virtual uint32_t GetApplicationCount(  ) = 0;
+    virtual uint32_t GetApplicationKeyByIndex( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationKeyByProcessId( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t LaunchApplication( const char * ) = 0;
+    virtual uint32_t LaunchDashboardOverlay( const char * ) = 0;
+    virtual uint32_t IdentifyApplication( uint32_t, const char * ) = 0;
+    virtual uint32_t GetApplicationProcessId( const char * ) = 0;
+    virtual const char * GetApplicationsErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t GetApplicationPropertyString( const char *, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual bool GetApplicationPropertyBool( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetApplicationAutoLaunch( const char *, bool ) = 0;
+    virtual bool GetApplicationAutoLaunch( const char * ) = 0;
+    virtual uint32_t GetStartingApplication( char *, uint32_t ) = 0;
+    virtual uint32_t GetTransitionState(  ) = 0;
+    virtual uint32_t PerformApplicationPrelaunchCheck( const char * ) = 0;
+    virtual const char * GetApplicationsTransitionStateNameFromEnum( uint32_t ) = 0;
+    virtual bool IsQuitUserPromptRequested(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRApplications_IVRApplications_002_AddApplicationManifest( struct cppIVRApplications_IVRApplications_002_AddApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->AddApplicationManifest((const char *)params->pchApplicationManifestFullPath, (bool)params->bTemporary);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->AddApplicationManifest( params->pchApplicationManifestFullPath, params->bTemporary );
 }
 
 void cppIVRApplications_IVRApplications_002_RemoveApplicationManifest( struct cppIVRApplications_IVRApplications_002_RemoveApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->RemoveApplicationManifest((const char *)params->pchApplicationManifestFullPath);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->RemoveApplicationManifest( params->pchApplicationManifestFullPath );
 }
 
 void cppIVRApplications_IVRApplications_002_IsApplicationInstalled( struct cppIVRApplications_IVRApplications_002_IsApplicationInstalled_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsApplicationInstalled((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->IsApplicationInstalled( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_002_GetApplicationCount( struct cppIVRApplications_IVRApplications_002_GetApplicationCount_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationCount();
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetApplicationCount(  );
 }
 
 void cppIVRApplications_IVRApplications_002_GetApplicationKeyByIndex( struct cppIVRApplications_IVRApplications_002_GetApplicationKeyByIndex_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByIndex((uint32_t)params->unApplicationIndex, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByIndex( params->unApplicationIndex, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_002_GetApplicationKeyByProcessId( struct cppIVRApplications_IVRApplications_002_GetApplicationKeyByProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByProcessId((uint32_t)params->unProcessId, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByProcessId( params->unProcessId, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_002_LaunchApplication( struct cppIVRApplications_IVRApplications_002_LaunchApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchApplication((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->LaunchApplication( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_002_LaunchDashboardOverlay( struct cppIVRApplications_IVRApplications_002_LaunchDashboardOverlay_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchDashboardOverlay((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->LaunchDashboardOverlay( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_002_IdentifyApplication( struct cppIVRApplications_IVRApplications_002_IdentifyApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IdentifyApplication((uint32_t)params->unProcessId, (const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->IdentifyApplication( params->unProcessId, params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_002_GetApplicationProcessId( struct cppIVRApplications_IVRApplications_002_GetApplicationProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationProcessId((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetApplicationProcessId( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_002_GetApplicationsErrorNameFromEnum( struct cppIVRApplications_IVRApplications_002_GetApplicationsErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsErrorNameFromEnum((vr::EVRApplicationError)params->error);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetApplicationsErrorNameFromEnum( params->error );
 }
 
 void cppIVRApplications_IVRApplications_002_GetApplicationPropertyString( struct cppIVRApplications_IVRApplications_002_GetApplicationPropertyString_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyString((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (char *)params->pchPropertyValueBuffer, (uint32_t)params->unPropertyValueBufferLen, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyString( params->pchAppKey, params->eProperty, params->pchPropertyValueBuffer, params->unPropertyValueBufferLen, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_002_GetApplicationPropertyBool( struct cppIVRApplications_IVRApplications_002_GetApplicationPropertyBool_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyBool((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyBool( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_002_SetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_002_SetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->SetApplicationAutoLaunch((const char *)params->pchAppKey, (bool)params->bAutoLaunch);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->SetApplicationAutoLaunch( params->pchAppKey, params->bAutoLaunch );
 }
 
 void cppIVRApplications_IVRApplications_002_GetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_002_GetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationAutoLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetApplicationAutoLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_002_GetStartingApplication( struct cppIVRApplications_IVRApplications_002_GetStartingApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetStartingApplication((char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetStartingApplication( params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_002_GetTransitionState( struct cppIVRApplications_IVRApplications_002_GetTransitionState_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetTransitionState();
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetTransitionState(  );
 }
 
 void cppIVRApplications_IVRApplications_002_PerformApplicationPrelaunchCheck( struct cppIVRApplications_IVRApplications_002_PerformApplicationPrelaunchCheck_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->PerformApplicationPrelaunchCheck((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->PerformApplicationPrelaunchCheck( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_002_GetApplicationsTransitionStateNameFromEnum( struct cppIVRApplications_IVRApplications_002_GetApplicationsTransitionStateNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsTransitionStateNameFromEnum((vr::EVRApplicationTransitionState)params->state);
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->GetApplicationsTransitionStateNameFromEnum( params->state );
 }
 
 void cppIVRApplications_IVRApplications_002_IsQuitUserPromptRequested( struct cppIVRApplications_IVRApplications_002_IsQuitUserPromptRequested_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsQuitUserPromptRequested();
+    struct cppIVRApplications_IVRApplications_002 *iface = (struct cppIVRApplications_IVRApplications_002 *)params->linux_side;
+    params->_ret = iface->IsQuitUserPromptRequested(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_002.h b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_002.h
index f1af8560..f802561c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_002.h
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_002.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRApplications_IVRApplications_002;
 struct cppIVRApplications_IVRApplications_002_AddApplicationManifest_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_003.cpp b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_003.cpp
index c2b4af2b..6fd85d53 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_003.cpp
@@ -9,109 +9,158 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRApplications_IVRApplications_003
+{
+#ifdef __cplusplus
+    virtual uint32_t AddApplicationManifest( const char *, bool ) = 0;
+    virtual uint32_t RemoveApplicationManifest( const char * ) = 0;
+    virtual bool IsApplicationInstalled( const char * ) = 0;
+    virtual uint32_t GetApplicationCount(  ) = 0;
+    virtual uint32_t GetApplicationKeyByIndex( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationKeyByProcessId( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t LaunchApplication( const char * ) = 0;
+    virtual uint32_t LaunchDashboardOverlay( const char * ) = 0;
+    virtual uint32_t IdentifyApplication( uint32_t, const char * ) = 0;
+    virtual uint32_t GetApplicationProcessId( const char * ) = 0;
+    virtual const char * GetApplicationsErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t GetApplicationPropertyString( const char *, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual bool GetApplicationPropertyBool( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetApplicationPropertyUint64( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetApplicationAutoLaunch( const char *, bool ) = 0;
+    virtual bool GetApplicationAutoLaunch( const char * ) = 0;
+    virtual uint32_t GetStartingApplication( char *, uint32_t ) = 0;
+    virtual uint32_t GetTransitionState(  ) = 0;
+    virtual uint32_t PerformApplicationPrelaunchCheck( const char * ) = 0;
+    virtual const char * GetApplicationsTransitionStateNameFromEnum( uint32_t ) = 0;
+    virtual bool IsQuitUserPromptRequested(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRApplications_IVRApplications_003_AddApplicationManifest( struct cppIVRApplications_IVRApplications_003_AddApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->AddApplicationManifest((const char *)params->pchApplicationManifestFullPath, (bool)params->bTemporary);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->AddApplicationManifest( params->pchApplicationManifestFullPath, params->bTemporary );
 }
 
 void cppIVRApplications_IVRApplications_003_RemoveApplicationManifest( struct cppIVRApplications_IVRApplications_003_RemoveApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->RemoveApplicationManifest((const char *)params->pchApplicationManifestFullPath);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->RemoveApplicationManifest( params->pchApplicationManifestFullPath );
 }
 
 void cppIVRApplications_IVRApplications_003_IsApplicationInstalled( struct cppIVRApplications_IVRApplications_003_IsApplicationInstalled_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsApplicationInstalled((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->IsApplicationInstalled( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_003_GetApplicationCount( struct cppIVRApplications_IVRApplications_003_GetApplicationCount_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationCount();
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetApplicationCount(  );
 }
 
 void cppIVRApplications_IVRApplications_003_GetApplicationKeyByIndex( struct cppIVRApplications_IVRApplications_003_GetApplicationKeyByIndex_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByIndex((uint32_t)params->unApplicationIndex, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByIndex( params->unApplicationIndex, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_003_GetApplicationKeyByProcessId( struct cppIVRApplications_IVRApplications_003_GetApplicationKeyByProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByProcessId((uint32_t)params->unProcessId, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByProcessId( params->unProcessId, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_003_LaunchApplication( struct cppIVRApplications_IVRApplications_003_LaunchApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchApplication((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->LaunchApplication( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_003_LaunchDashboardOverlay( struct cppIVRApplications_IVRApplications_003_LaunchDashboardOverlay_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchDashboardOverlay((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->LaunchDashboardOverlay( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_003_IdentifyApplication( struct cppIVRApplications_IVRApplications_003_IdentifyApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IdentifyApplication((uint32_t)params->unProcessId, (const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->IdentifyApplication( params->unProcessId, params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_003_GetApplicationProcessId( struct cppIVRApplications_IVRApplications_003_GetApplicationProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationProcessId((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetApplicationProcessId( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_003_GetApplicationsErrorNameFromEnum( struct cppIVRApplications_IVRApplications_003_GetApplicationsErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsErrorNameFromEnum((vr::EVRApplicationError)params->error);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetApplicationsErrorNameFromEnum( params->error );
 }
 
 void cppIVRApplications_IVRApplications_003_GetApplicationPropertyString( struct cppIVRApplications_IVRApplications_003_GetApplicationPropertyString_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyString((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (char *)params->pchPropertyValueBuffer, (uint32_t)params->unPropertyValueBufferLen, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyString( params->pchAppKey, params->eProperty, params->pchPropertyValueBuffer, params->unPropertyValueBufferLen, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_003_GetApplicationPropertyBool( struct cppIVRApplications_IVRApplications_003_GetApplicationPropertyBool_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyBool((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyBool( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_003_GetApplicationPropertyUint64( struct cppIVRApplications_IVRApplications_003_GetApplicationPropertyUint64_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyUint64((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyUint64( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_003_SetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_003_SetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->SetApplicationAutoLaunch((const char *)params->pchAppKey, (bool)params->bAutoLaunch);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->SetApplicationAutoLaunch( params->pchAppKey, params->bAutoLaunch );
 }
 
 void cppIVRApplications_IVRApplications_003_GetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_003_GetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationAutoLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetApplicationAutoLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_003_GetStartingApplication( struct cppIVRApplications_IVRApplications_003_GetStartingApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetStartingApplication((char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetStartingApplication( params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_003_GetTransitionState( struct cppIVRApplications_IVRApplications_003_GetTransitionState_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetTransitionState();
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetTransitionState(  );
 }
 
 void cppIVRApplications_IVRApplications_003_PerformApplicationPrelaunchCheck( struct cppIVRApplications_IVRApplications_003_PerformApplicationPrelaunchCheck_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->PerformApplicationPrelaunchCheck((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->PerformApplicationPrelaunchCheck( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_003_GetApplicationsTransitionStateNameFromEnum( struct cppIVRApplications_IVRApplications_003_GetApplicationsTransitionStateNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsTransitionStateNameFromEnum((vr::EVRApplicationTransitionState)params->state);
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->GetApplicationsTransitionStateNameFromEnum( params->state );
 }
 
 void cppIVRApplications_IVRApplications_003_IsQuitUserPromptRequested( struct cppIVRApplications_IVRApplications_003_IsQuitUserPromptRequested_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsQuitUserPromptRequested();
+    struct cppIVRApplications_IVRApplications_003 *iface = (struct cppIVRApplications_IVRApplications_003 *)params->linux_side;
+    params->_ret = iface->IsQuitUserPromptRequested(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_003.h b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_003.h
index 702e9991..39b6cf1a 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_003.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRApplications_IVRApplications_003;
 struct cppIVRApplications_IVRApplications_003_AddApplicationManifest_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_004.cpp b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_004.cpp
index ffbe3f62..27c6cb45 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_004.cpp
@@ -9,119 +9,172 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRApplications_IVRApplications_004
+{
+#ifdef __cplusplus
+    virtual uint32_t AddApplicationManifest( const char *, bool ) = 0;
+    virtual uint32_t RemoveApplicationManifest( const char * ) = 0;
+    virtual bool IsApplicationInstalled( const char * ) = 0;
+    virtual uint32_t GetApplicationCount(  ) = 0;
+    virtual uint32_t GetApplicationKeyByIndex( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationKeyByProcessId( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t LaunchApplication( const char * ) = 0;
+    virtual uint32_t LaunchDashboardOverlay( const char * ) = 0;
+    virtual bool CancelApplicationLaunch( const char * ) = 0;
+    virtual uint32_t IdentifyApplication( uint32_t, const char * ) = 0;
+    virtual uint32_t GetApplicationProcessId( const char * ) = 0;
+    virtual const char * GetApplicationsErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t GetApplicationPropertyString( const char *, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual bool GetApplicationPropertyBool( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetApplicationPropertyUint64( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetApplicationAutoLaunch( const char *, bool ) = 0;
+    virtual bool GetApplicationAutoLaunch( const char * ) = 0;
+    virtual uint32_t GetStartingApplication( char *, uint32_t ) = 0;
+    virtual uint32_t GetTransitionState(  ) = 0;
+    virtual uint32_t PerformApplicationPrelaunchCheck( const char * ) = 0;
+    virtual const char * GetApplicationsTransitionStateNameFromEnum( uint32_t ) = 0;
+    virtual bool IsQuitUserPromptRequested(  ) = 0;
+    virtual uint32_t LaunchInternalProcess( const char *, const char *, const char * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRApplications_IVRApplications_004_AddApplicationManifest( struct cppIVRApplications_IVRApplications_004_AddApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->AddApplicationManifest((const char *)params->pchApplicationManifestFullPath, (bool)params->bTemporary);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->AddApplicationManifest( params->pchApplicationManifestFullPath, params->bTemporary );
 }
 
 void cppIVRApplications_IVRApplications_004_RemoveApplicationManifest( struct cppIVRApplications_IVRApplications_004_RemoveApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->RemoveApplicationManifest((const char *)params->pchApplicationManifestFullPath);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->RemoveApplicationManifest( params->pchApplicationManifestFullPath );
 }
 
 void cppIVRApplications_IVRApplications_004_IsApplicationInstalled( struct cppIVRApplications_IVRApplications_004_IsApplicationInstalled_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsApplicationInstalled((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->IsApplicationInstalled( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_004_GetApplicationCount( struct cppIVRApplications_IVRApplications_004_GetApplicationCount_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationCount();
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetApplicationCount(  );
 }
 
 void cppIVRApplications_IVRApplications_004_GetApplicationKeyByIndex( struct cppIVRApplications_IVRApplications_004_GetApplicationKeyByIndex_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByIndex((uint32_t)params->unApplicationIndex, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByIndex( params->unApplicationIndex, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_004_GetApplicationKeyByProcessId( struct cppIVRApplications_IVRApplications_004_GetApplicationKeyByProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByProcessId((uint32_t)params->unProcessId, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByProcessId( params->unProcessId, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_004_LaunchApplication( struct cppIVRApplications_IVRApplications_004_LaunchApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchApplication((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->LaunchApplication( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_004_LaunchDashboardOverlay( struct cppIVRApplications_IVRApplications_004_LaunchDashboardOverlay_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchDashboardOverlay((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->LaunchDashboardOverlay( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_004_CancelApplicationLaunch( struct cppIVRApplications_IVRApplications_004_CancelApplicationLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->CancelApplicationLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->CancelApplicationLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_004_IdentifyApplication( struct cppIVRApplications_IVRApplications_004_IdentifyApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IdentifyApplication((uint32_t)params->unProcessId, (const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->IdentifyApplication( params->unProcessId, params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_004_GetApplicationProcessId( struct cppIVRApplications_IVRApplications_004_GetApplicationProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationProcessId((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetApplicationProcessId( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_004_GetApplicationsErrorNameFromEnum( struct cppIVRApplications_IVRApplications_004_GetApplicationsErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsErrorNameFromEnum((vr::EVRApplicationError)params->error);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetApplicationsErrorNameFromEnum( params->error );
 }
 
 void cppIVRApplications_IVRApplications_004_GetApplicationPropertyString( struct cppIVRApplications_IVRApplications_004_GetApplicationPropertyString_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyString((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (char *)params->pchPropertyValueBuffer, (uint32_t)params->unPropertyValueBufferLen, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyString( params->pchAppKey, params->eProperty, params->pchPropertyValueBuffer, params->unPropertyValueBufferLen, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_004_GetApplicationPropertyBool( struct cppIVRApplications_IVRApplications_004_GetApplicationPropertyBool_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyBool((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyBool( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_004_GetApplicationPropertyUint64( struct cppIVRApplications_IVRApplications_004_GetApplicationPropertyUint64_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyUint64((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyUint64( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_004_SetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_004_SetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->SetApplicationAutoLaunch((const char *)params->pchAppKey, (bool)params->bAutoLaunch);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->SetApplicationAutoLaunch( params->pchAppKey, params->bAutoLaunch );
 }
 
 void cppIVRApplications_IVRApplications_004_GetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_004_GetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationAutoLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetApplicationAutoLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_004_GetStartingApplication( struct cppIVRApplications_IVRApplications_004_GetStartingApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetStartingApplication((char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetStartingApplication( params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_004_GetTransitionState( struct cppIVRApplications_IVRApplications_004_GetTransitionState_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetTransitionState();
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetTransitionState(  );
 }
 
 void cppIVRApplications_IVRApplications_004_PerformApplicationPrelaunchCheck( struct cppIVRApplications_IVRApplications_004_PerformApplicationPrelaunchCheck_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->PerformApplicationPrelaunchCheck((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->PerformApplicationPrelaunchCheck( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_004_GetApplicationsTransitionStateNameFromEnum( struct cppIVRApplications_IVRApplications_004_GetApplicationsTransitionStateNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsTransitionStateNameFromEnum((vr::EVRApplicationTransitionState)params->state);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->GetApplicationsTransitionStateNameFromEnum( params->state );
 }
 
 void cppIVRApplications_IVRApplications_004_IsQuitUserPromptRequested( struct cppIVRApplications_IVRApplications_004_IsQuitUserPromptRequested_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsQuitUserPromptRequested();
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->IsQuitUserPromptRequested(  );
 }
 
 void cppIVRApplications_IVRApplications_004_LaunchInternalProcess( struct cppIVRApplications_IVRApplications_004_LaunchInternalProcess_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchInternalProcess((const char *)params->pchBinaryPath, (const char *)params->pchArguments, (const char *)params->pchWorkingDirectory);
+    struct cppIVRApplications_IVRApplications_004 *iface = (struct cppIVRApplications_IVRApplications_004 *)params->linux_side;
+    params->_ret = iface->LaunchInternalProcess( params->pchBinaryPath, params->pchArguments, params->pchWorkingDirectory );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_004.h b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_004.h
index 2d16073f..b5f366ae 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_004.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRApplications_IVRApplications_004;
 struct cppIVRApplications_IVRApplications_004_AddApplicationManifest_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_005.cpp b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_005.cpp
index 2b0233d7..f28fa7c0 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_005.cpp
@@ -9,124 +9,179 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRApplications_IVRApplications_005
+{
+#ifdef __cplusplus
+    virtual uint32_t AddApplicationManifest( const char *, bool ) = 0;
+    virtual uint32_t RemoveApplicationManifest( const char * ) = 0;
+    virtual bool IsApplicationInstalled( const char * ) = 0;
+    virtual uint32_t GetApplicationCount(  ) = 0;
+    virtual uint32_t GetApplicationKeyByIndex( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationKeyByProcessId( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t LaunchApplication( const char * ) = 0;
+    virtual uint32_t LaunchTemplateApplication( const char *, const char *, const AppOverrideKeys_t *, uint32_t ) = 0;
+    virtual uint32_t LaunchDashboardOverlay( const char * ) = 0;
+    virtual bool CancelApplicationLaunch( const char * ) = 0;
+    virtual uint32_t IdentifyApplication( uint32_t, const char * ) = 0;
+    virtual uint32_t GetApplicationProcessId( const char * ) = 0;
+    virtual const char * GetApplicationsErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t GetApplicationPropertyString( const char *, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual bool GetApplicationPropertyBool( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetApplicationPropertyUint64( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetApplicationAutoLaunch( const char *, bool ) = 0;
+    virtual bool GetApplicationAutoLaunch( const char * ) = 0;
+    virtual uint32_t GetStartingApplication( char *, uint32_t ) = 0;
+    virtual uint32_t GetTransitionState(  ) = 0;
+    virtual uint32_t PerformApplicationPrelaunchCheck( const char * ) = 0;
+    virtual const char * GetApplicationsTransitionStateNameFromEnum( uint32_t ) = 0;
+    virtual bool IsQuitUserPromptRequested(  ) = 0;
+    virtual uint32_t LaunchInternalProcess( const char *, const char *, const char * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRApplications_IVRApplications_005_AddApplicationManifest( struct cppIVRApplications_IVRApplications_005_AddApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->AddApplicationManifest((const char *)params->pchApplicationManifestFullPath, (bool)params->bTemporary);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->AddApplicationManifest( params->pchApplicationManifestFullPath, params->bTemporary );
 }
 
 void cppIVRApplications_IVRApplications_005_RemoveApplicationManifest( struct cppIVRApplications_IVRApplications_005_RemoveApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->RemoveApplicationManifest((const char *)params->pchApplicationManifestFullPath);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->RemoveApplicationManifest( params->pchApplicationManifestFullPath );
 }
 
 void cppIVRApplications_IVRApplications_005_IsApplicationInstalled( struct cppIVRApplications_IVRApplications_005_IsApplicationInstalled_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsApplicationInstalled((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->IsApplicationInstalled( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_005_GetApplicationCount( struct cppIVRApplications_IVRApplications_005_GetApplicationCount_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationCount();
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetApplicationCount(  );
 }
 
 void cppIVRApplications_IVRApplications_005_GetApplicationKeyByIndex( struct cppIVRApplications_IVRApplications_005_GetApplicationKeyByIndex_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByIndex((uint32_t)params->unApplicationIndex, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByIndex( params->unApplicationIndex, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_005_GetApplicationKeyByProcessId( struct cppIVRApplications_IVRApplications_005_GetApplicationKeyByProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByProcessId((uint32_t)params->unProcessId, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByProcessId( params->unProcessId, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_005_LaunchApplication( struct cppIVRApplications_IVRApplications_005_LaunchApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchApplication((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->LaunchApplication( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_005_LaunchTemplateApplication( struct cppIVRApplications_IVRApplications_005_LaunchTemplateApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchTemplateApplication((const char *)params->pchTemplateAppKey, (const char *)params->pchNewAppKey, (const vr::AppOverrideKeys_t *)params->pKeys, (uint32_t)params->unKeys);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->LaunchTemplateApplication( params->pchTemplateAppKey, params->pchNewAppKey, params->pKeys, params->unKeys );
 }
 
 void cppIVRApplications_IVRApplications_005_LaunchDashboardOverlay( struct cppIVRApplications_IVRApplications_005_LaunchDashboardOverlay_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchDashboardOverlay((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->LaunchDashboardOverlay( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_005_CancelApplicationLaunch( struct cppIVRApplications_IVRApplications_005_CancelApplicationLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->CancelApplicationLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->CancelApplicationLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_005_IdentifyApplication( struct cppIVRApplications_IVRApplications_005_IdentifyApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IdentifyApplication((uint32_t)params->unProcessId, (const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->IdentifyApplication( params->unProcessId, params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_005_GetApplicationProcessId( struct cppIVRApplications_IVRApplications_005_GetApplicationProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationProcessId((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetApplicationProcessId( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_005_GetApplicationsErrorNameFromEnum( struct cppIVRApplications_IVRApplications_005_GetApplicationsErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsErrorNameFromEnum((vr::EVRApplicationError)params->error);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetApplicationsErrorNameFromEnum( params->error );
 }
 
 void cppIVRApplications_IVRApplications_005_GetApplicationPropertyString( struct cppIVRApplications_IVRApplications_005_GetApplicationPropertyString_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyString((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (char *)params->pchPropertyValueBuffer, (uint32_t)params->unPropertyValueBufferLen, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyString( params->pchAppKey, params->eProperty, params->pchPropertyValueBuffer, params->unPropertyValueBufferLen, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_005_GetApplicationPropertyBool( struct cppIVRApplications_IVRApplications_005_GetApplicationPropertyBool_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyBool((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyBool( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_005_GetApplicationPropertyUint64( struct cppIVRApplications_IVRApplications_005_GetApplicationPropertyUint64_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyUint64((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyUint64( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_005_SetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_005_SetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->SetApplicationAutoLaunch((const char *)params->pchAppKey, (bool)params->bAutoLaunch);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->SetApplicationAutoLaunch( params->pchAppKey, params->bAutoLaunch );
 }
 
 void cppIVRApplications_IVRApplications_005_GetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_005_GetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationAutoLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetApplicationAutoLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_005_GetStartingApplication( struct cppIVRApplications_IVRApplications_005_GetStartingApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetStartingApplication((char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetStartingApplication( params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_005_GetTransitionState( struct cppIVRApplications_IVRApplications_005_GetTransitionState_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetTransitionState();
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetTransitionState(  );
 }
 
 void cppIVRApplications_IVRApplications_005_PerformApplicationPrelaunchCheck( struct cppIVRApplications_IVRApplications_005_PerformApplicationPrelaunchCheck_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->PerformApplicationPrelaunchCheck((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->PerformApplicationPrelaunchCheck( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_005_GetApplicationsTransitionStateNameFromEnum( struct cppIVRApplications_IVRApplications_005_GetApplicationsTransitionStateNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsTransitionStateNameFromEnum((vr::EVRApplicationTransitionState)params->state);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->GetApplicationsTransitionStateNameFromEnum( params->state );
 }
 
 void cppIVRApplications_IVRApplications_005_IsQuitUserPromptRequested( struct cppIVRApplications_IVRApplications_005_IsQuitUserPromptRequested_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsQuitUserPromptRequested();
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->IsQuitUserPromptRequested(  );
 }
 
 void cppIVRApplications_IVRApplications_005_LaunchInternalProcess( struct cppIVRApplications_IVRApplications_005_LaunchInternalProcess_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchInternalProcess((const char *)params->pchBinaryPath, (const char *)params->pchArguments, (const char *)params->pchWorkingDirectory);
+    struct cppIVRApplications_IVRApplications_005 *iface = (struct cppIVRApplications_IVRApplications_005 *)params->linux_side;
+    params->_ret = iface->LaunchInternalProcess( params->pchBinaryPath, params->pchArguments, params->pchWorkingDirectory );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_005.h b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_005.h
index 8058abf7..8e47e9ce 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_005.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRApplications_IVRApplications_005;
 struct cppIVRApplications_IVRApplications_005_AddApplicationManifest_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_006.cpp b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_006.cpp
index f922c76e..393cc53e 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_006.cpp
@@ -9,159 +9,228 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRApplications_IVRApplications_006
+{
+#ifdef __cplusplus
+    virtual uint32_t AddApplicationManifest( const char *, bool ) = 0;
+    virtual uint32_t RemoveApplicationManifest( const char * ) = 0;
+    virtual bool IsApplicationInstalled( const char * ) = 0;
+    virtual uint32_t GetApplicationCount(  ) = 0;
+    virtual uint32_t GetApplicationKeyByIndex( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationKeyByProcessId( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t LaunchApplication( const char * ) = 0;
+    virtual uint32_t LaunchTemplateApplication( const char *, const char *, const AppOverrideKeys_t *, uint32_t ) = 0;
+    virtual uint32_t LaunchApplicationFromMimeType( const char *, const char * ) = 0;
+    virtual uint32_t LaunchDashboardOverlay( const char * ) = 0;
+    virtual bool CancelApplicationLaunch( const char * ) = 0;
+    virtual uint32_t IdentifyApplication( uint32_t, const char * ) = 0;
+    virtual uint32_t GetApplicationProcessId( const char * ) = 0;
+    virtual const char * GetApplicationsErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t GetApplicationPropertyString( const char *, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual bool GetApplicationPropertyBool( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetApplicationPropertyUint64( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetApplicationAutoLaunch( const char *, bool ) = 0;
+    virtual bool GetApplicationAutoLaunch( const char * ) = 0;
+    virtual uint32_t SetDefaultApplicationForMimeType( const char *, const char * ) = 0;
+    virtual bool GetDefaultApplicationForMimeType( const char *, char *, uint32_t ) = 0;
+    virtual bool GetApplicationSupportedMimeTypes( const char *, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationsThatSupportMimeType( const char *, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationLaunchArguments( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetStartingApplication( char *, uint32_t ) = 0;
+    virtual uint32_t GetTransitionState(  ) = 0;
+    virtual uint32_t PerformApplicationPrelaunchCheck( const char * ) = 0;
+    virtual const char * GetApplicationsTransitionStateNameFromEnum( uint32_t ) = 0;
+    virtual bool IsQuitUserPromptRequested(  ) = 0;
+    virtual uint32_t LaunchInternalProcess( const char *, const char *, const char * ) = 0;
+    virtual uint32_t GetCurrentSceneProcessId(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRApplications_IVRApplications_006_AddApplicationManifest( struct cppIVRApplications_IVRApplications_006_AddApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->AddApplicationManifest((const char *)params->pchApplicationManifestFullPath, (bool)params->bTemporary);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->AddApplicationManifest( params->pchApplicationManifestFullPath, params->bTemporary );
 }
 
 void cppIVRApplications_IVRApplications_006_RemoveApplicationManifest( struct cppIVRApplications_IVRApplications_006_RemoveApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->RemoveApplicationManifest((const char *)params->pchApplicationManifestFullPath);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->RemoveApplicationManifest( params->pchApplicationManifestFullPath );
 }
 
 void cppIVRApplications_IVRApplications_006_IsApplicationInstalled( struct cppIVRApplications_IVRApplications_006_IsApplicationInstalled_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsApplicationInstalled((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->IsApplicationInstalled( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationCount( struct cppIVRApplications_IVRApplications_006_GetApplicationCount_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationCount();
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationCount(  );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationKeyByIndex( struct cppIVRApplications_IVRApplications_006_GetApplicationKeyByIndex_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByIndex((uint32_t)params->unApplicationIndex, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByIndex( params->unApplicationIndex, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationKeyByProcessId( struct cppIVRApplications_IVRApplications_006_GetApplicationKeyByProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByProcessId((uint32_t)params->unProcessId, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByProcessId( params->unProcessId, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_006_LaunchApplication( struct cppIVRApplications_IVRApplications_006_LaunchApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchApplication((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->LaunchApplication( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_006_LaunchTemplateApplication( struct cppIVRApplications_IVRApplications_006_LaunchTemplateApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchTemplateApplication((const char *)params->pchTemplateAppKey, (const char *)params->pchNewAppKey, (const vr::AppOverrideKeys_t *)params->pKeys, (uint32_t)params->unKeys);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->LaunchTemplateApplication( params->pchTemplateAppKey, params->pchNewAppKey, params->pKeys, params->unKeys );
 }
 
 void cppIVRApplications_IVRApplications_006_LaunchApplicationFromMimeType( struct cppIVRApplications_IVRApplications_006_LaunchApplicationFromMimeType_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchApplicationFromMimeType((const char *)params->pchMimeType, (const char *)params->pchArgs);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->LaunchApplicationFromMimeType( params->pchMimeType, params->pchArgs );
 }
 
 void cppIVRApplications_IVRApplications_006_LaunchDashboardOverlay( struct cppIVRApplications_IVRApplications_006_LaunchDashboardOverlay_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchDashboardOverlay((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->LaunchDashboardOverlay( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_006_CancelApplicationLaunch( struct cppIVRApplications_IVRApplications_006_CancelApplicationLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->CancelApplicationLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->CancelApplicationLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_006_IdentifyApplication( struct cppIVRApplications_IVRApplications_006_IdentifyApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IdentifyApplication((uint32_t)params->unProcessId, (const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->IdentifyApplication( params->unProcessId, params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationProcessId( struct cppIVRApplications_IVRApplications_006_GetApplicationProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationProcessId((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationProcessId( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationsErrorNameFromEnum( struct cppIVRApplications_IVRApplications_006_GetApplicationsErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsErrorNameFromEnum((vr::EVRApplicationError)params->error);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationsErrorNameFromEnum( params->error );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationPropertyString( struct cppIVRApplications_IVRApplications_006_GetApplicationPropertyString_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyString((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (char *)params->pchPropertyValueBuffer, (uint32_t)params->unPropertyValueBufferLen, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyString( params->pchAppKey, params->eProperty, params->pchPropertyValueBuffer, params->unPropertyValueBufferLen, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationPropertyBool( struct cppIVRApplications_IVRApplications_006_GetApplicationPropertyBool_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyBool((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyBool( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationPropertyUint64( struct cppIVRApplications_IVRApplications_006_GetApplicationPropertyUint64_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyUint64((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyUint64( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_006_SetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_006_SetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->SetApplicationAutoLaunch((const char *)params->pchAppKey, (bool)params->bAutoLaunch);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->SetApplicationAutoLaunch( params->pchAppKey, params->bAutoLaunch );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_006_GetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationAutoLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationAutoLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_006_SetDefaultApplicationForMimeType( struct cppIVRApplications_IVRApplications_006_SetDefaultApplicationForMimeType_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->SetDefaultApplicationForMimeType((const char *)params->pchAppKey, (const char *)params->pchMimeType);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->SetDefaultApplicationForMimeType( params->pchAppKey, params->pchMimeType );
 }
 
 void cppIVRApplications_IVRApplications_006_GetDefaultApplicationForMimeType( struct cppIVRApplications_IVRApplications_006_GetDefaultApplicationForMimeType_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetDefaultApplicationForMimeType((const char *)params->pchMimeType, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetDefaultApplicationForMimeType( params->pchMimeType, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationSupportedMimeTypes( struct cppIVRApplications_IVRApplications_006_GetApplicationSupportedMimeTypes_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationSupportedMimeTypes((const char *)params->pchAppKey, (char *)params->pchMimeTypesBuffer, (uint32_t)params->unMimeTypesBuffer);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationSupportedMimeTypes( params->pchAppKey, params->pchMimeTypesBuffer, params->unMimeTypesBuffer );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationsThatSupportMimeType( struct cppIVRApplications_IVRApplications_006_GetApplicationsThatSupportMimeType_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsThatSupportMimeType((const char *)params->pchMimeType, (char *)params->pchAppKeysThatSupportBuffer, (uint32_t)params->unAppKeysThatSupportBuffer);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationsThatSupportMimeType( params->pchMimeType, params->pchAppKeysThatSupportBuffer, params->unAppKeysThatSupportBuffer );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationLaunchArguments( struct cppIVRApplications_IVRApplications_006_GetApplicationLaunchArguments_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationLaunchArguments((uint32_t)params->unHandle, (char *)params->pchArgs, (uint32_t)params->unArgs);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationLaunchArguments( params->unHandle, params->pchArgs, params->unArgs );
 }
 
 void cppIVRApplications_IVRApplications_006_GetStartingApplication( struct cppIVRApplications_IVRApplications_006_GetStartingApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetStartingApplication((char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetStartingApplication( params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_006_GetTransitionState( struct cppIVRApplications_IVRApplications_006_GetTransitionState_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetTransitionState();
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetTransitionState(  );
 }
 
 void cppIVRApplications_IVRApplications_006_PerformApplicationPrelaunchCheck( struct cppIVRApplications_IVRApplications_006_PerformApplicationPrelaunchCheck_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->PerformApplicationPrelaunchCheck((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->PerformApplicationPrelaunchCheck( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_006_GetApplicationsTransitionStateNameFromEnum( struct cppIVRApplications_IVRApplications_006_GetApplicationsTransitionStateNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsTransitionStateNameFromEnum((vr::EVRApplicationTransitionState)params->state);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetApplicationsTransitionStateNameFromEnum( params->state );
 }
 
 void cppIVRApplications_IVRApplications_006_IsQuitUserPromptRequested( struct cppIVRApplications_IVRApplications_006_IsQuitUserPromptRequested_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsQuitUserPromptRequested();
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->IsQuitUserPromptRequested(  );
 }
 
 void cppIVRApplications_IVRApplications_006_LaunchInternalProcess( struct cppIVRApplications_IVRApplications_006_LaunchInternalProcess_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchInternalProcess((const char *)params->pchBinaryPath, (const char *)params->pchArguments, (const char *)params->pchWorkingDirectory);
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->LaunchInternalProcess( params->pchBinaryPath, params->pchArguments, params->pchWorkingDirectory );
 }
 
 void cppIVRApplications_IVRApplications_006_GetCurrentSceneProcessId( struct cppIVRApplications_IVRApplications_006_GetCurrentSceneProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetCurrentSceneProcessId();
+    struct cppIVRApplications_IVRApplications_006 *iface = (struct cppIVRApplications_IVRApplications_006 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneProcessId(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_006.h b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_006.h
index 07004ae1..42900e99 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_006.h
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_006.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRApplications_IVRApplications_006;
 struct cppIVRApplications_IVRApplications_006_AddApplicationManifest_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.cpp b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.cpp
index 15c83303..f540129f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.cpp
@@ -9,154 +9,221 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRApplications_IVRApplications_007
+{
+#ifdef __cplusplus
+    virtual uint32_t AddApplicationManifest( const char *, bool ) = 0;
+    virtual uint32_t RemoveApplicationManifest( const char * ) = 0;
+    virtual bool IsApplicationInstalled( const char * ) = 0;
+    virtual uint32_t GetApplicationCount(  ) = 0;
+    virtual uint32_t GetApplicationKeyByIndex( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationKeyByProcessId( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t LaunchApplication( const char * ) = 0;
+    virtual uint32_t LaunchTemplateApplication( const char *, const char *, const AppOverrideKeys_t *, uint32_t ) = 0;
+    virtual uint32_t LaunchApplicationFromMimeType( const char *, const char * ) = 0;
+    virtual uint32_t LaunchDashboardOverlay( const char * ) = 0;
+    virtual bool CancelApplicationLaunch( const char * ) = 0;
+    virtual uint32_t IdentifyApplication( uint32_t, const char * ) = 0;
+    virtual uint32_t GetApplicationProcessId( const char * ) = 0;
+    virtual const char * GetApplicationsErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t GetApplicationPropertyString( const char *, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual bool GetApplicationPropertyBool( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetApplicationPropertyUint64( const char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetApplicationAutoLaunch( const char *, bool ) = 0;
+    virtual bool GetApplicationAutoLaunch( const char * ) = 0;
+    virtual uint32_t SetDefaultApplicationForMimeType( const char *, const char * ) = 0;
+    virtual bool GetDefaultApplicationForMimeType( const char *, char *, uint32_t ) = 0;
+    virtual bool GetApplicationSupportedMimeTypes( const char *, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationsThatSupportMimeType( const char *, char *, uint32_t ) = 0;
+    virtual uint32_t GetApplicationLaunchArguments( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetStartingApplication( char *, uint32_t ) = 0;
+    virtual uint32_t GetSceneApplicationState(  ) = 0;
+    virtual uint32_t PerformApplicationPrelaunchCheck( const char * ) = 0;
+    virtual const char * GetSceneApplicationStateNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t LaunchInternalProcess( const char *, const char *, const char * ) = 0;
+    virtual uint32_t GetCurrentSceneProcessId(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRApplications_IVRApplications_007_AddApplicationManifest( struct cppIVRApplications_IVRApplications_007_AddApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->AddApplicationManifest((const char *)params->pchApplicationManifestFullPath, (bool)params->bTemporary);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->AddApplicationManifest( params->pchApplicationManifestFullPath, params->bTemporary );
 }
 
 void cppIVRApplications_IVRApplications_007_RemoveApplicationManifest( struct cppIVRApplications_IVRApplications_007_RemoveApplicationManifest_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->RemoveApplicationManifest((const char *)params->pchApplicationManifestFullPath);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->RemoveApplicationManifest( params->pchApplicationManifestFullPath );
 }
 
 void cppIVRApplications_IVRApplications_007_IsApplicationInstalled( struct cppIVRApplications_IVRApplications_007_IsApplicationInstalled_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IsApplicationInstalled((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->IsApplicationInstalled( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationCount( struct cppIVRApplications_IVRApplications_007_GetApplicationCount_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationCount();
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationCount(  );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationKeyByIndex( struct cppIVRApplications_IVRApplications_007_GetApplicationKeyByIndex_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByIndex((uint32_t)params->unApplicationIndex, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByIndex( params->unApplicationIndex, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationKeyByProcessId( struct cppIVRApplications_IVRApplications_007_GetApplicationKeyByProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationKeyByProcessId((uint32_t)params->unProcessId, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationKeyByProcessId( params->unProcessId, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_007_LaunchApplication( struct cppIVRApplications_IVRApplications_007_LaunchApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchApplication((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->LaunchApplication( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_007_LaunchTemplateApplication( struct cppIVRApplications_IVRApplications_007_LaunchTemplateApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchTemplateApplication((const char *)params->pchTemplateAppKey, (const char *)params->pchNewAppKey, (const vr::AppOverrideKeys_t *)params->pKeys, (uint32_t)params->unKeys);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->LaunchTemplateApplication( params->pchTemplateAppKey, params->pchNewAppKey, params->pKeys, params->unKeys );
 }
 
 void cppIVRApplications_IVRApplications_007_LaunchApplicationFromMimeType( struct cppIVRApplications_IVRApplications_007_LaunchApplicationFromMimeType_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchApplicationFromMimeType((const char *)params->pchMimeType, (const char *)params->pchArgs);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->LaunchApplicationFromMimeType( params->pchMimeType, params->pchArgs );
 }
 
 void cppIVRApplications_IVRApplications_007_LaunchDashboardOverlay( struct cppIVRApplications_IVRApplications_007_LaunchDashboardOverlay_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchDashboardOverlay((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->LaunchDashboardOverlay( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_007_CancelApplicationLaunch( struct cppIVRApplications_IVRApplications_007_CancelApplicationLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->CancelApplicationLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->CancelApplicationLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_007_IdentifyApplication( struct cppIVRApplications_IVRApplications_007_IdentifyApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->IdentifyApplication((uint32_t)params->unProcessId, (const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->IdentifyApplication( params->unProcessId, params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationProcessId( struct cppIVRApplications_IVRApplications_007_GetApplicationProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationProcessId((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationProcessId( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationsErrorNameFromEnum( struct cppIVRApplications_IVRApplications_007_GetApplicationsErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsErrorNameFromEnum((vr::EVRApplicationError)params->error);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationsErrorNameFromEnum( params->error );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationPropertyString( struct cppIVRApplications_IVRApplications_007_GetApplicationPropertyString_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyString((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (char *)params->pchPropertyValueBuffer, (uint32_t)params->unPropertyValueBufferLen, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyString( params->pchAppKey, params->eProperty, params->pchPropertyValueBuffer, params->unPropertyValueBufferLen, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationPropertyBool( struct cppIVRApplications_IVRApplications_007_GetApplicationPropertyBool_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyBool((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyBool( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationPropertyUint64( struct cppIVRApplications_IVRApplications_007_GetApplicationPropertyUint64_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationPropertyUint64((const char *)params->pchAppKey, (vr::EVRApplicationProperty)params->eProperty, (vr::EVRApplicationError *)params->peError);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationPropertyUint64( params->pchAppKey, params->eProperty, params->peError );
 }
 
 void cppIVRApplications_IVRApplications_007_SetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_007_SetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->SetApplicationAutoLaunch((const char *)params->pchAppKey, (bool)params->bAutoLaunch);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->SetApplicationAutoLaunch( params->pchAppKey, params->bAutoLaunch );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationAutoLaunch( struct cppIVRApplications_IVRApplications_007_GetApplicationAutoLaunch_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationAutoLaunch((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationAutoLaunch( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_007_SetDefaultApplicationForMimeType( struct cppIVRApplications_IVRApplications_007_SetDefaultApplicationForMimeType_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->SetDefaultApplicationForMimeType((const char *)params->pchAppKey, (const char *)params->pchMimeType);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->SetDefaultApplicationForMimeType( params->pchAppKey, params->pchMimeType );
 }
 
 void cppIVRApplications_IVRApplications_007_GetDefaultApplicationForMimeType( struct cppIVRApplications_IVRApplications_007_GetDefaultApplicationForMimeType_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetDefaultApplicationForMimeType((const char *)params->pchMimeType, (char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetDefaultApplicationForMimeType( params->pchMimeType, params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationSupportedMimeTypes( struct cppIVRApplications_IVRApplications_007_GetApplicationSupportedMimeTypes_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationSupportedMimeTypes((const char *)params->pchAppKey, (char *)params->pchMimeTypesBuffer, (uint32_t)params->unMimeTypesBuffer);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationSupportedMimeTypes( params->pchAppKey, params->pchMimeTypesBuffer, params->unMimeTypesBuffer );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationsThatSupportMimeType( struct cppIVRApplications_IVRApplications_007_GetApplicationsThatSupportMimeType_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationsThatSupportMimeType((const char *)params->pchMimeType, (char *)params->pchAppKeysThatSupportBuffer, (uint32_t)params->unAppKeysThatSupportBuffer);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationsThatSupportMimeType( params->pchMimeType, params->pchAppKeysThatSupportBuffer, params->unAppKeysThatSupportBuffer );
 }
 
 void cppIVRApplications_IVRApplications_007_GetApplicationLaunchArguments( struct cppIVRApplications_IVRApplications_007_GetApplicationLaunchArguments_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetApplicationLaunchArguments((uint32_t)params->unHandle, (char *)params->pchArgs, (uint32_t)params->unArgs);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetApplicationLaunchArguments( params->unHandle, params->pchArgs, params->unArgs );
 }
 
 void cppIVRApplications_IVRApplications_007_GetStartingApplication( struct cppIVRApplications_IVRApplications_007_GetStartingApplication_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetStartingApplication((char *)params->pchAppKeyBuffer, (uint32_t)params->unAppKeyBufferLen);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetStartingApplication( params->pchAppKeyBuffer, params->unAppKeyBufferLen );
 }
 
 void cppIVRApplications_IVRApplications_007_GetSceneApplicationState( struct cppIVRApplications_IVRApplications_007_GetSceneApplicationState_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetSceneApplicationState();
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetSceneApplicationState(  );
 }
 
 void cppIVRApplications_IVRApplications_007_PerformApplicationPrelaunchCheck( struct cppIVRApplications_IVRApplications_007_PerformApplicationPrelaunchCheck_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->PerformApplicationPrelaunchCheck((const char *)params->pchAppKey);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->PerformApplicationPrelaunchCheck( params->pchAppKey );
 }
 
 void cppIVRApplications_IVRApplications_007_GetSceneApplicationStateNameFromEnum( struct cppIVRApplications_IVRApplications_007_GetSceneApplicationStateNameFromEnum_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetSceneApplicationStateNameFromEnum((vr::EVRSceneApplicationState)params->state);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetSceneApplicationStateNameFromEnum( params->state );
 }
 
 void cppIVRApplications_IVRApplications_007_LaunchInternalProcess( struct cppIVRApplications_IVRApplications_007_LaunchInternalProcess_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->LaunchInternalProcess((const char *)params->pchBinaryPath, (const char *)params->pchArguments, (const char *)params->pchWorkingDirectory);
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->LaunchInternalProcess( params->pchBinaryPath, params->pchArguments, params->pchWorkingDirectory );
 }
 
 void cppIVRApplications_IVRApplications_007_GetCurrentSceneProcessId( struct cppIVRApplications_IVRApplications_007_GetCurrentSceneProcessId_params *params )
 {
-    params->_ret = ((IVRApplications*)params->linux_side)->GetCurrentSceneProcessId();
+    struct cppIVRApplications_IVRApplications_007 *iface = (struct cppIVRApplications_IVRApplications_007 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneProcessId(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.h b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.h
index 2b6441f8..6b2142e8 100644
--- a/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.h
+++ b/vrclient_x64/vrclient_x64/cppIVRApplications_IVRApplications_007.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRApplications_IVRApplications_007;
 struct cppIVRApplications_IVRApplications_007_AddApplicationManifest_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_004.cpp b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_004.cpp
index 2875003c..babcbbde 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_004.cpp
@@ -9,84 +9,123 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRChaperoneSetup_IVRChaperoneSetup_004
+{
+#ifdef __cplusplus
+    virtual bool CommitWorkingCopy( uint32_t ) = 0;
+    virtual void RevertWorkingCopy(  ) = 0;
+    virtual bool GetWorkingPlayAreaSize( float *, float * ) = 0;
+    virtual bool GetWorkingPlayAreaRect( HmdQuad_t * ) = 0;
+    virtual bool GetWorkingCollisionBoundsInfo( HmdQuad_t *, uint32_t * ) = 0;
+    virtual bool GetLiveCollisionBoundsInfo( HmdQuad_t *, uint32_t * ) = 0;
+    virtual bool GetWorkingSeatedZeroPoseToRawTrackingPose( HmdMatrix34_t * ) = 0;
+    virtual bool GetWorkingStandingZeroPoseToRawTrackingPose( HmdMatrix34_t * ) = 0;
+    virtual void SetWorkingPlayAreaSize( float, float ) = 0;
+    virtual void SetWorkingCollisionBoundsInfo( HmdQuad_t *, uint32_t ) = 0;
+    virtual void SetWorkingSeatedZeroPoseToRawTrackingPose( const HmdMatrix34_t * ) = 0;
+    virtual void SetWorkingStandingZeroPoseToRawTrackingPose( const HmdMatrix34_t * ) = 0;
+    virtual void ReloadFromDisk( uint32_t ) = 0;
+    virtual bool GetLiveSeatedZeroPoseToRawTrackingPose( HmdMatrix34_t * ) = 0;
+    virtual void SetWorkingWallTagInfo( uint8_t *, uint32_t ) = 0;
+    virtual bool GetLiveWallTagInfo( uint8_t *, uint32_t * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_CommitWorkingCopy( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_CommitWorkingCopy_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->CommitWorkingCopy((vr::EChaperoneConfigFile)params->configFile);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    params->_ret = iface->CommitWorkingCopy( params->configFile );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_RevertWorkingCopy( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_RevertWorkingCopy_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->RevertWorkingCopy();
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    iface->RevertWorkingCopy(  );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingPlayAreaSize( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingPlayAreaSize_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingPlayAreaSize((float *)params->pSizeX, (float *)params->pSizeZ);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    params->_ret = iface->GetWorkingPlayAreaSize( params->pSizeX, params->pSizeZ );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingPlayAreaRect( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingPlayAreaRect_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingPlayAreaRect((vr::HmdQuad_t *)params->rect);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    params->_ret = iface->GetWorkingPlayAreaRect( params->rect );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingCollisionBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingCollisionBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingCollisionBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t *)params->punQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    params->_ret = iface->GetWorkingCollisionBoundsInfo( params->pQuadsBuffer, params->punQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveCollisionBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveCollisionBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetLiveCollisionBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t *)params->punQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    params->_ret = iface->GetLiveCollisionBoundsInfo( params->pQuadsBuffer, params->punQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingSeatedZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingSeatedZeroPoseToRawTrackingPose_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingSeatedZeroPoseToRawTrackingPose((vr::HmdMatrix34_t *)params->pmatSeatedZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    params->_ret = iface->GetWorkingSeatedZeroPoseToRawTrackingPose( params->pmatSeatedZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingStandingZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetWorkingStandingZeroPoseToRawTrackingPose_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingStandingZeroPoseToRawTrackingPose((vr::HmdMatrix34_t *)params->pmatStandingZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    params->_ret = iface->GetWorkingStandingZeroPoseToRawTrackingPose( params->pmatStandingZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingPlayAreaSize( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingPlayAreaSize_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingPlayAreaSize((float)params->sizeX, (float)params->sizeZ);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    iface->SetWorkingPlayAreaSize( params->sizeX, params->sizeZ );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingCollisionBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingCollisionBoundsInfo_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingCollisionBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t)params->unQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    iface->SetWorkingCollisionBoundsInfo( params->pQuadsBuffer, params->unQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingSeatedZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingSeatedZeroPoseToRawTrackingPose_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingSeatedZeroPoseToRawTrackingPose((const vr::HmdMatrix34_t *)params->pMatSeatedZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    iface->SetWorkingSeatedZeroPoseToRawTrackingPose( params->pMatSeatedZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingStandingZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingStandingZeroPoseToRawTrackingPose_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingStandingZeroPoseToRawTrackingPose((const vr::HmdMatrix34_t *)params->pMatStandingZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    iface->SetWorkingStandingZeroPoseToRawTrackingPose( params->pMatStandingZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_ReloadFromDisk( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_ReloadFromDisk_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->ReloadFromDisk((vr::EChaperoneConfigFile)params->configFile);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    iface->ReloadFromDisk( params->configFile );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveSeatedZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveSeatedZeroPoseToRawTrackingPose_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetLiveSeatedZeroPoseToRawTrackingPose((vr::HmdMatrix34_t *)params->pmatSeatedZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    params->_ret = iface->GetLiveSeatedZeroPoseToRawTrackingPose( params->pmatSeatedZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingWallTagInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_SetWorkingWallTagInfo_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingWallTagInfo((uint8_t *)params->pTagsBuffer, (uint32_t)params->unTagCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    iface->SetWorkingWallTagInfo( params->pTagsBuffer, params->unTagCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveWallTagInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_GetLiveWallTagInfo_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetLiveWallTagInfo((uint8_t *)params->pTagsBuffer, (uint32_t *)params->punTagCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_004 *)params->linux_side;
+    params->_ret = iface->GetLiveWallTagInfo( params->pTagsBuffer, params->punTagCount );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_004.h b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_004.h
index 9880d01d..81c8b123 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_004.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRChaperoneSetup_IVRChaperoneSetup_004;
 struct cppIVRChaperoneSetup_IVRChaperoneSetup_004_CommitWorkingCopy_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_005.cpp b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_005.cpp
index 5634cc7a..d7601914 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_005.cpp
@@ -9,104 +9,151 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRChaperoneSetup_IVRChaperoneSetup_005
+{
+#ifdef __cplusplus
+    virtual bool CommitWorkingCopy( uint32_t ) = 0;
+    virtual void RevertWorkingCopy(  ) = 0;
+    virtual bool GetWorkingPlayAreaSize( float *, float * ) = 0;
+    virtual bool GetWorkingPlayAreaRect( HmdQuad_t * ) = 0;
+    virtual bool GetWorkingCollisionBoundsInfo( HmdQuad_t *, uint32_t * ) = 0;
+    virtual bool GetLiveCollisionBoundsInfo( HmdQuad_t *, uint32_t * ) = 0;
+    virtual bool GetWorkingSeatedZeroPoseToRawTrackingPose( HmdMatrix34_t * ) = 0;
+    virtual bool GetWorkingStandingZeroPoseToRawTrackingPose( HmdMatrix34_t * ) = 0;
+    virtual void SetWorkingPlayAreaSize( float, float ) = 0;
+    virtual void SetWorkingCollisionBoundsInfo( HmdQuad_t *, uint32_t ) = 0;
+    virtual void SetWorkingSeatedZeroPoseToRawTrackingPose( const HmdMatrix34_t * ) = 0;
+    virtual void SetWorkingStandingZeroPoseToRawTrackingPose( const HmdMatrix34_t * ) = 0;
+    virtual void ReloadFromDisk( uint32_t ) = 0;
+    virtual bool GetLiveSeatedZeroPoseToRawTrackingPose( HmdMatrix34_t * ) = 0;
+    virtual void SetWorkingCollisionBoundsTagsInfo( uint8_t *, uint32_t ) = 0;
+    virtual bool GetLiveCollisionBoundsTagsInfo( uint8_t *, uint32_t * ) = 0;
+    virtual bool SetWorkingPhysicalBoundsInfo( HmdQuad_t *, uint32_t ) = 0;
+    virtual bool GetLivePhysicalBoundsInfo( HmdQuad_t *, uint32_t * ) = 0;
+    virtual bool ExportLiveToBuffer( char *, uint32_t * ) = 0;
+    virtual bool ImportFromBufferToWorking( const char *, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_CommitWorkingCopy( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_CommitWorkingCopy_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->CommitWorkingCopy((vr::EChaperoneConfigFile)params->configFile);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->CommitWorkingCopy( params->configFile );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_RevertWorkingCopy( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_RevertWorkingCopy_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->RevertWorkingCopy();
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    iface->RevertWorkingCopy(  );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingPlayAreaSize( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingPlayAreaSize_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingPlayAreaSize((float *)params->pSizeX, (float *)params->pSizeZ);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->GetWorkingPlayAreaSize( params->pSizeX, params->pSizeZ );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingPlayAreaRect( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingPlayAreaRect_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingPlayAreaRect((vr::HmdQuad_t *)params->rect);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->GetWorkingPlayAreaRect( params->rect );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingCollisionBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingCollisionBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingCollisionBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t *)params->punQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->GetWorkingCollisionBoundsInfo( params->pQuadsBuffer, params->punQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveCollisionBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveCollisionBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetLiveCollisionBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t *)params->punQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->GetLiveCollisionBoundsInfo( params->pQuadsBuffer, params->punQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingSeatedZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingSeatedZeroPoseToRawTrackingPose_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingSeatedZeroPoseToRawTrackingPose((vr::HmdMatrix34_t *)params->pmatSeatedZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->GetWorkingSeatedZeroPoseToRawTrackingPose( params->pmatSeatedZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingStandingZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetWorkingStandingZeroPoseToRawTrackingPose_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingStandingZeroPoseToRawTrackingPose((vr::HmdMatrix34_t *)params->pmatStandingZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->GetWorkingStandingZeroPoseToRawTrackingPose( params->pmatStandingZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingPlayAreaSize( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingPlayAreaSize_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingPlayAreaSize((float)params->sizeX, (float)params->sizeZ);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    iface->SetWorkingPlayAreaSize( params->sizeX, params->sizeZ );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingCollisionBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingCollisionBoundsInfo_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingCollisionBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t)params->unQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    iface->SetWorkingCollisionBoundsInfo( params->pQuadsBuffer, params->unQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingSeatedZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingSeatedZeroPoseToRawTrackingPose_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingSeatedZeroPoseToRawTrackingPose((const vr::HmdMatrix34_t *)params->pMatSeatedZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    iface->SetWorkingSeatedZeroPoseToRawTrackingPose( params->pMatSeatedZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingStandingZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingStandingZeroPoseToRawTrackingPose_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingStandingZeroPoseToRawTrackingPose((const vr::HmdMatrix34_t *)params->pMatStandingZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    iface->SetWorkingStandingZeroPoseToRawTrackingPose( params->pMatStandingZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_ReloadFromDisk( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_ReloadFromDisk_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->ReloadFromDisk((vr::EChaperoneConfigFile)params->configFile);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    iface->ReloadFromDisk( params->configFile );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveSeatedZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveSeatedZeroPoseToRawTrackingPose_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetLiveSeatedZeroPoseToRawTrackingPose((vr::HmdMatrix34_t *)params->pmatSeatedZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->GetLiveSeatedZeroPoseToRawTrackingPose( params->pmatSeatedZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingCollisionBoundsTagsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingCollisionBoundsTagsInfo_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingCollisionBoundsTagsInfo((uint8_t *)params->pTagsBuffer, (uint32_t)params->unTagCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    iface->SetWorkingCollisionBoundsTagsInfo( params->pTagsBuffer, params->unTagCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveCollisionBoundsTagsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetLiveCollisionBoundsTagsInfo_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetLiveCollisionBoundsTagsInfo((uint8_t *)params->pTagsBuffer, (uint32_t *)params->punTagCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->GetLiveCollisionBoundsTagsInfo( params->pTagsBuffer, params->punTagCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingPhysicalBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_SetWorkingPhysicalBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->SetWorkingPhysicalBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t)params->unQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->SetWorkingPhysicalBoundsInfo( params->pQuadsBuffer, params->unQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetLivePhysicalBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_GetLivePhysicalBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetLivePhysicalBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t *)params->punQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->GetLivePhysicalBoundsInfo( params->pQuadsBuffer, params->punQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_ExportLiveToBuffer( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_ExportLiveToBuffer_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->ExportLiveToBuffer((char *)params->pBuffer, (uint32_t *)params->pnBufferLength);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->ExportLiveToBuffer( params->pBuffer, params->pnBufferLength );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_005_ImportFromBufferToWorking( struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_ImportFromBufferToWorking_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->ImportFromBufferToWorking((const char *)params->pBuffer, (uint32_t)params->nImportFlags);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_005 *)params->linux_side;
+    params->_ret = iface->ImportFromBufferToWorking( params->pBuffer, params->nImportFlags );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_005.h b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_005.h
index a98eded6..29a5f752 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_005.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRChaperoneSetup_IVRChaperoneSetup_005;
 struct cppIVRChaperoneSetup_IVRChaperoneSetup_005_CommitWorkingCopy_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.cpp b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.cpp
index 0d91a773..071ac1f2 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.cpp
@@ -9,104 +9,151 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRChaperoneSetup_IVRChaperoneSetup_006
+{
+#ifdef __cplusplus
+    virtual bool CommitWorkingCopy( uint32_t ) = 0;
+    virtual void RevertWorkingCopy(  ) = 0;
+    virtual bool GetWorkingPlayAreaSize( float *, float * ) = 0;
+    virtual bool GetWorkingPlayAreaRect( HmdQuad_t * ) = 0;
+    virtual bool GetWorkingCollisionBoundsInfo( HmdQuad_t *, uint32_t * ) = 0;
+    virtual bool GetLiveCollisionBoundsInfo( HmdQuad_t *, uint32_t * ) = 0;
+    virtual bool GetWorkingSeatedZeroPoseToRawTrackingPose( HmdMatrix34_t * ) = 0;
+    virtual bool GetWorkingStandingZeroPoseToRawTrackingPose( HmdMatrix34_t * ) = 0;
+    virtual void SetWorkingPlayAreaSize( float, float ) = 0;
+    virtual void SetWorkingCollisionBoundsInfo( HmdQuad_t *, uint32_t ) = 0;
+    virtual void SetWorkingPerimeter( HmdVector2_t *, uint32_t ) = 0;
+    virtual void SetWorkingSeatedZeroPoseToRawTrackingPose( const HmdMatrix34_t * ) = 0;
+    virtual void SetWorkingStandingZeroPoseToRawTrackingPose( const HmdMatrix34_t * ) = 0;
+    virtual void ReloadFromDisk( uint32_t ) = 0;
+    virtual bool GetLiveSeatedZeroPoseToRawTrackingPose( HmdMatrix34_t * ) = 0;
+    virtual bool ExportLiveToBuffer( char *, uint32_t * ) = 0;
+    virtual bool ImportFromBufferToWorking( const char *, uint32_t ) = 0;
+    virtual void ShowWorkingSetPreview(  ) = 0;
+    virtual void HideWorkingSetPreview(  ) = 0;
+    virtual void RoomSetupStarting(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_CommitWorkingCopy( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_CommitWorkingCopy_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->CommitWorkingCopy((vr::EChaperoneConfigFile)params->configFile);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    params->_ret = iface->CommitWorkingCopy( params->configFile );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_RevertWorkingCopy( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_RevertWorkingCopy_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->RevertWorkingCopy();
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    iface->RevertWorkingCopy(  );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetWorkingPlayAreaSize( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetWorkingPlayAreaSize_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingPlayAreaSize((float *)params->pSizeX, (float *)params->pSizeZ);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    params->_ret = iface->GetWorkingPlayAreaSize( params->pSizeX, params->pSizeZ );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetWorkingPlayAreaRect( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetWorkingPlayAreaRect_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingPlayAreaRect((vr::HmdQuad_t *)params->rect);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    params->_ret = iface->GetWorkingPlayAreaRect( params->rect );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetWorkingCollisionBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetWorkingCollisionBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingCollisionBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t *)params->punQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    params->_ret = iface->GetWorkingCollisionBoundsInfo( params->pQuadsBuffer, params->punQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetLiveCollisionBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetLiveCollisionBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetLiveCollisionBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t *)params->punQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    params->_ret = iface->GetLiveCollisionBoundsInfo( params->pQuadsBuffer, params->punQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetWorkingSeatedZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetWorkingSeatedZeroPoseToRawTrackingPose_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingSeatedZeroPoseToRawTrackingPose((vr::HmdMatrix34_t *)params->pmatSeatedZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    params->_ret = iface->GetWorkingSeatedZeroPoseToRawTrackingPose( params->pmatSeatedZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetWorkingStandingZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetWorkingStandingZeroPoseToRawTrackingPose_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetWorkingStandingZeroPoseToRawTrackingPose((vr::HmdMatrix34_t *)params->pmatStandingZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    params->_ret = iface->GetWorkingStandingZeroPoseToRawTrackingPose( params->pmatStandingZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_SetWorkingPlayAreaSize( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_SetWorkingPlayAreaSize_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingPlayAreaSize((float)params->sizeX, (float)params->sizeZ);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    iface->SetWorkingPlayAreaSize( params->sizeX, params->sizeZ );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_SetWorkingCollisionBoundsInfo( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_SetWorkingCollisionBoundsInfo_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingCollisionBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t)params->unQuadsCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    iface->SetWorkingCollisionBoundsInfo( params->pQuadsBuffer, params->unQuadsCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_SetWorkingPerimeter( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_SetWorkingPerimeter_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingPerimeter((vr::HmdVector2_t *)params->pPointBuffer, (uint32_t)params->unPointCount);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    iface->SetWorkingPerimeter( params->pPointBuffer, params->unPointCount );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_SetWorkingSeatedZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_SetWorkingSeatedZeroPoseToRawTrackingPose_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingSeatedZeroPoseToRawTrackingPose((const vr::HmdMatrix34_t *)params->pMatSeatedZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    iface->SetWorkingSeatedZeroPoseToRawTrackingPose( params->pMatSeatedZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_SetWorkingStandingZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_SetWorkingStandingZeroPoseToRawTrackingPose_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->SetWorkingStandingZeroPoseToRawTrackingPose((const vr::HmdMatrix34_t *)params->pMatStandingZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    iface->SetWorkingStandingZeroPoseToRawTrackingPose( params->pMatStandingZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_ReloadFromDisk( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_ReloadFromDisk_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->ReloadFromDisk((vr::EChaperoneConfigFile)params->configFile);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    iface->ReloadFromDisk( params->configFile );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetLiveSeatedZeroPoseToRawTrackingPose( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_GetLiveSeatedZeroPoseToRawTrackingPose_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->GetLiveSeatedZeroPoseToRawTrackingPose((vr::HmdMatrix34_t *)params->pmatSeatedZeroPoseToRawTrackingPose);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    params->_ret = iface->GetLiveSeatedZeroPoseToRawTrackingPose( params->pmatSeatedZeroPoseToRawTrackingPose );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_ExportLiveToBuffer( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_ExportLiveToBuffer_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->ExportLiveToBuffer((char *)params->pBuffer, (uint32_t *)params->pnBufferLength);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    params->_ret = iface->ExportLiveToBuffer( params->pBuffer, params->pnBufferLength );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_ImportFromBufferToWorking( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_ImportFromBufferToWorking_params *params )
 {
-    params->_ret = ((IVRChaperoneSetup*)params->linux_side)->ImportFromBufferToWorking((const char *)params->pBuffer, (uint32_t)params->nImportFlags);
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    params->_ret = iface->ImportFromBufferToWorking( params->pBuffer, params->nImportFlags );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_ShowWorkingSetPreview( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_ShowWorkingSetPreview_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->ShowWorkingSetPreview();
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    iface->ShowWorkingSetPreview(  );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_HideWorkingSetPreview( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_HideWorkingSetPreview_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->HideWorkingSetPreview();
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    iface->HideWorkingSetPreview(  );
 }
 
 void cppIVRChaperoneSetup_IVRChaperoneSetup_006_RoomSetupStarting( struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_RoomSetupStarting_params *params )
 {
-    ((IVRChaperoneSetup*)params->linux_side)->RoomSetupStarting();
+    struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *iface = (struct cppIVRChaperoneSetup_IVRChaperoneSetup_006 *)params->linux_side;
+    iface->RoomSetupStarting(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.h b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.h
index f83293e3..9d03a7b2 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.h
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperoneSetup_IVRChaperoneSetup_006.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRChaperoneSetup_IVRChaperoneSetup_006;
 struct cppIVRChaperoneSetup_IVRChaperoneSetup_006_CommitWorkingCopy_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.cpp b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.cpp
index 358a3e9e..5074f45f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.cpp
@@ -9,49 +9,74 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRChaperone_IVRChaperone_002
+{
+#ifdef __cplusplus
+    virtual uint32_t GetCalibrationState(  ) = 0;
+    virtual bool GetSoftBoundsInfo( ChaperoneSoftBoundsInfo_t * ) = 0;
+    virtual bool GetHardBoundsInfo( HmdQuad_t *, uint32_t * ) = 0;
+    virtual bool GetSeatedBoundsInfo( ChaperoneSeatedBoundsInfo_t * ) = 0;
+    virtual void ReloadInfo(  ) = 0;
+    virtual void SetSceneColor( HmdColor_t ) = 0;
+    virtual void GetBoundsColor( HmdColor_t *, int32_t ) = 0;
+    virtual bool AreBoundsVisible(  ) = 0;
+    virtual void ForceBoundsVisible( bool ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRChaperone_IVRChaperone_002_GetCalibrationState( struct cppIVRChaperone_IVRChaperone_002_GetCalibrationState_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->GetCalibrationState();
+    struct cppIVRChaperone_IVRChaperone_002 *iface = (struct cppIVRChaperone_IVRChaperone_002 *)params->linux_side;
+    params->_ret = iface->GetCalibrationState(  );
 }
 
 void cppIVRChaperone_IVRChaperone_002_GetSoftBoundsInfo( struct cppIVRChaperone_IVRChaperone_002_GetSoftBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->GetSoftBoundsInfo((vr::ChaperoneSoftBoundsInfo_t *)params->pInfo);
+    struct cppIVRChaperone_IVRChaperone_002 *iface = (struct cppIVRChaperone_IVRChaperone_002 *)params->linux_side;
+    params->_ret = iface->GetSoftBoundsInfo( params->pInfo );
 }
 
 void cppIVRChaperone_IVRChaperone_002_GetHardBoundsInfo( struct cppIVRChaperone_IVRChaperone_002_GetHardBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->GetHardBoundsInfo((vr::HmdQuad_t *)params->pQuadsBuffer, (uint32_t *)params->punQuadsCount);
+    struct cppIVRChaperone_IVRChaperone_002 *iface = (struct cppIVRChaperone_IVRChaperone_002 *)params->linux_side;
+    params->_ret = iface->GetHardBoundsInfo( params->pQuadsBuffer, params->punQuadsCount );
 }
 
 void cppIVRChaperone_IVRChaperone_002_GetSeatedBoundsInfo( struct cppIVRChaperone_IVRChaperone_002_GetSeatedBoundsInfo_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->GetSeatedBoundsInfo((vr::ChaperoneSeatedBoundsInfo_t *)params->pInfo);
+    struct cppIVRChaperone_IVRChaperone_002 *iface = (struct cppIVRChaperone_IVRChaperone_002 *)params->linux_side;
+    params->_ret = iface->GetSeatedBoundsInfo( params->pInfo );
 }
 
 void cppIVRChaperone_IVRChaperone_002_ReloadInfo( struct cppIVRChaperone_IVRChaperone_002_ReloadInfo_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->ReloadInfo();
+    struct cppIVRChaperone_IVRChaperone_002 *iface = (struct cppIVRChaperone_IVRChaperone_002 *)params->linux_side;
+    iface->ReloadInfo(  );
 }
 
 void cppIVRChaperone_IVRChaperone_002_SetSceneColor( struct cppIVRChaperone_IVRChaperone_002_SetSceneColor_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->SetSceneColor((vr::HmdColor_t)params->color);
+    struct cppIVRChaperone_IVRChaperone_002 *iface = (struct cppIVRChaperone_IVRChaperone_002 *)params->linux_side;
+    iface->SetSceneColor( params->color );
 }
 
 void cppIVRChaperone_IVRChaperone_002_GetBoundsColor( struct cppIVRChaperone_IVRChaperone_002_GetBoundsColor_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->GetBoundsColor((vr::HmdColor_t *)params->pOutputColorArray, (int)params->nNumOutputColors);
+    struct cppIVRChaperone_IVRChaperone_002 *iface = (struct cppIVRChaperone_IVRChaperone_002 *)params->linux_side;
+    iface->GetBoundsColor( params->pOutputColorArray, params->nNumOutputColors );
 }
 
 void cppIVRChaperone_IVRChaperone_002_AreBoundsVisible( struct cppIVRChaperone_IVRChaperone_002_AreBoundsVisible_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->AreBoundsVisible();
+    struct cppIVRChaperone_IVRChaperone_002 *iface = (struct cppIVRChaperone_IVRChaperone_002 *)params->linux_side;
+    params->_ret = iface->AreBoundsVisible(  );
 }
 
 void cppIVRChaperone_IVRChaperone_002_ForceBoundsVisible( struct cppIVRChaperone_IVRChaperone_002_ForceBoundsVisible_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->ForceBoundsVisible((bool)params->bForce);
+    struct cppIVRChaperone_IVRChaperone_002 *iface = (struct cppIVRChaperone_IVRChaperone_002 *)params->linux_side;
+    iface->ForceBoundsVisible( params->bForce );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.h b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.h
index 29ad9c2c..d059e615 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.h
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_002.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRChaperone_IVRChaperone_002;
 struct cppIVRChaperone_IVRChaperone_002_GetCalibrationState_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.cpp b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.cpp
index a3ee69d6..b344eed0 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.cpp
@@ -9,44 +9,67 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRChaperone_IVRChaperone_003
+{
+#ifdef __cplusplus
+    virtual uint32_t GetCalibrationState(  ) = 0;
+    virtual bool GetPlayAreaSize( float *, float * ) = 0;
+    virtual bool GetPlayAreaRect( HmdQuad_t * ) = 0;
+    virtual void ReloadInfo(  ) = 0;
+    virtual void SetSceneColor( HmdColor_t ) = 0;
+    virtual void GetBoundsColor( HmdColor_t *, int32_t, float, HmdColor_t * ) = 0;
+    virtual bool AreBoundsVisible(  ) = 0;
+    virtual void ForceBoundsVisible( bool ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRChaperone_IVRChaperone_003_GetCalibrationState( struct cppIVRChaperone_IVRChaperone_003_GetCalibrationState_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->GetCalibrationState();
+    struct cppIVRChaperone_IVRChaperone_003 *iface = (struct cppIVRChaperone_IVRChaperone_003 *)params->linux_side;
+    params->_ret = iface->GetCalibrationState(  );
 }
 
 void cppIVRChaperone_IVRChaperone_003_GetPlayAreaSize( struct cppIVRChaperone_IVRChaperone_003_GetPlayAreaSize_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->GetPlayAreaSize((float *)params->pSizeX, (float *)params->pSizeZ);
+    struct cppIVRChaperone_IVRChaperone_003 *iface = (struct cppIVRChaperone_IVRChaperone_003 *)params->linux_side;
+    params->_ret = iface->GetPlayAreaSize( params->pSizeX, params->pSizeZ );
 }
 
 void cppIVRChaperone_IVRChaperone_003_GetPlayAreaRect( struct cppIVRChaperone_IVRChaperone_003_GetPlayAreaRect_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->GetPlayAreaRect((vr::HmdQuad_t *)params->rect);
+    struct cppIVRChaperone_IVRChaperone_003 *iface = (struct cppIVRChaperone_IVRChaperone_003 *)params->linux_side;
+    params->_ret = iface->GetPlayAreaRect( params->rect );
 }
 
 void cppIVRChaperone_IVRChaperone_003_ReloadInfo( struct cppIVRChaperone_IVRChaperone_003_ReloadInfo_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->ReloadInfo();
+    struct cppIVRChaperone_IVRChaperone_003 *iface = (struct cppIVRChaperone_IVRChaperone_003 *)params->linux_side;
+    iface->ReloadInfo(  );
 }
 
 void cppIVRChaperone_IVRChaperone_003_SetSceneColor( struct cppIVRChaperone_IVRChaperone_003_SetSceneColor_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->SetSceneColor((vr::HmdColor_t)params->color);
+    struct cppIVRChaperone_IVRChaperone_003 *iface = (struct cppIVRChaperone_IVRChaperone_003 *)params->linux_side;
+    iface->SetSceneColor( params->color );
 }
 
 void cppIVRChaperone_IVRChaperone_003_GetBoundsColor( struct cppIVRChaperone_IVRChaperone_003_GetBoundsColor_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->GetBoundsColor((vr::HmdColor_t *)params->pOutputColorArray, (int)params->nNumOutputColors, (float)params->flCollisionBoundsFadeDistance, (vr::HmdColor_t *)params->pOutputCameraColor);
+    struct cppIVRChaperone_IVRChaperone_003 *iface = (struct cppIVRChaperone_IVRChaperone_003 *)params->linux_side;
+    iface->GetBoundsColor( params->pOutputColorArray, params->nNumOutputColors, params->flCollisionBoundsFadeDistance, params->pOutputCameraColor );
 }
 
 void cppIVRChaperone_IVRChaperone_003_AreBoundsVisible( struct cppIVRChaperone_IVRChaperone_003_AreBoundsVisible_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->AreBoundsVisible();
+    struct cppIVRChaperone_IVRChaperone_003 *iface = (struct cppIVRChaperone_IVRChaperone_003 *)params->linux_side;
+    params->_ret = iface->AreBoundsVisible(  );
 }
 
 void cppIVRChaperone_IVRChaperone_003_ForceBoundsVisible( struct cppIVRChaperone_IVRChaperone_003_ForceBoundsVisible_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->ForceBoundsVisible((bool)params->bForce);
+    struct cppIVRChaperone_IVRChaperone_003 *iface = (struct cppIVRChaperone_IVRChaperone_003 *)params->linux_side;
+    iface->ForceBoundsVisible( params->bForce );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.h b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.h
index 1cea5cf2..882c5cd7 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_003.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRChaperone_IVRChaperone_003;
 struct cppIVRChaperone_IVRChaperone_003_GetCalibrationState_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.cpp b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.cpp
index bf3ac557..bca6f746 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.cpp
@@ -9,49 +9,74 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRChaperone_IVRChaperone_004
+{
+#ifdef __cplusplus
+    virtual uint32_t GetCalibrationState(  ) = 0;
+    virtual bool GetPlayAreaSize( float *, float * ) = 0;
+    virtual bool GetPlayAreaRect( HmdQuad_t * ) = 0;
+    virtual void ReloadInfo(  ) = 0;
+    virtual void SetSceneColor( HmdColor_t ) = 0;
+    virtual void GetBoundsColor( HmdColor_t *, int32_t, float, HmdColor_t * ) = 0;
+    virtual bool AreBoundsVisible(  ) = 0;
+    virtual void ForceBoundsVisible( bool ) = 0;
+    virtual void ResetZeroPose( uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRChaperone_IVRChaperone_004_GetCalibrationState( struct cppIVRChaperone_IVRChaperone_004_GetCalibrationState_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->GetCalibrationState();
+    struct cppIVRChaperone_IVRChaperone_004 *iface = (struct cppIVRChaperone_IVRChaperone_004 *)params->linux_side;
+    params->_ret = iface->GetCalibrationState(  );
 }
 
 void cppIVRChaperone_IVRChaperone_004_GetPlayAreaSize( struct cppIVRChaperone_IVRChaperone_004_GetPlayAreaSize_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->GetPlayAreaSize((float *)params->pSizeX, (float *)params->pSizeZ);
+    struct cppIVRChaperone_IVRChaperone_004 *iface = (struct cppIVRChaperone_IVRChaperone_004 *)params->linux_side;
+    params->_ret = iface->GetPlayAreaSize( params->pSizeX, params->pSizeZ );
 }
 
 void cppIVRChaperone_IVRChaperone_004_GetPlayAreaRect( struct cppIVRChaperone_IVRChaperone_004_GetPlayAreaRect_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->GetPlayAreaRect((vr::HmdQuad_t *)params->rect);
+    struct cppIVRChaperone_IVRChaperone_004 *iface = (struct cppIVRChaperone_IVRChaperone_004 *)params->linux_side;
+    params->_ret = iface->GetPlayAreaRect( params->rect );
 }
 
 void cppIVRChaperone_IVRChaperone_004_ReloadInfo( struct cppIVRChaperone_IVRChaperone_004_ReloadInfo_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->ReloadInfo();
+    struct cppIVRChaperone_IVRChaperone_004 *iface = (struct cppIVRChaperone_IVRChaperone_004 *)params->linux_side;
+    iface->ReloadInfo(  );
 }
 
 void cppIVRChaperone_IVRChaperone_004_SetSceneColor( struct cppIVRChaperone_IVRChaperone_004_SetSceneColor_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->SetSceneColor((vr::HmdColor_t)params->color);
+    struct cppIVRChaperone_IVRChaperone_004 *iface = (struct cppIVRChaperone_IVRChaperone_004 *)params->linux_side;
+    iface->SetSceneColor( params->color );
 }
 
 void cppIVRChaperone_IVRChaperone_004_GetBoundsColor( struct cppIVRChaperone_IVRChaperone_004_GetBoundsColor_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->GetBoundsColor((vr::HmdColor_t *)params->pOutputColorArray, (int)params->nNumOutputColors, (float)params->flCollisionBoundsFadeDistance, (vr::HmdColor_t *)params->pOutputCameraColor);
+    struct cppIVRChaperone_IVRChaperone_004 *iface = (struct cppIVRChaperone_IVRChaperone_004 *)params->linux_side;
+    iface->GetBoundsColor( params->pOutputColorArray, params->nNumOutputColors, params->flCollisionBoundsFadeDistance, params->pOutputCameraColor );
 }
 
 void cppIVRChaperone_IVRChaperone_004_AreBoundsVisible( struct cppIVRChaperone_IVRChaperone_004_AreBoundsVisible_params *params )
 {
-    params->_ret = ((IVRChaperone*)params->linux_side)->AreBoundsVisible();
+    struct cppIVRChaperone_IVRChaperone_004 *iface = (struct cppIVRChaperone_IVRChaperone_004 *)params->linux_side;
+    params->_ret = iface->AreBoundsVisible(  );
 }
 
 void cppIVRChaperone_IVRChaperone_004_ForceBoundsVisible( struct cppIVRChaperone_IVRChaperone_004_ForceBoundsVisible_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->ForceBoundsVisible((bool)params->bForce);
+    struct cppIVRChaperone_IVRChaperone_004 *iface = (struct cppIVRChaperone_IVRChaperone_004 *)params->linux_side;
+    iface->ForceBoundsVisible( params->bForce );
 }
 
 void cppIVRChaperone_IVRChaperone_004_ResetZeroPose( struct cppIVRChaperone_IVRChaperone_004_ResetZeroPose_params *params )
 {
-    ((IVRChaperone*)params->linux_side)->ResetZeroPose((vr::ETrackingUniverseOrigin)params->eTrackingUniverseOrigin);
+    struct cppIVRChaperone_IVRChaperone_004 *iface = (struct cppIVRChaperone_IVRChaperone_004 *)params->linux_side;
+    iface->ResetZeroPose( params->eTrackingUniverseOrigin );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.h b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.h
index ec0d67af..ad1861b5 100644
--- a/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVRChaperone_IVRChaperone_004.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRChaperone_IVRChaperone_004;
 struct cppIVRChaperone_IVRChaperone_004_GetCalibrationState_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_002.cpp b/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_002.cpp
index 064a0583..acd747a1 100644
--- a/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_002.cpp
@@ -9,39 +9,60 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRClientCore_IVRClientCore_002
+{
+#ifdef __cplusplus
+    virtual uint32_t Init( uint32_t ) = 0;
+    virtual void Cleanup(  ) = 0;
+    virtual uint32_t IsInterfaceVersionValid( const char * ) = 0;
+    virtual void * GetGenericInterface( const char *, uint32_t * ) = 0;
+    virtual bool BIsHmdPresent(  ) = 0;
+    virtual const char * GetEnglishStringForHmdError( uint32_t ) = 0;
+    virtual const char * GetIDForVRInitError( uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRClientCore_IVRClientCore_002_Init( struct cppIVRClientCore_IVRClientCore_002_Init_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->Init((vr::EVRApplicationType)params->eApplicationType);
+    struct cppIVRClientCore_IVRClientCore_002 *iface = (struct cppIVRClientCore_IVRClientCore_002 *)params->linux_side;
+    params->_ret = iface->Init( params->eApplicationType );
 }
 
 void cppIVRClientCore_IVRClientCore_002_Cleanup( struct cppIVRClientCore_IVRClientCore_002_Cleanup_params *params )
 {
-    ((IVRClientCore*)params->linux_side)->Cleanup();
+    struct cppIVRClientCore_IVRClientCore_002 *iface = (struct cppIVRClientCore_IVRClientCore_002 *)params->linux_side;
+    iface->Cleanup(  );
 }
 
 void cppIVRClientCore_IVRClientCore_002_IsInterfaceVersionValid( struct cppIVRClientCore_IVRClientCore_002_IsInterfaceVersionValid_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->IsInterfaceVersionValid((const char *)params->pchInterfaceVersion);
+    struct cppIVRClientCore_IVRClientCore_002 *iface = (struct cppIVRClientCore_IVRClientCore_002 *)params->linux_side;
+    params->_ret = iface->IsInterfaceVersionValid( params->pchInterfaceVersion );
 }
 
 void cppIVRClientCore_IVRClientCore_002_GetGenericInterface( struct cppIVRClientCore_IVRClientCore_002_GetGenericInterface_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->GetGenericInterface((const char *)params->pchNameAndVersion, (vr::EVRInitError *)params->peError);
+    struct cppIVRClientCore_IVRClientCore_002 *iface = (struct cppIVRClientCore_IVRClientCore_002 *)params->linux_side;
+    params->_ret = iface->GetGenericInterface( params->pchNameAndVersion, params->peError );
 }
 
 void cppIVRClientCore_IVRClientCore_002_BIsHmdPresent( struct cppIVRClientCore_IVRClientCore_002_BIsHmdPresent_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->BIsHmdPresent();
+    struct cppIVRClientCore_IVRClientCore_002 *iface = (struct cppIVRClientCore_IVRClientCore_002 *)params->linux_side;
+    params->_ret = iface->BIsHmdPresent(  );
 }
 
 void cppIVRClientCore_IVRClientCore_002_GetEnglishStringForHmdError( struct cppIVRClientCore_IVRClientCore_002_GetEnglishStringForHmdError_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->GetEnglishStringForHmdError((vr::EVRInitError)params->eError);
+    struct cppIVRClientCore_IVRClientCore_002 *iface = (struct cppIVRClientCore_IVRClientCore_002 *)params->linux_side;
+    params->_ret = iface->GetEnglishStringForHmdError( params->eError );
 }
 
 void cppIVRClientCore_IVRClientCore_002_GetIDForVRInitError( struct cppIVRClientCore_IVRClientCore_002_GetIDForVRInitError_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->GetIDForVRInitError((vr::EVRInitError)params->eError);
+    struct cppIVRClientCore_IVRClientCore_002 *iface = (struct cppIVRClientCore_IVRClientCore_002 *)params->linux_side;
+    params->_ret = iface->GetIDForVRInitError( params->eError );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_002.h b/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_002.h
index 03c7f65e..1e82bdac 100644
--- a/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_002.h
+++ b/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_002.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRClientCore_IVRClientCore_002;
 struct cppIVRClientCore_IVRClientCore_002_Init_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.cpp b/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.cpp
index fc1fcaf1..bb942838 100644
--- a/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.cpp
@@ -9,39 +9,60 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRClientCore_IVRClientCore_003
+{
+#ifdef __cplusplus
+    virtual uint32_t Init( uint32_t, const char * ) = 0;
+    virtual void Cleanup(  ) = 0;
+    virtual uint32_t IsInterfaceVersionValid( const char * ) = 0;
+    virtual void * GetGenericInterface( const char *, uint32_t * ) = 0;
+    virtual bool BIsHmdPresent(  ) = 0;
+    virtual const char * GetEnglishStringForHmdError( uint32_t ) = 0;
+    virtual const char * GetIDForVRInitError( uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRClientCore_IVRClientCore_003_Init( struct cppIVRClientCore_IVRClientCore_003_Init_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->Init((vr::EVRApplicationType)params->eApplicationType, (const char *)params->pStartupInfo);
+    struct cppIVRClientCore_IVRClientCore_003 *iface = (struct cppIVRClientCore_IVRClientCore_003 *)params->linux_side;
+    params->_ret = iface->Init( params->eApplicationType, params->pStartupInfo );
 }
 
 void cppIVRClientCore_IVRClientCore_003_Cleanup( struct cppIVRClientCore_IVRClientCore_003_Cleanup_params *params )
 {
-    ((IVRClientCore*)params->linux_side)->Cleanup();
+    struct cppIVRClientCore_IVRClientCore_003 *iface = (struct cppIVRClientCore_IVRClientCore_003 *)params->linux_side;
+    iface->Cleanup(  );
 }
 
 void cppIVRClientCore_IVRClientCore_003_IsInterfaceVersionValid( struct cppIVRClientCore_IVRClientCore_003_IsInterfaceVersionValid_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->IsInterfaceVersionValid((const char *)params->pchInterfaceVersion);
+    struct cppIVRClientCore_IVRClientCore_003 *iface = (struct cppIVRClientCore_IVRClientCore_003 *)params->linux_side;
+    params->_ret = iface->IsInterfaceVersionValid( params->pchInterfaceVersion );
 }
 
 void cppIVRClientCore_IVRClientCore_003_GetGenericInterface( struct cppIVRClientCore_IVRClientCore_003_GetGenericInterface_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->GetGenericInterface((const char *)params->pchNameAndVersion, (vr::EVRInitError *)params->peError);
+    struct cppIVRClientCore_IVRClientCore_003 *iface = (struct cppIVRClientCore_IVRClientCore_003 *)params->linux_side;
+    params->_ret = iface->GetGenericInterface( params->pchNameAndVersion, params->peError );
 }
 
 void cppIVRClientCore_IVRClientCore_003_BIsHmdPresent( struct cppIVRClientCore_IVRClientCore_003_BIsHmdPresent_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->BIsHmdPresent();
+    struct cppIVRClientCore_IVRClientCore_003 *iface = (struct cppIVRClientCore_IVRClientCore_003 *)params->linux_side;
+    params->_ret = iface->BIsHmdPresent(  );
 }
 
 void cppIVRClientCore_IVRClientCore_003_GetEnglishStringForHmdError( struct cppIVRClientCore_IVRClientCore_003_GetEnglishStringForHmdError_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->GetEnglishStringForHmdError((vr::EVRInitError)params->eError);
+    struct cppIVRClientCore_IVRClientCore_003 *iface = (struct cppIVRClientCore_IVRClientCore_003 *)params->linux_side;
+    params->_ret = iface->GetEnglishStringForHmdError( params->eError );
 }
 
 void cppIVRClientCore_IVRClientCore_003_GetIDForVRInitError( struct cppIVRClientCore_IVRClientCore_003_GetIDForVRInitError_params *params )
 {
-    params->_ret = ((IVRClientCore*)params->linux_side)->GetIDForVRInitError((vr::EVRInitError)params->eError);
+    struct cppIVRClientCore_IVRClientCore_003 *iface = (struct cppIVRClientCore_IVRClientCore_003 *)params->linux_side;
+    params->_ret = iface->GetIDForVRInitError( params->eError );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.h b/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.h
index 3daed9e3..19a5e5d7 100644
--- a/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVRClientCore_IVRClientCore_003.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRClientCore_IVRClientCore_003;
 struct cppIVRClientCore_IVRClientCore_003_Init_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_005.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_005.cpp
index c02ee866..dc1df995 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_005.cpp
@@ -9,129 +9,184 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_005
+{
+#ifdef __cplusplus
+    virtual uint32_t GetLastError( char *, uint32_t ) = 0;
+    virtual void SetVSync( bool ) = 0;
+    virtual bool GetVSync(  ) = 0;
+    virtual void SetGamma( float ) = 0;
+    virtual float GetGamma(  ) = 0;
+    virtual void SetGraphicsDevice( uint32_t, void * ) = 0;
+    virtual void WaitGetPoses( TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void Submit( uint32_t, void *, Compositor_TextureBounds * ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void GetOverlayDefaults( Compositor_OverlaySettings * ) = 0;
+    virtual void SetOverlay( void *, Compositor_OverlaySettings * ) = 0;
+    virtual void SetOverlayRaw( void *, uint32_t, uint32_t, uint32_t, Compositor_OverlaySettings * ) = 0;
+    virtual void SetOverlayFromFile( const char *, Compositor_OverlaySettings * ) = 0;
+    virtual void ClearOverlay(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual bool ComputeOverlayIntersection( const Compositor_OverlaySettings *, float, uint32_t, HmdVector3_t, HmdVector3_t, HmdVector2_t *, HmdVector3_t * ) = 0;
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_005_GetLastError( struct cppIVRCompositor_IVRCompositor_005_GetLastError_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastError((char *)params->pchBuffer, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    params->_ret = iface->GetLastError( params->pchBuffer, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_005_SetVSync( struct cppIVRCompositor_IVRCompositor_005_SetVSync_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetVSync((bool)params->bVSync);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->SetVSync( params->bVSync );
 }
 
 void cppIVRCompositor_IVRCompositor_005_GetVSync( struct cppIVRCompositor_IVRCompositor_005_GetVSync_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVSync();
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    params->_ret = iface->GetVSync(  );
 }
 
 void cppIVRCompositor_IVRCompositor_005_SetGamma( struct cppIVRCompositor_IVRCompositor_005_SetGamma_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetGamma((float)params->fGamma);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->SetGamma( params->fGamma );
 }
 
 void cppIVRCompositor_IVRCompositor_005_GetGamma( struct cppIVRCompositor_IVRCompositor_005_GetGamma_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetGamma();
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    params->_ret = iface->GetGamma(  );
 }
 
 void cppIVRCompositor_IVRCompositor_005_SetGraphicsDevice( struct cppIVRCompositor_IVRCompositor_005_SetGraphicsDevice_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetGraphicsDevice((vr::Compositor_DeviceType)params->eType, (void *)params->pDevice);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->SetGraphicsDevice( params->eType, params->pDevice );
 }
 
 void cppIVRCompositor_IVRCompositor_005_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_005_WaitGetPoses_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pPoseArray, (uint32_t)params->unPoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->WaitGetPoses( params->pPoseArray, params->unPoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_005_Submit( struct cppIVRCompositor_IVRCompositor_005_Submit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->Submit((vr::Hmd_Eye)params->eEye, (void *)params->pTexture, (vr::Compositor_TextureBounds *)params->pBounds);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->Submit( params->eEye, params->pTexture, params->pBounds );
 }
 
 void cppIVRCompositor_IVRCompositor_005_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_005_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_005_GetOverlayDefaults( struct cppIVRCompositor_IVRCompositor_005_GetOverlayDefaults_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetOverlayDefaults((vr::Compositor_OverlaySettings *)params->pSettings);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->GetOverlayDefaults( params->pSettings );
 }
 
 void cppIVRCompositor_IVRCompositor_005_SetOverlay( struct cppIVRCompositor_IVRCompositor_005_SetOverlay_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetOverlay((void *)params->pTexture, (vr::Compositor_OverlaySettings *)params->pSettings);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->SetOverlay( params->pTexture, params->pSettings );
 }
 
 void cppIVRCompositor_IVRCompositor_005_SetOverlayRaw( struct cppIVRCompositor_IVRCompositor_005_SetOverlayRaw_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetOverlayRaw((void *)params->buffer, (uint32_t)params->width, (uint32_t)params->height, (uint32_t)params->depth, (vr::Compositor_OverlaySettings *)params->pSettings);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->SetOverlayRaw( params->buffer, params->width, params->height, params->depth, params->pSettings );
 }
 
 void cppIVRCompositor_IVRCompositor_005_SetOverlayFromFile( struct cppIVRCompositor_IVRCompositor_005_SetOverlayFromFile_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetOverlayFromFile((const char *)params->pchFilePath, (vr::Compositor_OverlaySettings *)params->pSettings);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->SetOverlayFromFile( params->pchFilePath, params->pSettings );
 }
 
 void cppIVRCompositor_IVRCompositor_005_ClearOverlay( struct cppIVRCompositor_IVRCompositor_005_ClearOverlay_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearOverlay();
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->ClearOverlay(  );
 }
 
 void cppIVRCompositor_IVRCompositor_005_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_005_GetFrameTiming_params *params )
 {
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
     Compositor_FrameTiming lin_pTiming;
     if (params->pTiming)
         struct_Compositor_FrameTiming_091_win_to_lin( params->pTiming, &lin_pTiming );
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming(params->pTiming ? &lin_pTiming : nullptr, (uint32_t)params->unFramesAgo);
+    params->_ret = iface->GetFrameTiming( params->pTiming ? &lin_pTiming : nullptr, params->unFramesAgo );
     if (params->pTiming)
         struct_Compositor_FrameTiming_091_lin_to_win( &lin_pTiming, params->pTiming );
 }
 
 void cppIVRCompositor_IVRCompositor_005_FadeToColor( struct cppIVRCompositor_IVRCompositor_005_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_005_FadeGrid( struct cppIVRCompositor_IVRCompositor_005_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_005_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_005_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_005_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_005_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_005_CompositorQuit( struct cppIVRCompositor_IVRCompositor_005_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_005_IsFullscreen( struct cppIVRCompositor_IVRCompositor_005_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_005_ComputeOverlayIntersection( struct cppIVRCompositor_IVRCompositor_005_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ComputeOverlayIntersection((const vr::Compositor_OverlaySettings *)params->pSettings, (float)params->fAspectRatio, (vr::TrackingUniverseOrigin)params->eOrigin, (vr::HmdVector3_t)params->vSource, (vr::HmdVector3_t)params->vDirection, (vr::HmdVector2_t *)params->pvecIntersectionUV, (vr::HmdVector3_t *)params->pvecIntersectionTrackingSpace);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->pSettings, params->fAspectRatio, params->eOrigin, params->vSource, params->vDirection, params->pvecIntersectionUV, params->pvecIntersectionTrackingSpace );
 }
 
 void cppIVRCompositor_IVRCompositor_005_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_005_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::TrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_005_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_005_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_005 *iface = (struct cppIVRCompositor_IVRCompositor_005 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_005.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_005.h
index 4a2b83af..d1940db1 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_005.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_005;
 struct cppIVRCompositor_IVRCompositor_005_GetLastError_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_006.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_006.cpp
index 70f5c450..990ea4c2 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_006.cpp
@@ -9,109 +9,156 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_006
+{
+#ifdef __cplusplus
+    virtual uint32_t GetLastError( char *, uint32_t ) = 0;
+    virtual void SetVSync( bool ) = 0;
+    virtual bool GetVSync(  ) = 0;
+    virtual void SetGamma( float ) = 0;
+    virtual float GetGamma(  ) = 0;
+    virtual void SetGraphicsDevice( uint32_t, void * ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t Submit( uint32_t, void *, VRTextureBounds_t * ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_006_GetLastError( struct cppIVRCompositor_IVRCompositor_006_GetLastError_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastError((char *)params->pchBuffer, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    params->_ret = iface->GetLastError( params->pchBuffer, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_006_SetVSync( struct cppIVRCompositor_IVRCompositor_006_SetVSync_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetVSync((bool)params->bVSync);
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    iface->SetVSync( params->bVSync );
 }
 
 void cppIVRCompositor_IVRCompositor_006_GetVSync( struct cppIVRCompositor_IVRCompositor_006_GetVSync_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVSync();
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    params->_ret = iface->GetVSync(  );
 }
 
 void cppIVRCompositor_IVRCompositor_006_SetGamma( struct cppIVRCompositor_IVRCompositor_006_SetGamma_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetGamma((float)params->fGamma);
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    iface->SetGamma( params->fGamma );
 }
 
 void cppIVRCompositor_IVRCompositor_006_GetGamma( struct cppIVRCompositor_IVRCompositor_006_GetGamma_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetGamma();
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    params->_ret = iface->GetGamma(  );
 }
 
 void cppIVRCompositor_IVRCompositor_006_SetGraphicsDevice( struct cppIVRCompositor_IVRCompositor_006_SetGraphicsDevice_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetGraphicsDevice((vr::Compositor_DeviceType)params->eType, (void *)params->pDevice);
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    iface->SetGraphicsDevice( params->eType, params->pDevice );
 }
 
 void cppIVRCompositor_IVRCompositor_006_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_006_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_006_Submit( struct cppIVRCompositor_IVRCompositor_006_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::Hmd_Eye)params->eEye, (void *)params->pTexture, (vr::VRTextureBounds_t *)params->pBounds);
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds );
 }
 
 void cppIVRCompositor_IVRCompositor_006_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_006_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_006_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_006_GetFrameTiming_params *params )
 {
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
     Compositor_FrameTiming lin_pTiming;
     if (params->pTiming)
         struct_Compositor_FrameTiming_092_win_to_lin( params->pTiming, &lin_pTiming );
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming(params->pTiming ? &lin_pTiming : nullptr, (uint32_t)params->unFramesAgo);
+    params->_ret = iface->GetFrameTiming( params->pTiming ? &lin_pTiming : nullptr, params->unFramesAgo );
     if (params->pTiming)
         struct_Compositor_FrameTiming_092_lin_to_win( &lin_pTiming, params->pTiming );
 }
 
 void cppIVRCompositor_IVRCompositor_006_FadeToColor( struct cppIVRCompositor_IVRCompositor_006_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_006_FadeGrid( struct cppIVRCompositor_IVRCompositor_006_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_006_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_006_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_006_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_006_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_006_CompositorQuit( struct cppIVRCompositor_IVRCompositor_006_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_006_IsFullscreen( struct cppIVRCompositor_IVRCompositor_006_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_006_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_006_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::TrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_006_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_006_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_006_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_006_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_006_CanRenderScene( struct cppIVRCompositor_IVRCompositor_006_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_006 *iface = (struct cppIVRCompositor_IVRCompositor_006 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_006.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_006.h
index ead8642e..6b61ebd8 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_006.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_006.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_006;
 struct cppIVRCompositor_IVRCompositor_006_GetLastError_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_007.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_007.cpp
index c56a5cd8..2187c535 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_007.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_007.cpp
@@ -9,104 +9,149 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_007
+{
+#ifdef __cplusplus
+    virtual uint32_t GetLastError( char *, uint32_t ) = 0;
+    virtual void SetVSync( bool ) = 0;
+    virtual bool GetVSync(  ) = 0;
+    virtual void SetGamma( float ) = 0;
+    virtual float GetGamma(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t Submit( uint32_t, uint32_t, void *, const VRTextureBounds_t * ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_007_GetLastError( struct cppIVRCompositor_IVRCompositor_007_GetLastError_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastError((char *)params->pchBuffer, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    params->_ret = iface->GetLastError( params->pchBuffer, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_007_SetVSync( struct cppIVRCompositor_IVRCompositor_007_SetVSync_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetVSync((bool)params->bVSync);
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    iface->SetVSync( params->bVSync );
 }
 
 void cppIVRCompositor_IVRCompositor_007_GetVSync( struct cppIVRCompositor_IVRCompositor_007_GetVSync_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVSync();
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    params->_ret = iface->GetVSync(  );
 }
 
 void cppIVRCompositor_IVRCompositor_007_SetGamma( struct cppIVRCompositor_IVRCompositor_007_SetGamma_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetGamma((float)params->fGamma);
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    iface->SetGamma( params->fGamma );
 }
 
 void cppIVRCompositor_IVRCompositor_007_GetGamma( struct cppIVRCompositor_IVRCompositor_007_GetGamma_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetGamma();
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    params->_ret = iface->GetGamma(  );
 }
 
 void cppIVRCompositor_IVRCompositor_007_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_007_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_007_Submit( struct cppIVRCompositor_IVRCompositor_007_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::Hmd_Eye)params->eEye, (vr::GraphicsAPIConvention)params->eTextureType, (void *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds);
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->eTextureType, params->pTexture, params->pBounds );
 }
 
 void cppIVRCompositor_IVRCompositor_007_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_007_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_007_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_007_GetFrameTiming_params *params )
 {
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
     Compositor_FrameTiming lin_pTiming;
     if (params->pTiming)
         struct_Compositor_FrameTiming_098_win_to_lin( params->pTiming, &lin_pTiming );
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming(params->pTiming ? &lin_pTiming : nullptr, (uint32_t)params->unFramesAgo);
+    params->_ret = iface->GetFrameTiming( params->pTiming ? &lin_pTiming : nullptr, params->unFramesAgo );
     if (params->pTiming)
         struct_Compositor_FrameTiming_098_lin_to_win( &lin_pTiming, params->pTiming );
 }
 
 void cppIVRCompositor_IVRCompositor_007_FadeToColor( struct cppIVRCompositor_IVRCompositor_007_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_007_FadeGrid( struct cppIVRCompositor_IVRCompositor_007_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_007_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_007_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_007_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_007_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_007_CompositorQuit( struct cppIVRCompositor_IVRCompositor_007_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_007_IsFullscreen( struct cppIVRCompositor_IVRCompositor_007_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_007_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_007_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::TrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_007_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_007_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_007_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_007_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_007_CanRenderScene( struct cppIVRCompositor_IVRCompositor_007_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_007 *iface = (struct cppIVRCompositor_IVRCompositor_007 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_007.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_007.h
index 5f2c0f66..7d5ce285 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_007.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_007.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_007;
 struct cppIVRCompositor_IVRCompositor_007_GetLastError_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_008.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_008.cpp
index 12dc1cce..91940775 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_008.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_008.cpp
@@ -9,139 +9,198 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_008
+{
+#ifdef __cplusplus
+    virtual uint32_t GetLastError( char *, uint32_t ) = 0;
+    virtual void SetVSync( bool ) = 0;
+    virtual bool GetVSync(  ) = 0;
+    virtual void SetGamma( float ) = 0;
+    virtual float GetGamma(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t Submit( uint32_t, uint32_t, void *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual void SetSkyboxOverride( uint32_t, void *, void *, void *, void *, void *, void * ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_008_GetLastError( struct cppIVRCompositor_IVRCompositor_008_GetLastError_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastError((char *)params->pchBuffer, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->GetLastError( params->pchBuffer, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_008_SetVSync( struct cppIVRCompositor_IVRCompositor_008_SetVSync_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetVSync((bool)params->bVSync);
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->SetVSync( params->bVSync );
 }
 
 void cppIVRCompositor_IVRCompositor_008_GetVSync( struct cppIVRCompositor_IVRCompositor_008_GetVSync_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVSync();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->GetVSync(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_SetGamma( struct cppIVRCompositor_IVRCompositor_008_SetGamma_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetGamma((float)params->fGamma);
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->SetGamma( params->fGamma );
 }
 
 void cppIVRCompositor_IVRCompositor_008_GetGamma( struct cppIVRCompositor_IVRCompositor_008_GetGamma_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetGamma();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->GetGamma(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_008_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_008_Submit( struct cppIVRCompositor_IVRCompositor_008_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::Hmd_Eye)params->eEye, (vr::GraphicsAPIConvention)params->eTextureType, (void *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::VRSubmitFlags_t)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->eTextureType, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_008_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_008_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_008_GetFrameTiming_params *params )
 {
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
     Compositor_FrameTiming lin_pTiming;
     if (params->pTiming)
         struct_Compositor_FrameTiming_0910_win_to_lin( params->pTiming, &lin_pTiming );
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming(params->pTiming ? &lin_pTiming : nullptr, (uint32_t)params->unFramesAgo);
+    params->_ret = iface->GetFrameTiming( params->pTiming ? &lin_pTiming : nullptr, params->unFramesAgo );
     if (params->pTiming)
         struct_Compositor_FrameTiming_0910_lin_to_win( &lin_pTiming, params->pTiming );
 }
 
 void cppIVRCompositor_IVRCompositor_008_FadeToColor( struct cppIVRCompositor_IVRCompositor_008_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_008_FadeGrid( struct cppIVRCompositor_IVRCompositor_008_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_008_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_008_SetSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((vr::GraphicsAPIConvention)params->eTextureType, (void *)params->pFront, (void *)params->pBack, (void *)params->pLeft, (void *)params->pRight, (void *)params->pTop, (void *)params->pBottom);
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->SetSkyboxOverride( params->eTextureType, params->pFront, params->pBack, params->pLeft, params->pRight, params->pTop, params->pBottom );
 }
 
 void cppIVRCompositor_IVRCompositor_008_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_008_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_008_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_008_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_CompositorQuit( struct cppIVRCompositor_IVRCompositor_008_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_IsFullscreen( struct cppIVRCompositor_IVRCompositor_008_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_008_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::TrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_008_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_008_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_008_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_CanRenderScene( struct cppIVRCompositor_IVRCompositor_008_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_008_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_008_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_008_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_008_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_008_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_008_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_008 *iface = (struct cppIVRCompositor_IVRCompositor_008 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_008.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_008.h
index e9c00c5f..043d18f4 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_008.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_008.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_008;
 struct cppIVRCompositor_IVRCompositor_008_GetLastError_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.cpp
index 26e7adb3..a5a3abab 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.cpp
@@ -9,129 +9,184 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_009
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_009_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_009_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_009_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_009_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_009_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_009_GetLastPoses( struct cppIVRCompositor_IVRCompositor_009_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_009_Submit( struct cppIVRCompositor_IVRCompositor_009_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_009_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_009_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_009_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_009_GetFrameTiming_params *params )
 {
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
     Compositor_FrameTiming lin_pTiming;
     if (params->pTiming)
         struct_Compositor_FrameTiming_0913_win_to_lin( params->pTiming, &lin_pTiming );
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming(params->pTiming ? &lin_pTiming : nullptr, (uint32_t)params->unFramesAgo);
+    params->_ret = iface->GetFrameTiming( params->pTiming ? &lin_pTiming : nullptr, params->unFramesAgo );
     if (params->pTiming)
         struct_Compositor_FrameTiming_0913_lin_to_win( &lin_pTiming, params->pTiming );
 }
 
 void cppIVRCompositor_IVRCompositor_009_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_009_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_FadeToColor( struct cppIVRCompositor_IVRCompositor_009_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_009_FadeGrid( struct cppIVRCompositor_IVRCompositor_009_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_009_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_009_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_009_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_009_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_009_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_009_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_CompositorQuit( struct cppIVRCompositor_IVRCompositor_009_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_IsFullscreen( struct cppIVRCompositor_IVRCompositor_009_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_009_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_009_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_CanRenderScene( struct cppIVRCompositor_IVRCompositor_009_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_009_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_009_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_009_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_009_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_009_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_009 *iface = (struct cppIVRCompositor_IVRCompositor_009 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.h
index e64aeb69..3f2b2736 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_009.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_009;
 struct cppIVRCompositor_IVRCompositor_009_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.cpp
index 08d18ea1..9f328f8a 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.cpp
@@ -9,129 +9,184 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_010
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_010_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_010_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_010_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_010_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_010_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_010_GetLastPoses( struct cppIVRCompositor_IVRCompositor_010_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_010_Submit( struct cppIVRCompositor_IVRCompositor_010_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_010_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_010_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_010_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_010_GetFrameTiming_params *params )
 {
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
     Compositor_FrameTiming lin_pTiming;
     if (params->pTiming)
         struct_Compositor_FrameTiming_0914_win_to_lin( params->pTiming, &lin_pTiming );
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming(params->pTiming ? &lin_pTiming : nullptr, (uint32_t)params->unFramesAgo);
+    params->_ret = iface->GetFrameTiming( params->pTiming ? &lin_pTiming : nullptr, params->unFramesAgo );
     if (params->pTiming)
         struct_Compositor_FrameTiming_0914_lin_to_win( &lin_pTiming, params->pTiming );
 }
 
 void cppIVRCompositor_IVRCompositor_010_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_010_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_FadeToColor( struct cppIVRCompositor_IVRCompositor_010_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_010_FadeGrid( struct cppIVRCompositor_IVRCompositor_010_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_010_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_010_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_010_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_010_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_010_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_010_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_CompositorQuit( struct cppIVRCompositor_IVRCompositor_010_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_IsFullscreen( struct cppIVRCompositor_IVRCompositor_010_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_010_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_010_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_CanRenderScene( struct cppIVRCompositor_IVRCompositor_010_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_010_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_010_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_010_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_010_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_010_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_010 *iface = (struct cppIVRCompositor_IVRCompositor_010 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.h
index f18612b8..c6198d9f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_010.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_010;
 struct cppIVRCompositor_IVRCompositor_010_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.cpp
index bea232eb..3e88b00f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.cpp
@@ -9,124 +9,179 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_011
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_011_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_011_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_011_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_011_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_011_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_011_GetLastPoses( struct cppIVRCompositor_IVRCompositor_011_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_011_Submit( struct cppIVRCompositor_IVRCompositor_011_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_011_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_011_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_011_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_011_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_011_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_011_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_FadeToColor( struct cppIVRCompositor_IVRCompositor_011_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_011_FadeGrid( struct cppIVRCompositor_IVRCompositor_011_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_011_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_011_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_011_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_011_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_011_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_011_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_CompositorQuit( struct cppIVRCompositor_IVRCompositor_011_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_IsFullscreen( struct cppIVRCompositor_IVRCompositor_011_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_011_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_011_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_CanRenderScene( struct cppIVRCompositor_IVRCompositor_011_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_011_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_011_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_011_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_011_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_011_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_011 *iface = (struct cppIVRCompositor_IVRCompositor_011 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.h
index b86bfab0..7b4b928d 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_011.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_011;
 struct cppIVRCompositor_IVRCompositor_011_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.cpp
index fa4fe866..acce259d 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.cpp
@@ -9,134 +9,193 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_012
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_012_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_012_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_012_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_012_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_012_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_012_GetLastPoses( struct cppIVRCompositor_IVRCompositor_012_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_012_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_012_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_012_Submit( struct cppIVRCompositor_IVRCompositor_012_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_012_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_012_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_012_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_012_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_012_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_012_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_FadeToColor( struct cppIVRCompositor_IVRCompositor_012_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_012_FadeGrid( struct cppIVRCompositor_IVRCompositor_012_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_012_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_012_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_012_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_012_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_012_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_012_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_CompositorQuit( struct cppIVRCompositor_IVRCompositor_012_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_IsFullscreen( struct cppIVRCompositor_IVRCompositor_012_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_012_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_012_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_CanRenderScene( struct cppIVRCompositor_IVRCompositor_012_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_012_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_012_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_012_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_012_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_012_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_012_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_012 *iface = (struct cppIVRCompositor_IVRCompositor_012 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.h
index 02a5576d..6732339c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_012.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_012;
 struct cppIVRCompositor_IVRCompositor_012_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.cpp
index 6f090ab0..87647438 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.cpp
@@ -9,139 +9,200 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_013
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_013_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_013_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_013_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_013_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_013_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_013_GetLastPoses( struct cppIVRCompositor_IVRCompositor_013_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_013_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_013_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_013_Submit( struct cppIVRCompositor_IVRCompositor_013_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_013_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_013_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_013_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_013_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_013_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_013_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_FadeToColor( struct cppIVRCompositor_IVRCompositor_013_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_013_FadeGrid( struct cppIVRCompositor_IVRCompositor_013_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_013_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_013_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_013_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_013_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_013_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_013_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_CompositorQuit( struct cppIVRCompositor_IVRCompositor_013_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_IsFullscreen( struct cppIVRCompositor_IVRCompositor_013_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_013_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_013_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_CanRenderScene( struct cppIVRCompositor_IVRCompositor_013_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_013_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_013_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_013_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_013_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_013_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_013_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_013_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_013 *iface = (struct cppIVRCompositor_IVRCompositor_013 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.h
index 372bcd41..12842295 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_013.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_013;
 struct cppIVRCompositor_IVRCompositor_013_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.cpp
index 29ee7913..b86719e6 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.cpp
@@ -9,149 +9,214 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_014
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_014_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_014_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_014_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_014_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_014_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_014_GetLastPoses( struct cppIVRCompositor_IVRCompositor_014_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_014_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_014_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_014_Submit( struct cppIVRCompositor_IVRCompositor_014_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_014_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_014_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_014_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_014_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_014_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_014_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_FadeToColor( struct cppIVRCompositor_IVRCompositor_014_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_014_FadeGrid( struct cppIVRCompositor_IVRCompositor_014_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_014_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_014_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_014_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_014_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_014_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_014_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_CompositorQuit( struct cppIVRCompositor_IVRCompositor_014_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_IsFullscreen( struct cppIVRCompositor_IVRCompositor_014_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_014_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_014_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_CanRenderScene( struct cppIVRCompositor_IVRCompositor_014_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_014_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_014_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_014_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_014_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_014_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_014_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_014_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_014_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_014_SuspendRendering( struct cppIVRCompositor_IVRCompositor_014_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_014 *iface = (struct cppIVRCompositor_IVRCompositor_014 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.h
index c11fffbf..005ff925 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_014.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_014;
 struct cppIVRCompositor_IVRCompositor_014_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.cpp
index 5275ca7d..230bdf6e 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.cpp
@@ -9,189 +9,270 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_015
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t RequestScreenshot( uint32_t, const char *, const char * ) = 0;
+    virtual uint32_t GetCurrentScreenshotType(  ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_015_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_015_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_015_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_015_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetLastPoses( struct cppIVRCompositor_IVRCompositor_015_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_015_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_015_Submit( struct cppIVRCompositor_IVRCompositor_015_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_015_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_015_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_015_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_015_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_015_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_015_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_015_FadeToColor( struct cppIVRCompositor_IVRCompositor_015_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_015_FadeGrid( struct cppIVRCompositor_IVRCompositor_015_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_015_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_015_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_015_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_015_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_015_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_015_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_CompositorQuit( struct cppIVRCompositor_IVRCompositor_015_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_IsFullscreen( struct cppIVRCompositor_IVRCompositor_015_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_015_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_015_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_CanRenderScene( struct cppIVRCompositor_IVRCompositor_015_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_015_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_015_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_015_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_015_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_015_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_015_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_015_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_015_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_SuspendRendering( struct cppIVRCompositor_IVRCompositor_015_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_015_RequestScreenshot( struct cppIVRCompositor_IVRCompositor_015_RequestScreenshot_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->RequestScreenshot((vr::EVRScreenshotType)params->type, (const char *)params->pchDestinationFileName, (const char *)params->pchVRDestinationFileName);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->RequestScreenshot( params->type, params->pchDestinationFileName, params->pchVRDestinationFileName );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetCurrentScreenshotType( struct cppIVRCompositor_IVRCompositor_015_GetCurrentScreenshotType_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentScreenshotType();
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->GetCurrentScreenshotType(  );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_015_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_015_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_015_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_015_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_015_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_015_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_015_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_015_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_015_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_015 *iface = (struct cppIVRCompositor_IVRCompositor_015 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.h
index 8ebce3ff..25b210e7 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_015.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_015;
 struct cppIVRCompositor_IVRCompositor_015_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.cpp
index e8b4793a..bf5f81d3 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.cpp
@@ -9,184 +9,261 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_016
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_016_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_016_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_016_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_016_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_016_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_016_GetLastPoses( struct cppIVRCompositor_IVRCompositor_016_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_016_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_016_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_016_Submit( struct cppIVRCompositor_IVRCompositor_016_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_016_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_016_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_016_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_016_GetFrameTiming_params *params )
 {
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
     Compositor_FrameTiming lin_pTiming;
     if (params->pTiming)
         struct_Compositor_FrameTiming_103_win_to_lin( params->pTiming, &lin_pTiming );
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming(params->pTiming ? &lin_pTiming : nullptr, (uint32_t)params->unFramesAgo);
+    params->_ret = iface->GetFrameTiming( params->pTiming ? &lin_pTiming : nullptr, params->unFramesAgo );
     if (params->pTiming)
         struct_Compositor_FrameTiming_103_lin_to_win( &lin_pTiming, params->pTiming );
 }
 
 void cppIVRCompositor_IVRCompositor_016_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_016_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_016_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_016_FadeToColor( struct cppIVRCompositor_IVRCompositor_016_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_016_FadeGrid( struct cppIVRCompositor_IVRCompositor_016_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_016_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_016_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_016_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_016_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_016_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_016_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_CompositorQuit( struct cppIVRCompositor_IVRCompositor_016_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_IsFullscreen( struct cppIVRCompositor_IVRCompositor_016_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_016_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_016_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_CanRenderScene( struct cppIVRCompositor_IVRCompositor_016_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_016_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_016_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_016_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_016_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_016_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_016_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_016_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_016_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_016_SuspendRendering( struct cppIVRCompositor_IVRCompositor_016_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_016_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_016_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_016_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_016_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_016_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_016_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_016_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_016_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_016_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_016_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_016 *iface = (struct cppIVRCompositor_IVRCompositor_016 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.h
index 3b44bf21..5bf4b264 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_016.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_016;
 struct cppIVRCompositor_IVRCompositor_016_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.cpp
index e9a5cab6..b35dde0f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.cpp
@@ -9,184 +9,263 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_017
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual uint32_t GetFrameTimings( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_017_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_017_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_017_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_017_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetLastPoses( struct cppIVRCompositor_IVRCompositor_017_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_017_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_017_Submit( struct cppIVRCompositor_IVRCompositor_017_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_017_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_017_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_017_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_017_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetFrameTimings( struct cppIVRCompositor_IVRCompositor_017_GetFrameTimings_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimings((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->nFrames);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->GetFrameTimings( params->pTiming, params->nFrames );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_017_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_017_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_017_FadeToColor( struct cppIVRCompositor_IVRCompositor_017_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_017_FadeGrid( struct cppIVRCompositor_IVRCompositor_017_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_017_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_017_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_017_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_017_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_017_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_017_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_CompositorQuit( struct cppIVRCompositor_IVRCompositor_017_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_IsFullscreen( struct cppIVRCompositor_IVRCompositor_017_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_017_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_017_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_CanRenderScene( struct cppIVRCompositor_IVRCompositor_017_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_017_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_017_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_017_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_017_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_017_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_017_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_017_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_017_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_017_SuspendRendering( struct cppIVRCompositor_IVRCompositor_017_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_017_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_017_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_017_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_017_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_017_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_017_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_017_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_017_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_017_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_017 *iface = (struct cppIVRCompositor_IVRCompositor_017 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.h
index bb6f9bc4..2cee88bf 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_017.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_017;
 struct cppIVRCompositor_IVRCompositor_017_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.cpp
index 13f1283b..d506570c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.cpp
@@ -9,194 +9,277 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_018
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual uint32_t GetFrameTimings( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual HmdColor_t GetCurrentFadeColor( bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual float GetCurrentGridAlpha(  ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_018_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_018_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_018_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_018_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetLastPoses( struct cppIVRCompositor_IVRCompositor_018_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_018_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_018_Submit( struct cppIVRCompositor_IVRCompositor_018_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_018_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_018_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_018_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_018_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetFrameTimings( struct cppIVRCompositor_IVRCompositor_018_GetFrameTimings_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimings((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->nFrames);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetFrameTimings( params->pTiming, params->nFrames );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_018_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_018_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_018_FadeToColor( struct cppIVRCompositor_IVRCompositor_018_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetCurrentFadeColor( struct cppIVRCompositor_IVRCompositor_018_GetCurrentFadeColor_params *params )
 {
-    *params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentFadeColor((bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    *params->_ret = iface->GetCurrentFadeColor( params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_018_FadeGrid( struct cppIVRCompositor_IVRCompositor_018_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetCurrentGridAlpha( struct cppIVRCompositor_IVRCompositor_018_GetCurrentGridAlpha_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentGridAlpha();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetCurrentGridAlpha(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_018_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_018_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_018_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_018_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_018_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_CompositorQuit( struct cppIVRCompositor_IVRCompositor_018_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_IsFullscreen( struct cppIVRCompositor_IVRCompositor_018_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_018_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_018_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_CanRenderScene( struct cppIVRCompositor_IVRCompositor_018_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_018_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_018_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_018_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_018_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_018_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_018_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_018_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_018_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_018_SuspendRendering( struct cppIVRCompositor_IVRCompositor_018_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_018_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_018_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_018_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_018_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_018_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_018_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_018_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_018_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_018_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_018 *iface = (struct cppIVRCompositor_IVRCompositor_018 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.h
index 2af24bce..0315630c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_018.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_018;
 struct cppIVRCompositor_IVRCompositor_018_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.cpp
index ff0a0dff..e96353b7 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.cpp
@@ -9,204 +9,291 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_019
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual uint32_t GetFrameTimings( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual HmdColor_t GetCurrentFadeColor( bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual float GetCurrentGridAlpha(  ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+    virtual uint32_t GetVulkanInstanceExtensionsRequired( char *, uint32_t ) = 0;
+    virtual uint32_t GetVulkanDeviceExtensionsRequired( VkPhysicalDevice_T *, char *, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_019_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_019_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_019_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_019_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetLastPoses( struct cppIVRCompositor_IVRCompositor_019_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_019_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_019_Submit( struct cppIVRCompositor_IVRCompositor_019_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_019_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_019_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_019_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_019_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetFrameTimings( struct cppIVRCompositor_IVRCompositor_019_GetFrameTimings_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimings((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->nFrames);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetFrameTimings( params->pTiming, params->nFrames );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_019_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_019_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_019_FadeToColor( struct cppIVRCompositor_IVRCompositor_019_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetCurrentFadeColor( struct cppIVRCompositor_IVRCompositor_019_GetCurrentFadeColor_params *params )
 {
-    *params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentFadeColor((bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    *params->_ret = iface->GetCurrentFadeColor( params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_019_FadeGrid( struct cppIVRCompositor_IVRCompositor_019_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetCurrentGridAlpha( struct cppIVRCompositor_IVRCompositor_019_GetCurrentGridAlpha_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentGridAlpha();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetCurrentGridAlpha(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_019_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_019_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_019_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_019_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_019_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_CompositorQuit( struct cppIVRCompositor_IVRCompositor_019_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_IsFullscreen( struct cppIVRCompositor_IVRCompositor_019_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_019_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_019_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_CanRenderScene( struct cppIVRCompositor_IVRCompositor_019_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_019_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_019_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_019_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_019_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_019_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_019_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_019_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_019_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_019_SuspendRendering( struct cppIVRCompositor_IVRCompositor_019_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_019_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_019_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_019_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_019_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_019_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_019_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_019_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_019_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetVulkanInstanceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_019_GetVulkanInstanceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanInstanceExtensionsRequired((char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetVulkanInstanceExtensionsRequired( params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_019_GetVulkanDeviceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_019_GetVulkanDeviceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanDeviceExtensionsRequired((VkPhysicalDevice_T *)params->pPhysicalDevice, (char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_019 *iface = (struct cppIVRCompositor_IVRCompositor_019 *)params->linux_side;
+    params->_ret = iface->GetVulkanDeviceExtensionsRequired( params->pPhysicalDevice, params->pchValue, params->unBufferSize );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.h
index fbdf3525..5d29c1a0 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_019.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_019;
 struct cppIVRCompositor_IVRCompositor_019_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.cpp
index eac22a9c..b0922456 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.cpp
@@ -9,209 +9,298 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_020
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual uint32_t GetFrameTimings( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual HmdColor_t GetCurrentFadeColor( bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual float GetCurrentGridAlpha(  ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual void ReleaseMirrorTextureD3D11( void * ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+    virtual uint32_t GetVulkanInstanceExtensionsRequired( char *, uint32_t ) = 0;
+    virtual uint32_t GetVulkanDeviceExtensionsRequired( VkPhysicalDevice_T *, char *, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_020_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_020_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_020_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_020_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetLastPoses( struct cppIVRCompositor_IVRCompositor_020_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_020_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_020_Submit( struct cppIVRCompositor_IVRCompositor_020_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_020_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_020_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_020_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_020_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetFrameTimings( struct cppIVRCompositor_IVRCompositor_020_GetFrameTimings_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimings((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->nFrames);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetFrameTimings( params->pTiming, params->nFrames );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_020_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_020_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_020_FadeToColor( struct cppIVRCompositor_IVRCompositor_020_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetCurrentFadeColor( struct cppIVRCompositor_IVRCompositor_020_GetCurrentFadeColor_params *params )
 {
-    *params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentFadeColor((bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    *params->_ret = iface->GetCurrentFadeColor( params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_020_FadeGrid( struct cppIVRCompositor_IVRCompositor_020_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetCurrentGridAlpha( struct cppIVRCompositor_IVRCompositor_020_GetCurrentGridAlpha_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentGridAlpha();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetCurrentGridAlpha(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_020_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_020_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_020_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_020_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_020_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_CompositorQuit( struct cppIVRCompositor_IVRCompositor_020_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_IsFullscreen( struct cppIVRCompositor_IVRCompositor_020_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_020_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_020_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_CanRenderScene( struct cppIVRCompositor_IVRCompositor_020_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_020_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_020_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_020_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_020_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_020_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_020_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_020_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_020_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_020_SuspendRendering( struct cppIVRCompositor_IVRCompositor_020_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_020_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_020_ReleaseMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_020_ReleaseMirrorTextureD3D11_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ReleaseMirrorTextureD3D11((void *)params->pD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->ReleaseMirrorTextureD3D11( params->pD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_020_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_020_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_020_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_020_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_020_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_020_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_020_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetVulkanInstanceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_020_GetVulkanInstanceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanInstanceExtensionsRequired((char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetVulkanInstanceExtensionsRequired( params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_020_GetVulkanDeviceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_020_GetVulkanDeviceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanDeviceExtensionsRequired((VkPhysicalDevice_T *)params->pPhysicalDevice, (char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_020 *iface = (struct cppIVRCompositor_IVRCompositor_020 *)params->linux_side;
+    params->_ret = iface->GetVulkanDeviceExtensionsRequired( params->pPhysicalDevice, params->pchValue, params->unBufferSize );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.h
index 776dee27..2f8d3c5c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_020.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_020;
 struct cppIVRCompositor_IVRCompositor_020_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.cpp
index 5f86a0c9..d3124a90 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.cpp
@@ -9,219 +9,312 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_021
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual uint32_t GetFrameTimings( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual HmdColor_t GetCurrentFadeColor( bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual float GetCurrentGridAlpha(  ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual void ReleaseMirrorTextureD3D11( void * ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+    virtual uint32_t GetVulkanInstanceExtensionsRequired( char *, uint32_t ) = 0;
+    virtual uint32_t GetVulkanDeviceExtensionsRequired( VkPhysicalDevice_T *, char *, uint32_t ) = 0;
+    virtual void SetExplicitTimingMode( bool ) = 0;
+    virtual uint32_t SubmitExplicitTimingData(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_021_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_021_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_021_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_021_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetLastPoses( struct cppIVRCompositor_IVRCompositor_021_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_021_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_021_Submit( struct cppIVRCompositor_IVRCompositor_021_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_021_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_021_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_021_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_021_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetFrameTimings( struct cppIVRCompositor_IVRCompositor_021_GetFrameTimings_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimings((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->nFrames);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetFrameTimings( params->pTiming, params->nFrames );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_021_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_021_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_021_FadeToColor( struct cppIVRCompositor_IVRCompositor_021_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetCurrentFadeColor( struct cppIVRCompositor_IVRCompositor_021_GetCurrentFadeColor_params *params )
 {
-    *params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentFadeColor((bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    *params->_ret = iface->GetCurrentFadeColor( params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_021_FadeGrid( struct cppIVRCompositor_IVRCompositor_021_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetCurrentGridAlpha( struct cppIVRCompositor_IVRCompositor_021_GetCurrentGridAlpha_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentGridAlpha();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetCurrentGridAlpha(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_021_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_021_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_021_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_021_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_021_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_CompositorQuit( struct cppIVRCompositor_IVRCompositor_021_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_IsFullscreen( struct cppIVRCompositor_IVRCompositor_021_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_021_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_021_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_CanRenderScene( struct cppIVRCompositor_IVRCompositor_021_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_021_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_021_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_021_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_021_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_021_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_021_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_021_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_021_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_021_SuspendRendering( struct cppIVRCompositor_IVRCompositor_021_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_021_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_021_ReleaseMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_021_ReleaseMirrorTextureD3D11_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ReleaseMirrorTextureD3D11((void *)params->pD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->ReleaseMirrorTextureD3D11( params->pD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_021_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_021_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_021_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_021_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_021_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_021_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_021_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetVulkanInstanceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_021_GetVulkanInstanceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanInstanceExtensionsRequired((char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetVulkanInstanceExtensionsRequired( params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_021_GetVulkanDeviceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_021_GetVulkanDeviceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanDeviceExtensionsRequired((VkPhysicalDevice_T *)params->pPhysicalDevice, (char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->GetVulkanDeviceExtensionsRequired( params->pPhysicalDevice, params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_021_SetExplicitTimingMode( struct cppIVRCompositor_IVRCompositor_021_SetExplicitTimingMode_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetExplicitTimingMode((bool)params->bExplicitTimingMode);
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    iface->SetExplicitTimingMode( params->bExplicitTimingMode );
 }
 
 void cppIVRCompositor_IVRCompositor_021_SubmitExplicitTimingData( struct cppIVRCompositor_IVRCompositor_021_SubmitExplicitTimingData_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SubmitExplicitTimingData();
+    struct cppIVRCompositor_IVRCompositor_021 *iface = (struct cppIVRCompositor_IVRCompositor_021 *)params->linux_side;
+    params->_ret = iface->SubmitExplicitTimingData(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.h
index 9e048ed3..087fcc2b 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_021.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_021;
 struct cppIVRCompositor_IVRCompositor_021_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.cpp
index 92be7567..49854932 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.cpp
@@ -9,234 +9,333 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_022
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual uint32_t GetFrameTimings( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual HmdColor_t GetCurrentFadeColor( bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual float GetCurrentGridAlpha(  ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual void ReleaseMirrorTextureD3D11( void * ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+    virtual uint32_t GetVulkanInstanceExtensionsRequired( char *, uint32_t ) = 0;
+    virtual uint32_t GetVulkanDeviceExtensionsRequired( VkPhysicalDevice_T *, char *, uint32_t ) = 0;
+    virtual void SetExplicitTimingMode( uint32_t ) = 0;
+    virtual uint32_t SubmitExplicitTimingData(  ) = 0;
+    virtual bool IsMotionSmoothingEnabled(  ) = 0;
+    virtual bool IsMotionSmoothingSupported(  ) = 0;
+    virtual bool IsCurrentSceneFocusAppLoading(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_022_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_022_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_022_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_022_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetLastPoses( struct cppIVRCompositor_IVRCompositor_022_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_022_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_022_Submit( struct cppIVRCompositor_IVRCompositor_022_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_022_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_022_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_022_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_022_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetFrameTimings( struct cppIVRCompositor_IVRCompositor_022_GetFrameTimings_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimings((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->nFrames);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetFrameTimings( params->pTiming, params->nFrames );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_022_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_022_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_022_FadeToColor( struct cppIVRCompositor_IVRCompositor_022_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetCurrentFadeColor( struct cppIVRCompositor_IVRCompositor_022_GetCurrentFadeColor_params *params )
 {
-    *params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentFadeColor((bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    *params->_ret = iface->GetCurrentFadeColor( params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_022_FadeGrid( struct cppIVRCompositor_IVRCompositor_022_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetCurrentGridAlpha( struct cppIVRCompositor_IVRCompositor_022_GetCurrentGridAlpha_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentGridAlpha();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetCurrentGridAlpha(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_022_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_022_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_022_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_022_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_022_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_CompositorQuit( struct cppIVRCompositor_IVRCompositor_022_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_IsFullscreen( struct cppIVRCompositor_IVRCompositor_022_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_022_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_022_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_CanRenderScene( struct cppIVRCompositor_IVRCompositor_022_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_022_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_022_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_022_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_022_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_022_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_022_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_022_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_022_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_SuspendRendering( struct cppIVRCompositor_IVRCompositor_022_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_022_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_022_ReleaseMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_022_ReleaseMirrorTextureD3D11_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ReleaseMirrorTextureD3D11((void *)params->pD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->ReleaseMirrorTextureD3D11( params->pD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_022_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_022_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_022_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_022_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_022_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_022_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_022_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetVulkanInstanceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_022_GetVulkanInstanceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanInstanceExtensionsRequired((char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetVulkanInstanceExtensionsRequired( params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_022_GetVulkanDeviceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_022_GetVulkanDeviceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanDeviceExtensionsRequired((VkPhysicalDevice_T *)params->pPhysicalDevice, (char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->GetVulkanDeviceExtensionsRequired( params->pPhysicalDevice, params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_022_SetExplicitTimingMode( struct cppIVRCompositor_IVRCompositor_022_SetExplicitTimingMode_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetExplicitTimingMode((vr::EVRCompositorTimingMode)params->eTimingMode);
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    iface->SetExplicitTimingMode( params->eTimingMode );
 }
 
 void cppIVRCompositor_IVRCompositor_022_SubmitExplicitTimingData( struct cppIVRCompositor_IVRCompositor_022_SubmitExplicitTimingData_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SubmitExplicitTimingData();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->SubmitExplicitTimingData(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_IsMotionSmoothingEnabled( struct cppIVRCompositor_IVRCompositor_022_IsMotionSmoothingEnabled_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMotionSmoothingEnabled();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->IsMotionSmoothingEnabled(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_IsMotionSmoothingSupported( struct cppIVRCompositor_IVRCompositor_022_IsMotionSmoothingSupported_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMotionSmoothingSupported();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->IsMotionSmoothingSupported(  );
 }
 
 void cppIVRCompositor_IVRCompositor_022_IsCurrentSceneFocusAppLoading( struct cppIVRCompositor_IVRCompositor_022_IsCurrentSceneFocusAppLoading_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsCurrentSceneFocusAppLoading();
+    struct cppIVRCompositor_IVRCompositor_022 *iface = (struct cppIVRCompositor_IVRCompositor_022 *)params->linux_side;
+    params->_ret = iface->IsCurrentSceneFocusAppLoading(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.h
index a6c49b5b..60482382 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_022.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_022;
 struct cppIVRCompositor_IVRCompositor_022_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.cpp
index 12abe2c7..47f9612f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.cpp
@@ -9,244 +9,347 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_024
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual uint32_t GetFrameTimings( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual HmdColor_t GetCurrentFadeColor( bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual float GetCurrentGridAlpha(  ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual void ReleaseMirrorTextureD3D11( void * ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+    virtual uint32_t GetVulkanInstanceExtensionsRequired( char *, uint32_t ) = 0;
+    virtual uint32_t GetVulkanDeviceExtensionsRequired( VkPhysicalDevice_T *, char *, uint32_t ) = 0;
+    virtual void SetExplicitTimingMode( uint32_t ) = 0;
+    virtual uint32_t SubmitExplicitTimingData(  ) = 0;
+    virtual bool IsMotionSmoothingEnabled(  ) = 0;
+    virtual bool IsMotionSmoothingSupported(  ) = 0;
+    virtual bool IsCurrentSceneFocusAppLoading(  ) = 0;
+    virtual uint32_t SetStageOverride_Async( const char *, const HmdMatrix34_t *, const Compositor_StageRenderSettings *, uint32_t ) = 0;
+    virtual void ClearStageOverride(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_024_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_024_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_024_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_024_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetLastPoses( struct cppIVRCompositor_IVRCompositor_024_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_024_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_024_Submit( struct cppIVRCompositor_IVRCompositor_024_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_024_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_024_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_024_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_024_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetFrameTimings( struct cppIVRCompositor_IVRCompositor_024_GetFrameTimings_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimings((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->nFrames);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetFrameTimings( params->pTiming, params->nFrames );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_024_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_024_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_024_FadeToColor( struct cppIVRCompositor_IVRCompositor_024_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetCurrentFadeColor( struct cppIVRCompositor_IVRCompositor_024_GetCurrentFadeColor_params *params )
 {
-    *params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentFadeColor((bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    *params->_ret = iface->GetCurrentFadeColor( params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_024_FadeGrid( struct cppIVRCompositor_IVRCompositor_024_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetCurrentGridAlpha( struct cppIVRCompositor_IVRCompositor_024_GetCurrentGridAlpha_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentGridAlpha();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetCurrentGridAlpha(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_024_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_024_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_024_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_024_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_024_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_CompositorQuit( struct cppIVRCompositor_IVRCompositor_024_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_IsFullscreen( struct cppIVRCompositor_IVRCompositor_024_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_024_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_024_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_CanRenderScene( struct cppIVRCompositor_IVRCompositor_024_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_024_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_024_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_024_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_024_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_024_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_024_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_024_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_024_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_SuspendRendering( struct cppIVRCompositor_IVRCompositor_024_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_024_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_024_ReleaseMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_024_ReleaseMirrorTextureD3D11_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ReleaseMirrorTextureD3D11((void *)params->pD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->ReleaseMirrorTextureD3D11( params->pD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_024_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_024_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_024_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_024_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_024_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_024_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_024_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetVulkanInstanceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_024_GetVulkanInstanceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanInstanceExtensionsRequired((char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetVulkanInstanceExtensionsRequired( params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_024_GetVulkanDeviceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_024_GetVulkanDeviceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanDeviceExtensionsRequired((VkPhysicalDevice_T *)params->pPhysicalDevice, (char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->GetVulkanDeviceExtensionsRequired( params->pPhysicalDevice, params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_024_SetExplicitTimingMode( struct cppIVRCompositor_IVRCompositor_024_SetExplicitTimingMode_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetExplicitTimingMode((vr::EVRCompositorTimingMode)params->eTimingMode);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->SetExplicitTimingMode( params->eTimingMode );
 }
 
 void cppIVRCompositor_IVRCompositor_024_SubmitExplicitTimingData( struct cppIVRCompositor_IVRCompositor_024_SubmitExplicitTimingData_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SubmitExplicitTimingData();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->SubmitExplicitTimingData(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_IsMotionSmoothingEnabled( struct cppIVRCompositor_IVRCompositor_024_IsMotionSmoothingEnabled_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMotionSmoothingEnabled();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->IsMotionSmoothingEnabled(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_IsMotionSmoothingSupported( struct cppIVRCompositor_IVRCompositor_024_IsMotionSmoothingSupported_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMotionSmoothingSupported();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->IsMotionSmoothingSupported(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_IsCurrentSceneFocusAppLoading( struct cppIVRCompositor_IVRCompositor_024_IsCurrentSceneFocusAppLoading_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsCurrentSceneFocusAppLoading();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->IsCurrentSceneFocusAppLoading(  );
 }
 
 void cppIVRCompositor_IVRCompositor_024_SetStageOverride_Async( struct cppIVRCompositor_IVRCompositor_024_SetStageOverride_Async_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetStageOverride_Async((const char *)params->pchRenderModelPath, (const vr::HmdMatrix34_t *)params->pTransform, (const vr::Compositor_StageRenderSettings *)params->pRenderSettings, (uint32_t)params->nSizeOfRenderSettings);
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    params->_ret = iface->SetStageOverride_Async( params->pchRenderModelPath, params->pTransform, params->pRenderSettings, params->nSizeOfRenderSettings );
 }
 
 void cppIVRCompositor_IVRCompositor_024_ClearStageOverride( struct cppIVRCompositor_IVRCompositor_024_ClearStageOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearStageOverride();
+    struct cppIVRCompositor_IVRCompositor_024 *iface = (struct cppIVRCompositor_IVRCompositor_024 *)params->linux_side;
+    iface->ClearStageOverride(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.h
index 29a88069..08a282e8 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_024.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_024;
 struct cppIVRCompositor_IVRCompositor_024_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp
index 030439ef..8f6b7839 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.cpp
@@ -9,259 +9,368 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_026
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual uint32_t GetFrameTimings( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual HmdColor_t GetCurrentFadeColor( bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual float GetCurrentGridAlpha(  ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual void ReleaseMirrorTextureD3D11( void * ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+    virtual uint32_t GetVulkanInstanceExtensionsRequired( char *, uint32_t ) = 0;
+    virtual uint32_t GetVulkanDeviceExtensionsRequired( VkPhysicalDevice_T *, char *, uint32_t ) = 0;
+    virtual void SetExplicitTimingMode( uint32_t ) = 0;
+    virtual uint32_t SubmitExplicitTimingData(  ) = 0;
+    virtual bool IsMotionSmoothingEnabled(  ) = 0;
+    virtual bool IsMotionSmoothingSupported(  ) = 0;
+    virtual bool IsCurrentSceneFocusAppLoading(  ) = 0;
+    virtual uint32_t SetStageOverride_Async( const char *, const HmdMatrix34_t *, const Compositor_StageRenderSettings *, uint32_t ) = 0;
+    virtual void ClearStageOverride(  ) = 0;
+    virtual bool GetCompositorBenchmarkResults( Compositor_BenchmarkResults *, uint32_t ) = 0;
+    virtual uint32_t GetLastPosePredictionIDs( uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetPosesForFrame( uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_026_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_026_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_026_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_026_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetLastPoses( struct cppIVRCompositor_IVRCompositor_026_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_026_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_026_Submit( struct cppIVRCompositor_IVRCompositor_026_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_026_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_026_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_026_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_026_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetFrameTimings( struct cppIVRCompositor_IVRCompositor_026_GetFrameTimings_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimings((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->nFrames);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetFrameTimings( params->pTiming, params->nFrames );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_026_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_026_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_026_FadeToColor( struct cppIVRCompositor_IVRCompositor_026_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetCurrentFadeColor( struct cppIVRCompositor_IVRCompositor_026_GetCurrentFadeColor_params *params )
 {
-    *params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentFadeColor((bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    *params->_ret = iface->GetCurrentFadeColor( params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_026_FadeGrid( struct cppIVRCompositor_IVRCompositor_026_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeIn);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeIn );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetCurrentGridAlpha( struct cppIVRCompositor_IVRCompositor_026_GetCurrentGridAlpha_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentGridAlpha();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetCurrentGridAlpha(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_026_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_026_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_026_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_026_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_026_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_CompositorQuit( struct cppIVRCompositor_IVRCompositor_026_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_IsFullscreen( struct cppIVRCompositor_IVRCompositor_026_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_026_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_026_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_CanRenderScene( struct cppIVRCompositor_IVRCompositor_026_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_026_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_026_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_026_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_026_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_026_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_026_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_026_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_026_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_SuspendRendering( struct cppIVRCompositor_IVRCompositor_026_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_026_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_026_ReleaseMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_026_ReleaseMirrorTextureD3D11_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ReleaseMirrorTextureD3D11((void *)params->pD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->ReleaseMirrorTextureD3D11( params->pD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_026_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_026_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_026_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_026_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_026_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_026_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_026_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetVulkanInstanceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_026_GetVulkanInstanceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanInstanceExtensionsRequired((char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetVulkanInstanceExtensionsRequired( params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetVulkanDeviceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_026_GetVulkanDeviceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanDeviceExtensionsRequired((VkPhysicalDevice_T *)params->pPhysicalDevice, (char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetVulkanDeviceExtensionsRequired( params->pPhysicalDevice, params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_026_SetExplicitTimingMode( struct cppIVRCompositor_IVRCompositor_026_SetExplicitTimingMode_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetExplicitTimingMode((vr::EVRCompositorTimingMode)params->eTimingMode);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->SetExplicitTimingMode( params->eTimingMode );
 }
 
 void cppIVRCompositor_IVRCompositor_026_SubmitExplicitTimingData( struct cppIVRCompositor_IVRCompositor_026_SubmitExplicitTimingData_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SubmitExplicitTimingData();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->SubmitExplicitTimingData(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_IsMotionSmoothingEnabled( struct cppIVRCompositor_IVRCompositor_026_IsMotionSmoothingEnabled_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMotionSmoothingEnabled();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->IsMotionSmoothingEnabled(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_IsMotionSmoothingSupported( struct cppIVRCompositor_IVRCompositor_026_IsMotionSmoothingSupported_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMotionSmoothingSupported();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->IsMotionSmoothingSupported(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_IsCurrentSceneFocusAppLoading( struct cppIVRCompositor_IVRCompositor_026_IsCurrentSceneFocusAppLoading_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsCurrentSceneFocusAppLoading();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->IsCurrentSceneFocusAppLoading(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_SetStageOverride_Async( struct cppIVRCompositor_IVRCompositor_026_SetStageOverride_Async_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetStageOverride_Async((const char *)params->pchRenderModelPath, (const vr::HmdMatrix34_t *)params->pTransform, (const vr::Compositor_StageRenderSettings *)params->pRenderSettings, (uint32_t)params->nSizeOfRenderSettings);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->SetStageOverride_Async( params->pchRenderModelPath, params->pTransform, params->pRenderSettings, params->nSizeOfRenderSettings );
 }
 
 void cppIVRCompositor_IVRCompositor_026_ClearStageOverride( struct cppIVRCompositor_IVRCompositor_026_ClearStageOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearStageOverride();
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    iface->ClearStageOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetCompositorBenchmarkResults( struct cppIVRCompositor_IVRCompositor_026_GetCompositorBenchmarkResults_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCompositorBenchmarkResults((vr::Compositor_BenchmarkResults *)params->pBenchmarkResults, (uint32_t)params->nSizeOfBenchmarkResults);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetCompositorBenchmarkResults( params->pBenchmarkResults, params->nSizeOfBenchmarkResults );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetLastPosePredictionIDs( struct cppIVRCompositor_IVRCompositor_026_GetLastPosePredictionIDs_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPosePredictionIDs((uint32_t *)params->pRenderPosePredictionID, (uint32_t *)params->pGamePosePredictionID);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetLastPosePredictionIDs( params->pRenderPosePredictionID, params->pGamePosePredictionID );
 }
 
 void cppIVRCompositor_IVRCompositor_026_GetPosesForFrame( struct cppIVRCompositor_IVRCompositor_026_GetPosesForFrame_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetPosesForFrame((uint32_t)params->unPosePredictionID, (vr::TrackedDevicePose_t *)params->pPoseArray, (uint32_t)params->unPoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_026 *iface = (struct cppIVRCompositor_IVRCompositor_026 *)params->linux_side;
+    params->_ret = iface->GetPosesForFrame( params->unPosePredictionID, params->pPoseArray, params->unPoseArrayCount );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.h
index 473289bd..3efe552e 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_026.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_026;
 struct cppIVRCompositor_IVRCompositor_026_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.cpp b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.cpp
index 5eabc411..3242ce30 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.cpp
@@ -9,259 +9,368 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRCompositor_IVRCompositor_027
+{
+#ifdef __cplusplus
+    virtual void SetTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetTrackingSpace(  ) = 0;
+    virtual uint32_t WaitGetPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoses( TrackedDevicePose_t *, uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual uint32_t GetLastPoseForTrackedDeviceIndex( uint32_t, TrackedDevicePose_t *, TrackedDevicePose_t * ) = 0;
+    virtual uint32_t Submit( uint32_t, const Texture_t *, const VRTextureBounds_t *, uint32_t ) = 0;
+    virtual void ClearLastSubmittedFrame(  ) = 0;
+    virtual void PostPresentHandoff(  ) = 0;
+    virtual bool GetFrameTiming( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual uint32_t GetFrameTimings( Compositor_FrameTiming *, uint32_t ) = 0;
+    virtual float GetFrameTimeRemaining(  ) = 0;
+    virtual void GetCumulativeStats( Compositor_CumulativeStats *, uint32_t ) = 0;
+    virtual void FadeToColor( float, float, float, float, float, bool ) = 0;
+    virtual HmdColor_t GetCurrentFadeColor( bool ) = 0;
+    virtual void FadeGrid( float, bool ) = 0;
+    virtual float GetCurrentGridAlpha(  ) = 0;
+    virtual uint32_t SetSkyboxOverride( const Texture_t *, uint32_t ) = 0;
+    virtual void ClearSkyboxOverride(  ) = 0;
+    virtual void CompositorBringToFront(  ) = 0;
+    virtual void CompositorGoToBack(  ) = 0;
+    virtual void CompositorQuit(  ) = 0;
+    virtual bool IsFullscreen(  ) = 0;
+    virtual uint32_t GetCurrentSceneFocusProcess(  ) = 0;
+    virtual uint32_t GetLastFrameRenderer(  ) = 0;
+    virtual bool CanRenderScene(  ) = 0;
+    virtual void ShowMirrorWindow(  ) = 0;
+    virtual void HideMirrorWindow(  ) = 0;
+    virtual bool IsMirrorWindowVisible(  ) = 0;
+    virtual void CompositorDumpImages(  ) = 0;
+    virtual bool ShouldAppRenderWithLowResources(  ) = 0;
+    virtual void ForceInterleavedReprojectionOn( bool ) = 0;
+    virtual void ForceReconnectProcess(  ) = 0;
+    virtual void SuspendRendering( bool ) = 0;
+    virtual uint32_t GetMirrorTextureD3D11( uint32_t, void *, void ** ) = 0;
+    virtual void ReleaseMirrorTextureD3D11( void * ) = 0;
+    virtual uint32_t GetMirrorTextureGL( uint32_t, uint32_t *, void ** ) = 0;
+    virtual bool ReleaseSharedGLTexture( uint32_t, void * ) = 0;
+    virtual void LockGLSharedTextureForAccess( void * ) = 0;
+    virtual void UnlockGLSharedTextureForAccess( void * ) = 0;
+    virtual uint32_t GetVulkanInstanceExtensionsRequired( char *, uint32_t ) = 0;
+    virtual uint32_t GetVulkanDeviceExtensionsRequired( VkPhysicalDevice_T *, char *, uint32_t ) = 0;
+    virtual void SetExplicitTimingMode( uint32_t ) = 0;
+    virtual uint32_t SubmitExplicitTimingData(  ) = 0;
+    virtual bool IsMotionSmoothingEnabled(  ) = 0;
+    virtual bool IsMotionSmoothingSupported(  ) = 0;
+    virtual bool IsCurrentSceneFocusAppLoading(  ) = 0;
+    virtual uint32_t SetStageOverride_Async( const char *, const HmdMatrix34_t *, const Compositor_StageRenderSettings *, uint32_t ) = 0;
+    virtual void ClearStageOverride(  ) = 0;
+    virtual bool GetCompositorBenchmarkResults( Compositor_BenchmarkResults *, uint32_t ) = 0;
+    virtual uint32_t GetLastPosePredictionIDs( uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetPosesForFrame( uint32_t, TrackedDevicePose_t *, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRCompositor_IVRCompositor_027_SetTrackingSpace( struct cppIVRCompositor_IVRCompositor_027_SetTrackingSpace_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetTrackingSpace((vr::ETrackingUniverseOrigin)params->eOrigin);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->SetTrackingSpace( params->eOrigin );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetTrackingSpace( struct cppIVRCompositor_IVRCompositor_027_GetTrackingSpace_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetTrackingSpace();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetTrackingSpace(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_WaitGetPoses( struct cppIVRCompositor_IVRCompositor_027_WaitGetPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->WaitGetPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->WaitGetPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetLastPoses( struct cppIVRCompositor_IVRCompositor_027_GetLastPoses_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoses((vr::TrackedDevicePose_t *)params->pRenderPoseArray, (uint32_t)params->unRenderPoseArrayCount, (vr::TrackedDevicePose_t *)params->pGamePoseArray, (uint32_t)params->unGamePoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetLastPoses( params->pRenderPoseArray, params->unRenderPoseArrayCount, params->pGamePoseArray, params->unGamePoseArrayCount );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetLastPoseForTrackedDeviceIndex( struct cppIVRCompositor_IVRCompositor_027_GetLastPoseForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPoseForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDevicePose_t *)params->pOutputPose, (vr::TrackedDevicePose_t *)params->pOutputGamePose);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetLastPoseForTrackedDeviceIndex( params->unDeviceIndex, params->pOutputPose, params->pOutputGamePose );
 }
 
 void cppIVRCompositor_IVRCompositor_027_Submit( struct cppIVRCompositor_IVRCompositor_027_Submit_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->Submit((vr::EVREye)params->eEye, (const vr::Texture_t *)params->pTexture, (const vr::VRTextureBounds_t *)params->pBounds, (vr::EVRSubmitFlags)params->nSubmitFlags);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->Submit( params->eEye, params->pTexture, params->pBounds, params->nSubmitFlags );
 }
 
 void cppIVRCompositor_IVRCompositor_027_ClearLastSubmittedFrame( struct cppIVRCompositor_IVRCompositor_027_ClearLastSubmittedFrame_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearLastSubmittedFrame();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->ClearLastSubmittedFrame(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_PostPresentHandoff( struct cppIVRCompositor_IVRCompositor_027_PostPresentHandoff_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->PostPresentHandoff();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->PostPresentHandoff(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetFrameTiming( struct cppIVRCompositor_IVRCompositor_027_GetFrameTiming_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTiming((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->unFramesAgo);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetFrameTiming( params->pTiming, params->unFramesAgo );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetFrameTimings( struct cppIVRCompositor_IVRCompositor_027_GetFrameTimings_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimings((vr::Compositor_FrameTiming *)params->pTiming, (uint32_t)params->nFrames);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetFrameTimings( params->pTiming, params->nFrames );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetFrameTimeRemaining( struct cppIVRCompositor_IVRCompositor_027_GetFrameTimeRemaining_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetFrameTimeRemaining();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetFrameTimeRemaining(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetCumulativeStats( struct cppIVRCompositor_IVRCompositor_027_GetCumulativeStats_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->GetCumulativeStats((vr::Compositor_CumulativeStats *)params->pStats, (uint32_t)params->nStatsSizeInBytes);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->GetCumulativeStats( params->pStats, params->nStatsSizeInBytes );
 }
 
 void cppIVRCompositor_IVRCompositor_027_FadeToColor( struct cppIVRCompositor_IVRCompositor_027_FadeToColor_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeToColor((float)params->fSeconds, (float)params->fRed, (float)params->fGreen, (float)params->fBlue, (float)params->fAlpha, (bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->FadeToColor( params->fSeconds, params->fRed, params->fGreen, params->fBlue, params->fAlpha, params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetCurrentFadeColor( struct cppIVRCompositor_IVRCompositor_027_GetCurrentFadeColor_params *params )
 {
-    *params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentFadeColor((bool)params->bBackground);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    *params->_ret = iface->GetCurrentFadeColor( params->bBackground );
 }
 
 void cppIVRCompositor_IVRCompositor_027_FadeGrid( struct cppIVRCompositor_IVRCompositor_027_FadeGrid_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->FadeGrid((float)params->fSeconds, (bool)params->bFadeGridIn);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->FadeGrid( params->fSeconds, params->bFadeGridIn );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetCurrentGridAlpha( struct cppIVRCompositor_IVRCompositor_027_GetCurrentGridAlpha_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentGridAlpha();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetCurrentGridAlpha(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_SetSkyboxOverride( struct cppIVRCompositor_IVRCompositor_027_SetSkyboxOverride_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetSkyboxOverride((const vr::Texture_t *)params->pTextures, (uint32_t)params->unTextureCount);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->SetSkyboxOverride( params->pTextures, params->unTextureCount );
 }
 
 void cppIVRCompositor_IVRCompositor_027_ClearSkyboxOverride( struct cppIVRCompositor_IVRCompositor_027_ClearSkyboxOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearSkyboxOverride();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->ClearSkyboxOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_CompositorBringToFront( struct cppIVRCompositor_IVRCompositor_027_CompositorBringToFront_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorBringToFront();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->CompositorBringToFront(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_CompositorGoToBack( struct cppIVRCompositor_IVRCompositor_027_CompositorGoToBack_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorGoToBack();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->CompositorGoToBack(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_CompositorQuit( struct cppIVRCompositor_IVRCompositor_027_CompositorQuit_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorQuit();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->CompositorQuit(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_IsFullscreen( struct cppIVRCompositor_IVRCompositor_027_IsFullscreen_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsFullscreen();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->IsFullscreen(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetCurrentSceneFocusProcess( struct cppIVRCompositor_IVRCompositor_027_GetCurrentSceneFocusProcess_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCurrentSceneFocusProcess();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetCurrentSceneFocusProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetLastFrameRenderer( struct cppIVRCompositor_IVRCompositor_027_GetLastFrameRenderer_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastFrameRenderer();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetLastFrameRenderer(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_CanRenderScene( struct cppIVRCompositor_IVRCompositor_027_CanRenderScene_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->CanRenderScene();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->CanRenderScene(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_ShowMirrorWindow( struct cppIVRCompositor_IVRCompositor_027_ShowMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ShowMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->ShowMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_HideMirrorWindow( struct cppIVRCompositor_IVRCompositor_027_HideMirrorWindow_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->HideMirrorWindow();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->HideMirrorWindow(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_IsMirrorWindowVisible( struct cppIVRCompositor_IVRCompositor_027_IsMirrorWindowVisible_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMirrorWindowVisible();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->IsMirrorWindowVisible(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_CompositorDumpImages( struct cppIVRCompositor_IVRCompositor_027_CompositorDumpImages_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->CompositorDumpImages();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->CompositorDumpImages(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_ShouldAppRenderWithLowResources( struct cppIVRCompositor_IVRCompositor_027_ShouldAppRenderWithLowResources_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ShouldAppRenderWithLowResources();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->ShouldAppRenderWithLowResources(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_ForceInterleavedReprojectionOn( struct cppIVRCompositor_IVRCompositor_027_ForceInterleavedReprojectionOn_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceInterleavedReprojectionOn((bool)params->bOverride);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->ForceInterleavedReprojectionOn( params->bOverride );
 }
 
 void cppIVRCompositor_IVRCompositor_027_ForceReconnectProcess( struct cppIVRCompositor_IVRCompositor_027_ForceReconnectProcess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ForceReconnectProcess();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->ForceReconnectProcess(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_SuspendRendering( struct cppIVRCompositor_IVRCompositor_027_SuspendRendering_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SuspendRendering((bool)params->bSuspend);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->SuspendRendering( params->bSuspend );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_027_GetMirrorTextureD3D11_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureD3D11((vr::EVREye)params->eEye, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureD3D11( params->eEye, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_027_ReleaseMirrorTextureD3D11( struct cppIVRCompositor_IVRCompositor_027_ReleaseMirrorTextureD3D11_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ReleaseMirrorTextureD3D11((void *)params->pD3D11ShaderResourceView);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->ReleaseMirrorTextureD3D11( params->pD3D11ShaderResourceView );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetMirrorTextureGL( struct cppIVRCompositor_IVRCompositor_027_GetMirrorTextureGL_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetMirrorTextureGL((vr::EVREye)params->eEye, (vr::glUInt_t *)params->pglTextureId, (vr::glSharedTextureHandle_t *)params->pglSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetMirrorTextureGL( params->eEye, params->pglTextureId, params->pglSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_027_ReleaseSharedGLTexture( struct cppIVRCompositor_IVRCompositor_027_ReleaseSharedGLTexture_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->ReleaseSharedGLTexture((vr::glUInt_t)params->glTextureId, (vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->ReleaseSharedGLTexture( params->glTextureId, params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_027_LockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_027_LockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->LockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->LockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_027_UnlockGLSharedTextureForAccess( struct cppIVRCompositor_IVRCompositor_027_UnlockGLSharedTextureForAccess_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->UnlockGLSharedTextureForAccess((vr::glSharedTextureHandle_t)params->glSharedTextureHandle);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->UnlockGLSharedTextureForAccess( params->glSharedTextureHandle );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetVulkanInstanceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_027_GetVulkanInstanceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanInstanceExtensionsRequired((char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetVulkanInstanceExtensionsRequired( params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetVulkanDeviceExtensionsRequired( struct cppIVRCompositor_IVRCompositor_027_GetVulkanDeviceExtensionsRequired_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetVulkanDeviceExtensionsRequired((VkPhysicalDevice_T *)params->pPhysicalDevice, (char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetVulkanDeviceExtensionsRequired( params->pPhysicalDevice, params->pchValue, params->unBufferSize );
 }
 
 void cppIVRCompositor_IVRCompositor_027_SetExplicitTimingMode( struct cppIVRCompositor_IVRCompositor_027_SetExplicitTimingMode_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->SetExplicitTimingMode((vr::EVRCompositorTimingMode)params->eTimingMode);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->SetExplicitTimingMode( params->eTimingMode );
 }
 
 void cppIVRCompositor_IVRCompositor_027_SubmitExplicitTimingData( struct cppIVRCompositor_IVRCompositor_027_SubmitExplicitTimingData_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SubmitExplicitTimingData();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->SubmitExplicitTimingData(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_IsMotionSmoothingEnabled( struct cppIVRCompositor_IVRCompositor_027_IsMotionSmoothingEnabled_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMotionSmoothingEnabled();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->IsMotionSmoothingEnabled(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_IsMotionSmoothingSupported( struct cppIVRCompositor_IVRCompositor_027_IsMotionSmoothingSupported_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsMotionSmoothingSupported();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->IsMotionSmoothingSupported(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_IsCurrentSceneFocusAppLoading( struct cppIVRCompositor_IVRCompositor_027_IsCurrentSceneFocusAppLoading_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->IsCurrentSceneFocusAppLoading();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->IsCurrentSceneFocusAppLoading(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_SetStageOverride_Async( struct cppIVRCompositor_IVRCompositor_027_SetStageOverride_Async_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->SetStageOverride_Async((const char *)params->pchRenderModelPath, (const vr::HmdMatrix34_t *)params->pTransform, (const vr::Compositor_StageRenderSettings *)params->pRenderSettings, (uint32_t)params->nSizeOfRenderSettings);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->SetStageOverride_Async( params->pchRenderModelPath, params->pTransform, params->pRenderSettings, params->nSizeOfRenderSettings );
 }
 
 void cppIVRCompositor_IVRCompositor_027_ClearStageOverride( struct cppIVRCompositor_IVRCompositor_027_ClearStageOverride_params *params )
 {
-    ((IVRCompositor*)params->linux_side)->ClearStageOverride();
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    iface->ClearStageOverride(  );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetCompositorBenchmarkResults( struct cppIVRCompositor_IVRCompositor_027_GetCompositorBenchmarkResults_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetCompositorBenchmarkResults((vr::Compositor_BenchmarkResults *)params->pBenchmarkResults, (uint32_t)params->nSizeOfBenchmarkResults);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetCompositorBenchmarkResults( params->pBenchmarkResults, params->nSizeOfBenchmarkResults );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetLastPosePredictionIDs( struct cppIVRCompositor_IVRCompositor_027_GetLastPosePredictionIDs_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetLastPosePredictionIDs((uint32_t *)params->pRenderPosePredictionID, (uint32_t *)params->pGamePosePredictionID);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetLastPosePredictionIDs( params->pRenderPosePredictionID, params->pGamePosePredictionID );
 }
 
 void cppIVRCompositor_IVRCompositor_027_GetPosesForFrame( struct cppIVRCompositor_IVRCompositor_027_GetPosesForFrame_params *params )
 {
-    params->_ret = ((IVRCompositor*)params->linux_side)->GetPosesForFrame((uint32_t)params->unPosePredictionID, (vr::TrackedDevicePose_t *)params->pPoseArray, (uint32_t)params->unPoseArrayCount);
+    struct cppIVRCompositor_IVRCompositor_027 *iface = (struct cppIVRCompositor_IVRCompositor_027 *)params->linux_side;
+    params->_ret = iface->GetPosesForFrame( params->unPosePredictionID, params->pPoseArray, params->unPoseArrayCount );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.h b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.h
index f5ee3769..742b37f2 100644
--- a/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.h
+++ b/vrclient_x64/vrclient_x64/cppIVRCompositor_IVRCompositor_027.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRCompositor_IVRCompositor_027;
 struct cppIVRCompositor_IVRCompositor_027_SetTrackingSpace_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRControlPanel_IVRControlPanel_006.cpp b/vrclient_x64/vrclient_x64/cppIVRControlPanel_IVRControlPanel_006.cpp
index ae189284..208c61d9 100644
--- a/vrclient_x64/vrclient_x64/cppIVRControlPanel_IVRControlPanel_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRControlPanel_IVRControlPanel_006.cpp
@@ -9,144 +9,207 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRControlPanel_IVRControlPanel_006
+{
+#ifdef __cplusplus
+    virtual uint32_t undoc1(  ) = 0;
+    virtual uint32_t undoc2( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t undoc3( const char * ) = 0;
+    virtual uint32_t undoc4( const char * ) = 0;
+    virtual uint32_t undoc5( const char *, uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t undoc6( const char *, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t undoc7( const char *, const char *, char *, uint32_t ) = 0;
+    virtual bool undoc8( uint32_t ) = 0;
+    virtual void undoc9(  ) = 0;
+    virtual void undoc10(  ) = 0;
+    virtual bool undoc11( uint32_t ) = 0;
+    virtual void undoc12(  ) = 0;
+    virtual void undoc13( uint32_t ) = 0;
+    virtual void undoc14( uint32_t ) = 0;
+    virtual uint32_t undoc15(  ) = 0;
+    virtual void undoc16( bool ) = 0;
+    virtual bool undoc17(  ) = 0;
+    virtual uint32_t undoc18(  ) = 0;
+    virtual void undoc19( bool ) = 0;
+    virtual bool undoc20(  ) = 0;
+    virtual uint32_t undoc21(  ) = 0;
+    virtual void undoc22( uint64_t, const char *, uint32_t, uint32_t, const char * ) = 0;
+    virtual bool undoc23( const char * ) = 0;
+    virtual bool undoc24(  ) = 0;
+    virtual bool undoc25( bool ) = 0;
+    virtual uint64_t undoc26(  ) = 0;
+    virtual uint32_t undoc27( const char * ) = 0;
+    virtual void undoc28( uint64_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRControlPanel_IVRControlPanel_006_undoc1( struct cppIVRControlPanel_IVRControlPanel_006_undoc1_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc1();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc1(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc2( struct cppIVRControlPanel_IVRControlPanel_006_undoc2_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc2((uint32_t)params->a, (char *)params->b, (uint32_t)params->c);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc2( params->a, params->b, params->c );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc3( struct cppIVRControlPanel_IVRControlPanel_006_undoc3_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc3((const char *)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc3( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc4( struct cppIVRControlPanel_IVRControlPanel_006_undoc4_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc4((const char *)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc4( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc5( struct cppIVRControlPanel_IVRControlPanel_006_undoc5_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc5((const char *)params->a, (uint32_t)params->b, (char *)params->c, (uint32_t)params->d);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc5( params->a, params->b, params->c, params->d );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc6( struct cppIVRControlPanel_IVRControlPanel_006_undoc6_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc6((const char *)params->a, (const char *)params->b, (char *)params->c, (uint32_t)params->d);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc6( params->a, params->b, params->c, params->d );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc7( struct cppIVRControlPanel_IVRControlPanel_006_undoc7_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc7((const char *)params->a, (const char *)params->b, (char *)params->c, (uint32_t)params->d);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc7( params->a, params->b, params->c, params->d );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc8( struct cppIVRControlPanel_IVRControlPanel_006_undoc8_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc8((uint32_t)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc8( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc9( struct cppIVRControlPanel_IVRControlPanel_006_undoc9_params *params )
 {
-    ((IVRControlPanel*)params->linux_side)->undoc9();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    iface->undoc9(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc10( struct cppIVRControlPanel_IVRControlPanel_006_undoc10_params *params )
 {
-    ((IVRControlPanel*)params->linux_side)->undoc10();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    iface->undoc10(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc11( struct cppIVRControlPanel_IVRControlPanel_006_undoc11_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc11((uint32_t)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc11( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc12( struct cppIVRControlPanel_IVRControlPanel_006_undoc12_params *params )
 {
-    ((IVRControlPanel*)params->linux_side)->undoc12();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    iface->undoc12(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc13( struct cppIVRControlPanel_IVRControlPanel_006_undoc13_params *params )
 {
-    ((IVRControlPanel*)params->linux_side)->undoc13((vr::TrackedDeviceIndex_t)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    iface->undoc13( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc14( struct cppIVRControlPanel_IVRControlPanel_006_undoc14_params *params )
 {
-    ((IVRControlPanel*)params->linux_side)->undoc14((vr::EVRState)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    iface->undoc14( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc15( struct cppIVRControlPanel_IVRControlPanel_006_undoc15_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc15();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc15(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc16( struct cppIVRControlPanel_IVRControlPanel_006_undoc16_params *params )
 {
-    ((IVRControlPanel*)params->linux_side)->undoc16((bool)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    iface->undoc16( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc17( struct cppIVRControlPanel_IVRControlPanel_006_undoc17_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc17();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc17(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc18( struct cppIVRControlPanel_IVRControlPanel_006_undoc18_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc18();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc18(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc19( struct cppIVRControlPanel_IVRControlPanel_006_undoc19_params *params )
 {
-    ((IVRControlPanel*)params->linux_side)->undoc19((bool)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    iface->undoc19( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc20( struct cppIVRControlPanel_IVRControlPanel_006_undoc20_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc20();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc20(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc21( struct cppIVRControlPanel_IVRControlPanel_006_undoc21_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc21();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc21(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc22( struct cppIVRControlPanel_IVRControlPanel_006_undoc22_params *params )
 {
-    ((IVRControlPanel*)params->linux_side)->undoc22((vr::WebConsoleHandle_t)params->a, (const char *)params->b, (uint32_t)params->c, (uint32_t)params->d, (const char *)params->e);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    iface->undoc22( params->a, params->b, params->c, params->d, params->e );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc23( struct cppIVRControlPanel_IVRControlPanel_006_undoc23_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc23((const char *)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc23( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc24( struct cppIVRControlPanel_IVRControlPanel_006_undoc24_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc24();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc24(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc25( struct cppIVRControlPanel_IVRControlPanel_006_undoc25_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc25((bool)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc25( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc26( struct cppIVRControlPanel_IVRControlPanel_006_undoc26_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc26();
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc26(  );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc27( struct cppIVRControlPanel_IVRControlPanel_006_undoc27_params *params )
 {
-    params->_ret = ((IVRControlPanel*)params->linux_side)->undoc27((const char *)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    params->_ret = iface->undoc27( params->a );
 }
 
 void cppIVRControlPanel_IVRControlPanel_006_undoc28( struct cppIVRControlPanel_IVRControlPanel_006_undoc28_params *params )
 {
-    ((IVRControlPanel*)params->linux_side)->undoc28((vr::VROverlayHandle_t)params->a);
+    struct cppIVRControlPanel_IVRControlPanel_006 *iface = (struct cppIVRControlPanel_IVRControlPanel_006 *)params->linux_side;
+    iface->undoc28( params->a );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRControlPanel_IVRControlPanel_006.h b/vrclient_x64/vrclient_x64/cppIVRControlPanel_IVRControlPanel_006.h
index 8b024703..ef362e8b 100644
--- a/vrclient_x64/vrclient_x64/cppIVRControlPanel_IVRControlPanel_006.h
+++ b/vrclient_x64/vrclient_x64/cppIVRControlPanel_IVRControlPanel_006.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRControlPanel_IVRControlPanel_006;
 struct cppIVRControlPanel_IVRControlPanel_006_undoc1_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.cpp b/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.cpp
index 137dccdb..9ec5bf5c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.cpp
@@ -9,24 +9,39 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRDriverManager_IVRDriverManager_001
+{
+#ifdef __cplusplus
+    virtual uint32_t GetDriverCount(  ) = 0;
+    virtual uint32_t GetDriverName( uint32_t, char *, uint32_t ) = 0;
+    virtual uint64_t GetDriverHandle( const char * ) = 0;
+    virtual bool IsEnabled( uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRDriverManager_IVRDriverManager_001_GetDriverCount( struct cppIVRDriverManager_IVRDriverManager_001_GetDriverCount_params *params )
 {
-    params->_ret = ((IVRDriverManager*)params->linux_side)->GetDriverCount();
+    struct cppIVRDriverManager_IVRDriverManager_001 *iface = (struct cppIVRDriverManager_IVRDriverManager_001 *)params->linux_side;
+    params->_ret = iface->GetDriverCount(  );
 }
 
 void cppIVRDriverManager_IVRDriverManager_001_GetDriverName( struct cppIVRDriverManager_IVRDriverManager_001_GetDriverName_params *params )
 {
-    params->_ret = ((IVRDriverManager*)params->linux_side)->GetDriverName((vr::DriverId_t)params->nDriver, (char *)params->pchValue, (uint32_t)params->unBufferSize);
+    struct cppIVRDriverManager_IVRDriverManager_001 *iface = (struct cppIVRDriverManager_IVRDriverManager_001 *)params->linux_side;
+    params->_ret = iface->GetDriverName( params->nDriver, params->pchValue, params->unBufferSize );
 }
 
 void cppIVRDriverManager_IVRDriverManager_001_GetDriverHandle( struct cppIVRDriverManager_IVRDriverManager_001_GetDriverHandle_params *params )
 {
-    params->_ret = ((IVRDriverManager*)params->linux_side)->GetDriverHandle((const char *)params->pchDriverName);
+    struct cppIVRDriverManager_IVRDriverManager_001 *iface = (struct cppIVRDriverManager_IVRDriverManager_001 *)params->linux_side;
+    params->_ret = iface->GetDriverHandle( params->pchDriverName );
 }
 
 void cppIVRDriverManager_IVRDriverManager_001_IsEnabled( struct cppIVRDriverManager_IVRDriverManager_001_IsEnabled_params *params )
 {
-    params->_ret = ((IVRDriverManager*)params->linux_side)->IsEnabled((vr::DriverId_t)params->nDriver);
+    struct cppIVRDriverManager_IVRDriverManager_001 *iface = (struct cppIVRDriverManager_IVRDriverManager_001 *)params->linux_side;
+    params->_ret = iface->IsEnabled( params->nDriver );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.h b/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.h
index 6fc5e4a6..f70e9234 100644
--- a/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRDriverManager_IVRDriverManager_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRDriverManager_IVRDriverManager_001;
 struct cppIVRDriverManager_IVRDriverManager_001_GetDriverCount_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.cpp b/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.cpp
index 93e46fd3..a424299d 100644
--- a/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.cpp
@@ -9,19 +9,32 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRExtendedDisplay_IVRExtendedDisplay_001
+{
+#ifdef __cplusplus
+    virtual void GetWindowBounds( int32_t *, int32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual void GetEyeOutputViewport( uint32_t, uint32_t *, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t *, int32_t * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRExtendedDisplay_IVRExtendedDisplay_001_GetWindowBounds( struct cppIVRExtendedDisplay_IVRExtendedDisplay_001_GetWindowBounds_params *params )
 {
-    ((IVRExtendedDisplay*)params->linux_side)->GetWindowBounds((int32_t *)params->pnX, (int32_t *)params->pnY, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRExtendedDisplay_IVRExtendedDisplay_001 *iface = (struct cppIVRExtendedDisplay_IVRExtendedDisplay_001 *)params->linux_side;
+    iface->GetWindowBounds( params->pnX, params->pnY, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRExtendedDisplay_IVRExtendedDisplay_001_GetEyeOutputViewport( struct cppIVRExtendedDisplay_IVRExtendedDisplay_001_GetEyeOutputViewport_params *params )
 {
-    ((IVRExtendedDisplay*)params->linux_side)->GetEyeOutputViewport((vr::EVREye)params->eEye, (uint32_t *)params->pnX, (uint32_t *)params->pnY, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRExtendedDisplay_IVRExtendedDisplay_001 *iface = (struct cppIVRExtendedDisplay_IVRExtendedDisplay_001 *)params->linux_side;
+    iface->GetEyeOutputViewport( params->eEye, params->pnX, params->pnY, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRExtendedDisplay_IVRExtendedDisplay_001_GetDXGIOutputInfo( struct cppIVRExtendedDisplay_IVRExtendedDisplay_001_GetDXGIOutputInfo_params *params )
 {
-    ((IVRExtendedDisplay*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex, (int32_t *)params->pnAdapterOutputIndex);
+    struct cppIVRExtendedDisplay_IVRExtendedDisplay_001 *iface = (struct cppIVRExtendedDisplay_IVRExtendedDisplay_001 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex, params->pnAdapterOutputIndex );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.h b/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.h
index 21cb41de..2a06f5b0 100644
--- a/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRExtendedDisplay_IVRExtendedDisplay_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRExtendedDisplay_IVRExtendedDisplay_001;
 struct cppIVRExtendedDisplay_IVRExtendedDisplay_001_GetWindowBounds_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.cpp b/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.cpp
index 63c9b05e..1253c13f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.cpp
@@ -9,49 +9,74 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRHeadsetView_IVRHeadsetView_001
+{
+#ifdef __cplusplus
+    virtual void SetHeadsetViewSize( uint32_t, uint32_t ) = 0;
+    virtual void GetHeadsetViewSize( uint32_t *, uint32_t * ) = 0;
+    virtual void SetHeadsetViewMode( uint32_t ) = 0;
+    virtual uint32_t GetHeadsetViewMode(  ) = 0;
+    virtual void SetHeadsetViewCropped( bool ) = 0;
+    virtual bool GetHeadsetViewCropped(  ) = 0;
+    virtual float GetHeadsetViewAspectRatio(  ) = 0;
+    virtual void SetHeadsetViewBlendRange( float, float ) = 0;
+    virtual void GetHeadsetViewBlendRange( float *, float * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewSize( struct cppIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewSize_params *params )
 {
-    ((IVRHeadsetView*)params->linux_side)->SetHeadsetViewSize((uint32_t)params->nWidth, (uint32_t)params->nHeight);
+    struct cppIVRHeadsetView_IVRHeadsetView_001 *iface = (struct cppIVRHeadsetView_IVRHeadsetView_001 *)params->linux_side;
+    iface->SetHeadsetViewSize( params->nWidth, params->nHeight );
 }
 
 void cppIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewSize( struct cppIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewSize_params *params )
 {
-    ((IVRHeadsetView*)params->linux_side)->GetHeadsetViewSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRHeadsetView_IVRHeadsetView_001 *iface = (struct cppIVRHeadsetView_IVRHeadsetView_001 *)params->linux_side;
+    iface->GetHeadsetViewSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewMode( struct cppIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewMode_params *params )
 {
-    ((IVRHeadsetView*)params->linux_side)->SetHeadsetViewMode((vr::HeadsetViewMode_t)params->eHeadsetViewMode);
+    struct cppIVRHeadsetView_IVRHeadsetView_001 *iface = (struct cppIVRHeadsetView_IVRHeadsetView_001 *)params->linux_side;
+    iface->SetHeadsetViewMode( params->eHeadsetViewMode );
 }
 
 void cppIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewMode( struct cppIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewMode_params *params )
 {
-    params->_ret = ((IVRHeadsetView*)params->linux_side)->GetHeadsetViewMode();
+    struct cppIVRHeadsetView_IVRHeadsetView_001 *iface = (struct cppIVRHeadsetView_IVRHeadsetView_001 *)params->linux_side;
+    params->_ret = iface->GetHeadsetViewMode(  );
 }
 
 void cppIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewCropped( struct cppIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewCropped_params *params )
 {
-    ((IVRHeadsetView*)params->linux_side)->SetHeadsetViewCropped((bool)params->bCropped);
+    struct cppIVRHeadsetView_IVRHeadsetView_001 *iface = (struct cppIVRHeadsetView_IVRHeadsetView_001 *)params->linux_side;
+    iface->SetHeadsetViewCropped( params->bCropped );
 }
 
 void cppIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewCropped( struct cppIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewCropped_params *params )
 {
-    params->_ret = ((IVRHeadsetView*)params->linux_side)->GetHeadsetViewCropped();
+    struct cppIVRHeadsetView_IVRHeadsetView_001 *iface = (struct cppIVRHeadsetView_IVRHeadsetView_001 *)params->linux_side;
+    params->_ret = iface->GetHeadsetViewCropped(  );
 }
 
 void cppIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewAspectRatio( struct cppIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewAspectRatio_params *params )
 {
-    params->_ret = ((IVRHeadsetView*)params->linux_side)->GetHeadsetViewAspectRatio();
+    struct cppIVRHeadsetView_IVRHeadsetView_001 *iface = (struct cppIVRHeadsetView_IVRHeadsetView_001 *)params->linux_side;
+    params->_ret = iface->GetHeadsetViewAspectRatio(  );
 }
 
 void cppIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewBlendRange( struct cppIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewBlendRange_params *params )
 {
-    ((IVRHeadsetView*)params->linux_side)->SetHeadsetViewBlendRange((float)params->flStartPct, (float)params->flEndPct);
+    struct cppIVRHeadsetView_IVRHeadsetView_001 *iface = (struct cppIVRHeadsetView_IVRHeadsetView_001 *)params->linux_side;
+    iface->SetHeadsetViewBlendRange( params->flStartPct, params->flEndPct );
 }
 
 void cppIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewBlendRange( struct cppIVRHeadsetView_IVRHeadsetView_001_GetHeadsetViewBlendRange_params *params )
 {
-    ((IVRHeadsetView*)params->linux_side)->GetHeadsetViewBlendRange((float *)params->pStartPct, (float *)params->pEndPct);
+    struct cppIVRHeadsetView_IVRHeadsetView_001 *iface = (struct cppIVRHeadsetView_IVRHeadsetView_001 *)params->linux_side;
+    iface->GetHeadsetViewBlendRange( params->pStartPct, params->pEndPct );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.h b/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.h
index fafd7136..8520a8f6 100644
--- a/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRHeadsetView_IVRHeadsetView_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRHeadsetView_IVRHeadsetView_001;
 struct cppIVRHeadsetView_IVRHeadsetView_001_SetHeadsetViewSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_001.cpp b/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_001.cpp
index 782475d1..af9b95d9 100644
--- a/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_001.cpp
@@ -9,29 +9,46 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRIOBuffer_IVRIOBuffer_001
+{
+#ifdef __cplusplus
+    virtual uint32_t Open( const char *, uint32_t, uint32_t, uint32_t, uint64_t * ) = 0;
+    virtual uint32_t Close( uint64_t ) = 0;
+    virtual uint32_t Read( uint64_t, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t Write( uint64_t, void *, uint32_t ) = 0;
+    virtual uint64_t PropertyContainer( uint64_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRIOBuffer_IVRIOBuffer_001_Open( struct cppIVRIOBuffer_IVRIOBuffer_001_Open_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->Open((const char *)params->pchPath, (vr::EIOBufferMode)params->mode, (uint32_t)params->unElementSize, (uint32_t)params->unElements, (vr::IOBufferHandle_t *)params->pulBuffer);
+    struct cppIVRIOBuffer_IVRIOBuffer_001 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_001 *)params->linux_side;
+    params->_ret = iface->Open( params->pchPath, params->mode, params->unElementSize, params->unElements, params->pulBuffer );
 }
 
 void cppIVRIOBuffer_IVRIOBuffer_001_Close( struct cppIVRIOBuffer_IVRIOBuffer_001_Close_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->Close((vr::IOBufferHandle_t)params->ulBuffer);
+    struct cppIVRIOBuffer_IVRIOBuffer_001 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_001 *)params->linux_side;
+    params->_ret = iface->Close( params->ulBuffer );
 }
 
 void cppIVRIOBuffer_IVRIOBuffer_001_Read( struct cppIVRIOBuffer_IVRIOBuffer_001_Read_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->Read((vr::IOBufferHandle_t)params->ulBuffer, (void *)params->pDst, (uint32_t)params->unBytes, (uint32_t *)params->punRead);
+    struct cppIVRIOBuffer_IVRIOBuffer_001 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_001 *)params->linux_side;
+    params->_ret = iface->Read( params->ulBuffer, params->pDst, params->unBytes, params->punRead );
 }
 
 void cppIVRIOBuffer_IVRIOBuffer_001_Write( struct cppIVRIOBuffer_IVRIOBuffer_001_Write_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->Write((vr::IOBufferHandle_t)params->ulBuffer, (void *)params->pSrc, (uint32_t)params->unBytes);
+    struct cppIVRIOBuffer_IVRIOBuffer_001 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_001 *)params->linux_side;
+    params->_ret = iface->Write( params->ulBuffer, params->pSrc, params->unBytes );
 }
 
 void cppIVRIOBuffer_IVRIOBuffer_001_PropertyContainer( struct cppIVRIOBuffer_IVRIOBuffer_001_PropertyContainer_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->PropertyContainer((vr::IOBufferHandle_t)params->ulBuffer);
+    struct cppIVRIOBuffer_IVRIOBuffer_001 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_001 *)params->linux_side;
+    params->_ret = iface->PropertyContainer( params->ulBuffer );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_001.h b/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_001.h
index d70e2cd1..ac3a29f3 100644
--- a/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRIOBuffer_IVRIOBuffer_001;
 struct cppIVRIOBuffer_IVRIOBuffer_001_Open_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.cpp b/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.cpp
index fa134672..e198a1fd 100644
--- a/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.cpp
@@ -9,34 +9,53 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRIOBuffer_IVRIOBuffer_002
+{
+#ifdef __cplusplus
+    virtual uint32_t Open( const char *, uint32_t, uint32_t, uint32_t, uint64_t * ) = 0;
+    virtual uint32_t Close( uint64_t ) = 0;
+    virtual uint32_t Read( uint64_t, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t Write( uint64_t, void *, uint32_t ) = 0;
+    virtual uint64_t PropertyContainer( uint64_t ) = 0;
+    virtual bool HasReaders( uint64_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRIOBuffer_IVRIOBuffer_002_Open( struct cppIVRIOBuffer_IVRIOBuffer_002_Open_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->Open((const char *)params->pchPath, (vr::EIOBufferMode)params->mode, (uint32_t)params->unElementSize, (uint32_t)params->unElements, (vr::IOBufferHandle_t *)params->pulBuffer);
+    struct cppIVRIOBuffer_IVRIOBuffer_002 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_002 *)params->linux_side;
+    params->_ret = iface->Open( params->pchPath, params->mode, params->unElementSize, params->unElements, params->pulBuffer );
 }
 
 void cppIVRIOBuffer_IVRIOBuffer_002_Close( struct cppIVRIOBuffer_IVRIOBuffer_002_Close_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->Close((vr::IOBufferHandle_t)params->ulBuffer);
+    struct cppIVRIOBuffer_IVRIOBuffer_002 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_002 *)params->linux_side;
+    params->_ret = iface->Close( params->ulBuffer );
 }
 
 void cppIVRIOBuffer_IVRIOBuffer_002_Read( struct cppIVRIOBuffer_IVRIOBuffer_002_Read_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->Read((vr::IOBufferHandle_t)params->ulBuffer, (void *)params->pDst, (uint32_t)params->unBytes, (uint32_t *)params->punRead);
+    struct cppIVRIOBuffer_IVRIOBuffer_002 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_002 *)params->linux_side;
+    params->_ret = iface->Read( params->ulBuffer, params->pDst, params->unBytes, params->punRead );
 }
 
 void cppIVRIOBuffer_IVRIOBuffer_002_Write( struct cppIVRIOBuffer_IVRIOBuffer_002_Write_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->Write((vr::IOBufferHandle_t)params->ulBuffer, (void *)params->pSrc, (uint32_t)params->unBytes);
+    struct cppIVRIOBuffer_IVRIOBuffer_002 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_002 *)params->linux_side;
+    params->_ret = iface->Write( params->ulBuffer, params->pSrc, params->unBytes );
 }
 
 void cppIVRIOBuffer_IVRIOBuffer_002_PropertyContainer( struct cppIVRIOBuffer_IVRIOBuffer_002_PropertyContainer_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->PropertyContainer((vr::IOBufferHandle_t)params->ulBuffer);
+    struct cppIVRIOBuffer_IVRIOBuffer_002 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_002 *)params->linux_side;
+    params->_ret = iface->PropertyContainer( params->ulBuffer );
 }
 
 void cppIVRIOBuffer_IVRIOBuffer_002_HasReaders( struct cppIVRIOBuffer_IVRIOBuffer_002_HasReaders_params *params )
 {
-    params->_ret = ((IVRIOBuffer*)params->linux_side)->HasReaders((vr::IOBufferHandle_t)params->ulBuffer);
+    struct cppIVRIOBuffer_IVRIOBuffer_002 *iface = (struct cppIVRIOBuffer_IVRIOBuffer_002 *)params->linux_side;
+    params->_ret = iface->HasReaders( params->ulBuffer );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.h b/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.h
index 910151c2..e93cccef 100644
--- a/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.h
+++ b/vrclient_x64/vrclient_x64/cppIVRIOBuffer_IVRIOBuffer_002.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRIOBuffer_IVRIOBuffer_002;
 struct cppIVRIOBuffer_IVRIOBuffer_002_Open_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp
index e273acb8..cb3bf4f0 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp
@@ -9,113 +9,154 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRInput_IVRInput_003
+{
+#ifdef __cplusplus
+    virtual uint32_t SetActionManifestPath( const char * ) = 0;
+    virtual uint32_t GetActionSetHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetActionHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetInputSourceHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t UpdateActionState( VRActiveActionSet_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetDigitalActionData( uint64_t, InputDigitalActionData_t *, uint32_t ) = 0;
+    virtual uint32_t GetAnalogActionData( uint64_t, InputAnalogActionData_t *, uint32_t ) = 0;
+    virtual uint32_t GetPoseActionData( uint64_t, uint32_t, float, InputPoseActionData_t *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalActionData( uint64_t, uint32_t, float, InputSkeletonActionData_t *, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalActionDataCompressed( uint64_t, uint32_t, float, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t UncompressSkeletalActionData( void *, uint32_t, uint32_t *, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t TriggerHapticVibrationAction( uint64_t, float, float, float, float ) = 0;
+    virtual uint32_t GetActionOrigins( uint64_t, uint64_t, uint64_t *, uint32_t ) = 0;
+    virtual uint32_t GetOriginLocalizedName( uint64_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetOriginTrackedDeviceInfo( uint64_t, InputOriginInfo_t *, uint32_t ) = 0;
+    virtual uint32_t ShowActionOrigins( uint64_t, uint64_t ) = 0;
+    virtual uint32_t ShowBindingsForActionSet( VRActiveActionSet_t *, uint32_t, uint32_t, uint64_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRInput_IVRInput_003_SetActionManifestPath( struct cppIVRInput_IVRInput_003_SetActionManifestPath_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->SetActionManifestPath((const char *)params->pchActionManifestPath);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->SetActionManifestPath( params->pchActionManifestPath );
 }
 
 void cppIVRInput_IVRInput_003_GetActionSetHandle( struct cppIVRInput_IVRInput_003_GetActionSetHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionSetHandle((const char *)params->pchActionSetName, (vr::VRActionSetHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pchActionSetName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_003_GetActionHandle( struct cppIVRInput_IVRInput_003_GetActionHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionHandle((const char *)params->pchActionName, (vr::VRActionHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->GetActionHandle( params->pchActionName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_003_GetInputSourceHandle( struct cppIVRInput_IVRInput_003_GetInputSourceHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetInputSourceHandle((const char *)params->pchInputSourcePath, (vr::VRInputValueHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->GetInputSourceHandle( params->pchInputSourcePath, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_003_UpdateActionState( struct cppIVRInput_IVRInput_003_UpdateActionState_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->UpdateActionState((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->UpdateActionState( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount );
 }
 
 void cppIVRInput_IVRInput_003_GetDigitalActionData( struct cppIVRInput_IVRInput_003_GetDigitalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
     InputDigitalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputDigitalActionData_t_1015_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetDigitalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize);
+    params->_ret = iface->GetDigitalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize );
     if (params->pActionData)
         struct_InputDigitalActionData_t_1015_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_003_GetAnalogActionData( struct cppIVRInput_IVRInput_003_GetAnalogActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
     InputAnalogActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputAnalogActionData_t_1015_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetAnalogActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize);
+    params->_ret = iface->GetAnalogActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize );
     if (params->pActionData)
         struct_InputAnalogActionData_t_1015_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_003_GetPoseActionData( struct cppIVRInput_IVRInput_003_GetPoseActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
     InputPoseActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputPoseActionData_t_1015_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetPoseActionData((vr::VRActionHandle_t)params->action, (vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize);
+    params->_ret = iface->GetPoseActionData( params->action, params->eOrigin, params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize );
     if (params->pActionData)
         struct_InputPoseActionData_t_1015_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_003_GetSkeletalActionData( struct cppIVRInput_IVRInput_003_GetSkeletalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
     InputSkeletonActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputSkeletonActionData_t_1015_win_to_lin( params->pActionData, &lin_pActionData );
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eBoneParent, (float)params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, (uint32_t)params->unActionDataSize, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    params->_ret = iface->GetSkeletalActionData( params->action, params->eBoneParent, params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, params->unActionDataSize, params->pTransformArray, params->unTransformArrayCount );
     if (params->pActionData)
         struct_InputSkeletonActionData_t_1015_lin_to_win( &lin_pActionData, params->pActionData );
 }
 
 void cppIVRInput_IVRInput_003_GetSkeletalActionDataCompressed( struct cppIVRInput_IVRInput_003_GetSkeletalActionDataCompressed_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalActionDataCompressed((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eBoneParent, (float)params->fPredictedSecondsFromNow, (void *)params->pvCompressedData, (uint32_t)params->unCompressedSize, (uint32_t *)params->punRequiredCompressedSize);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->GetSkeletalActionDataCompressed( params->action, params->eBoneParent, params->fPredictedSecondsFromNow, params->pvCompressedData, params->unCompressedSize, params->punRequiredCompressedSize );
 }
 
 void cppIVRInput_IVRInput_003_UncompressSkeletalActionData( struct cppIVRInput_IVRInput_003_UncompressSkeletalActionData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->UncompressSkeletalActionData((void *)params->pvCompressedBuffer, (uint32_t)params->unCompressedBufferSize, (vr::EVRSkeletalTransformSpace *)params->peBoneParent, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->UncompressSkeletalActionData( params->pvCompressedBuffer, params->unCompressedBufferSize, params->peBoneParent, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_003_TriggerHapticVibrationAction( struct cppIVRInput_IVRInput_003_TriggerHapticVibrationAction_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->TriggerHapticVibrationAction((vr::VRActionHandle_t)params->action, (float)params->fStartSecondsFromNow, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->TriggerHapticVibrationAction( params->action, params->fStartSecondsFromNow, params->fDurationSeconds, params->fFrequency, params->fAmplitude );
 }
 
 void cppIVRInput_IVRInput_003_GetActionOrigins( struct cppIVRInput_IVRInput_003_GetActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->digitalActionHandle, (vr::VRInputValueHandle_t *)params->originsOut, (uint32_t)params->originOutCount);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->GetActionOrigins( params->actionSetHandle, params->digitalActionHandle, params->originsOut, params->originOutCount );
 }
 
 void cppIVRInput_IVRInput_003_GetOriginLocalizedName( struct cppIVRInput_IVRInput_003_GetOriginLocalizedName_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginLocalizedName((vr::VRInputValueHandle_t)params->origin, (char *)params->pchNameArray, (uint32_t)params->unNameArraySize);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->GetOriginLocalizedName( params->origin, params->pchNameArray, params->unNameArraySize );
 }
 
 void cppIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo_params *params )
 {
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
     uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)params->origin, (vr::InputOriginInfo_t *)params->pOriginInfo, lin_unOriginInfoSize);
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_003_ShowActionOrigins( struct cppIVRInput_IVRInput_003_ShowActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->ulActionHandle);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->ShowActionOrigins( params->actionSetHandle, params->ulActionHandle );
 }
 
 void cppIVRInput_IVRInput_003_ShowBindingsForActionSet( struct cppIVRInput_IVRInput_003_ShowBindingsForActionSet_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowBindingsForActionSet((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount, (vr::VRInputValueHandle_t)params->originToHighlight);
+    struct cppIVRInput_IVRInput_003 *iface = (struct cppIVRInput_IVRInput_003 *)params->linux_side;
+    params->_ret = iface->ShowBindingsForActionSet( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount, params->originToHighlight );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.h
index 9a9884e3..bc7e3481 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRInput_IVRInput_003;
 struct cppIVRInput_IVRInput_003_SetActionManifestPath_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp
index 40e47d23..1224f2aa 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp
@@ -9,119 +9,162 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRInput_IVRInput_004
+{
+#ifdef __cplusplus
+    virtual uint32_t SetActionManifestPath( const char * ) = 0;
+    virtual uint32_t GetActionSetHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetActionHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetInputSourceHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t UpdateActionState( VRActiveActionSet_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetDigitalActionData( uint64_t, InputDigitalActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetAnalogActionData( uint64_t, InputAnalogActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetPoseActionData( uint64_t, uint32_t, float, InputPoseActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetSkeletalActionData( uint64_t, InputSkeletalActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetSkeletalBoneData( uint64_t, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetSkeletalBoneDataCompressed( uint64_t, uint32_t, uint32_t, void *, uint32_t, uint32_t *, uint64_t ) = 0;
+    virtual uint32_t DecompressSkeletalBoneData( void *, uint32_t, uint32_t *, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t TriggerHapticVibrationAction( uint64_t, float, float, float, float, uint64_t ) = 0;
+    virtual uint32_t GetActionOrigins( uint64_t, uint64_t, uint64_t *, uint32_t ) = 0;
+    virtual uint32_t GetOriginLocalizedName( uint64_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetOriginTrackedDeviceInfo( uint64_t, InputOriginInfo_t *, uint32_t ) = 0;
+    virtual uint32_t ShowActionOrigins( uint64_t, uint64_t ) = 0;
+    virtual uint32_t ShowBindingsForActionSet( VRActiveActionSet_t *, uint32_t, uint32_t, uint64_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRInput_IVRInput_004_SetActionManifestPath( struct cppIVRInput_IVRInput_004_SetActionManifestPath_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->SetActionManifestPath((const char *)params->pchActionManifestPath);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->SetActionManifestPath( params->pchActionManifestPath );
 }
 
 void cppIVRInput_IVRInput_004_GetActionSetHandle( struct cppIVRInput_IVRInput_004_GetActionSetHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionSetHandle((const char *)params->pchActionSetName, (vr::VRActionSetHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pchActionSetName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_004_GetActionHandle( struct cppIVRInput_IVRInput_004_GetActionHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionHandle((const char *)params->pchActionName, (vr::VRActionHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->GetActionHandle( params->pchActionName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_004_GetInputSourceHandle( struct cppIVRInput_IVRInput_004_GetInputSourceHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetInputSourceHandle((const char *)params->pchInputSourcePath, (vr::VRInputValueHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->GetInputSourceHandle( params->pchInputSourcePath, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_004_UpdateActionState( struct cppIVRInput_IVRInput_004_UpdateActionState_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->UpdateActionState((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->UpdateActionState( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount );
 }
 
 void cppIVRInput_IVRInput_004_GetDigitalActionData( struct cppIVRInput_IVRInput_004_GetDigitalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
     InputDigitalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputDigitalActionData_t_1017_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetDigitalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetDigitalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputDigitalActionData_t_1017_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_004_GetAnalogActionData( struct cppIVRInput_IVRInput_004_GetAnalogActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
     InputAnalogActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputAnalogActionData_t_1017_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetAnalogActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetAnalogActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputAnalogActionData_t_1017_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_004_GetPoseActionData( struct cppIVRInput_IVRInput_004_GetPoseActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
     InputPoseActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputPoseActionData_t_1017_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetPoseActionData((vr::VRActionHandle_t)params->action, (vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetPoseActionData( params->action, params->eOrigin, params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputPoseActionData_t_1017_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_004_GetSkeletalActionData( struct cppIVRInput_IVRInput_004_GetSkeletalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
     InputSkeletalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputSkeletalActionData_t_1017_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetSkeletalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputSkeletalActionData_t_1017_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_004_GetSkeletalBoneData( struct cppIVRInput_IVRInput_004_GetSkeletalBoneData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalBoneData((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::EVRSkeletalMotionRange)params->eMotionRange, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->GetSkeletalBoneData( params->action, params->eTransformSpace, params->eMotionRange, params->pTransformArray, params->unTransformArrayCount, params->ulRestrictToDevice );
 }
 
 void cppIVRInput_IVRInput_004_GetSkeletalBoneDataCompressed( struct cppIVRInput_IVRInput_004_GetSkeletalBoneDataCompressed_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalBoneDataCompressed((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::EVRSkeletalMotionRange)params->eMotionRange, (void *)params->pvCompressedData, (uint32_t)params->unCompressedSize, (uint32_t *)params->punRequiredCompressedSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->GetSkeletalBoneDataCompressed( params->action, params->eTransformSpace, params->eMotionRange, params->pvCompressedData, params->unCompressedSize, params->punRequiredCompressedSize, params->ulRestrictToDevice );
 }
 
 void cppIVRInput_IVRInput_004_DecompressSkeletalBoneData( struct cppIVRInput_IVRInput_004_DecompressSkeletalBoneData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->DecompressSkeletalBoneData((void *)params->pvCompressedBuffer, (uint32_t)params->unCompressedBufferSize, (vr::EVRSkeletalTransformSpace *)params->peTransformSpace, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->DecompressSkeletalBoneData( params->pvCompressedBuffer, params->unCompressedBufferSize, params->peTransformSpace, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_004_TriggerHapticVibrationAction( struct cppIVRInput_IVRInput_004_TriggerHapticVibrationAction_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->TriggerHapticVibrationAction((vr::VRActionHandle_t)params->action, (float)params->fStartSecondsFromNow, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->TriggerHapticVibrationAction( params->action, params->fStartSecondsFromNow, params->fDurationSeconds, params->fFrequency, params->fAmplitude, params->ulRestrictToDevice );
 }
 
 void cppIVRInput_IVRInput_004_GetActionOrigins( struct cppIVRInput_IVRInput_004_GetActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->digitalActionHandle, (vr::VRInputValueHandle_t *)params->originsOut, (uint32_t)params->originOutCount);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->GetActionOrigins( params->actionSetHandle, params->digitalActionHandle, params->originsOut, params->originOutCount );
 }
 
 void cppIVRInput_IVRInput_004_GetOriginLocalizedName( struct cppIVRInput_IVRInput_004_GetOriginLocalizedName_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginLocalizedName((vr::VRInputValueHandle_t)params->origin, (char *)params->pchNameArray, (uint32_t)params->unNameArraySize);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->GetOriginLocalizedName( params->origin, params->pchNameArray, params->unNameArraySize );
 }
 
 void cppIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo_params *params )
 {
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
     uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)params->origin, (vr::InputOriginInfo_t *)params->pOriginInfo, lin_unOriginInfoSize);
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_004_ShowActionOrigins( struct cppIVRInput_IVRInput_004_ShowActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->ulActionHandle);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->ShowActionOrigins( params->actionSetHandle, params->ulActionHandle );
 }
 
 void cppIVRInput_IVRInput_004_ShowBindingsForActionSet( struct cppIVRInput_IVRInput_004_ShowBindingsForActionSet_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowBindingsForActionSet((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount, (vr::VRInputValueHandle_t)params->originToHighlight);
+    struct cppIVRInput_IVRInput_004 *iface = (struct cppIVRInput_IVRInput_004 *)params->linux_side;
+    params->_ret = iface->ShowBindingsForActionSet( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount, params->originToHighlight );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.h
index 806d2229..1132e526 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRInput_IVRInput_004;
 struct cppIVRInput_IVRInput_004_SetActionManifestPath_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp
index 33b5c7c5..f9874866 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp
@@ -9,154 +9,211 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRInput_IVRInput_005
+{
+#ifdef __cplusplus
+    virtual uint32_t SetActionManifestPath( const char * ) = 0;
+    virtual uint32_t GetActionSetHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetActionHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetInputSourceHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t UpdateActionState( VRActiveActionSet_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetDigitalActionData( uint64_t, InputDigitalActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetAnalogActionData( uint64_t, InputAnalogActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetPoseActionData( uint64_t, uint32_t, float, InputPoseActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetSkeletalActionData( uint64_t, InputSkeletalActionData_t *, uint32_t ) = 0;
+    virtual uint32_t GetBoneCount( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t GetBoneHierarchy( uint64_t, int32_t *, uint32_t ) = 0;
+    virtual uint32_t GetBoneName( uint64_t, int32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalReferenceTransforms( uint64_t, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalTrackingLevel( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t GetSkeletalBoneData( uint64_t, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalSummaryData( uint64_t, VRSkeletalSummaryData_t * ) = 0;
+    virtual uint32_t GetSkeletalBoneDataCompressed( uint64_t, uint32_t, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t DecompressSkeletalBoneData( const void *, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t TriggerHapticVibrationAction( uint64_t, float, float, float, float, uint64_t ) = 0;
+    virtual uint32_t GetActionOrigins( uint64_t, uint64_t, uint64_t *, uint32_t ) = 0;
+    virtual uint32_t GetOriginLocalizedName( uint64_t, char *, uint32_t, int32_t ) = 0;
+    virtual uint32_t GetOriginTrackedDeviceInfo( uint64_t, InputOriginInfo_t *, uint32_t ) = 0;
+    virtual uint32_t ShowActionOrigins( uint64_t, uint64_t ) = 0;
+    virtual uint32_t ShowBindingsForActionSet( VRActiveActionSet_t *, uint32_t, uint32_t, uint64_t ) = 0;
+    virtual bool IsUsingLegacyInput(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRInput_IVRInput_005_SetActionManifestPath( struct cppIVRInput_IVRInput_005_SetActionManifestPath_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->SetActionManifestPath((const char *)params->pchActionManifestPath);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->SetActionManifestPath( params->pchActionManifestPath );
 }
 
 void cppIVRInput_IVRInput_005_GetActionSetHandle( struct cppIVRInput_IVRInput_005_GetActionSetHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionSetHandle((const char *)params->pchActionSetName, (vr::VRActionSetHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pchActionSetName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_005_GetActionHandle( struct cppIVRInput_IVRInput_005_GetActionHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionHandle((const char *)params->pchActionName, (vr::VRActionHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetActionHandle( params->pchActionName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_005_GetInputSourceHandle( struct cppIVRInput_IVRInput_005_GetInputSourceHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetInputSourceHandle((const char *)params->pchInputSourcePath, (vr::VRInputValueHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetInputSourceHandle( params->pchInputSourcePath, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_005_UpdateActionState( struct cppIVRInput_IVRInput_005_UpdateActionState_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->UpdateActionState((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->UpdateActionState( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount );
 }
 
 void cppIVRInput_IVRInput_005_GetDigitalActionData( struct cppIVRInput_IVRInput_005_GetDigitalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
     InputDigitalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputDigitalActionData_t_1322_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetDigitalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetDigitalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputDigitalActionData_t_1322_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_005_GetAnalogActionData( struct cppIVRInput_IVRInput_005_GetAnalogActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
     InputAnalogActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputAnalogActionData_t_1322_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetAnalogActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetAnalogActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputAnalogActionData_t_1322_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_005_GetPoseActionData( struct cppIVRInput_IVRInput_005_GetPoseActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
     InputPoseActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputPoseActionData_t_1322_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetPoseActionData((vr::VRActionHandle_t)params->action, (vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetPoseActionData( params->action, params->eOrigin, params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputPoseActionData_t_1322_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_005_GetSkeletalActionData( struct cppIVRInput_IVRInput_005_GetSkeletalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
     InputSkeletalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputSkeletalActionData_t_1322_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize);
+    params->_ret = iface->GetSkeletalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize );
     if (params->pActionData)
         struct_InputSkeletalActionData_t_1322_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_005_GetBoneCount( struct cppIVRInput_IVRInput_005_GetBoneCount_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneCount((vr::VRActionHandle_t)params->action, (uint32_t *)params->pBoneCount);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetBoneCount( params->action, params->pBoneCount );
 }
 
 void cppIVRInput_IVRInput_005_GetBoneHierarchy( struct cppIVRInput_IVRInput_005_GetBoneHierarchy_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneHierarchy((vr::VRActionHandle_t)params->action, (vr::BoneIndex_t *)params->pParentIndices, (uint32_t)params->unIndexArayCount);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetBoneHierarchy( params->action, params->pParentIndices, params->unIndexArayCount );
 }
 
 void cppIVRInput_IVRInput_005_GetBoneName( struct cppIVRInput_IVRInput_005_GetBoneName_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneName((vr::VRActionHandle_t)params->action, (vr::BoneIndex_t)params->nBoneIndex, (char *)params->pchBoneName, (uint32_t)params->unNameBufferSize);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetBoneName( params->action, params->nBoneIndex, params->pchBoneName, params->unNameBufferSize );
 }
 
 void cppIVRInput_IVRInput_005_GetSkeletalReferenceTransforms( struct cppIVRInput_IVRInput_005_GetSkeletalReferenceTransforms_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalReferenceTransforms((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::EVRSkeletalReferencePose)params->eReferencePose, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetSkeletalReferenceTransforms( params->action, params->eTransformSpace, params->eReferencePose, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_005_GetSkeletalTrackingLevel( struct cppIVRInput_IVRInput_005_GetSkeletalTrackingLevel_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalTrackingLevel((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTrackingLevel *)params->pSkeletalTrackingLevel);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetSkeletalTrackingLevel( params->action, params->pSkeletalTrackingLevel );
 }
 
 void cppIVRInput_IVRInput_005_GetSkeletalBoneData( struct cppIVRInput_IVRInput_005_GetSkeletalBoneData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalBoneData((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::EVRSkeletalMotionRange)params->eMotionRange, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetSkeletalBoneData( params->action, params->eTransformSpace, params->eMotionRange, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_005_GetSkeletalSummaryData( struct cppIVRInput_IVRInput_005_GetSkeletalSummaryData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalSummaryData((vr::VRActionHandle_t)params->action, (vr::VRSkeletalSummaryData_t *)params->pSkeletalSummaryData);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetSkeletalSummaryData( params->action, params->pSkeletalSummaryData );
 }
 
 void cppIVRInput_IVRInput_005_GetSkeletalBoneDataCompressed( struct cppIVRInput_IVRInput_005_GetSkeletalBoneDataCompressed_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalBoneDataCompressed((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalMotionRange)params->eMotionRange, (void *)params->pvCompressedData, (uint32_t)params->unCompressedSize, (uint32_t *)params->punRequiredCompressedSize);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetSkeletalBoneDataCompressed( params->action, params->eMotionRange, params->pvCompressedData, params->unCompressedSize, params->punRequiredCompressedSize );
 }
 
 void cppIVRInput_IVRInput_005_DecompressSkeletalBoneData( struct cppIVRInput_IVRInput_005_DecompressSkeletalBoneData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->DecompressSkeletalBoneData((const void *)params->pvCompressedBuffer, (uint32_t)params->unCompressedBufferSize, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->DecompressSkeletalBoneData( params->pvCompressedBuffer, params->unCompressedBufferSize, params->eTransformSpace, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_005_TriggerHapticVibrationAction( struct cppIVRInput_IVRInput_005_TriggerHapticVibrationAction_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->TriggerHapticVibrationAction((vr::VRActionHandle_t)params->action, (float)params->fStartSecondsFromNow, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->TriggerHapticVibrationAction( params->action, params->fStartSecondsFromNow, params->fDurationSeconds, params->fFrequency, params->fAmplitude, params->ulRestrictToDevice );
 }
 
 void cppIVRInput_IVRInput_005_GetActionOrigins( struct cppIVRInput_IVRInput_005_GetActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->digitalActionHandle, (vr::VRInputValueHandle_t *)params->originsOut, (uint32_t)params->originOutCount);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetActionOrigins( params->actionSetHandle, params->digitalActionHandle, params->originsOut, params->originOutCount );
 }
 
 void cppIVRInput_IVRInput_005_GetOriginLocalizedName( struct cppIVRInput_IVRInput_005_GetOriginLocalizedName_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginLocalizedName((vr::VRInputValueHandle_t)params->origin, (char *)params->pchNameArray, (uint32_t)params->unNameArraySize, (int32_t)params->unStringSectionsToInclude);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->GetOriginLocalizedName( params->origin, params->pchNameArray, params->unNameArraySize, params->unStringSectionsToInclude );
 }
 
 void cppIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo_params *params )
 {
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
     uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)params->origin, (vr::InputOriginInfo_t *)params->pOriginInfo, lin_unOriginInfoSize);
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_005_ShowActionOrigins( struct cppIVRInput_IVRInput_005_ShowActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->ulActionHandle);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->ShowActionOrigins( params->actionSetHandle, params->ulActionHandle );
 }
 
 void cppIVRInput_IVRInput_005_ShowBindingsForActionSet( struct cppIVRInput_IVRInput_005_ShowBindingsForActionSet_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowBindingsForActionSet((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount, (vr::VRInputValueHandle_t)params->originToHighlight);
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->ShowBindingsForActionSet( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount, params->originToHighlight );
 }
 
 void cppIVRInput_IVRInput_005_IsUsingLegacyInput( struct cppIVRInput_IVRInput_005_IsUsingLegacyInput_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->IsUsingLegacyInput();
+    struct cppIVRInput_IVRInput_005 *iface = (struct cppIVRInput_IVRInput_005 *)params->linux_side;
+    params->_ret = iface->IsUsingLegacyInput(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.h
index a8e6bde3..cf8aa9f1 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRInput_IVRInput_005;
 struct cppIVRInput_IVRInput_005_SetActionManifestPath_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp
index 44f161be..1da5d781 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp
@@ -9,165 +9,224 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRInput_IVRInput_006
+{
+#ifdef __cplusplus
+    virtual uint32_t SetActionManifestPath( const char * ) = 0;
+    virtual uint32_t GetActionSetHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetActionHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetInputSourceHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t UpdateActionState( VRActiveActionSet_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetDigitalActionData( uint64_t, InputDigitalActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetAnalogActionData( uint64_t, InputAnalogActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetPoseActionDataRelativeToNow( uint64_t, uint32_t, float, InputPoseActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetPoseActionDataForNextFrame( uint64_t, uint32_t, InputPoseActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetSkeletalActionData( uint64_t, InputSkeletalActionData_t *, uint32_t ) = 0;
+    virtual uint32_t GetBoneCount( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t GetBoneHierarchy( uint64_t, int32_t *, uint32_t ) = 0;
+    virtual uint32_t GetBoneName( uint64_t, int32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalReferenceTransforms( uint64_t, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalTrackingLevel( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t GetSkeletalBoneData( uint64_t, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalSummaryData( uint64_t, uint32_t, VRSkeletalSummaryData_t * ) = 0;
+    virtual uint32_t GetSkeletalBoneDataCompressed( uint64_t, uint32_t, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t DecompressSkeletalBoneData( const void *, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t TriggerHapticVibrationAction( uint64_t, float, float, float, float, uint64_t ) = 0;
+    virtual uint32_t GetActionOrigins( uint64_t, uint64_t, uint64_t *, uint32_t ) = 0;
+    virtual uint32_t GetOriginLocalizedName( uint64_t, char *, uint32_t, int32_t ) = 0;
+    virtual uint32_t GetOriginTrackedDeviceInfo( uint64_t, InputOriginInfo_t *, uint32_t ) = 0;
+    virtual uint32_t ShowActionOrigins( uint64_t, uint64_t ) = 0;
+    virtual uint32_t ShowBindingsForActionSet( VRActiveActionSet_t *, uint32_t, uint32_t, uint64_t ) = 0;
+    virtual bool IsUsingLegacyInput(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRInput_IVRInput_006_SetActionManifestPath( struct cppIVRInput_IVRInput_006_SetActionManifestPath_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->SetActionManifestPath((const char *)params->pchActionManifestPath);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->SetActionManifestPath( params->pchActionManifestPath );
 }
 
 void cppIVRInput_IVRInput_006_GetActionSetHandle( struct cppIVRInput_IVRInput_006_GetActionSetHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionSetHandle((const char *)params->pchActionSetName, (vr::VRActionSetHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pchActionSetName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_006_GetActionHandle( struct cppIVRInput_IVRInput_006_GetActionHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionHandle((const char *)params->pchActionName, (vr::VRActionHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetActionHandle( params->pchActionName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_006_GetInputSourceHandle( struct cppIVRInput_IVRInput_006_GetInputSourceHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetInputSourceHandle((const char *)params->pchInputSourcePath, (vr::VRInputValueHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetInputSourceHandle( params->pchInputSourcePath, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_006_UpdateActionState( struct cppIVRInput_IVRInput_006_UpdateActionState_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->UpdateActionState((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->UpdateActionState( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount );
 }
 
 void cppIVRInput_IVRInput_006_GetDigitalActionData( struct cppIVRInput_IVRInput_006_GetDigitalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
     InputDigitalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputDigitalActionData_t_1418_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetDigitalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetDigitalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputDigitalActionData_t_1418_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_006_GetAnalogActionData( struct cppIVRInput_IVRInput_006_GetAnalogActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
     InputAnalogActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputAnalogActionData_t_1418_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetAnalogActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetAnalogActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputAnalogActionData_t_1418_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_006_GetPoseActionDataRelativeToNow( struct cppIVRInput_IVRInput_006_GetPoseActionDataRelativeToNow_params *params )
 {
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
     InputPoseActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputPoseActionData_t_1418_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)params->action, (vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetPoseActionDataRelativeToNow( params->action, params->eOrigin, params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputPoseActionData_t_1418_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_006_GetPoseActionDataForNextFrame( struct cppIVRInput_IVRInput_006_GetPoseActionDataForNextFrame_params *params )
 {
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
     InputPoseActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputPoseActionData_t_1418_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)params->action, (vr::ETrackingUniverseOrigin)params->eOrigin, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetPoseActionDataForNextFrame( params->action, params->eOrigin, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputPoseActionData_t_1418_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_006_GetSkeletalActionData( struct cppIVRInput_IVRInput_006_GetSkeletalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
     InputSkeletalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputSkeletalActionData_t_1418_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize);
+    params->_ret = iface->GetSkeletalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize );
     if (params->pActionData)
         struct_InputSkeletalActionData_t_1418_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_006_GetBoneCount( struct cppIVRInput_IVRInput_006_GetBoneCount_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneCount((vr::VRActionHandle_t)params->action, (uint32_t *)params->pBoneCount);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetBoneCount( params->action, params->pBoneCount );
 }
 
 void cppIVRInput_IVRInput_006_GetBoneHierarchy( struct cppIVRInput_IVRInput_006_GetBoneHierarchy_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneHierarchy((vr::VRActionHandle_t)params->action, (vr::BoneIndex_t *)params->pParentIndices, (uint32_t)params->unIndexArayCount);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetBoneHierarchy( params->action, params->pParentIndices, params->unIndexArayCount );
 }
 
 void cppIVRInput_IVRInput_006_GetBoneName( struct cppIVRInput_IVRInput_006_GetBoneName_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneName((vr::VRActionHandle_t)params->action, (vr::BoneIndex_t)params->nBoneIndex, (char *)params->pchBoneName, (uint32_t)params->unNameBufferSize);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetBoneName( params->action, params->nBoneIndex, params->pchBoneName, params->unNameBufferSize );
 }
 
 void cppIVRInput_IVRInput_006_GetSkeletalReferenceTransforms( struct cppIVRInput_IVRInput_006_GetSkeletalReferenceTransforms_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalReferenceTransforms((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::EVRSkeletalReferencePose)params->eReferencePose, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetSkeletalReferenceTransforms( params->action, params->eTransformSpace, params->eReferencePose, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_006_GetSkeletalTrackingLevel( struct cppIVRInput_IVRInput_006_GetSkeletalTrackingLevel_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalTrackingLevel((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTrackingLevel *)params->pSkeletalTrackingLevel);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetSkeletalTrackingLevel( params->action, params->pSkeletalTrackingLevel );
 }
 
 void cppIVRInput_IVRInput_006_GetSkeletalBoneData( struct cppIVRInput_IVRInput_006_GetSkeletalBoneData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalBoneData((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::EVRSkeletalMotionRange)params->eMotionRange, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetSkeletalBoneData( params->action, params->eTransformSpace, params->eMotionRange, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_006_GetSkeletalSummaryData( struct cppIVRInput_IVRInput_006_GetSkeletalSummaryData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalSummaryData((vr::VRActionHandle_t)params->action, (vr::EVRSummaryType)params->eSummaryType, (vr::VRSkeletalSummaryData_t *)params->pSkeletalSummaryData);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetSkeletalSummaryData( params->action, params->eSummaryType, params->pSkeletalSummaryData );
 }
 
 void cppIVRInput_IVRInput_006_GetSkeletalBoneDataCompressed( struct cppIVRInput_IVRInput_006_GetSkeletalBoneDataCompressed_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalBoneDataCompressed((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalMotionRange)params->eMotionRange, (void *)params->pvCompressedData, (uint32_t)params->unCompressedSize, (uint32_t *)params->punRequiredCompressedSize);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetSkeletalBoneDataCompressed( params->action, params->eMotionRange, params->pvCompressedData, params->unCompressedSize, params->punRequiredCompressedSize );
 }
 
 void cppIVRInput_IVRInput_006_DecompressSkeletalBoneData( struct cppIVRInput_IVRInput_006_DecompressSkeletalBoneData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->DecompressSkeletalBoneData((const void *)params->pvCompressedBuffer, (uint32_t)params->unCompressedBufferSize, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->DecompressSkeletalBoneData( params->pvCompressedBuffer, params->unCompressedBufferSize, params->eTransformSpace, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_006_TriggerHapticVibrationAction( struct cppIVRInput_IVRInput_006_TriggerHapticVibrationAction_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->TriggerHapticVibrationAction((vr::VRActionHandle_t)params->action, (float)params->fStartSecondsFromNow, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->TriggerHapticVibrationAction( params->action, params->fStartSecondsFromNow, params->fDurationSeconds, params->fFrequency, params->fAmplitude, params->ulRestrictToDevice );
 }
 
 void cppIVRInput_IVRInput_006_GetActionOrigins( struct cppIVRInput_IVRInput_006_GetActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->digitalActionHandle, (vr::VRInputValueHandle_t *)params->originsOut, (uint32_t)params->originOutCount);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetActionOrigins( params->actionSetHandle, params->digitalActionHandle, params->originsOut, params->originOutCount );
 }
 
 void cppIVRInput_IVRInput_006_GetOriginLocalizedName( struct cppIVRInput_IVRInput_006_GetOriginLocalizedName_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginLocalizedName((vr::VRInputValueHandle_t)params->origin, (char *)params->pchNameArray, (uint32_t)params->unNameArraySize, (int32_t)params->unStringSectionsToInclude);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->GetOriginLocalizedName( params->origin, params->pchNameArray, params->unNameArraySize, params->unStringSectionsToInclude );
 }
 
 void cppIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo_params *params )
 {
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
     uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)params->origin, (vr::InputOriginInfo_t *)params->pOriginInfo, lin_unOriginInfoSize);
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_006_ShowActionOrigins( struct cppIVRInput_IVRInput_006_ShowActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->ulActionHandle);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->ShowActionOrigins( params->actionSetHandle, params->ulActionHandle );
 }
 
 void cppIVRInput_IVRInput_006_ShowBindingsForActionSet( struct cppIVRInput_IVRInput_006_ShowBindingsForActionSet_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowBindingsForActionSet((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount, (vr::VRInputValueHandle_t)params->originToHighlight);
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->ShowBindingsForActionSet( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount, params->originToHighlight );
 }
 
 void cppIVRInput_IVRInput_006_IsUsingLegacyInput( struct cppIVRInput_IVRInput_006_IsUsingLegacyInput_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->IsUsingLegacyInput();
+    struct cppIVRInput_IVRInput_006 *iface = (struct cppIVRInput_IVRInput_006 *)params->linux_side;
+    params->_ret = iface->IsUsingLegacyInput(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.h
index 3e8397a4..d4df201f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRInput_IVRInput_006;
 struct cppIVRInput_IVRInput_006_SetActionManifestPath_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp
index fb6959bf..123f5c52 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp
@@ -9,175 +9,238 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRInput_IVRInput_007
+{
+#ifdef __cplusplus
+    virtual uint32_t SetActionManifestPath( const char * ) = 0;
+    virtual uint32_t GetActionSetHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetActionHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetInputSourceHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t UpdateActionState( VRActiveActionSet_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetDigitalActionData( uint64_t, InputDigitalActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetAnalogActionData( uint64_t, InputAnalogActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetPoseActionDataRelativeToNow( uint64_t, uint32_t, float, InputPoseActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetPoseActionDataForNextFrame( uint64_t, uint32_t, InputPoseActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetSkeletalActionData( uint64_t, InputSkeletalActionData_t *, uint32_t ) = 0;
+    virtual uint32_t GetBoneCount( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t GetBoneHierarchy( uint64_t, int32_t *, uint32_t ) = 0;
+    virtual uint32_t GetBoneName( uint64_t, int32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalReferenceTransforms( uint64_t, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalTrackingLevel( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t GetSkeletalBoneData( uint64_t, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalSummaryData( uint64_t, uint32_t, VRSkeletalSummaryData_t * ) = 0;
+    virtual uint32_t GetSkeletalBoneDataCompressed( uint64_t, uint32_t, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t DecompressSkeletalBoneData( const void *, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t TriggerHapticVibrationAction( uint64_t, float, float, float, float, uint64_t ) = 0;
+    virtual uint32_t GetActionOrigins( uint64_t, uint64_t, uint64_t *, uint32_t ) = 0;
+    virtual uint32_t GetOriginLocalizedName( uint64_t, char *, uint32_t, int32_t ) = 0;
+    virtual uint32_t GetOriginTrackedDeviceInfo( uint64_t, InputOriginInfo_t *, uint32_t ) = 0;
+    virtual uint32_t GetActionBindingInfo( uint64_t, InputBindingInfo_t *, uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t ShowActionOrigins( uint64_t, uint64_t ) = 0;
+    virtual uint32_t ShowBindingsForActionSet( VRActiveActionSet_t *, uint32_t, uint32_t, uint64_t ) = 0;
+    virtual bool IsUsingLegacyInput(  ) = 0;
+    virtual uint32_t OpenBindingUI( const char *, uint64_t, uint64_t, bool ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRInput_IVRInput_007_SetActionManifestPath( struct cppIVRInput_IVRInput_007_SetActionManifestPath_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->SetActionManifestPath((const char *)params->pchActionManifestPath);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->SetActionManifestPath( params->pchActionManifestPath );
 }
 
 void cppIVRInput_IVRInput_007_GetActionSetHandle( struct cppIVRInput_IVRInput_007_GetActionSetHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionSetHandle((const char *)params->pchActionSetName, (vr::VRActionSetHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pchActionSetName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_007_GetActionHandle( struct cppIVRInput_IVRInput_007_GetActionHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionHandle((const char *)params->pchActionName, (vr::VRActionHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetActionHandle( params->pchActionName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_007_GetInputSourceHandle( struct cppIVRInput_IVRInput_007_GetInputSourceHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetInputSourceHandle((const char *)params->pchInputSourcePath, (vr::VRInputValueHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetInputSourceHandle( params->pchInputSourcePath, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_007_UpdateActionState( struct cppIVRInput_IVRInput_007_UpdateActionState_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->UpdateActionState((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->UpdateActionState( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount );
 }
 
 void cppIVRInput_IVRInput_007_GetDigitalActionData( struct cppIVRInput_IVRInput_007_GetDigitalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
     InputDigitalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputDigitalActionData_t_1916_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetDigitalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetDigitalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputDigitalActionData_t_1916_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_007_GetAnalogActionData( struct cppIVRInput_IVRInput_007_GetAnalogActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
     InputAnalogActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputAnalogActionData_t_1916_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetAnalogActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetAnalogActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputAnalogActionData_t_1916_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_007_GetPoseActionDataRelativeToNow( struct cppIVRInput_IVRInput_007_GetPoseActionDataRelativeToNow_params *params )
 {
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
     InputPoseActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputPoseActionData_t_1916_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)params->action, (vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetPoseActionDataRelativeToNow( params->action, params->eOrigin, params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputPoseActionData_t_1916_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_007_GetPoseActionDataForNextFrame( struct cppIVRInput_IVRInput_007_GetPoseActionDataForNextFrame_params *params )
 {
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
     InputPoseActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputPoseActionData_t_1916_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)params->action, (vr::ETrackingUniverseOrigin)params->eOrigin, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetPoseActionDataForNextFrame( params->action, params->eOrigin, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputPoseActionData_t_1916_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_007_GetSkeletalActionData( struct cppIVRInput_IVRInput_007_GetSkeletalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
     InputSkeletalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputSkeletalActionData_t_1916_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize);
+    params->_ret = iface->GetSkeletalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize );
     if (params->pActionData)
         struct_InputSkeletalActionData_t_1916_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_007_GetBoneCount( struct cppIVRInput_IVRInput_007_GetBoneCount_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneCount((vr::VRActionHandle_t)params->action, (uint32_t *)params->pBoneCount);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetBoneCount( params->action, params->pBoneCount );
 }
 
 void cppIVRInput_IVRInput_007_GetBoneHierarchy( struct cppIVRInput_IVRInput_007_GetBoneHierarchy_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneHierarchy((vr::VRActionHandle_t)params->action, (vr::BoneIndex_t *)params->pParentIndices, (uint32_t)params->unIndexArayCount);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetBoneHierarchy( params->action, params->pParentIndices, params->unIndexArayCount );
 }
 
 void cppIVRInput_IVRInput_007_GetBoneName( struct cppIVRInput_IVRInput_007_GetBoneName_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneName((vr::VRActionHandle_t)params->action, (vr::BoneIndex_t)params->nBoneIndex, (char *)params->pchBoneName, (uint32_t)params->unNameBufferSize);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetBoneName( params->action, params->nBoneIndex, params->pchBoneName, params->unNameBufferSize );
 }
 
 void cppIVRInput_IVRInput_007_GetSkeletalReferenceTransforms( struct cppIVRInput_IVRInput_007_GetSkeletalReferenceTransforms_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalReferenceTransforms((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::EVRSkeletalReferencePose)params->eReferencePose, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetSkeletalReferenceTransforms( params->action, params->eTransformSpace, params->eReferencePose, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_007_GetSkeletalTrackingLevel( struct cppIVRInput_IVRInput_007_GetSkeletalTrackingLevel_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalTrackingLevel((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTrackingLevel *)params->pSkeletalTrackingLevel);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetSkeletalTrackingLevel( params->action, params->pSkeletalTrackingLevel );
 }
 
 void cppIVRInput_IVRInput_007_GetSkeletalBoneData( struct cppIVRInput_IVRInput_007_GetSkeletalBoneData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalBoneData((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::EVRSkeletalMotionRange)params->eMotionRange, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetSkeletalBoneData( params->action, params->eTransformSpace, params->eMotionRange, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_007_GetSkeletalSummaryData( struct cppIVRInput_IVRInput_007_GetSkeletalSummaryData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalSummaryData((vr::VRActionHandle_t)params->action, (vr::EVRSummaryType)params->eSummaryType, (vr::VRSkeletalSummaryData_t *)params->pSkeletalSummaryData);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetSkeletalSummaryData( params->action, params->eSummaryType, params->pSkeletalSummaryData );
 }
 
 void cppIVRInput_IVRInput_007_GetSkeletalBoneDataCompressed( struct cppIVRInput_IVRInput_007_GetSkeletalBoneDataCompressed_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalBoneDataCompressed((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalMotionRange)params->eMotionRange, (void *)params->pvCompressedData, (uint32_t)params->unCompressedSize, (uint32_t *)params->punRequiredCompressedSize);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetSkeletalBoneDataCompressed( params->action, params->eMotionRange, params->pvCompressedData, params->unCompressedSize, params->punRequiredCompressedSize );
 }
 
 void cppIVRInput_IVRInput_007_DecompressSkeletalBoneData( struct cppIVRInput_IVRInput_007_DecompressSkeletalBoneData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->DecompressSkeletalBoneData((const void *)params->pvCompressedBuffer, (uint32_t)params->unCompressedBufferSize, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->DecompressSkeletalBoneData( params->pvCompressedBuffer, params->unCompressedBufferSize, params->eTransformSpace, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_007_TriggerHapticVibrationAction( struct cppIVRInput_IVRInput_007_TriggerHapticVibrationAction_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->TriggerHapticVibrationAction((vr::VRActionHandle_t)params->action, (float)params->fStartSecondsFromNow, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->TriggerHapticVibrationAction( params->action, params->fStartSecondsFromNow, params->fDurationSeconds, params->fFrequency, params->fAmplitude, params->ulRestrictToDevice );
 }
 
 void cppIVRInput_IVRInput_007_GetActionOrigins( struct cppIVRInput_IVRInput_007_GetActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->digitalActionHandle, (vr::VRInputValueHandle_t *)params->originsOut, (uint32_t)params->originOutCount);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetActionOrigins( params->actionSetHandle, params->digitalActionHandle, params->originsOut, params->originOutCount );
 }
 
 void cppIVRInput_IVRInput_007_GetOriginLocalizedName( struct cppIVRInput_IVRInput_007_GetOriginLocalizedName_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginLocalizedName((vr::VRInputValueHandle_t)params->origin, (char *)params->pchNameArray, (uint32_t)params->unNameArraySize, (int32_t)params->unStringSectionsToInclude);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetOriginLocalizedName( params->origin, params->pchNameArray, params->unNameArraySize, params->unStringSectionsToInclude );
 }
 
 void cppIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo_params *params )
 {
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
     uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)params->origin, (vr::InputOriginInfo_t *)params->pOriginInfo, lin_unOriginInfoSize);
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_007_GetActionBindingInfo( struct cppIVRInput_IVRInput_007_GetActionBindingInfo_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionBindingInfo((vr::VRActionHandle_t)params->action, (vr::InputBindingInfo_t *)params->pOriginInfo, (uint32_t)params->unBindingInfoSize, (uint32_t)params->unBindingInfoCount, (uint32_t *)params->punReturnedBindingInfoCount);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->GetActionBindingInfo( params->action, params->pOriginInfo, params->unBindingInfoSize, params->unBindingInfoCount, params->punReturnedBindingInfoCount );
 }
 
 void cppIVRInput_IVRInput_007_ShowActionOrigins( struct cppIVRInput_IVRInput_007_ShowActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->ulActionHandle);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->ShowActionOrigins( params->actionSetHandle, params->ulActionHandle );
 }
 
 void cppIVRInput_IVRInput_007_ShowBindingsForActionSet( struct cppIVRInput_IVRInput_007_ShowBindingsForActionSet_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowBindingsForActionSet((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount, (vr::VRInputValueHandle_t)params->originToHighlight);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->ShowBindingsForActionSet( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount, params->originToHighlight );
 }
 
 void cppIVRInput_IVRInput_007_IsUsingLegacyInput( struct cppIVRInput_IVRInput_007_IsUsingLegacyInput_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->IsUsingLegacyInput();
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->IsUsingLegacyInput(  );
 }
 
 void cppIVRInput_IVRInput_007_OpenBindingUI( struct cppIVRInput_IVRInput_007_OpenBindingUI_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->OpenBindingUI((const char *)params->pchAppKey, (vr::VRActionSetHandle_t)params->ulActionSetHandle, (vr::VRInputValueHandle_t)params->ulDeviceHandle, (bool)params->bShowOnDesktop);
+    struct cppIVRInput_IVRInput_007 *iface = (struct cppIVRInput_IVRInput_007 *)params->linux_side;
+    params->_ret = iface->OpenBindingUI( params->pchAppKey, params->ulActionSetHandle, params->ulDeviceHandle, params->bShowOnDesktop );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.h
index 5a6cec07..6577fd25 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRInput_IVRInput_007;
 struct cppIVRInput_IVRInput_007_SetActionManifestPath_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp
index 66b4272b..c5e2fd18 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp
@@ -9,195 +9,266 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRInput_IVRInput_010
+{
+#ifdef __cplusplus
+    virtual uint32_t SetActionManifestPath( const char * ) = 0;
+    virtual uint32_t GetActionSetHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetActionHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t GetInputSourceHandle( const char *, uint64_t * ) = 0;
+    virtual uint32_t UpdateActionState( VRActiveActionSet_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetDigitalActionData( uint64_t, InputDigitalActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetAnalogActionData( uint64_t, InputAnalogActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetPoseActionDataRelativeToNow( uint64_t, uint32_t, float, InputPoseActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetPoseActionDataForNextFrame( uint64_t, uint32_t, InputPoseActionData_t *, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetSkeletalActionData( uint64_t, InputSkeletalActionData_t *, uint32_t ) = 0;
+    virtual uint32_t GetDominantHand( uint32_t * ) = 0;
+    virtual uint32_t SetDominantHand( uint32_t ) = 0;
+    virtual uint32_t GetBoneCount( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t GetBoneHierarchy( uint64_t, int32_t *, uint32_t ) = 0;
+    virtual uint32_t GetBoneName( uint64_t, int32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalReferenceTransforms( uint64_t, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalTrackingLevel( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t GetSkeletalBoneData( uint64_t, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t GetSkeletalSummaryData( uint64_t, uint32_t, VRSkeletalSummaryData_t * ) = 0;
+    virtual uint32_t GetSkeletalBoneDataCompressed( uint64_t, uint32_t, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t DecompressSkeletalBoneData( const void *, uint32_t, uint32_t, VRBoneTransform_t *, uint32_t ) = 0;
+    virtual uint32_t TriggerHapticVibrationAction( uint64_t, float, float, float, float, uint64_t ) = 0;
+    virtual uint32_t GetActionOrigins( uint64_t, uint64_t, uint64_t *, uint32_t ) = 0;
+    virtual uint32_t GetOriginLocalizedName( uint64_t, char *, uint32_t, int32_t ) = 0;
+    virtual uint32_t GetOriginTrackedDeviceInfo( uint64_t, InputOriginInfo_t *, uint32_t ) = 0;
+    virtual uint32_t GetActionBindingInfo( uint64_t, InputBindingInfo_t *, uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t ShowActionOrigins( uint64_t, uint64_t ) = 0;
+    virtual uint32_t ShowBindingsForActionSet( VRActiveActionSet_t *, uint32_t, uint32_t, uint64_t ) = 0;
+    virtual uint32_t GetComponentStateForBinding( const char *, const char *, const InputBindingInfo_t *, uint32_t, uint32_t, RenderModel_ComponentState_t * ) = 0;
+    virtual bool IsUsingLegacyInput(  ) = 0;
+    virtual uint32_t OpenBindingUI( const char *, uint64_t, uint64_t, bool ) = 0;
+    virtual uint32_t GetBindingVariant( uint64_t, char *, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRInput_IVRInput_010_SetActionManifestPath( struct cppIVRInput_IVRInput_010_SetActionManifestPath_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->SetActionManifestPath((const char *)params->pchActionManifestPath);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->SetActionManifestPath( params->pchActionManifestPath );
 }
 
 void cppIVRInput_IVRInput_010_GetActionSetHandle( struct cppIVRInput_IVRInput_010_GetActionSetHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionSetHandle((const char *)params->pchActionSetName, (vr::VRActionSetHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetActionSetHandle( params->pchActionSetName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_010_GetActionHandle( struct cppIVRInput_IVRInput_010_GetActionHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionHandle((const char *)params->pchActionName, (vr::VRActionHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetActionHandle( params->pchActionName, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_010_GetInputSourceHandle( struct cppIVRInput_IVRInput_010_GetInputSourceHandle_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetInputSourceHandle((const char *)params->pchInputSourcePath, (vr::VRInputValueHandle_t *)params->pHandle);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetInputSourceHandle( params->pchInputSourcePath, params->pHandle );
 }
 
 void cppIVRInput_IVRInput_010_UpdateActionState( struct cppIVRInput_IVRInput_010_UpdateActionState_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->UpdateActionState((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->UpdateActionState( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount );
 }
 
 void cppIVRInput_IVRInput_010_GetDigitalActionData( struct cppIVRInput_IVRInput_010_GetDigitalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
     InputDigitalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputDigitalActionData_t_1267_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetDigitalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetDigitalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputDigitalActionData_t_1267_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_010_GetAnalogActionData( struct cppIVRInput_IVRInput_010_GetAnalogActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
     InputAnalogActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputAnalogActionData_t_1267_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetAnalogActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetAnalogActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputAnalogActionData_t_1267_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow( struct cppIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow_params *params )
 {
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
     InputPoseActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputPoseActionData_t_1267_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)params->action, (vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetPoseActionDataRelativeToNow( params->action, params->eOrigin, params->fPredictedSecondsFromNow, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputPoseActionData_t_1267_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_010_GetPoseActionDataForNextFrame( struct cppIVRInput_IVRInput_010_GetPoseActionDataForNextFrame_params *params )
 {
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
     InputPoseActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputPoseActionData_t_1267_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)params->action, (vr::ETrackingUniverseOrigin)params->eOrigin, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    params->_ret = iface->GetPoseActionDataForNextFrame( params->action, params->eOrigin, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize, params->ulRestrictToDevice );
     if (params->pActionData)
         struct_InputPoseActionData_t_1267_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_010_GetSkeletalActionData( struct cppIVRInput_IVRInput_010_GetSkeletalActionData_params *params )
 {
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
     InputSkeletalActionData_t lin_pActionData;
     if (params->pActionData)
         struct_InputSkeletalActionData_t_1267_win_to_lin( params->pActionData, &lin_pActionData );
     uint32_t lin_unActionDataSize = params->unActionDataSize ? sizeof(lin_pActionData) : 0;
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize);
+    params->_ret = iface->GetSkeletalActionData( params->action, params->pActionData ? &lin_pActionData : nullptr, lin_unActionDataSize );
     if (params->pActionData)
         struct_InputSkeletalActionData_t_1267_lin_to_win( &lin_pActionData, params->pActionData, params->unActionDataSize );
 }
 
 void cppIVRInput_IVRInput_010_GetDominantHand( struct cppIVRInput_IVRInput_010_GetDominantHand_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetDominantHand((vr::ETrackedControllerRole *)params->peDominantHand);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetDominantHand( params->peDominantHand );
 }
 
 void cppIVRInput_IVRInput_010_SetDominantHand( struct cppIVRInput_IVRInput_010_SetDominantHand_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->SetDominantHand((vr::ETrackedControllerRole)params->eDominantHand);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->SetDominantHand( params->eDominantHand );
 }
 
 void cppIVRInput_IVRInput_010_GetBoneCount( struct cppIVRInput_IVRInput_010_GetBoneCount_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneCount((vr::VRActionHandle_t)params->action, (uint32_t *)params->pBoneCount);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetBoneCount( params->action, params->pBoneCount );
 }
 
 void cppIVRInput_IVRInput_010_GetBoneHierarchy( struct cppIVRInput_IVRInput_010_GetBoneHierarchy_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneHierarchy((vr::VRActionHandle_t)params->action, (vr::BoneIndex_t *)params->pParentIndices, (uint32_t)params->unIndexArayCount);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetBoneHierarchy( params->action, params->pParentIndices, params->unIndexArayCount );
 }
 
 void cppIVRInput_IVRInput_010_GetBoneName( struct cppIVRInput_IVRInput_010_GetBoneName_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBoneName((vr::VRActionHandle_t)params->action, (vr::BoneIndex_t)params->nBoneIndex, (char *)params->pchBoneName, (uint32_t)params->unNameBufferSize);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetBoneName( params->action, params->nBoneIndex, params->pchBoneName, params->unNameBufferSize );
 }
 
 void cppIVRInput_IVRInput_010_GetSkeletalReferenceTransforms( struct cppIVRInput_IVRInput_010_GetSkeletalReferenceTransforms_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalReferenceTransforms((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::EVRSkeletalReferencePose)params->eReferencePose, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetSkeletalReferenceTransforms( params->action, params->eTransformSpace, params->eReferencePose, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_010_GetSkeletalTrackingLevel( struct cppIVRInput_IVRInput_010_GetSkeletalTrackingLevel_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalTrackingLevel((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTrackingLevel *)params->pSkeletalTrackingLevel);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetSkeletalTrackingLevel( params->action, params->pSkeletalTrackingLevel );
 }
 
 void cppIVRInput_IVRInput_010_GetSkeletalBoneData( struct cppIVRInput_IVRInput_010_GetSkeletalBoneData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalBoneData((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::EVRSkeletalMotionRange)params->eMotionRange, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetSkeletalBoneData( params->action, params->eTransformSpace, params->eMotionRange, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_010_GetSkeletalSummaryData( struct cppIVRInput_IVRInput_010_GetSkeletalSummaryData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalSummaryData((vr::VRActionHandle_t)params->action, (vr::EVRSummaryType)params->eSummaryType, (vr::VRSkeletalSummaryData_t *)params->pSkeletalSummaryData);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetSkeletalSummaryData( params->action, params->eSummaryType, params->pSkeletalSummaryData );
 }
 
 void cppIVRInput_IVRInput_010_GetSkeletalBoneDataCompressed( struct cppIVRInput_IVRInput_010_GetSkeletalBoneDataCompressed_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetSkeletalBoneDataCompressed((vr::VRActionHandle_t)params->action, (vr::EVRSkeletalMotionRange)params->eMotionRange, (void *)params->pvCompressedData, (uint32_t)params->unCompressedSize, (uint32_t *)params->punRequiredCompressedSize);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetSkeletalBoneDataCompressed( params->action, params->eMotionRange, params->pvCompressedData, params->unCompressedSize, params->punRequiredCompressedSize );
 }
 
 void cppIVRInput_IVRInput_010_DecompressSkeletalBoneData( struct cppIVRInput_IVRInput_010_DecompressSkeletalBoneData_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->DecompressSkeletalBoneData((const void *)params->pvCompressedBuffer, (uint32_t)params->unCompressedBufferSize, (vr::EVRSkeletalTransformSpace)params->eTransformSpace, (vr::VRBoneTransform_t *)params->pTransformArray, (uint32_t)params->unTransformArrayCount);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->DecompressSkeletalBoneData( params->pvCompressedBuffer, params->unCompressedBufferSize, params->eTransformSpace, params->pTransformArray, params->unTransformArrayCount );
 }
 
 void cppIVRInput_IVRInput_010_TriggerHapticVibrationAction( struct cppIVRInput_IVRInput_010_TriggerHapticVibrationAction_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->TriggerHapticVibrationAction((vr::VRActionHandle_t)params->action, (float)params->fStartSecondsFromNow, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude, (vr::VRInputValueHandle_t)params->ulRestrictToDevice);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->TriggerHapticVibrationAction( params->action, params->fStartSecondsFromNow, params->fDurationSeconds, params->fFrequency, params->fAmplitude, params->ulRestrictToDevice );
 }
 
 void cppIVRInput_IVRInput_010_GetActionOrigins( struct cppIVRInput_IVRInput_010_GetActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->digitalActionHandle, (vr::VRInputValueHandle_t *)params->originsOut, (uint32_t)params->originOutCount);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetActionOrigins( params->actionSetHandle, params->digitalActionHandle, params->originsOut, params->originOutCount );
 }
 
 void cppIVRInput_IVRInput_010_GetOriginLocalizedName( struct cppIVRInput_IVRInput_010_GetOriginLocalizedName_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginLocalizedName((vr::VRInputValueHandle_t)params->origin, (char *)params->pchNameArray, (uint32_t)params->unNameArraySize, (int32_t)params->unStringSectionsToInclude);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetOriginLocalizedName( params->origin, params->pchNameArray, params->unNameArraySize, params->unStringSectionsToInclude );
 }
 
 void cppIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo( struct cppIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo_params *params )
 {
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
     uint32_t lin_unOriginInfoSize = std::min( params->unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t) );
-    params->_ret = ((IVRInput*)params->linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)params->origin, (vr::InputOriginInfo_t *)params->pOriginInfo, lin_unOriginInfoSize);
+    params->_ret = iface->GetOriginTrackedDeviceInfo( params->origin, params->pOriginInfo, lin_unOriginInfoSize );
 }
 
 void cppIVRInput_IVRInput_010_GetActionBindingInfo( struct cppIVRInput_IVRInput_010_GetActionBindingInfo_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetActionBindingInfo((vr::VRActionHandle_t)params->action, (vr::InputBindingInfo_t *)params->pOriginInfo, (uint32_t)params->unBindingInfoSize, (uint32_t)params->unBindingInfoCount, (uint32_t *)params->punReturnedBindingInfoCount);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetActionBindingInfo( params->action, params->pOriginInfo, params->unBindingInfoSize, params->unBindingInfoCount, params->punReturnedBindingInfoCount );
 }
 
 void cppIVRInput_IVRInput_010_ShowActionOrigins( struct cppIVRInput_IVRInput_010_ShowActionOrigins_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowActionOrigins((vr::VRActionSetHandle_t)params->actionSetHandle, (vr::VRActionHandle_t)params->ulActionHandle);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->ShowActionOrigins( params->actionSetHandle, params->ulActionHandle );
 }
 
 void cppIVRInput_IVRInput_010_ShowBindingsForActionSet( struct cppIVRInput_IVRInput_010_ShowBindingsForActionSet_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->ShowBindingsForActionSet((vr::VRActiveActionSet_t *)params->pSets, (uint32_t)params->unSizeOfVRSelectedActionSet_t, (uint32_t)params->unSetCount, (vr::VRInputValueHandle_t)params->originToHighlight);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->ShowBindingsForActionSet( params->pSets, params->unSizeOfVRSelectedActionSet_t, params->unSetCount, params->originToHighlight );
 }
 
 void cppIVRInput_IVRInput_010_GetComponentStateForBinding( struct cppIVRInput_IVRInput_010_GetComponentStateForBinding_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetComponentStateForBinding((const char *)params->pchRenderModelName, (const char *)params->pchComponentName, (const vr::InputBindingInfo_t *)params->pOriginInfo, (uint32_t)params->unBindingInfoSize, (uint32_t)params->unBindingInfoCount, (vr::RenderModel_ComponentState_t *)params->pComponentState);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetComponentStateForBinding( params->pchRenderModelName, params->pchComponentName, params->pOriginInfo, params->unBindingInfoSize, params->unBindingInfoCount, params->pComponentState );
 }
 
 void cppIVRInput_IVRInput_010_IsUsingLegacyInput( struct cppIVRInput_IVRInput_010_IsUsingLegacyInput_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->IsUsingLegacyInput();
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->IsUsingLegacyInput(  );
 }
 
 void cppIVRInput_IVRInput_010_OpenBindingUI( struct cppIVRInput_IVRInput_010_OpenBindingUI_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->OpenBindingUI((const char *)params->pchAppKey, (vr::VRActionSetHandle_t)params->ulActionSetHandle, (vr::VRInputValueHandle_t)params->ulDeviceHandle, (bool)params->bShowOnDesktop);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->OpenBindingUI( params->pchAppKey, params->ulActionSetHandle, params->ulDeviceHandle, params->bShowOnDesktop );
 }
 
 void cppIVRInput_IVRInput_010_GetBindingVariant( struct cppIVRInput_IVRInput_010_GetBindingVariant_params *params )
 {
-    params->_ret = ((IVRInput*)params->linux_side)->GetBindingVariant((vr::VRInputValueHandle_t)params->ulDevicePath, (char *)params->pchVariantArray, (uint32_t)params->unVariantArraySize);
+    struct cppIVRInput_IVRInput_010 *iface = (struct cppIVRInput_IVRInput_010 *)params->linux_side;
+    params->_ret = iface->GetBindingVariant( params->ulDevicePath, params->pchVariantArray, params->unVariantArraySize );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h
index da921886..05369d12 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRInput_IVRInput_010;
 struct cppIVRInput_IVRInput_010_SetActionManifestPath_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRMailbox_IVRMailbox_001.cpp b/vrclient_x64/vrclient_x64/cppIVRMailbox_IVRMailbox_001.cpp
index 6fdd396a..a61f7286 100644
--- a/vrclient_x64/vrclient_x64/cppIVRMailbox_IVRMailbox_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRMailbox_IVRMailbox_001.cpp
@@ -9,24 +9,39 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRMailbox_IVRMailbox_001
+{
+#ifdef __cplusplus
+    virtual uint32_t undoc1( const char *, uint64_t * ) = 0;
+    virtual uint32_t undoc2( uint64_t ) = 0;
+    virtual uint32_t undoc3( uint64_t, const char *, const char * ) = 0;
+    virtual uint32_t undoc4( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRMailbox_IVRMailbox_001_undoc1( struct cppIVRMailbox_IVRMailbox_001_undoc1_params *params )
 {
-    params->_ret = ((IVRMailbox*)params->linux_side)->undoc1((const char *)params->a, (vr::vrmb_typea *)params->b);
+    struct cppIVRMailbox_IVRMailbox_001 *iface = (struct cppIVRMailbox_IVRMailbox_001 *)params->linux_side;
+    params->_ret = iface->undoc1( params->a, params->b );
 }
 
 void cppIVRMailbox_IVRMailbox_001_undoc2( struct cppIVRMailbox_IVRMailbox_001_undoc2_params *params )
 {
-    params->_ret = ((IVRMailbox*)params->linux_side)->undoc2((vr::vrmb_typea)params->a);
+    struct cppIVRMailbox_IVRMailbox_001 *iface = (struct cppIVRMailbox_IVRMailbox_001 *)params->linux_side;
+    params->_ret = iface->undoc2( params->a );
 }
 
 void cppIVRMailbox_IVRMailbox_001_undoc3( struct cppIVRMailbox_IVRMailbox_001_undoc3_params *params )
 {
-    params->_ret = ((IVRMailbox*)params->linux_side)->undoc3((vr::vrmb_typea)params->a, (const char *)params->b, (const char *)params->c);
+    struct cppIVRMailbox_IVRMailbox_001 *iface = (struct cppIVRMailbox_IVRMailbox_001 *)params->linux_side;
+    params->_ret = iface->undoc3( params->a, params->b, params->c );
 }
 
 void cppIVRMailbox_IVRMailbox_001_undoc4( struct cppIVRMailbox_IVRMailbox_001_undoc4_params *params )
 {
-    params->_ret = ((IVRMailbox*)params->linux_side)->undoc4((vr::vrmb_typea)params->a, (char *)params->b, (uint32_t)params->c, (uint32_t *)params->d);
+    struct cppIVRMailbox_IVRMailbox_001 *iface = (struct cppIVRMailbox_IVRMailbox_001 *)params->linux_side;
+    params->_ret = iface->undoc4( params->a, params->b, params->c, params->d );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRMailbox_IVRMailbox_001.h b/vrclient_x64/vrclient_x64/cppIVRMailbox_IVRMailbox_001.h
index 06245166..13f26b8a 100644
--- a/vrclient_x64/vrclient_x64/cppIVRMailbox_IVRMailbox_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRMailbox_IVRMailbox_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRMailbox_IVRMailbox_001;
 struct cppIVRMailbox_IVRMailbox_001_undoc1_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_001.cpp b/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_001.cpp
index 38c7a1f6..e842a46f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_001.cpp
@@ -9,19 +9,32 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRNotifications_IVRNotifications_001
+{
+#ifdef __cplusplus
+    virtual uint32_t GetErrorString( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t CreateNotification( uint64_t, uint64_t, const char *, const char *, const char *, const NotificationBitmap *, uint32_t * ) = 0;
+    virtual uint32_t DismissNotification( uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRNotifications_IVRNotifications_001_GetErrorString( struct cppIVRNotifications_IVRNotifications_001_GetErrorString_params *params )
 {
-    params->_ret = ((IVRNotifications*)params->linux_side)->GetErrorString((vr::NotificationError_t)params->error, (char *)params->pchBuffer, (uint32_t)params->unBufferSize);
+    struct cppIVRNotifications_IVRNotifications_001 *iface = (struct cppIVRNotifications_IVRNotifications_001 *)params->linux_side;
+    params->_ret = iface->GetErrorString( params->error, params->pchBuffer, params->unBufferSize );
 }
 
 void cppIVRNotifications_IVRNotifications_001_CreateNotification( struct cppIVRNotifications_IVRNotifications_001_CreateNotification_params *params )
 {
-    params->_ret = ((IVRNotifications*)params->linux_side)->CreateNotification((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint64_t)params->ulUserValue, (const char *)params->strType, (const char *)params->strText, (const char *)params->strCategory, (const vr::NotificationBitmap *)params->photo, (vr::VRNotificationId *)params->notificationId);
+    struct cppIVRNotifications_IVRNotifications_001 *iface = (struct cppIVRNotifications_IVRNotifications_001 *)params->linux_side;
+    params->_ret = iface->CreateNotification( params->ulOverlayHandle, params->ulUserValue, params->strType, params->strText, params->strCategory, params->photo, params->notificationId );
 }
 
 void cppIVRNotifications_IVRNotifications_001_DismissNotification( struct cppIVRNotifications_IVRNotifications_001_DismissNotification_params *params )
 {
-    params->_ret = ((IVRNotifications*)params->linux_side)->DismissNotification((vr::VRNotificationId)params->notificationId);
+    struct cppIVRNotifications_IVRNotifications_001 *iface = (struct cppIVRNotifications_IVRNotifications_001 *)params->linux_side;
+    params->_ret = iface->DismissNotification( params->notificationId );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_001.h b/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_001.h
index 4b0d2dab..4888f7b0 100644
--- a/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRNotifications_IVRNotifications_001;
 struct cppIVRNotifications_IVRNotifications_001_GetErrorString_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.cpp b/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.cpp
index 6536c2de..dc3b1a70 100644
--- a/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.cpp
@@ -9,14 +9,25 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRNotifications_IVRNotifications_002
+{
+#ifdef __cplusplus
+    virtual uint32_t CreateNotification( uint64_t, uint64_t, uint32_t, const char *, uint32_t, const NotificationBitmap_t *, uint32_t * ) = 0;
+    virtual uint32_t RemoveNotification( uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRNotifications_IVRNotifications_002_CreateNotification( struct cppIVRNotifications_IVRNotifications_002_CreateNotification_params *params )
 {
-    params->_ret = ((IVRNotifications*)params->linux_side)->CreateNotification((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint64_t)params->ulUserValue, (vr::EVRNotificationType)params->type, (const char *)params->pchText, (vr::EVRNotificationStyle)params->style, (const vr::NotificationBitmap_t *)params->pImage, (vr::VRNotificationId *)params->pNotificationId);
+    struct cppIVRNotifications_IVRNotifications_002 *iface = (struct cppIVRNotifications_IVRNotifications_002 *)params->linux_side;
+    params->_ret = iface->CreateNotification( params->ulOverlayHandle, params->ulUserValue, params->type, params->pchText, params->style, params->pImage, params->pNotificationId );
 }
 
 void cppIVRNotifications_IVRNotifications_002_RemoveNotification( struct cppIVRNotifications_IVRNotifications_002_RemoveNotification_params *params )
 {
-    params->_ret = ((IVRNotifications*)params->linux_side)->RemoveNotification((vr::VRNotificationId)params->notificationId);
+    struct cppIVRNotifications_IVRNotifications_002 *iface = (struct cppIVRNotifications_IVRNotifications_002 *)params->linux_side;
+    params->_ret = iface->RemoveNotification( params->notificationId );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.h b/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.h
index e52b0d1c..b596e64f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.h
+++ b/vrclient_x64/vrclient_x64/cppIVRNotifications_IVRNotifications_002.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRNotifications_IVRNotifications_002;
 struct cppIVRNotifications_IVRNotifications_002_CreateNotification_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp b/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp
index 5f934d47..6f509f24 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.cpp
@@ -9,27 +9,42 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlayView_IVROverlayView_003
+{
+#ifdef __cplusplus
+    virtual uint32_t AcquireOverlayView( uint64_t, VRNativeDevice_t *, VROverlayView_t *, uint32_t ) = 0;
+    virtual uint32_t ReleaseOverlayView( VROverlayView_t * ) = 0;
+    virtual void PostOverlayEvent( uint64_t, const VREvent_t * ) = 0;
+    virtual bool IsViewingPermitted( uint64_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlayView_IVROverlayView_003_AcquireOverlayView( struct cppIVROverlayView_IVROverlayView_003_AcquireOverlayView_params *params )
 {
-    params->_ret = ((IVROverlayView*)params->linux_side)->AcquireOverlayView((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRNativeDevice_t *)params->pNativeDevice, (vr::VROverlayView_t *)params->pOverlayView, (uint32_t)params->unOverlayViewSize);
+    struct cppIVROverlayView_IVROverlayView_003 *iface = (struct cppIVROverlayView_IVROverlayView_003 *)params->linux_side;
+    params->_ret = iface->AcquireOverlayView( params->ulOverlayHandle, params->pNativeDevice, params->pOverlayView, params->unOverlayViewSize );
 }
 
 void cppIVROverlayView_IVROverlayView_003_ReleaseOverlayView( struct cppIVROverlayView_IVROverlayView_003_ReleaseOverlayView_params *params )
 {
-    params->_ret = ((IVROverlayView*)params->linux_side)->ReleaseOverlayView((vr::VROverlayView_t *)params->pOverlayView);
+    struct cppIVROverlayView_IVROverlayView_003 *iface = (struct cppIVROverlayView_IVROverlayView_003 *)params->linux_side;
+    params->_ret = iface->ReleaseOverlayView( params->pOverlayView );
 }
 
 void cppIVROverlayView_IVROverlayView_003_PostOverlayEvent( struct cppIVROverlayView_IVROverlayView_003_PostOverlayEvent_params *params )
 {
+    struct cppIVROverlayView_IVROverlayView_003 *iface = (struct cppIVROverlayView_IVROverlayView_003 *)params->linux_side;
     VREvent_t lin_pvrEvent;
     if (params->pvrEvent)
         struct_VREvent_t_1267_win_to_lin( params->pvrEvent, &lin_pvrEvent );
-    ((IVROverlayView*)params->linux_side)->PostOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pvrEvent ? &lin_pvrEvent : nullptr);
+    iface->PostOverlayEvent( params->ulOverlayHandle, params->pvrEvent ? &lin_pvrEvent : nullptr );
 }
 
 void cppIVROverlayView_IVROverlayView_003_IsViewingPermitted( struct cppIVROverlayView_IVROverlayView_003_IsViewingPermitted_params *params )
 {
-    params->_ret = ((IVROverlayView*)params->linux_side)->IsViewingPermitted((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlayView_IVROverlayView_003 *iface = (struct cppIVROverlayView_IVROverlayView_003 *)params->linux_side;
+    params->_ret = iface->IsViewingPermitted( params->ulOverlayHandle );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.h b/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.h
index 1a121628..a4961674 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlayView_IVROverlayView_003.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlayView_IVROverlayView_003;
 struct cppIVROverlayView_IVROverlayView_003_AcquireOverlayView_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp
index 887e8683..4688710f 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.cpp
@@ -9,204 +9,291 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_001
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayGamma( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayGamma( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayVisibility( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayVisibility( uint64_t, uint32_t ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t * ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, void * ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual bool IsSystemOverlayVisible(  ) = 0;
+    virtual bool IsActiveSystemOverlay( uint64_t ) = 0;
+    virtual uint32_t SetSystemOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetSystemOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_001_FindOverlay( struct cppIVROverlay_IVROverlay_001_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_001_CreateOverlay( struct cppIVROverlay_IVROverlay_001_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_001_DestroyOverlay( struct cppIVROverlay_IVROverlay_001_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_001_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_001_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_001_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_001_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_001_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::VROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayFlag( struct cppIVROverlay_IVROverlay_001_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayFlag( struct cppIVROverlay_IVROverlay_001_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_001_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_001_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayGamma( struct cppIVROverlay_IVROverlay_001_SetOverlayGamma_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayGamma((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fGamma);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayGamma( params->ulOverlayHandle, params->fGamma );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayGamma( struct cppIVROverlay_IVROverlay_001_GetOverlayGamma_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayGamma((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfGamma);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayGamma( params->ulOverlayHandle, params->pfGamma );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_001_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_001_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_001_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_001_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_001_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_001_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_001_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_001_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_001_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayVisibility( struct cppIVROverlay_IVROverlay_001_GetOverlayVisibility_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayVisibility((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayVisibility *)params->peOverlayVisibility);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayVisibility( params->ulOverlayHandle, params->peOverlayVisibility );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayVisibility( struct cppIVROverlay_IVROverlay_001_SetOverlayVisibility_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayVisibility((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayVisibility)params->eOverlayVisibility);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayVisibility( params->ulOverlayHandle, params->eOverlayVisibility );
 }
 
 void cppIVROverlay_IVROverlay_001_ShowOverlay( struct cppIVROverlay_IVROverlay_001_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_001_HideOverlay( struct cppIVROverlay_IVROverlay_001_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_001_IsOverlayVisible( struct cppIVROverlay_IVROverlay_001_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_001_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_001_PollNextOverlayEvent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VREvent_t *)params->pEvent);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_001_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_001_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_001_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_001_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_001_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_001_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_001_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_001_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_001_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayTexture( struct cppIVROverlay_IVROverlay_001_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayRaw( struct cppIVROverlay_IVROverlay_001_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_001_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_001_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_001_IsSystemOverlayVisible( struct cppIVROverlay_IVROverlay_001_IsSystemOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsSystemOverlayVisible();
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->IsSystemOverlayVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_001_IsActiveSystemOverlay( struct cppIVROverlay_IVROverlay_001_IsActiveSystemOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveSystemOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->IsActiveSystemOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_001_SetSystemOverlaySceneProcess( struct cppIVROverlay_IVROverlay_001_SetSystemOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetSystemOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->SetSystemOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_001_GetSystemOverlaySceneProcess( struct cppIVROverlay_IVROverlay_001_GetSystemOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetSystemOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_001 *iface = (struct cppIVROverlay_IVROverlay_001 *)params->linux_side;
+    params->_ret = iface->GetSystemOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h
index 4a8389ea..925f5e59 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_001;
 struct cppIVROverlay_IVROverlay_001_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp
index a0d4fbc2..06bd5f4e 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.cpp
@@ -9,214 +9,305 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_002
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayGamma( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayGamma( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t * ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, uint32_t, void * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_002_FindOverlay( struct cppIVROverlay_IVROverlay_002_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_002_CreateOverlay( struct cppIVROverlay_IVROverlay_002_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_002_DestroyOverlay( struct cppIVROverlay_IVROverlay_002_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_002_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_002_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_002_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_002_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_002_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::VROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayFlag( struct cppIVROverlay_IVROverlay_002_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayFlag( struct cppIVROverlay_IVROverlay_002_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayColor( struct cppIVROverlay_IVROverlay_002_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayColor( struct cppIVROverlay_IVROverlay_002_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_002_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_002_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayGamma( struct cppIVROverlay_IVROverlay_002_SetOverlayGamma_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayGamma((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fGamma);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayGamma( params->ulOverlayHandle, params->fGamma );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayGamma( struct cppIVROverlay_IVROverlay_002_GetOverlayGamma_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayGamma((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfGamma);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayGamma( params->ulOverlayHandle, params->pfGamma );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_002_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_002_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_002_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_002_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_002_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_002_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_002_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_002_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_002_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_002_ShowOverlay( struct cppIVROverlay_IVROverlay_002_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_002_HideOverlay( struct cppIVROverlay_IVROverlay_002_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_002_IsOverlayVisible( struct cppIVROverlay_IVROverlay_002_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_002_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_002_PollNextOverlayEvent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VREvent_t *)params->pEvent);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_002_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_002_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_002_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_002_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_002_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_002_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_002_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_002_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_002_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayTexture( struct cppIVROverlay_IVROverlay_002_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::GraphicsAPIConvention)params->eTextureType, (void *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->eTextureType, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_002_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_002_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayRaw( struct cppIVROverlay_IVROverlay_002_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_002_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_002_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_002_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_002_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_002_IsDashboardVisible( struct cppIVROverlay_IVROverlay_002_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_002_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_002_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_002_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_002_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_002_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_002_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_002 *iface = (struct cppIVROverlay_IVROverlay_002 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h
index e2b655ab..bda210e0 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_002.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_002;
 struct cppIVROverlay_IVROverlay_002_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp
index 19fe27d4..f3f5fac0 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.cpp
@@ -9,234 +9,333 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_003
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayGamma( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayGamma( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t * ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, uint32_t, void * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_003_FindOverlay( struct cppIVROverlay_IVROverlay_003_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_003_CreateOverlay( struct cppIVROverlay_IVROverlay_003_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_003_DestroyOverlay( struct cppIVROverlay_IVROverlay_003_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_003_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_003_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_003_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_003_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayKey( struct cppIVROverlay_IVROverlay_003_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::VROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayName( struct cppIVROverlay_IVROverlay_003_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::VROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayImageData( struct cppIVROverlay_IVROverlay_003_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_003_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::VROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayFlag( struct cppIVROverlay_IVROverlay_003_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayFlag( struct cppIVROverlay_IVROverlay_003_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayColor( struct cppIVROverlay_IVROverlay_003_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayColor( struct cppIVROverlay_IVROverlay_003_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_003_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_003_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayGamma( struct cppIVROverlay_IVROverlay_003_SetOverlayGamma_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayGamma((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fGamma);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayGamma( params->ulOverlayHandle, params->fGamma );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayGamma( struct cppIVROverlay_IVROverlay_003_GetOverlayGamma_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayGamma((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfGamma);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayGamma( params->ulOverlayHandle, params->pfGamma );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_003_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_003_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_003_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_003_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_003_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_003_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_003_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_003_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_003_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_003_ShowOverlay( struct cppIVROverlay_IVROverlay_003_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_003_HideOverlay( struct cppIVROverlay_IVROverlay_003_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_003_IsOverlayVisible( struct cppIVROverlay_IVROverlay_003_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_003_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_003_PollNextOverlayEvent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VREvent_t *)params->pEvent);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_003_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_003_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_003_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_003_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_003_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_003_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_003_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_003_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_003_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayTexture( struct cppIVROverlay_IVROverlay_003_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::GraphicsAPIConvention)params->eTextureType, (void *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->eTextureType, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_003_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_003_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayRaw( struct cppIVROverlay_IVROverlay_003_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_003_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_003_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_003_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_003_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_003_IsDashboardVisible( struct cppIVROverlay_IVROverlay_003_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_003_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_003_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_003_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_003_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_003_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_003_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_003_ShowDashboard( struct cppIVROverlay_IVROverlay_003_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_003 *iface = (struct cppIVROverlay_IVROverlay_003 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h
index 86159aba..1250b516 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_003.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_003;
 struct cppIVROverlay_IVROverlay_003_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp
index ad5b1e95..e3f55e6a 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.cpp
@@ -9,244 +9,347 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_004
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayGamma( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayGamma( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t * ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, uint32_t, void * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_004_FindOverlay( struct cppIVROverlay_IVROverlay_004_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_004_CreateOverlay( struct cppIVROverlay_IVROverlay_004_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_004_DestroyOverlay( struct cppIVROverlay_IVROverlay_004_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_004_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_004_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_004_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_004_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayKey( struct cppIVROverlay_IVROverlay_004_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::VROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayName( struct cppIVROverlay_IVROverlay_004_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::VROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayImageData( struct cppIVROverlay_IVROverlay_004_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_004_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::VROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayFlag( struct cppIVROverlay_IVROverlay_004_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayFlag( struct cppIVROverlay_IVROverlay_004_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayColor( struct cppIVROverlay_IVROverlay_004_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayColor( struct cppIVROverlay_IVROverlay_004_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_004_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_004_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayGamma( struct cppIVROverlay_IVROverlay_004_SetOverlayGamma_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayGamma((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fGamma);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayGamma( params->ulOverlayHandle, params->fGamma );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayGamma( struct cppIVROverlay_IVROverlay_004_GetOverlayGamma_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayGamma((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfGamma);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayGamma( params->ulOverlayHandle, params->pfGamma );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_004_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_004_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_004_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_004_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_004_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_004_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_004_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_004_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_004_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_004_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_004_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_004_ShowOverlay( struct cppIVROverlay_IVROverlay_004_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_004_HideOverlay( struct cppIVROverlay_IVROverlay_004_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_004_IsOverlayVisible( struct cppIVROverlay_IVROverlay_004_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_004_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_004_PollNextOverlayEvent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VREvent_t *)params->pEvent);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_004_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_004_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_004_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_004_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_004_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_004_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_004_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_004_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_004_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayTexture( struct cppIVROverlay_IVROverlay_004_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::GraphicsAPIConvention)params->eTextureType, (void *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->eTextureType, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_004_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_004_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayRaw( struct cppIVROverlay_IVROverlay_004_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_004_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_004_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_004_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_004_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_004_IsDashboardVisible( struct cppIVROverlay_IVROverlay_004_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_004_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_004_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_004_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_004_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_004_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_004_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_004_ShowDashboard( struct cppIVROverlay_IVROverlay_004_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_004 *iface = (struct cppIVROverlay_IVROverlay_004 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h
index fdca074f..6e083bee 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_004.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_004;
 struct cppIVROverlay_IVROverlay_004_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp
index 0fa6d0db..13797021 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.cpp
@@ -9,264 +9,375 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_005
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayGamma( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayGamma( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t * ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual bool IsFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, uint32_t, void * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_005_FindOverlay( struct cppIVROverlay_IVROverlay_005_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_CreateOverlay( struct cppIVROverlay_IVROverlay_005_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_DestroyOverlay( struct cppIVROverlay_IVROverlay_005_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_005_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_005_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayKey( struct cppIVROverlay_IVROverlay_005_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::VROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayName( struct cppIVROverlay_IVROverlay_005_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::VROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayImageData( struct cppIVROverlay_IVROverlay_005_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_005_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::VROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayFlag( struct cppIVROverlay_IVROverlay_005_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayFlag( struct cppIVROverlay_IVROverlay_005_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayColor( struct cppIVROverlay_IVROverlay_005_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayColor( struct cppIVROverlay_IVROverlay_005_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_005_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_005_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayGamma( struct cppIVROverlay_IVROverlay_005_SetOverlayGamma_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayGamma((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fGamma);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayGamma( params->ulOverlayHandle, params->fGamma );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayGamma( struct cppIVROverlay_IVROverlay_005_GetOverlayGamma_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayGamma((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfGamma);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayGamma( params->ulOverlayHandle, params->pfGamma );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_005_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_005_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_005_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_005_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_005_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_005_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_005_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_005_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_005_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_005_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_005_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_005_ShowOverlay( struct cppIVROverlay_IVROverlay_005_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_HideOverlay( struct cppIVROverlay_IVROverlay_005_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_IsOverlayVisible( struct cppIVROverlay_IVROverlay_005_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_005_PollNextOverlayEvent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VREvent_t *)params->pEvent);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_005_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_005_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_005_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_005_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_005_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_005_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_005_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_005_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_005_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_005_IsFocusOverlay( struct cppIVROverlay_IVROverlay_005_IsFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsFocusOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->IsFocusOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayTexture( struct cppIVROverlay_IVROverlay_005_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::GraphicsAPIConvention)params->eTextureType, (void *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->eTextureType, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_005_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_005_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayRaw( struct cppIVROverlay_IVROverlay_005_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_005_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_005_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_005_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_005_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_IsDashboardVisible( struct cppIVROverlay_IVROverlay_005_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_005_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_005_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_005_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_005_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_005_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_005_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_005_ShowDashboard( struct cppIVROverlay_IVROverlay_005_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_005_ShowKeyboard( struct cppIVROverlay_IVROverlay_005_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode );
 }
 
 void cppIVROverlay_IVROverlay_005_GetKeyboardText( struct cppIVROverlay_IVROverlay_005_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_005_HideKeyboard( struct cppIVROverlay_IVROverlay_005_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_005 *iface = (struct cppIVROverlay_IVROverlay_005 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h
index 950f2e00..392edc2b 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_005.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_005;
 struct cppIVROverlay_IVROverlay_005_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp
index 2c611d2c..a2ea5d02 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.cpp
@@ -9,289 +9,410 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_007
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t * ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_007_FindOverlay( struct cppIVROverlay_IVROverlay_007_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_CreateOverlay( struct cppIVROverlay_IVROverlay_007_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_DestroyOverlay( struct cppIVROverlay_IVROverlay_007_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_007_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_007_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayKey( struct cppIVROverlay_IVROverlay_007_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayName( struct cppIVROverlay_IVROverlay_007_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayImageData( struct cppIVROverlay_IVROverlay_007_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_007_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayFlag( struct cppIVROverlay_IVROverlay_007_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayFlag( struct cppIVROverlay_IVROverlay_007_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayColor( struct cppIVROverlay_IVROverlay_007_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayColor( struct cppIVROverlay_IVROverlay_007_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_007_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_007_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_007_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_007_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_007_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_007_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_007_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_007_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_007_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_007_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_007_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_007_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_007_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_007_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_007_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_007_ShowOverlay( struct cppIVROverlay_IVROverlay_007_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_HideOverlay( struct cppIVROverlay_IVROverlay_007_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_IsOverlayVisible( struct cppIVROverlay_IVROverlay_007_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_007_PollNextOverlayEvent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VREvent_t *)params->pEvent);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_007_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_007_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_007_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_007_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_007_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_007_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_007_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_007_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_007_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_007_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_007_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_007_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_007_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_007_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_007_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_007_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_007_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayTexture( struct cppIVROverlay_IVROverlay_007_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_007_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_007_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayRaw( struct cppIVROverlay_IVROverlay_007_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_007_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_007_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_007_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_007_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_IsDashboardVisible( struct cppIVROverlay_IVROverlay_007_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_007_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_007_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_007_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_007_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_007_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_007_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_007_ShowDashboard( struct cppIVROverlay_IVROverlay_007_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_007_ShowKeyboard( struct cppIVROverlay_IVROverlay_007_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_007_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_007_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_007_GetKeyboardText( struct cppIVROverlay_IVROverlay_007_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_007_HideKeyboard( struct cppIVROverlay_IVROverlay_007_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_007 *iface = (struct cppIVROverlay_IVROverlay_007 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h
index 9d79f859..275f4dd8 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_007.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_007;
 struct cppIVROverlay_IVROverlay_007_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp
index 02992200..05d3b6c2 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.cpp
@@ -9,304 +9,431 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_008
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t * ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_008_FindOverlay( struct cppIVROverlay_IVROverlay_008_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_CreateOverlay( struct cppIVROverlay_IVROverlay_008_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_DestroyOverlay( struct cppIVROverlay_IVROverlay_008_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_008_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_008_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayKey( struct cppIVROverlay_IVROverlay_008_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayName( struct cppIVROverlay_IVROverlay_008_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayImageData( struct cppIVROverlay_IVROverlay_008_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_008_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayFlag( struct cppIVROverlay_IVROverlay_008_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayFlag( struct cppIVROverlay_IVROverlay_008_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayColor( struct cppIVROverlay_IVROverlay_008_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayColor( struct cppIVROverlay_IVROverlay_008_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_008_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_008_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_008_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_008_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_008_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_008_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_008_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_008_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_008_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_008_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_008_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_008_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_008_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_008_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_008_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_008_ShowOverlay( struct cppIVROverlay_IVROverlay_008_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_HideOverlay( struct cppIVROverlay_IVROverlay_008_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_IsOverlayVisible( struct cppIVROverlay_IVROverlay_008_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_008_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_008_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_008_PollNextOverlayEvent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VREvent_t *)params->pEvent);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_008_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_008_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_008_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_008_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_008_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_008_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_008_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_008_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_008_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_008_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_008_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_008_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_008_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_008_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_008_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_008_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_008_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayTexture( struct cppIVROverlay_IVROverlay_008_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_008_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_008_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayRaw( struct cppIVROverlay_IVROverlay_008_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_008_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_008_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_008_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_008_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_IsDashboardVisible( struct cppIVROverlay_IVROverlay_008_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_008_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_008_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_008_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_008_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_008_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_008_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_008_ShowDashboard( struct cppIVROverlay_IVROverlay_008_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_008_ShowKeyboard( struct cppIVROverlay_IVROverlay_008_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_008_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_008_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_008_GetKeyboardText( struct cppIVROverlay_IVROverlay_008_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_008_HideKeyboard( struct cppIVROverlay_IVROverlay_008_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_008_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_008_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_008_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_008_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_008 *iface = (struct cppIVROverlay_IVROverlay_008 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h
index 88903f21..bb134ab7 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_008.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_008;
 struct cppIVROverlay_IVROverlay_008_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp
index de291a3a..76bbd24b 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp
@@ -9,325 +9,458 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_010
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_010_FindOverlay( struct cppIVROverlay_IVROverlay_010_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_CreateOverlay( struct cppIVROverlay_IVROverlay_010_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_DestroyOverlay( struct cppIVROverlay_IVROverlay_010_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_010_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_010_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayKey( struct cppIVROverlay_IVROverlay_010_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayName( struct cppIVROverlay_IVROverlay_010_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayImageData( struct cppIVROverlay_IVROverlay_010_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_010_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayFlag( struct cppIVROverlay_IVROverlay_010_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayFlag( struct cppIVROverlay_IVROverlay_010_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayColor( struct cppIVROverlay_IVROverlay_010_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayColor( struct cppIVROverlay_IVROverlay_010_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_010_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_010_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_010_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_010_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_010_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_010_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_010_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_010_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_010_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_010_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_010_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_010_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_010_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_010_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_010_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_010_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_010_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_010_ShowOverlay( struct cppIVROverlay_IVROverlay_010_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_HideOverlay( struct cppIVROverlay_IVROverlay_010_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_IsOverlayVisible( struct cppIVROverlay_IVROverlay_010_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_010_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_010_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_010_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_0918_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_0918_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_010_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_010_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_010_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_010_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_010_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_010_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_010_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_010_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_010_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_010_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_010_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_010_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_010_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_010_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_010_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_010_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_010_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayTexture( struct cppIVROverlay_IVROverlay_010_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_010_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_010_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayRaw( struct cppIVROverlay_IVROverlay_010_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_010_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_010_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_010_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_010_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_IsDashboardVisible( struct cppIVROverlay_IVROverlay_010_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_010_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_010_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_010_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_010_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_010_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_010_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_010_ShowDashboard( struct cppIVROverlay_IVROverlay_010_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_010_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_010_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_010_ShowKeyboard( struct cppIVROverlay_IVROverlay_010_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_010_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_010_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_010_GetKeyboardText( struct cppIVROverlay_IVROverlay_010_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_010_HideKeyboard( struct cppIVROverlay_IVROverlay_010_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_010_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_010_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_010_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_010_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_010 *iface = (struct cppIVROverlay_IVROverlay_010 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.h
index 1e4cad0d..cb9979df 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_010;
 struct cppIVROverlay_IVROverlay_010_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp
index 086e9038..f08a308f 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp
@@ -9,345 +9,486 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_011
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_011_FindOverlay( struct cppIVROverlay_IVROverlay_011_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_CreateOverlay( struct cppIVROverlay_IVROverlay_011_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_DestroyOverlay( struct cppIVROverlay_IVROverlay_011_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_011_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_011_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayKey( struct cppIVROverlay_IVROverlay_011_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayName( struct cppIVROverlay_IVROverlay_011_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayImageData( struct cppIVROverlay_IVROverlay_011_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_011_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_011_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_011_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayFlag( struct cppIVROverlay_IVROverlay_011_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayFlag( struct cppIVROverlay_IVROverlay_011_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayColor( struct cppIVROverlay_IVROverlay_011_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayColor( struct cppIVROverlay_IVROverlay_011_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_011_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_011_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_011_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_011_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_011_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_011_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_011_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_011_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_011_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_011_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_011_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_011_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_011_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_011_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_011_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_011_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_011_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_011_ShowOverlay( struct cppIVROverlay_IVROverlay_011_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_HideOverlay( struct cppIVROverlay_IVROverlay_011_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_IsOverlayVisible( struct cppIVROverlay_IVROverlay_011_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_011_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_011_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_011_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_0920_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_0920_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_011_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_011_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_011_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_011_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_011_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_011_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_011_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_011_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_011_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_011_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_011_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_011_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_011_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_011_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_011_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_011_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayTexture( struct cppIVROverlay_IVROverlay_011_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_011_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_011_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayRaw( struct cppIVROverlay_IVROverlay_011_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_011_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_011_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_011_GetOverlayTexture( struct cppIVROverlay_IVROverlay_011_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::EGraphicsAPIConvention *)params->pAPI, (vr::EColorSpace *)params->pColorSpace);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPI, params->pColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_011_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_011_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_011_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_IsDashboardVisible( struct cppIVROverlay_IVROverlay_011_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_011_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_011_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_011_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_011_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_011_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_011_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_011_ShowDashboard( struct cppIVROverlay_IVROverlay_011_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_011_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_011_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_011_ShowKeyboard( struct cppIVROverlay_IVROverlay_011_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_011_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_011_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_011_GetKeyboardText( struct cppIVROverlay_IVROverlay_011_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_011_HideKeyboard( struct cppIVROverlay_IVROverlay_011_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_011_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_011_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_011_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_011_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_011 *iface = (struct cppIVROverlay_IVROverlay_011 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.h
index ec69bf71..b5402123 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_011;
 struct cppIVROverlay_IVROverlay_011_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp
index 351a0900..6b5de640 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp
@@ -9,350 +9,493 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_012
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_012_FindOverlay( struct cppIVROverlay_IVROverlay_012_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_CreateOverlay( struct cppIVROverlay_IVROverlay_012_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_DestroyOverlay( struct cppIVROverlay_IVROverlay_012_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_012_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_012_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayKey( struct cppIVROverlay_IVROverlay_012_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayName( struct cppIVROverlay_IVROverlay_012_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayImageData( struct cppIVROverlay_IVROverlay_012_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_012_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_012_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_012_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayFlag( struct cppIVROverlay_IVROverlay_012_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayFlag( struct cppIVROverlay_IVROverlay_012_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayColor( struct cppIVROverlay_IVROverlay_012_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayColor( struct cppIVROverlay_IVROverlay_012_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_012_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_012_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_012_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_012_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_012_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_012_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_012_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_012_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_012_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_012_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_012_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_012_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_012_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_012_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_012_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_012_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_012_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_012_ShowOverlay( struct cppIVROverlay_IVROverlay_012_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_HideOverlay( struct cppIVROverlay_IVROverlay_012_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_IsOverlayVisible( struct cppIVROverlay_IVROverlay_012_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_012_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_012_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_012_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_101_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_101_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_012_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_012_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_012_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_012_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_012_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_012_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_012_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_012_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_012_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_012_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_012_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_012_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_012_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_012_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_012_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_012_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayTexture( struct cppIVROverlay_IVROverlay_012_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_012_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_012_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayRaw( struct cppIVROverlay_IVROverlay_012_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_012_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_012_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayTexture( struct cppIVROverlay_IVROverlay_012_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::EGraphicsAPIConvention *)params->pAPI, (vr::EColorSpace *)params->pColorSpace);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPI, params->pColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_012_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_012_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_012_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_012_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_012_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_IsDashboardVisible( struct cppIVROverlay_IVROverlay_012_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_012_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_012_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_012_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_012_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_012_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_012_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_012_ShowDashboard( struct cppIVROverlay_IVROverlay_012_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_012_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_012_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_012_ShowKeyboard( struct cppIVROverlay_IVROverlay_012_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_012_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_012_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_012_GetKeyboardText( struct cppIVROverlay_IVROverlay_012_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_012_HideKeyboard( struct cppIVROverlay_IVROverlay_012_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_012_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_012_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_012_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_012_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_012 *iface = (struct cppIVROverlay_IVROverlay_012 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.h
index f387c428..683f8198 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_012;
 struct cppIVROverlay_IVROverlay_012_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp
index 8ff25b4f..581e468d 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp
@@ -9,375 +9,528 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_013
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_013_FindOverlay( struct cppIVROverlay_IVROverlay_013_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_CreateOverlay( struct cppIVROverlay_IVROverlay_013_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_DestroyOverlay( struct cppIVROverlay_IVROverlay_013_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_013_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_013_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayKey( struct cppIVROverlay_IVROverlay_013_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayName( struct cppIVROverlay_IVROverlay_013_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayImageData( struct cppIVROverlay_IVROverlay_013_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_013_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_013_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_013_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayFlag( struct cppIVROverlay_IVROverlay_013_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayFlag( struct cppIVROverlay_IVROverlay_013_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayColor( struct cppIVROverlay_IVROverlay_013_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayColor( struct cppIVROverlay_IVROverlay_013_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_013_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_013_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_013_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_013_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_013_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_013_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_013_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_013_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_013_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_013_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_013_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_013_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_013_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_013_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_013_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_013_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_013_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_013_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_013_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_013_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_013_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_013_ShowOverlay( struct cppIVROverlay_IVROverlay_013_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_HideOverlay( struct cppIVROverlay_IVROverlay_013_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_IsOverlayVisible( struct cppIVROverlay_IVROverlay_013_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_013_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_013_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_013_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_104_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_104_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_013_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_013_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_013_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_013_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_013_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_013_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_013_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_013_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_013_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_013_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_013_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_013_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_013_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_013_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_013_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_013_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayTexture( struct cppIVROverlay_IVROverlay_013_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_013_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_013_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayRaw( struct cppIVROverlay_IVROverlay_013_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_013_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayTexture( struct cppIVROverlay_IVROverlay_013_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::EGraphicsAPIConvention *)params->pAPI, (vr::EColorSpace *)params->pColorSpace);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPI, params->pColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_013_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_013_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_013_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_013_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_013_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_IsDashboardVisible( struct cppIVROverlay_IVROverlay_013_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_013_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_013_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_013_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_013_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_013_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_013_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_013_ShowDashboard( struct cppIVROverlay_IVROverlay_013_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_013_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_013_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_013_ShowKeyboard( struct cppIVROverlay_IVROverlay_013_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_013_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_013_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_013_GetKeyboardText( struct cppIVROverlay_IVROverlay_013_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_013_HideKeyboard( struct cppIVROverlay_IVROverlay_013_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_013_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_013_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_013_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_013_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_013_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_013_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_013 *iface = (struct cppIVROverlay_IVROverlay_013 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.h
index c7587179..0bb09913 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_013;
 struct cppIVROverlay_IVROverlay_013_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp
index f485cd11..5c505ac5 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp
@@ -9,385 +9,542 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_014
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_014_FindOverlay( struct cppIVROverlay_IVROverlay_014_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_CreateOverlay( struct cppIVROverlay_IVROverlay_014_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_DestroyOverlay( struct cppIVROverlay_IVROverlay_014_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_014_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_014_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayKey( struct cppIVROverlay_IVROverlay_014_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayName( struct cppIVROverlay_IVROverlay_014_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayImageData( struct cppIVROverlay_IVROverlay_014_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_014_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_014_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_014_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayFlag( struct cppIVROverlay_IVROverlay_014_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayFlag( struct cppIVROverlay_IVROverlay_014_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayColor( struct cppIVROverlay_IVROverlay_014_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayColor( struct cppIVROverlay_IVROverlay_014_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_014_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_014_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_014_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_014_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_014_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_014_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_014_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_014_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_014_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_014_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_014_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_014_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_014_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_014_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_014_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_014_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_014_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_014_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_014_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_014_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_014_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_014_ShowOverlay( struct cppIVROverlay_IVROverlay_014_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_HideOverlay( struct cppIVROverlay_IVROverlay_014_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_IsOverlayVisible( struct cppIVROverlay_IVROverlay_014_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_014_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_014_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_014_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_106_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_106_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_014_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_014_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_014_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_014_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_014_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_014_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_014_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_014_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_014_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_014_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_014_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_014_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_014_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_014_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_014_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_014_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayTexture( struct cppIVROverlay_IVROverlay_014_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_014_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_014_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayRaw( struct cppIVROverlay_IVROverlay_014_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_014_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayTexture( struct cppIVROverlay_IVROverlay_014_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_014_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_014_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_014_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_014_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_014_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_IsDashboardVisible( struct cppIVROverlay_IVROverlay_014_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_014_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_014_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_014_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_014_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_014_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_014_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_014_ShowDashboard( struct cppIVROverlay_IVROverlay_014_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_014_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_014_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_014_ShowKeyboard( struct cppIVROverlay_IVROverlay_014_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_014_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_014_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_014_GetKeyboardText( struct cppIVROverlay_IVROverlay_014_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_014_HideKeyboard( struct cppIVROverlay_IVROverlay_014_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_014_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_014_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_014_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_014_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_014_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_014_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_014_GetOverlayFlags( struct cppIVROverlay_IVROverlay_014_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_014_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_014_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_014 *iface = (struct cppIVROverlay_IVROverlay_014 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.h
index 4e40694b..d9c0d4de 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_014;
 struct cppIVROverlay_IVROverlay_014_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp
index e5c0b965..db853c5b 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp
@@ -9,415 +9,584 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_016
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayRenderModel( uint64_t, char *, uint32_t, HmdColor_t *, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayRenderModel( uint64_t, const char *, const HmdColor_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTransformOverlayRelative( uint64_t, uint64_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformOverlayRelative( uint64_t, uint64_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_016_FindOverlay( struct cppIVROverlay_IVROverlay_016_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_CreateOverlay( struct cppIVROverlay_IVROverlay_016_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_DestroyOverlay( struct cppIVROverlay_IVROverlay_016_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_016_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_016_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayKey( struct cppIVROverlay_IVROverlay_016_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayName( struct cppIVROverlay_IVROverlay_016_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayName( struct cppIVROverlay_IVROverlay_016_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayImageData( struct cppIVROverlay_IVROverlay_016_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_016_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_016_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_016_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayFlag( struct cppIVROverlay_IVROverlay_016_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayFlag( struct cppIVROverlay_IVROverlay_016_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayColor( struct cppIVROverlay_IVROverlay_016_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayColor( struct cppIVROverlay_IVROverlay_016_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_016_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_016_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_016_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_016_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_016_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_016_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_016_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_016_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_016_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_016_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_016_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_016_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_016_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_016_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayRenderModel( struct cppIVROverlay_IVROverlay_016_GetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::HmdColor_t *)params->pColor, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderModel( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pColor, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayRenderModel( struct cppIVROverlay_IVROverlay_016_SetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchRenderModel, (const vr::HmdColor_t *)params->pColor);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderModel( params->ulOverlayHandle, params->pchRenderModel, params->pColor );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_016_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_016_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_016_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_016_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_016_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_016_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_016_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_016_GetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t *)params->ulOverlayHandleParent, (vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_016_SetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulOverlayHandleParent, (const vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_016_ShowOverlay( struct cppIVROverlay_IVROverlay_016_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_HideOverlay( struct cppIVROverlay_IVROverlay_016_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_IsOverlayVisible( struct cppIVROverlay_IVROverlay_016_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_016_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_016_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_016_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1010_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1010_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_016_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_016_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_016_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_016_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_016_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_016_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_016_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_016_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_016_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_016_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_016_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_016_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_016_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_016_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_016_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_016_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayTexture( struct cppIVROverlay_IVROverlay_016_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_016_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_016_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayRaw( struct cppIVROverlay_IVROverlay_016_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_016_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayTexture( struct cppIVROverlay_IVROverlay_016_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_016_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_016_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_016_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_016_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_016_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_IsDashboardVisible( struct cppIVROverlay_IVROverlay_016_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_016_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_016_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_016_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_016_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_016_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_016_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_016_ShowDashboard( struct cppIVROverlay_IVROverlay_016_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_016_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_016_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_016_ShowKeyboard( struct cppIVROverlay_IVROverlay_016_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_016_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_016_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_016_GetKeyboardText( struct cppIVROverlay_IVROverlay_016_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_016_HideKeyboard( struct cppIVROverlay_IVROverlay_016_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_016_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_016_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_016_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_016_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_016_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_016_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_016_GetOverlayFlags( struct cppIVROverlay_IVROverlay_016_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_016_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_016_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_016_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_016_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_016 *iface = (struct cppIVROverlay_IVROverlay_016 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.h
index 85db3dcd..0990a31e 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_016;
 struct cppIVROverlay_IVROverlay_016_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp
index d9a488e0..3ec10440 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp
@@ -9,425 +9,598 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_017
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayRenderModel( uint64_t, char *, uint32_t, HmdColor_t *, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayRenderModel( uint64_t, const char *, const HmdColor_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTransformOverlayRelative( uint64_t, uint64_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformOverlayRelative( uint64_t, uint64_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( uint64_t, uint32_t ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayDualAnalogTransform( uint64_t, uint32_t, const HmdVector2_t *, float ) = 0;
+    virtual uint32_t GetOverlayDualAnalogTransform( uint64_t, uint32_t, HmdVector2_t *, float * ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_017_FindOverlay( struct cppIVROverlay_IVROverlay_017_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_CreateOverlay( struct cppIVROverlay_IVROverlay_017_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_DestroyOverlay( struct cppIVROverlay_IVROverlay_017_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_017_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_017_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayKey( struct cppIVROverlay_IVROverlay_017_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayName( struct cppIVROverlay_IVROverlay_017_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayName( struct cppIVROverlay_IVROverlay_017_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayImageData( struct cppIVROverlay_IVROverlay_017_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_017_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_017_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_017_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayFlag( struct cppIVROverlay_IVROverlay_017_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayFlag( struct cppIVROverlay_IVROverlay_017_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayColor( struct cppIVROverlay_IVROverlay_017_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayColor( struct cppIVROverlay_IVROverlay_017_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_017_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_017_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_017_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_017_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_017_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_017_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_017_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_017_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_017_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_017_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_017_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_017_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_017_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_017_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayRenderModel( struct cppIVROverlay_IVROverlay_017_GetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::HmdColor_t *)params->pColor, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderModel( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pColor, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayRenderModel( struct cppIVROverlay_IVROverlay_017_SetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchRenderModel, (const vr::HmdColor_t *)params->pColor);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderModel( params->ulOverlayHandle, params->pchRenderModel, params->pColor );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_017_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_017_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_017_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_017_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_017_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_017_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_017_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_017_GetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t *)params->ulOverlayHandleParent, (vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_017_SetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulOverlayHandleParent, (const vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_017_ShowOverlay( struct cppIVROverlay_IVROverlay_017_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_HideOverlay( struct cppIVROverlay_IVROverlay_017_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_IsOverlayVisible( struct cppIVROverlay_IVROverlay_017_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_017_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_017_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_017_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1011_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1011_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_017_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_017_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_017_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_017_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_017_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_017_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_017_HandleControllerOverlayInteractionAsMouse( struct cppIVROverlay_IVROverlay_017_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HandleControllerOverlayInteractionAsMouse((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->ulOverlayHandle, params->unControllerDeviceIndex );
 }
 
 void cppIVROverlay_IVROverlay_017_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_017_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_017_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_017_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_017_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_017_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_017_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_017_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_017_SetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, *params->vCenter, (float)params->fRadius);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->vCenter, params->fRadius );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_017_GetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, (vr::HmdVector2_t *)params->pvCenter, (float *)params->pfRadius);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->pvCenter, params->pfRadius );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayTexture( struct cppIVROverlay_IVROverlay_017_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_017_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_017_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayRaw( struct cppIVROverlay_IVROverlay_017_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_017_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayTexture( struct cppIVROverlay_IVROverlay_017_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_017_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_017_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_017_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_017_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_017_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_IsDashboardVisible( struct cppIVROverlay_IVROverlay_017_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_017_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_017_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_017_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_017_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_017_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_017_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_017_ShowDashboard( struct cppIVROverlay_IVROverlay_017_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_017_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_017_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_017_ShowKeyboard( struct cppIVROverlay_IVROverlay_017_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_017_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_017_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_017_GetKeyboardText( struct cppIVROverlay_IVROverlay_017_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_017_HideKeyboard( struct cppIVROverlay_IVROverlay_017_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_017_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_017_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_017_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_017_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_017_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_017_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_017_GetOverlayFlags( struct cppIVROverlay_IVROverlay_017_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_017_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_017_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_017_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_017_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_017 *iface = (struct cppIVROverlay_IVROverlay_017 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.h
index f7906748..33493200 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_017;
 struct cppIVROverlay_IVROverlay_017_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp
index 13c3fd22..a15c0c0c 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp
@@ -9,420 +9,591 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_018
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayRenderModel( uint64_t, char *, uint32_t, HmdColor_t *, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayRenderModel( uint64_t, const char *, const HmdColor_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTransformOverlayRelative( uint64_t, uint64_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformOverlayRelative( uint64_t, uint64_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayDualAnalogTransform( uint64_t, uint32_t, const HmdVector2_t *, float ) = 0;
+    virtual uint32_t GetOverlayDualAnalogTransform( uint64_t, uint32_t, HmdVector2_t *, float * ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_018_FindOverlay( struct cppIVROverlay_IVROverlay_018_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_CreateOverlay( struct cppIVROverlay_IVROverlay_018_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_DestroyOverlay( struct cppIVROverlay_IVROverlay_018_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_018_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_018_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayKey( struct cppIVROverlay_IVROverlay_018_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayName( struct cppIVROverlay_IVROverlay_018_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayName( struct cppIVROverlay_IVROverlay_018_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayImageData( struct cppIVROverlay_IVROverlay_018_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_018_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_018_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_018_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayFlag( struct cppIVROverlay_IVROverlay_018_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayFlag( struct cppIVROverlay_IVROverlay_018_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayColor( struct cppIVROverlay_IVROverlay_018_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayColor( struct cppIVROverlay_IVROverlay_018_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_018_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_018_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_018_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_018_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_018_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_018_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_018_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_018_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_018_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_018_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_018_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_018_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_018_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_018_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayRenderModel( struct cppIVROverlay_IVROverlay_018_GetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::HmdColor_t *)params->pColor, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderModel( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pColor, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayRenderModel( struct cppIVROverlay_IVROverlay_018_SetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchRenderModel, (const vr::HmdColor_t *)params->pColor);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderModel( params->ulOverlayHandle, params->pchRenderModel, params->pColor );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_018_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_018_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_018_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_018_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_018_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_018_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_018_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_018_GetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t *)params->ulOverlayHandleParent, (vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_018_SetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulOverlayHandleParent, (const vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_018_ShowOverlay( struct cppIVROverlay_IVROverlay_018_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_HideOverlay( struct cppIVROverlay_IVROverlay_018_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_IsOverlayVisible( struct cppIVROverlay_IVROverlay_018_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_018_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_018_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_018_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1017_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1017_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_018_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_018_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_018_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_018_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_018_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_018_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_018_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_018_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_018_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_018_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_018_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_018_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_018_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_018_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_018_SetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, *params->vCenter, (float)params->fRadius);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->vCenter, params->fRadius );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_018_GetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, (vr::HmdVector2_t *)params->pvCenter, (float *)params->pfRadius);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->pvCenter, params->pfRadius );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayTexture( struct cppIVROverlay_IVROverlay_018_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_018_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_018_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayRaw( struct cppIVROverlay_IVROverlay_018_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_018_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayTexture( struct cppIVROverlay_IVROverlay_018_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_018_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_018_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_018_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_018_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_018_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_IsDashboardVisible( struct cppIVROverlay_IVROverlay_018_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_018_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_018_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_018_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_018_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_018_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_018_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_018_ShowDashboard( struct cppIVROverlay_IVROverlay_018_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_018_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_018_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_018_ShowKeyboard( struct cppIVROverlay_IVROverlay_018_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_018_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_018_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_018_GetKeyboardText( struct cppIVROverlay_IVROverlay_018_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_018_HideKeyboard( struct cppIVROverlay_IVROverlay_018_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_018_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_018_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_018_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_018_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_018_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_018_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_018_GetOverlayFlags( struct cppIVROverlay_IVROverlay_018_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_018_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_018_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_018_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_018_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_018 *iface = (struct cppIVROverlay_IVROverlay_018 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.h
index c6b850f0..2bba15ee 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_018;
 struct cppIVROverlay_IVROverlay_018_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp
index 8aabcdb3..821deb5b 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp
@@ -9,420 +9,591 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_019
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t SetHighQualityOverlay( uint64_t ) = 0;
+    virtual uint64_t GetHighQualityOverlay(  ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayRenderModel( uint64_t, char *, uint32_t, HmdColor_t *, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayRenderModel( uint64_t, const char *, const HmdColor_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTransformOverlayRelative( uint64_t, uint64_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformOverlayRelative( uint64_t, uint64_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayDualAnalogTransform( uint64_t, uint32_t, const HmdVector2_t *, float ) = 0;
+    virtual uint32_t GetOverlayDualAnalogTransform( uint64_t, uint32_t, HmdVector2_t *, float * ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_019_FindOverlay( struct cppIVROverlay_IVROverlay_019_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_CreateOverlay( struct cppIVROverlay_IVROverlay_019_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_DestroyOverlay( struct cppIVROverlay_IVROverlay_019_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_SetHighQualityOverlay( struct cppIVROverlay_IVROverlay_019_SetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetHighQualityOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetHighQualityOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_GetHighQualityOverlay( struct cppIVROverlay_IVROverlay_019_GetHighQualityOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetHighQualityOverlay();
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetHighQualityOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayKey( struct cppIVROverlay_IVROverlay_019_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayName( struct cppIVROverlay_IVROverlay_019_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayName( struct cppIVROverlay_IVROverlay_019_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayImageData( struct cppIVROverlay_IVROverlay_019_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_019_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_019_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_019_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayFlag( struct cppIVROverlay_IVROverlay_019_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayFlag( struct cppIVROverlay_IVROverlay_019_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayColor( struct cppIVROverlay_IVROverlay_019_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayColor( struct cppIVROverlay_IVROverlay_019_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_019_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_019_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_019_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_019_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_019_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_019_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_019_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_019_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_019_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_019_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_019_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_019_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_019_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_019_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayRenderModel( struct cppIVROverlay_IVROverlay_019_GetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::HmdColor_t *)params->pColor, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderModel( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pColor, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayRenderModel( struct cppIVROverlay_IVROverlay_019_SetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchRenderModel, (const vr::HmdColor_t *)params->pColor);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderModel( params->ulOverlayHandle, params->pchRenderModel, params->pColor );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_019_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_019_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_019_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_019_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_019_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_019_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_019_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_019_GetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t *)params->ulOverlayHandleParent, (vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_019_SetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulOverlayHandleParent, (const vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_019_ShowOverlay( struct cppIVROverlay_IVROverlay_019_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_HideOverlay( struct cppIVROverlay_IVROverlay_019_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_IsOverlayVisible( struct cppIVROverlay_IVROverlay_019_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_019_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_019_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_019_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1610_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1610_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_019_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_019_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_019_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_019_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_019_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_019_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_019_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_019_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_019_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_019_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_019_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_019_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_019_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_019_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_019_SetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, (const vr::HmdVector2_t *)params->pvCenter, (float)params->fRadius);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->pvCenter, params->fRadius );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_019_GetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, (vr::HmdVector2_t *)params->pvCenter, (float *)params->pfRadius);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->pvCenter, params->pfRadius );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayTexture( struct cppIVROverlay_IVROverlay_019_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_019_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_019_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayRaw( struct cppIVROverlay_IVROverlay_019_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_019_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayTexture( struct cppIVROverlay_IVROverlay_019_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_019_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_019_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_019_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_019_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_019_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_IsDashboardVisible( struct cppIVROverlay_IVROverlay_019_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_019_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_019_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_019_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_019_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_019_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_019_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_019_ShowDashboard( struct cppIVROverlay_IVROverlay_019_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_019_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_019_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_019_ShowKeyboard( struct cppIVROverlay_IVROverlay_019_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_019_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_019_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_019_GetKeyboardText( struct cppIVROverlay_IVROverlay_019_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_019_HideKeyboard( struct cppIVROverlay_IVROverlay_019_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_019_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_019_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_019_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_019_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_019_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_019_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_019_GetOverlayFlags( struct cppIVROverlay_IVROverlay_019_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_019_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_019_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_019_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_019_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_019 *iface = (struct cppIVROverlay_IVROverlay_019 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.h
index 0d9689d1..b7e0f241 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_019;
 struct cppIVROverlay_IVROverlay_019_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp
index fbe1baa5..ce339282 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp
@@ -9,410 +9,577 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_020
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float, float ) = 0;
+    virtual uint32_t GetOverlayAutoCurveDistanceRangeInMeters( uint64_t, float *, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayRenderModel( uint64_t, char *, uint32_t, HmdColor_t *, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayRenderModel( uint64_t, const char *, const HmdColor_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTransformOverlayRelative( uint64_t, uint64_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformOverlayRelative( uint64_t, uint64_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint64_t GetGamepadFocusOverlay(  ) = 0;
+    virtual uint32_t SetGamepadFocusOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayNeighbor( uint32_t, uint64_t, uint64_t ) = 0;
+    virtual uint32_t MoveGamepadFocusToNeighbor( uint32_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayDualAnalogTransform( uint64_t, uint32_t, const HmdVector2_t *, float ) = 0;
+    virtual uint32_t GetOverlayDualAnalogTransform( uint64_t, uint32_t, HmdVector2_t *, float * ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_020_FindOverlay( struct cppIVROverlay_IVROverlay_020_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_CreateOverlay( struct cppIVROverlay_IVROverlay_020_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_DestroyOverlay( struct cppIVROverlay_IVROverlay_020_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayKey( struct cppIVROverlay_IVROverlay_020_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayName( struct cppIVROverlay_IVROverlay_020_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayName( struct cppIVROverlay_IVROverlay_020_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayImageData( struct cppIVROverlay_IVROverlay_020_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_020_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_020_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_020_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayFlag( struct cppIVROverlay_IVROverlay_020_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayFlag( struct cppIVROverlay_IVROverlay_020_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayColor( struct cppIVROverlay_IVROverlay_020_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayColor( struct cppIVROverlay_IVROverlay_020_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_020_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_020_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_020_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_020_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_020_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_020_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_020_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_020_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_020_SetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fMinDistanceInMeters, (float)params->fMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->fMinDistanceInMeters, params->fMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayAutoCurveDistanceRangeInMeters( struct cppIVROverlay_IVROverlay_020_GetOverlayAutoCurveDistanceRangeInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAutoCurveDistanceRangeInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfMinDistanceInMeters, (float *)params->pfMaxDistanceInMeters);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayAutoCurveDistanceRangeInMeters( params->ulOverlayHandle, params->pfMinDistanceInMeters, params->pfMaxDistanceInMeters );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_020_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_020_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_020_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_020_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayRenderModel( struct cppIVROverlay_IVROverlay_020_GetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::HmdColor_t *)params->pColor, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderModel( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pColor, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayRenderModel( struct cppIVROverlay_IVROverlay_020_SetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchRenderModel, (const vr::HmdColor_t *)params->pColor);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderModel( params->ulOverlayHandle, params->pchRenderModel, params->pColor );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_020_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_020_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_020_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_020_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_020_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_020_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_020_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_020_GetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t *)params->ulOverlayHandleParent, (vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_020_SetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulOverlayHandleParent, (const vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_020_ShowOverlay( struct cppIVROverlay_IVROverlay_020_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_HideOverlay( struct cppIVROverlay_IVROverlay_020_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_IsOverlayVisible( struct cppIVROverlay_IVROverlay_020_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_020_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_020_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_020_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1715_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1715_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_020_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_020_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_020_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_020_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_020_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_020_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_020_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_020_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_GetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_020_GetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetGamepadFocusOverlay();
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetGamepadFocusOverlay(  );
 }
 
 void cppIVROverlay_IVROverlay_020_SetGamepadFocusOverlay( struct cppIVROverlay_IVROverlay_020_SetGamepadFocusOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetGamepadFocusOverlay((vr::VROverlayHandle_t)params->ulNewFocusOverlay);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetGamepadFocusOverlay( params->ulNewFocusOverlay );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayNeighbor( struct cppIVROverlay_IVROverlay_020_SetOverlayNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom, (vr::VROverlayHandle_t)params->ulTo);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayNeighbor( params->eDirection, params->ulFrom, params->ulTo );
 }
 
 void cppIVROverlay_IVROverlay_020_MoveGamepadFocusToNeighbor( struct cppIVROverlay_IVROverlay_020_MoveGamepadFocusToNeighbor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->MoveGamepadFocusToNeighbor((vr::EOverlayDirection)params->eDirection, (vr::VROverlayHandle_t)params->ulFrom);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->MoveGamepadFocusToNeighbor( params->eDirection, params->ulFrom );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_020_SetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, (const vr::HmdVector2_t *)params->pvCenter, (float)params->fRadius);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->pvCenter, params->fRadius );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_020_GetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, (vr::HmdVector2_t *)params->pvCenter, (float *)params->pfRadius);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->pvCenter, params->pfRadius );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayTexture( struct cppIVROverlay_IVROverlay_020_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_020_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_020_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayRaw( struct cppIVROverlay_IVROverlay_020_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_020_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayTexture( struct cppIVROverlay_IVROverlay_020_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_020_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_020_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_020_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_020_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_020_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_IsDashboardVisible( struct cppIVROverlay_IVROverlay_020_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_020_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_020_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_020_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_020_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_020_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_020_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_020_ShowDashboard( struct cppIVROverlay_IVROverlay_020_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_020_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_020_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_020_ShowKeyboard( struct cppIVROverlay_IVROverlay_020_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_020_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_020_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_020_GetKeyboardText( struct cppIVROverlay_IVROverlay_020_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_020_HideKeyboard( struct cppIVROverlay_IVROverlay_020_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_020_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_020_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_020_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_020_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_020_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_020_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_020_GetOverlayFlags( struct cppIVROverlay_IVROverlay_020_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_020_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_020_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_020_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_020_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_020 *iface = (struct cppIVROverlay_IVROverlay_020 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.h
index e0ae27e3..b18df6f7 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_020;
 struct cppIVROverlay_IVROverlay_020_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp
index a97816af..892a4601 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp
@@ -9,390 +9,549 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_021
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayCurvature( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayCurvature( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayRenderModel( uint64_t, char *, uint32_t, HmdColor_t *, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayRenderModel( uint64_t, const char *, const HmdColor_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTransformOverlayRelative( uint64_t, uint64_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformOverlayRelative( uint64_t, uint64_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayDualAnalogTransform( uint64_t, uint32_t, const HmdVector2_t *, float ) = 0;
+    virtual uint32_t GetOverlayDualAnalogTransform( uint64_t, uint32_t, HmdVector2_t *, float * ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_021_FindOverlay( struct cppIVROverlay_IVROverlay_021_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_CreateOverlay( struct cppIVROverlay_IVROverlay_021_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_DestroyOverlay( struct cppIVROverlay_IVROverlay_021_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayKey( struct cppIVROverlay_IVROverlay_021_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayName( struct cppIVROverlay_IVROverlay_021_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayName( struct cppIVROverlay_IVROverlay_021_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayImageData( struct cppIVROverlay_IVROverlay_021_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_021_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_021_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_021_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayFlag( struct cppIVROverlay_IVROverlay_021_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayFlag( struct cppIVROverlay_IVROverlay_021_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayColor( struct cppIVROverlay_IVROverlay_021_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayColor( struct cppIVROverlay_IVROverlay_021_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_021_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_021_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_021_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_021_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_021_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_021_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_021_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_021_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayCurvature( struct cppIVROverlay_IVROverlay_021_SetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fCurvature);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayCurvature( params->ulOverlayHandle, params->fCurvature );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayCurvature( struct cppIVROverlay_IVROverlay_021_GetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfCurvature);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayCurvature( params->ulOverlayHandle, params->pfCurvature );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_021_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_021_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_021_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_021_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayRenderModel( struct cppIVROverlay_IVROverlay_021_GetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::HmdColor_t *)params->pColor, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderModel( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pColor, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayRenderModel( struct cppIVROverlay_IVROverlay_021_SetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchRenderModel, (const vr::HmdColor_t *)params->pColor);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderModel( params->ulOverlayHandle, params->pchRenderModel, params->pColor );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_021_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_021_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_021_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_021_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_021_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_021_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_021_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_021_GetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t *)params->ulOverlayHandleParent, (vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_021_SetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulOverlayHandleParent, (const vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_021_ShowOverlay( struct cppIVROverlay_IVROverlay_021_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_HideOverlay( struct cppIVROverlay_IVROverlay_021_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_IsOverlayVisible( struct cppIVROverlay_IVROverlay_021_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_021_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_021_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_021_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1819_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1819_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_021_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_021_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_021_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_021_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_021_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_021_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_021_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_021_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_021_SetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, (const vr::HmdVector2_t *)params->pvCenter, (float)params->fRadius);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->pvCenter, params->fRadius );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_021_GetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, (vr::HmdVector2_t *)params->pvCenter, (float *)params->pfRadius);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->pvCenter, params->pfRadius );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayTexture( struct cppIVROverlay_IVROverlay_021_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_021_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_021_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayRaw( struct cppIVROverlay_IVROverlay_021_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unDepth);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unDepth );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_021_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayTexture( struct cppIVROverlay_IVROverlay_021_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_021_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_021_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_021_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_021_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_021_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_IsDashboardVisible( struct cppIVROverlay_IVROverlay_021_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_021_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_021_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_021_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_021_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_021_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_021_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_021_ShowDashboard( struct cppIVROverlay_IVROverlay_021_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_021_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_021_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_021_ShowKeyboard( struct cppIVROverlay_IVROverlay_021_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_021_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_021_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_021_GetKeyboardText( struct cppIVROverlay_IVROverlay_021_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_021_HideKeyboard( struct cppIVROverlay_IVROverlay_021_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_021_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_021_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_021_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_021_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_021_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_021_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_021_GetOverlayFlags( struct cppIVROverlay_IVROverlay_021_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_021_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_021_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_021_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_021_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_021 *iface = (struct cppIVROverlay_IVROverlay_021 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.h
index 2cc8c1a5..b3dbf4a2 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_021;
 struct cppIVROverlay_IVROverlay_021_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp
index 5ae95969..2771448d 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp
@@ -9,420 +9,591 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_022
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayCurvature( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayCurvature( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayRenderModel( uint64_t, char *, uint32_t, HmdColor_t *, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayRenderModel( uint64_t, const char *, const HmdColor_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTransformOverlayRelative( uint64_t, uint64_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformOverlayRelative( uint64_t, uint64_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformCursor( uint64_t, const HmdVector2_t * ) = 0;
+    virtual uint32_t GetOverlayTransformCursor( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayDualAnalogTransform( uint64_t, uint32_t, const HmdVector2_t *, float ) = 0;
+    virtual uint32_t GetOverlayDualAnalogTransform( uint64_t, uint32_t, HmdVector2_t *, float * ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t TriggerLaserMouseHapticVibration( uint64_t, float, float, float ) = 0;
+    virtual uint32_t SetOverlayCursor( uint64_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayCursorPositionOverride( uint64_t, const HmdVector2_t * ) = 0;
+    virtual uint32_t ClearOverlayCursorPositionOverride( uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, const char *, uint32_t, const char *, bool, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_022_FindOverlay( struct cppIVROverlay_IVROverlay_022_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_CreateOverlay( struct cppIVROverlay_IVROverlay_022_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_DestroyOverlay( struct cppIVROverlay_IVROverlay_022_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayKey( struct cppIVROverlay_IVROverlay_022_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayName( struct cppIVROverlay_IVROverlay_022_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayName( struct cppIVROverlay_IVROverlay_022_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayImageData( struct cppIVROverlay_IVROverlay_022_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_022_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_022_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_022_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayFlag( struct cppIVROverlay_IVROverlay_022_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayFlag( struct cppIVROverlay_IVROverlay_022_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayFlags( struct cppIVROverlay_IVROverlay_022_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayColor( struct cppIVROverlay_IVROverlay_022_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayColor( struct cppIVROverlay_IVROverlay_022_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_022_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_022_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_022_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_022_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_022_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_022_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_022_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_022_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayCurvature( struct cppIVROverlay_IVROverlay_022_SetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fCurvature);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayCurvature( params->ulOverlayHandle, params->fCurvature );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayCurvature( struct cppIVROverlay_IVROverlay_022_GetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfCurvature);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayCurvature( params->ulOverlayHandle, params->pfCurvature );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_022_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_022_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_022_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_022_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayRenderModel( struct cppIVROverlay_IVROverlay_022_GetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::HmdColor_t *)params->pColor, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderModel( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pColor, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayRenderModel( struct cppIVROverlay_IVROverlay_022_SetOverlayRenderModel_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderModel((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchRenderModel, (const vr::HmdColor_t *)params->pColor);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderModel( params->ulOverlayHandle, params->pchRenderModel, params->pColor );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_022_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_022_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_022_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_022_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_022_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_022_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_022_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_022_GetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t *)params->ulOverlayHandleParent, (vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_022_SetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulOverlayHandleParent, (const vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayTransformCursor( struct cppIVROverlay_IVROverlay_022_SetOverlayTransformCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformCursor((vr::VROverlayHandle_t)params->ulCursorOverlayHandle, (const vr::HmdVector2_t *)params->pvHotspot);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformCursor( params->ulCursorOverlayHandle, params->pvHotspot );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTransformCursor( struct cppIVROverlay_IVROverlay_022_GetOverlayTransformCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformCursor((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvHotspot);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformCursor( params->ulOverlayHandle, params->pvHotspot );
 }
 
 void cppIVROverlay_IVROverlay_022_ShowOverlay( struct cppIVROverlay_IVROverlay_022_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_HideOverlay( struct cppIVROverlay_IVROverlay_022_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_IsOverlayVisible( struct cppIVROverlay_IVROverlay_022_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_022_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_022_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_022_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1916_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1916_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_022_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_022_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_022_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_022_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_022_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_022_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_022_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_022_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_022_SetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, (const vr::HmdVector2_t *)params->pvCenter, (float)params->fRadius);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->pvCenter, params->fRadius );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayDualAnalogTransform( struct cppIVROverlay_IVROverlay_022_GetOverlayDualAnalogTransform_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayDualAnalogTransform((vr::VROverlayHandle_t)params->ulOverlay, (vr::EDualAnalogWhich)params->eWhich, (vr::HmdVector2_t *)params->pvCenter, (float *)params->pfRadius);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayDualAnalogTransform( params->ulOverlay, params->eWhich, params->pvCenter, params->pfRadius );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_022_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_022_TriggerLaserMouseHapticVibration( struct cppIVROverlay_IVROverlay_022_TriggerLaserMouseHapticVibration_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->TriggerLaserMouseHapticVibration((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->TriggerLaserMouseHapticVibration( params->ulOverlayHandle, params->fDurationSeconds, params->fFrequency, params->fAmplitude );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayCursor( struct cppIVROverlay_IVROverlay_022_SetOverlayCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCursor((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulCursorHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayCursor( params->ulOverlayHandle, params->ulCursorHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayCursorPositionOverride( struct cppIVROverlay_IVROverlay_022_SetOverlayCursorPositionOverride_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCursorPositionOverride((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvCursor);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayCursorPositionOverride( params->ulOverlayHandle, params->pvCursor );
 }
 
 void cppIVROverlay_IVROverlay_022_ClearOverlayCursorPositionOverride( struct cppIVROverlay_IVROverlay_022_ClearOverlayCursorPositionOverride_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayCursorPositionOverride((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->ClearOverlayCursorPositionOverride( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayTexture( struct cppIVROverlay_IVROverlay_022_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_022_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_022_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayRaw( struct cppIVROverlay_IVROverlay_022_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unBytesPerPixel);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unBytesPerPixel );
 }
 
 void cppIVROverlay_IVROverlay_022_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_022_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTexture( struct cppIVROverlay_IVROverlay_022_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_022_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_022_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_022_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_022_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_022_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_IsDashboardVisible( struct cppIVROverlay_IVROverlay_022_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_022_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_022_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_022_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_022_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_022_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_022_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_022_ShowDashboard( struct cppIVROverlay_IVROverlay_022_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_022_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_022_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_022_ShowKeyboard( struct cppIVROverlay_IVROverlay_022_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_022_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_022_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (bool)params->bUseMinimalMode, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->pchDescription, params->unCharMax, params->pchExistingText, params->bUseMinimalMode, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_022_GetKeyboardText( struct cppIVROverlay_IVROverlay_022_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_022_HideKeyboard( struct cppIVROverlay_IVROverlay_022_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_022_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_022_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_022_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_022_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_022_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_022_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_022_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_022_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_022 *iface = (struct cppIVROverlay_IVROverlay_022 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.h
index 9dddeef6..4db7969b 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_022;
 struct cppIVROverlay_IVROverlay_022_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp
index 3323408e..3151d93b 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp
@@ -9,400 +9,563 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_024
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayCurvature( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayCurvature( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTransformOverlayRelative( uint64_t, uint64_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformOverlayRelative( uint64_t, uint64_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformCursor( uint64_t, const HmdVector2_t * ) = 0;
+    virtual uint32_t GetOverlayTransformCursor( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t TriggerLaserMouseHapticVibration( uint64_t, float, float, float ) = 0;
+    virtual uint32_t SetOverlayCursor( uint64_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayCursorPositionOverride( uint64_t, const HmdVector2_t * ) = 0;
+    virtual uint32_t ClearOverlayCursorPositionOverride( uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, uint32_t, const char *, uint32_t, const char *, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, uint32_t, const char *, uint32_t, const char *, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_024_FindOverlay( struct cppIVROverlay_IVROverlay_024_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_CreateOverlay( struct cppIVROverlay_IVROverlay_024_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_DestroyOverlay( struct cppIVROverlay_IVROverlay_024_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayKey( struct cppIVROverlay_IVROverlay_024_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayName( struct cppIVROverlay_IVROverlay_024_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayName( struct cppIVROverlay_IVROverlay_024_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayImageData( struct cppIVROverlay_IVROverlay_024_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_024_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_024_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_024_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayFlag( struct cppIVROverlay_IVROverlay_024_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayFlag( struct cppIVROverlay_IVROverlay_024_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayFlags( struct cppIVROverlay_IVROverlay_024_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayColor( struct cppIVROverlay_IVROverlay_024_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayColor( struct cppIVROverlay_IVROverlay_024_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_024_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_024_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_024_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_024_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_024_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_024_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_024_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_024_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayCurvature( struct cppIVROverlay_IVROverlay_024_SetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fCurvature);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayCurvature( params->ulOverlayHandle, params->fCurvature );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayCurvature( struct cppIVROverlay_IVROverlay_024_GetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfCurvature);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayCurvature( params->ulOverlayHandle, params->pfCurvature );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_024_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_024_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_024_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_024_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_024_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_024_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_024_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_024_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_024_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_024_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_024_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_024_GetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t *)params->ulOverlayHandleParent, (vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_024_SetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulOverlayHandleParent, (const vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayTransformCursor( struct cppIVROverlay_IVROverlay_024_SetOverlayTransformCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformCursor((vr::VROverlayHandle_t)params->ulCursorOverlayHandle, (const vr::HmdVector2_t *)params->pvHotspot);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformCursor( params->ulCursorOverlayHandle, params->pvHotspot );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTransformCursor( struct cppIVROverlay_IVROverlay_024_GetOverlayTransformCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformCursor((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvHotspot);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformCursor( params->ulOverlayHandle, params->pvHotspot );
 }
 
 void cppIVROverlay_IVROverlay_024_ShowOverlay( struct cppIVROverlay_IVROverlay_024_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_HideOverlay( struct cppIVROverlay_IVROverlay_024_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_IsOverlayVisible( struct cppIVROverlay_IVROverlay_024_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_024_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_024_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_024_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_11415_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_11415_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_024_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_024_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_024_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_024_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_024_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_024_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_024_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_024_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_024_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_024_TriggerLaserMouseHapticVibration( struct cppIVROverlay_IVROverlay_024_TriggerLaserMouseHapticVibration_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->TriggerLaserMouseHapticVibration((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->TriggerLaserMouseHapticVibration( params->ulOverlayHandle, params->fDurationSeconds, params->fFrequency, params->fAmplitude );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayCursor( struct cppIVROverlay_IVROverlay_024_SetOverlayCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCursor((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulCursorHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayCursor( params->ulOverlayHandle, params->ulCursorHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayCursorPositionOverride( struct cppIVROverlay_IVROverlay_024_SetOverlayCursorPositionOverride_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCursorPositionOverride((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvCursor);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayCursorPositionOverride( params->ulOverlayHandle, params->pvCursor );
 }
 
 void cppIVROverlay_IVROverlay_024_ClearOverlayCursorPositionOverride( struct cppIVROverlay_IVROverlay_024_ClearOverlayCursorPositionOverride_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayCursorPositionOverride((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->ClearOverlayCursorPositionOverride( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayTexture( struct cppIVROverlay_IVROverlay_024_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_024_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_024_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayRaw( struct cppIVROverlay_IVROverlay_024_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unBytesPerPixel);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unBytesPerPixel );
 }
 
 void cppIVROverlay_IVROverlay_024_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_024_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTexture( struct cppIVROverlay_IVROverlay_024_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_024_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_024_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_024_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_024_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_024_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_IsDashboardVisible( struct cppIVROverlay_IVROverlay_024_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_024_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_024_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_024_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_024_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_024_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_024_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_024_ShowDashboard( struct cppIVROverlay_IVROverlay_024_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_024_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_024_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_024_ShowKeyboard( struct cppIVROverlay_IVROverlay_024_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (uint32_t)params->unFlags, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->unFlags, params->pchDescription, params->unCharMax, params->pchExistingText, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_024_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_024_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (uint32_t)params->unFlags, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->unFlags, params->pchDescription, params->unCharMax, params->pchExistingText, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_024_GetKeyboardText( struct cppIVROverlay_IVROverlay_024_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_024_HideKeyboard( struct cppIVROverlay_IVROverlay_024_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_024_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_024_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_024_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_024_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_024_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_024_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_024_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_024_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_024 *iface = (struct cppIVROverlay_IVROverlay_024 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.h
index 7a6a54ec..c540e75f 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_024;
 struct cppIVROverlay_IVROverlay_024_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp
index d496ee47..5003a15f 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp
@@ -9,405 +9,570 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_025
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayCurvature( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayCurvature( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTransformOverlayRelative( uint64_t, uint64_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformOverlayRelative( uint64_t, uint64_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformCursor( uint64_t, const HmdVector2_t * ) = 0;
+    virtual uint32_t GetOverlayTransformCursor( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayTransformProjection( uint64_t, uint32_t, const HmdMatrix34_t *, const VROverlayProjection_t *, uint32_t ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t TriggerLaserMouseHapticVibration( uint64_t, float, float, float ) = 0;
+    virtual uint32_t SetOverlayCursor( uint64_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayCursorPositionOverride( uint64_t, const HmdVector2_t * ) = 0;
+    virtual uint32_t ClearOverlayCursorPositionOverride( uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, uint32_t, const char *, uint32_t, const char *, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, uint32_t, const char *, uint32_t, const char *, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_025_FindOverlay( struct cppIVROverlay_IVROverlay_025_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_CreateOverlay( struct cppIVROverlay_IVROverlay_025_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_DestroyOverlay( struct cppIVROverlay_IVROverlay_025_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayKey( struct cppIVROverlay_IVROverlay_025_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayName( struct cppIVROverlay_IVROverlay_025_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayName( struct cppIVROverlay_IVROverlay_025_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayImageData( struct cppIVROverlay_IVROverlay_025_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_025_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_025_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_025_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayFlag( struct cppIVROverlay_IVROverlay_025_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayFlag( struct cppIVROverlay_IVROverlay_025_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayFlags( struct cppIVROverlay_IVROverlay_025_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayColor( struct cppIVROverlay_IVROverlay_025_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayColor( struct cppIVROverlay_IVROverlay_025_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_025_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_025_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_025_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_025_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_025_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_025_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_025_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_025_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayCurvature( struct cppIVROverlay_IVROverlay_025_SetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fCurvature);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayCurvature( params->ulOverlayHandle, params->fCurvature );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayCurvature( struct cppIVROverlay_IVROverlay_025_GetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfCurvature);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayCurvature( params->ulOverlayHandle, params->pfCurvature );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_025_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_025_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_025_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_025_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_025_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_025_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_025_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_025_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_025_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_025_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_025_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_025_GetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t *)params->ulOverlayHandleParent, (vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_025_SetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulOverlayHandleParent, (const vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayTransformCursor( struct cppIVROverlay_IVROverlay_025_SetOverlayTransformCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformCursor((vr::VROverlayHandle_t)params->ulCursorOverlayHandle, (const vr::HmdVector2_t *)params->pvHotspot);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformCursor( params->ulCursorOverlayHandle, params->pvHotspot );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTransformCursor( struct cppIVROverlay_IVROverlay_025_GetOverlayTransformCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformCursor((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvHotspot);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformCursor( params->ulOverlayHandle, params->pvHotspot );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayTransformProjection( struct cppIVROverlay_IVROverlay_025_SetOverlayTransformProjection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformProjection((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform, (const vr::VROverlayProjection_t *)params->pProjection, (vr::EVREye)params->eEye);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformProjection( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform, params->pProjection, params->eEye );
 }
 
 void cppIVROverlay_IVROverlay_025_ShowOverlay( struct cppIVROverlay_IVROverlay_025_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_HideOverlay( struct cppIVROverlay_IVROverlay_025_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_IsOverlayVisible( struct cppIVROverlay_IVROverlay_025_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_025_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_025_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_025_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1168_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1168_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_025_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_025_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_025_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_025_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_025_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_025_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_025_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_025_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_025_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_025_TriggerLaserMouseHapticVibration( struct cppIVROverlay_IVROverlay_025_TriggerLaserMouseHapticVibration_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->TriggerLaserMouseHapticVibration((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->TriggerLaserMouseHapticVibration( params->ulOverlayHandle, params->fDurationSeconds, params->fFrequency, params->fAmplitude );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayCursor( struct cppIVROverlay_IVROverlay_025_SetOverlayCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCursor((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulCursorHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayCursor( params->ulOverlayHandle, params->ulCursorHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayCursorPositionOverride( struct cppIVROverlay_IVROverlay_025_SetOverlayCursorPositionOverride_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCursorPositionOverride((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvCursor);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayCursorPositionOverride( params->ulOverlayHandle, params->pvCursor );
 }
 
 void cppIVROverlay_IVROverlay_025_ClearOverlayCursorPositionOverride( struct cppIVROverlay_IVROverlay_025_ClearOverlayCursorPositionOverride_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayCursorPositionOverride((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->ClearOverlayCursorPositionOverride( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayTexture( struct cppIVROverlay_IVROverlay_025_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_025_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_025_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayRaw( struct cppIVROverlay_IVROverlay_025_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unBytesPerPixel);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unBytesPerPixel );
 }
 
 void cppIVROverlay_IVROverlay_025_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_025_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTexture( struct cppIVROverlay_IVROverlay_025_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_025_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_025_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_025_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_025_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_025_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_IsDashboardVisible( struct cppIVROverlay_IVROverlay_025_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_025_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_025_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_025_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_025_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_025_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_025_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_025_ShowDashboard( struct cppIVROverlay_IVROverlay_025_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_025_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_025_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_025_ShowKeyboard( struct cppIVROverlay_IVROverlay_025_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (uint32_t)params->unFlags, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->unFlags, params->pchDescription, params->unCharMax, params->pchExistingText, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_025_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_025_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (uint32_t)params->unFlags, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->unFlags, params->pchDescription, params->unCharMax, params->pchExistingText, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_025_GetKeyboardText( struct cppIVROverlay_IVROverlay_025_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_025_HideKeyboard( struct cppIVROverlay_IVROverlay_025_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_025_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_025_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_025_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_025_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_025_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_025_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_025_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_025_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_025 *iface = (struct cppIVROverlay_IVROverlay_025 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.h
index 1c823539..2f75a0f8 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_025;
 struct cppIVROverlay_IVROverlay_025_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp
index f9e407be..0abfb118 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp
@@ -9,420 +9,591 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_026
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayCurvature( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayCurvature( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayPreCurvePitch( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayPreCurvePitch( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTransformOverlayRelative( uint64_t, uint64_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformOverlayRelative( uint64_t, uint64_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformCursor( uint64_t, const HmdVector2_t * ) = 0;
+    virtual uint32_t GetOverlayTransformCursor( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayTransformProjection( uint64_t, uint32_t, const HmdMatrix34_t *, const VROverlayProjection_t *, uint32_t ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual uint32_t WaitFrameSync( uint32_t ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t TriggerLaserMouseHapticVibration( uint64_t, float, float, float ) = 0;
+    virtual uint32_t SetOverlayCursor( uint64_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayCursorPositionOverride( uint64_t, const HmdVector2_t * ) = 0;
+    virtual uint32_t ClearOverlayCursorPositionOverride( uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, uint32_t, const char *, uint32_t, const char *, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, uint32_t, const char *, uint32_t, const char *, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_026_FindOverlay( struct cppIVROverlay_IVROverlay_026_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_CreateOverlay( struct cppIVROverlay_IVROverlay_026_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_DestroyOverlay( struct cppIVROverlay_IVROverlay_026_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayKey( struct cppIVROverlay_IVROverlay_026_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayName( struct cppIVROverlay_IVROverlay_026_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayName( struct cppIVROverlay_IVROverlay_026_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayImageData( struct cppIVROverlay_IVROverlay_026_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_026_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_026_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_026_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayFlag( struct cppIVROverlay_IVROverlay_026_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayFlag( struct cppIVROverlay_IVROverlay_026_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayFlags( struct cppIVROverlay_IVROverlay_026_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayColor( struct cppIVROverlay_IVROverlay_026_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayColor( struct cppIVROverlay_IVROverlay_026_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_026_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_026_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_026_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_026_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_026_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_026_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_026_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_026_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayCurvature( struct cppIVROverlay_IVROverlay_026_SetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fCurvature);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayCurvature( params->ulOverlayHandle, params->fCurvature );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayCurvature( struct cppIVROverlay_IVROverlay_026_GetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfCurvature);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayCurvature( params->ulOverlayHandle, params->pfCurvature );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayPreCurvePitch( struct cppIVROverlay_IVROverlay_026_SetOverlayPreCurvePitch_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayPreCurvePitch((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRadians);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayPreCurvePitch( params->ulOverlayHandle, params->fRadians );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayPreCurvePitch( struct cppIVROverlay_IVROverlay_026_GetOverlayPreCurvePitch_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayPreCurvePitch((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRadians);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayPreCurvePitch( params->ulOverlayHandle, params->pfRadians );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_026_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_026_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_026_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_026_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_026_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_026_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_026_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_026_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_026_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_026_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_026_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_026_GetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t *)params->ulOverlayHandleParent, (vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayTransformOverlayRelative( struct cppIVROverlay_IVROverlay_026_SetOverlayTransformOverlayRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformOverlayRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulOverlayHandleParent, (const vr::HmdMatrix34_t *)params->pmatParentOverlayToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformOverlayRelative( params->ulOverlayHandle, params->ulOverlayHandleParent, params->pmatParentOverlayToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayTransformCursor( struct cppIVROverlay_IVROverlay_026_SetOverlayTransformCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformCursor((vr::VROverlayHandle_t)params->ulCursorOverlayHandle, (const vr::HmdVector2_t *)params->pvHotspot);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformCursor( params->ulCursorOverlayHandle, params->pvHotspot );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTransformCursor( struct cppIVROverlay_IVROverlay_026_GetOverlayTransformCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformCursor((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvHotspot);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformCursor( params->ulOverlayHandle, params->pvHotspot );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayTransformProjection( struct cppIVROverlay_IVROverlay_026_SetOverlayTransformProjection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformProjection((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform, (const vr::VROverlayProjection_t *)params->pProjection, (vr::EVREye)params->eEye);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformProjection( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform, params->pProjection, params->eEye );
 }
 
 void cppIVROverlay_IVROverlay_026_ShowOverlay( struct cppIVROverlay_IVROverlay_026_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_HideOverlay( struct cppIVROverlay_IVROverlay_026_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_IsOverlayVisible( struct cppIVROverlay_IVROverlay_026_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_026_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_026_WaitFrameSync( struct cppIVROverlay_IVROverlay_026_WaitFrameSync_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->WaitFrameSync((uint32_t)params->nTimeoutMs);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->WaitFrameSync( params->nTimeoutMs );
 }
 
 void cppIVROverlay_IVROverlay_026_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_026_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1237_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1237_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_026_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_026_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_026_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_026_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_026_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_026_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_026_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_026_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_026_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_026_TriggerLaserMouseHapticVibration( struct cppIVROverlay_IVROverlay_026_TriggerLaserMouseHapticVibration_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->TriggerLaserMouseHapticVibration((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->TriggerLaserMouseHapticVibration( params->ulOverlayHandle, params->fDurationSeconds, params->fFrequency, params->fAmplitude );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayCursor( struct cppIVROverlay_IVROverlay_026_SetOverlayCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCursor((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulCursorHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayCursor( params->ulOverlayHandle, params->ulCursorHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayCursorPositionOverride( struct cppIVROverlay_IVROverlay_026_SetOverlayCursorPositionOverride_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCursorPositionOverride((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvCursor);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayCursorPositionOverride( params->ulOverlayHandle, params->pvCursor );
 }
 
 void cppIVROverlay_IVROverlay_026_ClearOverlayCursorPositionOverride( struct cppIVROverlay_IVROverlay_026_ClearOverlayCursorPositionOverride_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayCursorPositionOverride((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->ClearOverlayCursorPositionOverride( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayTexture( struct cppIVROverlay_IVROverlay_026_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_026_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_026_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayRaw( struct cppIVROverlay_IVROverlay_026_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unBytesPerPixel);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unBytesPerPixel );
 }
 
 void cppIVROverlay_IVROverlay_026_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_026_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTexture( struct cppIVROverlay_IVROverlay_026_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_026_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_026_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_026_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_026_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_026_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_IsDashboardVisible( struct cppIVROverlay_IVROverlay_026_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_026_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_026_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_026_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_026_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_026_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_026_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_026_ShowDashboard( struct cppIVROverlay_IVROverlay_026_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_026_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_026_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_026_ShowKeyboard( struct cppIVROverlay_IVROverlay_026_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (uint32_t)params->unFlags, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->unFlags, params->pchDescription, params->unCharMax, params->pchExistingText, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_026_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_026_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (uint32_t)params->unFlags, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->unFlags, params->pchDescription, params->unCharMax, params->pchExistingText, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_026_GetKeyboardText( struct cppIVROverlay_IVROverlay_026_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_026_HideKeyboard( struct cppIVROverlay_IVROverlay_026_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_026_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_026_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_026_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_026_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_026_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_026_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_026_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_026_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_026 *iface = (struct cppIVROverlay_IVROverlay_026 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.h
index e630372f..bded6f45 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_026;
 struct cppIVROverlay_IVROverlay_026_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp
index 839c2d2e..a62a7cd4 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp
@@ -9,410 +9,577 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVROverlay_IVROverlay_027
+{
+#ifdef __cplusplus
+    virtual uint32_t FindOverlay( const char *, uint64_t * ) = 0;
+    virtual uint32_t CreateOverlay( const char *, const char *, uint64_t * ) = 0;
+    virtual uint32_t DestroyOverlay( uint64_t ) = 0;
+    virtual uint32_t GetOverlayKey( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetOverlayName( uint64_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayName( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayImageData( uint64_t, void *, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual const char * GetOverlayErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t SetOverlayRenderingPid( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayRenderingPid( uint64_t ) = 0;
+    virtual uint32_t SetOverlayFlag( uint64_t, uint32_t, bool ) = 0;
+    virtual uint32_t GetOverlayFlag( uint64_t, uint32_t, bool * ) = 0;
+    virtual uint32_t GetOverlayFlags( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayColor( uint64_t, float, float, float ) = 0;
+    virtual uint32_t GetOverlayColor( uint64_t, float *, float *, float * ) = 0;
+    virtual uint32_t SetOverlayAlpha( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayAlpha( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTexelAspect( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayTexelAspect( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlaySortOrder( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlaySortOrder( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayWidthInMeters( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayWidthInMeters( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayCurvature( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayCurvature( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayPreCurvePitch( uint64_t, float ) = 0;
+    virtual uint32_t GetOverlayPreCurvePitch( uint64_t, float * ) = 0;
+    virtual uint32_t SetOverlayTextureColorSpace( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayTextureColorSpace( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTextureBounds( uint64_t, const VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTextureBounds( uint64_t, VRTextureBounds_t * ) = 0;
+    virtual uint32_t GetOverlayTransformType( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayTransformAbsolute( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformAbsolute( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceRelative( uint64_t, uint32_t *, HmdMatrix34_t * ) = 0;
+    virtual uint32_t SetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTransformTrackedDeviceComponent( uint64_t, uint32_t *, char *, uint32_t ) = 0;
+    virtual uint32_t SetOverlayTransformCursor( uint64_t, const HmdVector2_t * ) = 0;
+    virtual uint32_t GetOverlayTransformCursor( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayTransformProjection( uint64_t, uint32_t, const HmdMatrix34_t *, const VROverlayProjection_t *, uint32_t ) = 0;
+    virtual uint32_t ShowOverlay( uint64_t ) = 0;
+    virtual uint32_t HideOverlay( uint64_t ) = 0;
+    virtual bool IsOverlayVisible( uint64_t ) = 0;
+    virtual uint32_t GetTransformForOverlayCoordinates( uint64_t, uint32_t, HmdVector2_t, HmdMatrix34_t * ) = 0;
+    virtual uint32_t WaitFrameSync( uint32_t ) = 0;
+    virtual bool PollNextOverlayEvent( uint64_t, VREvent_t *, uint32_t ) = 0;
+    virtual uint32_t GetOverlayInputMethod( uint64_t, uint32_t * ) = 0;
+    virtual uint32_t SetOverlayInputMethod( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetOverlayMouseScale( uint64_t, HmdVector2_t * ) = 0;
+    virtual uint32_t SetOverlayMouseScale( uint64_t, const HmdVector2_t * ) = 0;
+    virtual bool ComputeOverlayIntersection( uint64_t, const VROverlayIntersectionParams_t *, VROverlayIntersectionResults_t * ) = 0;
+    virtual bool IsHoverTargetOverlay( uint64_t ) = 0;
+    virtual uint32_t SetOverlayIntersectionMask( uint64_t, VROverlayIntersectionMaskPrimitive_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t TriggerLaserMouseHapticVibration( uint64_t, float, float, float ) = 0;
+    virtual uint32_t SetOverlayCursor( uint64_t, uint64_t ) = 0;
+    virtual uint32_t SetOverlayCursorPositionOverride( uint64_t, const HmdVector2_t * ) = 0;
+    virtual uint32_t ClearOverlayCursorPositionOverride( uint64_t ) = 0;
+    virtual uint32_t SetOverlayTexture( uint64_t, const Texture_t * ) = 0;
+    virtual uint32_t ClearOverlayTexture( uint64_t ) = 0;
+    virtual uint32_t SetOverlayRaw( uint64_t, void *, uint32_t, uint32_t, uint32_t ) = 0;
+    virtual uint32_t SetOverlayFromFile( uint64_t, const char * ) = 0;
+    virtual uint32_t GetOverlayTexture( uint64_t, void **, void *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, uint32_t *, VRTextureBounds_t * ) = 0;
+    virtual uint32_t ReleaseNativeOverlayHandle( uint64_t, void * ) = 0;
+    virtual uint32_t GetOverlayTextureSize( uint64_t, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t CreateDashboardOverlay( const char *, const char *, uint64_t *, uint64_t * ) = 0;
+    virtual bool IsDashboardVisible(  ) = 0;
+    virtual bool IsActiveDashboardOverlay( uint64_t ) = 0;
+    virtual uint32_t SetDashboardOverlaySceneProcess( uint64_t, uint32_t ) = 0;
+    virtual uint32_t GetDashboardOverlaySceneProcess( uint64_t, uint32_t * ) = 0;
+    virtual void ShowDashboard( const char * ) = 0;
+    virtual uint32_t GetPrimaryDashboardDevice(  ) = 0;
+    virtual uint32_t ShowKeyboard( uint32_t, uint32_t, uint32_t, const char *, uint32_t, const char *, uint64_t ) = 0;
+    virtual uint32_t ShowKeyboardForOverlay( uint64_t, uint32_t, uint32_t, uint32_t, const char *, uint32_t, const char *, uint64_t ) = 0;
+    virtual uint32_t GetKeyboardText( char *, uint32_t ) = 0;
+    virtual void HideKeyboard(  ) = 0;
+    virtual void SetKeyboardTransformAbsolute( uint32_t, const HmdMatrix34_t * ) = 0;
+    virtual void SetKeyboardPositionForOverlay( uint64_t, HmdRect2_t ) = 0;
+    virtual uint32_t ShowMessageOverlay( const char *, const char *, const char *, const char *, const char *, const char * ) = 0;
+    virtual void CloseMessageOverlay(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVROverlay_IVROverlay_027_FindOverlay( struct cppIVROverlay_IVROverlay_027_FindOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->FindOverlay((const char *)params->pchOverlayKey, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->FindOverlay( params->pchOverlayKey, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_CreateOverlay( struct cppIVROverlay_IVROverlay_027_CreateOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayName, (vr::VROverlayHandle_t *)params->pOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->CreateOverlay( params->pchOverlayKey, params->pchOverlayName, params->pOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_DestroyOverlay( struct cppIVROverlay_IVROverlay_027_DestroyOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->DestroyOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->DestroyOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayKey( struct cppIVROverlay_IVROverlay_027_GetOverlayKey_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayKey((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayKey( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayName( struct cppIVROverlay_IVROverlay_027_GetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::EVROverlayError *)params->pError);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayName( params->ulOverlayHandle, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayName( struct cppIVROverlay_IVROverlay_027_SetOverlayName_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayName((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchName);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayName( params->ulOverlayHandle, params->pchName );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayImageData( struct cppIVROverlay_IVROverlay_027_GetOverlayImageData_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayImageData((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unBufferSize, (uint32_t *)params->punWidth, (uint32_t *)params->punHeight);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayImageData( params->ulOverlayHandle, params->pvBuffer, params->unBufferSize, params->punWidth, params->punHeight );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayErrorNameFromEnum( struct cppIVROverlay_IVROverlay_027_GetOverlayErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayErrorNameFromEnum((vr::EVROverlayError)params->error);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayErrorNameFromEnum( params->error );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_027_SetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unPID);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayRenderingPid( params->ulOverlayHandle, params->unPID );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayRenderingPid( struct cppIVROverlay_IVROverlay_027_GetOverlayRenderingPid_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayRenderingPid((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayRenderingPid( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayFlag( struct cppIVROverlay_IVROverlay_027_SetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool)params->bEnabled);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->bEnabled );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayFlag( struct cppIVROverlay_IVROverlay_027_GetOverlayFlag_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlag((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayFlags)params->eOverlayFlag, (bool *)params->pbEnabled);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlag( params->ulOverlayHandle, params->eOverlayFlag, params->pbEnabled );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayFlags( struct cppIVROverlay_IVROverlay_027_GetOverlayFlags_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayFlags((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pFlags);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayFlags( params->ulOverlayHandle, params->pFlags );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayColor( struct cppIVROverlay_IVROverlay_027_SetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRed, (float)params->fGreen, (float)params->fBlue);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayColor( params->ulOverlayHandle, params->fRed, params->fGreen, params->fBlue );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayColor( struct cppIVROverlay_IVROverlay_027_GetOverlayColor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayColor((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRed, (float *)params->pfGreen, (float *)params->pfBlue);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayColor( params->ulOverlayHandle, params->pfRed, params->pfGreen, params->pfBlue );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayAlpha( struct cppIVROverlay_IVROverlay_027_SetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fAlpha);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayAlpha( params->ulOverlayHandle, params->fAlpha );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayAlpha( struct cppIVROverlay_IVROverlay_027_GetOverlayAlpha_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayAlpha((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfAlpha);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayAlpha( params->ulOverlayHandle, params->pfAlpha );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_027_SetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fTexelAspect);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexelAspect( params->ulOverlayHandle, params->fTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayTexelAspect( struct cppIVROverlay_IVROverlay_027_GetOverlayTexelAspect_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexelAspect((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfTexelAspect);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexelAspect( params->ulOverlayHandle, params->pfTexelAspect );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlaySortOrder( struct cppIVROverlay_IVROverlay_027_SetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unSortOrder);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlaySortOrder( params->ulOverlayHandle, params->unSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlaySortOrder( struct cppIVROverlay_IVROverlay_027_GetOverlaySortOrder_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlaySortOrder((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punSortOrder);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlaySortOrder( params->ulOverlayHandle, params->punSortOrder );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_027_SetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fWidthInMeters);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayWidthInMeters( params->ulOverlayHandle, params->fWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayWidthInMeters( struct cppIVROverlay_IVROverlay_027_GetOverlayWidthInMeters_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayWidthInMeters((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfWidthInMeters);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayWidthInMeters( params->ulOverlayHandle, params->pfWidthInMeters );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayCurvature( struct cppIVROverlay_IVROverlay_027_SetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fCurvature);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayCurvature( params->ulOverlayHandle, params->fCurvature );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayCurvature( struct cppIVROverlay_IVROverlay_027_GetOverlayCurvature_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayCurvature((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfCurvature);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayCurvature( params->ulOverlayHandle, params->pfCurvature );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayPreCurvePitch( struct cppIVROverlay_IVROverlay_027_SetOverlayPreCurvePitch_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayPreCurvePitch((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fRadians);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayPreCurvePitch( params->ulOverlayHandle, params->fRadians );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayPreCurvePitch( struct cppIVROverlay_IVROverlay_027_GetOverlayPreCurvePitch_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayPreCurvePitch((vr::VROverlayHandle_t)params->ulOverlayHandle, (float *)params->pfRadians);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayPreCurvePitch( params->ulOverlayHandle, params->pfRadians );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_027_SetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace)params->eTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureColorSpace( params->ulOverlayHandle, params->eTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayTextureColorSpace( struct cppIVROverlay_IVROverlay_027_GetOverlayTextureColorSpace_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureColorSpace((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EColorSpace *)params->peTextureColorSpace);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureColorSpace( params->ulOverlayHandle, params->peTextureColorSpace );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_027_SetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayTextureBounds( struct cppIVROverlay_IVROverlay_027_GetOverlayTextureBounds_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureBounds((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VRTextureBounds_t *)params->pOverlayTextureBounds);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureBounds( params->ulOverlayHandle, params->pOverlayTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayTransformType( struct cppIVROverlay_IVROverlay_027_GetOverlayTransformType_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformType((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayTransformType *)params->peTransformType);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformType( params->ulOverlayHandle, params->peTransformType );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_027_SetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformAbsolute( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayTransformAbsolute( struct cppIVROverlay_IVROverlay_027_GetOverlayTransformAbsolute_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformAbsolute((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin *)params->peTrackingOrigin, (vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformAbsolute( params->ulOverlayHandle, params->peTrackingOrigin, params->pmatTrackingOriginToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_027_SetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unTrackedDevice, (const vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->unTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayTransformTrackedDeviceRelative( struct cppIVROverlay_IVROverlay_027_GetOverlayTransformTrackedDeviceRelative_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceRelative((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punTrackedDevice, (vr::HmdMatrix34_t *)params->pmatTrackedDeviceToOverlayTransform);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceRelative( params->ulOverlayHandle, params->punTrackedDevice, params->pmatTrackedDeviceToOverlayTransform );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_027_SetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchComponentName);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->unDeviceIndex, params->pchComponentName );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayTransformTrackedDeviceComponent( struct cppIVROverlay_IVROverlay_027_GetOverlayTransformTrackedDeviceComponent_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformTrackedDeviceComponent((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::TrackedDeviceIndex_t *)params->punDeviceIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameSize);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformTrackedDeviceComponent( params->ulOverlayHandle, params->punDeviceIndex, params->pchComponentName, params->unComponentNameSize );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayTransformCursor( struct cppIVROverlay_IVROverlay_027_SetOverlayTransformCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformCursor((vr::VROverlayHandle_t)params->ulCursorOverlayHandle, (const vr::HmdVector2_t *)params->pvHotspot);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformCursor( params->ulCursorOverlayHandle, params->pvHotspot );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayTransformCursor( struct cppIVROverlay_IVROverlay_027_GetOverlayTransformCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTransformCursor((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvHotspot);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayTransformCursor( params->ulOverlayHandle, params->pvHotspot );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayTransformProjection( struct cppIVROverlay_IVROverlay_027_SetOverlayTransformProjection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTransformProjection((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToOverlayTransform, (const vr::VROverlayProjection_t *)params->pProjection, (vr::EVREye)params->eEye);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayTransformProjection( params->ulOverlayHandle, params->eTrackingOrigin, params->pmatTrackingOriginToOverlayTransform, params->pProjection, params->eEye );
 }
 
 void cppIVROverlay_IVROverlay_027_ShowOverlay( struct cppIVROverlay_IVROverlay_027_ShowOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->ShowOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_HideOverlay( struct cppIVROverlay_IVROverlay_027_HideOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->HideOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->HideOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_IsOverlayVisible( struct cppIVROverlay_IVROverlay_027_IsOverlayVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsOverlayVisible((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->IsOverlayVisible( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_GetTransformForOverlayCoordinates( struct cppIVROverlay_IVROverlay_027_GetTransformForOverlayCoordinates_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetTransformForOverlayCoordinates((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (vr::HmdVector2_t)params->coordinatesInOverlay, (vr::HmdMatrix34_t *)params->pmatTransform);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetTransformForOverlayCoordinates( params->ulOverlayHandle, params->eTrackingOrigin, params->coordinatesInOverlay, params->pmatTransform );
 }
 
 void cppIVROverlay_IVROverlay_027_WaitFrameSync( struct cppIVROverlay_IVROverlay_027_WaitFrameSync_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->WaitFrameSync((uint32_t)params->nTimeoutMs);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->WaitFrameSync( params->nTimeoutMs );
 }
 
 void cppIVROverlay_IVROverlay_027_PollNextOverlayEvent( struct cppIVROverlay_IVROverlay_027_PollNextOverlayEvent_params *params )
 {
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1267_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVROverlay*)params->linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextOverlayEvent( params->ulOverlayHandle, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1267_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayInputMethod( struct cppIVROverlay_IVROverlay_027_GetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod *)params->peInputMethod);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayInputMethod( params->ulOverlayHandle, params->peInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayInputMethod( struct cppIVROverlay_IVROverlay_027_SetOverlayInputMethod_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayInputMethod((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayInputMethod)params->eInputMethod);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayInputMethod( params->ulOverlayHandle, params->eInputMethod );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayMouseScale( struct cppIVROverlay_IVROverlay_027_GetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayMouseScale( struct cppIVROverlay_IVROverlay_027_SetOverlayMouseScale_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayMouseScale((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvecMouseScale);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayMouseScale( params->ulOverlayHandle, params->pvecMouseScale );
 }
 
 void cppIVROverlay_IVROverlay_027_ComputeOverlayIntersection( struct cppIVROverlay_IVROverlay_027_ComputeOverlayIntersection_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ComputeOverlayIntersection((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::VROverlayIntersectionParams_t *)params->pParams, (vr::VROverlayIntersectionResults_t *)params->pResults);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->ComputeOverlayIntersection( params->ulOverlayHandle, params->pParams, params->pResults );
 }
 
 void cppIVROverlay_IVROverlay_027_IsHoverTargetOverlay( struct cppIVROverlay_IVROverlay_027_IsHoverTargetOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsHoverTargetOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->IsHoverTargetOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayIntersectionMask( struct cppIVROverlay_IVROverlay_027_SetOverlayIntersectionMask_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayIntersectionMask((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayIntersectionMaskPrimitive_t *)params->pMaskPrimitives, (uint32_t)params->unNumMaskPrimitives, (uint32_t)params->unPrimitiveSize);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayIntersectionMask( params->ulOverlayHandle, params->pMaskPrimitives, params->unNumMaskPrimitives, params->unPrimitiveSize );
 }
 
 void cppIVROverlay_IVROverlay_027_TriggerLaserMouseHapticVibration( struct cppIVROverlay_IVROverlay_027_TriggerLaserMouseHapticVibration_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->TriggerLaserMouseHapticVibration((vr::VROverlayHandle_t)params->ulOverlayHandle, (float)params->fDurationSeconds, (float)params->fFrequency, (float)params->fAmplitude);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->TriggerLaserMouseHapticVibration( params->ulOverlayHandle, params->fDurationSeconds, params->fFrequency, params->fAmplitude );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayCursor( struct cppIVROverlay_IVROverlay_027_SetOverlayCursor_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCursor((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::VROverlayHandle_t)params->ulCursorHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayCursor( params->ulOverlayHandle, params->ulCursorHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayCursorPositionOverride( struct cppIVROverlay_IVROverlay_027_SetOverlayCursorPositionOverride_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayCursorPositionOverride((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::HmdVector2_t *)params->pvCursor);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayCursorPositionOverride( params->ulOverlayHandle, params->pvCursor );
 }
 
 void cppIVROverlay_IVROverlay_027_ClearOverlayCursorPositionOverride( struct cppIVROverlay_IVROverlay_027_ClearOverlayCursorPositionOverride_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayCursorPositionOverride((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->ClearOverlayCursorPositionOverride( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayTexture( struct cppIVROverlay_IVROverlay_027_SetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (const vr::Texture_t *)params->pTexture);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayTexture( params->ulOverlayHandle, params->pTexture );
 }
 
 void cppIVROverlay_IVROverlay_027_ClearOverlayTexture( struct cppIVROverlay_IVROverlay_027_ClearOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ClearOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->ClearOverlayTexture( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayRaw( struct cppIVROverlay_IVROverlay_027_SetOverlayRaw_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayRaw((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pvBuffer, (uint32_t)params->unWidth, (uint32_t)params->unHeight, (uint32_t)params->unBytesPerPixel);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayRaw( params->ulOverlayHandle, params->pvBuffer, params->unWidth, params->unHeight, params->unBytesPerPixel );
 }
 
 void cppIVROverlay_IVROverlay_027_SetOverlayFromFile( struct cppIVROverlay_IVROverlay_027_SetOverlayFromFile_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetOverlayFromFile((vr::VROverlayHandle_t)params->ulOverlayHandle, (const char *)params->pchFilePath);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetOverlayFromFile( params->ulOverlayHandle, params->pchFilePath );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayTexture( struct cppIVROverlay_IVROverlay_027_GetOverlayTexture_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTexture((vr::VROverlayHandle_t)params->ulOverlayHandle, (void **)params->pNativeTextureHandle, (void *)params->pNativeTextureRef, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight, (uint32_t *)params->pNativeFormat, (vr::ETextureType *)params->pAPIType, (vr::EColorSpace *)params->pColorSpace, (vr::VRTextureBounds_t *)params->pTextureBounds);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayTexture( params->ulOverlayHandle, params->pNativeTextureHandle, params->pNativeTextureRef, params->pWidth, params->pHeight, params->pNativeFormat, params->pAPIType, params->pColorSpace, params->pTextureBounds );
 }
 
 void cppIVROverlay_IVROverlay_027_ReleaseNativeOverlayHandle( struct cppIVROverlay_IVROverlay_027_ReleaseNativeOverlayHandle_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ReleaseNativeOverlayHandle((vr::VROverlayHandle_t)params->ulOverlayHandle, (void *)params->pNativeTextureHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->ReleaseNativeOverlayHandle( params->ulOverlayHandle, params->pNativeTextureHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_GetOverlayTextureSize( struct cppIVROverlay_IVROverlay_027_GetOverlayTextureSize_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetOverlayTextureSize((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetOverlayTextureSize( params->ulOverlayHandle, params->pWidth, params->pHeight );
 }
 
 void cppIVROverlay_IVROverlay_027_CreateDashboardOverlay( struct cppIVROverlay_IVROverlay_027_CreateDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->CreateDashboardOverlay((const char *)params->pchOverlayKey, (const char *)params->pchOverlayFriendlyName, (vr::VROverlayHandle_t *)params->pMainHandle, (vr::VROverlayHandle_t *)params->pThumbnailHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->CreateDashboardOverlay( params->pchOverlayKey, params->pchOverlayFriendlyName, params->pMainHandle, params->pThumbnailHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_IsDashboardVisible( struct cppIVROverlay_IVROverlay_027_IsDashboardVisible_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsDashboardVisible();
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->IsDashboardVisible(  );
 }
 
 void cppIVROverlay_IVROverlay_027_IsActiveDashboardOverlay( struct cppIVROverlay_IVROverlay_027_IsActiveDashboardOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->IsActiveDashboardOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->IsActiveDashboardOverlay( params->ulOverlayHandle );
 }
 
 void cppIVROverlay_IVROverlay_027_SetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_027_SetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->SetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t)params->unProcessId);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->SetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->unProcessId );
 }
 
 void cppIVROverlay_IVROverlay_027_GetDashboardOverlaySceneProcess( struct cppIVROverlay_IVROverlay_027_GetDashboardOverlaySceneProcess_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetDashboardOverlaySceneProcess((vr::VROverlayHandle_t)params->ulOverlayHandle, (uint32_t *)params->punProcessId);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetDashboardOverlaySceneProcess( params->ulOverlayHandle, params->punProcessId );
 }
 
 void cppIVROverlay_IVROverlay_027_ShowDashboard( struct cppIVROverlay_IVROverlay_027_ShowDashboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->ShowDashboard((const char *)params->pchOverlayToShow);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    iface->ShowDashboard( params->pchOverlayToShow );
 }
 
 void cppIVROverlay_IVROverlay_027_GetPrimaryDashboardDevice( struct cppIVROverlay_IVROverlay_027_GetPrimaryDashboardDevice_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetPrimaryDashboardDevice();
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetPrimaryDashboardDevice(  );
 }
 
 void cppIVROverlay_IVROverlay_027_ShowKeyboard( struct cppIVROverlay_IVROverlay_027_ShowKeyboard_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboard((vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (uint32_t)params->unFlags, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->ShowKeyboard( params->eInputMode, params->eLineInputMode, params->unFlags, params->pchDescription, params->unCharMax, params->pchExistingText, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_027_ShowKeyboardForOverlay( struct cppIVROverlay_IVROverlay_027_ShowKeyboardForOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowKeyboardForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::EGamepadTextInputMode)params->eInputMode, (vr::EGamepadTextInputLineMode)params->eLineInputMode, (uint32_t)params->unFlags, (const char *)params->pchDescription, (uint32_t)params->unCharMax, (const char *)params->pchExistingText, (uint64_t)params->uUserValue);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->ShowKeyboardForOverlay( params->ulOverlayHandle, params->eInputMode, params->eLineInputMode, params->unFlags, params->pchDescription, params->unCharMax, params->pchExistingText, params->uUserValue );
 }
 
 void cppIVROverlay_IVROverlay_027_GetKeyboardText( struct cppIVROverlay_IVROverlay_027_GetKeyboardText_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->GetKeyboardText((char *)params->pchText, (uint32_t)params->cchText);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->GetKeyboardText( params->pchText, params->cchText );
 }
 
 void cppIVROverlay_IVROverlay_027_HideKeyboard( struct cppIVROverlay_IVROverlay_027_HideKeyboard_params *params )
 {
-    ((IVROverlay*)params->linux_side)->HideKeyboard();
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    iface->HideKeyboard(  );
 }
 
 void cppIVROverlay_IVROverlay_027_SetKeyboardTransformAbsolute( struct cppIVROverlay_IVROverlay_027_SetKeyboardTransformAbsolute_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardTransformAbsolute((vr::ETrackingUniverseOrigin)params->eTrackingOrigin, (const vr::HmdMatrix34_t *)params->pmatTrackingOriginToKeyboardTransform);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    iface->SetKeyboardTransformAbsolute( params->eTrackingOrigin, params->pmatTrackingOriginToKeyboardTransform );
 }
 
 void cppIVROverlay_IVROverlay_027_SetKeyboardPositionForOverlay( struct cppIVROverlay_IVROverlay_027_SetKeyboardPositionForOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->SetKeyboardPositionForOverlay((vr::VROverlayHandle_t)params->ulOverlayHandle, (vr::HmdRect2_t)params->avoidRect);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    iface->SetKeyboardPositionForOverlay( params->ulOverlayHandle, params->avoidRect );
 }
 
 void cppIVROverlay_IVROverlay_027_ShowMessageOverlay( struct cppIVROverlay_IVROverlay_027_ShowMessageOverlay_params *params )
 {
-    params->_ret = ((IVROverlay*)params->linux_side)->ShowMessageOverlay((const char *)params->pchText, (const char *)params->pchCaption, (const char *)params->pchButton0Text, (const char *)params->pchButton1Text, (const char *)params->pchButton2Text, (const char *)params->pchButton3Text);
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    params->_ret = iface->ShowMessageOverlay( params->pchText, params->pchCaption, params->pchButton0Text, params->pchButton1Text, params->pchButton2Text, params->pchButton3Text );
 }
 
 void cppIVROverlay_IVROverlay_027_CloseMessageOverlay( struct cppIVROverlay_IVROverlay_027_CloseMessageOverlay_params *params )
 {
-    ((IVROverlay*)params->linux_side)->CloseMessageOverlay();
+    struct cppIVROverlay_IVROverlay_027 *iface = (struct cppIVROverlay_IVROverlay_027 *)params->linux_side;
+    iface->CloseMessageOverlay(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.h b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.h
index 39fa374c..086579eb 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.h
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVROverlay_IVROverlay_027;
 struct cppIVROverlay_IVROverlay_027_FindOverlay_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_001.cpp b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_001.cpp
index 7b24da51..fe5d6ac7 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_001.cpp
@@ -9,24 +9,39 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRRenderModels_IVRRenderModels_001
+{
+#ifdef __cplusplus
+    virtual bool LoadRenderModel( const char *, RenderModel_t * ) = 0;
+    virtual void FreeRenderModel( RenderModel_t * ) = 0;
+    virtual uint32_t GetRenderModelName( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetRenderModelCount(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRRenderModels_IVRRenderModels_001_LoadRenderModel( struct cppIVRRenderModels_IVRRenderModels_001_LoadRenderModel_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadRenderModel((const char *)params->pchRenderModelName, struct_RenderModel_t_0910_unwrap( params->pRenderModel ));
+    struct cppIVRRenderModels_IVRRenderModels_001 *iface = (struct cppIVRRenderModels_IVRRenderModels_001 *)params->linux_side;
+    params->_ret = iface->LoadRenderModel( params->pchRenderModelName, struct_RenderModel_t_0910_unwrap( params->pRenderModel ) );
 }
 
 void cppIVRRenderModels_IVRRenderModels_001_FreeRenderModel( struct cppIVRRenderModels_IVRRenderModels_001_FreeRenderModel_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeRenderModel(struct_RenderModel_t_0910_unwrap( params->pRenderModel ));
+    struct cppIVRRenderModels_IVRRenderModels_001 *iface = (struct cppIVRRenderModels_IVRRenderModels_001 *)params->linux_side;
+    iface->FreeRenderModel( struct_RenderModel_t_0910_unwrap( params->pRenderModel ) );
 }
 
 void cppIVRRenderModels_IVRRenderModels_001_GetRenderModelName( struct cppIVRRenderModels_IVRRenderModels_001_GetRenderModelName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelName((uint32_t)params->unRenderModelIndex, (char *)params->pchRenderModelName, (uint32_t)params->unRenderModelNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_001 *iface = (struct cppIVRRenderModels_IVRRenderModels_001 *)params->linux_side;
+    params->_ret = iface->GetRenderModelName( params->unRenderModelIndex, params->pchRenderModelName, params->unRenderModelNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_001_GetRenderModelCount( struct cppIVRRenderModels_IVRRenderModels_001_GetRenderModelCount_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelCount();
+    struct cppIVRRenderModels_IVRRenderModels_001 *iface = (struct cppIVRRenderModels_IVRRenderModels_001 *)params->linux_side;
+    params->_ret = iface->GetRenderModelCount(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_001.h b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_001.h
index 88946059..104b8a56 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRRenderModels_IVRRenderModels_001;
 struct cppIVRRenderModels_IVRRenderModels_001_LoadRenderModel_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.cpp b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.cpp
index 0cbef91b..4b5c4f96 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.cpp
@@ -9,73 +9,104 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRRenderModels_IVRRenderModels_002
+{
+#ifdef __cplusplus
+    virtual bool LoadRenderModel( const char *, RenderModel_t ** ) = 0;
+    virtual void FreeRenderModel( RenderModel_t * ) = 0;
+    virtual bool LoadTexture( int32_t, RenderModel_TextureMap_t ** ) = 0;
+    virtual void FreeTexture( RenderModel_TextureMap_t * ) = 0;
+    virtual uint32_t GetRenderModelName( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetRenderModelCount(  ) = 0;
+    virtual uint32_t GetComponentCount( const char * ) = 0;
+    virtual uint32_t GetComponentName( const char *, uint32_t, char *, uint32_t ) = 0;
+    virtual uint64_t GetComponentButtonMask( const char *, const char * ) = 0;
+    virtual uint32_t GetComponentRenderModelName( const char *, const char *, char *, uint32_t ) = 0;
+    virtual bool GetComponentState( const char *, const char *, const VRControllerState_t *, RenderModel_ComponentState_t * ) = 0;
+    virtual bool RenderModelHasComponent( const char *, const char * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRRenderModels_IVRRenderModels_002_LoadRenderModel( struct cppIVRRenderModels_IVRRenderModels_002_LoadRenderModel_params *params )
 {
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
     RenderModel_t *lin_ppRenderModel;
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadRenderModel((const char *)params->pchRenderModelName, params->ppRenderModel ? &lin_ppRenderModel : nullptr);
+    params->_ret = iface->LoadRenderModel( params->pchRenderModelName, params->ppRenderModel ? &lin_ppRenderModel : nullptr );
     if (params->_ret == 0)
         *params->ppRenderModel = struct_RenderModel_t_0915_wrap( lin_ppRenderModel );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_FreeRenderModel( struct cppIVRRenderModels_IVRRenderModels_002_FreeRenderModel_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeRenderModel(struct_RenderModel_t_0915_unwrap( params->pRenderModel ));
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
+    iface->FreeRenderModel( struct_RenderModel_t_0915_unwrap( params->pRenderModel ) );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_LoadTexture( struct cppIVRRenderModels_IVRRenderModels_002_LoadTexture_params *params )
 {
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
     RenderModel_TextureMap_t *lin_ppTexture;
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadTexture((vr::TextureID_t)params->textureId, params->ppTexture ? &lin_ppTexture : nullptr);
+    params->_ret = iface->LoadTexture( params->textureId, params->ppTexture ? &lin_ppTexture : nullptr );
     if (params->_ret == 0)
         *params->ppTexture = struct_RenderModel_TextureMap_t_0915_wrap( lin_ppTexture );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_FreeTexture( struct cppIVRRenderModels_IVRRenderModels_002_FreeTexture_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeTexture(struct_RenderModel_TextureMap_t_0915_unwrap( params->pTexture ));
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
+    iface->FreeTexture( struct_RenderModel_TextureMap_t_0915_unwrap( params->pTexture ) );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_GetRenderModelName( struct cppIVRRenderModels_IVRRenderModels_002_GetRenderModelName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelName((uint32_t)params->unRenderModelIndex, (char *)params->pchRenderModelName, (uint32_t)params->unRenderModelNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
+    params->_ret = iface->GetRenderModelName( params->unRenderModelIndex, params->pchRenderModelName, params->unRenderModelNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_GetRenderModelCount( struct cppIVRRenderModels_IVRRenderModels_002_GetRenderModelCount_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelCount();
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
+    params->_ret = iface->GetRenderModelCount(  );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_GetComponentCount( struct cppIVRRenderModels_IVRRenderModels_002_GetComponentCount_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentCount((const char *)params->pchRenderModelName);
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
+    params->_ret = iface->GetComponentCount( params->pchRenderModelName );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_GetComponentName( struct cppIVRRenderModels_IVRRenderModels_002_GetComponentName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentName((const char *)params->pchRenderModelName, (uint32_t)params->unComponentIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
+    params->_ret = iface->GetComponentName( params->pchRenderModelName, params->unComponentIndex, params->pchComponentName, params->unComponentNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_GetComponentButtonMask( struct cppIVRRenderModels_IVRRenderModels_002_GetComponentButtonMask_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentButtonMask((const char *)params->pchRenderModelName, (const char *)params->pchComponentName);
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
+    params->_ret = iface->GetComponentButtonMask( params->pchRenderModelName, params->pchComponentName );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_GetComponentRenderModelName( struct cppIVRRenderModels_IVRRenderModels_002_GetComponentRenderModelName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentRenderModelName((const char *)params->pchRenderModelName, (const char *)params->pchComponentName, (char *)params->pchComponentRenderModelName, (uint32_t)params->unComponentRenderModelNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
+    params->_ret = iface->GetComponentRenderModelName( params->pchRenderModelName, params->pchComponentName, params->pchComponentRenderModelName, params->unComponentRenderModelNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_GetComponentState( struct cppIVRRenderModels_IVRRenderModels_002_GetComponentState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_0915_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentState((const char *)params->pchRenderModelName, (const char *)params->pchComponentName, params->pControllerState ? &lin_pControllerState : nullptr, (vr::RenderModel_ComponentState_t *)params->pComponentState);
+    params->_ret = iface->GetComponentState( params->pchRenderModelName, params->pchComponentName, params->pControllerState ? &lin_pControllerState : nullptr, params->pComponentState );
 }
 
 void cppIVRRenderModels_IVRRenderModels_002_RenderModelHasComponent( struct cppIVRRenderModels_IVRRenderModels_002_RenderModelHasComponent_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->RenderModelHasComponent((const char *)params->pchRenderModelName, (const char *)params->pchComponentName);
+    struct cppIVRRenderModels_IVRRenderModels_002 *iface = (struct cppIVRRenderModels_IVRRenderModels_002 *)params->linux_side;
+    params->_ret = iface->RenderModelHasComponent( params->pchRenderModelName, params->pchComponentName );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.h b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.h
index 60c2dc43..b57e2e2c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.h
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRRenderModels_IVRRenderModels_002;
 struct cppIVRRenderModels_IVRRenderModels_002_LoadRenderModel_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.cpp b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.cpp
index e572fa8f..374240e9 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.cpp
@@ -9,83 +9,118 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRRenderModels_IVRRenderModels_004
+{
+#ifdef __cplusplus
+    virtual uint32_t LoadRenderModel_Async( const char *, RenderModel_t ** ) = 0;
+    virtual void FreeRenderModel( RenderModel_t * ) = 0;
+    virtual uint32_t LoadTexture_Async( int32_t, RenderModel_TextureMap_t ** ) = 0;
+    virtual void FreeTexture( RenderModel_TextureMap_t * ) = 0;
+    virtual uint32_t LoadTextureD3D11_Async( int32_t, void *, void ** ) = 0;
+    virtual void FreeTextureD3D11( void * ) = 0;
+    virtual uint32_t GetRenderModelName( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetRenderModelCount(  ) = 0;
+    virtual uint32_t GetComponentCount( const char * ) = 0;
+    virtual uint32_t GetComponentName( const char *, uint32_t, char *, uint32_t ) = 0;
+    virtual uint64_t GetComponentButtonMask( const char *, const char * ) = 0;
+    virtual uint32_t GetComponentRenderModelName( const char *, const char *, char *, uint32_t ) = 0;
+    virtual bool GetComponentState( const char *, const char *, const VRControllerState_t *, const RenderModel_ControllerMode_State_t *, RenderModel_ComponentState_t * ) = 0;
+    virtual bool RenderModelHasComponent( const char *, const char * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRRenderModels_IVRRenderModels_004_LoadRenderModel_Async( struct cppIVRRenderModels_IVRRenderModels_004_LoadRenderModel_Async_params *params )
 {
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
     RenderModel_t *lin_ppRenderModel;
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadRenderModel_Async((const char *)params->pchRenderModelName, params->ppRenderModel ? &lin_ppRenderModel : nullptr);
+    params->_ret = iface->LoadRenderModel_Async( params->pchRenderModelName, params->ppRenderModel ? &lin_ppRenderModel : nullptr );
     if (params->_ret == 0)
         *params->ppRenderModel = struct_RenderModel_t_0918_wrap( lin_ppRenderModel );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_FreeRenderModel( struct cppIVRRenderModels_IVRRenderModels_004_FreeRenderModel_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeRenderModel(struct_RenderModel_t_0918_unwrap( params->pRenderModel ));
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    iface->FreeRenderModel( struct_RenderModel_t_0918_unwrap( params->pRenderModel ) );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_LoadTexture_Async( struct cppIVRRenderModels_IVRRenderModels_004_LoadTexture_Async_params *params )
 {
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
     RenderModel_TextureMap_t *lin_ppTexture;
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadTexture_Async((vr::TextureID_t)params->textureId, params->ppTexture ? &lin_ppTexture : nullptr);
+    params->_ret = iface->LoadTexture_Async( params->textureId, params->ppTexture ? &lin_ppTexture : nullptr );
     if (params->_ret == 0)
         *params->ppTexture = struct_RenderModel_TextureMap_t_0918_wrap( lin_ppTexture );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_FreeTexture( struct cppIVRRenderModels_IVRRenderModels_004_FreeTexture_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeTexture(struct_RenderModel_TextureMap_t_0918_unwrap( params->pTexture ));
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    iface->FreeTexture( struct_RenderModel_TextureMap_t_0918_unwrap( params->pTexture ) );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_LoadTextureD3D11_Async( struct cppIVRRenderModels_IVRRenderModels_004_LoadTextureD3D11_Async_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadTextureD3D11_Async((vr::TextureID_t)params->textureId, (void *)params->pD3D11Device, (void **)params->ppD3D11Texture2D);
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    params->_ret = iface->LoadTextureD3D11_Async( params->textureId, params->pD3D11Device, params->ppD3D11Texture2D );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_FreeTextureD3D11( struct cppIVRRenderModels_IVRRenderModels_004_FreeTextureD3D11_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeTextureD3D11((void *)params->pD3D11Texture2D);
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    iface->FreeTextureD3D11( params->pD3D11Texture2D );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_GetRenderModelName( struct cppIVRRenderModels_IVRRenderModels_004_GetRenderModelName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelName((uint32_t)params->unRenderModelIndex, (char *)params->pchRenderModelName, (uint32_t)params->unRenderModelNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    params->_ret = iface->GetRenderModelName( params->unRenderModelIndex, params->pchRenderModelName, params->unRenderModelNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_GetRenderModelCount( struct cppIVRRenderModels_IVRRenderModels_004_GetRenderModelCount_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelCount();
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    params->_ret = iface->GetRenderModelCount(  );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_GetComponentCount( struct cppIVRRenderModels_IVRRenderModels_004_GetComponentCount_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentCount((const char *)params->pchRenderModelName);
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    params->_ret = iface->GetComponentCount( params->pchRenderModelName );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_GetComponentName( struct cppIVRRenderModels_IVRRenderModels_004_GetComponentName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentName((const char *)params->pchRenderModelName, (uint32_t)params->unComponentIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    params->_ret = iface->GetComponentName( params->pchRenderModelName, params->unComponentIndex, params->pchComponentName, params->unComponentNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_GetComponentButtonMask( struct cppIVRRenderModels_IVRRenderModels_004_GetComponentButtonMask_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentButtonMask((const char *)params->pchRenderModelName, (const char *)params->pchComponentName);
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    params->_ret = iface->GetComponentButtonMask( params->pchRenderModelName, params->pchComponentName );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_GetComponentRenderModelName( struct cppIVRRenderModels_IVRRenderModels_004_GetComponentRenderModelName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentRenderModelName((const char *)params->pchRenderModelName, (const char *)params->pchComponentName, (char *)params->pchComponentRenderModelName, (uint32_t)params->unComponentRenderModelNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    params->_ret = iface->GetComponentRenderModelName( params->pchRenderModelName, params->pchComponentName, params->pchComponentRenderModelName, params->unComponentRenderModelNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_GetComponentState( struct cppIVRRenderModels_IVRRenderModels_004_GetComponentState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_0918_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentState((const char *)params->pchRenderModelName, (const char *)params->pchComponentName, params->pControllerState ? &lin_pControllerState : nullptr, (const vr::RenderModel_ControllerMode_State_t *)params->pState, (vr::RenderModel_ComponentState_t *)params->pComponentState);
+    params->_ret = iface->GetComponentState( params->pchRenderModelName, params->pchComponentName, params->pControllerState ? &lin_pControllerState : nullptr, params->pState, params->pComponentState );
 }
 
 void cppIVRRenderModels_IVRRenderModels_004_RenderModelHasComponent( struct cppIVRRenderModels_IVRRenderModels_004_RenderModelHasComponent_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->RenderModelHasComponent((const char *)params->pchRenderModelName, (const char *)params->pchComponentName);
+    struct cppIVRRenderModels_IVRRenderModels_004 *iface = (struct cppIVRRenderModels_IVRRenderModels_004 *)params->linux_side;
+    params->_ret = iface->RenderModelHasComponent( params->pchRenderModelName, params->pchComponentName );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.h b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.h
index 406b38e3..2ae32e62 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRRenderModels_IVRRenderModels_004;
 struct cppIVRRenderModels_IVRRenderModels_004_LoadRenderModel_Async_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.cpp b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.cpp
index 0bc75601..3cd3b091 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.cpp
@@ -9,103 +9,146 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRRenderModels_IVRRenderModels_005
+{
+#ifdef __cplusplus
+    virtual uint32_t LoadRenderModel_Async( const char *, RenderModel_t ** ) = 0;
+    virtual void FreeRenderModel( RenderModel_t * ) = 0;
+    virtual uint32_t LoadTexture_Async( int32_t, RenderModel_TextureMap_t ** ) = 0;
+    virtual void FreeTexture( RenderModel_TextureMap_t * ) = 0;
+    virtual uint32_t LoadTextureD3D11_Async( int32_t, void *, void ** ) = 0;
+    virtual uint32_t LoadIntoTextureD3D11_Async( int32_t, void * ) = 0;
+    virtual void FreeTextureD3D11( void * ) = 0;
+    virtual uint32_t GetRenderModelName( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetRenderModelCount(  ) = 0;
+    virtual uint32_t GetComponentCount( const char * ) = 0;
+    virtual uint32_t GetComponentName( const char *, uint32_t, char *, uint32_t ) = 0;
+    virtual uint64_t GetComponentButtonMask( const char *, const char * ) = 0;
+    virtual uint32_t GetComponentRenderModelName( const char *, const char *, char *, uint32_t ) = 0;
+    virtual bool GetComponentState( const char *, const char *, const VRControllerState_t *, const RenderModel_ControllerMode_State_t *, RenderModel_ComponentState_t * ) = 0;
+    virtual bool RenderModelHasComponent( const char *, const char * ) = 0;
+    virtual uint32_t GetRenderModelThumbnailURL( const char *, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetRenderModelOriginalPath( const char *, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetRenderModelErrorNameFromEnum( uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRRenderModels_IVRRenderModels_005_LoadRenderModel_Async( struct cppIVRRenderModels_IVRRenderModels_005_LoadRenderModel_Async_params *params )
 {
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
     RenderModel_t *lin_ppRenderModel;
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadRenderModel_Async((const char *)params->pchRenderModelName, params->ppRenderModel ? &lin_ppRenderModel : nullptr);
+    params->_ret = iface->LoadRenderModel_Async( params->pchRenderModelName, params->ppRenderModel ? &lin_ppRenderModel : nullptr );
     if (params->_ret == 0)
         *params->ppRenderModel = struct_RenderModel_t_1015_wrap( lin_ppRenderModel );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_FreeRenderModel( struct cppIVRRenderModels_IVRRenderModels_005_FreeRenderModel_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeRenderModel(struct_RenderModel_t_1015_unwrap( params->pRenderModel ));
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    iface->FreeRenderModel( struct_RenderModel_t_1015_unwrap( params->pRenderModel ) );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_LoadTexture_Async( struct cppIVRRenderModels_IVRRenderModels_005_LoadTexture_Async_params *params )
 {
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
     RenderModel_TextureMap_t *lin_ppTexture;
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadTexture_Async((vr::TextureID_t)params->textureId, params->ppTexture ? &lin_ppTexture : nullptr);
+    params->_ret = iface->LoadTexture_Async( params->textureId, params->ppTexture ? &lin_ppTexture : nullptr );
     if (params->_ret == 0)
         *params->ppTexture = struct_RenderModel_TextureMap_t_1015_wrap( lin_ppTexture );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_FreeTexture( struct cppIVRRenderModels_IVRRenderModels_005_FreeTexture_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeTexture(struct_RenderModel_TextureMap_t_1015_unwrap( params->pTexture ));
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    iface->FreeTexture( struct_RenderModel_TextureMap_t_1015_unwrap( params->pTexture ) );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_LoadTextureD3D11_Async( struct cppIVRRenderModels_IVRRenderModels_005_LoadTextureD3D11_Async_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadTextureD3D11_Async((vr::TextureID_t)params->textureId, (void *)params->pD3D11Device, (void **)params->ppD3D11Texture2D);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->LoadTextureD3D11_Async( params->textureId, params->pD3D11Device, params->ppD3D11Texture2D );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_LoadIntoTextureD3D11_Async( struct cppIVRRenderModels_IVRRenderModels_005_LoadIntoTextureD3D11_Async_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadIntoTextureD3D11_Async((vr::TextureID_t)params->textureId, (void *)params->pDstTexture);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->LoadIntoTextureD3D11_Async( params->textureId, params->pDstTexture );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_FreeTextureD3D11( struct cppIVRRenderModels_IVRRenderModels_005_FreeTextureD3D11_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeTextureD3D11((void *)params->pD3D11Texture2D);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    iface->FreeTextureD3D11( params->pD3D11Texture2D );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_GetRenderModelName( struct cppIVRRenderModels_IVRRenderModels_005_GetRenderModelName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelName((uint32_t)params->unRenderModelIndex, (char *)params->pchRenderModelName, (uint32_t)params->unRenderModelNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->GetRenderModelName( params->unRenderModelIndex, params->pchRenderModelName, params->unRenderModelNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_GetRenderModelCount( struct cppIVRRenderModels_IVRRenderModels_005_GetRenderModelCount_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelCount();
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->GetRenderModelCount(  );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_GetComponentCount( struct cppIVRRenderModels_IVRRenderModels_005_GetComponentCount_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentCount((const char *)params->pchRenderModelName);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->GetComponentCount( params->pchRenderModelName );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_GetComponentName( struct cppIVRRenderModels_IVRRenderModels_005_GetComponentName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentName((const char *)params->pchRenderModelName, (uint32_t)params->unComponentIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->GetComponentName( params->pchRenderModelName, params->unComponentIndex, params->pchComponentName, params->unComponentNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_GetComponentButtonMask( struct cppIVRRenderModels_IVRRenderModels_005_GetComponentButtonMask_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentButtonMask((const char *)params->pchRenderModelName, (const char *)params->pchComponentName);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->GetComponentButtonMask( params->pchRenderModelName, params->pchComponentName );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_GetComponentRenderModelName( struct cppIVRRenderModels_IVRRenderModels_005_GetComponentRenderModelName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentRenderModelName((const char *)params->pchRenderModelName, (const char *)params->pchComponentName, (char *)params->pchComponentRenderModelName, (uint32_t)params->unComponentRenderModelNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->GetComponentRenderModelName( params->pchRenderModelName, params->pchComponentName, params->pchComponentRenderModelName, params->unComponentRenderModelNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_GetComponentState( struct cppIVRRenderModels_IVRRenderModels_005_GetComponentState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1015_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentState((const char *)params->pchRenderModelName, (const char *)params->pchComponentName, params->pControllerState ? &lin_pControllerState : nullptr, (const vr::RenderModel_ControllerMode_State_t *)params->pState, (vr::RenderModel_ComponentState_t *)params->pComponentState);
+    params->_ret = iface->GetComponentState( params->pchRenderModelName, params->pchComponentName, params->pControllerState ? &lin_pControllerState : nullptr, params->pState, params->pComponentState );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_RenderModelHasComponent( struct cppIVRRenderModels_IVRRenderModels_005_RenderModelHasComponent_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->RenderModelHasComponent((const char *)params->pchRenderModelName, (const char *)params->pchComponentName);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->RenderModelHasComponent( params->pchRenderModelName, params->pchComponentName );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_GetRenderModelThumbnailURL( struct cppIVRRenderModels_IVRRenderModels_005_GetRenderModelThumbnailURL_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelThumbnailURL((const char *)params->pchRenderModelName, (char *)params->pchThumbnailURL, (uint32_t)params->unThumbnailURLLen, (vr::EVRRenderModelError *)params->peError);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->GetRenderModelThumbnailURL( params->pchRenderModelName, params->pchThumbnailURL, params->unThumbnailURLLen, params->peError );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_GetRenderModelOriginalPath( struct cppIVRRenderModels_IVRRenderModels_005_GetRenderModelOriginalPath_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelOriginalPath((const char *)params->pchRenderModelName, (char *)params->pchOriginalPath, (uint32_t)params->unOriginalPathLen, (vr::EVRRenderModelError *)params->peError);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->GetRenderModelOriginalPath( params->pchRenderModelName, params->pchOriginalPath, params->unOriginalPathLen, params->peError );
 }
 
 void cppIVRRenderModels_IVRRenderModels_005_GetRenderModelErrorNameFromEnum( struct cppIVRRenderModels_IVRRenderModels_005_GetRenderModelErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelErrorNameFromEnum((vr::EVRRenderModelError)params->error);
+    struct cppIVRRenderModels_IVRRenderModels_005 *iface = (struct cppIVRRenderModels_IVRRenderModels_005 *)params->linux_side;
+    params->_ret = iface->GetRenderModelErrorNameFromEnum( params->error );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.h b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.h
index 04721877..84f6b18b 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRRenderModels_IVRRenderModels_005;
 struct cppIVRRenderModels_IVRRenderModels_005_LoadRenderModel_Async_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp
index 21108896..8115adc3 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp
@@ -9,108 +9,153 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRRenderModels_IVRRenderModels_006
+{
+#ifdef __cplusplus
+    virtual uint32_t LoadRenderModel_Async( const char *, RenderModel_t ** ) = 0;
+    virtual void FreeRenderModel( RenderModel_t * ) = 0;
+    virtual uint32_t LoadTexture_Async( int32_t, RenderModel_TextureMap_t ** ) = 0;
+    virtual void FreeTexture( RenderModel_TextureMap_t * ) = 0;
+    virtual uint32_t LoadTextureD3D11_Async( int32_t, void *, void ** ) = 0;
+    virtual uint32_t LoadIntoTextureD3D11_Async( int32_t, void * ) = 0;
+    virtual void FreeTextureD3D11( void * ) = 0;
+    virtual uint32_t GetRenderModelName( uint32_t, char *, uint32_t ) = 0;
+    virtual uint32_t GetRenderModelCount(  ) = 0;
+    virtual uint32_t GetComponentCount( const char * ) = 0;
+    virtual uint32_t GetComponentName( const char *, uint32_t, char *, uint32_t ) = 0;
+    virtual uint64_t GetComponentButtonMask( const char *, const char * ) = 0;
+    virtual uint32_t GetComponentRenderModelName( const char *, const char *, char *, uint32_t ) = 0;
+    virtual bool GetComponentStateForDevicePath( const char *, const char *, uint64_t, const RenderModel_ControllerMode_State_t *, RenderModel_ComponentState_t * ) = 0;
+    virtual bool GetComponentState( const char *, const char *, const VRControllerState_t *, const RenderModel_ControllerMode_State_t *, RenderModel_ComponentState_t * ) = 0;
+    virtual bool RenderModelHasComponent( const char *, const char * ) = 0;
+    virtual uint32_t GetRenderModelThumbnailURL( const char *, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetRenderModelOriginalPath( const char *, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetRenderModelErrorNameFromEnum( uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async( struct cppIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async_params *params )
 {
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
     RenderModel_t *lin_ppRenderModel;
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadRenderModel_Async((const char *)params->pchRenderModelName, params->ppRenderModel ? &lin_ppRenderModel : nullptr);
+    params->_ret = iface->LoadRenderModel_Async( params->pchRenderModelName, params->ppRenderModel ? &lin_ppRenderModel : nullptr );
     if (params->_ret == 0)
         *params->ppRenderModel = struct_RenderModel_t_1267_wrap( lin_ppRenderModel );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_FreeRenderModel( struct cppIVRRenderModels_IVRRenderModels_006_FreeRenderModel_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeRenderModel(struct_RenderModel_t_1267_unwrap( params->pRenderModel ));
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    iface->FreeRenderModel( struct_RenderModel_t_1267_unwrap( params->pRenderModel ) );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_LoadTexture_Async( struct cppIVRRenderModels_IVRRenderModels_006_LoadTexture_Async_params *params )
 {
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
     RenderModel_TextureMap_t *lin_ppTexture;
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadTexture_Async((vr::TextureID_t)params->textureId, params->ppTexture ? &lin_ppTexture : nullptr);
+    params->_ret = iface->LoadTexture_Async( params->textureId, params->ppTexture ? &lin_ppTexture : nullptr );
     if (params->_ret == 0)
         *params->ppTexture = struct_RenderModel_TextureMap_t_1267_wrap( lin_ppTexture );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_FreeTexture( struct cppIVRRenderModels_IVRRenderModels_006_FreeTexture_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeTexture(struct_RenderModel_TextureMap_t_1267_unwrap( params->pTexture ));
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    iface->FreeTexture( struct_RenderModel_TextureMap_t_1267_unwrap( params->pTexture ) );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_LoadTextureD3D11_Async( struct cppIVRRenderModels_IVRRenderModels_006_LoadTextureD3D11_Async_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadTextureD3D11_Async((vr::TextureID_t)params->textureId, (void *)params->pD3D11Device, (void **)params->ppD3D11Texture2D);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->LoadTextureD3D11_Async( params->textureId, params->pD3D11Device, params->ppD3D11Texture2D );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_LoadIntoTextureD3D11_Async( struct cppIVRRenderModels_IVRRenderModels_006_LoadIntoTextureD3D11_Async_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->LoadIntoTextureD3D11_Async((vr::TextureID_t)params->textureId, (void *)params->pDstTexture);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->LoadIntoTextureD3D11_Async( params->textureId, params->pDstTexture );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_FreeTextureD3D11( struct cppIVRRenderModels_IVRRenderModels_006_FreeTextureD3D11_params *params )
 {
-    ((IVRRenderModels*)params->linux_side)->FreeTextureD3D11((void *)params->pD3D11Texture2D);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    iface->FreeTextureD3D11( params->pD3D11Texture2D );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetRenderModelName( struct cppIVRRenderModels_IVRRenderModels_006_GetRenderModelName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelName((uint32_t)params->unRenderModelIndex, (char *)params->pchRenderModelName, (uint32_t)params->unRenderModelNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->GetRenderModelName( params->unRenderModelIndex, params->pchRenderModelName, params->unRenderModelNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetRenderModelCount( struct cppIVRRenderModels_IVRRenderModels_006_GetRenderModelCount_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelCount();
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->GetRenderModelCount(  );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetComponentCount( struct cppIVRRenderModels_IVRRenderModels_006_GetComponentCount_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentCount((const char *)params->pchRenderModelName);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->GetComponentCount( params->pchRenderModelName );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetComponentName( struct cppIVRRenderModels_IVRRenderModels_006_GetComponentName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentName((const char *)params->pchRenderModelName, (uint32_t)params->unComponentIndex, (char *)params->pchComponentName, (uint32_t)params->unComponentNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->GetComponentName( params->pchRenderModelName, params->unComponentIndex, params->pchComponentName, params->unComponentNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetComponentButtonMask( struct cppIVRRenderModels_IVRRenderModels_006_GetComponentButtonMask_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentButtonMask((const char *)params->pchRenderModelName, (const char *)params->pchComponentName);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->GetComponentButtonMask( params->pchRenderModelName, params->pchComponentName );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetComponentRenderModelName( struct cppIVRRenderModels_IVRRenderModels_006_GetComponentRenderModelName_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentRenderModelName((const char *)params->pchRenderModelName, (const char *)params->pchComponentName, (char *)params->pchComponentRenderModelName, (uint32_t)params->unComponentRenderModelNameLen);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->GetComponentRenderModelName( params->pchRenderModelName, params->pchComponentName, params->pchComponentRenderModelName, params->unComponentRenderModelNameLen );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetComponentStateForDevicePath( struct cppIVRRenderModels_IVRRenderModels_006_GetComponentStateForDevicePath_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentStateForDevicePath((const char *)params->pchRenderModelName, (const char *)params->pchComponentName, (vr::VRInputValueHandle_t)params->devicePath, (const vr::RenderModel_ControllerMode_State_t *)params->pState, (vr::RenderModel_ComponentState_t *)params->pComponentState);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->GetComponentStateForDevicePath( params->pchRenderModelName, params->pchComponentName, params->devicePath, params->pState, params->pComponentState );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetComponentState( struct cppIVRRenderModels_IVRRenderModels_006_GetComponentState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1267_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetComponentState((const char *)params->pchRenderModelName, (const char *)params->pchComponentName, params->pControllerState ? &lin_pControllerState : nullptr, (const vr::RenderModel_ControllerMode_State_t *)params->pState, (vr::RenderModel_ComponentState_t *)params->pComponentState);
+    params->_ret = iface->GetComponentState( params->pchRenderModelName, params->pchComponentName, params->pControllerState ? &lin_pControllerState : nullptr, params->pState, params->pComponentState );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_RenderModelHasComponent( struct cppIVRRenderModels_IVRRenderModels_006_RenderModelHasComponent_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->RenderModelHasComponent((const char *)params->pchRenderModelName, (const char *)params->pchComponentName);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->RenderModelHasComponent( params->pchRenderModelName, params->pchComponentName );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetRenderModelThumbnailURL( struct cppIVRRenderModels_IVRRenderModels_006_GetRenderModelThumbnailURL_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelThumbnailURL((const char *)params->pchRenderModelName, (char *)params->pchThumbnailURL, (uint32_t)params->unThumbnailURLLen, (vr::EVRRenderModelError *)params->peError);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->GetRenderModelThumbnailURL( params->pchRenderModelName, params->pchThumbnailURL, params->unThumbnailURLLen, params->peError );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetRenderModelOriginalPath( struct cppIVRRenderModels_IVRRenderModels_006_GetRenderModelOriginalPath_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelOriginalPath((const char *)params->pchRenderModelName, (char *)params->pchOriginalPath, (uint32_t)params->unOriginalPathLen, (vr::EVRRenderModelError *)params->peError);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->GetRenderModelOriginalPath( params->pchRenderModelName, params->pchOriginalPath, params->unOriginalPathLen, params->peError );
 }
 
 void cppIVRRenderModels_IVRRenderModels_006_GetRenderModelErrorNameFromEnum( struct cppIVRRenderModels_IVRRenderModels_006_GetRenderModelErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRRenderModels*)params->linux_side)->GetRenderModelErrorNameFromEnum((vr::EVRRenderModelError)params->error);
+    struct cppIVRRenderModels_IVRRenderModels_006 *iface = (struct cppIVRRenderModels_IVRRenderModels_006 *)params->linux_side;
+    params->_ret = iface->GetRenderModelErrorNameFromEnum( params->error );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.h b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.h
index f37fac7c..2f9408c4 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.h
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRRenderModels_IVRRenderModels_006;
 struct cppIVRRenderModels_IVRRenderModels_006_LoadRenderModel_Async_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.cpp b/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.cpp
index 1dfc3473..050cf000 100644
--- a/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.cpp
@@ -9,14 +9,25 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRResources_IVRResources_001
+{
+#ifdef __cplusplus
+    virtual uint32_t LoadSharedResource( const char *, char *, uint32_t ) = 0;
+    virtual uint32_t GetResourceFullPath( const char *, const char *, char *, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRResources_IVRResources_001_LoadSharedResource( struct cppIVRResources_IVRResources_001_LoadSharedResource_params *params )
 {
-    params->_ret = ((IVRResources*)params->linux_side)->LoadSharedResource((const char *)params->pchResourceName, (char *)params->pchBuffer, (uint32_t)params->unBufferLen);
+    struct cppIVRResources_IVRResources_001 *iface = (struct cppIVRResources_IVRResources_001 *)params->linux_side;
+    params->_ret = iface->LoadSharedResource( params->pchResourceName, params->pchBuffer, params->unBufferLen );
 }
 
 void cppIVRResources_IVRResources_001_GetResourceFullPath( struct cppIVRResources_IVRResources_001_GetResourceFullPath_params *params )
 {
-    params->_ret = ((IVRResources*)params->linux_side)->GetResourceFullPath((const char *)params->pchResourceName, (const char *)params->pchResourceTypeDirectory, (char *)params->pchPathBuffer, (uint32_t)params->unBufferLen);
+    struct cppIVRResources_IVRResources_001 *iface = (struct cppIVRResources_IVRResources_001 *)params->linux_side;
+    params->_ret = iface->GetResourceFullPath( params->pchResourceName, params->pchResourceTypeDirectory, params->pchPathBuffer, params->unBufferLen );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.h b/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.h
index bd74a561..1ea63ce1 100644
--- a/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRResources_IVRResources_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRResources_IVRResources_001;
 struct cppIVRResources_IVRResources_001_LoadSharedResource_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.cpp b/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.cpp
index c72d971e..7f95d4b5 100644
--- a/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.cpp
@@ -9,39 +9,60 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRScreenshots_IVRScreenshots_001
+{
+#ifdef __cplusplus
+    virtual uint32_t RequestScreenshot( uint32_t *, uint32_t, const char *, const char * ) = 0;
+    virtual uint32_t HookScreenshot( uint32_t *, int32_t ) = 0;
+    virtual uint32_t GetScreenshotPropertyType( uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetScreenshotPropertyFilename( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t UpdateScreenshotProgress( uint32_t, float ) = 0;
+    virtual uint32_t TakeStereoScreenshot( uint32_t *, const char *, const char * ) = 0;
+    virtual uint32_t SubmitScreenshot( uint32_t, uint32_t, const char *, const char * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRScreenshots_IVRScreenshots_001_RequestScreenshot( struct cppIVRScreenshots_IVRScreenshots_001_RequestScreenshot_params *params )
 {
-    params->_ret = ((IVRScreenshots*)params->linux_side)->RequestScreenshot((vr::ScreenshotHandle_t *)params->pOutScreenshotHandle, (vr::EVRScreenshotType)params->type, (const char *)params->pchPreviewFilename, (const char *)params->pchVRFilename);
+    struct cppIVRScreenshots_IVRScreenshots_001 *iface = (struct cppIVRScreenshots_IVRScreenshots_001 *)params->linux_side;
+    params->_ret = iface->RequestScreenshot( params->pOutScreenshotHandle, params->type, params->pchPreviewFilename, params->pchVRFilename );
 }
 
 void cppIVRScreenshots_IVRScreenshots_001_HookScreenshot( struct cppIVRScreenshots_IVRScreenshots_001_HookScreenshot_params *params )
 {
-    params->_ret = ((IVRScreenshots*)params->linux_side)->HookScreenshot((const vr::EVRScreenshotType *)params->pSupportedTypes, (int)params->numTypes);
+    struct cppIVRScreenshots_IVRScreenshots_001 *iface = (struct cppIVRScreenshots_IVRScreenshots_001 *)params->linux_side;
+    params->_ret = iface->HookScreenshot( params->pSupportedTypes, params->numTypes );
 }
 
 void cppIVRScreenshots_IVRScreenshots_001_GetScreenshotPropertyType( struct cppIVRScreenshots_IVRScreenshots_001_GetScreenshotPropertyType_params *params )
 {
-    params->_ret = ((IVRScreenshots*)params->linux_side)->GetScreenshotPropertyType((vr::ScreenshotHandle_t)params->screenshotHandle, (vr::EVRScreenshotError *)params->pError);
+    struct cppIVRScreenshots_IVRScreenshots_001 *iface = (struct cppIVRScreenshots_IVRScreenshots_001 *)params->linux_side;
+    params->_ret = iface->GetScreenshotPropertyType( params->screenshotHandle, params->pError );
 }
 
 void cppIVRScreenshots_IVRScreenshots_001_GetScreenshotPropertyFilename( struct cppIVRScreenshots_IVRScreenshots_001_GetScreenshotPropertyFilename_params *params )
 {
-    params->_ret = ((IVRScreenshots*)params->linux_side)->GetScreenshotPropertyFilename((vr::ScreenshotHandle_t)params->screenshotHandle, (vr::EVRScreenshotPropertyFilenames)params->filenameType, (char *)params->pchFilename, (uint32_t)params->cchFilename, (vr::EVRScreenshotError *)params->pError);
+    struct cppIVRScreenshots_IVRScreenshots_001 *iface = (struct cppIVRScreenshots_IVRScreenshots_001 *)params->linux_side;
+    params->_ret = iface->GetScreenshotPropertyFilename( params->screenshotHandle, params->filenameType, params->pchFilename, params->cchFilename, params->pError );
 }
 
 void cppIVRScreenshots_IVRScreenshots_001_UpdateScreenshotProgress( struct cppIVRScreenshots_IVRScreenshots_001_UpdateScreenshotProgress_params *params )
 {
-    params->_ret = ((IVRScreenshots*)params->linux_side)->UpdateScreenshotProgress((vr::ScreenshotHandle_t)params->screenshotHandle, (float)params->flProgress);
+    struct cppIVRScreenshots_IVRScreenshots_001 *iface = (struct cppIVRScreenshots_IVRScreenshots_001 *)params->linux_side;
+    params->_ret = iface->UpdateScreenshotProgress( params->screenshotHandle, params->flProgress );
 }
 
 void cppIVRScreenshots_IVRScreenshots_001_TakeStereoScreenshot( struct cppIVRScreenshots_IVRScreenshots_001_TakeStereoScreenshot_params *params )
 {
-    params->_ret = ((IVRScreenshots*)params->linux_side)->TakeStereoScreenshot((vr::ScreenshotHandle_t *)params->pOutScreenshotHandle, (const char *)params->pchPreviewFilename, (const char *)params->pchVRFilename);
+    struct cppIVRScreenshots_IVRScreenshots_001 *iface = (struct cppIVRScreenshots_IVRScreenshots_001 *)params->linux_side;
+    params->_ret = iface->TakeStereoScreenshot( params->pOutScreenshotHandle, params->pchPreviewFilename, params->pchVRFilename );
 }
 
 void cppIVRScreenshots_IVRScreenshots_001_SubmitScreenshot( struct cppIVRScreenshots_IVRScreenshots_001_SubmitScreenshot_params *params )
 {
-    params->_ret = ((IVRScreenshots*)params->linux_side)->SubmitScreenshot((vr::ScreenshotHandle_t)params->screenshotHandle, (vr::EVRScreenshotType)params->type, (const char *)params->pchSourcePreviewFilename, (const char *)params->pchSourceVRFilename);
+    struct cppIVRScreenshots_IVRScreenshots_001 *iface = (struct cppIVRScreenshots_IVRScreenshots_001 *)params->linux_side;
+    params->_ret = iface->SubmitScreenshot( params->screenshotHandle, params->type, params->pchSourcePreviewFilename, params->pchSourceVRFilename );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.h b/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.h
index 439faa13..13340390 100644
--- a/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRScreenshots_IVRScreenshots_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRScreenshots_IVRScreenshots_001;
 struct cppIVRScreenshots_IVRScreenshots_001_RequestScreenshot_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_001.cpp b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_001.cpp
index d26fb492..9dce4be1 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_001.cpp
@@ -9,64 +9,95 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSettings_IVRSettings_001
+{
+#ifdef __cplusplus
+    virtual const char * GetSettingsErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool Sync( bool, uint32_t * ) = 0;
+    virtual bool GetBool( const char *, const char *, bool, uint32_t * ) = 0;
+    virtual void SetBool( const char *, const char *, bool, uint32_t * ) = 0;
+    virtual int32_t GetInt32( const char *, const char *, int32_t, uint32_t * ) = 0;
+    virtual void SetInt32( const char *, const char *, int32_t, uint32_t * ) = 0;
+    virtual float GetFloat( const char *, const char *, float, uint32_t * ) = 0;
+    virtual void SetFloat( const char *, const char *, float, uint32_t * ) = 0;
+    virtual void GetString( const char *, const char *, char *, uint32_t, const char *, uint32_t * ) = 0;
+    virtual void SetString( const char *, const char *, const char *, uint32_t * ) = 0;
+    virtual void RemoveSection( const char *, uint32_t * ) = 0;
+    virtual void RemoveKeyInSection( const char *, const char *, uint32_t * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSettings_IVRSettings_001_GetSettingsErrorNameFromEnum( struct cppIVRSettings_IVRSettings_001_GetSettingsErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetSettingsErrorNameFromEnum((vr::EVRSettingsError)params->eError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    params->_ret = iface->GetSettingsErrorNameFromEnum( params->eError );
 }
 
 void cppIVRSettings_IVRSettings_001_Sync( struct cppIVRSettings_IVRSettings_001_Sync_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->Sync((bool)params->bForce, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    params->_ret = iface->Sync( params->bForce, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_001_GetBool( struct cppIVRSettings_IVRSettings_001_GetBool_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetBool((const char *)params->pchSection, (const char *)params->pchSettingsKey, (bool)params->bDefaultValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    params->_ret = iface->GetBool( params->pchSection, params->pchSettingsKey, params->bDefaultValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_001_SetBool( struct cppIVRSettings_IVRSettings_001_SetBool_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetBool((const char *)params->pchSection, (const char *)params->pchSettingsKey, (bool)params->bValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    iface->SetBool( params->pchSection, params->pchSettingsKey, params->bValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_001_GetInt32( struct cppIVRSettings_IVRSettings_001_GetInt32_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetInt32((const char *)params->pchSection, (const char *)params->pchSettingsKey, (int32_t)params->nDefaultValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    params->_ret = iface->GetInt32( params->pchSection, params->pchSettingsKey, params->nDefaultValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_001_SetInt32( struct cppIVRSettings_IVRSettings_001_SetInt32_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetInt32((const char *)params->pchSection, (const char *)params->pchSettingsKey, (int32_t)params->nValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    iface->SetInt32( params->pchSection, params->pchSettingsKey, params->nValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_001_GetFloat( struct cppIVRSettings_IVRSettings_001_GetFloat_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetFloat((const char *)params->pchSection, (const char *)params->pchSettingsKey, (float)params->flDefaultValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    params->_ret = iface->GetFloat( params->pchSection, params->pchSettingsKey, params->flDefaultValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_001_SetFloat( struct cppIVRSettings_IVRSettings_001_SetFloat_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetFloat((const char *)params->pchSection, (const char *)params->pchSettingsKey, (float)params->flValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    iface->SetFloat( params->pchSection, params->pchSettingsKey, params->flValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_001_GetString( struct cppIVRSettings_IVRSettings_001_GetString_params *params )
 {
-    ((IVRSettings*)params->linux_side)->GetString((const char *)params->pchSection, (const char *)params->pchSettingsKey, (char *)params->pchValue, (uint32_t)params->unValueLen, (const char *)params->pchDefaultValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    iface->GetString( params->pchSection, params->pchSettingsKey, params->pchValue, params->unValueLen, params->pchDefaultValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_001_SetString( struct cppIVRSettings_IVRSettings_001_SetString_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetString((const char *)params->pchSection, (const char *)params->pchSettingsKey, (const char *)params->pchValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    iface->SetString( params->pchSection, params->pchSettingsKey, params->pchValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_001_RemoveSection( struct cppIVRSettings_IVRSettings_001_RemoveSection_params *params )
 {
-    ((IVRSettings*)params->linux_side)->RemoveSection((const char *)params->pchSection, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    iface->RemoveSection( params->pchSection, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_001_RemoveKeyInSection( struct cppIVRSettings_IVRSettings_001_RemoveKeyInSection_params *params )
 {
-    ((IVRSettings*)params->linux_side)->RemoveKeyInSection((const char *)params->pchSection, (const char *)params->pchSettingsKey, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_001 *iface = (struct cppIVRSettings_IVRSettings_001 *)params->linux_side;
+    iface->RemoveKeyInSection( params->pchSection, params->pchSettingsKey, params->peError );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_001.h b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_001.h
index 73d2cf20..2f04d1b9 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSettings_IVRSettings_001;
 struct cppIVRSettings_IVRSettings_001_GetSettingsErrorNameFromEnum_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_002.cpp b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_002.cpp
index 0b73d568..2b72835a 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_002.cpp
@@ -9,64 +9,95 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSettings_IVRSettings_002
+{
+#ifdef __cplusplus
+    virtual const char * GetSettingsErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool Sync( bool, uint32_t * ) = 0;
+    virtual void SetBool( const char *, const char *, bool, uint32_t * ) = 0;
+    virtual void SetInt32( const char *, const char *, int32_t, uint32_t * ) = 0;
+    virtual void SetFloat( const char *, const char *, float, uint32_t * ) = 0;
+    virtual void SetString( const char *, const char *, const char *, uint32_t * ) = 0;
+    virtual bool GetBool( const char *, const char *, uint32_t * ) = 0;
+    virtual int32_t GetInt32( const char *, const char *, uint32_t * ) = 0;
+    virtual float GetFloat( const char *, const char *, uint32_t * ) = 0;
+    virtual void GetString( const char *, const char *, char *, uint32_t, uint32_t * ) = 0;
+    virtual void RemoveSection( const char *, uint32_t * ) = 0;
+    virtual void RemoveKeyInSection( const char *, const char *, uint32_t * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSettings_IVRSettings_002_GetSettingsErrorNameFromEnum( struct cppIVRSettings_IVRSettings_002_GetSettingsErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetSettingsErrorNameFromEnum((vr::EVRSettingsError)params->eError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    params->_ret = iface->GetSettingsErrorNameFromEnum( params->eError );
 }
 
 void cppIVRSettings_IVRSettings_002_Sync( struct cppIVRSettings_IVRSettings_002_Sync_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->Sync((bool)params->bForce, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    params->_ret = iface->Sync( params->bForce, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_002_SetBool( struct cppIVRSettings_IVRSettings_002_SetBool_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetBool((const char *)params->pchSection, (const char *)params->pchSettingsKey, (bool)params->bValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    iface->SetBool( params->pchSection, params->pchSettingsKey, params->bValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_002_SetInt32( struct cppIVRSettings_IVRSettings_002_SetInt32_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetInt32((const char *)params->pchSection, (const char *)params->pchSettingsKey, (int32_t)params->nValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    iface->SetInt32( params->pchSection, params->pchSettingsKey, params->nValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_002_SetFloat( struct cppIVRSettings_IVRSettings_002_SetFloat_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetFloat((const char *)params->pchSection, (const char *)params->pchSettingsKey, (float)params->flValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    iface->SetFloat( params->pchSection, params->pchSettingsKey, params->flValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_002_SetString( struct cppIVRSettings_IVRSettings_002_SetString_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetString((const char *)params->pchSection, (const char *)params->pchSettingsKey, (const char *)params->pchValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    iface->SetString( params->pchSection, params->pchSettingsKey, params->pchValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_002_GetBool( struct cppIVRSettings_IVRSettings_002_GetBool_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetBool((const char *)params->pchSection, (const char *)params->pchSettingsKey, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    params->_ret = iface->GetBool( params->pchSection, params->pchSettingsKey, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_002_GetInt32( struct cppIVRSettings_IVRSettings_002_GetInt32_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetInt32((const char *)params->pchSection, (const char *)params->pchSettingsKey, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    params->_ret = iface->GetInt32( params->pchSection, params->pchSettingsKey, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_002_GetFloat( struct cppIVRSettings_IVRSettings_002_GetFloat_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetFloat((const char *)params->pchSection, (const char *)params->pchSettingsKey, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    params->_ret = iface->GetFloat( params->pchSection, params->pchSettingsKey, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_002_GetString( struct cppIVRSettings_IVRSettings_002_GetString_params *params )
 {
-    ((IVRSettings*)params->linux_side)->GetString((const char *)params->pchSection, (const char *)params->pchSettingsKey, (char *)params->pchValue, (uint32_t)params->unValueLen, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    iface->GetString( params->pchSection, params->pchSettingsKey, params->pchValue, params->unValueLen, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_002_RemoveSection( struct cppIVRSettings_IVRSettings_002_RemoveSection_params *params )
 {
-    ((IVRSettings*)params->linux_side)->RemoveSection((const char *)params->pchSection, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    iface->RemoveSection( params->pchSection, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_002_RemoveKeyInSection( struct cppIVRSettings_IVRSettings_002_RemoveKeyInSection_params *params )
 {
-    ((IVRSettings*)params->linux_side)->RemoveKeyInSection((const char *)params->pchSection, (const char *)params->pchSettingsKey, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_002 *iface = (struct cppIVRSettings_IVRSettings_002 *)params->linux_side;
+    iface->RemoveKeyInSection( params->pchSection, params->pchSettingsKey, params->peError );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_002.h b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_002.h
index c3c19302..b0b726e9 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_002.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_002.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSettings_IVRSettings_002;
 struct cppIVRSettings_IVRSettings_002_GetSettingsErrorNameFromEnum_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.cpp b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.cpp
index d5bcde54..430b1505 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.cpp
@@ -9,59 +9,88 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSettings_IVRSettings_003
+{
+#ifdef __cplusplus
+    virtual const char * GetSettingsErrorNameFromEnum( uint32_t ) = 0;
+    virtual void SetBool( const char *, const char *, bool, uint32_t * ) = 0;
+    virtual void SetInt32( const char *, const char *, int32_t, uint32_t * ) = 0;
+    virtual void SetFloat( const char *, const char *, float, uint32_t * ) = 0;
+    virtual void SetString( const char *, const char *, const char *, uint32_t * ) = 0;
+    virtual bool GetBool( const char *, const char *, uint32_t * ) = 0;
+    virtual int32_t GetInt32( const char *, const char *, uint32_t * ) = 0;
+    virtual float GetFloat( const char *, const char *, uint32_t * ) = 0;
+    virtual void GetString( const char *, const char *, char *, uint32_t, uint32_t * ) = 0;
+    virtual void RemoveSection( const char *, uint32_t * ) = 0;
+    virtual void RemoveKeyInSection( const char *, const char *, uint32_t * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSettings_IVRSettings_003_GetSettingsErrorNameFromEnum( struct cppIVRSettings_IVRSettings_003_GetSettingsErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetSettingsErrorNameFromEnum((vr::EVRSettingsError)params->eError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    params->_ret = iface->GetSettingsErrorNameFromEnum( params->eError );
 }
 
 void cppIVRSettings_IVRSettings_003_SetBool( struct cppIVRSettings_IVRSettings_003_SetBool_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetBool((const char *)params->pchSection, (const char *)params->pchSettingsKey, (bool)params->bValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    iface->SetBool( params->pchSection, params->pchSettingsKey, params->bValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_003_SetInt32( struct cppIVRSettings_IVRSettings_003_SetInt32_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetInt32((const char *)params->pchSection, (const char *)params->pchSettingsKey, (int32_t)params->nValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    iface->SetInt32( params->pchSection, params->pchSettingsKey, params->nValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_003_SetFloat( struct cppIVRSettings_IVRSettings_003_SetFloat_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetFloat((const char *)params->pchSection, (const char *)params->pchSettingsKey, (float)params->flValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    iface->SetFloat( params->pchSection, params->pchSettingsKey, params->flValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_003_SetString( struct cppIVRSettings_IVRSettings_003_SetString_params *params )
 {
-    ((IVRSettings*)params->linux_side)->SetString((const char *)params->pchSection, (const char *)params->pchSettingsKey, (const char *)params->pchValue, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    iface->SetString( params->pchSection, params->pchSettingsKey, params->pchValue, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_003_GetBool( struct cppIVRSettings_IVRSettings_003_GetBool_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetBool((const char *)params->pchSection, (const char *)params->pchSettingsKey, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    params->_ret = iface->GetBool( params->pchSection, params->pchSettingsKey, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_003_GetInt32( struct cppIVRSettings_IVRSettings_003_GetInt32_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetInt32((const char *)params->pchSection, (const char *)params->pchSettingsKey, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    params->_ret = iface->GetInt32( params->pchSection, params->pchSettingsKey, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_003_GetFloat( struct cppIVRSettings_IVRSettings_003_GetFloat_params *params )
 {
-    params->_ret = ((IVRSettings*)params->linux_side)->GetFloat((const char *)params->pchSection, (const char *)params->pchSettingsKey, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    params->_ret = iface->GetFloat( params->pchSection, params->pchSettingsKey, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_003_GetString( struct cppIVRSettings_IVRSettings_003_GetString_params *params )
 {
-    ((IVRSettings*)params->linux_side)->GetString((const char *)params->pchSection, (const char *)params->pchSettingsKey, (char *)params->pchValue, (uint32_t)params->unValueLen, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    iface->GetString( params->pchSection, params->pchSettingsKey, params->pchValue, params->unValueLen, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_003_RemoveSection( struct cppIVRSettings_IVRSettings_003_RemoveSection_params *params )
 {
-    ((IVRSettings*)params->linux_side)->RemoveSection((const char *)params->pchSection, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    iface->RemoveSection( params->pchSection, params->peError );
 }
 
 void cppIVRSettings_IVRSettings_003_RemoveKeyInSection( struct cppIVRSettings_IVRSettings_003_RemoveKeyInSection_params *params )
 {
-    ((IVRSettings*)params->linux_side)->RemoveKeyInSection((const char *)params->pchSection, (const char *)params->pchSettingsKey, (vr::EVRSettingsError *)params->peError);
+    struct cppIVRSettings_IVRSettings_003 *iface = (struct cppIVRSettings_IVRSettings_003 *)params->linux_side;
+    iface->RemoveKeyInSection( params->pchSection, params->pchSettingsKey, params->peError );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.h b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.h
index 8d7ffdcb..b5e2dcc6 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSettings_IVRSettings_003.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSettings_IVRSettings_003;
 struct cppIVRSettings_IVRSettings_003_GetSettingsErrorNameFromEnum_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp
index 71da657d..0b03368d 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.cpp
@@ -9,204 +9,287 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_003
+{
+#ifdef __cplusplus
+    virtual void GetWindowBounds( int32_t *, int32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual void GetEyeOutputViewport( uint32_t, uint32_t *, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float, uint32_t ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual DistortionCoordinates_t ComputeDistortion( uint32_t, float, float ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t *, int32_t * ) = 0;
+    virtual bool AttachToWindow( void * ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual bool LoadRenderModel( const char *, RenderModel_t * ) = 0;
+    virtual void FreeRenderModel( RenderModel_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t * ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t * ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool HandleControllerOverlayInteractionAsMouse( const Compositor_OverlaySettings *, HmdVector2_t, HmdVector2_t, uint32_t, uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_003_GetWindowBounds( struct cppIVRSystem_IVRSystem_003_GetWindowBounds_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetWindowBounds((int32_t *)params->pnX, (int32_t *)params->pnY, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    iface->GetWindowBounds( params->pnX, params->pnY, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_003_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_003_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_003_GetEyeOutputViewport( struct cppIVRSystem_IVRSystem_003_GetEyeOutputViewport_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetEyeOutputViewport((vr::Hmd_Eye)params->eEye, (uint32_t *)params->pnX, (uint32_t *)params->pnY, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    iface->GetEyeOutputViewport( params->eEye, params->pnX, params->pnY, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_003_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_003_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::Hmd_Eye)params->eEye, (float)params->fNearZ, (float)params->fFarZ, (vr::GraphicsAPIConvention)params->eProjType);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ, params->eProjType );
 }
 
 void cppIVRSystem_IVRSystem_003_GetProjectionRaw( struct cppIVRSystem_IVRSystem_003_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::Hmd_Eye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_003_ComputeDistortion( struct cppIVRSystem_IVRSystem_003_ComputeDistortion_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::Hmd_Eye)params->eEye, (float)params->fU, (float)params->fV);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    *params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV );
 }
 
 void cppIVRSystem_IVRSystem_003_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_003_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::Hmd_Eye)params->eEye);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_003_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_003_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_003_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_003_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_003_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_003_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex, (int32_t *)params->pnAdapterOutputIndex);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex, params->pnAdapterOutputIndex );
 }
 
 void cppIVRSystem_IVRSystem_003_AttachToWindow( struct cppIVRSystem_IVRSystem_003_AttachToWindow_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->AttachToWindow((void *)params->hWnd);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->AttachToWindow( params->hWnd );
 }
 
 void cppIVRSystem_IVRSystem_003_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_003_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::TrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_003_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_003_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_003_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_003_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_003_LoadRenderModel( struct cppIVRSystem_IVRSystem_003_LoadRenderModel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->LoadRenderModel((const char *)params->pchRenderModelName, struct_RenderModel_t_091_unwrap( params->pRenderModel ));
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->LoadRenderModel( params->pchRenderModelName, struct_RenderModel_t_091_unwrap( params->pRenderModel ) );
 }
 
 void cppIVRSystem_IVRSystem_003_FreeRenderModel( struct cppIVRSystem_IVRSystem_003_FreeRenderModel_params *params )
 {
-    ((IVRSystem*)params->linux_side)->FreeRenderModel(struct_RenderModel_t_091_unwrap( params->pRenderModel ));
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    iface->FreeRenderModel( struct_RenderModel_t_091_unwrap( params->pRenderModel ) );
 }
 
 void cppIVRSystem_IVRSystem_003_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_003_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_003_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_003_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_003_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_003_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_003_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_003_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_003_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_003_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_003_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_003_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_003_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_003_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_003_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_003_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_003_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_003_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::TrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_003_PollNextEvent( struct cppIVRSystem_IVRSystem_003_PollNextEvent_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent((vr::VREvent_t *)params->pEvent);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->PollNextEvent( params->pEvent );
 }
 
 void cppIVRSystem_IVRSystem_003_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_003_PollNextEventWithPose_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)params->eOrigin, (vr::VREvent_t *)params->pEvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
 }
 
 void cppIVRSystem_IVRSystem_003_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_003_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_003_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_003_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::Hmd_Eye)params->eEye);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_003_GetControllerState( struct cppIVRSystem_IVRSystem_003_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_091_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr );
     if (params->pControllerState)
         struct_VRControllerState001_t_091_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_003_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_003_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_091_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::TrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_091_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_003_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_003_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_003_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_003_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_003_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_003_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_003_HandleControllerOverlayInteractionAsMouse( struct cppIVRSystem_IVRSystem_003_HandleControllerOverlayInteractionAsMouse_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->HandleControllerOverlayInteractionAsMouse(*params->overlaySettings, (vr::HmdVector2_t)params->vecWindowClientPositionOnScreen, (vr::HmdVector2_t)params->vecWindowClientSize, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (vr::EVRControllerEventOutputType)params->eOutputType);
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->HandleControllerOverlayInteractionAsMouse( params->overlaySettings, params->vecWindowClientPositionOnScreen, params->vecWindowClientSize, params->unControllerDeviceIndex, params->eOutputType );
 }
 
 void cppIVRSystem_IVRSystem_003_CaptureInputFocus( struct cppIVRSystem_IVRSystem_003_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_003_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_003_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_003_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_003_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_003 *iface = (struct cppIVRSystem_IVRSystem_003 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h
index 455ecb56..5698db53 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_003.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_003;
 struct cppIVRSystem_IVRSystem_003_GetWindowBounds_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp
index c412a72a..15bc0077 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.cpp
@@ -9,194 +9,273 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_004
+{
+#ifdef __cplusplus
+    virtual void GetWindowBounds( int32_t *, int32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual void GetEyeOutputViewport( uint32_t, uint32_t *, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float, uint32_t ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual DistortionCoordinates_t ComputeDistortion( uint32_t, float, float ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t *, int32_t * ) = 0;
+    virtual bool AttachToWindow( void * ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t * ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t * ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_004_GetWindowBounds( struct cppIVRSystem_IVRSystem_004_GetWindowBounds_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetWindowBounds((int32_t *)params->pnX, (int32_t *)params->pnY, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    iface->GetWindowBounds( params->pnX, params->pnY, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_004_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_004_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_004_GetEyeOutputViewport( struct cppIVRSystem_IVRSystem_004_GetEyeOutputViewport_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetEyeOutputViewport((vr::Hmd_Eye)params->eEye, (uint32_t *)params->pnX, (uint32_t *)params->pnY, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    iface->GetEyeOutputViewport( params->eEye, params->pnX, params->pnY, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_004_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_004_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::Hmd_Eye)params->eEye, (float)params->fNearZ, (float)params->fFarZ, (vr::GraphicsAPIConvention)params->eProjType);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ, params->eProjType );
 }
 
 void cppIVRSystem_IVRSystem_004_GetProjectionRaw( struct cppIVRSystem_IVRSystem_004_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::Hmd_Eye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_004_ComputeDistortion( struct cppIVRSystem_IVRSystem_004_ComputeDistortion_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::Hmd_Eye)params->eEye, (float)params->fU, (float)params->fV);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    *params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV );
 }
 
 void cppIVRSystem_IVRSystem_004_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_004_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::Hmd_Eye)params->eEye);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_004_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_004_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_004_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_004_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_004_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_004_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex, (int32_t *)params->pnAdapterOutputIndex);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex, params->pnAdapterOutputIndex );
 }
 
 void cppIVRSystem_IVRSystem_004_AttachToWindow( struct cppIVRSystem_IVRSystem_004_AttachToWindow_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->AttachToWindow((void *)params->hWnd);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->AttachToWindow( params->hWnd );
 }
 
 void cppIVRSystem_IVRSystem_004_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_004_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::TrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_004_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_004_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_004_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_004_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_004_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_004_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_004_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_004_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_004_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_004_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_004_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_004_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_004_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_004_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_004_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_004_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_004_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_004_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_004_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_004_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_004_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_004_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::TrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_004_PollNextEvent( struct cppIVRSystem_IVRSystem_004_PollNextEvent_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent((vr::VREvent_t *)params->pEvent);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->PollNextEvent( params->pEvent );
 }
 
 void cppIVRSystem_IVRSystem_004_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_004_PollNextEventWithPose_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)params->eOrigin, (vr::VREvent_t *)params->pEvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
 }
 
 void cppIVRSystem_IVRSystem_004_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_004_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_004_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_004_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::Hmd_Eye)params->eEye);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_004_GetControllerState( struct cppIVRSystem_IVRSystem_004_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_092_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr );
     if (params->pControllerState)
         struct_VRControllerState001_t_092_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_004_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_004_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_092_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::TrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_092_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_004_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_004_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_004_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_004_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_004_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_004_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_004_CaptureInputFocus( struct cppIVRSystem_IVRSystem_004_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_004_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_004_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_004_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_004_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_004_DriverDebugRequest( struct cppIVRSystem_IVRSystem_004_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_004 *iface = (struct cppIVRSystem_IVRSystem_004 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h
index c352cf24..415af0fa 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_004.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_004;
 struct cppIVRSystem_IVRSystem_004_GetWindowBounds_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp
index 82ab9dcb..a93c59c9 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.cpp
@@ -9,199 +9,280 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_005
+{
+#ifdef __cplusplus
+    virtual void GetWindowBounds( int32_t *, int32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual void GetEyeOutputViewport( uint32_t, uint32_t *, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float, uint32_t ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual DistortionCoordinates_t ComputeDistortion( uint32_t, float, float ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t *, int32_t * ) = 0;
+    virtual bool AttachToWindow( void * ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t * ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t * ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_005_GetWindowBounds( struct cppIVRSystem_IVRSystem_005_GetWindowBounds_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetWindowBounds((int32_t *)params->pnX, (int32_t *)params->pnY, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    iface->GetWindowBounds( params->pnX, params->pnY, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_005_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_005_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_005_GetEyeOutputViewport( struct cppIVRSystem_IVRSystem_005_GetEyeOutputViewport_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetEyeOutputViewport((vr::Hmd_Eye)params->eEye, (uint32_t *)params->pnX, (uint32_t *)params->pnY, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    iface->GetEyeOutputViewport( params->eEye, params->pnX, params->pnY, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_005_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_005_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::Hmd_Eye)params->eEye, (float)params->fNearZ, (float)params->fFarZ, (vr::GraphicsAPIConvention)params->eProjType);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ, params->eProjType );
 }
 
 void cppIVRSystem_IVRSystem_005_GetProjectionRaw( struct cppIVRSystem_IVRSystem_005_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::Hmd_Eye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_005_ComputeDistortion( struct cppIVRSystem_IVRSystem_005_ComputeDistortion_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::Hmd_Eye)params->eEye, (float)params->fU, (float)params->fV);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    *params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV );
 }
 
 void cppIVRSystem_IVRSystem_005_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_005_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::Hmd_Eye)params->eEye);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_005_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_005_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_005_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_005_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_005_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_005_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex, (int32_t *)params->pnAdapterOutputIndex);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex, params->pnAdapterOutputIndex );
 }
 
 void cppIVRSystem_IVRSystem_005_AttachToWindow( struct cppIVRSystem_IVRSystem_005_AttachToWindow_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->AttachToWindow((void *)params->hWnd);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->AttachToWindow( params->hWnd );
 }
 
 void cppIVRSystem_IVRSystem_005_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_005_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::TrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_005_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_005_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_005_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_005_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_005_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_005_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::TrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_005_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_005_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_005_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_005_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_005_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_005_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_005_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_005_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_005_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_005_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_005_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_005_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_005_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_005_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_005_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_005_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_005_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_005_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::TrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_005_PollNextEvent( struct cppIVRSystem_IVRSystem_005_PollNextEvent_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent((vr::VREvent_t *)params->pEvent);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->PollNextEvent( params->pEvent );
 }
 
 void cppIVRSystem_IVRSystem_005_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_005_PollNextEventWithPose_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)params->eOrigin, (vr::VREvent_t *)params->pEvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
 }
 
 void cppIVRSystem_IVRSystem_005_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_005_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_005_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_005_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::Hmd_Eye)params->eEye);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_005_GetControllerState( struct cppIVRSystem_IVRSystem_005_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_098_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr );
     if (params->pControllerState)
         struct_VRControllerState001_t_098_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_005_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_005_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_098_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::TrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_098_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_005_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_005_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_005_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_005_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_005_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_005_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_005_CaptureInputFocus( struct cppIVRSystem_IVRSystem_005_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_005_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_005_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_005_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_005_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_005_DriverDebugRequest( struct cppIVRSystem_IVRSystem_005_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_005 *iface = (struct cppIVRSystem_IVRSystem_005 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h
index 04e58c22..53938d7b 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_005.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_005;
 struct cppIVRSystem_IVRSystem_005_GetWindowBounds_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp
index 82dab55c..84f7e58f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.cpp
@@ -9,224 +9,315 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_006
+{
+#ifdef __cplusplus
+    virtual void GetWindowBounds( int32_t *, int32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual void GetEyeOutputViewport( uint32_t, uint32_t *, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float, uint32_t ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual DistortionCoordinates_t ComputeDistortion( uint32_t, float, float ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t *, int32_t * ) = 0;
+    virtual bool AttachToWindow( void * ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t * ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t * ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_006_GetWindowBounds( struct cppIVRSystem_IVRSystem_006_GetWindowBounds_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetWindowBounds((int32_t *)params->pnX, (int32_t *)params->pnY, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    iface->GetWindowBounds( params->pnX, params->pnY, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_006_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_006_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_006_GetEyeOutputViewport( struct cppIVRSystem_IVRSystem_006_GetEyeOutputViewport_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetEyeOutputViewport((vr::Hmd_Eye)params->eEye, (uint32_t *)params->pnX, (uint32_t *)params->pnY, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    iface->GetEyeOutputViewport( params->eEye, params->pnX, params->pnY, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_006_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_006_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::Hmd_Eye)params->eEye, (float)params->fNearZ, (float)params->fFarZ, (vr::GraphicsAPIConvention)params->eProjType);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ, params->eProjType );
 }
 
 void cppIVRSystem_IVRSystem_006_GetProjectionRaw( struct cppIVRSystem_IVRSystem_006_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::Hmd_Eye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_006_ComputeDistortion( struct cppIVRSystem_IVRSystem_006_ComputeDistortion_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::Hmd_Eye)params->eEye, (float)params->fU, (float)params->fV);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    *params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV );
 }
 
 void cppIVRSystem_IVRSystem_006_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_006_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::Hmd_Eye)params->eEye);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_006_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_006_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_006_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_006_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_006_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_006_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex, (int32_t *)params->pnAdapterOutputIndex);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex, params->pnAdapterOutputIndex );
 }
 
 void cppIVRSystem_IVRSystem_006_AttachToWindow( struct cppIVRSystem_IVRSystem_006_AttachToWindow_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->AttachToWindow((void *)params->hWnd);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->AttachToWindow( params->hWnd );
 }
 
 void cppIVRSystem_IVRSystem_006_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_006_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::TrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_006_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_006_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_006_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_006_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_006_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_006_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_006_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_006_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::TrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_006_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_006_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_006_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_006_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_006_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_006_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_006_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_006_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_006_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_006_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_006_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_006_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_006_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_006_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_006_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_006_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_006_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_006_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::TrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::TrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_006_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_006_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::TrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_006_PollNextEvent( struct cppIVRSystem_IVRSystem_006_PollNextEvent_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent((vr::VREvent_t *)params->pEvent);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->PollNextEvent( params->pEvent );
 }
 
 void cppIVRSystem_IVRSystem_006_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_006_PollNextEventWithPose_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::TrackingUniverseOrigin)params->eOrigin, (vr::VREvent_t *)params->pEvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
 }
 
 void cppIVRSystem_IVRSystem_006_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_006_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_006_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_006_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::Hmd_Eye)params->eEye);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_006_GetControllerState( struct cppIVRSystem_IVRSystem_006_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_0910_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr );
     if (params->pControllerState)
         struct_VRControllerState001_t_0910_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_006_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_006_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_0910_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::TrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_0910_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_006_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_006_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_006_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_006_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_006_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_006_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_006_CaptureInputFocus( struct cppIVRSystem_IVRSystem_006_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_006_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_006_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_006_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_006_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_006_DriverDebugRequest( struct cppIVRSystem_IVRSystem_006_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_006_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_006_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_006_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_006_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_006_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_006_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_006 *iface = (struct cppIVRSystem_IVRSystem_006 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h
index 1b215794..2c5382d1 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_006.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_006;
 struct cppIVRSystem_IVRSystem_006_GetWindowBounds_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp
index 41e24b4b..38b1b914 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.cpp
@@ -9,224 +9,315 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_009
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float, uint32_t ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual DistortionCoordinates_t ComputeDistortion( uint32_t, float, float ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t * ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t * ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual void AcknowledgeQuit_UserPrompt(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_009_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_009_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_009_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_009_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ, (vr::EGraphicsAPIConvention)params->eProjType);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ, params->eProjType );
 }
 
 void cppIVRSystem_IVRSystem_009_GetProjectionRaw( struct cppIVRSystem_IVRSystem_009_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_009_ComputeDistortion( struct cppIVRSystem_IVRSystem_009_ComputeDistortion_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    *params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV );
 }
 
 void cppIVRSystem_IVRSystem_009_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_009_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_009_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_009_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_009_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_009_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_009_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_009_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_009_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_009_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_009_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_009_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_009_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_009_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_009_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_009_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_009_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_009_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_009_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_009_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_009_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_009_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_009_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_009_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_009_ApplyTransform( struct cppIVRSystem_IVRSystem_009_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_009_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_009_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_009_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_009_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_009_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_009_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_009_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_009_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_009_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_009_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_009_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_009_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_009_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_009_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_009_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_009_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_009_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_009_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_009_PollNextEvent( struct cppIVRSystem_IVRSystem_009_PollNextEvent_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent((vr::VREvent_t *)params->pEvent);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->PollNextEvent( params->pEvent );
 }
 
 void cppIVRSystem_IVRSystem_009_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_009_PollNextEventWithPose_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::VREvent_t *)params->pEvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
 }
 
 void cppIVRSystem_IVRSystem_009_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_009_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_009_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_009_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_009_GetControllerState( struct cppIVRSystem_IVRSystem_009_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_0912_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr );
     if (params->pControllerState)
         struct_VRControllerState001_t_0912_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_009_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_009_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_0912_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_0912_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_009_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_009_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_009_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_009_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_009_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_009_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_009_CaptureInputFocus( struct cppIVRSystem_IVRSystem_009_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_009_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_009_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_009_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_009_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_009_DriverDebugRequest( struct cppIVRSystem_IVRSystem_009_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_009_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_009_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_009_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_009_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_009_AcknowledgeQuit_UserPrompt( struct cppIVRSystem_IVRSystem_009_AcknowledgeQuit_UserPrompt_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_UserPrompt();
+    struct cppIVRSystem_IVRSystem_009 *iface = (struct cppIVRSystem_IVRSystem_009 *)params->linux_side;
+    iface->AcknowledgeQuit_UserPrompt(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h
index c68643fb..8dda4d98 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_009.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_009;
 struct cppIVRSystem_IVRSystem_009_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp
index 4e5a2183..af8e8c7f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.cpp
@@ -9,244 +9,343 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_010
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float, uint32_t ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual DistortionCoordinates_t ComputeDistortion( uint32_t, float, float ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t * ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t * ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual void AcknowledgeQuit_UserPrompt(  ) = 0;
+    virtual void PerformanceTestEnableCapture( bool ) = 0;
+    virtual void PerformanceTestReportFidelityLevelChange( int32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_010_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_010_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_010_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_010_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ, (vr::EGraphicsAPIConvention)params->eProjType);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ, params->eProjType );
 }
 
 void cppIVRSystem_IVRSystem_010_GetProjectionRaw( struct cppIVRSystem_IVRSystem_010_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_010_ComputeDistortion( struct cppIVRSystem_IVRSystem_010_ComputeDistortion_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    *params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV );
 }
 
 void cppIVRSystem_IVRSystem_010_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_010_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_010_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_010_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_010_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_010_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_010_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_010_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_010_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_010_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_010_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_010_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_010_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_010_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_010_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_010_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_010_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_010_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_010_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_010_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_010_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_010_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_010_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_010_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_010_ApplyTransform( struct cppIVRSystem_IVRSystem_010_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_010_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_010_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_010_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_010_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_010_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_010_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_010_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_010_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_010_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_010_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_010_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_010_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_010_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_010_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_010_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_010_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_010_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_010_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_010_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_010_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_010_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_010_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_010_PollNextEvent( struct cppIVRSystem_IVRSystem_010_PollNextEvent_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent((vr::VREvent_t *)params->pEvent);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->PollNextEvent( params->pEvent );
 }
 
 void cppIVRSystem_IVRSystem_010_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_010_PollNextEventWithPose_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::VREvent_t *)params->pEvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent, params->pTrackedDevicePose );
 }
 
 void cppIVRSystem_IVRSystem_010_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_010_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_010_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_010_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_010_GetControllerState( struct cppIVRSystem_IVRSystem_010_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_0914_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr );
     if (params->pControllerState)
         struct_VRControllerState001_t_0914_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_010_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_010_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_0914_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_0914_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_010_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_010_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_010_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_010_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_010_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_010_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_010_CaptureInputFocus( struct cppIVRSystem_IVRSystem_010_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_010_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_010_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_010_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_010_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_010_DriverDebugRequest( struct cppIVRSystem_IVRSystem_010_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_010_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_010_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_010_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_010_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_010_AcknowledgeQuit_UserPrompt( struct cppIVRSystem_IVRSystem_010_AcknowledgeQuit_UserPrompt_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_UserPrompt();
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->AcknowledgeQuit_UserPrompt(  );
 }
 
 void cppIVRSystem_IVRSystem_010_PerformanceTestEnableCapture( struct cppIVRSystem_IVRSystem_010_PerformanceTestEnableCapture_params *params )
 {
-    ((IVRSystem*)params->linux_side)->PerformanceTestEnableCapture((bool)params->bEnable);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->PerformanceTestEnableCapture( params->bEnable );
 }
 
 void cppIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange( struct cppIVRSystem_IVRSystem_010_PerformanceTestReportFidelityLevelChange_params *params )
 {
-    ((IVRSystem*)params->linux_side)->PerformanceTestReportFidelityLevelChange((int)params->nFidelityLevel);
+    struct cppIVRSystem_IVRSystem_010 *iface = (struct cppIVRSystem_IVRSystem_010 *)params->linux_side;
+    iface->PerformanceTestReportFidelityLevelChange( params->nFidelityLevel );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h
index 48b5323f..a66401c9 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_010.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_010;
 struct cppIVRSystem_IVRSystem_010_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp
index 34f7ad56..4f4cb48c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp
@@ -9,256 +9,355 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_011
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float, uint32_t ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual DistortionCoordinates_t ComputeDistortion( uint32_t, float, float ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t *, uint32_t ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t * ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual void AcknowledgeQuit_UserPrompt(  ) = 0;
+    virtual void PerformanceTestEnableCapture( bool ) = 0;
+    virtual void PerformanceTestReportFidelityLevelChange( int32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_011_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_011_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_011_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_011_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ, (vr::EGraphicsAPIConvention)params->eProjType);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ, params->eProjType );
 }
 
 void cppIVRSystem_IVRSystem_011_GetProjectionRaw( struct cppIVRSystem_IVRSystem_011_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_011_ComputeDistortion( struct cppIVRSystem_IVRSystem_011_ComputeDistortion_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    *params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV );
 }
 
 void cppIVRSystem_IVRSystem_011_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_011_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_011_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_011_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_011_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_011_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_011_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_011_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_011_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_011_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_011_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_011_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_011_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_011_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_011_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_011_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_011_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_011_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_011_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_011_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_011_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_011_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_011_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_011_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_011_ApplyTransform( struct cppIVRSystem_IVRSystem_011_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_011_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_011_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_011_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_011_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_011_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_011_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_011_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_011_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_011_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_011_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_011_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_011_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_011_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_011_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_011_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_011_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_011_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_011_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_011_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_011_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_011_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_011_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_011_PollNextEvent( struct cppIVRSystem_IVRSystem_011_PollNextEvent_params *params )
 {
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_0918_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent(params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_0918_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_011_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_011_PollNextEventWithPose_params *params )
 {
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_0918_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, params->pTrackedDevicePose );
     if (params->pEvent)
         struct_VREvent_t_0918_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_011_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_011_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_011_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_011_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_011_GetControllerState( struct cppIVRSystem_IVRSystem_011_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_0918_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr );
     if (params->pControllerState)
         struct_VRControllerState001_t_0918_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_011_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_011_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_0918_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_0918_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_011_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_011_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_011_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_011_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_011_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_011_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_011_CaptureInputFocus( struct cppIVRSystem_IVRSystem_011_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_011_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_011_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_011_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_011_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_011_DriverDebugRequest( struct cppIVRSystem_IVRSystem_011_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_011_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_011_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_011_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_011_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_011_AcknowledgeQuit_UserPrompt( struct cppIVRSystem_IVRSystem_011_AcknowledgeQuit_UserPrompt_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_UserPrompt();
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->AcknowledgeQuit_UserPrompt(  );
 }
 
 void cppIVRSystem_IVRSystem_011_PerformanceTestEnableCapture( struct cppIVRSystem_IVRSystem_011_PerformanceTestEnableCapture_params *params )
 {
-    ((IVRSystem*)params->linux_side)->PerformanceTestEnableCapture((bool)params->bEnable);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->PerformanceTestEnableCapture( params->bEnable );
 }
 
 void cppIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange( struct cppIVRSystem_IVRSystem_011_PerformanceTestReportFidelityLevelChange_params *params )
 {
-    ((IVRSystem*)params->linux_side)->PerformanceTestReportFidelityLevelChange((int)params->nFidelityLevel);
+    struct cppIVRSystem_IVRSystem_011 *iface = (struct cppIVRSystem_IVRSystem_011 *)params->linux_side;
+    iface->PerformanceTestReportFidelityLevelChange( params->nFidelityLevel );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h
index cf61e1fb..5c588629 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_011;
 struct cppIVRSystem_IVRSystem_011_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp
index a6809f79..e69af3bc 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp
@@ -9,246 +9,341 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_012
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float, uint32_t ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual DistortionCoordinates_t ComputeDistortion( uint32_t, float, float ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t *, uint32_t ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t * ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual void AcknowledgeQuit_UserPrompt(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_012_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_012_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_012_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_012_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ, (vr::EGraphicsAPIConvention)params->eProjType);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ, params->eProjType );
 }
 
 void cppIVRSystem_IVRSystem_012_GetProjectionRaw( struct cppIVRSystem_IVRSystem_012_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_012_ComputeDistortion( struct cppIVRSystem_IVRSystem_012_ComputeDistortion_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    *params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV );
 }
 
 void cppIVRSystem_IVRSystem_012_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_012_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_012_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_012_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_012_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_012_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_012_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_012_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_012_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_012_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_012_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_012_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_012_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_012_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_012_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_012_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_012_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_012_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_012_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_012_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_012_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_012_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_012_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_012_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_012_ApplyTransform( struct cppIVRSystem_IVRSystem_012_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_012_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_012_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_012_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_012_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_012_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_012_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_012_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_012_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_012_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_012_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_012_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_012_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_012_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_012_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_012_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_012_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_012_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_012_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_012_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_012_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_012_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_012_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_012_PollNextEvent( struct cppIVRSystem_IVRSystem_012_PollNextEvent_params *params )
 {
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_103_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent(params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_103_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_012_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_012_PollNextEventWithPose_params *params )
 {
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_103_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, params->pTrackedDevicePose );
     if (params->pEvent)
         struct_VREvent_t_103_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_012_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_012_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_012_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_012_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_012_GetControllerState( struct cppIVRSystem_IVRSystem_012_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_103_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr );
     if (params->pControllerState)
         struct_VRControllerState001_t_103_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_012_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_012_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_103_win_to_lin( params->pControllerState, &lin_pControllerState );
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_103_lin_to_win( &lin_pControllerState, params->pControllerState, -1 );
 }
 
 void cppIVRSystem_IVRSystem_012_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_012_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_012_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_012_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_012_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_012_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_012_CaptureInputFocus( struct cppIVRSystem_IVRSystem_012_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_012_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_012_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_012_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_012_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_012_DriverDebugRequest( struct cppIVRSystem_IVRSystem_012_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_012_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_012_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_012_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_012_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_012_AcknowledgeQuit_UserPrompt( struct cppIVRSystem_IVRSystem_012_AcknowledgeQuit_UserPrompt_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_UserPrompt();
+    struct cppIVRSystem_IVRSystem_012 *iface = (struct cppIVRSystem_IVRSystem_012 *)params->linux_side;
+    iface->AcknowledgeQuit_UserPrompt(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h
index 3d1333fd..f2e988a1 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_012;
 struct cppIVRSystem_IVRSystem_012_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp
index 3aa04985..547b2336 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp
@@ -9,248 +9,343 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_014
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float, uint32_t ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual bool ComputeDistortion( uint32_t, float, float, DistortionCoordinates_t * ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t *, uint32_t ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t, uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t *, uint32_t ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual void AcknowledgeQuit_UserPrompt(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_014_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_014_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_014_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_014_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ, (vr::EGraphicsAPIConvention)params->eProjType);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ, params->eProjType );
 }
 
 void cppIVRSystem_IVRSystem_014_GetProjectionRaw( struct cppIVRSystem_IVRSystem_014_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_014_ComputeDistortion( struct cppIVRSystem_IVRSystem_014_ComputeDistortion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV, (vr::DistortionCoordinates_t *)params->pDistortionCoordinates);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV, params->pDistortionCoordinates );
 }
 
 void cppIVRSystem_IVRSystem_014_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_014_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_014_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_014_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_014_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_014_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_014_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_014_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_014_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_014_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_014_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_014_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_014_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_014_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_014_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_014_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_014_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_014_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_014_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_014_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_014_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_014_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_014_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_014_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_014_ApplyTransform( struct cppIVRSystem_IVRSystem_014_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_014_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_014_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_014_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_014_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_014_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_014_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_014_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_014_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_014_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_014_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_014_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_014_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_014_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_014_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_014_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_014_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_014_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_014_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_014_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_014_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_014_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_014_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_014_PollNextEvent( struct cppIVRSystem_IVRSystem_014_PollNextEvent_params *params )
 {
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_104_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent(params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_104_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_014_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_014_PollNextEventWithPose_params *params )
 {
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_104_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, params->pTrackedDevicePose );
     if (params->pEvent)
         struct_VREvent_t_104_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_014_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_014_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_014_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_014_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye, (vr::EHiddenAreaMeshType)params->type);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye, params->type );
 }
 
 void cppIVRSystem_IVRSystem_014_GetControllerState( struct cppIVRSystem_IVRSystem_014_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_104_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize );
     if (params->pControllerState)
         struct_VRControllerState001_t_104_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_014_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_014_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_104_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_104_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_014_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_014_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_014_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_014_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_014_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_014_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_014_CaptureInputFocus( struct cppIVRSystem_IVRSystem_014_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_014_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_014_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_014_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_014_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_014_DriverDebugRequest( struct cppIVRSystem_IVRSystem_014_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_014_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_014_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_014_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_014_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_014_AcknowledgeQuit_UserPrompt( struct cppIVRSystem_IVRSystem_014_AcknowledgeQuit_UserPrompt_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_UserPrompt();
+    struct cppIVRSystem_IVRSystem_014 *iface = (struct cppIVRSystem_IVRSystem_014 *)params->linux_side;
+    iface->AcknowledgeQuit_UserPrompt(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h
index fd3be3ac..06e072bc 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_014;
 struct cppIVRSystem_IVRSystem_014_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp
index 19054031..00953ea2 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp
@@ -9,248 +9,343 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_015
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual bool ComputeDistortion( uint32_t, float, float, DistortionCoordinates_t * ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t *, uint32_t ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t, uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t *, uint32_t ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual void AcknowledgeQuit_UserPrompt(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_015_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_015_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_015_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_015_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ );
 }
 
 void cppIVRSystem_IVRSystem_015_GetProjectionRaw( struct cppIVRSystem_IVRSystem_015_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_015_ComputeDistortion( struct cppIVRSystem_IVRSystem_015_ComputeDistortion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV, (vr::DistortionCoordinates_t *)params->pDistortionCoordinates);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV, params->pDistortionCoordinates );
 }
 
 void cppIVRSystem_IVRSystem_015_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_015_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_015_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_015_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_015_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_015_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_015_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_015_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_015_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_015_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_015_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_015_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_015_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_015_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_015_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_015_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_015_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_015_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_015_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_015_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_015_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_015_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_015_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_015_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_015_ApplyTransform( struct cppIVRSystem_IVRSystem_015_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_015_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_015_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_015_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_015_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_015_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_015_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_015_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_015_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_015_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_015_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_015_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_015_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_015_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_015_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_015_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_015_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_015_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_015_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_015_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_015_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_015_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_015_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_015_PollNextEvent( struct cppIVRSystem_IVRSystem_015_PollNextEvent_params *params )
 {
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_107_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent(params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_107_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_015_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_015_PollNextEventWithPose_params *params )
 {
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_107_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, params->pTrackedDevicePose );
     if (params->pEvent)
         struct_VREvent_t_107_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_015_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_015_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_015_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_015_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye, (vr::EHiddenAreaMeshType)params->type);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye, params->type );
 }
 
 void cppIVRSystem_IVRSystem_015_GetControllerState( struct cppIVRSystem_IVRSystem_015_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_107_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize );
     if (params->pControllerState)
         struct_VRControllerState001_t_107_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_015_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_015_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_107_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_107_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_015_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_015_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_015_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_015_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_015_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_015_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_015_CaptureInputFocus( struct cppIVRSystem_IVRSystem_015_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_015_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_015_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_015_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_015_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_015_DriverDebugRequest( struct cppIVRSystem_IVRSystem_015_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_015_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_015_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_015_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_015_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_015_AcknowledgeQuit_UserPrompt( struct cppIVRSystem_IVRSystem_015_AcknowledgeQuit_UserPrompt_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_UserPrompt();
+    struct cppIVRSystem_IVRSystem_015 *iface = (struct cppIVRSystem_IVRSystem_015 *)params->linux_side;
+    iface->AcknowledgeQuit_UserPrompt(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h
index 0594287d..29f2b615 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_015;
 struct cppIVRSystem_IVRSystem_015_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp
index ae1d09cf..8c41fcdc 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp
@@ -9,253 +9,350 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_016
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual bool ComputeDistortion( uint32_t, float, float, DistortionCoordinates_t * ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual void GetOutputDevice( uint64_t *, uint32_t ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t *, uint32_t ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t, uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t *, uint32_t ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual void AcknowledgeQuit_UserPrompt(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_016_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_016_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_016_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_016_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ );
 }
 
 void cppIVRSystem_IVRSystem_016_GetProjectionRaw( struct cppIVRSystem_IVRSystem_016_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_016_ComputeDistortion( struct cppIVRSystem_IVRSystem_016_ComputeDistortion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV, (vr::DistortionCoordinates_t *)params->pDistortionCoordinates);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV, params->pDistortionCoordinates );
 }
 
 void cppIVRSystem_IVRSystem_016_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_016_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_016_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_016_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_016_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_016_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_016_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_016_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_016_GetOutputDevice( struct cppIVRSystem_IVRSystem_016_GetOutputDevice_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetOutputDevice((uint64_t *)params->pnDevice, (vr::ETextureType)params->textureType);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->GetOutputDevice( params->pnDevice, params->textureType );
 }
 
 void cppIVRSystem_IVRSystem_016_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_016_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_016_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_016_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_016_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_016_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_016_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_016_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_016_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_016_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_016_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_016_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_016_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_016_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_016_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_016_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_016_ApplyTransform( struct cppIVRSystem_IVRSystem_016_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_016_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_016_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_016_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_016_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_016_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_016_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_016_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_016_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_016_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_016_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_016_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_016_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_016_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_016_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_016_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_016_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_016_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_016_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_016_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_016_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_016_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_016_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_016_PollNextEvent( struct cppIVRSystem_IVRSystem_016_PollNextEvent_params *params )
 {
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_109_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent(params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_109_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_016_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_016_PollNextEventWithPose_params *params )
 {
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_109_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, params->pTrackedDevicePose );
     if (params->pEvent)
         struct_VREvent_t_109_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_016_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_016_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_016_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_016_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye, (vr::EHiddenAreaMeshType)params->type);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye, params->type );
 }
 
 void cppIVRSystem_IVRSystem_016_GetControllerState( struct cppIVRSystem_IVRSystem_016_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_109_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize );
     if (params->pControllerState)
         struct_VRControllerState001_t_109_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_016_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_016_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_109_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_109_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_016_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_016_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_016_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_016_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_016_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_016_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_016_CaptureInputFocus( struct cppIVRSystem_IVRSystem_016_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_016_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_016_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_016_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_016_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_016_DriverDebugRequest( struct cppIVRSystem_IVRSystem_016_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_016_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_016_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_016_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_016_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_016_AcknowledgeQuit_UserPrompt( struct cppIVRSystem_IVRSystem_016_AcknowledgeQuit_UserPrompt_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_UserPrompt();
+    struct cppIVRSystem_IVRSystem_016 *iface = (struct cppIVRSystem_IVRSystem_016 *)params->linux_side;
+    iface->AcknowledgeQuit_UserPrompt(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h
index 58e94a1b..bd6617cf 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_016;
 struct cppIVRSystem_IVRSystem_016_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp
index 520c41ef..ded6ef02 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp
@@ -9,253 +9,350 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_017
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual bool ComputeDistortion( uint32_t, float, float, DistortionCoordinates_t * ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual void GetOutputDevice( uint64_t *, uint32_t, VkInstance_T * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t *, uint32_t ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t, uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t *, uint32_t ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool CaptureInputFocus(  ) = 0;
+    virtual void ReleaseInputFocus(  ) = 0;
+    virtual bool IsInputFocusCapturedByAnotherProcess(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual void AcknowledgeQuit_UserPrompt(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_017_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_017_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_017_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_017_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ );
 }
 
 void cppIVRSystem_IVRSystem_017_GetProjectionRaw( struct cppIVRSystem_IVRSystem_017_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_017_ComputeDistortion( struct cppIVRSystem_IVRSystem_017_ComputeDistortion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV, (vr::DistortionCoordinates_t *)params->pDistortionCoordinates);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV, params->pDistortionCoordinates );
 }
 
 void cppIVRSystem_IVRSystem_017_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_017_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_017_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_017_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_017_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_017_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_017_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_017_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_017_GetOutputDevice( struct cppIVRSystem_IVRSystem_017_GetOutputDevice_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetOutputDevice((uint64_t *)params->pnDevice, (vr::ETextureType)params->textureType, (VkInstance_T *)params->pInstance);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->GetOutputDevice( params->pnDevice, params->textureType, params->pInstance );
 }
 
 void cppIVRSystem_IVRSystem_017_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_017_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_017_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_017_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_017_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_017_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_017_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_017_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_017_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_017_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_017_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_017_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_017_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_017_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_017_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_017_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_017_ApplyTransform( struct cppIVRSystem_IVRSystem_017_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_017_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_017_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_017_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_017_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_017_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_017_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_017_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_017_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_017_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_017_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_017_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_017_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_017_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_017_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_017_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_017_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_017_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_017_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_017_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_017_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_017_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_017_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_017_PollNextEvent( struct cppIVRSystem_IVRSystem_017_PollNextEvent_params *params )
 {
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1011_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent(params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1011_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_017_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_017_PollNextEventWithPose_params *params )
 {
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1011_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, params->pTrackedDevicePose );
     if (params->pEvent)
         struct_VREvent_t_1011_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_017_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_017_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_017_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_017_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye, (vr::EHiddenAreaMeshType)params->type);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye, params->type );
 }
 
 void cppIVRSystem_IVRSystem_017_GetControllerState( struct cppIVRSystem_IVRSystem_017_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1011_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize );
     if (params->pControllerState)
         struct_VRControllerState001_t_1011_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_017_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_017_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1011_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_1011_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_017_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_017_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_017_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_017_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_017_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_017_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_017_CaptureInputFocus( struct cppIVRSystem_IVRSystem_017_CaptureInputFocus_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->CaptureInputFocus();
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->CaptureInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_017_ReleaseInputFocus( struct cppIVRSystem_IVRSystem_017_ReleaseInputFocus_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ReleaseInputFocus();
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->ReleaseInputFocus(  );
 }
 
 void cppIVRSystem_IVRSystem_017_IsInputFocusCapturedByAnotherProcess( struct cppIVRSystem_IVRSystem_017_IsInputFocusCapturedByAnotherProcess_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputFocusCapturedByAnotherProcess();
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->IsInputFocusCapturedByAnotherProcess(  );
 }
 
 void cppIVRSystem_IVRSystem_017_DriverDebugRequest( struct cppIVRSystem_IVRSystem_017_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_017_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_017_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_017_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_017_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_017_AcknowledgeQuit_UserPrompt( struct cppIVRSystem_IVRSystem_017_AcknowledgeQuit_UserPrompt_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_UserPrompt();
+    struct cppIVRSystem_IVRSystem_017 *iface = (struct cppIVRSystem_IVRSystem_017 *)params->linux_side;
+    iface->AcknowledgeQuit_UserPrompt(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h
index ff896253..234e55fb 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_017;
 struct cppIVRSystem_IVRSystem_017_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp
index b51b6d62..492e8d13 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp
@@ -9,263 +9,364 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_019
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual bool ComputeDistortion( uint32_t, float, float, DistortionCoordinates_t * ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual void GetOutputDevice( uint64_t *, uint32_t, VkInstance_T * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetArrayTrackedDeviceProperty( uint32_t, uint32_t, uint32_t, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t *, uint32_t ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t, uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t *, uint32_t ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool IsInputAvailable(  ) = 0;
+    virtual bool IsSteamVRDrawingControllers(  ) = 0;
+    virtual bool ShouldApplicationPause(  ) = 0;
+    virtual bool ShouldApplicationReduceRenderingWork(  ) = 0;
+    virtual uint32_t DriverDebugRequest( uint32_t, const char *, char *, uint32_t ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual void AcknowledgeQuit_UserPrompt(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_019_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_019_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_019_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_019_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ );
 }
 
 void cppIVRSystem_IVRSystem_019_GetProjectionRaw( struct cppIVRSystem_IVRSystem_019_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_019_ComputeDistortion( struct cppIVRSystem_IVRSystem_019_ComputeDistortion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV, (vr::DistortionCoordinates_t *)params->pDistortionCoordinates);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV, params->pDistortionCoordinates );
 }
 
 void cppIVRSystem_IVRSystem_019_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_019_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_019_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_019_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_019_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_019_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_019_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_019_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_019_GetOutputDevice( struct cppIVRSystem_IVRSystem_019_GetOutputDevice_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetOutputDevice((uint64_t *)params->pnDevice, (vr::ETextureType)params->textureType, (VkInstance_T *)params->pInstance);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    iface->GetOutputDevice( params->pnDevice, params->textureType, params->pInstance );
 }
 
 void cppIVRSystem_IVRSystem_019_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_019_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_019_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_019_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_019_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_019_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_019_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_019_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_019_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_019_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_019_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_019_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_019_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_019_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_019_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_019_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_019_ApplyTransform( struct cppIVRSystem_IVRSystem_019_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_019_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_019_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_019_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_019_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_019_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_019_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_019_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_019_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_019_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_019_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_019_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_019_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_019_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_019_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_019_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_019_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_019_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_019_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_019_GetArrayTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_019_GetArrayTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetArrayTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::PropertyTypeTag_t)params->propType, (void *)params->pBuffer, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetArrayTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->propType, params->pBuffer, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_019_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_019_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_019_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_019_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_019_PollNextEvent( struct cppIVRSystem_IVRSystem_019_PollNextEvent_params *params )
 {
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1418_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent(params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1418_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_019_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_019_PollNextEventWithPose_params *params )
 {
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1418_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, params->pTrackedDevicePose );
     if (params->pEvent)
         struct_VREvent_t_1418_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_019_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_019_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_019_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_019_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye, (vr::EHiddenAreaMeshType)params->type);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye, params->type );
 }
 
 void cppIVRSystem_IVRSystem_019_GetControllerState( struct cppIVRSystem_IVRSystem_019_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1418_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize );
     if (params->pControllerState)
         struct_VRControllerState001_t_1418_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_019_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_019_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1418_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_1418_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_019_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_019_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_019_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_019_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_019_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_019_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_019_IsInputAvailable( struct cppIVRSystem_IVRSystem_019_IsInputAvailable_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputAvailable();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->IsInputAvailable(  );
 }
 
 void cppIVRSystem_IVRSystem_019_IsSteamVRDrawingControllers( struct cppIVRSystem_IVRSystem_019_IsSteamVRDrawingControllers_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsSteamVRDrawingControllers();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->IsSteamVRDrawingControllers(  );
 }
 
 void cppIVRSystem_IVRSystem_019_ShouldApplicationPause( struct cppIVRSystem_IVRSystem_019_ShouldApplicationPause_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ShouldApplicationPause();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->ShouldApplicationPause(  );
 }
 
 void cppIVRSystem_IVRSystem_019_ShouldApplicationReduceRenderingWork( struct cppIVRSystem_IVRSystem_019_ShouldApplicationReduceRenderingWork_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ShouldApplicationReduceRenderingWork();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->ShouldApplicationReduceRenderingWork(  );
 }
 
 void cppIVRSystem_IVRSystem_019_DriverDebugRequest( struct cppIVRSystem_IVRSystem_019_DriverDebugRequest_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->DriverDebugRequest((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (const char *)params->pchRequest, (char *)params->pchResponseBuffer, (uint32_t)params->unResponseBufferSize);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->DriverDebugRequest( params->unDeviceIndex, params->pchRequest, params->pchResponseBuffer, params->unResponseBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_019_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_019_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_019_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_019_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_019_AcknowledgeQuit_UserPrompt( struct cppIVRSystem_IVRSystem_019_AcknowledgeQuit_UserPrompt_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_UserPrompt();
+    struct cppIVRSystem_IVRSystem_019 *iface = (struct cppIVRSystem_IVRSystem_019 *)params->linux_side;
+    iface->AcknowledgeQuit_UserPrompt(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h
index 9be5fdac..9ece91f3 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_019;
 struct cppIVRSystem_IVRSystem_019_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp
index e6c3f741..47163941 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp
@@ -9,268 +9,371 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_020
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual bool ComputeDistortion( uint32_t, float, float, DistortionCoordinates_t * ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual void GetOutputDevice( uint64_t *, uint32_t, VkInstance_T * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetArrayTrackedDeviceProperty( uint32_t, uint32_t, uint32_t, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t *, uint32_t ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t, uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t *, uint32_t ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool IsInputAvailable(  ) = 0;
+    virtual bool IsSteamVRDrawingControllers(  ) = 0;
+    virtual bool ShouldApplicationPause(  ) = 0;
+    virtual bool ShouldApplicationReduceRenderingWork(  ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual void AcknowledgeQuit_UserPrompt(  ) = 0;
+    virtual uint32_t GetAppContainerFilePaths( char *, uint32_t ) = 0;
+    virtual const char * GetRuntimeVersion(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_020_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_020_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_020_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_020_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ );
 }
 
 void cppIVRSystem_IVRSystem_020_GetProjectionRaw( struct cppIVRSystem_IVRSystem_020_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_020_ComputeDistortion( struct cppIVRSystem_IVRSystem_020_ComputeDistortion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV, (vr::DistortionCoordinates_t *)params->pDistortionCoordinates);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV, params->pDistortionCoordinates );
 }
 
 void cppIVRSystem_IVRSystem_020_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_020_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_020_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_020_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_020_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_020_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_020_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_020_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_020_GetOutputDevice( struct cppIVRSystem_IVRSystem_020_GetOutputDevice_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetOutputDevice((uint64_t *)params->pnDevice, (vr::ETextureType)params->textureType, (VkInstance_T *)params->pInstance);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    iface->GetOutputDevice( params->pnDevice, params->textureType, params->pInstance );
 }
 
 void cppIVRSystem_IVRSystem_020_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_020_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_020_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_020_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_020_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_020_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_020_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_020_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_020_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_020_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_020_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_020_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_020_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_020_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_020_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_020_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_020_ApplyTransform( struct cppIVRSystem_IVRSystem_020_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_020_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_020_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_020_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_020_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_020_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_020_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_020_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_020_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_020_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_020_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_020_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_020_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_020_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_020_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_020_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_020_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_020_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_020_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_020_GetArrayTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_020_GetArrayTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetArrayTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::PropertyTypeTag_t)params->propType, (void *)params->pBuffer, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetArrayTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->propType, params->pBuffer, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_020_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_020_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_020_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_020_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_020_PollNextEvent( struct cppIVRSystem_IVRSystem_020_PollNextEvent_params *params )
 {
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1715_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent(params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1715_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_020_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_020_PollNextEventWithPose_params *params )
 {
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1715_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, params->pTrackedDevicePose );
     if (params->pEvent)
         struct_VREvent_t_1715_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_020_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_020_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_020_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_020_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye, (vr::EHiddenAreaMeshType)params->type);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye, params->type );
 }
 
 void cppIVRSystem_IVRSystem_020_GetControllerState( struct cppIVRSystem_IVRSystem_020_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1715_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize );
     if (params->pControllerState)
         struct_VRControllerState001_t_1715_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_020_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_020_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1715_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_1715_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_020_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_020_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_020_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_020_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_020_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_020_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_020_IsInputAvailable( struct cppIVRSystem_IVRSystem_020_IsInputAvailable_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputAvailable();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->IsInputAvailable(  );
 }
 
 void cppIVRSystem_IVRSystem_020_IsSteamVRDrawingControllers( struct cppIVRSystem_IVRSystem_020_IsSteamVRDrawingControllers_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsSteamVRDrawingControllers();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->IsSteamVRDrawingControllers(  );
 }
 
 void cppIVRSystem_IVRSystem_020_ShouldApplicationPause( struct cppIVRSystem_IVRSystem_020_ShouldApplicationPause_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ShouldApplicationPause();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->ShouldApplicationPause(  );
 }
 
 void cppIVRSystem_IVRSystem_020_ShouldApplicationReduceRenderingWork( struct cppIVRSystem_IVRSystem_020_ShouldApplicationReduceRenderingWork_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ShouldApplicationReduceRenderingWork();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->ShouldApplicationReduceRenderingWork(  );
 }
 
 void cppIVRSystem_IVRSystem_020_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_020_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_020_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_020_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_020_AcknowledgeQuit_UserPrompt( struct cppIVRSystem_IVRSystem_020_AcknowledgeQuit_UserPrompt_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_UserPrompt();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    iface->AcknowledgeQuit_UserPrompt(  );
 }
 
 void cppIVRSystem_IVRSystem_020_GetAppContainerFilePaths( struct cppIVRSystem_IVRSystem_020_GetAppContainerFilePaths_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetAppContainerFilePaths((char *)params->pchBuffer, (uint32_t)params->unBufferSize);
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetAppContainerFilePaths( params->pchBuffer, params->unBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_020_GetRuntimeVersion( struct cppIVRSystem_IVRSystem_020_GetRuntimeVersion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetRuntimeVersion();
+    struct cppIVRSystem_IVRSystem_020 *iface = (struct cppIVRSystem_IVRSystem_020 *)params->linux_side;
+    params->_ret = iface->GetRuntimeVersion(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h
index aadc666a..13d8508e 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_020;
 struct cppIVRSystem_IVRSystem_020_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp
index f4fe98f8..72bed60c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp
@@ -9,263 +9,364 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_021
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual bool ComputeDistortion( uint32_t, float, float, DistortionCoordinates_t * ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual void GetOutputDevice( uint64_t *, uint32_t, VkInstance_T * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual void ResetSeatedZeroPose(  ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetArrayTrackedDeviceProperty( uint32_t, uint32_t, uint32_t, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t *, uint32_t ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t, uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t *, uint32_t ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool IsInputAvailable(  ) = 0;
+    virtual bool IsSteamVRDrawingControllers(  ) = 0;
+    virtual bool ShouldApplicationPause(  ) = 0;
+    virtual bool ShouldApplicationReduceRenderingWork(  ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual uint32_t GetAppContainerFilePaths( char *, uint32_t ) = 0;
+    virtual const char * GetRuntimeVersion(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_021_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_021_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_021_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_021_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ );
 }
 
 void cppIVRSystem_IVRSystem_021_GetProjectionRaw( struct cppIVRSystem_IVRSystem_021_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_021_ComputeDistortion( struct cppIVRSystem_IVRSystem_021_ComputeDistortion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV, (vr::DistortionCoordinates_t *)params->pDistortionCoordinates);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV, params->pDistortionCoordinates );
 }
 
 void cppIVRSystem_IVRSystem_021_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_021_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_021_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_021_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_021_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_021_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_021_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_021_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_021_GetOutputDevice( struct cppIVRSystem_IVRSystem_021_GetOutputDevice_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetOutputDevice((uint64_t *)params->pnDevice, (vr::ETextureType)params->textureType, (VkInstance_T *)params->pInstance);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    iface->GetOutputDevice( params->pnDevice, params->textureType, params->pInstance );
 }
 
 void cppIVRSystem_IVRSystem_021_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_021_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_021_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_021_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_021_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_021_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_021_ResetSeatedZeroPose( struct cppIVRSystem_IVRSystem_021_ResetSeatedZeroPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ResetSeatedZeroPose();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    iface->ResetSeatedZeroPose(  );
 }
 
 void cppIVRSystem_IVRSystem_021_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_021_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_021_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_021_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_021_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_021_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_021_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_021_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_021_ApplyTransform( struct cppIVRSystem_IVRSystem_021_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_021_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_021_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_021_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_021_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_021_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_021_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_021_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_021_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_021_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_021_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_021_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_021_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_021_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_021_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_021_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_021_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_021_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_021_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_021_GetArrayTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_021_GetArrayTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetArrayTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::PropertyTypeTag_t)params->propType, (void *)params->pBuffer, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetArrayTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->propType, params->pBuffer, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_021_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_021_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_021_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_021_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_021_PollNextEvent( struct cppIVRSystem_IVRSystem_021_PollNextEvent_params *params )
 {
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1125_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent(params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1125_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_021_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_021_PollNextEventWithPose_params *params )
 {
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1125_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, params->pTrackedDevicePose );
     if (params->pEvent)
         struct_VREvent_t_1125_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_021_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_021_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_021_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_021_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye, (vr::EHiddenAreaMeshType)params->type);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye, params->type );
 }
 
 void cppIVRSystem_IVRSystem_021_GetControllerState( struct cppIVRSystem_IVRSystem_021_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1125_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize );
     if (params->pControllerState)
         struct_VRControllerState001_t_1125_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_021_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_021_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1125_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_1125_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_021_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_021_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_021_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_021_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_021_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_021_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_021_IsInputAvailable( struct cppIVRSystem_IVRSystem_021_IsInputAvailable_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputAvailable();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->IsInputAvailable(  );
 }
 
 void cppIVRSystem_IVRSystem_021_IsSteamVRDrawingControllers( struct cppIVRSystem_IVRSystem_021_IsSteamVRDrawingControllers_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsSteamVRDrawingControllers();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->IsSteamVRDrawingControllers(  );
 }
 
 void cppIVRSystem_IVRSystem_021_ShouldApplicationPause( struct cppIVRSystem_IVRSystem_021_ShouldApplicationPause_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ShouldApplicationPause();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->ShouldApplicationPause(  );
 }
 
 void cppIVRSystem_IVRSystem_021_ShouldApplicationReduceRenderingWork( struct cppIVRSystem_IVRSystem_021_ShouldApplicationReduceRenderingWork_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ShouldApplicationReduceRenderingWork();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->ShouldApplicationReduceRenderingWork(  );
 }
 
 void cppIVRSystem_IVRSystem_021_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_021_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_021_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_021_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_021_GetAppContainerFilePaths( struct cppIVRSystem_IVRSystem_021_GetAppContainerFilePaths_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetAppContainerFilePaths((char *)params->pchBuffer, (uint32_t)params->unBufferSize);
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetAppContainerFilePaths( params->pchBuffer, params->unBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_021_GetRuntimeVersion( struct cppIVRSystem_IVRSystem_021_GetRuntimeVersion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetRuntimeVersion();
+    struct cppIVRSystem_IVRSystem_021 *iface = (struct cppIVRSystem_IVRSystem_021 *)params->linux_side;
+    params->_ret = iface->GetRuntimeVersion(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h
index 7885af99..2b52e5fc 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_021;
 struct cppIVRSystem_IVRSystem_021_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp
index 643cc283..bac6a022 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp
@@ -9,258 +9,357 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRSystem_IVRSystem_022
+{
+#ifdef __cplusplus
+    virtual void GetRecommendedRenderTargetSize( uint32_t *, uint32_t * ) = 0;
+    virtual HmdMatrix44_t GetProjectionMatrix( uint32_t, float, float ) = 0;
+    virtual void GetProjectionRaw( uint32_t, float *, float *, float *, float * ) = 0;
+    virtual bool ComputeDistortion( uint32_t, float, float, DistortionCoordinates_t * ) = 0;
+    virtual HmdMatrix34_t GetEyeToHeadTransform( uint32_t ) = 0;
+    virtual bool GetTimeSinceLastVsync( float *, uint64_t * ) = 0;
+    virtual int32_t GetD3D9AdapterIndex(  ) = 0;
+    virtual void GetDXGIOutputInfo( int32_t * ) = 0;
+    virtual void GetOutputDevice( uint64_t *, uint32_t, VkInstance_T * ) = 0;
+    virtual bool IsDisplayOnDesktop(  ) = 0;
+    virtual bool SetDisplayVisibility( bool ) = 0;
+    virtual void GetDeviceToAbsoluteTrackingPose( uint32_t, float, TrackedDevicePose_t *, uint32_t ) = 0;
+    virtual HmdMatrix34_t GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual HmdMatrix34_t GetRawZeroPoseToStandingAbsoluteTrackingPose(  ) = 0;
+    virtual uint32_t GetSortedTrackedDeviceIndicesOfClass( uint32_t, uint32_t *, uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceActivityLevel( uint32_t ) = 0;
+    virtual void ApplyTransform( TrackedDevicePose_t *, const TrackedDevicePose_t *, const HmdMatrix34_t * ) = 0;
+    virtual uint32_t GetTrackedDeviceIndexForControllerRole( uint32_t ) = 0;
+    virtual uint32_t GetControllerRoleForTrackedDeviceIndex( uint32_t ) = 0;
+    virtual uint32_t GetTrackedDeviceClass( uint32_t ) = 0;
+    virtual bool IsTrackedDeviceConnected( uint32_t ) = 0;
+    virtual bool GetBoolTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual float GetFloatTrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual int32_t GetInt32TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint64_t GetUint64TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual HmdMatrix34_t GetMatrix34TrackedDeviceProperty( uint32_t, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetArrayTrackedDeviceProperty( uint32_t, uint32_t, uint32_t, void *, uint32_t, uint32_t * ) = 0;
+    virtual uint32_t GetStringTrackedDeviceProperty( uint32_t, uint32_t, char *, uint32_t, uint32_t * ) = 0;
+    virtual const char * GetPropErrorNameFromEnum( uint32_t ) = 0;
+    virtual bool PollNextEvent( VREvent_t *, uint32_t ) = 0;
+    virtual bool PollNextEventWithPose( uint32_t, VREvent_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual const char * GetEventTypeNameFromEnum( uint32_t ) = 0;
+    virtual HiddenAreaMesh_t GetHiddenAreaMesh( uint32_t, uint32_t ) = 0;
+    virtual bool GetControllerState( uint32_t, VRControllerState_t *, uint32_t ) = 0;
+    virtual bool GetControllerStateWithPose( uint32_t, uint32_t, VRControllerState_t *, uint32_t, TrackedDevicePose_t * ) = 0;
+    virtual void TriggerHapticPulse( uint32_t, uint32_t, uint16_t ) = 0;
+    virtual const char * GetButtonIdNameFromEnum( uint32_t ) = 0;
+    virtual const char * GetControllerAxisTypeNameFromEnum( uint32_t ) = 0;
+    virtual bool IsInputAvailable(  ) = 0;
+    virtual bool IsSteamVRDrawingControllers(  ) = 0;
+    virtual bool ShouldApplicationPause(  ) = 0;
+    virtual bool ShouldApplicationReduceRenderingWork(  ) = 0;
+    virtual uint32_t PerformFirmwareUpdate( uint32_t ) = 0;
+    virtual void AcknowledgeQuit_Exiting(  ) = 0;
+    virtual uint32_t GetAppContainerFilePaths( char *, uint32_t ) = 0;
+    virtual const char * GetRuntimeVersion(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRSystem_IVRSystem_022_GetRecommendedRenderTargetSize( struct cppIVRSystem_IVRSystem_022_GetRecommendedRenderTargetSize_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetRecommendedRenderTargetSize((uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    iface->GetRecommendedRenderTargetSize( params->pnWidth, params->pnHeight );
 }
 
 void cppIVRSystem_IVRSystem_022_GetProjectionMatrix( struct cppIVRSystem_IVRSystem_022_GetProjectionMatrix_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetProjectionMatrix((vr::EVREye)params->eEye, (float)params->fNearZ, (float)params->fFarZ);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    *params->_ret = iface->GetProjectionMatrix( params->eEye, params->fNearZ, params->fFarZ );
 }
 
 void cppIVRSystem_IVRSystem_022_GetProjectionRaw( struct cppIVRSystem_IVRSystem_022_GetProjectionRaw_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetProjectionRaw((vr::EVREye)params->eEye, (float *)params->pfLeft, (float *)params->pfRight, (float *)params->pfTop, (float *)params->pfBottom);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    iface->GetProjectionRaw( params->eEye, params->pfLeft, params->pfRight, params->pfTop, params->pfBottom );
 }
 
 void cppIVRSystem_IVRSystem_022_ComputeDistortion( struct cppIVRSystem_IVRSystem_022_ComputeDistortion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ComputeDistortion((vr::EVREye)params->eEye, (float)params->fU, (float)params->fV, (vr::DistortionCoordinates_t *)params->pDistortionCoordinates);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->ComputeDistortion( params->eEye, params->fU, params->fV, params->pDistortionCoordinates );
 }
 
 void cppIVRSystem_IVRSystem_022_GetEyeToHeadTransform( struct cppIVRSystem_IVRSystem_022_GetEyeToHeadTransform_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetEyeToHeadTransform((vr::EVREye)params->eEye);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    *params->_ret = iface->GetEyeToHeadTransform( params->eEye );
 }
 
 void cppIVRSystem_IVRSystem_022_GetTimeSinceLastVsync( struct cppIVRSystem_IVRSystem_022_GetTimeSinceLastVsync_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTimeSinceLastVsync((float *)params->pfSecondsSinceLastVsync, (uint64_t *)params->pulFrameCounter);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetTimeSinceLastVsync( params->pfSecondsSinceLastVsync, params->pulFrameCounter );
 }
 
 void cppIVRSystem_IVRSystem_022_GetD3D9AdapterIndex( struct cppIVRSystem_IVRSystem_022_GetD3D9AdapterIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetD3D9AdapterIndex();
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetD3D9AdapterIndex(  );
 }
 
 void cppIVRSystem_IVRSystem_022_GetDXGIOutputInfo( struct cppIVRSystem_IVRSystem_022_GetDXGIOutputInfo_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDXGIOutputInfo((int32_t *)params->pnAdapterIndex);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    iface->GetDXGIOutputInfo( params->pnAdapterIndex );
 }
 
 void cppIVRSystem_IVRSystem_022_GetOutputDevice( struct cppIVRSystem_IVRSystem_022_GetOutputDevice_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetOutputDevice((uint64_t *)params->pnDevice, (vr::ETextureType)params->textureType, (VkInstance_T *)params->pInstance);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    iface->GetOutputDevice( params->pnDevice, params->textureType, params->pInstance );
 }
 
 void cppIVRSystem_IVRSystem_022_IsDisplayOnDesktop( struct cppIVRSystem_IVRSystem_022_IsDisplayOnDesktop_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsDisplayOnDesktop();
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->IsDisplayOnDesktop(  );
 }
 
 void cppIVRSystem_IVRSystem_022_SetDisplayVisibility( struct cppIVRSystem_IVRSystem_022_SetDisplayVisibility_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->SetDisplayVisibility((bool)params->bIsVisibleOnDesktop);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->SetDisplayVisibility( params->bIsVisibleOnDesktop );
 }
 
 void cppIVRSystem_IVRSystem_022_GetDeviceToAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_022_GetDeviceToAbsoluteTrackingPose_params *params )
 {
-    ((IVRSystem*)params->linux_side)->GetDeviceToAbsoluteTrackingPose((vr::ETrackingUniverseOrigin)params->eOrigin, (float)params->fPredictedSecondsToPhotonsFromNow, (vr::TrackedDevicePose_t *)params->pTrackedDevicePoseArray, (uint32_t)params->unTrackedDevicePoseArrayCount);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    iface->GetDeviceToAbsoluteTrackingPose( params->eOrigin, params->fPredictedSecondsToPhotonsFromNow, params->pTrackedDevicePoseArray, params->unTrackedDevicePoseArrayCount );
 }
 
 void cppIVRSystem_IVRSystem_022_GetSeatedZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_022_GetSeatedZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetSeatedZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    *params->_ret = iface->GetSeatedZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_022_GetRawZeroPoseToStandingAbsoluteTrackingPose( struct cppIVRSystem_IVRSystem_022_GetRawZeroPoseToStandingAbsoluteTrackingPose_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetRawZeroPoseToStandingAbsoluteTrackingPose();
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    *params->_ret = iface->GetRawZeroPoseToStandingAbsoluteTrackingPose(  );
 }
 
 void cppIVRSystem_IVRSystem_022_GetSortedTrackedDeviceIndicesOfClass( struct cppIVRSystem_IVRSystem_022_GetSortedTrackedDeviceIndicesOfClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetSortedTrackedDeviceIndicesOfClass((vr::ETrackedDeviceClass)params->eTrackedDeviceClass, (vr::TrackedDeviceIndex_t *)params->punTrackedDeviceIndexArray, (uint32_t)params->unTrackedDeviceIndexArrayCount, (vr::TrackedDeviceIndex_t)params->unRelativeToTrackedDeviceIndex);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetSortedTrackedDeviceIndicesOfClass( params->eTrackedDeviceClass, params->punTrackedDeviceIndexArray, params->unTrackedDeviceIndexArrayCount, params->unRelativeToTrackedDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_022_GetTrackedDeviceActivityLevel( struct cppIVRSystem_IVRSystem_022_GetTrackedDeviceActivityLevel_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceActivityLevel((vr::TrackedDeviceIndex_t)params->unDeviceId);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceActivityLevel( params->unDeviceId );
 }
 
 void cppIVRSystem_IVRSystem_022_ApplyTransform( struct cppIVRSystem_IVRSystem_022_ApplyTransform_params *params )
 {
-    ((IVRSystem*)params->linux_side)->ApplyTransform((vr::TrackedDevicePose_t *)params->pOutputPose, (const vr::TrackedDevicePose_t *)params->pTrackedDevicePose, (const vr::HmdMatrix34_t *)params->pTransform);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    iface->ApplyTransform( params->pOutputPose, params->pTrackedDevicePose, params->pTransform );
 }
 
 void cppIVRSystem_IVRSystem_022_GetTrackedDeviceIndexForControllerRole( struct cppIVRSystem_IVRSystem_022_GetTrackedDeviceIndexForControllerRole_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceIndexForControllerRole((vr::ETrackedControllerRole)params->unDeviceType);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceIndexForControllerRole( params->unDeviceType );
 }
 
 void cppIVRSystem_IVRSystem_022_GetControllerRoleForTrackedDeviceIndex( struct cppIVRSystem_IVRSystem_022_GetControllerRoleForTrackedDeviceIndex_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerRoleForTrackedDeviceIndex((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetControllerRoleForTrackedDeviceIndex( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_022_GetTrackedDeviceClass( struct cppIVRSystem_IVRSystem_022_GetTrackedDeviceClass_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetTrackedDeviceClass((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetTrackedDeviceClass( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_022_IsTrackedDeviceConnected( struct cppIVRSystem_IVRSystem_022_IsTrackedDeviceConnected_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsTrackedDeviceConnected((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->IsTrackedDeviceConnected( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_022_GetBoolTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_022_GetBoolTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetBoolTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetBoolTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_022_GetFloatTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_022_GetFloatTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetFloatTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetFloatTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_022_GetInt32TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_022_GetInt32TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetInt32TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetInt32TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_022_GetUint64TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_022_GetUint64TrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetUint64TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetUint64TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_022_GetMatrix34TrackedDeviceProperty( struct cppIVRSystem_IVRSystem_022_GetMatrix34TrackedDeviceProperty_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetMatrix34TrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    *params->_ret = iface->GetMatrix34TrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_022_GetArrayTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_022_GetArrayTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetArrayTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (vr::PropertyTypeTag_t)params->propType, (void *)params->pBuffer, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetArrayTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->propType, params->pBuffer, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_022_GetStringTrackedDeviceProperty( struct cppIVRSystem_IVRSystem_022_GetStringTrackedDeviceProperty_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetStringTrackedDeviceProperty((vr::TrackedDeviceIndex_t)params->unDeviceIndex, (vr::ETrackedDeviceProperty)params->prop, (char *)params->pchValue, (uint32_t)params->unBufferSize, (vr::ETrackedPropertyError *)params->pError);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetStringTrackedDeviceProperty( params->unDeviceIndex, params->prop, params->pchValue, params->unBufferSize, params->pError );
 }
 
 void cppIVRSystem_IVRSystem_022_GetPropErrorNameFromEnum( struct cppIVRSystem_IVRSystem_022_GetPropErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetPropErrorNameFromEnum((vr::ETrackedPropertyError)params->error);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetPropErrorNameFromEnum( params->error );
 }
 
 void cppIVRSystem_IVRSystem_022_PollNextEvent( struct cppIVRSystem_IVRSystem_022_PollNextEvent_params *params )
 {
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1267_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEvent(params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent);
+    params->_ret = iface->PollNextEvent( params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent );
     if (params->pEvent)
         struct_VREvent_t_1267_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_022_PollNextEventWithPose( struct cppIVRSystem_IVRSystem_022_PollNextEventWithPose_params *params )
 {
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
     VREvent_t lin_pEvent;
     if (params->pEvent)
         struct_VREvent_t_1267_win_to_lin( params->pEvent, &lin_pEvent );
     uint32_t lin_uncbVREvent = params->uncbVREvent ? sizeof(lin_pEvent) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->PollNextEventWithPose( params->eOrigin, params->pEvent ? &lin_pEvent : nullptr, lin_uncbVREvent, params->pTrackedDevicePose );
     if (params->pEvent)
         struct_VREvent_t_1267_lin_to_win( &lin_pEvent, params->pEvent, params->uncbVREvent );
 }
 
 void cppIVRSystem_IVRSystem_022_GetEventTypeNameFromEnum( struct cppIVRSystem_IVRSystem_022_GetEventTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetEventTypeNameFromEnum((vr::EVREventType)params->eType);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetEventTypeNameFromEnum( params->eType );
 }
 
 void cppIVRSystem_IVRSystem_022_GetHiddenAreaMesh( struct cppIVRSystem_IVRSystem_022_GetHiddenAreaMesh_params *params )
 {
-    *params->_ret = ((IVRSystem*)params->linux_side)->GetHiddenAreaMesh((vr::EVREye)params->eEye, (vr::EHiddenAreaMeshType)params->type);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    *params->_ret = iface->GetHiddenAreaMesh( params->eEye, params->type );
 }
 
 void cppIVRSystem_IVRSystem_022_GetControllerState( struct cppIVRSystem_IVRSystem_022_GetControllerState_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1267_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize);
+    params->_ret = iface->GetControllerState( params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize );
     if (params->pControllerState)
         struct_VRControllerState001_t_1267_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_022_GetControllerStateWithPose( struct cppIVRSystem_IVRSystem_022_GetControllerStateWithPose_params *params )
 {
-    VRControllerState001_t lin_pControllerState;
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    VRControllerState_t lin_pControllerState;
     if (params->pControllerState)
         struct_VRControllerState001_t_1267_win_to_lin( params->pControllerState, &lin_pControllerState );
     uint32_t lin_unControllerStateSize = params->unControllerStateSize ? sizeof(lin_pControllerState) : 0;
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)params->eOrigin, (vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)params->pTrackedDevicePose);
+    params->_ret = iface->GetControllerStateWithPose( params->eOrigin, params->unControllerDeviceIndex, params->pControllerState ? &lin_pControllerState : nullptr, lin_unControllerStateSize, params->pTrackedDevicePose );
     if (params->pControllerState)
         struct_VRControllerState001_t_1267_lin_to_win( &lin_pControllerState, params->pControllerState, params->unControllerStateSize );
 }
 
 void cppIVRSystem_IVRSystem_022_TriggerHapticPulse( struct cppIVRSystem_IVRSystem_022_TriggerHapticPulse_params *params )
 {
-    ((IVRSystem*)params->linux_side)->TriggerHapticPulse((vr::TrackedDeviceIndex_t)params->unControllerDeviceIndex, (uint32_t)params->unAxisId, (unsigned short)params->usDurationMicroSec);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    iface->TriggerHapticPulse( params->unControllerDeviceIndex, params->unAxisId, params->usDurationMicroSec );
 }
 
 void cppIVRSystem_IVRSystem_022_GetButtonIdNameFromEnum( struct cppIVRSystem_IVRSystem_022_GetButtonIdNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetButtonIdNameFromEnum((vr::EVRButtonId)params->eButtonId);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetButtonIdNameFromEnum( params->eButtonId );
 }
 
 void cppIVRSystem_IVRSystem_022_GetControllerAxisTypeNameFromEnum( struct cppIVRSystem_IVRSystem_022_GetControllerAxisTypeNameFromEnum_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetControllerAxisTypeNameFromEnum((vr::EVRControllerAxisType)params->eAxisType);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetControllerAxisTypeNameFromEnum( params->eAxisType );
 }
 
 void cppIVRSystem_IVRSystem_022_IsInputAvailable( struct cppIVRSystem_IVRSystem_022_IsInputAvailable_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsInputAvailable();
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->IsInputAvailable(  );
 }
 
 void cppIVRSystem_IVRSystem_022_IsSteamVRDrawingControllers( struct cppIVRSystem_IVRSystem_022_IsSteamVRDrawingControllers_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->IsSteamVRDrawingControllers();
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->IsSteamVRDrawingControllers(  );
 }
 
 void cppIVRSystem_IVRSystem_022_ShouldApplicationPause( struct cppIVRSystem_IVRSystem_022_ShouldApplicationPause_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ShouldApplicationPause();
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->ShouldApplicationPause(  );
 }
 
 void cppIVRSystem_IVRSystem_022_ShouldApplicationReduceRenderingWork( struct cppIVRSystem_IVRSystem_022_ShouldApplicationReduceRenderingWork_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->ShouldApplicationReduceRenderingWork();
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->ShouldApplicationReduceRenderingWork(  );
 }
 
 void cppIVRSystem_IVRSystem_022_PerformFirmwareUpdate( struct cppIVRSystem_IVRSystem_022_PerformFirmwareUpdate_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->PerformFirmwareUpdate((vr::TrackedDeviceIndex_t)params->unDeviceIndex);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->PerformFirmwareUpdate( params->unDeviceIndex );
 }
 
 void cppIVRSystem_IVRSystem_022_AcknowledgeQuit_Exiting( struct cppIVRSystem_IVRSystem_022_AcknowledgeQuit_Exiting_params *params )
 {
-    ((IVRSystem*)params->linux_side)->AcknowledgeQuit_Exiting();
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    iface->AcknowledgeQuit_Exiting(  );
 }
 
 void cppIVRSystem_IVRSystem_022_GetAppContainerFilePaths( struct cppIVRSystem_IVRSystem_022_GetAppContainerFilePaths_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetAppContainerFilePaths((char *)params->pchBuffer, (uint32_t)params->unBufferSize);
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetAppContainerFilePaths( params->pchBuffer, params->unBufferSize );
 }
 
 void cppIVRSystem_IVRSystem_022_GetRuntimeVersion( struct cppIVRSystem_IVRSystem_022_GetRuntimeVersion_params *params )
 {
-    params->_ret = ((IVRSystem*)params->linux_side)->GetRuntimeVersion();
+    struct cppIVRSystem_IVRSystem_022 *iface = (struct cppIVRSystem_IVRSystem_022 *)params->linux_side;
+    params->_ret = iface->GetRuntimeVersion(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.h b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.h
index 2113eb2c..2bd3c997 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.h
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRSystem_IVRSystem_022;
 struct cppIVRSystem_IVRSystem_022_GetRecommendedRenderTargetSize_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.cpp
index af827c58..4da619cd 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.cpp
@@ -9,97 +9,140 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRTrackedCamera_IVRTrackedCamera_001
+{
+#ifdef __cplusplus
+    virtual bool HasCamera( uint32_t ) = 0;
+    virtual bool GetCameraFirmwareDescription( uint32_t, char *, uint32_t ) = 0;
+    virtual bool GetCameraFrameDimensions( uint32_t, uint32_t, uint32_t *, uint32_t * ) = 0;
+    virtual bool SetCameraVideoStreamFormat( uint32_t, uint32_t ) = 0;
+    virtual uint32_t GetCameraVideoStreamFormat( uint32_t ) = 0;
+    virtual bool EnableCameraForStreaming( uint32_t, bool ) = 0;
+    virtual bool StartVideoStream( uint32_t ) = 0;
+    virtual bool StopVideoStream( uint32_t ) = 0;
+    virtual bool IsVideoStreamActive( uint32_t ) = 0;
+    virtual float GetVideoStreamElapsedTime( uint32_t ) = 0;
+    virtual const CameraVideoStreamFrame_t * GetVideoStreamFrame( uint32_t ) = 0;
+    virtual bool ReleaseVideoStreamFrame( uint32_t, const CameraVideoStreamFrame_t * ) = 0;
+    virtual bool SetAutoExposure( uint32_t, bool ) = 0;
+    virtual bool PauseVideoStream( uint32_t ) = 0;
+    virtual bool ResumeVideoStream( uint32_t ) = 0;
+    virtual bool IsVideoStreamPaused( uint32_t ) = 0;
+    virtual bool GetCameraDistortion( uint32_t, float, float, float *, float * ) = 0;
+    virtual bool GetCameraProjection( uint32_t, float, float, float, float, HmdMatrix44_t * ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRTrackedCamera_IVRTrackedCamera_001_HasCamera( struct cppIVRTrackedCamera_IVRTrackedCamera_001_HasCamera_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->HasCamera((vr::TrackedDeviceIndex_t)params->nDeviceIndex);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->HasCamera( params->nDeviceIndex );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_GetCameraFirmwareDescription( struct cppIVRTrackedCamera_IVRTrackedCamera_001_GetCameraFirmwareDescription_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraFirmwareDescription((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (char *)params->pBuffer, (uint32_t)params->nBufferLen);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->GetCameraFirmwareDescription( params->nDeviceIndex, params->pBuffer, params->nBufferLen );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_GetCameraFrameDimensions( struct cppIVRTrackedCamera_IVRTrackedCamera_001_GetCameraFrameDimensions_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraFrameDimensions((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::ECameraVideoStreamFormat)params->nVideoStreamFormat, (uint32_t *)params->pWidth, (uint32_t *)params->pHeight);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->GetCameraFrameDimensions( params->nDeviceIndex, params->nVideoStreamFormat, params->pWidth, params->pHeight );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_SetCameraVideoStreamFormat( struct cppIVRTrackedCamera_IVRTrackedCamera_001_SetCameraVideoStreamFormat_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->SetCameraVideoStreamFormat((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::ECameraVideoStreamFormat)params->nVideoStreamFormat);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->SetCameraVideoStreamFormat( params->nDeviceIndex, params->nVideoStreamFormat );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_GetCameraVideoStreamFormat( struct cppIVRTrackedCamera_IVRTrackedCamera_001_GetCameraVideoStreamFormat_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraVideoStreamFormat((vr::TrackedDeviceIndex_t)params->nDeviceIndex);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->GetCameraVideoStreamFormat( params->nDeviceIndex );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_EnableCameraForStreaming( struct cppIVRTrackedCamera_IVRTrackedCamera_001_EnableCameraForStreaming_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->EnableCameraForStreaming((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (bool)params->bEnable);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->EnableCameraForStreaming( params->nDeviceIndex, params->bEnable );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_StartVideoStream( struct cppIVRTrackedCamera_IVRTrackedCamera_001_StartVideoStream_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->StartVideoStream((vr::TrackedDeviceIndex_t)params->nDeviceIndex);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->StartVideoStream( params->nDeviceIndex );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_StopVideoStream( struct cppIVRTrackedCamera_IVRTrackedCamera_001_StopVideoStream_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->StopVideoStream((vr::TrackedDeviceIndex_t)params->nDeviceIndex);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->StopVideoStream( params->nDeviceIndex );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_IsVideoStreamActive( struct cppIVRTrackedCamera_IVRTrackedCamera_001_IsVideoStreamActive_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->IsVideoStreamActive((vr::TrackedDeviceIndex_t)params->nDeviceIndex);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->IsVideoStreamActive( params->nDeviceIndex );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_GetVideoStreamElapsedTime( struct cppIVRTrackedCamera_IVRTrackedCamera_001_GetVideoStreamElapsedTime_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamElapsedTime((vr::TrackedDeviceIndex_t)params->nDeviceIndex);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->GetVideoStreamElapsedTime( params->nDeviceIndex );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_GetVideoStreamFrame( struct cppIVRTrackedCamera_IVRTrackedCamera_001_GetVideoStreamFrame_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamFrame((vr::TrackedDeviceIndex_t)params->nDeviceIndex);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->GetVideoStreamFrame( params->nDeviceIndex );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_ReleaseVideoStreamFrame( struct cppIVRTrackedCamera_IVRTrackedCamera_001_ReleaseVideoStreamFrame_params *params )
 {
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
     CameraVideoStreamFrame_t lin_pFrameImage;
     if (params->pFrameImage)
         struct_CameraVideoStreamFrame_t_0914_win_to_lin( params->pFrameImage, &lin_pFrameImage );
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ReleaseVideoStreamFrame((vr::TrackedDeviceIndex_t)params->nDeviceIndex, params->pFrameImage ? &lin_pFrameImage : nullptr);
+    params->_ret = iface->ReleaseVideoStreamFrame( params->nDeviceIndex, params->pFrameImage ? &lin_pFrameImage : nullptr );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_SetAutoExposure( struct cppIVRTrackedCamera_IVRTrackedCamera_001_SetAutoExposure_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->SetAutoExposure((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (bool)params->bEnable);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->SetAutoExposure( params->nDeviceIndex, params->bEnable );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_PauseVideoStream( struct cppIVRTrackedCamera_IVRTrackedCamera_001_PauseVideoStream_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->PauseVideoStream((vr::TrackedDeviceIndex_t)params->nDeviceIndex);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->PauseVideoStream( params->nDeviceIndex );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_ResumeVideoStream( struct cppIVRTrackedCamera_IVRTrackedCamera_001_ResumeVideoStream_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ResumeVideoStream((vr::TrackedDeviceIndex_t)params->nDeviceIndex);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->ResumeVideoStream( params->nDeviceIndex );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_IsVideoStreamPaused( struct cppIVRTrackedCamera_IVRTrackedCamera_001_IsVideoStreamPaused_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->IsVideoStreamPaused((vr::TrackedDeviceIndex_t)params->nDeviceIndex);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->IsVideoStreamPaused( params->nDeviceIndex );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_GetCameraDistortion( struct cppIVRTrackedCamera_IVRTrackedCamera_001_GetCameraDistortion_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraDistortion((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (float)params->flInputU, (float)params->flInputV, (float *)params->pflOutputU, (float *)params->pflOutputV);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->GetCameraDistortion( params->nDeviceIndex, params->flInputU, params->flInputV, params->pflOutputU, params->pflOutputV );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_001_GetCameraProjection( struct cppIVRTrackedCamera_IVRTrackedCamera_001_GetCameraProjection_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraProjection((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (float)params->flWidthPixels, (float)params->flHeightPixels, (float)params->flZNear, (float)params->flZFar, (vr::HmdMatrix44_t *)params->pProjection);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_001 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_001 *)params->linux_side;
+    params->_ret = iface->GetCameraProjection( params->nDeviceIndex, params->flWidthPixels, params->flHeightPixels, params->flZNear, params->flZFar, params->pProjection );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.h b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.h
index b96ee837..c5d71f7c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.h
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRTrackedCamera_IVRTrackedCamera_001;
 struct cppIVRTrackedCamera_IVRTrackedCamera_001_HasCamera_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_002.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_002.cpp
index 3cea1673..17c520d5 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_002.cpp
@@ -9,44 +9,67 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRTrackedCamera_IVRTrackedCamera_002
+{
+#ifdef __cplusplus
+    virtual const char * GetCameraErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t HasCamera( uint32_t, bool * ) = 0;
+    virtual uint32_t GetCameraFrameSize( uint32_t, uint32_t, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetCameraIntrinisics( uint32_t, uint32_t, HmdVector2_t *, HmdVector2_t * ) = 0;
+    virtual uint32_t GetCameraProjection( uint32_t, uint32_t, float, float, HmdMatrix44_t * ) = 0;
+    virtual uint32_t AcquireVideoStreamingService( uint32_t, void ** ) = 0;
+    virtual uint32_t ReleaseVideoStreamingService( void * ) = 0;
+    virtual uint32_t GetVideoStreamFrameBuffer( void *, uint32_t, void *, uint32_t, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRTrackedCamera_IVRTrackedCamera_002_GetCameraErrorNameFromEnum( struct cppIVRTrackedCamera_IVRTrackedCamera_002_GetCameraErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraErrorNameFromEnum((vr::EVRTrackedCameraError)params->eCameraError);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_002 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_002 *)params->linux_side;
+    params->_ret = iface->GetCameraErrorNameFromEnum( params->eCameraError );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_002_HasCamera( struct cppIVRTrackedCamera_IVRTrackedCamera_002_HasCamera_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->HasCamera((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (bool *)params->pHasCamera);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_002 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_002 *)params->linux_side;
+    params->_ret = iface->HasCamera( params->nDeviceIndex, params->pHasCamera );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_002_GetCameraFrameSize( struct cppIVRTrackedCamera_IVRTrackedCamera_002_GetCameraFrameSize_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraFrameSize((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight, (uint32_t *)params->pnFrameBufferSize);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_002 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_002 *)params->linux_side;
+    params->_ret = iface->GetCameraFrameSize( params->nDeviceIndex, params->eFrameType, params->pnWidth, params->pnHeight, params->pnFrameBufferSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_002_GetCameraIntrinisics( struct cppIVRTrackedCamera_IVRTrackedCamera_002_GetCameraIntrinisics_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraIntrinisics((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::HmdVector2_t *)params->pFocalLength, (vr::HmdVector2_t *)params->pCenter);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_002 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_002 *)params->linux_side;
+    params->_ret = iface->GetCameraIntrinisics( params->nDeviceIndex, params->eFrameType, params->pFocalLength, params->pCenter );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_002_GetCameraProjection( struct cppIVRTrackedCamera_IVRTrackedCamera_002_GetCameraProjection_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraProjection((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (float)params->flZNear, (float)params->flZFar, (vr::HmdMatrix44_t *)params->pProjection);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_002 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_002 *)params->linux_side;
+    params->_ret = iface->GetCameraProjection( params->nDeviceIndex, params->eFrameType, params->flZNear, params->flZFar, params->pProjection );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_002_AcquireVideoStreamingService( struct cppIVRTrackedCamera_IVRTrackedCamera_002_AcquireVideoStreamingService_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->AcquireVideoStreamingService((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::TrackedCameraHandle_t *)params->pHandle);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_002 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_002 *)params->linux_side;
+    params->_ret = iface->AcquireVideoStreamingService( params->nDeviceIndex, params->pHandle );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_002_ReleaseVideoStreamingService( struct cppIVRTrackedCamera_IVRTrackedCamera_002_ReleaseVideoStreamingService_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ReleaseVideoStreamingService((vr::TrackedCameraHandle_t)params->hTrackedCamera);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_002 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_002 *)params->linux_side;
+    params->_ret = iface->ReleaseVideoStreamingService( params->hTrackedCamera );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_002_GetVideoStreamFrameBuffer( struct cppIVRTrackedCamera_IVRTrackedCamera_002_GetVideoStreamFrameBuffer_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (void *)params->pFrameBuffer, (uint32_t)params->nFrameBufferSize, (vr::CameraVideoStreamFrameHeader_t *)params->pFrameHeader, (uint32_t)params->nFrameHeaderSize);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_002 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_002 *)params->linux_side;
+    params->_ret = iface->GetVideoStreamFrameBuffer( params->hTrackedCamera, params->eFrameType, params->pFrameBuffer, params->nFrameBufferSize, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_002.h b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_002.h
index f27b8c48..6ef6354b 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_002.h
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_002.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRTrackedCamera_IVRTrackedCamera_002;
 struct cppIVRTrackedCamera_IVRTrackedCamera_002_GetCameraErrorNameFromEnum_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_003.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_003.cpp
index 2e2842b1..f25f8914 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_003.cpp
@@ -9,64 +9,95 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRTrackedCamera_IVRTrackedCamera_003
+{
+#ifdef __cplusplus
+    virtual const char * GetCameraErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t HasCamera( uint32_t, bool * ) = 0;
+    virtual uint32_t GetCameraFrameSize( uint32_t, uint32_t, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetCameraIntrinsics( uint32_t, uint32_t, HmdVector2_t *, HmdVector2_t * ) = 0;
+    virtual uint32_t GetCameraProjection( uint32_t, uint32_t, float, float, HmdMatrix44_t * ) = 0;
+    virtual uint32_t AcquireVideoStreamingService( uint32_t, uint64_t * ) = 0;
+    virtual uint32_t ReleaseVideoStreamingService( uint64_t ) = 0;
+    virtual uint32_t GetVideoStreamFrameBuffer( uint64_t, uint32_t, void *, uint32_t, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t GetVideoStreamTextureSize( uint32_t, uint32_t, VRTextureBounds_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetVideoStreamTextureD3D11( uint64_t, uint32_t, void *, void **, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t GetVideoStreamTextureGL( uint64_t, uint32_t, uint32_t *, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t ReleaseVideoStreamTextureGL( uint64_t, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRTrackedCamera_IVRTrackedCamera_003_GetCameraErrorNameFromEnum( struct cppIVRTrackedCamera_IVRTrackedCamera_003_GetCameraErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraErrorNameFromEnum((vr::EVRTrackedCameraError)params->eCameraError);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->GetCameraErrorNameFromEnum( params->eCameraError );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_HasCamera( struct cppIVRTrackedCamera_IVRTrackedCamera_003_HasCamera_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->HasCamera((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (bool *)params->pHasCamera);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->HasCamera( params->nDeviceIndex, params->pHasCamera );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_GetCameraFrameSize( struct cppIVRTrackedCamera_IVRTrackedCamera_003_GetCameraFrameSize_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraFrameSize((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight, (uint32_t *)params->pnFrameBufferSize);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->GetCameraFrameSize( params->nDeviceIndex, params->eFrameType, params->pnWidth, params->pnHeight, params->pnFrameBufferSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_GetCameraIntrinsics( struct cppIVRTrackedCamera_IVRTrackedCamera_003_GetCameraIntrinsics_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraIntrinsics((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::HmdVector2_t *)params->pFocalLength, (vr::HmdVector2_t *)params->pCenter);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->GetCameraIntrinsics( params->nDeviceIndex, params->eFrameType, params->pFocalLength, params->pCenter );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_GetCameraProjection( struct cppIVRTrackedCamera_IVRTrackedCamera_003_GetCameraProjection_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraProjection((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (float)params->flZNear, (float)params->flZFar, (vr::HmdMatrix44_t *)params->pProjection);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->GetCameraProjection( params->nDeviceIndex, params->eFrameType, params->flZNear, params->flZFar, params->pProjection );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_AcquireVideoStreamingService( struct cppIVRTrackedCamera_IVRTrackedCamera_003_AcquireVideoStreamingService_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->AcquireVideoStreamingService((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::TrackedCameraHandle_t *)params->pHandle);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->AcquireVideoStreamingService( params->nDeviceIndex, params->pHandle );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_ReleaseVideoStreamingService( struct cppIVRTrackedCamera_IVRTrackedCamera_003_ReleaseVideoStreamingService_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ReleaseVideoStreamingService((vr::TrackedCameraHandle_t)params->hTrackedCamera);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->ReleaseVideoStreamingService( params->hTrackedCamera );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamFrameBuffer( struct cppIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamFrameBuffer_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (void *)params->pFrameBuffer, (uint32_t)params->nFrameBufferSize, (vr::CameraVideoStreamFrameHeader_t *)params->pFrameHeader, (uint32_t)params->nFrameHeaderSize);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->GetVideoStreamFrameBuffer( params->hTrackedCamera, params->eFrameType, params->pFrameBuffer, params->nFrameBufferSize, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureSize( struct cppIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureSize_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureSize((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::VRTextureBounds_t *)params->pTextureBounds, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->GetVideoStreamTextureSize( params->nDeviceIndex, params->eFrameType, params->pTextureBounds, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureD3D11( struct cppIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureD3D11_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView, (vr::CameraVideoStreamFrameHeader_t *)params->pFrameHeader, (uint32_t)params->nFrameHeaderSize);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->GetVideoStreamTextureD3D11( params->hTrackedCamera, params->eFrameType, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureGL( struct cppIVRTrackedCamera_IVRTrackedCamera_003_GetVideoStreamTextureGL_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::glUInt_t *)params->pglTextureId, (vr::CameraVideoStreamFrameHeader_t *)params->pFrameHeader, (uint32_t)params->nFrameHeaderSize);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->GetVideoStreamTextureGL( params->hTrackedCamera, params->eFrameType, params->pglTextureId, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_003_ReleaseVideoStreamTextureGL( struct cppIVRTrackedCamera_IVRTrackedCamera_003_ReleaseVideoStreamTextureGL_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ReleaseVideoStreamTextureGL((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::glUInt_t)params->glTextureId);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_003 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_003 *)params->linux_side;
+    params->_ret = iface->ReleaseVideoStreamTextureGL( params->hTrackedCamera, params->glTextureId );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_003.h b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_003.h
index d8e88aa9..a9f7a86e 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_003.h
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_003.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRTrackedCamera_IVRTrackedCamera_003;
 struct cppIVRTrackedCamera_IVRTrackedCamera_003_GetCameraErrorNameFromEnum_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp
index c7460051..697d246f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp
@@ -9,82 +9,113 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRTrackedCamera_IVRTrackedCamera_004
+{
+#ifdef __cplusplus
+    virtual const char * GetCameraErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t HasCamera( uint32_t, bool * ) = 0;
+    virtual uint32_t GetCameraFrameSize( uint32_t, uint32_t, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetCameraIntrinsics( uint32_t, uint32_t, HmdVector2_t *, HmdVector2_t * ) = 0;
+    virtual uint32_t GetCameraProjection( uint32_t, uint32_t, float, float, HmdMatrix44_t * ) = 0;
+    virtual uint32_t AcquireVideoStreamingService( uint32_t, uint64_t * ) = 0;
+    virtual uint32_t ReleaseVideoStreamingService( uint64_t ) = 0;
+    virtual uint32_t GetVideoStreamFrameBuffer( uint64_t, uint32_t, void *, uint32_t, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t GetVideoStreamTextureSize( uint32_t, uint32_t, VRTextureBounds_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetVideoStreamTextureD3D11( uint64_t, uint32_t, void *, void **, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t GetVideoStreamTextureGL( uint64_t, uint32_t, uint32_t *, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t ReleaseVideoStreamTextureGL( uint64_t, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRTrackedCamera_IVRTrackedCamera_004_GetCameraErrorNameFromEnum( struct cppIVRTrackedCamera_IVRTrackedCamera_004_GetCameraErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraErrorNameFromEnum((vr::EVRTrackedCameraError)params->eCameraError);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
+    params->_ret = iface->GetCameraErrorNameFromEnum( params->eCameraError );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_HasCamera( struct cppIVRTrackedCamera_IVRTrackedCamera_004_HasCamera_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->HasCamera((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (bool *)params->pHasCamera);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
+    params->_ret = iface->HasCamera( params->nDeviceIndex, params->pHasCamera );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_GetCameraFrameSize( struct cppIVRTrackedCamera_IVRTrackedCamera_004_GetCameraFrameSize_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraFrameSize((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight, (uint32_t *)params->pnFrameBufferSize);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
+    params->_ret = iface->GetCameraFrameSize( params->nDeviceIndex, params->eFrameType, params->pnWidth, params->pnHeight, params->pnFrameBufferSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_GetCameraIntrinsics( struct cppIVRTrackedCamera_IVRTrackedCamera_004_GetCameraIntrinsics_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraIntrinsics((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::HmdVector2_t *)params->pFocalLength, (vr::HmdVector2_t *)params->pCenter);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
+    params->_ret = iface->GetCameraIntrinsics( params->nDeviceIndex, params->eFrameType, params->pFocalLength, params->pCenter );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_GetCameraProjection( struct cppIVRTrackedCamera_IVRTrackedCamera_004_GetCameraProjection_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraProjection((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (float)params->flZNear, (float)params->flZFar, (vr::HmdMatrix44_t *)params->pProjection);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
+    params->_ret = iface->GetCameraProjection( params->nDeviceIndex, params->eFrameType, params->flZNear, params->flZFar, params->pProjection );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_AcquireVideoStreamingService( struct cppIVRTrackedCamera_IVRTrackedCamera_004_AcquireVideoStreamingService_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->AcquireVideoStreamingService((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::TrackedCameraHandle_t *)params->pHandle);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
+    params->_ret = iface->AcquireVideoStreamingService( params->nDeviceIndex, params->pHandle );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_ReleaseVideoStreamingService( struct cppIVRTrackedCamera_IVRTrackedCamera_004_ReleaseVideoStreamingService_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ReleaseVideoStreamingService((vr::TrackedCameraHandle_t)params->hTrackedCamera);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
+    params->_ret = iface->ReleaseVideoStreamingService( params->hTrackedCamera );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamFrameBuffer( struct cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamFrameBuffer_params *params )
 {
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
     CameraVideoStreamFrameHeader_t lin_pFrameHeader;
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin( params->pFrameHeader, &lin_pFrameHeader );
     uint32_t lin_nFrameHeaderSize = params->nFrameHeaderSize ? sizeof(lin_pFrameHeader) : 0;
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (void *)params->pFrameBuffer, (uint32_t)params->nFrameBufferSize, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize);
+    params->_ret = iface->GetVideoStreamFrameBuffer( params->hTrackedCamera, params->eFrameType, params->pFrameBuffer, params->nFrameBufferSize, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize );
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win( &lin_pFrameHeader, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamTextureSize( struct cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamTextureSize_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureSize((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::VRTextureBounds_t *)params->pTextureBounds, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
+    params->_ret = iface->GetVideoStreamTextureSize( params->nDeviceIndex, params->eFrameType, params->pTextureBounds, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamTextureD3D11( struct cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamTextureD3D11_params *params )
 {
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
     CameraVideoStreamFrameHeader_t lin_pFrameHeader;
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin( params->pFrameHeader, &lin_pFrameHeader );
     uint32_t lin_nFrameHeaderSize = params->nFrameHeaderSize ? sizeof(lin_pFrameHeader) : 0;
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize);
+    params->_ret = iface->GetVideoStreamTextureD3D11( params->hTrackedCamera, params->eFrameType, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize );
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win( &lin_pFrameHeader, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamTextureGL( struct cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamTextureGL_params *params )
 {
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
     CameraVideoStreamFrameHeader_t lin_pFrameHeader;
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin( params->pFrameHeader, &lin_pFrameHeader );
     uint32_t lin_nFrameHeaderSize = params->nFrameHeaderSize ? sizeof(lin_pFrameHeader) : 0;
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::glUInt_t *)params->pglTextureId, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize);
+    params->_ret = iface->GetVideoStreamTextureGL( params->hTrackedCamera, params->eFrameType, params->pglTextureId, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize );
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win( &lin_pFrameHeader, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_004_ReleaseVideoStreamTextureGL( struct cppIVRTrackedCamera_IVRTrackedCamera_004_ReleaseVideoStreamTextureGL_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ReleaseVideoStreamTextureGL((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::glUInt_t)params->glTextureId);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_004 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_004 *)params->linux_side;
+    params->_ret = iface->ReleaseVideoStreamTextureGL( params->hTrackedCamera, params->glTextureId );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.h b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.h
index e59bd999..b055dc52 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.h
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRTrackedCamera_IVRTrackedCamera_004;
 struct cppIVRTrackedCamera_IVRTrackedCamera_004_GetCameraErrorNameFromEnum_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp
index 27737db7..f304f009 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp
@@ -9,82 +9,113 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRTrackedCamera_IVRTrackedCamera_005
+{
+#ifdef __cplusplus
+    virtual const char * GetCameraErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t HasCamera( uint32_t, bool * ) = 0;
+    virtual uint32_t GetCameraFrameSize( uint32_t, uint32_t, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetCameraIntrinsics( uint32_t, uint32_t, uint32_t, HmdVector2_t *, HmdVector2_t * ) = 0;
+    virtual uint32_t GetCameraProjection( uint32_t, uint32_t, uint32_t, float, float, HmdMatrix44_t * ) = 0;
+    virtual uint32_t AcquireVideoStreamingService( uint32_t, uint64_t * ) = 0;
+    virtual uint32_t ReleaseVideoStreamingService( uint64_t ) = 0;
+    virtual uint32_t GetVideoStreamFrameBuffer( uint64_t, uint32_t, void *, uint32_t, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t GetVideoStreamTextureSize( uint32_t, uint32_t, VRTextureBounds_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetVideoStreamTextureD3D11( uint64_t, uint32_t, void *, void **, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t GetVideoStreamTextureGL( uint64_t, uint32_t, uint32_t *, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t ReleaseVideoStreamTextureGL( uint64_t, uint32_t ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRTrackedCamera_IVRTrackedCamera_005_GetCameraErrorNameFromEnum( struct cppIVRTrackedCamera_IVRTrackedCamera_005_GetCameraErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraErrorNameFromEnum((vr::EVRTrackedCameraError)params->eCameraError);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
+    params->_ret = iface->GetCameraErrorNameFromEnum( params->eCameraError );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_HasCamera( struct cppIVRTrackedCamera_IVRTrackedCamera_005_HasCamera_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->HasCamera((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (bool *)params->pHasCamera);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
+    params->_ret = iface->HasCamera( params->nDeviceIndex, params->pHasCamera );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_GetCameraFrameSize( struct cppIVRTrackedCamera_IVRTrackedCamera_005_GetCameraFrameSize_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraFrameSize((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight, (uint32_t *)params->pnFrameBufferSize);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
+    params->_ret = iface->GetCameraFrameSize( params->nDeviceIndex, params->eFrameType, params->pnWidth, params->pnHeight, params->pnFrameBufferSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_GetCameraIntrinsics( struct cppIVRTrackedCamera_IVRTrackedCamera_005_GetCameraIntrinsics_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraIntrinsics((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (uint32_t)params->nCameraIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::HmdVector2_t *)params->pFocalLength, (vr::HmdVector2_t *)params->pCenter);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
+    params->_ret = iface->GetCameraIntrinsics( params->nDeviceIndex, params->nCameraIndex, params->eFrameType, params->pFocalLength, params->pCenter );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_GetCameraProjection( struct cppIVRTrackedCamera_IVRTrackedCamera_005_GetCameraProjection_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraProjection((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (uint32_t)params->nCameraIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (float)params->flZNear, (float)params->flZFar, (vr::HmdMatrix44_t *)params->pProjection);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
+    params->_ret = iface->GetCameraProjection( params->nDeviceIndex, params->nCameraIndex, params->eFrameType, params->flZNear, params->flZFar, params->pProjection );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_AcquireVideoStreamingService( struct cppIVRTrackedCamera_IVRTrackedCamera_005_AcquireVideoStreamingService_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->AcquireVideoStreamingService((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::TrackedCameraHandle_t *)params->pHandle);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
+    params->_ret = iface->AcquireVideoStreamingService( params->nDeviceIndex, params->pHandle );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_ReleaseVideoStreamingService( struct cppIVRTrackedCamera_IVRTrackedCamera_005_ReleaseVideoStreamingService_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ReleaseVideoStreamingService((vr::TrackedCameraHandle_t)params->hTrackedCamera);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
+    params->_ret = iface->ReleaseVideoStreamingService( params->hTrackedCamera );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamFrameBuffer( struct cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamFrameBuffer_params *params )
 {
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
     CameraVideoStreamFrameHeader_t lin_pFrameHeader;
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin( params->pFrameHeader, &lin_pFrameHeader );
     uint32_t lin_nFrameHeaderSize = params->nFrameHeaderSize ? sizeof(lin_pFrameHeader) : 0;
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (void *)params->pFrameBuffer, (uint32_t)params->nFrameBufferSize, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize);
+    params->_ret = iface->GetVideoStreamFrameBuffer( params->hTrackedCamera, params->eFrameType, params->pFrameBuffer, params->nFrameBufferSize, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize );
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win( &lin_pFrameHeader, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamTextureSize( struct cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamTextureSize_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureSize((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::VRTextureBounds_t *)params->pTextureBounds, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
+    params->_ret = iface->GetVideoStreamTextureSize( params->nDeviceIndex, params->eFrameType, params->pTextureBounds, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamTextureD3D11( struct cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamTextureD3D11_params *params )
 {
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
     CameraVideoStreamFrameHeader_t lin_pFrameHeader;
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin( params->pFrameHeader, &lin_pFrameHeader );
     uint32_t lin_nFrameHeaderSize = params->nFrameHeaderSize ? sizeof(lin_pFrameHeader) : 0;
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize);
+    params->_ret = iface->GetVideoStreamTextureD3D11( params->hTrackedCamera, params->eFrameType, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize );
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win( &lin_pFrameHeader, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamTextureGL( struct cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamTextureGL_params *params )
 {
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
     CameraVideoStreamFrameHeader_t lin_pFrameHeader;
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin( params->pFrameHeader, &lin_pFrameHeader );
     uint32_t lin_nFrameHeaderSize = params->nFrameHeaderSize ? sizeof(lin_pFrameHeader) : 0;
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::glUInt_t *)params->pglTextureId, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize);
+    params->_ret = iface->GetVideoStreamTextureGL( params->hTrackedCamera, params->eFrameType, params->pglTextureId, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize );
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win( &lin_pFrameHeader, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_005_ReleaseVideoStreamTextureGL( struct cppIVRTrackedCamera_IVRTrackedCamera_005_ReleaseVideoStreamTextureGL_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ReleaseVideoStreamTextureGL((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::glUInt_t)params->glTextureId);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_005 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_005 *)params->linux_side;
+    params->_ret = iface->ReleaseVideoStreamTextureGL( params->hTrackedCamera, params->glTextureId );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.h b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.h
index 2b511a67..acc39e42 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.h
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRTrackedCamera_IVRTrackedCamera_005;
 struct cppIVRTrackedCamera_IVRTrackedCamera_005_GetCameraErrorNameFromEnum_params
 {
     void *linux_side;
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp
index 38fc59a9..31f3eba5 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp
@@ -9,92 +9,127 @@ extern "C" {
 #ifdef __cplusplus
 extern "C" {
 #endif
+
+struct cppIVRTrackedCamera_IVRTrackedCamera_006
+{
+#ifdef __cplusplus
+    virtual const char * GetCameraErrorNameFromEnum( uint32_t ) = 0;
+    virtual uint32_t HasCamera( uint32_t, bool * ) = 0;
+    virtual uint32_t GetCameraFrameSize( uint32_t, uint32_t, uint32_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetCameraIntrinsics( uint32_t, uint32_t, uint32_t, HmdVector2_t *, HmdVector2_t * ) = 0;
+    virtual uint32_t GetCameraProjection( uint32_t, uint32_t, uint32_t, float, float, HmdMatrix44_t * ) = 0;
+    virtual uint32_t AcquireVideoStreamingService( uint32_t, uint64_t * ) = 0;
+    virtual uint32_t ReleaseVideoStreamingService( uint64_t ) = 0;
+    virtual uint32_t GetVideoStreamFrameBuffer( uint64_t, uint32_t, void *, uint32_t, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t GetVideoStreamTextureSize( uint32_t, uint32_t, VRTextureBounds_t *, uint32_t *, uint32_t * ) = 0;
+    virtual uint32_t GetVideoStreamTextureD3D11( uint64_t, uint32_t, void *, void **, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t GetVideoStreamTextureGL( uint64_t, uint32_t, uint32_t *, CameraVideoStreamFrameHeader_t *, uint32_t ) = 0;
+    virtual uint32_t ReleaseVideoStreamTextureGL( uint64_t, uint32_t ) = 0;
+    virtual void SetCameraTrackingSpace( uint32_t ) = 0;
+    virtual uint32_t GetCameraTrackingSpace(  ) = 0;
+#endif /* __cplusplus */
+};
+
 void cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraErrorNameFromEnum( struct cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraErrorNameFromEnum_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraErrorNameFromEnum((vr::EVRTrackedCameraError)params->eCameraError);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    params->_ret = iface->GetCameraErrorNameFromEnum( params->eCameraError );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_HasCamera( struct cppIVRTrackedCamera_IVRTrackedCamera_006_HasCamera_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->HasCamera((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (bool *)params->pHasCamera);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    params->_ret = iface->HasCamera( params->nDeviceIndex, params->pHasCamera );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraFrameSize( struct cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraFrameSize_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraFrameSize((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight, (uint32_t *)params->pnFrameBufferSize);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    params->_ret = iface->GetCameraFrameSize( params->nDeviceIndex, params->eFrameType, params->pnWidth, params->pnHeight, params->pnFrameBufferSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraIntrinsics( struct cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraIntrinsics_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraIntrinsics((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (uint32_t)params->nCameraIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::HmdVector2_t *)params->pFocalLength, (vr::HmdVector2_t *)params->pCenter);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    params->_ret = iface->GetCameraIntrinsics( params->nDeviceIndex, params->nCameraIndex, params->eFrameType, params->pFocalLength, params->pCenter );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraProjection( struct cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraProjection_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraProjection((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (uint32_t)params->nCameraIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (float)params->flZNear, (float)params->flZFar, (vr::HmdMatrix44_t *)params->pProjection);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    params->_ret = iface->GetCameraProjection( params->nDeviceIndex, params->nCameraIndex, params->eFrameType, params->flZNear, params->flZFar, params->pProjection );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_AcquireVideoStreamingService( struct cppIVRTrackedCamera_IVRTrackedCamera_006_AcquireVideoStreamingService_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->AcquireVideoStreamingService((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::TrackedCameraHandle_t *)params->pHandle);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    params->_ret = iface->AcquireVideoStreamingService( params->nDeviceIndex, params->pHandle );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_ReleaseVideoStreamingService( struct cppIVRTrackedCamera_IVRTrackedCamera_006_ReleaseVideoStreamingService_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ReleaseVideoStreamingService((vr::TrackedCameraHandle_t)params->hTrackedCamera);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    params->_ret = iface->ReleaseVideoStreamingService( params->hTrackedCamera );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamFrameBuffer( struct cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamFrameBuffer_params *params )
 {
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
     CameraVideoStreamFrameHeader_t lin_pFrameHeader;
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin( params->pFrameHeader, &lin_pFrameHeader );
     uint32_t lin_nFrameHeaderSize = params->nFrameHeaderSize ? sizeof(lin_pFrameHeader) : 0;
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (void *)params->pFrameBuffer, (uint32_t)params->nFrameBufferSize, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize);
+    params->_ret = iface->GetVideoStreamFrameBuffer( params->hTrackedCamera, params->eFrameType, params->pFrameBuffer, params->nFrameBufferSize, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize );
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_lin_to_win( &lin_pFrameHeader, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureSize( struct cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureSize_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureSize((vr::TrackedDeviceIndex_t)params->nDeviceIndex, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::VRTextureBounds_t *)params->pTextureBounds, (uint32_t *)params->pnWidth, (uint32_t *)params->pnHeight);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    params->_ret = iface->GetVideoStreamTextureSize( params->nDeviceIndex, params->eFrameType, params->pTextureBounds, params->pnWidth, params->pnHeight );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureD3D11( struct cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureD3D11_params *params )
 {
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
     CameraVideoStreamFrameHeader_t lin_pFrameHeader;
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin( params->pFrameHeader, &lin_pFrameHeader );
     uint32_t lin_nFrameHeaderSize = params->nFrameHeaderSize ? sizeof(lin_pFrameHeader) : 0;
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (void *)params->pD3D11DeviceOrResource, (void **)params->ppD3D11ShaderResourceView, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize);
+    params->_ret = iface->GetVideoStreamTextureD3D11( params->hTrackedCamera, params->eFrameType, params->pD3D11DeviceOrResource, params->ppD3D11ShaderResourceView, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize );
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_lin_to_win( &lin_pFrameHeader, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureGL( struct cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStreamTextureGL_params *params )
 {
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
     CameraVideoStreamFrameHeader_t lin_pFrameHeader;
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin( params->pFrameHeader, &lin_pFrameHeader );
     uint32_t lin_nFrameHeaderSize = params->nFrameHeaderSize ? sizeof(lin_pFrameHeader) : 0;
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::EVRTrackedCameraFrameType)params->eFrameType, (vr::glUInt_t *)params->pglTextureId, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize);
+    params->_ret = iface->GetVideoStreamTextureGL( params->hTrackedCamera, params->eFrameType, params->pglTextureId, params->pFrameHeader ? &lin_pFrameHeader : nullptr, lin_nFrameHeaderSize );
     if (params->pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_lin_to_win( &lin_pFrameHeader, params->pFrameHeader, params->nFrameHeaderSize );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_ReleaseVideoStreamTextureGL( struct cppIVRTrackedCamera_IVRTrackedCamera_006_ReleaseVideoStreamTextureGL_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->ReleaseVideoStreamTextureGL((vr::TrackedCameraHandle_t)params->hTrackedCamera, (vr::glUInt_t)params->glTextureId);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    params->_ret = iface->ReleaseVideoStreamTextureGL( params->hTrackedCamera, params->glTextureId );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_SetCameraTrackingSpace( struct cppIVRTrackedCamera_IVRTrackedCamera_006_SetCameraTrackingSpace_params *params )
 {
-    ((IVRTrackedCamera*)params->linux_side)->SetCameraTrackingSpace((vr::ETrackingUniverseOrigin)params->eUniverse);
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    iface->SetCameraTrackingSpace( params->eUniverse );
 }
 
 void cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraTrackingSpace( struct cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraTrackingSpace_params *params )
 {
-    params->_ret = ((IVRTrackedCamera*)params->linux_side)->GetCameraTrackingSpace();
+    struct cppIVRTrackedCamera_IVRTrackedCamera_006 *iface = (struct cppIVRTrackedCamera_IVRTrackedCamera_006 *)params->linux_side;
+    params->_ret = iface->GetCameraTrackingSpace(  );
 }
 
 #ifdef __cplusplus
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.h b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.h
index 2671d0f6..0a0f521a 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.h
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.h
@@ -1,6 +1,7 @@
 #ifdef __cplusplus
 extern "C" {
 #endif
+struct cppIVRTrackedCamera_IVRTrackedCamera_006;
 struct cppIVRTrackedCamera_IVRTrackedCamera_006_GetCameraErrorNameFromEnum_params
 {
     void *linux_side;