diff --git a/vrclient_x64/gen_wrapper.py b/vrclient_x64/gen_wrapper.py
index 85069bf1..fb52cf35 100755
--- a/vrclient_x64/gen_wrapper.py
+++ b/vrclient_x64/gen_wrapper.py
@@ -594,6 +594,7 @@ def handle_method_cpp(method, classname, cppname, cpp):
         cpp.write("        struct_%s_%s_win_to_lin(%s, &lin);\n" % (strip_ns(do_win_to_lin[0]), display_sdkver(sdkver), do_win_to_lin[1]))
 
 
+    size_fixup = {}
     convert_size_param = ""
     params = list(zip(names[1:], method.get_arguments()))
     params += [(None, None)] # for next_name, next_param
@@ -607,12 +608,14 @@ def handle_method_cpp(method, classname, cppname, cpp):
             convert_size_param = ', -1'
         elif struct_needs_size_adjustment(real_type.get_canonical()):
             real_name = real_type.spelling
-            cpp.write(f'    {next_name} = std::min({next_name}, (uint32_t)sizeof({real_name}));\n')
+            cpp.write(f'    uint32_t lin_{next_name} = std::min({next_name}, (uint32_t)sizeof({real_name}));\n')
             convert_size_param = f', {next_name}'
+            size_fixup[next_name] = True
         elif do_win_to_lin and do_win_to_lin[1] == name:
             assert do_win_to_lin[0] not in STRUCTS_NEXT_IS_SIZE_UNHANDLED
-            cpp.write(f'    {next_name} = {next_name} ? sizeof(lin) : 0;\n')
+            cpp.write(f'    uint32_t lin_{next_name} = {next_name} ? sizeof(lin) : 0;\n')
             convert_size_param = f', {next_name}'
+            size_fixup[next_name] = True
 
 
     if method.result_type.kind == TypeKind.VOID:
@@ -624,7 +627,9 @@ def handle_method_cpp(method, classname, cppname, cpp):
 
     params = []
     for name, param in zip(names[1:], method.get_arguments()):
