diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py
index c637e920..98052336 100755
--- a/vrclient_x64/gen_wrapper.py
+++ b/vrclient_x64/gen_wrapper.py
@@ -382,12 +382,12 @@ def handle_method(cfile, classname, winclassname, cppname, method, cpp, cpp_h, e
                 elif strip_ns(param.type.get_pointee().get_canonical().spelling) in system_structs:
                     do_unwrap = (strip_ns(param.type.get_pointee().get_canonical().spelling), param.spelling)
                     typename = "win" + do_unwrap[0] + "_" + display_sdkver(sdkver) + " *"
-                elif param.type.get_pointee().kind == clang.cindex.TypeKind.POINTER and \
+                elif param.type.get_pointee().get_canonical().kind == clang.cindex.TypeKind.POINTER and \
                         strip_ns(param.type.get_pointee().get_pointee().get_canonical().spelling) in system_structs:
                     do_wrap = (strip_ns(param.type.get_pointee().get_pointee().get_canonical().spelling), param.spelling)
                     typename = "win" + do_wrap[0] + "_" + display_sdkver(sdkver) + " **"
-                elif real_type.kind == clang.cindex.TypeKind.RECORD and \
-                        struct_needs_conversion(real_type):
+                elif real_type.get_canonical().kind == clang.cindex.TypeKind.RECORD and \
+                        struct_needs_conversion(real_type.get_canonical()):
                     do_win_to_lin = (strip_ns(real_type.spelling), param.spelling)
                     do_lin_to_win = (strip_ns(real_type.spelling), param.spelling)
                     #preserve pointers
@@ -771,8 +771,8 @@ def struct_needs_conversion_nocache(struct):
     for field in struct.get_fields():
         if struct.get_offset(field.spelling) != windows_struct.get_offset(field.spelling):
             return True
-        if field.type.kind == clang.cindex.TypeKind.RECORD and \
-                struct_needs_conversion(field.type):
+        if field.type.get_canonical().kind == clang.cindex.TypeKind.RECORD and \
+                struct_needs_conversion(field.type.get_canonical()):
             return True
 
     #check 64-bit compat
@@ -783,8 +783,8 @@ def struct_needs_conversion_nocache(struct):
     for field in lin64_struct.get_fields():
         if lin64_struct.get_offset(field.spelling) != windows_struct.get_offset(field.spelling):
             return True
-        if field.type.kind == clang.cindex.TypeKind.RECORD and \
-                struct_needs_conversion(field.type):
+        if field.type.get_canonical().kind == clang.cindex.TypeKind.RECORD and \
+                struct_needs_conversion(field.type.get_canonical()):
             return True
 
     return False
@@ -797,9 +797,10 @@ def struct_needs_conversion(struct):
     return struct_conversion_cache[sdkver][strip_const(struct.spelling)]
 
 def get_field_attribute_str(field):
-    if field.type.kind != clang.cindex.TypeKind.RECORD:
+    ftype = field.type.get_canonical()
+    if ftype.kind != clang.cindex.TypeKind.RECORD:
         return ""
-    win_struct = find_windows_struct(field.type)
+    win_struct = find_windows_struct(ftype)
     align = win_struct.get_align()
     return " __attribute__((aligned(" + str(align) + ")))"
 
@@ -822,7 +823,7 @@ def handle_struct(sdkver, struct):
 
     which = set()
 
-    if struct_needs_conversion(struct.type):
+    if struct_needs_conversion(struct.type.get_canonical()):
         which.add(LIN_TO_WIN)
         which.add(WIN_TO_LIN)
 
@@ -858,13 +859,13 @@ def handle_struct(sdkver, struct):
     cppfile.write("struct win%s {\n" % handler_name)
     for m in struct.get_children():
         if m.kind == clang.cindex.CursorKind.FIELD_DECL:
-            if m.type.kind == clang.cindex.TypeKind.CONSTANTARRAY:
+            if m.type.get_canonical().kind == clang.cindex.TypeKind.CONSTANTARRAY:
                 cppfile.write("    %s %s[%u];\n" % (m.type.element_type.spelling, m.displayname, m.type.element_count))
-            elif m.type.kind == clang.cindex.TypeKind.RECORD and \
-                    struct_needs_conversion(m.type):
+            elif m.type.get_canonical().kind == clang.cindex.TypeKind.RECORD and \
+                    struct_needs_conversion(m.type.get_canonical()):
                 cppfile.write("    win%s_%s %s;\n" % (strip_ns(m.type.spelling), display_sdkver(sdkver), m.displayname))
             else:
-                if m.type.kind == clang.cindex.TypeKind.POINTER and \
+                if m.type.get_canonical().kind == clang.cindex.TypeKind.POINTER and \
                         m.type.get_pointee().kind == clang.cindex.TypeKind.FUNCTIONPROTO:
                     cppfile.write("    void *%s; /*fn pointer*/\n" % m.displayname)
                 else:
@@ -883,12 +884,12 @@ def handle_struct(sdkver, struct):
 
         for m in struct.get_children():
             if m.kind == clang.cindex.CursorKind.FIELD_DECL:
-                if m.type.kind == clang.cindex.TypeKind.CONSTANTARRAY:
+                if m.type.get_canonical().kind == clang.cindex.TypeKind.CONSTANTARRAY:
                     #TODO: if this is a struct, or packed differently, we'll have to
                     # copy each element in a for-loop
                     cppfile.write("    memcpy(win->%s, lin->%s, sizeof(win->%s));\n" % (m.displayname, m.displayname, m.displayname))
-                elif m.type.kind == clang.cindex.TypeKind.RECORD and \
-                        struct_needs_conversion(m.type):
+                elif m.type.get_canonical().kind == clang.cindex.TypeKind.RECORD and \
+                        struct_needs_conversion(m.type.get_canonical()):
                     cppfile.write("    lin_to_win_struct_%s_%s(&lin->%s, &win->%s);\n" % (strip_ns(m.type.spelling), display_sdkver(sdkver), m.displayname, m.displayname))
                 else:
                     cppfile.write("    win->%s = lin->%s;\n" % (m.displayname, m.displayname))
@@ -904,12 +905,12 @@ def handle_struct(sdkver, struct):
 
         for m in struct.get_children():
             if m.kind == clang.cindex.CursorKind.FIELD_DECL:
-                if m.type.kind == clang.cindex.TypeKind.CONSTANTARRAY:
+                if m.type.get_canonical().kind == clang.cindex.TypeKind.CONSTANTARRAY:
                     #TODO: if this is a struct, or packed differently, we'll have to
                     # copy each element in a for-loop
                     cppfile.write("    memcpy(lin->%s, win->%s, sizeof(lin->%s));\n" % (m.displayname, m.displayname, m.displayname))
-                elif m.type.kind == clang.cindex.TypeKind.RECORD and \
-                        struct_needs_conversion(m.type):
+                elif m.type.get_canonical().kind == clang.cindex.TypeKind.RECORD and \
+                        struct_needs_conversion(m.type.get_canonical()):
                     cppfile.write("    win_to_lin_struct_%s_%s(&win->%s, &lin->%s);\n" % (m.type.spelling, display_sdkver(sdkver), m.displayname, m.displayname))
                 else:
                     cppfile.write("    lin->%s = win->%s;\n" % (m.displayname, m.displayname))
@@ -925,7 +926,7 @@ def handle_struct(sdkver, struct):
 
         for m in struct.get_children():
             if m.kind == clang.cindex.CursorKind.FIELD_DECL:
-                if m.type.kind == clang.cindex.TypeKind.CONSTANTARRAY:
+                if m.type.get_canonical().kind == clang.cindex.TypeKind.CONSTANTARRAY:
                     #TODO: if this is a struct, or packed differently, we'll have to
                     # copy each element in a for-loop
                     cppfile.write("    memcpy(win->%s, lin->%s, sizeof(win->%s));\n" % (m.displayname, m.displayname, m.displayname))
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.cpp b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.cpp
index f5b2c082..1a805312 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_002.cpp
@@ -71,7 +71,14 @@ uint32_t cppIVRRenderModels_IVRRenderModels_002_GetComponentRenderModelName(void
 
 bool cppIVRRenderModels_IVRRenderModels_002_GetComponentState(void *linux_side, const char * pchRenderModelName, const char * pchComponentName, VRControllerState_t * pControllerState, RenderModel_ComponentState_t * pComponentState)
 {
-    return ((IVRRenderModels*)linux_side)->GetComponentState((const char *)pchRenderModelName, (const char *)pchComponentName, (const vr::VRControllerState_t *)pControllerState, (vr::RenderModel_ComponentState_t *)pComponentState);
+    const VRControllerState_t lin;
+    bool _ret;
+    if(pControllerState)
+        struct_const VRControllerState_t_0915_win_to_lin(pControllerState, &lin);
+    _ret = ((IVRRenderModels*)linux_side)->GetComponentState((const char *)pchRenderModelName, (const char *)pchComponentName, pControllerState ? &lin : nullptr, (vr::RenderModel_ComponentState_t *)pComponentState);
+    if(pControllerState)
+        struct_const VRControllerState_t_0915_lin_to_win(&lin, pControllerState);
+    return _ret;
 }
 
 bool cppIVRRenderModels_IVRRenderModels_002_RenderModelHasComponent(void *linux_side, const char * pchRenderModelName, const char * pchComponentName)
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.cpp b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.cpp
index 8e95be0a..dac49e01 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_004.cpp
@@ -81,7 +81,14 @@ uint32_t cppIVRRenderModels_IVRRenderModels_004_GetComponentRenderModelName(void
 
 bool cppIVRRenderModels_IVRRenderModels_004_GetComponentState(void *linux_side, const char * pchRenderModelName, const char * pchComponentName, VRControllerState_t * pControllerState, RenderModel_ControllerMode_State_t * pState, RenderModel_ComponentState_t * pComponentState)
 {
-    return ((IVRRenderModels*)linux_side)->GetComponentState((const char *)pchRenderModelName, (const char *)pchComponentName, (const vr::VRControllerState_t *)pControllerState, (const vr::RenderModel_ControllerMode_State_t *)pState, (vr::RenderModel_ComponentState_t *)pComponentState);
+    const VRControllerState_t lin;
+    bool _ret;
+    if(pControllerState)
+        struct_const VRControllerState_t_0918_win_to_lin(pControllerState, &lin);
+    _ret = ((IVRRenderModels*)linux_side)->GetComponentState((const char *)pchRenderModelName, (const char *)pchComponentName, pControllerState ? &lin : nullptr, (const vr::RenderModel_ControllerMode_State_t *)pState, (vr::RenderModel_ComponentState_t *)pComponentState);
+    if(pControllerState)
+        struct_const VRControllerState_t_0918_lin_to_win(&lin, pControllerState);
+    return _ret;
 }
 
 bool cppIVRRenderModels_IVRRenderModels_004_RenderModelHasComponent(void *linux_side, const char * pchRenderModelName, const char * pchComponentName)
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.cpp b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.cpp
index 601fa7cf..fe716371 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_005.cpp
@@ -86,7 +86,14 @@ uint32_t cppIVRRenderModels_IVRRenderModels_005_GetComponentRenderModelName(void
 
 bool cppIVRRenderModels_IVRRenderModels_005_GetComponentState(void *linux_side, const char * pchRenderModelName, const char * pchComponentName, VRControllerState_t * pControllerState, RenderModel_ControllerMode_State_t * pState, RenderModel_ComponentState_t * pComponentState)
 {
-    return ((IVRRenderModels*)linux_side)->GetComponentState((const char *)pchRenderModelName, (const char *)pchComponentName, (const vr::VRControllerState_t *)pControllerState, (const vr::RenderModel_ControllerMode_State_t *)pState, (vr::RenderModel_ComponentState_t *)pComponentState);
+    const VRControllerState_t lin;
+    bool _ret;
+    if(pControllerState)
+        struct_const VRControllerState_t_1015_win_to_lin(pControllerState, &lin);
+    _ret = ((IVRRenderModels*)linux_side)->GetComponentState((const char *)pchRenderModelName, (const char *)pchComponentName, pControllerState ? &lin : nullptr, (const vr::RenderModel_ControllerMode_State_t *)pState, (vr::RenderModel_ComponentState_t *)pComponentState);
+    if(pControllerState)
+        struct_const VRControllerState_t_1015_lin_to_win(&lin, pControllerState);
+    return _ret;
 }
 
 bool cppIVRRenderModels_IVRRenderModels_005_RenderModelHasComponent(void *linux_side, const char * pchRenderModelName, const char * pchComponentName)
diff --git a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp
index 5b6eab41..2285e46b 100644
--- a/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRRenderModels_IVRRenderModels_006.cpp
@@ -91,7 +91,14 @@ bool cppIVRRenderModels_IVRRenderModels_006_GetComponentStateForDevicePath(void
 
 bool cppIVRRenderModels_IVRRenderModels_006_GetComponentState(void *linux_side, const char * pchRenderModelName, const char * pchComponentName, VRControllerState_t * pControllerState, RenderModel_ControllerMode_State_t * pState, RenderModel_ComponentState_t * pComponentState)
 {
-    return ((IVRRenderModels*)linux_side)->GetComponentState((const char *)pchRenderModelName, (const char *)pchComponentName, (const vr::VRControllerState_t *)pControllerState, (const vr::RenderModel_ControllerMode_State_t *)pState, (vr::RenderModel_ComponentState_t *)pComponentState);
+    const VRControllerState_t lin;
+    bool _ret;
+    if(pControllerState)
+        struct_const VRControllerState_t_1610_win_to_lin(pControllerState, &lin);
+    _ret = ((IVRRenderModels*)linux_side)->GetComponentState((const char *)pchRenderModelName, (const char *)pchComponentName, pControllerState ? &lin : nullptr, (const vr::RenderModel_ControllerMode_State_t *)pState, (vr::RenderModel_ComponentState_t *)pComponentState);
+    if(pControllerState)
+        struct_const VRControllerState_t_1610_lin_to_win(&lin, pControllerState);
+    return _ret;
 }
 
 bool cppIVRRenderModels_IVRRenderModels_006_RenderModelHasComponent(void *linux_side, const char * pchRenderModelName, const char * pchComponentName)
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.cpp
index bf5c0a5c..aba62de4 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_001.cpp
@@ -66,7 +66,14 @@ const vr::CameraVideoStreamFrame_t * cppIVRTrackedCamera_IVRTrackedCamera_001_Ge
 
 bool cppIVRTrackedCamera_IVRTrackedCamera_001_ReleaseVideoStreamFrame(void *linux_side, TrackedDeviceIndex_t nDeviceIndex, CameraVideoStreamFrame_t * pFrameImage)
 {
-    return ((IVRTrackedCamera*)linux_side)->ReleaseVideoStreamFrame((vr::TrackedDeviceIndex_t)nDeviceIndex, (const vr::CameraVideoStreamFrame_t *)pFrameImage);
+    const CameraVideoStreamFrame_t lin;
+    bool _ret;
+    if(pFrameImage)
+        struct_const CameraVideoStreamFrame_t_0914_win_to_lin(pFrameImage, &lin);
+    _ret = ((IVRTrackedCamera*)linux_side)->ReleaseVideoStreamFrame((vr::TrackedDeviceIndex_t)nDeviceIndex, pFrameImage ? &lin : nullptr);
+    if(pFrameImage)
+        struct_const CameraVideoStreamFrame_t_0914_lin_to_win(&lin, pFrameImage);
+    return _ret;
 }
 
 bool cppIVRTrackedCamera_IVRTrackedCamera_001_SetAutoExposure(void *linux_side, TrackedDeviceIndex_t nDeviceIndex, bool bEnable)
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp
index 02393508..83634ed8 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp
@@ -46,7 +46,14 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_ReleaseVideoS
 
 vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamFrameBuffer(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pFrameBuffer, uint32_t nFrameBufferSize, CameraVideoStreamFrameHeader_t * pFrameHeader, uint32_t nFrameHeaderSize)
 {
-    return ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, (vr::CameraVideoStreamFrameHeader_t *)pFrameHeader, (uint32_t)nFrameHeaderSize);
+    CameraVideoStreamFrameHeader_t lin;
+    vr::EVRTrackedCameraError _ret;
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin);
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader);
+    return _ret;
 }
 
 vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamTextureSize(void *linux_side, TrackedDeviceIndex_t nDeviceIndex, EVRTrackedCameraFrameType eFrameType, VRTextureBounds_t * pTextureBounds, uint32_t * pnWidth, uint32_t * pnHeight)
@@ -56,12 +63,26 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStrea
 
 vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamTextureD3D11(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pD3D11DeviceOrResource, void ** ppD3D11ShaderResourceView, CameraVideoStreamFrameHeader_t * pFrameHeader, uint32_t nFrameHeaderSize)
 {
-    return ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, (vr::CameraVideoStreamFrameHeader_t *)pFrameHeader, (uint32_t)nFrameHeaderSize);
+    CameraVideoStreamFrameHeader_t lin;
+    vr::EVRTrackedCameraError _ret;
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin);
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader);
+    return _ret;
 }
 
 vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStreamTextureGL(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, glUInt_t * pglTextureId, CameraVideoStreamFrameHeader_t * pFrameHeader, uint32_t nFrameHeaderSize)
 {
-    return ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, (vr::CameraVideoStreamFrameHeader_t *)pFrameHeader, (uint32_t)nFrameHeaderSize);
+    CameraVideoStreamFrameHeader_t lin;
+    vr::EVRTrackedCameraError _ret;
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin);
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader);
+    return _ret;
 }
 
 vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_ReleaseVideoStreamTextureGL(void *linux_side, TrackedCameraHandle_t hTrackedCamera, glUInt_t glTextureId)
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp
index b1ed1d66..c8b34870 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp
@@ -46,7 +46,14 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_ReleaseVideoS
 
 vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamFrameBuffer(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pFrameBuffer, uint32_t nFrameBufferSize, CameraVideoStreamFrameHeader_t * pFrameHeader, uint32_t nFrameHeaderSize)
 {
-    return ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, (vr::CameraVideoStreamFrameHeader_t *)pFrameHeader, (uint32_t)nFrameHeaderSize);
+    CameraVideoStreamFrameHeader_t lin;
+    vr::EVRTrackedCameraError _ret;
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin);
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader);
+    return _ret;
 }
 
 vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamTextureSize(void *linux_side, TrackedDeviceIndex_t nDeviceIndex, EVRTrackedCameraFrameType eFrameType, VRTextureBounds_t * pTextureBounds, uint32_t * pnWidth, uint32_t * pnHeight)
