diff --git a/lsteamclient/cppISteamClient_SteamClient016.cpp b/lsteamclient/cppISteamClient_SteamClient016.cpp
index 835d9df3..f7565a8b 100644
--- a/lsteamclient/cppISteamClient_SteamClient016.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient016.cpp
@@ -254,7 +254,7 @@ NTSTATUS ISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess( void
 {
     struct ISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
     struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
-    void (*U_STDCALL u_func)(uint64_t, void *, uint32_t, int32_t) = manual_convert_Set_SteamAPI_CPostAPIResultInProcess_func( params->func );
+    void (*U_CDECL u_func)(uint64_t, void *, uint32_t, int32_t) = manual_convert_Set_SteamAPI_CPostAPIResultInProcess_func( params->func );
     iface->Set_SteamAPI_CPostAPIResultInProcess( u_func );
     return 0;
 }
@@ -263,7 +263,7 @@ NTSTATUS ISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess( vo
 {
     struct ISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
     struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
-    void (*U_STDCALL u_func)(uint64_t, void *, uint32_t, int32_t) = manual_convert_Remove_SteamAPI_CPostAPIResultInProcess_func( params->func );
+    void (*U_CDECL u_func)(uint64_t, void *, uint32_t, int32_t) = manual_convert_Remove_SteamAPI_CPostAPIResultInProcess_func( params->func );
     iface->Remove_SteamAPI_CPostAPIResultInProcess( u_func );
     return 0;
 }
@@ -272,7 +272,7 @@ NTSTATUS ISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProc
 {
     struct ISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params = (struct ISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *)args;
     struct u_ISteamClient_SteamClient016 *iface = (struct u_ISteamClient_SteamClient016 *)params->linux_side;
-    uint32_t (*U_STDCALL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
+    uint32_t (*U_CDECL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
     iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( u_func );
     return 0;
 }
diff --git a/lsteamclient/cppISteamClient_SteamClient017.cpp b/lsteamclient/cppISteamClient_SteamClient017.cpp
index c133eb57..14021cfc 100644
--- a/lsteamclient/cppISteamClient_SteamClient017.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient017.cpp
@@ -254,7 +254,7 @@ NTSTATUS ISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInPro
 {
     struct ISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
     struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
-    void (*U_STDCALL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
     iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( u__a );
     return 0;
 }
@@ -263,7 +263,7 @@ NTSTATUS ISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultIn
 {
     struct ISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
     struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
-    void (*U_STDCALL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
     iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( u__a );
     return 0;
 }
@@ -272,7 +272,7 @@ NTSTATUS ISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProc
 {
     struct ISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params = (struct ISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *)args;
     struct u_ISteamClient_SteamClient017 *iface = (struct u_ISteamClient_SteamClient017 *)params->linux_side;
-    uint32_t (*U_STDCALL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
+    uint32_t (*U_CDECL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
     iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( u_func );
     return 0;
 }
diff --git a/lsteamclient/cppISteamClient_SteamClient018.cpp b/lsteamclient/cppISteamClient_SteamClient018.cpp
index cbaa823a..c889e6b0 100644
--- a/lsteamclient/cppISteamClient_SteamClient018.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient018.cpp
@@ -262,7 +262,7 @@ NTSTATUS ISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInPro
 {
     struct ISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
     struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
-    void (*U_STDCALL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
     iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( u__a );
     return 0;
 }
@@ -271,7 +271,7 @@ NTSTATUS ISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultIn
 {
     struct ISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
     struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
-    void (*U_STDCALL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
     iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( u__a );
     return 0;
 }
@@ -280,7 +280,7 @@ NTSTATUS ISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProc
 {
     struct ISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params = (struct ISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *)args;
     struct u_ISteamClient_SteamClient018 *iface = (struct u_ISteamClient_SteamClient018 *)params->linux_side;
-    uint32_t (*U_STDCALL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
+    uint32_t (*U_CDECL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
     iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( u_func );
     return 0;
 }
diff --git a/lsteamclient/cppISteamClient_SteamClient019.cpp b/lsteamclient/cppISteamClient_SteamClient019.cpp
index 01d7de97..6c479726 100644
--- a/lsteamclient/cppISteamClient_SteamClient019.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient019.cpp
@@ -262,7 +262,7 @@ NTSTATUS ISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInPro
 {
     struct ISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
     struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
-    void (*U_STDCALL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
     iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( u__a );
     return 0;
 }
@@ -271,7 +271,7 @@ NTSTATUS ISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultIn
 {
     struct ISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
     struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
-    void (*U_STDCALL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
     iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( u__a );
     return 0;
 }
@@ -280,7 +280,7 @@ NTSTATUS ISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProc
 {
     struct ISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *params = (struct ISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params *)args;
     struct u_ISteamClient_SteamClient019 *iface = (struct u_ISteamClient_SteamClient019 *)params->linux_side;
-    uint32_t (*U_STDCALL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
+    uint32_t (*U_CDECL u_func)(int32_t) = manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( params->func );
     iface->Set_SteamAPI_CCheckCallbackRegisteredInProcess( u_func );
     return 0;
 }
diff --git a/lsteamclient/cppISteamClient_SteamClient020.cpp b/lsteamclient/cppISteamClient_SteamClient020.cpp
index 43cd597d..98afa0b3 100644
--- a/lsteamclient/cppISteamClient_SteamClient020.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient020.cpp
@@ -262,7 +262,7 @@ NTSTATUS ISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInPro
 {
     struct ISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params *)args;
     struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
-    void (*U_STDCALL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( params->_a );
     iface->DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( u__a );
     return 0;
 }
@@ -271,7 +271,7 @@ NTSTATUS ISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultIn
 {
     struct ISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *params = (struct ISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params *)args;
     struct u_ISteamClient_SteamClient020 *iface = (struct u_ISteamClient_SteamClient020 *)params->linux_side;
-    void (*U_STDCALL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
+    void (*U_CDECL u__a)(void) = manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( params->_a );
     iface->DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( u__a );
     return 0;
 }
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp
index f2fb0960..7ea4d9e0 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils001.cpp
@@ -101,7 +101,7 @@ NTSTATUS ISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction( v
 {
     struct ISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_params *params = (struct ISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_params *)args;
     struct u_ISteamNetworkingUtils_SteamNetworkingUtils001 *iface = (struct u_ISteamNetworkingUtils_SteamNetworkingUtils001 *)params->linux_side;
-    void (*U_STDCALL u_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc );
+    void (*U_CDECL u_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc );
     iface->SetDebugOutputFunction( params->eDetailLevel, u_pfnFunc );
     return 0;
 }
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp
index 3b19e376..54f28e21 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils002.cpp
@@ -101,7 +101,7 @@ NTSTATUS ISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction( v
 {
     struct ISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_params *params = (struct ISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_params *)args;
     struct u_ISteamNetworkingUtils_SteamNetworkingUtils002 *iface = (struct u_ISteamNetworkingUtils_SteamNetworkingUtils002 *)params->linux_side;
-    void (*U_STDCALL u_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc );
+    void (*U_CDECL u_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc );
     iface->SetDebugOutputFunction( params->eDetailLevel, u_pfnFunc );
     return 0;
 }
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.cpp b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.cpp
index f9ba8ce1..e632396d 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.cpp
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils003.cpp
@@ -101,7 +101,7 @@ NTSTATUS ISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction( v
 {
     struct ISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_params *params = (struct ISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_params *)args;
     struct u_ISteamNetworkingUtils_SteamNetworkingUtils003 *iface = (struct u_ISteamNetworkingUtils_SteamNetworkingUtils003 *)params->linux_side;
-    void (*U_STDCALL u_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc );
+    void (*U_CDECL u_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc );
     iface->SetDebugOutputFunction( params->eDetailLevel, u_pfnFunc );
     return 0;
 }
diff --git a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.cpp b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.cpp
index b8a502f7..67e23a40 100644
--- a/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.cpp
+++ b/lsteamclient/cppISteamNetworkingUtils_SteamNetworkingUtils004.cpp
@@ -101,7 +101,7 @@ NTSTATUS ISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction( v
 {
     struct ISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_params *params = (struct ISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_params *)args;
     struct u_ISteamNetworkingUtils_SteamNetworkingUtils004 *iface = (struct u_ISteamNetworkingUtils_SteamNetworkingUtils004 *)params->linux_side;
-    void (*U_STDCALL u_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc );
+    void (*U_CDECL u_pfnFunc)(uint32_t, const char *) = manual_convert_SetDebugOutputFunction_pfnFunc( params->pfnFunc );
     iface->SetDebugOutputFunction( params->eDetailLevel, u_pfnFunc );
     return 0;
 }
diff --git a/lsteamclient/gen_wrapper.py b/lsteamclient/gen_wrapper.py
index 3c9564e5..1ed6f16b 100755
--- a/lsteamclient/gen_wrapper.py
+++ b/lsteamclient/gen_wrapper.py
@@ -838,7 +838,7 @@ def callconv(cursor, prefix):
     tokens = cursor.get_tokens()
     while next(tokens).spelling != '(': pass
     token = next(tokens).spelling.strip('_')
-    token = token.replace('*', 'stdcall')
+    token = token.replace('*', 'cdecl')
     token = token.replace('S_CALLTYPE', 'cdecl')
     return f'{prefix[0].upper()}_{token.upper()} '
 
diff --git a/lsteamclient/steam_networking_manual.c b/lsteamclient/steam_networking_manual.c
index 85af5f01..857d545d 100644
--- a/lsteamclient/steam_networking_manual.c
+++ b/lsteamclient/steam_networking_manual.c
@@ -41,12 +41,12 @@ static BOOL networking_message_pool_alloc_data( uint32_t count, struct networkin
     return TRUE;
 }
 
-static void W_STDCALL w_SteamNetworkingMessage_t_144_FreeData( w_SteamNetworkingMessage_t_144 *msg )
+static void W_CDECL w_SteamNetworkingMessage_t_144_FreeData( w_SteamNetworkingMessage_t_144 *msg )
 {
     if (msg->m_pData) SecureZeroMemory( msg->m_pData, msg->m_cbSize );
 }
 
-static void W_STDCALL w_SteamNetworkingMessage_t_144_Release( w_SteamNetworkingMessage_t_144 *msg )
+static void W_CDECL w_SteamNetworkingMessage_t_144_Release( w_SteamNetworkingMessage_t_144 *msg )
 {
     struct networking_message *message = CONTAINING_RECORD( msg, struct networking_message, w_msg_144 );
 
@@ -100,7 +100,7 @@ static BOOL networking_message_pool_receive_144( int32_t capacity, int32_t count
     return TRUE;
 }
 
-static void W_STDCALL w_SteamNetworkingMessage_t_147_FreeData( w_SteamNetworkingMessage_t_147 *msg )
+static void W_CDECL w_SteamNetworkingMessage_t_147_FreeData( w_SteamNetworkingMessage_t_147 *msg )
 {
     struct networking_message *message = CONTAINING_RECORD( msg, struct networking_message, w_msg_147 );
 
@@ -108,7 +108,7 @@ static void W_STDCALL w_SteamNetworkingMessage_t_147_FreeData( w_SteamNetworking
     if (!message->pool) HeapFree( GetProcessHeap(), 0, msg->m_pData );
 }
 
-static void W_STDCALL w_SteamNetworkingMessage_t_147_Release( w_SteamNetworkingMessage_t_147 *msg )
+static void W_CDECL w_SteamNetworkingMessage_t_147_Release( w_SteamNetworkingMessage_t_147 *msg )
 {
     struct networking_message *message = CONTAINING_RECORD( msg, struct networking_message, w_msg_147 );
 
@@ -168,7 +168,7 @@ static BOOL networking_message_pool_receive_147( uint32_t capacity, uint32_t cou
     return TRUE;
 }
 
-static void W_STDCALL w_SteamNetworkingMessage_t_153a_FreeData( w_SteamNetworkingMessage_t_153a *msg )
+static void W_CDECL w_SteamNetworkingMessage_t_153a_FreeData( w_SteamNetworkingMessage_t_153a *msg )
 {
     struct networking_message *message = CONTAINING_RECORD( msg, struct networking_message, w_msg_153a );
 
@@ -176,7 +176,7 @@ static void W_STDCALL w_SteamNetworkingMessage_t_153a_FreeData( w_SteamNetworkin
     if (!message->pool) HeapFree( GetProcessHeap(), 0, msg->m_pData );
 }
 
-static void W_STDCALL w_SteamNetworkingMessage_t_153a_Release( w_SteamNetworkingMessage_t_153a *msg )
+static void W_CDECL w_SteamNetworkingMessage_t_153a_Release( w_SteamNetworkingMessage_t_153a *msg )
 {
     struct networking_message *message = CONTAINING_RECORD( msg, struct networking_message, w_msg_153a );
 
diff --git a/lsteamclient/steamclient_main.c b/lsteamclient/steamclient_main.c
index 883c6e91..4a72869b 100644
--- a/lsteamclient/steamclient_main.c
+++ b/lsteamclient/steamclient_main.c
@@ -356,10 +356,6 @@ static void execute_pending_callbacks(void)
             TRACE( "CALL_CDECL_FUNC_DATA func %p, data %p.\n", params.callback->call_cdecl_func_data.pFunc, params.callback->call_cdecl_func_data.data );
             params.callback->call_cdecl_func_data.pFunc( params.callback->call_cdecl_func_data.data );
             break;
-        case CALL_STDCALL_FUNC_DATA:
-            TRACE( "CALL_STDCALL_FUNC_DATA func %p, data %p.\n", params.callback->call_stdcall_func_data.pFunc, params.callback->call_stdcall_func_data.data );
-            params.callback->call_stdcall_func_data.pFunc( params.callback->call_stdcall_func_data.data );
-            break;
         case CALL_IFACE_VTABLE_0:
             TRACE( "CALL_IFACE_VTABLE_0 iface %p, arg0 %#jx, arg1 %#jx, arg2 %#jx.\n", params.callback->call_iface_vtable.iface,
                    params.callback->call_iface_vtable.arg0, params.callback->call_iface_vtable.arg1, params.callback->call_iface_vtable.arg2 );
diff --git a/lsteamclient/steamclient_structs_generated.h b/lsteamclient/steamclient_structs_generated.h
index 07fec1f3..0df61664 100644
--- a/lsteamclient/steamclient_structs_generated.h
+++ b/lsteamclient/steamclient_structs_generated.h
@@ -9978,8 +9978,8 @@ struct w64_SteamNetworkingMessage_t_153a
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    W64_PTR(void (*W_STDCALL m_pfnFreeData)(w64_SteamNetworkingMessage_t_153a *), m_pfnFreeData);
-    W64_PTR(void (*W_STDCALL m_pfnRelease)(w64_SteamNetworkingMessage_t_153a *), m_pfnRelease);
+    W64_PTR(void (*W_CDECL m_pfnFreeData)(w64_SteamNetworkingMessage_t_153a *), m_pfnFreeData);
+    W64_PTR(void (*W_CDECL m_pfnRelease)(w64_SteamNetworkingMessage_t_153a *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10002,8 +10002,8 @@ struct u64_SteamNetworkingMessage_t_153a
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    U64_PTR(void (*U_STDCALL m_pfnFreeData)(u64_SteamNetworkingMessage_t_153a *), m_pfnFreeData);
-    U64_PTR(void (*U_STDCALL m_pfnRelease)(u64_SteamNetworkingMessage_t_153a *), m_pfnRelease);
+    U64_PTR(void (*U_CDECL m_pfnFreeData)(u64_SteamNetworkingMessage_t_153a *), m_pfnFreeData);
+    U64_PTR(void (*U_CDECL m_pfnRelease)(u64_SteamNetworkingMessage_t_153a *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10027,8 +10027,8 @@ struct w32_SteamNetworkingMessage_t_153a
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    W32_PTR(void (*W_STDCALL m_pfnFreeData)(w32_SteamNetworkingMessage_t_153a *), m_pfnFreeData);
-    W32_PTR(void (*W_STDCALL m_pfnRelease)(w32_SteamNetworkingMessage_t_153a *), m_pfnRelease);
+    W32_PTR(void (*W_CDECL m_pfnFreeData)(w32_SteamNetworkingMessage_t_153a *), m_pfnFreeData);
+    W32_PTR(void (*W_CDECL m_pfnRelease)(w32_SteamNetworkingMessage_t_153a *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10051,8 +10051,8 @@ struct u32_SteamNetworkingMessage_t_153a
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    U32_PTR(void (*U_STDCALL m_pfnFreeData)(u32_SteamNetworkingMessage_t_153a *), m_pfnFreeData);
-    U32_PTR(void (*U_STDCALL m_pfnRelease)(u32_SteamNetworkingMessage_t_153a *), m_pfnRelease);
+    U32_PTR(void (*U_CDECL m_pfnFreeData)(u32_SteamNetworkingMessage_t_153a *), m_pfnFreeData);
+    U32_PTR(void (*U_CDECL m_pfnRelease)(u32_SteamNetworkingMessage_t_153a *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10083,8 +10083,8 @@ struct w64_SteamNetworkingMessage_t_147
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    W64_PTR(void (*W_STDCALL m_pfnFreeData)(w64_SteamNetworkingMessage_t_147 *), m_pfnFreeData);
-    W64_PTR(void (*W_STDCALL m_pfnRelease)(w64_SteamNetworkingMessage_t_147 *), m_pfnRelease);
+    W64_PTR(void (*W_CDECL m_pfnFreeData)(w64_SteamNetworkingMessage_t_147 *), m_pfnFreeData);
+    W64_PTR(void (*W_CDECL m_pfnRelease)(w64_SteamNetworkingMessage_t_147 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10104,8 +10104,8 @@ struct u64_SteamNetworkingMessage_t_147
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    U64_PTR(void (*U_STDCALL m_pfnFreeData)(u64_SteamNetworkingMessage_t_147 *), m_pfnFreeData);
-    U64_PTR(void (*U_STDCALL m_pfnRelease)(u64_SteamNetworkingMessage_t_147 *), m_pfnRelease);
+    U64_PTR(void (*U_CDECL m_pfnFreeData)(u64_SteamNetworkingMessage_t_147 *), m_pfnFreeData);
+    U64_PTR(void (*U_CDECL m_pfnRelease)(u64_SteamNetworkingMessage_t_147 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10126,8 +10126,8 @@ struct w32_SteamNetworkingMessage_t_147
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    W32_PTR(void (*W_STDCALL m_pfnFreeData)(w32_SteamNetworkingMessage_t_147 *), m_pfnFreeData);
-    W32_PTR(void (*W_STDCALL m_pfnRelease)(w32_SteamNetworkingMessage_t_147 *), m_pfnRelease);
+    W32_PTR(void (*W_CDECL m_pfnFreeData)(w32_SteamNetworkingMessage_t_147 *), m_pfnFreeData);
+    W32_PTR(void (*W_CDECL m_pfnRelease)(w32_SteamNetworkingMessage_t_147 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10147,8 +10147,8 @@ struct u32_SteamNetworkingMessage_t_147
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    U32_PTR(void (*U_STDCALL m_pfnFreeData)(u32_SteamNetworkingMessage_t_147 *), m_pfnFreeData);
-    U32_PTR(void (*U_STDCALL m_pfnRelease)(u32_SteamNetworkingMessage_t_147 *), m_pfnRelease);
+    U32_PTR(void (*U_CDECL m_pfnFreeData)(u32_SteamNetworkingMessage_t_147 *), m_pfnFreeData);
+    U32_PTR(void (*U_CDECL m_pfnRelease)(u32_SteamNetworkingMessage_t_147 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10177,8 +10177,8 @@ struct w64_SteamNetworkingMessage_t_151
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    W64_PTR(void (*W_STDCALL m_pfnFreeData)(w64_SteamNetworkingMessage_t_151 *), m_pfnFreeData);
-    W64_PTR(void (*W_STDCALL m_pfnRelease)(w64_SteamNetworkingMessage_t_151 *), m_pfnRelease);
+    W64_PTR(void (*W_CDECL m_pfnFreeData)(w64_SteamNetworkingMessage_t_151 *), m_pfnFreeData);
+    W64_PTR(void (*W_CDECL m_pfnRelease)(w64_SteamNetworkingMessage_t_151 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10198,8 +10198,8 @@ struct u64_SteamNetworkingMessage_t_151
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    U64_PTR(void (*U_STDCALL m_pfnFreeData)(u64_SteamNetworkingMessage_t_151 *), m_pfnFreeData);
-    U64_PTR(void (*U_STDCALL m_pfnRelease)(u64_SteamNetworkingMessage_t_151 *), m_pfnRelease);
+    U64_PTR(void (*U_CDECL m_pfnFreeData)(u64_SteamNetworkingMessage_t_151 *), m_pfnFreeData);
+    U64_PTR(void (*U_CDECL m_pfnRelease)(u64_SteamNetworkingMessage_t_151 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10220,8 +10220,8 @@ struct w32_SteamNetworkingMessage_t_151
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    W32_PTR(void (*W_STDCALL m_pfnFreeData)(w32_SteamNetworkingMessage_t_151 *), m_pfnFreeData);
-    W32_PTR(void (*W_STDCALL m_pfnRelease)(w32_SteamNetworkingMessage_t_151 *), m_pfnRelease);
+    W32_PTR(void (*W_CDECL m_pfnFreeData)(w32_SteamNetworkingMessage_t_151 *), m_pfnFreeData);
+    W32_PTR(void (*W_CDECL m_pfnRelease)(w32_SteamNetworkingMessage_t_151 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10241,8 +10241,8 @@ struct u32_SteamNetworkingMessage_t_151
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    U32_PTR(void (*U_STDCALL m_pfnFreeData)(u32_SteamNetworkingMessage_t_151 *), m_pfnFreeData);
-    U32_PTR(void (*U_STDCALL m_pfnRelease)(u32_SteamNetworkingMessage_t_151 *), m_pfnRelease);
+    U32_PTR(void (*U_CDECL m_pfnFreeData)(u32_SteamNetworkingMessage_t_151 *), m_pfnFreeData);
+    U32_PTR(void (*U_CDECL m_pfnRelease)(u32_SteamNetworkingMessage_t_151 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m_nFlags;
     int64_t m_nUserData;
@@ -10271,8 +10271,8 @@ struct w64_SteamNetworkingMessage_t_144
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    W64_PTR(void (*W_STDCALL m_pfnFreeData)(w64_SteamNetworkingMessage_t_144 *), m_pfnFreeData);
-    W64_PTR(void (*W_STDCALL m_pfnRelease)(w64_SteamNetworkingMessage_t_144 *), m_pfnRelease);
+    W64_PTR(void (*W_CDECL m_pfnFreeData)(w64_SteamNetworkingMessage_t_144 *), m_pfnFreeData);
+    W64_PTR(void (*W_CDECL m_pfnRelease)(w64_SteamNetworkingMessage_t_144 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m___nPadDummy;
 #ifdef __cplusplus
@@ -10291,8 +10291,8 @@ struct u64_SteamNetworkingMessage_t_144
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    U64_PTR(void (*U_STDCALL m_pfnFreeData)(u64_SteamNetworkingMessage_t_144 *), m_pfnFreeData);
-    U64_PTR(void (*U_STDCALL m_pfnRelease)(u64_SteamNetworkingMessage_t_144 *), m_pfnRelease);
+    U64_PTR(void (*U_CDECL m_pfnFreeData)(u64_SteamNetworkingMessage_t_144 *), m_pfnFreeData);
+    U64_PTR(void (*U_CDECL m_pfnRelease)(u64_SteamNetworkingMessage_t_144 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m___nPadDummy;
 #ifdef __cplusplus
@@ -10312,8 +10312,8 @@ struct w32_SteamNetworkingMessage_t_144
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    W32_PTR(void (*W_STDCALL m_pfnFreeData)(w32_SteamNetworkingMessage_t_144 *), m_pfnFreeData);
-    W32_PTR(void (*W_STDCALL m_pfnRelease)(w32_SteamNetworkingMessage_t_144 *), m_pfnRelease);
+    W32_PTR(void (*W_CDECL m_pfnFreeData)(w32_SteamNetworkingMessage_t_144 *), m_pfnFreeData);
+    W32_PTR(void (*W_CDECL m_pfnRelease)(w32_SteamNetworkingMessage_t_144 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m___nPadDummy;
 #ifdef __cplusplus
@@ -10332,8 +10332,8 @@ struct u32_SteamNetworkingMessage_t_144
     int64_t m_nConnUserData;
     int64_t m_usecTimeReceived;
     int64_t m_nMessageNumber;
-    U32_PTR(void (*U_STDCALL m_pfnFreeData)(u32_SteamNetworkingMessage_t_144 *), m_pfnFreeData);
-    U32_PTR(void (*U_STDCALL m_pfnRelease)(u32_SteamNetworkingMessage_t_144 *), m_pfnRelease);
+    U32_PTR(void (*U_CDECL m_pfnFreeData)(u32_SteamNetworkingMessage_t_144 *), m_pfnFreeData);
+    U32_PTR(void (*U_CDECL m_pfnRelease)(u32_SteamNetworkingMessage_t_144 *), m_pfnRelease);
     int32_t m_nChannel;
     int32_t m___nPadDummy;
 #ifdef __cplusplus
diff --git a/lsteamclient/unix_private.h b/lsteamclient/unix_private.h
index 6f45791d..b9208aee 100644
--- a/lsteamclient/unix_private.h
+++ b/lsteamclient/unix_private.h
@@ -25,8 +25,6 @@ extern void queue_vtable_callback_0_rules_responded( struct w_steam_iface *w_ifa
 
 typedef void (*W_CDECL w_cdecl_func)( void * );
 extern void queue_cdecl_func_callback( w_cdecl_func func, void *data, uint32_t data_size );
-typedef void (*W_STDCALL w_stdcall_func)( void * );
-extern void queue_stdcall_func_callback( w_stdcall_func func, void *data, uint32_t data_size );
 
 extern uint32_t manual_convert_nNativeKeyCode( uint32_t win_vk );
 
@@ -34,25 +32,25 @@ typedef void (U_CDECL *u_SteamAPIWarningMessageHook_t)( int32_t, const char * );
 typedef void (W_CDECL *w_SteamAPIWarningMessageHook_t)( int32_t, const char * );
 u_SteamAPIWarningMessageHook_t manual_convert_SetWarningMessageHook_pFunction( w_SteamAPIWarningMessageHook_t );
 
-typedef void (U_STDCALL *u_FSteamNetworkingSocketsDebugOutput)( uint32_t, const char * );
-typedef void (W_STDCALL *w_FSteamNetworkingSocketsDebugOutput)( uint32_t, const char * );
+typedef void (U_CDECL *u_FSteamNetworkingSocketsDebugOutput)( uint32_t, const char * );
+typedef void (W_CDECL *w_FSteamNetworkingSocketsDebugOutput)( uint32_t, const char * );
 u_FSteamNetworkingSocketsDebugOutput manual_convert_SetDebugOutputFunction_pfnFunc( w_FSteamNetworkingSocketsDebugOutput );
 
-typedef uint32_t (U_STDCALL *u_SteamAPI_CheckCallbackRegistered_t)( int32_t );
-typedef uint32_t (W_STDCALL *w_SteamAPI_CheckCallbackRegistered_t)( int32_t );
+typedef uint32_t (U_CDECL *u_SteamAPI_CheckCallbackRegistered_t)( int32_t );
+typedef uint32_t (W_CDECL *w_SteamAPI_CheckCallbackRegistered_t)( int32_t );
 u_SteamAPI_CheckCallbackRegistered_t manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func( w_SteamAPI_CheckCallbackRegistered_t );
 
 typedef uint32_t (U_CDECL *u_SteamAPI_CheckCallbackRegistered_t_156)( int32_t );
 typedef uint32_t (W_CDECL *w_SteamAPI_CheckCallbackRegistered_t_156)( int32_t );
 u_SteamAPI_CheckCallbackRegistered_t_156 manual_convert_Set_SteamAPI_CCheckCallbackRegisteredInProcess_func_156( w_SteamAPI_CheckCallbackRegistered_t_156 );
 
-typedef void (U_STDCALL *u_SteamAPI_PostAPIResultInProcess_t)( uint64_t, void *, uint32_t, int );
-typedef void (W_STDCALL *w_SteamAPI_PostAPIResultInProcess_t)( uint64_t, void *, uint32_t, int );
+typedef void (U_CDECL *u_SteamAPI_PostAPIResultInProcess_t)( uint64_t, void *, uint32_t, int );
+typedef void (W_CDECL *w_SteamAPI_PostAPIResultInProcess_t)( uint64_t, void *, uint32_t, int );
 u_SteamAPI_PostAPIResultInProcess_t manual_convert_Set_SteamAPI_CPostAPIResultInProcess_func( w_SteamAPI_PostAPIResultInProcess_t );
 u_SteamAPI_PostAPIResultInProcess_t manual_convert_Remove_SteamAPI_CPostAPIResultInProcess_func( w_SteamAPI_PostAPIResultInProcess_t );
 
-typedef void (U_STDCALL *u_void_SteamAPI_PostAPIResultInProcess_t)(void);
-typedef void (W_STDCALL *w_void_SteamAPI_PostAPIResultInProcess_t)(void);
+typedef void (U_CDECL *u_void_SteamAPI_PostAPIResultInProcess_t)(void);
+typedef void (W_CDECL *w_void_SteamAPI_PostAPIResultInProcess_t)(void);
 u_void_SteamAPI_PostAPIResultInProcess_t manual_convert_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess__a( w_void_SteamAPI_PostAPIResultInProcess_t );
 u_void_SteamAPI_PostAPIResultInProcess_t manual_convert_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess__a( w_void_SteamAPI_PostAPIResultInProcess_t );
 
diff --git a/lsteamclient/unix_private_generated.h b/lsteamclient/unix_private_generated.h
index 66a62b34..32dfc199 100644
--- a/lsteamclient/unix_private_generated.h
+++ b/lsteamclient/unix_private_generated.h
@@ -3489,9 +3489,9 @@ struct u_ISteamClient_SteamClient016
     virtual void /*ISteamMusic*/ * GetISteamMusic( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamMusicRemote*/ * GetISteamMusicRemote( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamHTMLSurface*/ * GetISteamHTMLSurface( int32_t, int32_t, const char * ) = 0;
-    virtual void Set_SteamAPI_CPostAPIResultInProcess( void (*U_STDCALL )(uint64_t, void *, uint32_t, int32_t) ) = 0;
-    virtual void Remove_SteamAPI_CPostAPIResultInProcess( void (*U_STDCALL )(uint64_t, void *, uint32_t, int32_t) ) = 0;
-    virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( uint32_t (*U_STDCALL )(int32_t) ) = 0;
+    virtual void Set_SteamAPI_CPostAPIResultInProcess( void (*U_CDECL )(uint64_t, void *, uint32_t, int32_t) ) = 0;
+    virtual void Remove_SteamAPI_CPostAPIResultInProcess( void (*U_CDECL )(uint64_t, void *, uint32_t, int32_t) ) = 0;
+    virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( uint32_t (*U_CDECL )(int32_t) ) = 0;
 #endif /* __cplusplus */
 };
 
@@ -3646,9 +3646,9 @@ struct u_ISteamClient_SteamClient017
     virtual void /*ISteamMusic*/ * GetISteamMusic( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamMusicRemote*/ * GetISteamMusicRemote( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamHTMLSurface*/ * GetISteamHTMLSurface( int32_t, int32_t, const char * ) = 0;
-    virtual void DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void (*U_STDCALL )(void) ) = 0;
-    virtual void DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void (*U_STDCALL )(void) ) = 0;
-    virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( uint32_t (*U_STDCALL )(int32_t) ) = 0;
+    virtual void DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void (*U_CDECL )(void) ) = 0;
+    virtual void DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void (*U_CDECL )(void) ) = 0;
+    virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( uint32_t (*U_CDECL )(int32_t) ) = 0;
     virtual void /*ISteamInventory*/ * GetISteamInventory( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamVideo*/ * GetISteamVideo( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamParentalSettings*/ * GetISteamParentalSettings( int32_t, int32_t, const char * ) = 0;
@@ -4852,9 +4852,9 @@ struct u_ISteamClient_SteamClient018
     virtual void /*ISteamMusic*/ * GetISteamMusic( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamMusicRemote*/ * GetISteamMusicRemote( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamHTMLSurface*/ * GetISteamHTMLSurface( int32_t, int32_t, const char * ) = 0;
-    virtual void DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void (*U_STDCALL )(void) ) = 0;
-    virtual void DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void (*U_STDCALL )(void) ) = 0;
-    virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( uint32_t (*U_STDCALL )(int32_t) ) = 0;
+    virtual void DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void (*U_CDECL )(void) ) = 0;
+    virtual void DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void (*U_CDECL )(void) ) = 0;
+    virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( uint32_t (*U_CDECL )(int32_t) ) = 0;
     virtual void /*ISteamInventory*/ * GetISteamInventory( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamVideo*/ * GetISteamVideo( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamParentalSettings*/ * GetISteamParentalSettings( int32_t, int32_t, const char * ) = 0;
@@ -5384,7 +5384,7 @@ struct u_ISteamNetworkingUtils_SteamNetworkingUtils001
     virtual int32_t GetPOPCount(  ) = 0;
     virtual int32_t GetPOPList( uint32_t *, int32_t ) = 0;
     virtual int64_t GetLocalTimestamp(  ) = 0;
-    virtual void SetDebugOutputFunction( uint32_t, void (*U_STDCALL )(uint32_t, const char *) ) = 0;
+    virtual void SetDebugOutputFunction( uint32_t, void (*U_CDECL )(uint32_t, const char *) ) = 0;
     virtual int8_t SetConfigValue( uint32_t, uint32_t, int32_t, uint32_t, const void * ) = 0;
     virtual uint32_t GetConfigValue( uint32_t, uint32_t, int32_t, uint32_t *, void *, uint32_t * ) = 0;
     virtual int8_t GetConfigValueInfo( uint32_t, const char **, uint32_t *, uint32_t *, uint32_t * ) = 0;
@@ -5534,7 +5534,7 @@ struct u_ISteamNetworkingUtils_SteamNetworkingUtils002
     virtual int32_t GetPOPCount(  ) = 0;
     virtual int32_t GetPOPList( uint32_t *, int32_t ) = 0;
     virtual int64_t GetLocalTimestamp(  ) = 0;
-    virtual void SetDebugOutputFunction( uint32_t, void (*U_STDCALL )(uint32_t, const char *) ) = 0;
+    virtual void SetDebugOutputFunction( uint32_t, void (*U_CDECL )(uint32_t, const char *) ) = 0;
     virtual int8_t SetConfigValue( uint32_t, uint32_t, int32_t, uint32_t, const void * ) = 0;
     virtual uint32_t GetConfigValue( uint32_t, uint32_t, int32_t, uint32_t *, void *, uint32_t * ) = 0;
     virtual int8_t GetConfigValueInfo( uint32_t, const char **, uint32_t *, uint32_t *, uint32_t * ) = 0;
@@ -5582,9 +5582,9 @@ struct u_ISteamClient_SteamClient019
     virtual void /*ISteamMusic*/ * GetISteamMusic( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamMusicRemote*/ * GetISteamMusicRemote( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamHTMLSurface*/ * GetISteamHTMLSurface( int32_t, int32_t, const char * ) = 0;
-    virtual void DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void (*U_STDCALL )(void) ) = 0;
-    virtual void DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void (*U_STDCALL )(void) ) = 0;
-    virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( uint32_t (*U_STDCALL )(int32_t) ) = 0;
+    virtual void DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void (*U_CDECL )(void) ) = 0;
+    virtual void DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void (*U_CDECL )(void) ) = 0;
+    virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( uint32_t (*U_CDECL )(int32_t) ) = 0;
     virtual void /*ISteamInventory*/ * GetISteamInventory( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamVideo*/ * GetISteamVideo( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamParentalSettings*/ * GetISteamParentalSettings( int32_t, int32_t, const char * ) = 0;
@@ -5642,8 +5642,8 @@ struct u_ISteamClient_SteamClient020
     virtual void /*ISteamMusic*/ * GetISteamMusic( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamMusicRemote*/ * GetISteamMusicRemote( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamHTMLSurface*/ * GetISteamHTMLSurface( int32_t, int32_t, const char * ) = 0;
-    virtual void DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void (*U_STDCALL )(void) ) = 0;
-    virtual void DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void (*U_STDCALL )(void) ) = 0;
+    virtual void DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess( void (*U_CDECL )(void) ) = 0;
+    virtual void DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess( void (*U_CDECL )(void) ) = 0;
     virtual void Set_SteamAPI_CCheckCallbackRegisteredInProcess( uint32_t (*U_CDECL )(int32_t) ) = 0;
     virtual void /*ISteamInventory*/ * GetISteamInventory( int32_t, int32_t, const char * ) = 0;
     virtual void /*ISteamVideo*/ * GetISteamVideo( int32_t, int32_t, const char * ) = 0;
@@ -5875,7 +5875,7 @@ struct u_ISteamNetworkingUtils_SteamNetworkingUtils003
     virtual int32_t GetPOPCount(  ) = 0;
     virtual int32_t GetPOPList( uint32_t *, int32_t ) = 0;
     virtual int64_t GetLocalTimestamp(  ) = 0;
-    virtual void SetDebugOutputFunction( uint32_t, void (*U_STDCALL )(uint32_t, const char *) ) = 0;
+    virtual void SetDebugOutputFunction( uint32_t, void (*U_CDECL )(uint32_t, const char *) ) = 0;
     virtual int8_t SetConfigValue( uint32_t, uint32_t, int32_t, uint32_t, const void * ) = 0;
     virtual uint32_t GetConfigValue( uint32_t, uint32_t, int32_t, uint32_t *, void *, uint32_t * ) = 0;
     virtual int8_t GetConfigValueInfo( uint32_t, const char **, uint32_t *, uint32_t *, uint32_t * ) = 0;
@@ -6373,7 +6373,7 @@ struct u_ISteamInput_SteamInput005
     virtual int8_t BNewDataAvailable(  ) = 0;
     virtual int32_t GetConnectedControllers( uint64_t * ) = 0;
     virtual void EnableDeviceCallbacks(  ) = 0;
-    virtual void EnableActionEventCallbacks( void (*U_STDCALL )(SteamInputActionEvent_t *) ) = 0;
+    virtual void EnableActionEventCallbacks( void (*U_CDECL )(SteamInputActionEvent_t *) ) = 0;
     virtual uint64_t GetActionSetHandle( const char * ) = 0;
     virtual void ActivateActionSet( uint64_t, uint64_t ) = 0;
     virtual uint64_t GetCurrentActionSet( uint64_t ) = 0;
@@ -6476,7 +6476,7 @@ struct u_ISteamInput_SteamInput006
     virtual int8_t BNewDataAvailable(  ) = 0;
     virtual int32_t GetConnectedControllers( uint64_t * ) = 0;
     virtual void EnableDeviceCallbacks(  ) = 0;
-    virtual void EnableActionEventCallbacks( void (*U_STDCALL )(SteamInputActionEvent_t *) ) = 0;
+    virtual void EnableActionEventCallbacks( void (*U_CDECL )(SteamInputActionEvent_t *) ) = 0;
     virtual uint64_t GetActionSetHandle( const char * ) = 0;
     virtual void ActivateActionSet( uint64_t, uint64_t ) = 0;
     virtual uint64_t GetCurrentActionSet( uint64_t ) = 0;
@@ -6681,7 +6681,7 @@ struct u_ISteamNetworkingUtils_SteamNetworkingUtils004
     virtual int32_t GetPOPCount(  ) = 0;
     virtual int32_t GetPOPList( uint32_t *, int32_t ) = 0;
     virtual int64_t GetLocalTimestamp(  ) = 0;
-    virtual void SetDebugOutputFunction( uint32_t, void (*U_STDCALL )(uint32_t, const char *) ) = 0;
+    virtual void SetDebugOutputFunction( uint32_t, void (*U_CDECL )(uint32_t, const char *) ) = 0;
     virtual uint32_t GetIPv4FakeIPType( uint32_t ) = 0;
     virtual uint32_t GetRealIdentityForFakeIP( const SteamNetworkingIPAddr *, SteamNetworkingIdentity_144 * ) = 0;
     virtual int8_t SetConfigValue( uint32_t, uint32_t, int32_t, uint32_t, const void * ) = 0;
diff --git a/lsteamclient/unix_steam_input_manual.cpp b/lsteamclient/unix_steam_input_manual.cpp
index c1c56011..815081d2 100644
--- a/lsteamclient/unix_steam_input_manual.cpp
+++ b/lsteamclient/unix_steam_input_manual.cpp
@@ -314,10 +314,10 @@ NTSTATUS ISteamInput_SteamInput002_GetGlyphForXboxOrigin( void *args )
 
 /* ISteamInput_SteamInput005 */
 
-static void (W_STDCALL *w_EnableActionEventCallbacks_152)( SteamInputActionEvent_t * );
-static void U_STDCALL u_SteamInputActionEventCallbackPointer_152( SteamInputActionEvent_t *dat )
+static void (W_CDECL *w_EnableActionEventCallbacks_152)( SteamInputActionEvent_t * );
+static void U_CDECL u_SteamInputActionEventCallbackPointer_152( SteamInputActionEvent_t *dat )
 {
-    if (w_EnableActionEventCallbacks_152) queue_stdcall_func_callback( (w_stdcall_func)w_EnableActionEventCallbacks_152, dat, sizeof(*dat) );
+    if (w_EnableActionEventCallbacks_152) queue_cdecl_func_callback( (w_cdecl_func)w_EnableActionEventCallbacks_152, dat, sizeof(*dat) );
 }
 
 NTSTATUS ISteamInput_SteamInput005_EnableActionEventCallbacks( void *args )
diff --git a/lsteamclient/unix_steam_networking_manual.cpp b/lsteamclient/unix_steam_networking_manual.cpp
index f40d96d8..f81a2f35 100644
--- a/lsteamclient/unix_steam_networking_manual.cpp
+++ b/lsteamclient/unix_steam_networking_manual.cpp
@@ -132,7 +132,7 @@ NTSTATUS steamclient_networking_messages_receive_147( void *args )
     return 0;
 }
 
-static void U_STDCALL u_SteamNetworkingMessage_t_147_FreeData( u_SteamNetworkingMessage_t_147 *msg )
+static void U_CDECL u_SteamNetworkingMessage_t_147_FreeData( u_SteamNetworkingMessage_t_147 *msg )
 {
     free( msg->m_pData );
     msg->m_pData = NULL;
@@ -410,7 +410,7 @@ NTSTATUS steamclient_networking_messages_receive_153a( void *args )
     return 0;
 }
 
-static void U_STDCALL u_SteamNetworkingMessage_t_153a_FreeData( u_SteamNetworkingMessage_t_153a *msg )
+static void U_CDECL u_SteamNetworkingMessage_t_153a_FreeData( u_SteamNetworkingMessage_t_153a *msg )
 {
     free( msg->m_pData );
     msg->m_pData = NULL;
diff --git a/lsteamclient/unixlib.cpp b/lsteamclient/unixlib.cpp
index bbb731ba..6e85d3b7 100644
--- a/lsteamclient/unixlib.cpp
+++ b/lsteamclient/unixlib.cpp
@@ -123,26 +123,6 @@ void queue_cdecl_func_callback( w_cdecl_func func, void *data, uint32_t data_siz
     pthread_mutex_unlock( &callbacks_lock );
 }
 
-void queue_stdcall_func_callback( w_stdcall_func func, void *data, uint32_t data_size )
-{
-    uint32_t size = data_size;
-    struct callback_entry *entry;
-
-    size += sizeof(struct callback_entry);
-    if (!(entry = (struct callback_entry *)malloc( size ))) return;
-
-    entry->callback.type = CALL_STDCALL_FUNC_DATA;
-    size -= offsetof( struct callback_entry, callback );
-    entry->callback.size = size;
-
-    entry->callback.call_stdcall_func_data.pFunc = func;
-    memcpy( (char *)entry->callback.call_stdcall_func_data.data, data, data_size );
-
-    pthread_mutex_lock( &callbacks_lock );
-    list_add_tail( &callbacks, &entry->entry );
-    pthread_mutex_unlock( &callbacks_lock );
-}
-
 u_FSteamNetworkingSocketsDebugOutput manual_convert_SetDebugOutputFunction_pfnFunc( w_FSteamNetworkingSocketsDebugOutput w_func )
 {
     w_steam_networking_socket_debug_output = w_func;
@@ -177,7 +157,7 @@ u_SteamAPIWarningMessageHook_t manual_convert_SetWarningMessageHook_pFunction( w
     return &u_steam_api_warning_message_hook;
 }
 
-static uint32_t U_STDCALL u_steam_api_check_callback_registered( int32_t v )
+static uint32_t U_CDECL u_steam_api_check_callback_registered( int32_t v )
 {
     return 1;
 }
@@ -199,7 +179,7 @@ u_SteamAPI_CheckCallbackRegistered_t_156 manual_convert_Set_SteamAPI_CCheckCallb
     return &u_steam_api_check_callback_registered_156;
 }
 
-static void U_STDCALL u_steam_api_post_api_result_in_process( uint64_t a, void *b, uint32_t c, int d )
+static void U_CDECL u_steam_api_post_api_result_in_process( uint64_t a, void *b, uint32_t c, int d )
 {
 }
 
@@ -215,7 +195,7 @@ u_SteamAPI_PostAPIResultInProcess_t manual_convert_Remove_SteamAPI_CPostAPIResul
     return &u_steam_api_post_api_result_in_process;
 }
 
-static void U_STDCALL u_void_steam_api_post_api_result_in_process(void)
+static void U_CDECL u_void_steam_api_post_api_result_in_process(void)
 {
 }
 
diff --git a/lsteamclient/unixlib.h b/lsteamclient/unixlib.h
index a1d71aa8..aa175a3d 100644
--- a/lsteamclient/unixlib.h
+++ b/lsteamclient/unixlib.h
@@ -36,7 +36,6 @@ enum callback_type
     SOCKETS_DEBUG_OUTPUT = 1,
     WARNING_MESSAGE_HOOK,
     CALL_CDECL_FUNC_DATA,
-    CALL_STDCALL_FUNC_DATA,
     CALL_IFACE_VTABLE_0,
     CALL_IFACE_VTABLE_1,
     CALL_IFACE_VTABLE_2,
@@ -53,7 +52,7 @@ struct callback
     {
         struct
         {
-            void (*W_STDCALL pfnFunc)( uint32_t, const char * );
+            void (*W_CDECL pfnFunc)( uint32_t, const char * );
             uint32_t type;
             const char msg[1];
         } sockets_debug_output;
@@ -71,12 +70,6 @@ struct callback
             unsigned char data[1];
         } call_cdecl_func_data;
 
-        struct
-        {
-            void (*W_STDCALL pFunc)( void * );
-            unsigned char data[1];
-        } call_stdcall_func_data;
-
         struct
         {
             struct w_steam_iface *iface;
diff --git a/lsteamclient/unixlib_generated.h b/lsteamclient/unixlib_generated.h
index c07e9648..43ce2811 100644
--- a/lsteamclient/unixlib_generated.h
+++ b/lsteamclient/unixlib_generated.h
@@ -22905,19 +22905,19 @@ struct ISteamClient_SteamClient016_GetISteamHTMLSurface_params
 struct ISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL func)(uint64_t, void *, uint32_t, int32_t);
+    void (*W_CDECL func)(uint64_t, void *, uint32_t, int32_t);
 };
 
 struct ISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL func)(uint64_t, void *, uint32_t, int32_t);
+    void (*W_CDECL func)(uint64_t, void *, uint32_t, int32_t);
 };
 
 struct ISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params
 {
     struct u_steam_iface *linux_side;
-    uint32_t (*W_STDCALL func)(int32_t);
+    uint32_t (*W_CDECL func)(int32_t);
 };
 
 struct ISteamClient_SteamClient017_CreateSteamPipe_params
@@ -23176,19 +23176,19 @@ struct ISteamClient_SteamClient017_GetISteamHTMLSurface_params
 struct ISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL _a)(void);
+    void (*W_CDECL _a)(void);
 };
 
 struct ISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL _a)(void);
+    void (*W_CDECL _a)(void);
 };
 
 struct ISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params
 {
     struct u_steam_iface *linux_side;
-    uint32_t (*W_STDCALL func)(int32_t);
+    uint32_t (*W_CDECL func)(int32_t);
 };
 
 struct ISteamClient_SteamClient017_GetISteamInventory_params
@@ -23483,19 +23483,19 @@ struct ISteamClient_SteamClient018_GetISteamHTMLSurface_params
 struct ISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL _a)(void);
+    void (*W_CDECL _a)(void);
 };
 
 struct ISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL _a)(void);
+    void (*W_CDECL _a)(void);
 };
 
 struct ISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params
 {
     struct u_steam_iface *linux_side;
-    uint32_t (*W_STDCALL func)(int32_t);
+    uint32_t (*W_CDECL func)(int32_t);
 };
 
 struct ISteamClient_SteamClient018_GetISteamInventory_params
@@ -23808,19 +23808,19 @@ struct ISteamClient_SteamClient019_GetISteamHTMLSurface_params
 struct ISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL _a)(void);
+    void (*W_CDECL _a)(void);
 };
 
 struct ISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL _a)(void);
+    void (*W_CDECL _a)(void);
 };
 
 struct ISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params
 {
     struct u_steam_iface *linux_side;
-    uint32_t (*W_STDCALL func)(int32_t);
+    uint32_t (*W_CDECL func)(int32_t);
 };
 
 struct ISteamClient_SteamClient019_GetISteamInventory_params
@@ -24142,13 +24142,13 @@ struct ISteamClient_SteamClient020_GetISteamHTMLSurface_params
 struct ISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL _a)(void);
+    void (*W_CDECL _a)(void);
 };
 
 struct ISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL _a)(void);
+    void (*W_CDECL _a)(void);
 };
 
 struct ISteamClient_SteamClient020_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params
@@ -33850,7 +33850,7 @@ struct ISteamInput_SteamInput005_EnableDeviceCallbacks_params
 struct ISteamInput_SteamInput005_EnableActionEventCallbacks_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL pCallback)(SteamInputActionEvent_t *);
+    void (*W_CDECL pCallback)(SteamInputActionEvent_t *);
 };
 
 struct ISteamInput_SteamInput005_GetActionSetHandle_params
@@ -34204,7 +34204,7 @@ struct ISteamInput_SteamInput006_EnableDeviceCallbacks_params
 struct ISteamInput_SteamInput006_EnableActionEventCallbacks_params
 {
     struct u_steam_iface *linux_side;
-    void (*W_STDCALL pCallback)(SteamInputActionEvent_t *);
+    void (*W_CDECL pCallback)(SteamInputActionEvent_t *);
 };
 
 struct ISteamInput_SteamInput006_GetActionSetHandle_params
@@ -40205,7 +40205,7 @@ struct ISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_para
 {
     struct u_steam_iface *linux_side;
     uint32_t eDetailLevel;
-    void (*W_STDCALL pfnFunc)(uint32_t, const char *);
+    void (*W_CDECL pfnFunc)(uint32_t, const char *);
 };
 
 struct ISteamNetworkingUtils_SteamNetworkingUtils001_SetConfigValue_params
@@ -40372,7 +40372,7 @@ struct ISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_para
 {
     struct u_steam_iface *linux_side;
     uint32_t eDetailLevel;
-    void (*W_STDCALL pfnFunc)(uint32_t, const char *);
+    void (*W_CDECL pfnFunc)(uint32_t, const char *);
 };
 
 struct ISteamNetworkingUtils_SteamNetworkingUtils002_SetConfigValue_params
@@ -40546,7 +40546,7 @@ struct ISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_para
 {
     struct u_steam_iface *linux_side;
     uint32_t eDetailLevel;
-    void (*W_STDCALL pfnFunc)(uint32_t, const char *);
+    void (*W_CDECL pfnFunc)(uint32_t, const char *);
 };
 
 struct ISteamNetworkingUtils_SteamNetworkingUtils003_SetConfigValue_params
@@ -40720,7 +40720,7 @@ struct ISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_para
 {
     struct u_steam_iface *linux_side;
     uint32_t eDetailLevel;
-    void (*W_STDCALL pfnFunc)(uint32_t, const char *);
+    void (*W_CDECL pfnFunc)(uint32_t, const char *);
 };
 
 struct ISteamNetworkingUtils_SteamNetworkingUtils004_GetIPv4FakeIPType_params
diff --git a/lsteamclient/winISteamClient.c b/lsteamclient/winISteamClient.c
index 0edc77c5..af6a668a 100644
--- a/lsteamclient/winISteamClient.c
+++ b/lsteamclient/winISteamClient.c
@@ -4570,7 +4570,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient016_GetISteam
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL func)(uint64_t, void *, uint32_t, int32_t))
+void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_CDECL func)(uint64_t, void *, uint32_t, int32_t))
 {
     struct ISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -4581,7 +4581,7 @@ void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProc
     STEAMCLIENT_CALL( ISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess, &params );
 }
 
-void __thiscall winISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL func)(uint64_t, void *, uint32_t, int32_t))
+void __thiscall winISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_CDECL func)(uint64_t, void *, uint32_t, int32_t))
 {
     struct ISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -4592,7 +4592,7 @@ void __thiscall winISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInP
     STEAMCLIENT_CALL( ISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess, &params );
 }
 
-void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_STDCALL func)(int32_t))
+void __thiscall winISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_CDECL func)(int32_t))
 {
     struct ISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params =
     {
@@ -5121,7 +5121,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient017_GetISteam
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void))
+void __thiscall winISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_CDECL _a)(void))
 {
     struct ISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -5132,7 +5132,7 @@ void __thiscall winISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIR
     STEAMCLIENT_CALL( ISteamClient_SteamClient017_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess, &params );
 }
 
-void __thiscall winISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void))
+void __thiscall winISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_CDECL _a)(void))
 {
     struct ISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -5143,7 +5143,7 @@ void __thiscall winISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostA
     STEAMCLIENT_CALL( ISteamClient_SteamClient017_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess, &params );
 }
 
-void __thiscall winISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_STDCALL func)(int32_t))
+void __thiscall winISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_CDECL func)(int32_t))
 {
     struct ISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params =
     {
@@ -5738,7 +5738,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient018_GetISteam
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void))
+void __thiscall winISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_CDECL _a)(void))
 {
     struct ISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -5749,7 +5749,7 @@ void __thiscall winISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIR
     STEAMCLIENT_CALL( ISteamClient_SteamClient018_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess, &params );
 }
 
-void __thiscall winISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void))
+void __thiscall winISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_CDECL _a)(void))
 {
     struct ISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -5760,7 +5760,7 @@ void __thiscall winISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostA
     STEAMCLIENT_CALL( ISteamClient_SteamClient018_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess, &params );
 }
 
-void __thiscall winISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_STDCALL func)(int32_t))
+void __thiscall winISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_CDECL func)(int32_t))
 {
     struct ISteamClient_SteamClient018_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params =
     {
@@ -6389,7 +6389,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient019_GetISteam
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void))
+void __thiscall winISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_CDECL _a)(void))
 {
     struct ISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -6400,7 +6400,7 @@ void __thiscall winISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIR
     STEAMCLIENT_CALL( ISteamClient_SteamClient019_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess, &params );
 }
 
-void __thiscall winISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void))
+void __thiscall winISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_CDECL _a)(void))
 {
     struct ISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -6411,7 +6411,7 @@ void __thiscall winISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostA
     STEAMCLIENT_CALL( ISteamClient_SteamClient019_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess, &params );
 }
 