-        if do_lin_to_win and do_lin_to_win[1] == name or \
+        if name in size_fixup:
+            params.append(f'lin_{name}')
+        elif do_lin_to_win and do_lin_to_win[1] == name or \
                 do_win_to_lin and do_win_to_lin[1] == name or \
                 do_wrap and do_wrap[1] == name:
             params.append("%s ? &lin : nullptr" % name)
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp
index b86ae369..652bee9b 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_003.cpp
@@ -40,8 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetDigitalActionData(void *linux_side
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputDigitalActionData_t_1015_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize);
     if(pActionData)
         struct_InputDigitalActionData_t_1015_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -53,8 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetAnalogActionData(void *linux_side,
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputAnalogActionData_t_1015_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize);
     if(pActionData)
         struct_InputAnalogActionData_t_1015_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -66,8 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetPoseActionData(void *linux_side, V
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputPoseActionData_t_1015_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, lin_unActionDataSize);
     if(pActionData)
         struct_InputPoseActionData_t_1015_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -112,8 +112,8 @@ vr::EVRInputError cppIVRInput_IVRInput_003_GetOriginLocalizedName(void *linux_si
 
 vr::EVRInputError cppIVRInput_IVRInput_003_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
 {
-    unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
-    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize);
+    uint32_t lin_unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
+    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, lin_unOriginInfoSize);
 }
 
 vr::EVRInputError cppIVRInput_IVRInput_003_ShowActionOrigins(void *linux_side, VRActionSetHandle_t actionSetHandle, VRActionHandle_t ulActionHandle)
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp
index cd5bb1da..c26ac1b6 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_004.cpp
@@ -40,8 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetDigitalActionData(void *linux_side
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputDigitalActionData_t_1017_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputDigitalActionData_t_1017_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -53,8 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetAnalogActionData(void *linux_side,
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputAnalogActionData_t_1017_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputAnalogActionData_t_1017_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -66,8 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetPoseActionData(void *linux_side, V
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputPoseActionData_t_1017_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputPoseActionData_t_1017_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -79,8 +79,8 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetSkeletalActionData(void *linux_sid
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputSkeletalActionData_t_1017_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputSkeletalActionData_t_1017_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -118,8 +118,8 @@ vr::EVRInputError cppIVRInput_IVRInput_004_GetOriginLocalizedName(void *linux_si
 
 vr::EVRInputError cppIVRInput_IVRInput_004_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
 {
-    unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
-    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize);
+    uint32_t lin_unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
+    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, lin_unOriginInfoSize);
 }
 
 vr::EVRInputError cppIVRInput_IVRInput_004_ShowActionOrigins(void *linux_side, VRActionSetHandle_t actionSetHandle, VRActionHandle_t ulActionHandle)
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp
index 2906a5c6..84ce955f 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_005.cpp
@@ -40,8 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetDigitalActionData(void *linux_side
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputDigitalActionData_t_1322_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputDigitalActionData_t_1322_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -53,8 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetAnalogActionData(void *linux_side,
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputAnalogActionData_t_1322_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputAnalogActionData_t_1322_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -66,8 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetPoseActionData(void *linux_side, V
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputPoseActionData_t_1322_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetPoseActionData((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputPoseActionData_t_1322_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -79,8 +79,8 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetSkeletalActionData(void *linux_sid
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputSkeletalActionData_t_1322_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize);
     if(pActionData)
         struct_InputSkeletalActionData_t_1322_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -148,8 +148,8 @@ vr::EVRInputError cppIVRInput_IVRInput_005_GetOriginLocalizedName(void *linux_si
 
 vr::EVRInputError cppIVRInput_IVRInput_005_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
 {
-    unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
-    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize);
+    uint32_t lin_unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
+    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, lin_unOriginInfoSize);
 }
 
 vr::EVRInputError cppIVRInput_IVRInput_005_ShowActionOrigins(void *linux_side, VRActionSetHandle_t actionSetHandle, VRActionHandle_t ulActionHandle)
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp
index ad751d4b..48456e0b 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_006.cpp
@@ -40,8 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetDigitalActionData(void *linux_side
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputDigitalActionData_t_1418_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputDigitalActionData_t_1418_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -53,8 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetAnalogActionData(void *linux_side,
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputAnalogActionData_t_1418_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputAnalogActionData_t_1418_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -66,8 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetPoseActionDataRelativeToNow(void *
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputPoseActionData_t_1418_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputPoseActionData_t_1418_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -79,8 +79,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetPoseActionDataForNextFrame(void *l
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputPoseActionData_t_1418_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputPoseActionData_t_1418_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -92,8 +92,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetSkeletalActionData(void *linux_sid
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputSkeletalActionData_t_1418_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize);
     if(pActionData)
         struct_InputSkeletalActionData_t_1418_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -161,8 +161,8 @@ vr::EVRInputError cppIVRInput_IVRInput_006_GetOriginLocalizedName(void *linux_si
 
 vr::EVRInputError cppIVRInput_IVRInput_006_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
 {
-    unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
-    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize);
+    uint32_t lin_unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
+    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, lin_unOriginInfoSize);
 }
 
 vr::EVRInputError cppIVRInput_IVRInput_006_ShowActionOrigins(void *linux_side, VRActionSetHandle_t actionSetHandle, VRActionHandle_t ulActionHandle)
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp
index ca706933..0aa9e1af 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_007.cpp
@@ -40,8 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetDigitalActionData(void *linux_side
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputDigitalActionData_t_1916_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputDigitalActionData_t_1916_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -53,8 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetAnalogActionData(void *linux_side,
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputAnalogActionData_t_1916_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputAnalogActionData_t_1916_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -66,8 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetPoseActionDataRelativeToNow(void *
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputPoseActionData_t_1916_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputPoseActionData_t_1916_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -79,8 +79,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetPoseActionDataForNextFrame(void *l
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputPoseActionData_t_1916_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputPoseActionData_t_1916_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -92,8 +92,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetSkeletalActionData(void *linux_sid
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputSkeletalActionData_t_1916_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize);
     if(pActionData)
         struct_InputSkeletalActionData_t_1916_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -161,8 +161,8 @@ vr::EVRInputError cppIVRInput_IVRInput_007_GetOriginLocalizedName(void *linux_si
 
 vr::EVRInputError cppIVRInput_IVRInput_007_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
 {
-    unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
-    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize);
+    uint32_t lin_unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
+    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, lin_unOriginInfoSize);
 }
 
 vr::EVRInputError cppIVRInput_IVRInput_007_GetActionBindingInfo(void *linux_side, VRActionHandle_t action, InputBindingInfo_t *pOriginInfo, uint32_t unBindingInfoSize, uint32_t unBindingInfoCount, uint32_t *punReturnedBindingInfoCount)
diff --git a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp
index 113ffe33..82a33cb6 100644
--- a/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRInput_IVRInput_010.cpp
@@ -40,8 +40,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetDigitalActionData(void *linux_side
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputDigitalActionData_t_1267_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetDigitalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputDigitalActionData_t_1267_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -53,8 +53,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetAnalogActionData(void *linux_side,
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputAnalogActionData_t_1267_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetAnalogActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputAnalogActionData_t_1267_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -66,8 +66,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataRelativeToNow(void *
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputPoseActionData_t_1267_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetPoseActionDataRelativeToNow((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, (float)fPredictedSecondsFromNow, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputPoseActionData_t_1267_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -79,8 +79,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetPoseActionDataForNextFrame(void *l
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputPoseActionData_t_1267_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetPoseActionDataForNextFrame((vr::VRActionHandle_t)action, (vr::ETrackingUniverseOrigin)eOrigin, pActionData ? &lin : nullptr, lin_unActionDataSize, (vr::VRInputValueHandle_t)ulRestrictToDevice);
     if(pActionData)
         struct_InputPoseActionData_t_1267_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -92,8 +92,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetSkeletalActionData(void *linux_sid
     vr::EVRInputError _ret;
     if(pActionData)
         struct_InputSkeletalActionData_t_1267_win_to_lin(pActionData, &lin);
-    unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
-    _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, (uint32_t)unActionDataSize);
+    uint32_t lin_unActionDataSize = unActionDataSize ? sizeof(lin) : 0;
+    _ret = ((IVRInput*)linux_side)->GetSkeletalActionData((vr::VRActionHandle_t)action, pActionData ? &lin : nullptr, lin_unActionDataSize);
     if(pActionData)
         struct_InputSkeletalActionData_t_1267_lin_to_win(&lin, pActionData, unActionDataSize);
     return _ret;
@@ -171,8 +171,8 @@ vr::EVRInputError cppIVRInput_IVRInput_010_GetOriginLocalizedName(void *linux_si
 
 vr::EVRInputError cppIVRInput_IVRInput_010_GetOriginTrackedDeviceInfo(void *linux_side, VRInputValueHandle_t origin, InputOriginInfo_t *pOriginInfo, uint32_t unOriginInfoSize)
 {
-    unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
-    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, (uint32_t)unOriginInfoSize);
+    uint32_t lin_unOriginInfoSize = std::min(unOriginInfoSize, (uint32_t)sizeof(vr::InputOriginInfo_t));
+    return ((IVRInput*)linux_side)->GetOriginTrackedDeviceInfo((vr::VRInputValueHandle_t)origin, (vr::InputOriginInfo_t *)pOriginInfo, lin_unOriginInfoSize);
 }
 
 vr::EVRInputError cppIVRInput_IVRInput_010_GetActionBindingInfo(void *linux_side, VRActionHandle_t action, InputBindingInfo_t *pOriginInfo, uint32_t unBindingInfoSize, uint32_t unBindingInfoCount, uint32_t *punReturnedBindingInfoCount)
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp
index 1192b9c9..5bcaeb82 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_010.cpp
@@ -185,8 +185,8 @@ bool cppIVROverlay_IVROverlay_010_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_0918_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_0918_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp
index a6a83ef8..8106b1e4 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_011.cpp
@@ -195,8 +195,8 @@ bool cppIVROverlay_IVROverlay_011_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_0920_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_0920_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp
index 8993e805..43b67f1f 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_012.cpp
@@ -195,8 +195,8 @@ bool cppIVROverlay_IVROverlay_012_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_101_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_101_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp
index aa5639d7..47ac4810 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_013.cpp
@@ -215,8 +215,8 @@ bool cppIVROverlay_IVROverlay_013_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_104_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_104_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp
index 6ab08e94..cad74f13 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_014.cpp
@@ -215,8 +215,8 @@ bool cppIVROverlay_IVROverlay_014_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_106_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_106_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp
index 7cd2831d..8d08ca0c 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_016.cpp
@@ -240,8 +240,8 @@ bool cppIVROverlay_IVROverlay_016_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1010_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1010_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp
index a35cb73b..43050be8 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_017.cpp
@@ -240,8 +240,8 @@ bool cppIVROverlay_IVROverlay_017_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1011_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1011_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp
index 1b292a23..8aa2bebb 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_018.cpp
@@ -240,8 +240,8 @@ bool cppIVROverlay_IVROverlay_018_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1017_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1017_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp
index 9687bc0b..5e3085cd 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_019.cpp
@@ -240,8 +240,8 @@ bool cppIVROverlay_IVROverlay_019_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1610_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1610_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp
index 605877b9..aec68a66 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_020.cpp
@@ -230,8 +230,8 @@ bool cppIVROverlay_IVROverlay_020_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1715_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1715_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp
index 83b27869..e6eb5533 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_021.cpp
@@ -230,8 +230,8 @@ bool cppIVROverlay_IVROverlay_021_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1819_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1819_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp
index 4ee24b92..773d635c 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_022.cpp
@@ -245,8 +245,8 @@ bool cppIVROverlay_IVROverlay_022_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1916_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1916_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp
index 608cdc7f..b2ea8d6c 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_024.cpp
@@ -235,8 +235,8 @@ bool cppIVROverlay_IVROverlay_024_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_11415_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_11415_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp
index da058339..6cf6483a 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_025.cpp
@@ -240,8 +240,8 @@ bool cppIVROverlay_IVROverlay_025_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1168_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1168_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp
index f94f0453..329ff6dc 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_026.cpp
@@ -255,8 +255,8 @@ bool cppIVROverlay_IVROverlay_026_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1237_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1237_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp
index 4848f146..951171d6 100644
--- a/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVROverlay_IVROverlay_027.cpp
@@ -245,8 +245,8 @@ bool cppIVROverlay_IVROverlay_027_PollNextOverlayEvent(void *linux_side, VROverl
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1267_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVROverlay*)linux_side)->PollNextOverlayEvent((vr::VROverlayHandle_t)ulOverlayHandle, pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1267_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp
index 11dfb7d5..2dcdf9f5 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_011.cpp
@@ -155,8 +155,8 @@ bool cppIVRSystem_IVRSystem_011_PollNextEvent(void *linux_side, winVREvent_t_091
     bool _ret;
     if(pEvent)
         struct_VREvent_t_0918_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_0918_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -168,8 +168,8 @@ bool cppIVRSystem_IVRSystem_011_PollNextEventWithPose(void *linux_side, ETrackin
     bool _ret;
     if(pEvent)
         struct_VREvent_t_0918_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pEvent)
         struct_VREvent_t_0918_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp
index 79c517cb..b638e97c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_012.cpp
@@ -155,8 +155,8 @@ bool cppIVRSystem_IVRSystem_012_PollNextEvent(void *linux_side, winVREvent_t_103
     bool _ret;
     if(pEvent)
         struct_VREvent_t_103_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_103_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -168,8 +168,8 @@ bool cppIVRSystem_IVRSystem_012_PollNextEventWithPose(void *linux_side, ETrackin
     bool _ret;
     if(pEvent)
         struct_VREvent_t_103_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pEvent)
         struct_VREvent_t_103_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp
index da761d3b..2ffecf54 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_014.cpp
@@ -155,8 +155,8 @@ bool cppIVRSystem_IVRSystem_014_PollNextEvent(void *linux_side, winVREvent_t_104
     bool _ret;
     if(pEvent)
         struct_VREvent_t_104_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_104_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -168,8 +168,8 @@ bool cppIVRSystem_IVRSystem_014_PollNextEventWithPose(void *linux_side, ETrackin
     bool _ret;
     if(pEvent)
         struct_VREvent_t_104_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pEvent)
         struct_VREvent_t_104_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -191,8 +191,8 @@ bool cppIVRSystem_IVRSystem_014_GetControllerState(void *linux_side, TrackedDevi
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_104_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize);
     if(pControllerState)
         struct_VRControllerState001_t_104_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
@@ -204,8 +204,8 @@ bool cppIVRSystem_IVRSystem_014_GetControllerStateWithPose(void *linux_side, ETr
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_104_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pControllerState)
         struct_VRControllerState001_t_104_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp
index 0820c227..e196a616 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_015.cpp
@@ -155,8 +155,8 @@ bool cppIVRSystem_IVRSystem_015_PollNextEvent(void *linux_side, winVREvent_t_107
     bool _ret;
     if(pEvent)
         struct_VREvent_t_107_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_107_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -168,8 +168,8 @@ bool cppIVRSystem_IVRSystem_015_PollNextEventWithPose(void *linux_side, ETrackin
     bool _ret;
     if(pEvent)
         struct_VREvent_t_107_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pEvent)
         struct_VREvent_t_107_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -191,8 +191,8 @@ bool cppIVRSystem_IVRSystem_015_GetControllerState(void *linux_side, TrackedDevi
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_107_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize);
     if(pControllerState)
         struct_VRControllerState001_t_107_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
@@ -204,8 +204,8 @@ bool cppIVRSystem_IVRSystem_015_GetControllerStateWithPose(void *linux_side, ETr
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_107_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pControllerState)
         struct_VRControllerState001_t_107_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp
index 89b11e9a..fbbfb4bd 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_016.cpp
@@ -160,8 +160,8 @@ bool cppIVRSystem_IVRSystem_016_PollNextEvent(void *linux_side, winVREvent_t_109
     bool _ret;
     if(pEvent)
         struct_VREvent_t_109_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_109_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -173,8 +173,8 @@ bool cppIVRSystem_IVRSystem_016_PollNextEventWithPose(void *linux_side, ETrackin
     bool _ret;
     if(pEvent)
         struct_VREvent_t_109_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pEvent)
         struct_VREvent_t_109_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -196,8 +196,8 @@ bool cppIVRSystem_IVRSystem_016_GetControllerState(void *linux_side, TrackedDevi
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_109_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize);
     if(pControllerState)
         struct_VRControllerState001_t_109_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
@@ -209,8 +209,8 @@ bool cppIVRSystem_IVRSystem_016_GetControllerStateWithPose(void *linux_side, ETr
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_109_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pControllerState)
         struct_VRControllerState001_t_109_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp
index 43203db9..3fd42885 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_017.cpp
@@ -160,8 +160,8 @@ bool cppIVRSystem_IVRSystem_017_PollNextEvent(void *linux_side, winVREvent_t_101
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1011_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1011_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -173,8 +173,8 @@ bool cppIVRSystem_IVRSystem_017_PollNextEventWithPose(void *linux_side, ETrackin
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1011_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pEvent)
         struct_VREvent_t_1011_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -196,8 +196,8 @@ bool cppIVRSystem_IVRSystem_017_GetControllerState(void *linux_side, TrackedDevi
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_1011_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize);
     if(pControllerState)
         struct_VRControllerState001_t_1011_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
@@ -209,8 +209,8 @@ bool cppIVRSystem_IVRSystem_017_GetControllerStateWithPose(void *linux_side, ETr
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_1011_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pControllerState)
         struct_VRControllerState001_t_1011_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp
index cd206ea9..ea4a6b6c 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_019.cpp
@@ -165,8 +165,8 @@ bool cppIVRSystem_IVRSystem_019_PollNextEvent(void *linux_side, winVREvent_t_141
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1418_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1418_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -178,8 +178,8 @@ bool cppIVRSystem_IVRSystem_019_PollNextEventWithPose(void *linux_side, ETrackin
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1418_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pEvent)
         struct_VREvent_t_1418_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -201,8 +201,8 @@ bool cppIVRSystem_IVRSystem_019_GetControllerState(void *linux_side, TrackedDevi
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_1418_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize);
     if(pControllerState)
         struct_VRControllerState001_t_1418_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
@@ -214,8 +214,8 @@ bool cppIVRSystem_IVRSystem_019_GetControllerStateWithPose(void *linux_side, ETr
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_1418_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pControllerState)
         struct_VRControllerState001_t_1418_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp
index acb13dd6..954005f9 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_020.cpp
@@ -165,8 +165,8 @@ bool cppIVRSystem_IVRSystem_020_PollNextEvent(void *linux_side, winVREvent_t_171
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1715_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1715_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -178,8 +178,8 @@ bool cppIVRSystem_IVRSystem_020_PollNextEventWithPose(void *linux_side, ETrackin
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1715_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pEvent)
         struct_VREvent_t_1715_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -201,8 +201,8 @@ bool cppIVRSystem_IVRSystem_020_GetControllerState(void *linux_side, TrackedDevi
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_1715_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize);
     if(pControllerState)
         struct_VRControllerState001_t_1715_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
@@ -214,8 +214,8 @@ bool cppIVRSystem_IVRSystem_020_GetControllerStateWithPose(void *linux_side, ETr
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_1715_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pControllerState)
         struct_VRControllerState001_t_1715_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp
index 4008f7ae..63b16bcb 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_021.cpp
@@ -165,8 +165,8 @@ bool cppIVRSystem_IVRSystem_021_PollNextEvent(void *linux_side, winVREvent_t_112
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1125_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1125_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -178,8 +178,8 @@ bool cppIVRSystem_IVRSystem_021_PollNextEventWithPose(void *linux_side, ETrackin
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1125_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pEvent)
         struct_VREvent_t_1125_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -201,8 +201,8 @@ bool cppIVRSystem_IVRSystem_021_GetControllerState(void *linux_side, TrackedDevi
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_1125_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize);
     if(pControllerState)
         struct_VRControllerState001_t_1125_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
@@ -214,8 +214,8 @@ bool cppIVRSystem_IVRSystem_021_GetControllerStateWithPose(void *linux_side, ETr
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_1125_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pControllerState)
         struct_VRControllerState001_t_1125_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp
index a324616e..9a100169 100644
--- a/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRSystem_IVRSystem_022.cpp
@@ -160,8 +160,8 @@ bool cppIVRSystem_IVRSystem_022_PollNextEvent(void *linux_side, winVREvent_t_126
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1267_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, (uint32_t)uncbVREvent);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEvent(pEvent ? &lin : nullptr, lin_uncbVREvent);
     if(pEvent)
         struct_VREvent_t_1267_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -173,8 +173,8 @@ bool cppIVRSystem_IVRSystem_022_PollNextEventWithPose(void *linux_side, ETrackin
     bool _ret;
     if(pEvent)
         struct_VREvent_t_1267_win_to_lin(pEvent, &lin);
-    uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, (uint32_t)uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_uncbVREvent = uncbVREvent ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->PollNextEventWithPose((vr::ETrackingUniverseOrigin)eOrigin, pEvent ? &lin : nullptr, lin_uncbVREvent, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pEvent)
         struct_VREvent_t_1267_lin_to_win(&lin, pEvent, uncbVREvent);
     return _ret;
@@ -196,8 +196,8 @@ bool cppIVRSystem_IVRSystem_022_GetControllerState(void *linux_side, TrackedDevi
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_1267_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerState((vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize);
     if(pControllerState)
         struct_VRControllerState001_t_1267_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
@@ -209,8 +209,8 @@ bool cppIVRSystem_IVRSystem_022_GetControllerStateWithPose(void *linux_side, ETr
     bool _ret;
     if(pControllerState)
         struct_VRControllerState001_t_1267_win_to_lin(pControllerState, &lin);
-    unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
-    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, (uint32_t)unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
+    uint32_t lin_unControllerStateSize = unControllerStateSize ? sizeof(lin) : 0;
+    _ret = ((IVRSystem*)linux_side)->GetControllerStateWithPose((vr::ETrackingUniverseOrigin)eOrigin, (vr::TrackedDeviceIndex_t)unControllerDeviceIndex, pControllerState ? &lin : nullptr, lin_unControllerStateSize, (vr::TrackedDevicePose_t *)pTrackedDevicePose);
     if(pControllerState)
         struct_VRControllerState001_t_1267_lin_to_win(&lin, pControllerState, unControllerStateSize);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp
index da27feb9..a706403e 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_004.cpp
@@ -50,8 +50,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStrea
     vr::EVRTrackedCameraError _ret;
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin);
-    nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
-    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    uint32_t lin_nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, lin_nFrameHeaderSize);
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize);
     return _ret;
@@ -68,8 +68,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStrea
     vr::EVRTrackedCameraError _ret;
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin);
-    nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
-    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    uint32_t lin_nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, lin_nFrameHeaderSize);
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize);
     return _ret;
@@ -81,8 +81,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_004_GetVideoStrea
     vr::EVRTrackedCameraError _ret;
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_win_to_lin(pFrameHeader, &lin);
-    nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
-    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    uint32_t lin_nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, lin_nFrameHeaderSize);
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1017_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp
index 2ddccd21..72be4243 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_005.cpp
@@ -50,8 +50,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStrea
     vr::EVRTrackedCameraError _ret;
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin);
-    nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
-    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    uint32_t lin_nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, lin_nFrameHeaderSize);
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize);
     return _ret;
@@ -68,8 +68,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStrea
     vr::EVRTrackedCameraError _ret;
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin);
-    nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
-    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    uint32_t lin_nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, lin_nFrameHeaderSize);
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize);
     return _ret;
@@ -81,8 +81,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_005_GetVideoStrea
     vr::EVRTrackedCameraError _ret;
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_win_to_lin(pFrameHeader, &lin);
-    nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
-    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    uint32_t lin_nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, lin_nFrameHeaderSize);
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1610_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize);
     return _ret;
diff --git a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp
index e778da17..6094fe71 100644
--- a/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp
+++ b/vrclient_x64/vrclient_x64/cppIVRTrackedCamera_IVRTrackedCamera_006.cpp
@@ -50,8 +50,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStrea
     vr::EVRTrackedCameraError _ret;
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin(pFrameHeader, &lin);
-    nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
-    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    uint32_t lin_nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamFrameBuffer((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pFrameBuffer, (uint32_t)nFrameBufferSize, pFrameHeader ? &lin : nullptr, lin_nFrameHeaderSize);
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize);
     return _ret;
@@ -68,8 +68,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStrea
     vr::EVRTrackedCameraError _ret;
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin(pFrameHeader, &lin);
-    nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
-    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    uint32_t lin_nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureD3D11((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (void *)pD3D11DeviceOrResource, (void **)ppD3D11ShaderResourceView, pFrameHeader ? &lin : nullptr, lin_nFrameHeaderSize);
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize);
     return _ret;
@@ -81,8 +81,8 @@ vr::EVRTrackedCameraError cppIVRTrackedCamera_IVRTrackedCamera_006_GetVideoStrea
     vr::EVRTrackedCameraError _ret;
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_win_to_lin(pFrameHeader, &lin);
-    nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
-    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, (uint32_t)nFrameHeaderSize);
+    uint32_t lin_nFrameHeaderSize = nFrameHeaderSize ? sizeof(lin) : 0;
+    _ret = ((IVRTrackedCamera*)linux_side)->GetVideoStreamTextureGL((vr::TrackedCameraHandle_t)hTrackedCamera, (vr::EVRTrackedCameraFrameType)eFrameType, (vr::glUInt_t *)pglTextureId, pFrameHeader ? &lin : nullptr, lin_nFrameHeaderSize);
     if(pFrameHeader)
         struct_CameraVideoStreamFrameHeader_t_1267_lin_to_win(&lin, pFrameHeader, nFrameHeaderSize);
     return _ret;