@@ -56,12 +63,26 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStrea
 
 vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamTextureD3D11(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, void * pD3D11DeviceOrResource, void ** ppD3D11ShaderResourceView, CameraVideoStreamFrameHeader_t * pFrameHeader, uint32_t nFrameHeaderSize)
 {
-    return ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, (vr::CameraVideoStreamFrameHeader_t *)pFrameHeader, (uint32_t)nFrameHeaderSize);
+    CameraVideoStreamFrameHeader_t lin;
+    vr::EVRTrackedCameraError _ret;
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin);
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader);
+    return _ret;
 }
 
 vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStreamTextureGL(void *linux_side, TrackedCameraHandle_t hTrackedCamera, EVRTrackedCameraFrameType eFrameType, glUInt_t * pglTextureId, CameraVideoStreamFrameHeader_t * pFrameHeader, uint32_t nFrameHeaderSize)
 {
-    return ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, (vr::CameraVideoStreamFrameHeader_t *)pFrameHeader, (uint32_t)nFrameHeaderSize);
+    CameraVideoStreamFrameHeader_t lin;
+    vr::EVRTrackedCameraError _ret;
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin);
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    if(pFrameHeader)
+        struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader);
+    return _ret;
 }
 
 vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_ReleaseVideoStreamTextureGL(void *linux_side, TrackedCameraHandle_t hTrackedCamera, glUInt_t glTextureId)