-void __thiscall winISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_STDCALL func)(int32_t))
+void __thiscall winISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess(struct w_steam_iface *_this, uint32_t (*W_CDECL func)(int32_t))
 {
     struct ISteamClient_SteamClient019_Set_SteamAPI_CCheckCallbackRegisteredInProcess_params params =
     {
@@ -7057,7 +7057,7 @@ void /*ISteamHTMLSurface*/ * __thiscall winISteamClient_SteamClient020_GetISteam
     return params._ret;
 }
 
-void __thiscall winISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void))
+void __thiscall winISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_CDECL _a)(void))
 {
     struct ISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess_params params =
     {
@@ -7068,7 +7068,7 @@ void __thiscall winISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIR
     STEAMCLIENT_CALL( ISteamClient_SteamClient020_DEPRECATED_Set_SteamAPI_CPostAPIResultInProcess, &params );
 }
 
-void __thiscall winISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_STDCALL _a)(void))
+void __thiscall winISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess(struct w_steam_iface *_this, void (*W_CDECL _a)(void))
 {
     struct ISteamClient_SteamClient020_DEPRECATED_Remove_SteamAPI_CPostAPIResultInProcess_params params =
     {
diff --git a/lsteamclient/winISteamInput.c b/lsteamclient/winISteamInput.c
index a3d7235e..edd7e47b 100644
--- a/lsteamclient/winISteamInput.c
+++ b/lsteamclient/winISteamInput.c
@@ -1153,7 +1153,7 @@ void __thiscall winISteamInput_SteamInput005_EnableDeviceCallbacks(struct w_stea
     STEAMCLIENT_CALL( ISteamInput_SteamInput005_EnableDeviceCallbacks, &params );
 }
 
-void __thiscall winISteamInput_SteamInput005_EnableActionEventCallbacks(struct w_steam_iface *_this, void (*W_STDCALL pCallback)(SteamInputActionEvent_t *))
+void __thiscall winISteamInput_SteamInput005_EnableActionEventCallbacks(struct w_steam_iface *_this, void (*W_CDECL pCallback)(SteamInputActionEvent_t *))
 {
     struct ISteamInput_SteamInput005_EnableActionEventCallbacks_params params =
     {
@@ -1808,7 +1808,7 @@ void __thiscall winISteamInput_SteamInput006_EnableDeviceCallbacks(struct w_stea
     STEAMCLIENT_CALL( ISteamInput_SteamInput006_EnableDeviceCallbacks, &params );
 }
 
-void __thiscall winISteamInput_SteamInput006_EnableActionEventCallbacks(struct w_steam_iface *_this, void (*W_STDCALL pCallback)(SteamInputActionEvent_t *))
+void __thiscall winISteamInput_SteamInput006_EnableActionEventCallbacks(struct w_steam_iface *_this, void (*W_CDECL pCallback)(SteamInputActionEvent_t *))
 {
     struct ISteamInput_SteamInput006_EnableActionEventCallbacks_params params =
     {
diff --git a/lsteamclient/winISteamNetworkingUtils.c b/lsteamclient/winISteamNetworkingUtils.c
index 1cbc352a..45a28bef 100644
--- a/lsteamclient/winISteamNetworkingUtils.c
+++ b/lsteamclient/winISteamNetworkingUtils.c
@@ -172,7 +172,7 @@ int64_t __thiscall winISteamNetworkingUtils_SteamNetworkingUtils001_GetLocalTime
     return params._ret;
 }
 
-void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_STDCALL pfnFunc)(uint32_t, const char *))
+void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_CDECL pfnFunc)(uint32_t, const char *))
 {
     struct ISteamNetworkingUtils_SteamNetworkingUtils001_SetDebugOutputFunction_params params =
     {
@@ -510,7 +510,7 @@ int64_t __thiscall winISteamNetworkingUtils_SteamNetworkingUtils002_GetLocalTime
     return params._ret;
 }
 
-void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_STDCALL pfnFunc)(uint32_t, const char *))
+void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_CDECL pfnFunc)(uint32_t, const char *))
 {
     struct ISteamNetworkingUtils_SteamNetworkingUtils002_SetDebugOutputFunction_params params =
     {
@@ -849,7 +849,7 @@ int64_t __thiscall winISteamNetworkingUtils_SteamNetworkingUtils003_GetLocalTime
     return params._ret;
 }
 
-void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_STDCALL pfnFunc)(uint32_t, const char *))
+void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_CDECL pfnFunc)(uint32_t, const char *))
 {
     struct ISteamNetworkingUtils_SteamNetworkingUtils003_SetDebugOutputFunction_params params =
     {
@@ -1192,7 +1192,7 @@ int64_t __thiscall winISteamNetworkingUtils_SteamNetworkingUtils004_GetLocalTime
     return params._ret;
 }
 
-void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_STDCALL pfnFunc)(uint32_t, const char *))
+void __thiscall winISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction(struct w_steam_iface *_this, uint32_t eDetailLevel, void (*W_CDECL pfnFunc)(uint32_t, const char *))
 {
     struct ISteamNetworkingUtils_SteamNetworkingUtils004_SetDebugOutputFunction_params params =
     {