diff --git a/vrclient_x64/vrclient_x64/struct_converters_090.cpp b/vrclient_x64/vrclient_x64/struct_converters_090.cpp
index 72f8fb7e..03f818c1 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_090.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_090.cpp
@@ -114,7 +114,7 @@ struct RenderModel_t *struct_RenderModel_t_090_unwrap(winRenderModel_t_090 *w)
 struct winVREvent_t_090 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -165,7 +165,7 @@ struct winCompositor_FrameTiming_090 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_091.cpp b/vrclient_x64/vrclient_x64/struct_converters_091.cpp
index 9b1b8f64..7197ac22 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_091.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_091.cpp
@@ -114,7 +114,7 @@ struct RenderModel_t *struct_RenderModel_t_091_unwrap(winRenderModel_t_091 *w)
 struct winVREvent_t_091 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -165,7 +165,7 @@ struct winCompositor_FrameTiming_091 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0910.cpp b/vrclient_x64/vrclient_x64/struct_converters_0910.cpp
index 92400260..3ff1bcae 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0910.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0910.cpp
@@ -114,7 +114,7 @@ struct RenderModel_t *struct_RenderModel_t_0910_unwrap(winRenderModel_t_0910 *w)
 struct winVREvent_t_0910 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -165,7 +165,7 @@ struct winCompositor_FrameTiming_0910 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
     float prediction;
     float m_flFrameIntervalMs;
     float m_flSceneRenderCpuMs;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0912.cpp b/vrclient_x64/vrclient_x64/struct_converters_0912.cpp
index 48e94aad..7afe9b36 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0912.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0912.cpp
@@ -10,7 +10,7 @@ extern "C" {
 struct winVREvent_t_0912 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -67,7 +67,7 @@ struct winCameraVideoStreamFrame_t_0912 {
     double m_flFrameElapsedTime;
     double m_flFrameCaptureTime;
     bool m_bPoseIsValid;
-    vr::HmdMatrix34_t m_matDeviceToAbsoluteTracking;
+    vr::HmdMatrix34_t m_matDeviceToAbsoluteTracking __attribute__((aligned(4)));
     float m_Pad[4];
     void * m_pImageData;
 }  __attribute__ ((ms_struct));
@@ -120,7 +120,7 @@ struct winCompositor_FrameTiming_0912 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
     float prediction;
     float m_flFrameIntervalMs;
     float m_flSceneRenderCpuMs;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0913.cpp b/vrclient_x64/vrclient_x64/struct_converters_0913.cpp
index 84e2f321..4b241017 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0913.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0913.cpp
@@ -10,7 +10,7 @@ extern "C" {
 struct winVREvent_t_0913 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -67,7 +67,7 @@ struct winCameraVideoStreamFrame_t_0913 {
     double m_flFrameElapsedTime;
     double m_flFrameCaptureTime;
     bool m_bPoseIsValid;
-    vr::HmdMatrix34_t m_matDeviceToAbsoluteTracking;
+    vr::HmdMatrix34_t m_matDeviceToAbsoluteTracking __attribute__((aligned(4)));
     float m_Pad[4];
     void * m_pImageData;
 }  __attribute__ ((ms_struct));
@@ -120,7 +120,7 @@ struct winCompositor_FrameTiming_0913 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
     float prediction;
     float m_flFrameIntervalMs;
     float m_flSceneRenderCpuMs;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0914.cpp b/vrclient_x64/vrclient_x64/struct_converters_0914.cpp
index 3edce5b5..69f1699d 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0914.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0914.cpp
@@ -10,7 +10,7 @@ extern "C" {
 struct winVREvent_t_0914 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -71,7 +71,7 @@ struct winCameraVideoStreamFrame_t_0914 {
     double m_flFrameCaptureTime;
     uint64_t m_nFrameCaptureTicks;
     bool m_bPoseIsValid;
-    vr::HmdMatrix34_t m_matDeviceToAbsoluteTracking;
+    vr::HmdMatrix34_t m_matDeviceToAbsoluteTracking __attribute__((aligned(4)));
     float m_Pad[4];
     void * m_pImageData;
 }  __attribute__ ((ms_struct));
@@ -132,7 +132,7 @@ struct winCompositor_FrameTiming_0914 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
     float prediction;
     float m_flFrameIntervalMs;
     float m_flSceneRenderCpuMs;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0915.cpp b/vrclient_x64/vrclient_x64/struct_converters_0915.cpp
index 6938a131..5682c791 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0915.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0915.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_0915 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0916.cpp b/vrclient_x64/vrclient_x64/struct_converters_0916.cpp
index 62ef0dac..b4e0bffc 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0916.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0916.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_0916 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0917.cpp b/vrclient_x64/vrclient_x64/struct_converters_0917.cpp
index 78ccdee8..bf2861ae 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0917.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0917.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_0917 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0918.cpp b/vrclient_x64/vrclient_x64/struct_converters_0918.cpp
index af1824b0..4eacfb7e 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0918.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0918.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_0918 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0919.cpp b/vrclient_x64/vrclient_x64/struct_converters_0919.cpp
index 0c99d284..accb6504 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0919.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0919.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_0919 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_092.cpp b/vrclient_x64/vrclient_x64/struct_converters_092.cpp
index 96d3f4f6..e5db5659 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_092.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_092.cpp
@@ -114,7 +114,7 @@ struct RenderModel_t *struct_RenderModel_t_092_unwrap(winRenderModel_t_092 *w)
 struct winVREvent_t_092 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -165,7 +165,7 @@ struct winCompositor_FrameTiming_092 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_0920.cpp b/vrclient_x64/vrclient_x64/struct_converters_0920.cpp
index 01fdb6dd..81b94145 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_0920.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_0920.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_0920 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_093.cpp b/vrclient_x64/vrclient_x64/struct_converters_093.cpp
index b9592b54..00379e17 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_093.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_093.cpp
@@ -114,7 +114,7 @@ struct RenderModel_t *struct_RenderModel_t_093_unwrap(winRenderModel_t_093 *w)
 struct winVREvent_t_093 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -165,7 +165,7 @@ struct winCompositor_FrameTiming_093 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
     float prediction;
     float m_flFrameIntervalMs;
     float m_flSceneRenderCpuMs;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_094.cpp b/vrclient_x64/vrclient_x64/struct_converters_094.cpp
index 52adbd88..f4ae33e9 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_094.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_094.cpp
@@ -114,7 +114,7 @@ struct RenderModel_t *struct_RenderModel_t_094_unwrap(winRenderModel_t_094 *w)
 struct winVREvent_t_094 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -165,7 +165,7 @@ struct winCompositor_FrameTiming_094 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
     float prediction;
     float m_flFrameIntervalMs;
     float m_flSceneRenderCpuMs;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_096.cpp b/vrclient_x64/vrclient_x64/struct_converters_096.cpp
index 8107a66e..ba791fff 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_096.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_096.cpp
@@ -114,7 +114,7 @@ struct RenderModel_t *struct_RenderModel_t_096_unwrap(winRenderModel_t_096 *w)
 struct winVREvent_t_096 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -165,7 +165,7 @@ struct winCompositor_FrameTiming_096 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
     float prediction;
     float m_flFrameIntervalMs;
     float m_flSceneRenderCpuMs;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_097.cpp b/vrclient_x64/vrclient_x64/struct_converters_097.cpp
index 49651c5a..4ad9e3bd 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_097.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_097.cpp
@@ -114,7 +114,7 @@ struct RenderModel_t *struct_RenderModel_t_097_unwrap(winRenderModel_t_097 *w)
 struct winVREvent_t_097 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -165,7 +165,7 @@ struct winCompositor_FrameTiming_097 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
     float prediction;
     float m_flFrameIntervalMs;
     float m_flSceneRenderCpuMs;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_098.cpp b/vrclient_x64/vrclient_x64/struct_converters_098.cpp
index c42296f9..f61a43cf 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_098.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_098.cpp
@@ -114,7 +114,7 @@ struct RenderModel_t *struct_RenderModel_t_098_unwrap(winRenderModel_t_098 *w)
 struct winVREvent_t_098 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -165,7 +165,7 @@ struct winCompositor_FrameTiming_098 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
     float prediction;
     float m_flFrameIntervalMs;
     float m_flSceneRenderCpuMs;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_099.cpp b/vrclient_x64/vrclient_x64/struct_converters_099.cpp
index 09cfdfa3..1349a7e8 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_099.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_099.cpp
@@ -114,7 +114,7 @@ struct RenderModel_t *struct_RenderModel_t_099_unwrap(winRenderModel_t_099 *w)
 struct winVREvent_t_099 {
     vr::EVREventType eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
     float eventAgeSeconds;
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
@@ -165,7 +165,7 @@ struct winCompositor_FrameTiming_099 {
     float frameVSync;
     uint32_t droppedFrames;
     uint32_t frameIndex;
-    vr::TrackedDevicePose_t pose;
+    vr::TrackedDevicePose_t pose __attribute__((aligned(4)));
     float prediction;
     float m_flFrameIntervalMs;
     float m_flSceneRenderCpuMs;
diff --git a/vrclient_x64/vrclient_x64/struct_converters_100.cpp b/vrclient_x64/vrclient_x64/struct_converters_100.cpp
index ed23619f..dc1f15c8 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_100.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_100.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_100 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_101.cpp b/vrclient_x64/vrclient_x64/struct_converters_101.cpp
index e3e8e543..1ecdf6c6 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_101.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_101.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_101 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1010.cpp b/vrclient_x64/vrclient_x64/struct_converters_1010.cpp
index 48dc4e19..8dc32b9c 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1010.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1010.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1010 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1011.cpp b/vrclient_x64/vrclient_x64/struct_converters_1011.cpp
index 710d96a8..4ceeb3e2 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1011.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1011.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1011 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1012.cpp b/vrclient_x64/vrclient_x64/struct_converters_1012.cpp
index b9e5744c..baa505db 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1012.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1012.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1012 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1013.cpp b/vrclient_x64/vrclient_x64/struct_converters_1013.cpp
index 82901f27..631a9292 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1013.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1013.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1013 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1014.cpp b/vrclient_x64/vrclient_x64/struct_converters_1014.cpp
index ac21a2e7..29b9c02f 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1014.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1014.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1014 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1015.cpp b/vrclient_x64/vrclient_x64/struct_converters_1015.cpp
index 3473102e..7361c4d3 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1015.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1015.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1015 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1016.cpp b/vrclient_x64/vrclient_x64/struct_converters_1016.cpp
index cd219650..f5e1614f 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1016.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1016.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1016 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1017.cpp b/vrclient_x64/vrclient_x64/struct_converters_1017.cpp
index 832914da..3f8c9050 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1017.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1017.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1017 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_102.cpp b/vrclient_x64/vrclient_x64/struct_converters_102.cpp
index 5b1b79f0..41315c86 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_102.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_102.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_102 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
@@ -88,7 +88,7 @@ struct winCompositor_FrameTiming_102 {
     float m_flCompositorUpdateStartMs;
     float m_flCompositorUpdateEndMs;
     float m_flCompositorRenderStartMs;
-    vr::TrackedDevicePose_t m_HmdPose;
+    vr::TrackedDevicePose_t m_HmdPose __attribute__((aligned(4)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_103.cpp b/vrclient_x64/vrclient_x64/struct_converters_103.cpp
index f4817ca0..42b8e737 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_103.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_103.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_103 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
@@ -88,7 +88,7 @@ struct winCompositor_FrameTiming_103 {
     float m_flCompositorUpdateStartMs;
     float m_flCompositorUpdateEndMs;
     float m_flCompositorRenderStartMs;
-    vr::TrackedDevicePose_t m_HmdPose;
+    vr::TrackedDevicePose_t m_HmdPose __attribute__((aligned(4)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_103a.cpp b/vrclient_x64/vrclient_x64/struct_converters_103a.cpp
index 24987800..2be1b19f 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_103a.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_103a.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_103a {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_104.cpp b/vrclient_x64/vrclient_x64/struct_converters_104.cpp
index 3d0009ba..f03400a7 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_104.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_104.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_104 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_105.cpp b/vrclient_x64/vrclient_x64/struct_converters_105.cpp
index 491343e0..b7305afc 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_105.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_105.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_105 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_106.cpp b/vrclient_x64/vrclient_x64/struct_converters_106.cpp
index cd42ddc3..2a6906d6 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_106.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_106.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_106 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_107.cpp b/vrclient_x64/vrclient_x64/struct_converters_107.cpp
index aa71e58a..bd2bb7a0 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_107.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_107.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_107 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_108.cpp b/vrclient_x64/vrclient_x64/struct_converters_108.cpp
index ca0bb7d0..fac7cfe1 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_108.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_108.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_108 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_109.cpp b/vrclient_x64/vrclient_x64/struct_converters_109.cpp
index 780505cb..d7ccfe08 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_109.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_109.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_109 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_113b.cpp b/vrclient_x64/vrclient_x64/struct_converters_113b.cpp
index 2ed12d48..07b6d85f 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_113b.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_113b.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_113b {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1210.cpp b/vrclient_x64/vrclient_x64/struct_converters_1210.cpp
index bcacb86b..9eefca1c 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1210.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1210.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1210 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1322.cpp b/vrclient_x64/vrclient_x64/struct_converters_1322.cpp
index 520f9e95..b7921d2e 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1322.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1322.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1322 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1418.cpp b/vrclient_x64/vrclient_x64/struct_converters_1418.cpp
index 044ffe28..04ff1346 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1418.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1418.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1418 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1517.cpp b/vrclient_x64/vrclient_x64/struct_converters_1517.cpp
index 7414efd3..15ec0c04 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1517.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1517.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1517 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)
 
diff --git a/vrclient_x64/vrclient_x64/struct_converters_1610.cpp b/vrclient_x64/vrclient_x64/struct_converters_1610.cpp
index bcf8cff4..f56f5622 100644
--- a/vrclient_x64/vrclient_x64/struct_converters_1610.cpp
+++ b/vrclient_x64/vrclient_x64/struct_converters_1610.cpp
@@ -11,7 +11,7 @@ struct winVREvent_t_1610 {
     uint32_t eventType;
     vr::TrackedDeviceIndex_t trackedDeviceIndex;
     float eventAgeSeconds;
-    vr::VREvent_Data_t data;
+    vr::VREvent_Data_t data __attribute__((aligned(8)));
 }  __attribute__ ((ms_struct));
 #pragma pack(pop)