diff --git a/lsteamclient/cb_converters.dat b/lsteamclient/cb_converters.dat
index 3fcfa712..a39a92f1 100644
--- a/lsteamclient/cb_converters.dat
+++ b/lsteamclient/cb_converters.dat
@@ -1,58 +1,58 @@
-case 0x00100098: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_MicroTxnAuthorizationResponse_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c0201: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_LobbyCreated_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c145b: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RequestPlayersForGameProgressCallback_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x0038145c: win_msg->m_cubParam = 64; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RequestPlayersForGameResultCallback_t_64(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x0014145d: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RequestPlayersForGameFinalResultCallback_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x0014145e: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SubmitPlayerResultResultCallback_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c145f: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_EndGameResultCallback_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x011414b5: win_msg->m_cubParam = 280; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_JoinPartyCallback_t_280(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c14b6: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_CreateBeaconCallback_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x01180517: win_msg->m_cubParam = 288; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageAppSyncProgress_t_288(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x0110051b: win_msg->m_cubParam = 280; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageFileShareResult_t_280(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x0010051d: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStoragePublishFileResult_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c051f: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageDeletePublishedFileResult_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x019c0520: win_msg->m_cubParam = 416; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateUserPublishedFilesResult_t_416(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c0521: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageSubscribePublishedFileResult_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x02640522: win_msg->m_cubParam = 616; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateUserSubscribedFilesResult_t_616(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c0523: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUnsubscribePublishedFileResult_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00100524: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUpdatePublishedFileResult_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x01200525: win_msg->m_cubParam = 296; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageDownloadUGCResult_t_296(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x26140526: win_msg->m_cubParam = 9760; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_9760(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x026c0527: win_msg->m_cubParam = 624; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateWorkshopFilesResult_t_624(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x001c0528: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c052c: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x0010052d: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUserVoteDetails_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x019c052e: win_msg->m_cubParam = 416; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x0010052f: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageSetUserPublishedFileActionResult_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00140532: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStoragePublishedFileUpdated_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x001c0452: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_LeaderboardScoreUploaded_t_32(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c0457: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_LeaderboardUGCSet_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00140458: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_PS3TrophiesInstalled_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x002403ff: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_FileDetailsResult_t_40(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00180835: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestCompleted_t_32(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c0836: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestHeadersReceived_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00140837: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestDataReceived_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x26280d4a: win_msg->m_cubParam = 9784; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamUGCRequestUGCDetailsResult_t_9784(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00100d4b: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_CreateItemResult_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c0d4d: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_ItemInstalled_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00100d4e: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_DownloadItemResult_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00140d54: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_AddUGCDependencyResult_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00140d55: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoveUGCDependencyResult_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00100d56: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_AddAppDependencyResult_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00100d57: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoveAppDependencyResult_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00940d58: win_msg->m_cubParam = 152; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_GetAppDependenciesResult_t_152(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c0d59: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_DeleteItemResult_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c11a4: win_msg->m_cubParam = 12; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_FileOpenDialog_t_12(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00141260: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamInventoryStartPurchaseResult_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x002000d1: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_GSReputation_t_40(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x00140835: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestCompleted_t_24(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x26240d4a: win_msg->m_cubParam = 9776; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamUGCRequestUGCDetailsResult_t_9776(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c051b: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageFileShareResult_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x26200d4a: win_msg->m_cubParam = 9768; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamUGCRequestUGCDetailsResult_t_9768(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x26100526: win_msg->m_cubParam = 9752; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_9752(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c051d: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStoragePublishFileResult_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x000c0524: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUpdatePublishedFileResult_t_16(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x02640527: win_msg->m_cubParam = 616; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateWorkshopFilesResult_t_616(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x250c0526: win_msg->m_cubParam = 9496; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_9496(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x06c4051e: win_msg->m_cubParam = 1744; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_1744(lin_msg.m_pubParam, win_msg->m_pubParam); break;
-case 0x0020051c: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageDownloadUGCResult_t_40(lin_msg.m_pubParam, win_msg->m_pubParam); break;
+case 0x00100098: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_MicroTxnAuthorizationResponse_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c0201: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_LobbyCreated_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c145b: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RequestPlayersForGameProgressCallback_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x0038145c: win_msg->m_cubParam = 64; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RequestPlayersForGameResultCallback_t_64((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x0014145d: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RequestPlayersForGameFinalResultCallback_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x0014145e: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SubmitPlayerResultResultCallback_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c145f: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_EndGameResultCallback_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x011414b5: win_msg->m_cubParam = 280; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_JoinPartyCallback_t_280((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c14b6: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_CreateBeaconCallback_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x01180517: win_msg->m_cubParam = 288; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageAppSyncProgress_t_288((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x0110051b: win_msg->m_cubParam = 280; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageFileShareResult_t_280((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x0010051d: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStoragePublishFileResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c051f: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageDeletePublishedFileResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x019c0520: win_msg->m_cubParam = 416; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateUserPublishedFilesResult_t_416((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c0521: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageSubscribePublishedFileResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x02640522: win_msg->m_cubParam = 616; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateUserSubscribedFilesResult_t_616((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c0523: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUnsubscribePublishedFileResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00100524: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUpdatePublishedFileResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x01200525: win_msg->m_cubParam = 296; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageDownloadUGCResult_t_296((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x26140526: win_msg->m_cubParam = 9760; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_9760((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x026c0527: win_msg->m_cubParam = 624; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateWorkshopFilesResult_t_624((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x001c0528: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c052c: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x0010052d: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUserVoteDetails_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x019c052e: win_msg->m_cubParam = 416; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x0010052f: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageSetUserPublishedFileActionResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00140532: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStoragePublishedFileUpdated_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x001c0452: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_LeaderboardScoreUploaded_t_32((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c0457: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_LeaderboardUGCSet_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00140458: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_PS3TrophiesInstalled_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x002403ff: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_FileDetailsResult_t_40((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00180835: win_msg->m_cubParam = 32; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestCompleted_t_32((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c0836: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestHeadersReceived_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00140837: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestDataReceived_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x26280d4a: win_msg->m_cubParam = 9784; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamUGCRequestUGCDetailsResult_t_9784((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00100d4b: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_CreateItemResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c0d4d: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_ItemInstalled_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00100d4e: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_DownloadItemResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00140d54: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_AddUGCDependencyResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00140d55: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoveUGCDependencyResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00100d56: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_AddAppDependencyResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00100d57: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoveAppDependencyResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00940d58: win_msg->m_cubParam = 152; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_GetAppDependenciesResult_t_152((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c0d59: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_DeleteItemResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c11a4: win_msg->m_cubParam = 12; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTML_FileOpenDialog_t_12((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00141260: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamInventoryStartPurchaseResult_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x002000d1: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_GSReputation_t_40((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x00140835: win_msg->m_cubParam = 24; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_HTTPRequestCompleted_t_24((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x26240d4a: win_msg->m_cubParam = 9776; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamUGCRequestUGCDetailsResult_t_9776((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c051b: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageFileShareResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x26200d4a: win_msg->m_cubParam = 9768; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_SteamUGCRequestUGCDetailsResult_t_9768((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x26100526: win_msg->m_cubParam = 9752; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_9752((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c051d: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStoragePublishFileResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x000c0524: win_msg->m_cubParam = 16; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageUpdatePublishedFileResult_t_16((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x02640527: win_msg->m_cubParam = 616; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageEnumerateWorkshopFilesResult_t_616((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x250c0526: win_msg->m_cubParam = 9496; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_9496((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x06c4051e: win_msg->m_cubParam = 1744; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageGetPublishedFileDetailsResult_t_1744((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
+case 0x0020051c: win_msg->m_cubParam = 40; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); cb_RemoteStorageDownloadUGCResult_t_40((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;
diff --git a/lsteamclient/cb_converters.h b/lsteamclient/cb_converters.h
index 95e4fa09..55c1e482 100644
--- a/lsteamclient/cb_converters.h
+++ b/lsteamclient/cb_converters.h
@@ -1,116 +1,232 @@
-extern void cb_MicroTxnAuthorizationResponse_t_24(void *l, void *w);
+struct MicroTxnAuthorizationResponse_t;
+struct winMicroTxnAuthorizationResponse_t_24;
+extern void cb_MicroTxnAuthorizationResponse_t_24(const struct MicroTxnAuthorizationResponse_t *l, struct winMicroTxnAuthorizationResponse_t_24 *w);
 
-extern void cb_LobbyCreated_t_16(void *l, void *w);
+struct LobbyCreated_t;
+struct winLobbyCreated_t_16;
+extern void cb_LobbyCreated_t_16(const struct LobbyCreated_t *l, struct winLobbyCreated_t_16 *w);
 
-extern void cb_RequestPlayersForGameProgressCallback_t_16(void *l, void *w);
+struct RequestPlayersForGameProgressCallback_t;
+struct winRequestPlayersForGameProgressCallback_t_16;
+extern void cb_RequestPlayersForGameProgressCallback_t_16(const struct RequestPlayersForGameProgressCallback_t *l, struct winRequestPlayersForGameProgressCallback_t_16 *w);
 
-extern void cb_RequestPlayersForGameResultCallback_t_64(void *l, void *w);
+struct RequestPlayersForGameResultCallback_t;
+struct winRequestPlayersForGameResultCallback_t_64;
+extern void cb_RequestPlayersForGameResultCallback_t_64(const struct RequestPlayersForGameResultCallback_t *l, struct winRequestPlayersForGameResultCallback_t_64 *w);
 
-extern void cb_RequestPlayersForGameFinalResultCallback_t_24(void *l, void *w);
+struct RequestPlayersForGameFinalResultCallback_t;
+struct winRequestPlayersForGameFinalResultCallback_t_24;
+extern void cb_RequestPlayersForGameFinalResultCallback_t_24(const struct RequestPlayersForGameFinalResultCallback_t *l, struct winRequestPlayersForGameFinalResultCallback_t_24 *w);
 
-extern void cb_SubmitPlayerResultResultCallback_t_24(void *l, void *w);
+struct SubmitPlayerResultResultCallback_t;
+struct winSubmitPlayerResultResultCallback_t_24;
+extern void cb_SubmitPlayerResultResultCallback_t_24(const struct SubmitPlayerResultResultCallback_t *l, struct winSubmitPlayerResultResultCallback_t_24 *w);
 
-extern void cb_EndGameResultCallback_t_16(void *l, void *w);
+struct EndGameResultCallback_t;
+struct winEndGameResultCallback_t_16;
+extern void cb_EndGameResultCallback_t_16(const struct EndGameResultCallback_t *l, struct winEndGameResultCallback_t_16 *w);
 
-extern void cb_JoinPartyCallback_t_280(void *l, void *w);
+struct JoinPartyCallback_t;
+struct winJoinPartyCallback_t_280;
+extern void cb_JoinPartyCallback_t_280(const struct JoinPartyCallback_t *l, struct winJoinPartyCallback_t_280 *w);
 
-extern void cb_CreateBeaconCallback_t_16(void *l, void *w);
+struct CreateBeaconCallback_t;
+struct winCreateBeaconCallback_t_16;
+extern void cb_CreateBeaconCallback_t_16(const struct CreateBeaconCallback_t *l, struct winCreateBeaconCallback_t_16 *w);
 
-extern void cb_RemoteStorageAppSyncProgress_t_288(void *l, void *w);
+struct RemoteStorageAppSyncProgress_t;
+struct winRemoteStorageAppSyncProgress_t_288;
+extern void cb_RemoteStorageAppSyncProgress_t_288(const struct RemoteStorageAppSyncProgress_t *l, struct winRemoteStorageAppSyncProgress_t_288 *w);
 
-extern void cb_RemoteStorageFileShareResult_t_280(void *l, void *w);
+struct RemoteStorageFileShareResult_t;
+struct winRemoteStorageFileShareResult_t_280;
+extern void cb_RemoteStorageFileShareResult_t_280(const struct RemoteStorageFileShareResult_t *l, struct winRemoteStorageFileShareResult_t_280 *w);
 
-extern void cb_RemoteStoragePublishFileResult_t_24(void *l, void *w);
+struct RemoteStoragePublishFileResult_t;
+struct winRemoteStoragePublishFileResult_t_24;
+extern void cb_RemoteStoragePublishFileResult_t_24(const struct RemoteStoragePublishFileResult_t *l, struct winRemoteStoragePublishFileResult_t_24 *w);
 
-extern void cb_RemoteStorageDeletePublishedFileResult_t_16(void *l, void *w);
+struct RemoteStorageDeletePublishedFileResult_t;
+struct winRemoteStorageDeletePublishedFileResult_t_16;
+extern void cb_RemoteStorageDeletePublishedFileResult_t_16(const struct RemoteStorageDeletePublishedFileResult_t *l, struct winRemoteStorageDeletePublishedFileResult_t_16 *w);
 
-extern void cb_RemoteStorageEnumerateUserPublishedFilesResult_t_416(void *l, void *w);
+struct RemoteStorageEnumerateUserPublishedFilesResult_t;
+struct winRemoteStorageEnumerateUserPublishedFilesResult_t_416;
+extern void cb_RemoteStorageEnumerateUserPublishedFilesResult_t_416(const struct RemoteStorageEnumerateUserPublishedFilesResult_t *l, struct winRemoteStorageEnumerateUserPublishedFilesResult_t_416 *w);
 
-extern void cb_RemoteStorageSubscribePublishedFileResult_t_16(void *l, void *w);
+struct RemoteStorageSubscribePublishedFileResult_t;
+struct winRemoteStorageSubscribePublishedFileResult_t_16;
+extern void cb_RemoteStorageSubscribePublishedFileResult_t_16(const struct RemoteStorageSubscribePublishedFileResult_t *l, struct winRemoteStorageSubscribePublishedFileResult_t_16 *w);
 
-extern void cb_RemoteStorageEnumerateUserSubscribedFilesResult_t_616(void *l, void *w);
+struct RemoteStorageEnumerateUserSubscribedFilesResult_t;
+struct winRemoteStorageEnumerateUserSubscribedFilesResult_t_616;
+extern void cb_RemoteStorageEnumerateUserSubscribedFilesResult_t_616(const struct RemoteStorageEnumerateUserSubscribedFilesResult_t *l, struct winRemoteStorageEnumerateUserSubscribedFilesResult_t_616 *w);
 
-extern void cb_RemoteStorageUnsubscribePublishedFileResult_t_16(void *l, void *w);
+struct RemoteStorageUnsubscribePublishedFileResult_t;
+struct winRemoteStorageUnsubscribePublishedFileResult_t_16;
+extern void cb_RemoteStorageUnsubscribePublishedFileResult_t_16(const struct RemoteStorageUnsubscribePublishedFileResult_t *l, struct winRemoteStorageUnsubscribePublishedFileResult_t_16 *w);
 
-extern void cb_RemoteStorageUpdatePublishedFileResult_t_24(void *l, void *w);
+struct RemoteStorageUpdatePublishedFileResult_t;
+struct winRemoteStorageUpdatePublishedFileResult_t_24;
+extern void cb_RemoteStorageUpdatePublishedFileResult_t_24(const struct RemoteStorageUpdatePublishedFileResult_t *l, struct winRemoteStorageUpdatePublishedFileResult_t_24 *w);
 
-extern void cb_RemoteStorageDownloadUGCResult_t_296(void *l, void *w);
+struct RemoteStorageDownloadUGCResult_t;
+struct winRemoteStorageDownloadUGCResult_t_296;
+extern void cb_RemoteStorageDownloadUGCResult_t_296(const struct RemoteStorageDownloadUGCResult_t *l, struct winRemoteStorageDownloadUGCResult_t_296 *w);
 
-extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_9760(void *l, void *w);
+struct RemoteStorageGetPublishedFileDetailsResult_t;
+struct winRemoteStorageGetPublishedFileDetailsResult_t_9760;
+extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_9760(const struct RemoteStorageGetPublishedFileDetailsResult_t *l, struct winRemoteStorageGetPublishedFileDetailsResult_t_9760 *w);
 
-extern void cb_RemoteStorageEnumerateWorkshopFilesResult_t_624(void *l, void *w);
+struct RemoteStorageEnumerateWorkshopFilesResult_t;
+struct winRemoteStorageEnumerateWorkshopFilesResult_t_624;
+extern void cb_RemoteStorageEnumerateWorkshopFilesResult_t_624(const struct RemoteStorageEnumerateWorkshopFilesResult_t *l, struct winRemoteStorageEnumerateWorkshopFilesResult_t_624 *w);
 
-extern void cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32(void *l, void *w);
+struct RemoteStorageGetPublishedItemVoteDetailsResult_t;
+struct winRemoteStorageGetPublishedItemVoteDetailsResult_t_32;
+extern void cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32(const struct RemoteStorageGetPublishedItemVoteDetailsResult_t *l, struct winRemoteStorageGetPublishedItemVoteDetailsResult_t_32 *w);
 
-extern void cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16(void *l, void *w);
+struct RemoteStorageUpdateUserPublishedItemVoteResult_t;
+struct winRemoteStorageUpdateUserPublishedItemVoteResult_t_16;
+extern void cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16(const struct RemoteStorageUpdateUserPublishedItemVoteResult_t *l, struct winRemoteStorageUpdateUserPublishedItemVoteResult_t_16 *w);
 
-extern void cb_RemoteStorageUserVoteDetails_t_24(void *l, void *w);
+struct RemoteStorageUserVoteDetails_t;
+struct winRemoteStorageUserVoteDetails_t_24;
+extern void cb_RemoteStorageUserVoteDetails_t_24(const struct RemoteStorageUserVoteDetails_t *l, struct winRemoteStorageUserVoteDetails_t_24 *w);
 
-extern void cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416(void *l, void *w);
+struct RemoteStorageEnumerateUserSharedWorkshopFilesResult_t;
+struct winRemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416;
+extern void cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416(const struct RemoteStorageEnumerateUserSharedWorkshopFilesResult_t *l, struct winRemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 *w);
 
-extern void cb_RemoteStorageSetUserPublishedFileActionResult_t_24(void *l, void *w);
+struct RemoteStorageSetUserPublishedFileActionResult_t;
+struct winRemoteStorageSetUserPublishedFileActionResult_t_24;
+extern void cb_RemoteStorageSetUserPublishedFileActionResult_t_24(const struct RemoteStorageSetUserPublishedFileActionResult_t *l, struct winRemoteStorageSetUserPublishedFileActionResult_t_24 *w);
 
-extern void cb_RemoteStoragePublishedFileUpdated_t_24(void *l, void *w);
+struct RemoteStoragePublishedFileUpdated_t;
+struct winRemoteStoragePublishedFileUpdated_t_24;
+extern void cb_RemoteStoragePublishedFileUpdated_t_24(const struct RemoteStoragePublishedFileUpdated_t *l, struct winRemoteStoragePublishedFileUpdated_t_24 *w);
 
-extern void cb_LeaderboardScoreUploaded_t_32(void *l, void *w);
+struct LeaderboardScoreUploaded_t;
+struct winLeaderboardScoreUploaded_t_32;
+extern void cb_LeaderboardScoreUploaded_t_32(const struct LeaderboardScoreUploaded_t *l, struct winLeaderboardScoreUploaded_t_32 *w);
 
-extern void cb_LeaderboardUGCSet_t_16(void *l, void *w);
+struct LeaderboardUGCSet_t;
+struct winLeaderboardUGCSet_t_16;
+extern void cb_LeaderboardUGCSet_t_16(const struct LeaderboardUGCSet_t *l, struct winLeaderboardUGCSet_t_16 *w);
 
-extern void cb_PS3TrophiesInstalled_t_24(void *l, void *w);
+struct PS3TrophiesInstalled_t;
+struct winPS3TrophiesInstalled_t_24;
+extern void cb_PS3TrophiesInstalled_t_24(const struct PS3TrophiesInstalled_t *l, struct winPS3TrophiesInstalled_t_24 *w);
 
-extern void cb_FileDetailsResult_t_40(void *l, void *w);
+struct FileDetailsResult_t;
+struct winFileDetailsResult_t_40;
+extern void cb_FileDetailsResult_t_40(const struct FileDetailsResult_t *l, struct winFileDetailsResult_t_40 *w);
 
-extern void cb_HTTPRequestCompleted_t_32(void *l, void *w);
+struct HTTPRequestCompleted_t;
+struct winHTTPRequestCompleted_t_32;
+extern void cb_HTTPRequestCompleted_t_32(const struct HTTPRequestCompleted_t *l, struct winHTTPRequestCompleted_t_32 *w);
 
-extern void cb_HTTPRequestHeadersReceived_t_16(void *l, void *w);
+struct HTTPRequestHeadersReceived_t;
+struct winHTTPRequestHeadersReceived_t_16;
+extern void cb_HTTPRequestHeadersReceived_t_16(const struct HTTPRequestHeadersReceived_t *l, struct winHTTPRequestHeadersReceived_t_16 *w);
 
-extern void cb_HTTPRequestDataReceived_t_24(void *l, void *w);
+struct HTTPRequestDataReceived_t;
+struct winHTTPRequestDataReceived_t_24;
+extern void cb_HTTPRequestDataReceived_t_24(const struct HTTPRequestDataReceived_t *l, struct winHTTPRequestDataReceived_t_24 *w);
 
-extern void cb_SteamUGCRequestUGCDetailsResult_t_9784(void *l, void *w);
+struct SteamUGCRequestUGCDetailsResult_t;
+struct winSteamUGCRequestUGCDetailsResult_t_9784;
+extern void cb_SteamUGCRequestUGCDetailsResult_t_9784(const struct SteamUGCRequestUGCDetailsResult_t *l, struct winSteamUGCRequestUGCDetailsResult_t_9784 *w);
 
-extern void cb_CreateItemResult_t_24(void *l, void *w);
+struct CreateItemResult_t;
+struct winCreateItemResult_t_24;
+extern void cb_CreateItemResult_t_24(const struct CreateItemResult_t *l, struct winCreateItemResult_t_24 *w);
 
-extern void cb_ItemInstalled_t_16(void *l, void *w);
+struct ItemInstalled_t;
+struct winItemInstalled_t_16;
+extern void cb_ItemInstalled_t_16(const struct ItemInstalled_t *l, struct winItemInstalled_t_16 *w);
 
-extern void cb_DownloadItemResult_t_24(void *l, void *w);
+struct DownloadItemResult_t;
+struct winDownloadItemResult_t_24;
+extern void cb_DownloadItemResult_t_24(const struct DownloadItemResult_t *l, struct winDownloadItemResult_t_24 *w);
 
-extern void cb_AddUGCDependencyResult_t_24(void *l, void *w);
+struct AddUGCDependencyResult_t;
+struct winAddUGCDependencyResult_t_24;
+extern void cb_AddUGCDependencyResult_t_24(const struct AddUGCDependencyResult_t *l, struct winAddUGCDependencyResult_t_24 *w);
 
-extern void cb_RemoveUGCDependencyResult_t_24(void *l, void *w);
+struct RemoveUGCDependencyResult_t;
+struct winRemoveUGCDependencyResult_t_24;
+extern void cb_RemoveUGCDependencyResult_t_24(const struct RemoveUGCDependencyResult_t *l, struct winRemoveUGCDependencyResult_t_24 *w);
 
-extern void cb_AddAppDependencyResult_t_24(void *l, void *w);
+struct AddAppDependencyResult_t;
+struct winAddAppDependencyResult_t_24;
+extern void cb_AddAppDependencyResult_t_24(const struct AddAppDependencyResult_t *l, struct winAddAppDependencyResult_t_24 *w);
 
-extern void cb_RemoveAppDependencyResult_t_24(void *l, void *w);
+struct RemoveAppDependencyResult_t;
+struct winRemoveAppDependencyResult_t_24;
+extern void cb_RemoveAppDependencyResult_t_24(const struct RemoveAppDependencyResult_t *l, struct winRemoveAppDependencyResult_t_24 *w);
 
-extern void cb_GetAppDependenciesResult_t_152(void *l, void *w);
+struct GetAppDependenciesResult_t;
+struct winGetAppDependenciesResult_t_152;
+extern void cb_GetAppDependenciesResult_t_152(const struct GetAppDependenciesResult_t *l, struct winGetAppDependenciesResult_t_152 *w);
 
-extern void cb_DeleteItemResult_t_16(void *l, void *w);
+struct DeleteItemResult_t;
+struct winDeleteItemResult_t_16;
+extern void cb_DeleteItemResult_t_16(const struct DeleteItemResult_t *l, struct winDeleteItemResult_t_16 *w);
 
-extern void cb_HTML_FileOpenDialog_t_12(void *l, void *w);
+struct HTML_FileOpenDialog_t;
+struct winHTML_FileOpenDialog_t_12;
+extern void cb_HTML_FileOpenDialog_t_12(const struct HTML_FileOpenDialog_t *l, struct winHTML_FileOpenDialog_t_12 *w);
 
-extern void cb_SteamInventoryStartPurchaseResult_t_24(void *l, void *w);
+struct SteamInventoryStartPurchaseResult_t;
+struct winSteamInventoryStartPurchaseResult_t_24;
+extern void cb_SteamInventoryStartPurchaseResult_t_24(const struct SteamInventoryStartPurchaseResult_t *l, struct winSteamInventoryStartPurchaseResult_t_24 *w);
 
-extern void cb_GSReputation_t_40(void *l, void *w);
+struct GSReputation_t;
+struct winGSReputation_t_40;
+extern void cb_GSReputation_t_40(const struct GSReputation_t *l, struct winGSReputation_t_40 *w);
 
-extern void cb_HTTPRequestCompleted_t_24(void *l, void *w);
+struct HTTPRequestCompleted_t;
+struct winHTTPRequestCompleted_t_24;
+extern void cb_HTTPRequestCompleted_t_24(const struct HTTPRequestCompleted_t *l, struct winHTTPRequestCompleted_t_24 *w);
 
-extern void cb_SteamUGCRequestUGCDetailsResult_t_9776(void *l, void *w);
+struct SteamUGCRequestUGCDetailsResult_t;
+struct winSteamUGCRequestUGCDetailsResult_t_9776;
+extern void cb_SteamUGCRequestUGCDetailsResult_t_9776(const struct SteamUGCRequestUGCDetailsResult_t *l, struct winSteamUGCRequestUGCDetailsResult_t_9776 *w);
 
-extern void cb_RemoteStorageFileShareResult_t_16(void *l, void *w);
+struct RemoteStorageFileShareResult_t;
+struct winRemoteStorageFileShareResult_t_16;
+extern void cb_RemoteStorageFileShareResult_t_16(const struct RemoteStorageFileShareResult_t *l, struct winRemoteStorageFileShareResult_t_16 *w);
 
-extern void cb_SteamUGCRequestUGCDetailsResult_t_9768(void *l, void *w);
+struct SteamUGCRequestUGCDetailsResult_t;
+struct winSteamUGCRequestUGCDetailsResult_t_9768;
+extern void cb_SteamUGCRequestUGCDetailsResult_t_9768(const struct SteamUGCRequestUGCDetailsResult_t *l, struct winSteamUGCRequestUGCDetailsResult_t_9768 *w);
 
-extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_9752(void *l, void *w);
+struct RemoteStorageGetPublishedFileDetailsResult_t;
+struct winRemoteStorageGetPublishedFileDetailsResult_t_9752;
+extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_9752(const struct RemoteStorageGetPublishedFileDetailsResult_t *l, struct winRemoteStorageGetPublishedFileDetailsResult_t_9752 *w);
 
-extern void cb_RemoteStoragePublishFileResult_t_16(void *l, void *w);
+struct RemoteStoragePublishFileResult_t;
+struct winRemoteStoragePublishFileResult_t_16;
+extern void cb_RemoteStoragePublishFileResult_t_16(const struct RemoteStoragePublishFileResult_t *l, struct winRemoteStoragePublishFileResult_t_16 *w);
 
-extern void cb_RemoteStorageUpdatePublishedFileResult_t_16(void *l, void *w);
+struct RemoteStorageUpdatePublishedFileResult_t;
+struct winRemoteStorageUpdatePublishedFileResult_t_16;
+extern void cb_RemoteStorageUpdatePublishedFileResult_t_16(const struct RemoteStorageUpdatePublishedFileResult_t *l, struct winRemoteStorageUpdatePublishedFileResult_t_16 *w);
 
-extern void cb_RemoteStorageEnumerateWorkshopFilesResult_t_616(void *l, void *w);
+struct RemoteStorageEnumerateWorkshopFilesResult_t;
+struct winRemoteStorageEnumerateWorkshopFilesResult_t_616;
+extern void cb_RemoteStorageEnumerateWorkshopFilesResult_t_616(const struct RemoteStorageEnumerateWorkshopFilesResult_t *l, struct winRemoteStorageEnumerateWorkshopFilesResult_t_616 *w);
 
-extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_9496(void *l, void *w);
+struct RemoteStorageGetPublishedFileDetailsResult_t;
+struct winRemoteStorageGetPublishedFileDetailsResult_t_9496;
+extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_9496(const struct RemoteStorageGetPublishedFileDetailsResult_t *l, struct winRemoteStorageGetPublishedFileDetailsResult_t_9496 *w);
 
-extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_1744(void *l, void *w);
+struct RemoteStorageGetPublishedFileDetailsResult_t;
+struct winRemoteStorageGetPublishedFileDetailsResult_t_1744;
+extern void cb_RemoteStorageGetPublishedFileDetailsResult_t_1744(const struct RemoteStorageGetPublishedFileDetailsResult_t *l, struct winRemoteStorageGetPublishedFileDetailsResult_t_1744 *w);
 
-extern void cb_RemoteStorageDownloadUGCResult_t_40(void *l, void *w);
+struct RemoteStorageDownloadUGCResult_t;
+struct winRemoteStorageDownloadUGCResult_t_40;
+extern void cb_RemoteStorageDownloadUGCResult_t_40(const struct RemoteStorageDownloadUGCResult_t *l, struct winRemoteStorageDownloadUGCResult_t_40 *w);
 
diff --git a/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.cpp
index e8b11f8f..98fa1dd0 100644
--- a/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h"
 uint32 cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetNumInstalledApps(void *linux_side)
 {
     return ((ISteamAppList*)linux_side)->GetNumInstalledApps();
diff --git a/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h b/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h
index 45537285..58e40fd9 100644
--- a/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h
@@ -1,11 +1,5 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetNumInstalledApps(void *);
 extern uint32 cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetInstalledApps(void *, AppId_t *, uint32);
 extern int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppName(void *, AppId_t, char *, int);
 extern int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppInstallDir(void *, AppId_t, char *, int);
 extern int cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_GetAppBuildId(void *, AppId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.cpp
index afcda4b8..b6af85a1 100644
--- a/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamworks_sdk_143/isteamappticket.h"
 #include "steamclient_private.h"
-#include "cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h"
 uint32 cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_GetAppOwnershipTicketData(void *linux_side, uint32 nAppID, void * pvBuffer, uint32 cbBufferLength, uint32 * piAppId, uint32 * piSteamId, uint32 * piSignature, uint32 * pcbSignature)
 {
     return ((ISteamAppTicket*)linux_side)->GetAppOwnershipTicketData((uint32)nAppID, (void *)pvBuffer, (uint32)cbBufferLength, (uint32 *)piAppId, (uint32 *)piSteamId, (uint32 *)piSignature, (uint32 *)pcbSignature);
diff --git a/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h b/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h
index 09c169b5..2824abdc 100644
--- a/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h
@@ -1,7 +1 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_GetAppOwnershipTicketData(void *, uint32, void *, uint32, uint32 *, uint32 *, uint32 *, uint32 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.cpp
index caa59a56..c531a8db 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_100/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_100.h"
+#define SDKVER_100
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h"
 int cppISteamApps_STEAMAPPS_INTERFACE_VERSION001_GetAppData(void *linux_side, AppId_t nAppID, const char * pchKey, char * pchValue, int cchValueMax)
 {
     return ((ISteamApps*)linux_side)->GetAppData((AppId_t)nAppID, (const char *)pchKey, (char *)pchValue, (int)cchValueMax);
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h
index b443c68b..75ec1d58 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION001.h
@@ -1,7 +1 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION001_GetAppData(void *, AppId_t, const char *, char *, int);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.cpp b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.cpp
index 12c3e133..1e6c76df 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_103/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_103.h"
+#define SDKVER_103
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h"
 bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribed(void *linux_side)
 {
     return ((ISteamApps*)linux_side)->BIsSubscribed();
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h
index a6fc51ea..8aef587b 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribed(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsLowViolence(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsCybercafe(void *);
@@ -8,6 +5,3 @@ extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsVACBanned(void *);
 extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetCurrentGameLanguage(void *);
 extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_GetAvailableGameLanguages(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION002_BIsSubscribedApp(void *, AppId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.cpp b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.cpp
index 74431bd1..7dfcc599 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_111/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_111.h"
+#define SDKVER_111
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h"
 bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribed(void *linux_side)
 {
     return ((ISteamApps*)linux_side)->BIsSubscribed();
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h
index a38c9b6d..d3161dc4 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribed(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsLowViolence(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsCybercafe(void *);
@@ -9,6 +6,3 @@ extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetCurrentGameL
 extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_GetAvailableGameLanguages(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsSubscribedApp(void *, AppId_t);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION003_BIsDlcInstalled(void *, AppId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.cpp b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.cpp
index ed6cdb3c..59d2bc77 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_117/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_117.h"
+#define SDKVER_117
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h"
 bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribed(void *linux_side)
 {
     return ((ISteamApps*)linux_side)->BIsSubscribed();
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h
index 515eed5d..7150cba4 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsSubscribed(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsLowViolence(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BIsCybercafe(void *);
@@ -15,6 +12,3 @@ extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_GetDLCCount(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_BGetDLCDataByIndex(void *, int, AppId_t *, bool *, char *, int);
 extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_InstallDLC(void *, AppId_t);
 extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION004_UninstallDLC(void *, AppId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.cpp b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.cpp
index edc26a42..828562a3 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_125/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_125.h"
+#define SDKVER_125
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h"
 bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribed(void *linux_side)
 {
     return ((ISteamApps*)linux_side)->BIsSubscribed();
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h
index bb2d7574..71172144 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsSubscribed(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsLowViolence(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsCybercafe(void *);
@@ -21,6 +18,3 @@ extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_MarkContentCorrupt(void
 extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetInstalledDepots(void *, DepotId_t *, uint32);
 extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_GetAppInstallDir(void *, AppId_t, char *, uint32);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION005_BIsAppInstalled(void *, AppId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.cpp b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.cpp
index f75b81f3..f1c75ebc 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_131/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_131.h"
+#define SDKVER_131
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h"
 bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribed(void *linux_side)
 {
     return ((ISteamApps*)linux_side)->BIsSubscribed();
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h
index e972da43..c2538b97 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION006.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsSubscribed(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsLowViolence(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsCybercafe(void *);
@@ -23,6 +20,3 @@ extern uint32 cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppInstallDir(void
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_BIsAppInstalled(void *, AppId_t);
 extern CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetAppOwner(void *);
 extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION006_GetLaunchQueryParam(void *, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.cpp b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.cpp
index afbfcdcf..dc8c642a 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_136/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_136.h"
+#define SDKVER_136
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h"
 bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribed(void *linux_side)
 {
     return ((ISteamApps*)linux_side)->BIsSubscribed();
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h
index ba100385..64143337 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION007.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsSubscribed(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsLowViolence(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_BIsCybercafe(void *);
@@ -25,6 +22,3 @@ extern CSteamID cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppOwner(void *)
 extern const char * cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetLaunchQueryParam(void *, const char *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetDlcDownloadProgress(void *, AppId_t, uint64 *, uint64 *);
 extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION007_GetAppBuildId(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.cpp b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.cpp
index 35fde743..65b4345e 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.cpp
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h"
 bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribed(void *linux_side)
 {
     return ((ISteamApps*)linux_side)->BIsSubscribed();
diff --git a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h
index 8c3b69de..674ab9fa 100644
--- a/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h
+++ b/lsteamclient/cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribed(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsLowViolence(void *);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsCybercafe(void *);
@@ -29,6 +26,3 @@ extern void cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_RequestAllProofOfPurcha
 extern SteamAPICall_t cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetFileDetails(void *, const char *);
 extern int cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_GetLaunchCommandLine(void *, char *, int);
 extern bool cppISteamApps_STEAMAPPS_INTERFACE_VERSION008_BIsSubscribedFromFamilySharing(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient006.cpp b/lsteamclient/cppISteamClient_SteamClient006.cpp
index a1231757..1667d48c 100644
--- a/lsteamclient/cppISteamClient_SteamClient006.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient006.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099y/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient006.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099y.h"
+#define SDKVER_099y
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient006.h"
 HSteamPipe cppISteamClient_SteamClient006_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient006.h b/lsteamclient/cppISteamClient_SteamClient006.h
index c053f3aa..6bdeb670 100644
--- a/lsteamclient/cppISteamClient_SteamClient006.h
+++ b/lsteamclient/cppISteamClient_SteamClient006.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient006_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient006_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient006_CreateGlobalUser(void *, HSteamPipe *);
@@ -22,6 +19,3 @@ extern void *cppISteamClient_SteamClient006_GetISteamMasterServerUpdater(void *,
 extern void *cppISteamClient_SteamClient006_GetISteamMatchmakingServers(void *, HSteamUser, HSteamPipe, const char *);
 extern void cppISteamClient_SteamClient006_RunFrame(void *);
 extern uint32 cppISteamClient_SteamClient006_GetIPCCallCount(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient007.cpp b/lsteamclient/cppISteamClient_SteamClient007.cpp
index 4ad4d256..c12dad7b 100644
--- a/lsteamclient/cppISteamClient_SteamClient007.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient007.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_103/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient007.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_103.h"
+#define SDKVER_103
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient007.h"
 HSteamPipe cppISteamClient_SteamClient007_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient007.h b/lsteamclient/cppISteamClient_SteamClient007.h
index ba7198de..f69e256f 100644
--- a/lsteamclient/cppISteamClient_SteamClient007.h
+++ b/lsteamclient/cppISteamClient_SteamClient007.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient007_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient007_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient007_ConnectToGlobalUser(void *, HSteamPipe);
@@ -23,6 +20,3 @@ extern void *cppISteamClient_SteamClient007_GetISteamApps(void *, HSteamUser, HS
 extern void *cppISteamClient_SteamClient007_GetISteamNetworking(void *, HSteamUser, HSteamPipe, const char *);
 extern void cppISteamClient_SteamClient007_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
 extern void *cppISteamClient_SteamClient007_GetISteamRemoteStorage(void *, HSteamUser, HSteamPipe, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient008.cpp b/lsteamclient/cppISteamClient_SteamClient008.cpp
index 9c5c9528..08e2e105 100644
--- a/lsteamclient/cppISteamClient_SteamClient008.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient008.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_107/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient008.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_107.h"
+#define SDKVER_107
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient008.h"
 HSteamPipe cppISteamClient_SteamClient008_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient008.h b/lsteamclient/cppISteamClient_SteamClient008.h
index 1a5af401..be8d22d9 100644
--- a/lsteamclient/cppISteamClient_SteamClient008.h
+++ b/lsteamclient/cppISteamClient_SteamClient008.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient008_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient008_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient008_ConnectToGlobalUser(void *, HSteamPipe);
@@ -22,6 +19,3 @@ extern void *cppISteamClient_SteamClient008_GetISteamRemoteStorage(void *, HStea
 extern void cppISteamClient_SteamClient008_RunFrame(void *);
 extern uint32 cppISteamClient_SteamClient008_GetIPCCallCount(void *);
 extern void cppISteamClient_SteamClient008_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient009.cpp b/lsteamclient/cppISteamClient_SteamClient009.cpp
index b8f7e3f4..36bbec71 100644
--- a/lsteamclient/cppISteamClient_SteamClient009.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient009.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_111/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient009.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_111.h"
+#define SDKVER_111
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient009.h"
 HSteamPipe cppISteamClient_SteamClient009_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient009.h b/lsteamclient/cppISteamClient_SteamClient009.h
index f23244f0..a380d20c 100644
--- a/lsteamclient/cppISteamClient_SteamClient009.h
+++ b/lsteamclient/cppISteamClient_SteamClient009.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient009_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient009_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient009_ConnectToGlobalUser(void *, HSteamPipe);
@@ -23,6 +20,3 @@ extern void *cppISteamClient_SteamClient009_GetISteamRemoteStorage(void *, HStea
 extern void cppISteamClient_SteamClient009_RunFrame(void *);
 extern uint32 cppISteamClient_SteamClient009_GetIPCCallCount(void *);
 extern void cppISteamClient_SteamClient009_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient010.cpp b/lsteamclient/cppISteamClient_SteamClient010.cpp
index 4e995dbe..781875e9 100644
--- a/lsteamclient/cppISteamClient_SteamClient010.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient010.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_115/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient010.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_115.h"
+#define SDKVER_115
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient010.h"
 HSteamPipe cppISteamClient_SteamClient010_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient010.h b/lsteamclient/cppISteamClient_SteamClient010.h
index 6b0ee78a..7061dfde 100644
--- a/lsteamclient/cppISteamClient_SteamClient010.h
+++ b/lsteamclient/cppISteamClient_SteamClient010.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient010_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient010_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient010_ConnectToGlobalUser(void *, HSteamPipe);
@@ -25,6 +22,3 @@ extern uint32 cppISteamClient_SteamClient010_GetIPCCallCount(void *);
 extern void cppISteamClient_SteamClient010_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
 extern bool cppISteamClient_SteamClient010_BShutdownIfAllPipesClosed(void *);
 extern void *cppISteamClient_SteamClient010_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient011.cpp b/lsteamclient/cppISteamClient_SteamClient011.cpp
index 791c8feb..422f6644 100644
--- a/lsteamclient/cppISteamClient_SteamClient011.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient011.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_116/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient011.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_116.h"
+#define SDKVER_116
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient011.h"
 HSteamPipe cppISteamClient_SteamClient011_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient011.h b/lsteamclient/cppISteamClient_SteamClient011.h
index a3379849..34f7dc32 100644
--- a/lsteamclient/cppISteamClient_SteamClient011.h
+++ b/lsteamclient/cppISteamClient_SteamClient011.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient011_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient011_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient011_ConnectToGlobalUser(void *, HSteamPipe);
@@ -26,6 +23,3 @@ extern uint32 cppISteamClient_SteamClient011_GetIPCCallCount(void *);
 extern void cppISteamClient_SteamClient011_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
 extern bool cppISteamClient_SteamClient011_BShutdownIfAllPipesClosed(void *);
 extern void *cppISteamClient_SteamClient011_GetISteamHTTP(void *, HSteamUser, HSteamPipe, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient012.cpp b/lsteamclient/cppISteamClient_SteamClient012.cpp
index d90545d6..b0ea2050 100644
--- a/lsteamclient/cppISteamClient_SteamClient012.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient012.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_128/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient012.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_128.h"
+#define SDKVER_128
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient012.h"
 HSteamPipe cppISteamClient_SteamClient012_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient012.h b/lsteamclient/cppISteamClient_SteamClient012.h
index 6c801067..b31d6f7c 100644
--- a/lsteamclient/cppISteamClient_SteamClient012.h
+++ b/lsteamclient/cppISteamClient_SteamClient012.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient012_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient012_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient012_ConnectToGlobalUser(void *, HSteamPipe);
@@ -28,6 +25,3 @@ extern void *cppISteamClient_SteamClient012_GetISteamHTTP(void *, HSteamUser, HS
 extern void *cppISteamClient_SteamClient012_GetISteamUnifiedMessages(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient012_GetISteamController(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient012_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient013.cpp b/lsteamclient/cppISteamClient_SteamClient013.cpp
index 9807db96..92ab7288 100644
--- a/lsteamclient/cppISteamClient_SteamClient013.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient013.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_128x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient013.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_128x.h"
+#define SDKVER_128x
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient013.h"
 HSteamPipe cppISteamClient_SteamClient013_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient013.h b/lsteamclient/cppISteamClient_SteamClient013.h
index b00287c8..5e4c2f7b 100644
--- a/lsteamclient/cppISteamClient_SteamClient013.h
+++ b/lsteamclient/cppISteamClient_SteamClient013.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient013_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient013_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient013_ConnectToGlobalUser(void *, HSteamPipe);
@@ -31,6 +28,3 @@ extern void *cppISteamClient_SteamClient013_GetISteamUGC(void *, HSteamUser, HSt
 extern void * cppISteamClient_SteamClient013_GetISteamInventory(void *, HSteamUser, HSteamPipe, const char *);
 extern void * cppISteamClient_SteamClient013_GetISteamVideo(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient013_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient014.cpp b/lsteamclient/cppISteamClient_SteamClient014.cpp
index db70a61a..25d0c443 100644
--- a/lsteamclient/cppISteamClient_SteamClient014.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient014.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_129a/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient014.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_129a.h"
+#define SDKVER_129a
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient014.h"
 HSteamPipe cppISteamClient_SteamClient014_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient014.h b/lsteamclient/cppISteamClient_SteamClient014.h
index 91e08236..1e85d0b8 100644
--- a/lsteamclient/cppISteamClient_SteamClient014.h
+++ b/lsteamclient/cppISteamClient_SteamClient014.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient014_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient014_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient014_ConnectToGlobalUser(void *, HSteamPipe);
@@ -30,6 +27,3 @@ extern void *cppISteamClient_SteamClient014_GetISteamController(void *, HSteamUs
 extern void *cppISteamClient_SteamClient014_GetISteamUGC(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient014_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient014_GetISteamMusic(void *, HSteamUser, HSteamPipe, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient015.cpp b/lsteamclient/cppISteamClient_SteamClient015.cpp
index 3f897a9e..90c014e4 100644
--- a/lsteamclient/cppISteamClient_SteamClient015.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient015.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_130/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient015.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_130.h"
+#define SDKVER_130
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient015.h"
 HSteamPipe cppISteamClient_SteamClient015_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient015.h b/lsteamclient/cppISteamClient_SteamClient015.h
index 4cc0d2a8..7f497187 100644
--- a/lsteamclient/cppISteamClient_SteamClient015.h
+++ b/lsteamclient/cppISteamClient_SteamClient015.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient015_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient015_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient015_ConnectToGlobalUser(void *, HSteamPipe);
@@ -31,6 +28,3 @@ extern void *cppISteamClient_SteamClient015_GetISteamUGC(void *, HSteamUser, HSt
 extern void *cppISteamClient_SteamClient015_GetISteamAppList(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient015_GetISteamMusic(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient015_GetISteamMusicRemote(void *, HSteamUser, HSteamPipe, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient016.cpp b/lsteamclient/cppISteamClient_SteamClient016.cpp
index abbaeeae..7b1c7d5c 100644
--- a/lsteamclient/cppISteamClient_SteamClient016.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient016.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_131/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient016.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_131.h"
+#define SDKVER_131
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient016.h"
 HSteamPipe cppISteamClient_SteamClient016_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient016.h b/lsteamclient/cppISteamClient_SteamClient016.h
index cfef323a..c90cdd4d 100644
--- a/lsteamclient/cppISteamClient_SteamClient016.h
+++ b/lsteamclient/cppISteamClient_SteamClient016.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient016_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient016_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient016_ConnectToGlobalUser(void *, HSteamPipe);
@@ -35,6 +32,3 @@ extern void *cppISteamClient_SteamClient016_GetISteamHTMLSurface(void *, HSteamU
 extern void cppISteamClient_SteamClient016_Set_SteamAPI_CPostAPIResultInProcess(void *, SteamAPI_PostAPIResultInProcess_t);
 extern void cppISteamClient_SteamClient016_Remove_SteamAPI_CPostAPIResultInProcess(void *, SteamAPI_PostAPIResultInProcess_t);
 extern void cppISteamClient_SteamClient016_Set_SteamAPI_CCheckCallbackRegisteredInProcess(void *, SteamAPI_CheckCallbackRegistered_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient017.cpp b/lsteamclient/cppISteamClient_SteamClient017.cpp
index 17bd01db..0a7e1927 100644
--- a/lsteamclient/cppISteamClient_SteamClient017.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient017.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_142/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient017.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_142.h"
+#define SDKVER_142
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient017.h"
 HSteamPipe cppISteamClient_SteamClient017_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient017.h b/lsteamclient/cppISteamClient_SteamClient017.h
index 38a52411..37552aa4 100644
--- a/lsteamclient/cppISteamClient_SteamClient017.h
+++ b/lsteamclient/cppISteamClient_SteamClient017.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient017_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient017_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient017_ConnectToGlobalUser(void *, HSteamPipe);
@@ -38,6 +35,3 @@ extern void cppISteamClient_SteamClient017_Set_SteamAPI_CCheckCallbackRegistered
 extern void *cppISteamClient_SteamClient017_GetISteamInventory(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient017_GetISteamVideo(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient017_GetISteamParentalSettings(void *, HSteamUser, HSteamPipe, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamClient_SteamClient018.cpp b/lsteamclient/cppISteamClient_SteamClient018.cpp
index 07eb8bfc..9b5e4b1c 100644
--- a/lsteamclient/cppISteamClient_SteamClient018.cpp
+++ b/lsteamclient/cppISteamClient_SteamClient018.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamClient_SteamClient018.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamClient_SteamClient018.h"
 HSteamPipe cppISteamClient_SteamClient018_CreateSteamPipe(void *linux_side)
 {
     return ((ISteamClient*)linux_side)->CreateSteamPipe();
diff --git a/lsteamclient/cppISteamClient_SteamClient018.h b/lsteamclient/cppISteamClient_SteamClient018.h
index a0f6d3fa..ba761f13 100644
--- a/lsteamclient/cppISteamClient_SteamClient018.h
+++ b/lsteamclient/cppISteamClient_SteamClient018.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamPipe cppISteamClient_SteamClient018_CreateSteamPipe(void *);
 extern bool cppISteamClient_SteamClient018_BReleaseSteamPipe(void *, HSteamPipe);
 extern HSteamUser cppISteamClient_SteamClient018_ConnectToGlobalUser(void *, HSteamPipe);
@@ -41,6 +38,3 @@ extern void *cppISteamClient_SteamClient018_GetISteamVideo(void *, HSteamUser, H
 extern void *cppISteamClient_SteamClient018_GetISteamParentalSettings(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient018_GetISteamInput(void *, HSteamUser, HSteamPipe, const char *);
 extern void *cppISteamClient_SteamClient018_GetISteamParties(void *, HSteamUser, HSteamPipe, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.cpp b/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.cpp
index 02ea4ca6..96a230b1 100644
--- a/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.cpp
+++ b/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_134/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_134.h"
+#define SDKVER_134
+#include "struct_converters.h"
+#include "cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.h"
 bool cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Init(void *linux_side, const char * pchAbsolutePathToControllerConfigVDF)
 {
     return ((ISteamController*)linux_side)->Init((const char *)pchAbsolutePathToControllerConfigVDF);
diff --git a/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.h b/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.h
index 40e821d5..8bde17c9 100644
--- a/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.h
+++ b/lsteamclient/cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION.h
@@ -1,12 +1,6 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Init(void *, const char *);
 extern bool cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_Shutdown(void *);
 extern void cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_RunFrame(void *);
 extern bool cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_GetControllerState(void *, uint32, SteamControllerState001_t *);
 extern void cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_TriggerHapticPulse(void *, uint32, ESteamControllerPad, unsigned short);
 extern void cppISteamController_STEAMCONTROLLER_INTERFACE_VERSION_SetOverrideMode(void *, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamController_SteamController003.cpp b/lsteamclient/cppISteamController_SteamController003.cpp
index 9fc850c9..b9965d2b 100644
--- a/lsteamclient/cppISteamController_SteamController003.cpp
+++ b/lsteamclient/cppISteamController_SteamController003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_137/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamController_SteamController003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_137.h"
+#define SDKVER_137
+#include "struct_converters.h"
+#include "cppISteamController_SteamController003.h"
 bool cppISteamController_SteamController003_Init(void *linux_side)
 {
     return ((ISteamController*)linux_side)->Init();
diff --git a/lsteamclient/cppISteamController_SteamController003.h b/lsteamclient/cppISteamController_SteamController003.h
index c15f1321..f01286e0 100644
--- a/lsteamclient/cppISteamController_SteamController003.h
+++ b/lsteamclient/cppISteamController_SteamController003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamController_SteamController003_Init(void *);
 extern bool cppISteamController_SteamController003_Shutdown(void *);
 extern void cppISteamController_SteamController003_RunFrame(void *);
@@ -18,6 +15,3 @@ extern int cppISteamController_SteamController003_GetAnalogActionOrigins(void *,
 extern void cppISteamController_SteamController003_StopAnalogActionMomentum(void *, ControllerHandle_t, ControllerAnalogActionHandle_t);
 extern void cppISteamController_SteamController003_TriggerHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short);
 extern void cppISteamController_SteamController003_TriggerRepeatedHapticPulse(void *, ControllerHandle_t, ESteamControllerPad, unsigned short, unsigned short, unsigned short, unsigned int);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamController_SteamController004.cpp b/lsteamclient/cppISteamController_SteamController004.cpp
index 7ce15251..06552bac 100644
--- a/lsteamclient/cppISteamController_SteamController004.cpp
+++ b/lsteamclient/cppISteamController_SteamController004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_138a/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamController_SteamController004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_138a.h"
+#define SDKVER_138a
+#include "struct_converters.h"
+#include "cppISteamController_SteamController004.h"
 bool cppISteamController_SteamController004_Init(void *linux_side)
 {
     return ((ISteamController*)linux_side)->Init();
diff --git a/lsteamclient/cppISteamController_SteamController004.h b/lsteamclient/cppISteamController_SteamController004.h
index 3b65c6a5..72626e11 100644
--- a/lsteamclient/cppISteamController_SteamController004.h
+++ b/lsteamclient/cppISteamController_SteamController004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamController_SteamController004_Init(void *);
 extern bool cppISteamController_SteamController004_Shutdown(void *);
 extern void cppISteamController_SteamController004_RunFrame(void *);
@@ -23,6 +20,3 @@ extern ControllerHandle_t cppISteamController_SteamController004_GetControllerFo
 extern ControllerMotionData_t cppISteamController_SteamController004_GetMotionData(void *, ControllerHandle_t);
 extern bool cppISteamController_SteamController004_ShowDigitalActionOrigins(void *, ControllerHandle_t, ControllerDigitalActionHandle_t, float, float, float);
 extern bool cppISteamController_SteamController004_ShowAnalogActionOrigins(void *, ControllerHandle_t, ControllerAnalogActionHandle_t, float, float, float);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamController_SteamController005.cpp b/lsteamclient/cppISteamController_SteamController005.cpp
index 04194fdb..5b0d98b9 100644
--- a/lsteamclient/cppISteamController_SteamController005.cpp
+++ b/lsteamclient/cppISteamController_SteamController005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_141/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamController_SteamController005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_141.h"
+#define SDKVER_141
+#include "struct_converters.h"
+#include "cppISteamController_SteamController005.h"
 bool cppISteamController_SteamController005_Init(void *linux_side)
 {
     return ((ISteamController*)linux_side)->Init();
diff --git a/lsteamclient/cppISteamController_SteamController005.h b/lsteamclient/cppISteamController_SteamController005.h
index ebfa84c9..c3d550ff 100644
--- a/lsteamclient/cppISteamController_SteamController005.h
+++ b/lsteamclient/cppISteamController_SteamController005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamController_SteamController005_Init(void *);
 extern bool cppISteamController_SteamController005_Shutdown(void *);
 extern void cppISteamController_SteamController005_RunFrame(void *);
@@ -27,6 +24,3 @@ extern bool cppISteamController_SteamController005_ShowDigitalActionOrigins(void
 extern bool cppISteamController_SteamController005_ShowAnalogActionOrigins(void *, ControllerHandle_t, ControllerAnalogActionHandle_t, float, float, float);
 extern const char * cppISteamController_SteamController005_GetStringForActionOrigin(void *, EControllerActionOrigin);
 extern const char * cppISteamController_SteamController005_GetGlyphForActionOrigin(void *, EControllerActionOrigin);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamController_SteamController006.cpp b/lsteamclient/cppISteamController_SteamController006.cpp
index 8e79ca28..5d9b2941 100644
--- a/lsteamclient/cppISteamController_SteamController006.cpp
+++ b/lsteamclient/cppISteamController_SteamController006.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_142/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamController_SteamController006.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_142.h"
+#define SDKVER_142
+#include "struct_converters.h"
+#include "cppISteamController_SteamController006.h"
 bool cppISteamController_SteamController006_Init(void *linux_side)
 {
     return ((ISteamController*)linux_side)->Init();
diff --git a/lsteamclient/cppISteamController_SteamController006.h b/lsteamclient/cppISteamController_SteamController006.h
index 082c6f24..2b91c22b 100644
--- a/lsteamclient/cppISteamController_SteamController006.h
+++ b/lsteamclient/cppISteamController_SteamController006.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamController_SteamController006_Init(void *);
 extern bool cppISteamController_SteamController006_Shutdown(void *);
 extern void cppISteamController_SteamController006_RunFrame(void *);
@@ -32,6 +29,3 @@ extern bool cppISteamController_SteamController006_ShowAnalogActionOrigins(void
 extern const char * cppISteamController_SteamController006_GetStringForActionOrigin(void *, EControllerActionOrigin);
 extern const char * cppISteamController_SteamController006_GetGlyphForActionOrigin(void *, EControllerActionOrigin);
 extern ESteamInputType cppISteamController_SteamController006_GetInputTypeForHandle(void *, ControllerHandle_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamController_SteamController007.cpp b/lsteamclient/cppISteamController_SteamController007.cpp
index 85a0da85..717ba76b 100644
--- a/lsteamclient/cppISteamController_SteamController007.cpp
+++ b/lsteamclient/cppISteamController_SteamController007.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamController_SteamController007.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamController_SteamController007.h"
 bool cppISteamController_SteamController007_Init(void *linux_side)
 {
     return ((ISteamController*)linux_side)->Init();
diff --git a/lsteamclient/cppISteamController_SteamController007.h b/lsteamclient/cppISteamController_SteamController007.h
index 4eba66bd..f8f9fc03 100644
--- a/lsteamclient/cppISteamController_SteamController007.h
+++ b/lsteamclient/cppISteamController_SteamController007.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamController_SteamController007_Init(void *);
 extern bool cppISteamController_SteamController007_Shutdown(void *);
 extern void cppISteamController_SteamController007_RunFrame(void *);
@@ -34,6 +31,3 @@ extern const char * cppISteamController_SteamController007_GetStringForXboxOrigi
 extern const char * cppISteamController_SteamController007_GetGlyphForXboxOrigin(void *, EXboxOrigin);
 extern EControllerActionOrigin cppISteamController_SteamController007_GetActionOriginFromXboxOrigin(void *, ControllerHandle_t, EXboxOrigin);
 extern EControllerActionOrigin cppISteamController_SteamController007_TranslateActionOrigin(void *, ESteamInputType, EControllerActionOrigin);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends001.cpp b/lsteamclient/cppISteamFriends_SteamFriends001.cpp
index 7638969c..25f6e804 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends001.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099x.h"
+#define SDKVER_099x
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends001.h"
 const char * cppISteamFriends_SteamFriends001_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends001.h b/lsteamclient/cppISteamFriends_SteamFriends001.h
index 29e71bcb..4b196075 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends001.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends001_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends001_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends001_GetPersonaState(void *);
@@ -28,6 +25,3 @@ extern bool cppISteamFriends_SteamFriends001_InviteFriendByEmail(void *, const c
 extern int cppISteamFriends_SteamFriends001_GetBlockedFriendCount(void *);
 extern bool cppISteamFriends_SteamFriends001_GetFriendGamePlayed(void *, CSteamID, uint64 *, uint32 *, uint16 *);
 extern bool cppISteamFriends_SteamFriends001_GetFriendGamePlayed2(void *, CSteamID, uint64 *, uint32 *, uint16 *, uint16 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends002.cpp b/lsteamclient/cppISteamFriends_SteamFriends002.cpp
index fce4eba6..ebd4997a 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends002.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099y/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099y.h"
+#define SDKVER_099y
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends002.h"
 const char * cppISteamFriends_SteamFriends002_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends002.h b/lsteamclient/cppISteamFriends_SteamFriends002.h
index f5078083..b46dfe3f 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends002.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends002_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends002_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends002_GetPersonaState(void *);
@@ -31,6 +28,3 @@ extern bool cppISteamFriends_SteamFriends002_InviteFriendToClan(void *, CSteamID
 extern bool cppISteamFriends_SteamFriends002_AcknowledgeInviteToClan(void *, CSteamID, bool);
 extern int cppISteamFriends_SteamFriends002_GetFriendCountFromSource(void *, CSteamID);
 extern CSteamID cppISteamFriends_SteamFriends002_GetFriendFromSourceByIndex(void *, CSteamID, int);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends003.cpp b/lsteamclient/cppISteamFriends_SteamFriends003.cpp
index 3d253ad2..a99cce9e 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends003.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_101/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_101.h"
+#define SDKVER_101
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends003.h"
 const char * cppISteamFriends_SteamFriends003_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends003.h b/lsteamclient/cppISteamFriends_SteamFriends003.h
index 99e1b2ec..176ef322 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends003.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends003_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends003_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends003_GetPersonaState(void *);
@@ -21,6 +18,3 @@ extern CSteamID cppISteamFriends_SteamFriends003_GetFriendFromSourceByIndex(void
 extern bool cppISteamFriends_SteamFriends003_IsUserInSource(void *, CSteamID, CSteamID);
 extern void cppISteamFriends_SteamFriends003_SetInGameVoiceSpeaking(void *, CSteamID, bool);
 extern void cppISteamFriends_SteamFriends003_ActivateGameOverlay(void *, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends004.cpp b/lsteamclient/cppISteamFriends_SteamFriends004.cpp
index 6df48984..38a9defb 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends004.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_102/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_102.h"
+#define SDKVER_102
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends004.h"
 const char * cppISteamFriends_SteamFriends004_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends004.h b/lsteamclient/cppISteamFriends_SteamFriends004.h
index 8b96c12a..66c3653d 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends004.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends004_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends004_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends004_GetPersonaState(void *);
@@ -21,6 +18,3 @@ extern CSteamID cppISteamFriends_SteamFriends004_GetFriendFromSourceByIndex(void
 extern bool cppISteamFriends_SteamFriends004_IsUserInSource(void *, CSteamID, CSteamID);
 extern void cppISteamFriends_SteamFriends004_SetInGameVoiceSpeaking(void *, CSteamID, bool);
 extern void cppISteamFriends_SteamFriends004_ActivateGameOverlay(void *, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends005.cpp b/lsteamclient/cppISteamFriends_SteamFriends005.cpp
index 028fef3c..292980a3 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends005.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_109/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_109.h"
+#define SDKVER_109
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends005.h"
 const char * cppISteamFriends_SteamFriends005_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends005.h b/lsteamclient/cppISteamFriends_SteamFriends005.h
index 621dc6d3..3e23744a 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends005.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends005_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends005_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends005_GetPersonaState(void *);
@@ -25,6 +22,3 @@ extern void cppISteamFriends_SteamFriends005_ActivateGameOverlayToUser(void *, c
 extern void cppISteamFriends_SteamFriends005_ActivateGameOverlayToWebPage(void *, const char *);
 extern void cppISteamFriends_SteamFriends005_ActivateGameOverlayToStore(void *, AppId_t);
 extern void cppISteamFriends_SteamFriends005_SetPlayedWith(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends006.cpp b/lsteamclient/cppISteamFriends_SteamFriends006.cpp
index d8d0d12b..a4f537fb 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends006.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends006.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_110/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends006.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_110.h"
+#define SDKVER_110
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends006.h"
 const char * cppISteamFriends_SteamFriends006_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends006.h b/lsteamclient/cppISteamFriends_SteamFriends006.h
index 48527906..03faf48b 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends006.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends006.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends006_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends006_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends006_GetPersonaState(void *);
@@ -27,6 +24,3 @@ extern void cppISteamFriends_SteamFriends006_ActivateGameOverlayToWebPage(void *
 extern void cppISteamFriends_SteamFriends006_ActivateGameOverlayToStore(void *, AppId_t);
 extern void cppISteamFriends_SteamFriends006_SetPlayedWith(void *, CSteamID);
 extern void cppISteamFriends_SteamFriends006_ActivateGameOverlayInviteDialog(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends007.cpp b/lsteamclient/cppISteamFriends_SteamFriends007.cpp
index f005ce6a..e67d06b5 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends007.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends007.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_111/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends007.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_111.h"
+#define SDKVER_111
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends007.h"
 const char * cppISteamFriends_SteamFriends007_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends007.h b/lsteamclient/cppISteamFriends_SteamFriends007.h
index 1925af3a..e0db8f40 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends007.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends007.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends007_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends007_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends007_GetPersonaState(void *);
@@ -29,6 +26,3 @@ extern void cppISteamFriends_SteamFriends007_ActivateGameOverlayInviteDialog(voi
 extern int cppISteamFriends_SteamFriends007_GetSmallFriendAvatar(void *, CSteamID);
 extern int cppISteamFriends_SteamFriends007_GetMediumFriendAvatar(void *, CSteamID);
 extern int cppISteamFriends_SteamFriends007_GetLargeFriendAvatar(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends008.cpp b/lsteamclient/cppISteamFriends_SteamFriends008.cpp
index d6230719..811fff33 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends008.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends008.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_112/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends008.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_112.h"
+#define SDKVER_112
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends008.h"
 const char * cppISteamFriends_SteamFriends008_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends008.h b/lsteamclient/cppISteamFriends_SteamFriends008.h
index 76655557..01d4df93 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends008.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends008.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends008_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends008_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends008_GetPersonaState(void *);
@@ -35,6 +32,3 @@ extern CSteamID cppISteamFriends_SteamFriends008_GetClanOwner(void *, CSteamID);
 extern int cppISteamFriends_SteamFriends008_GetClanOfficerCount(void *, CSteamID);
 extern CSteamID cppISteamFriends_SteamFriends008_GetClanOfficerByIndex(void *, CSteamID, int);
 extern uint32 cppISteamFriends_SteamFriends008_GetUserRestrictions(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends009.cpp b/lsteamclient/cppISteamFriends_SteamFriends009.cpp
index 9936d726..e48910d4 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends009.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends009.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_116/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends009.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_116.h"
+#define SDKVER_116
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends009.h"
 const char * cppISteamFriends_SteamFriends009_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends009.h b/lsteamclient/cppISteamFriends_SteamFriends009.h
index a1313a04..f476ba6c 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends009.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends009.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends009_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends009_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends009_GetPersonaState(void *);
@@ -45,6 +42,3 @@ extern int cppISteamFriends_SteamFriends009_GetCoplayFriendCount(void *);
 extern CSteamID cppISteamFriends_SteamFriends009_GetCoplayFriend(void *, int);
 extern int cppISteamFriends_SteamFriends009_GetFriendCoplayTime(void *, CSteamID);
 extern AppId_t cppISteamFriends_SteamFriends009_GetFriendCoplayGame(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends010.cpp b/lsteamclient/cppISteamFriends_SteamFriends010.cpp
index 12cb7b05..208bb70e 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends010.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends010.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_116x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends010.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_116x.h"
+#define SDKVER_116x
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends010.h"
 const char * cppISteamFriends_SteamFriends010_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends010.h b/lsteamclient/cppISteamFriends_SteamFriends010.h
index 7a5a8a53..48d2c87c 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends010.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends010.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends010_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends010_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends010_GetPersonaState(void *);
@@ -60,6 +57,3 @@ extern bool cppISteamFriends_SteamFriends010_CloseClanChatWindowInSteam(void *,
 extern bool cppISteamFriends_SteamFriends010_SetListenForFriendsMessages(void *, bool);
 extern bool cppISteamFriends_SteamFriends010_ReplyToFriendMessage(void *, CSteamID, const char *);
 extern int cppISteamFriends_SteamFriends010_GetFriendMessage(void *, CSteamID, int, void *, int, EChatEntryType *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends011.cpp b/lsteamclient/cppISteamFriends_SteamFriends011.cpp
index 9547bb2f..f24c1c85 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends011.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends011.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_119/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends011.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_119.h"
+#define SDKVER_119
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends011.h"
 const char * cppISteamFriends_SteamFriends011_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends011.h b/lsteamclient/cppISteamFriends_SteamFriends011.h
index 8ddf34e0..8a9901ec 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends011.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends011.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends011_GetPersonaName(void *);
 extern void cppISteamFriends_SteamFriends011_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends011_GetPersonaState(void *);
@@ -64,6 +61,3 @@ extern int cppISteamFriends_SteamFriends011_GetFriendMessage(void *, CSteamID, i
 extern SteamAPICall_t cppISteamFriends_SteamFriends011_GetFollowerCount(void *, CSteamID);
 extern SteamAPICall_t cppISteamFriends_SteamFriends011_IsFollowing(void *, CSteamID);
 extern SteamAPICall_t cppISteamFriends_SteamFriends011_EnumerateFollowingList(void *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends012.cpp b/lsteamclient/cppISteamFriends_SteamFriends012.cpp
index 28e5e070..640c32dd 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends012.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends012.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_119x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends012.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_119x.h"
+#define SDKVER_119x
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends012.h"
 const char * cppISteamFriends_SteamFriends012_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends012.h b/lsteamclient/cppISteamFriends_SteamFriends012.h
index 061dc597..579955f2 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends012.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends012.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends012_GetPersonaName(void *);
 extern SteamAPICall_t cppISteamFriends_SteamFriends012_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends012_GetPersonaState(void *);
@@ -64,6 +61,3 @@ extern int cppISteamFriends_SteamFriends012_GetFriendMessage(void *, CSteamID, i
 extern SteamAPICall_t cppISteamFriends_SteamFriends012_GetFollowerCount(void *, CSteamID);
 extern SteamAPICall_t cppISteamFriends_SteamFriends012_IsFollowing(void *, CSteamID);
 extern SteamAPICall_t cppISteamFriends_SteamFriends012_EnumerateFollowingList(void *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends013.cpp b/lsteamclient/cppISteamFriends_SteamFriends013.cpp
index 6ba753d4..45c23094 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends013.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends013.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_125/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends013.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_125.h"
+#define SDKVER_125
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends013.h"
 const char * cppISteamFriends_SteamFriends013_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends013.h b/lsteamclient/cppISteamFriends_SteamFriends013.h
index 3b27b229..8d060cc8 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends013.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends013.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends013_GetPersonaName(void *);
 extern SteamAPICall_t cppISteamFriends_SteamFriends013_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends013_GetPersonaState(void *);
@@ -64,6 +61,3 @@ extern int cppISteamFriends_SteamFriends013_GetFriendMessage(void *, CSteamID, i
 extern SteamAPICall_t cppISteamFriends_SteamFriends013_GetFollowerCount(void *, CSteamID);
 extern SteamAPICall_t cppISteamFriends_SteamFriends013_IsFollowing(void *, CSteamID);
 extern SteamAPICall_t cppISteamFriends_SteamFriends013_EnumerateFollowingList(void *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends014.cpp b/lsteamclient/cppISteamFriends_SteamFriends014.cpp
index 774ae4f9..d5bfa844 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends014.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends014.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_131/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends014.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_131.h"
+#define SDKVER_131
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends014.h"
 const char * cppISteamFriends_SteamFriends014_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends014.h b/lsteamclient/cppISteamFriends_SteamFriends014.h
index faf6231f..41c0b338 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends014.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends014.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends014_GetPersonaName(void *);
 extern SteamAPICall_t cppISteamFriends_SteamFriends014_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends014_GetPersonaState(void *);
@@ -65,6 +62,3 @@ extern int cppISteamFriends_SteamFriends014_GetFriendMessage(void *, CSteamID, i
 extern SteamAPICall_t cppISteamFriends_SteamFriends014_GetFollowerCount(void *, CSteamID);
 extern SteamAPICall_t cppISteamFriends_SteamFriends014_IsFollowing(void *, CSteamID);
 extern SteamAPICall_t cppISteamFriends_SteamFriends014_EnumerateFollowingList(void *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends015.cpp b/lsteamclient/cppISteamFriends_SteamFriends015.cpp
index 661c49fa..9f971dea 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends015.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends015.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_142/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends015.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_142.h"
+#define SDKVER_142
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends015.h"
 const char * cppISteamFriends_SteamFriends015_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends015.h b/lsteamclient/cppISteamFriends_SteamFriends015.h
index f66efdea..5fd94c5c 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends015.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends015.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends015_GetPersonaName(void *);
 extern SteamAPICall_t cppISteamFriends_SteamFriends015_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends015_GetPersonaState(void *);
@@ -73,6 +70,3 @@ extern SteamAPICall_t cppISteamFriends_SteamFriends015_IsFollowing(void *, CStea
 extern SteamAPICall_t cppISteamFriends_SteamFriends015_EnumerateFollowingList(void *, uint32);
 extern bool cppISteamFriends_SteamFriends015_IsClanPublic(void *, CSteamID);
 extern bool cppISteamFriends_SteamFriends015_IsClanOfficialGameGroup(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamFriends_SteamFriends017.cpp b/lsteamclient/cppISteamFriends_SteamFriends017.cpp
index 5f6a7a5c..831a5a6c 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends017.cpp
+++ b/lsteamclient/cppISteamFriends_SteamFriends017.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamFriends_SteamFriends017.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamFriends_SteamFriends017.h"
 const char * cppISteamFriends_SteamFriends017_GetPersonaName(void *linux_side)
 {
     return ((ISteamFriends*)linux_side)->GetPersonaName();
diff --git a/lsteamclient/cppISteamFriends_SteamFriends017.h b/lsteamclient/cppISteamFriends_SteamFriends017.h
index f14cea5a..686c5be7 100644
--- a/lsteamclient/cppISteamFriends_SteamFriends017.h
+++ b/lsteamclient/cppISteamFriends_SteamFriends017.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern const char * cppISteamFriends_SteamFriends017_GetPersonaName(void *);
 extern SteamAPICall_t cppISteamFriends_SteamFriends017_SetPersonaName(void *, const char *);
 extern EPersonaState cppISteamFriends_SteamFriends017_GetPersonaState(void *);
@@ -74,6 +71,3 @@ extern SteamAPICall_t cppISteamFriends_SteamFriends017_EnumerateFollowingList(vo
 extern bool cppISteamFriends_SteamFriends017_IsClanPublic(void *, CSteamID);
 extern bool cppISteamFriends_SteamFriends017_IsClanOfficialGameGroup(void *, CSteamID);
 extern int cppISteamFriends_SteamFriends017_GetNumChatsWithUnreadPriorityMessages(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameCoordinator_SteamGameCoordinator001.cpp b/lsteamclient/cppISteamGameCoordinator_SteamGameCoordinator001.cpp
index 9f415130..939c9955 100644
--- a/lsteamclient/cppISteamGameCoordinator_SteamGameCoordinator001.cpp
+++ b/lsteamclient/cppISteamGameCoordinator_SteamGameCoordinator001.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamworks_sdk_143/isteamgamecoordinator.h"
 #include "steamclient_private.h"
-#include "cppISteamGameCoordinator_SteamGameCoordinator001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamGameCoordinator_SteamGameCoordinator001.h"
 EGCResults cppISteamGameCoordinator_SteamGameCoordinator001_SendMessage(void *linux_side, uint32 unMsgType, const void * pubData, uint32 cubData)
 {
     return ((ISteamGameCoordinator*)linux_side)->SendMessage((uint32)unMsgType, (const void *)pubData, (uint32)cubData);
diff --git a/lsteamclient/cppISteamGameCoordinator_SteamGameCoordinator001.h b/lsteamclient/cppISteamGameCoordinator_SteamGameCoordinator001.h
index abb692d8..c4a71084 100644
--- a/lsteamclient/cppISteamGameCoordinator_SteamGameCoordinator001.h
+++ b/lsteamclient/cppISteamGameCoordinator_SteamGameCoordinator001.h
@@ -1,9 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern EGCResults cppISteamGameCoordinator_SteamGameCoordinator001_SendMessage(void *, uint32, const void *, uint32);
 extern bool cppISteamGameCoordinator_SteamGameCoordinator001_IsMessageAvailable(void *, uint32 *);
 extern EGCResults cppISteamGameCoordinator_SteamGameCoordinator001_RetrieveMessage(void *, uint32 *, void *, uint32, uint32 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameServerStats_SteamGameServerStats001.cpp b/lsteamclient/cppISteamGameServerStats_SteamGameServerStats001.cpp
index 48a5d183..872a66c6 100644
--- a/lsteamclient/cppISteamGameServerStats_SteamGameServerStats001.cpp
+++ b/lsteamclient/cppISteamGameServerStats_SteamGameServerStats001.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamworks_sdk_143/isteamgameserverstats.h"
 #include "steamclient_private.h"
-#include "cppISteamGameServerStats_SteamGameServerStats001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamGameServerStats_SteamGameServerStats001.h"
 SteamAPICall_t cppISteamGameServerStats_SteamGameServerStats001_RequestUserStats(void *linux_side, CSteamID steamIDUser)
 {
     return ((ISteamGameServerStats*)linux_side)->RequestUserStats((CSteamID)steamIDUser);
diff --git a/lsteamclient/cppISteamGameServerStats_SteamGameServerStats001.h b/lsteamclient/cppISteamGameServerStats_SteamGameServerStats001.h
index c1eff92f..712e95f2 100644
--- a/lsteamclient/cppISteamGameServerStats_SteamGameServerStats001.h
+++ b/lsteamclient/cppISteamGameServerStats_SteamGameServerStats001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern SteamAPICall_t cppISteamGameServerStats_SteamGameServerStats001_RequestUserStats(void *, CSteamID);
 extern bool cppISteamGameServerStats_SteamGameServerStats001_GetUserStat(void *, CSteamID, const char *, int32 *);
 extern bool cppISteamGameServerStats_SteamGameServerStats001_GetUserStat_2(void *, CSteamID, const char *, float *);
@@ -11,6 +8,3 @@ extern bool cppISteamGameServerStats_SteamGameServerStats001_UpdateUserAvgRateSt
 extern bool cppISteamGameServerStats_SteamGameServerStats001_SetUserAchievement(void *, CSteamID, const char *);
 extern bool cppISteamGameServerStats_SteamGameServerStats001_ClearUserAchievement(void *, CSteamID, const char *);
 extern SteamAPICall_t cppISteamGameServerStats_SteamGameServerStats001_StoreUserStats(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer002.cpp b/lsteamclient/cppISteamGameServer_SteamGameServer002.cpp
index e9967df6..7f0de368 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer002.cpp
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer002.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_099x/steam_api.h"
 #include "steamworks_sdk_099x/isteamgameserver.h"
 #include "steamclient_private.h"
-#include "cppISteamGameServer_SteamGameServer002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099x.h"
+#define SDKVER_099x
+#include "struct_converters.h"
+#include "cppISteamGameServer_SteamGameServer002.h"
 void cppISteamGameServer_SteamGameServer002_LogOn(void *linux_side)
 {
     ((ISteamGameServer*)linux_side)->LogOn();
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer002.h b/lsteamclient/cppISteamGameServer_SteamGameServer002.h
index 894666d7..e6564eaa 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer002.h
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamGameServer_SteamGameServer002_LogOn(void *);
 extern void cppISteamGameServer_SteamGameServer002_LogOff(void *);
 extern bool cppISteamGameServer_SteamGameServer002_BLoggedOn(void *);
@@ -22,6 +19,3 @@ extern bool cppISteamGameServer_SteamGameServer002_GSCreateUnauthenticatedUser(v
 extern bool cppISteamGameServer_SteamGameServer002_GSSetUserData(void *, CSteamID, const char *, uint32);
 extern void cppISteamGameServer_SteamGameServer002_GSUpdateSpectatorPort(void *, uint16);
 extern void cppISteamGameServer_SteamGameServer002_GSSetGameType(void *, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer003.cpp b/lsteamclient/cppISteamGameServer_SteamGameServer003.cpp
index 6842fbda..927439fc 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer003.cpp
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer003.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_099y/steam_api.h"
 #include "steamworks_sdk_099y/isteamgameserver.h"
 #include "steamclient_private.h"
-#include "cppISteamGameServer_SteamGameServer003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099y.h"
+#define SDKVER_099y
+#include "struct_converters.h"
+#include "cppISteamGameServer_SteamGameServer003.h"
 void cppISteamGameServer_SteamGameServer003_LogOn(void *linux_side)
 {
     ((ISteamGameServer*)linux_side)->LogOn();
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer003.h b/lsteamclient/cppISteamGameServer_SteamGameServer003.h
index 086ad7d9..6922542c 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer003.h
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamGameServer_SteamGameServer003_LogOn(void *);
 extern void cppISteamGameServer_SteamGameServer003_LogOff(void *);
 extern bool cppISteamGameServer_SteamGameServer003_BLoggedOn(void *);
@@ -18,6 +15,3 @@ extern bool cppISteamGameServer_SteamGameServer003_GSSetUserData(void *, CSteamI
 extern void cppISteamGameServer_SteamGameServer003_GSUpdateSpectatorPort(void *, uint16);
 extern void cppISteamGameServer_SteamGameServer003_GSSetGameType(void *, const char *);
 extern bool cppISteamGameServer_SteamGameServer003_GSGetUserAchievementStatus(void *, CSteamID, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer004.cpp b/lsteamclient/cppISteamGameServer_SteamGameServer004.cpp
index b28ffdee..75916f6e 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer004.cpp
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer004.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_100/steam_api.h"
 #include "steamworks_sdk_100/isteamgameserver.h"
 #include "steamclient_private.h"
-#include "cppISteamGameServer_SteamGameServer004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_100.h"
+#define SDKVER_100
+#include "struct_converters.h"
+#include "cppISteamGameServer_SteamGameServer004.h"
 void cppISteamGameServer_SteamGameServer004_LogOn(void *linux_side)
 {
     ((ISteamGameServer*)linux_side)->LogOn();
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer004.h b/lsteamclient/cppISteamGameServer_SteamGameServer004.h
index fa20aead..40a3dfa2 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer004.h
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamGameServer_SteamGameServer004_LogOn(void *);
 extern void cppISteamGameServer_SteamGameServer004_LogOff(void *);
 extern bool cppISteamGameServer_SteamGameServer004_BLoggedOn(void *);
@@ -15,6 +12,3 @@ extern void cppISteamGameServer_SteamGameServer004_UpdateServerStatus(void *, in
 extern void cppISteamGameServer_SteamGameServer004_UpdateSpectatorPort(void *, uint16);
 extern void cppISteamGameServer_SteamGameServer004_SetGameType(void *, const char *);
 extern bool cppISteamGameServer_SteamGameServer004_BGetUserAchievementStatus(void *, CSteamID, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer005.cpp b/lsteamclient/cppISteamGameServer_SteamGameServer005.cpp
index 974f8ebb..0d807455 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer005.cpp
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer005.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_102/steam_api.h"
 #include "steamworks_sdk_102/isteamgameserver.h"
 #include "steamclient_private.h"
-#include "cppISteamGameServer_SteamGameServer005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_102.h"
+#define SDKVER_102
+#include "struct_converters.h"
+#include "cppISteamGameServer_SteamGameServer005.h"
 void cppISteamGameServer_SteamGameServer005_LogOn(void *linux_side)
 {
     ((ISteamGameServer*)linux_side)->LogOn();
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer005.h b/lsteamclient/cppISteamGameServer_SteamGameServer005.h
index 5f9aeeeb..f7529104 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer005.h
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamGameServer_SteamGameServer005_LogOn(void *);
 extern void cppISteamGameServer_SteamGameServer005_LogOff(void *);
 extern bool cppISteamGameServer_SteamGameServer005_BLoggedOn(void *);
@@ -15,6 +12,3 @@ extern void cppISteamGameServer_SteamGameServer005_UpdateServerStatus(void *, in
 extern void cppISteamGameServer_SteamGameServer005_UpdateSpectatorPort(void *, uint16);
 extern void cppISteamGameServer_SteamGameServer005_SetGameType(void *, const char *);
 extern bool cppISteamGameServer_SteamGameServer005_BGetUserAchievementStatus(void *, CSteamID, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer008.cpp b/lsteamclient/cppISteamGameServer_SteamGameServer008.cpp
index 9242966d..ee166148 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer008.cpp
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer008.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_104/steam_api.h"
 #include "steamworks_sdk_104/isteamgameserver.h"
 #include "steamclient_private.h"
-#include "cppISteamGameServer_SteamGameServer008.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_104.h"
+#define SDKVER_104
+#include "struct_converters.h"
+#include "cppISteamGameServer_SteamGameServer008.h"
 void cppISteamGameServer_SteamGameServer008_LogOn(void *linux_side)
 {
     ((ISteamGameServer*)linux_side)->LogOn();
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer008.h b/lsteamclient/cppISteamGameServer_SteamGameServer008.h
index 2094de0e..6489c665 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer008.h
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer008.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamGameServer_SteamGameServer008_LogOn(void *);
 extern void cppISteamGameServer_SteamGameServer008_LogOff(void *);
 extern bool cppISteamGameServer_SteamGameServer008_BLoggedOn(void *);
@@ -18,6 +15,3 @@ extern bool cppISteamGameServer_SteamGameServer008_BGetUserAchievementStatus(voi
 extern void cppISteamGameServer_SteamGameServer008_GetGameplayStats(void *);
 extern bool cppISteamGameServer_SteamGameServer008_RequestUserGroupStatus(void *, CSteamID, CSteamID);
 extern uint32 cppISteamGameServer_SteamGameServer008_GetPublicIP(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer009.cpp b/lsteamclient/cppISteamGameServer_SteamGameServer009.cpp
index a2fb7e93..007a79ef 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer009.cpp
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer009.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_107/steam_api.h"
 #include "steamworks_sdk_107/isteamgameserver.h"
 #include "steamclient_private.h"
-#include "cppISteamGameServer_SteamGameServer009.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_107.h"
+#define SDKVER_107
+#include "struct_converters.h"
+#include "cppISteamGameServer_SteamGameServer009.h"
 void cppISteamGameServer_SteamGameServer009_LogOn(void *linux_side)
 {
     ((ISteamGameServer*)linux_side)->LogOn();
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer009.h b/lsteamclient/cppISteamGameServer_SteamGameServer009.h
index 1a35d8b0..e6375af6 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer009.h
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer009.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamGameServer_SteamGameServer009_LogOn(void *);
 extern void cppISteamGameServer_SteamGameServer009_LogOff(void *);
 extern bool cppISteamGameServer_SteamGameServer009_BLoggedOn(void *);
@@ -20,6 +17,3 @@ extern bool cppISteamGameServer_SteamGameServer009_RequestUserGroupStatus(void *
 extern uint32 cppISteamGameServer_SteamGameServer009_GetPublicIP(void *);
 extern void cppISteamGameServer_SteamGameServer009_SetGameData(void *, const char *);
 extern EUserHasLicenseForAppResult cppISteamGameServer_SteamGameServer009_UserHasLicenseForApp(void *, CSteamID, AppId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer010.cpp b/lsteamclient/cppISteamGameServer_SteamGameServer010.cpp
index 8c84fa9a..50b3187a 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer010.cpp
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer010.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_116/steam_api.h"
 #include "steamworks_sdk_116/isteamgameserver.h"
 #include "steamclient_private.h"
-#include "cppISteamGameServer_SteamGameServer010.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_116.h"
+#define SDKVER_116
+#include "struct_converters.h"
+#include "cppISteamGameServer_SteamGameServer010.h"
 void cppISteamGameServer_SteamGameServer010_LogOn(void *linux_side)
 {
     ((ISteamGameServer*)linux_side)->LogOn();
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer010.h b/lsteamclient/cppISteamGameServer_SteamGameServer010.h
index f05b252e..f58b7dd4 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer010.h
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer010.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamGameServer_SteamGameServer010_LogOn(void *);
 extern void cppISteamGameServer_SteamGameServer010_LogOff(void *);
 extern bool cppISteamGameServer_SteamGameServer010_BLoggedOn(void *);
@@ -24,6 +21,3 @@ extern HAuthTicket cppISteamGameServer_SteamGameServer010_GetAuthSessionTicket(v
 extern EBeginAuthSessionResult cppISteamGameServer_SteamGameServer010_BeginAuthSession(void *, const void *, int, CSteamID);
 extern void cppISteamGameServer_SteamGameServer010_EndAuthSession(void *, CSteamID);
 extern void cppISteamGameServer_SteamGameServer010_CancelAuthTicket(void *, HAuthTicket);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer011.cpp b/lsteamclient/cppISteamGameServer_SteamGameServer011.cpp
index fc241964..f3179b95 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer011.cpp
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer011.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_128/steam_api.h"
 #include "steamworks_sdk_128/isteamgameserver.h"
 #include "steamclient_private.h"
-#include "cppISteamGameServer_SteamGameServer011.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_128.h"
+#define SDKVER_128
+#include "struct_converters.h"
+#include "cppISteamGameServer_SteamGameServer011.h"
 bool cppISteamGameServer_SteamGameServer011_InitGameServer(void *linux_side, uint32 unIP, uint16 usGamePort, uint16 usQueryPort, uint32 unFlags, AppId_t nGameAppId, const char * pchVersionString)
 {
     return ((ISteamGameServer*)linux_side)->InitGameServer((uint32)unIP, (uint16)usGamePort, (uint16)usQueryPort, (uint32)unFlags, (AppId_t)nGameAppId, (const char *)pchVersionString);
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer011.h b/lsteamclient/cppISteamGameServer_SteamGameServer011.h
index ee065283..97acd031 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer011.h
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer011.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamGameServer_SteamGameServer011_InitGameServer(void *, uint32, uint16, uint16, uint32, AppId_t, const char *);
 extern void cppISteamGameServer_SteamGameServer011_SetProduct(void *, const char *);
 extern void cppISteamGameServer_SteamGameServer011_SetGameDescription(void *, const char *);
@@ -45,6 +42,3 @@ extern void cppISteamGameServer_SteamGameServer011_SetHeartbeatInterval(void *,
 extern void cppISteamGameServer_SteamGameServer011_ForceHeartbeat(void *);
 extern SteamAPICall_t cppISteamGameServer_SteamGameServer011_AssociateWithClan(void *, CSteamID);
 extern SteamAPICall_t cppISteamGameServer_SteamGameServer011_ComputeNewPlayerCompatibility(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer012.cpp b/lsteamclient/cppISteamGameServer_SteamGameServer012.cpp
index a73ef365..97ea6e0f 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer012.cpp
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer012.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamworks_sdk_143/isteamgameserver.h"
 #include "steamclient_private.h"
-#include "cppISteamGameServer_SteamGameServer012.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamGameServer_SteamGameServer012.h"
 bool cppISteamGameServer_SteamGameServer012_InitGameServer(void *linux_side, uint32 unIP, uint16 usGamePort, uint16 usQueryPort, uint32 unFlags, AppId_t nGameAppId, const char * pchVersionString)
 {
     return ((ISteamGameServer*)linux_side)->InitGameServer((uint32)unIP, (uint16)usGamePort, (uint16)usQueryPort, (uint32)unFlags, (AppId_t)nGameAppId, (const char *)pchVersionString);
diff --git a/lsteamclient/cppISteamGameServer_SteamGameServer012.h b/lsteamclient/cppISteamGameServer_SteamGameServer012.h
index 5642e2ab..91e7323e 100644
--- a/lsteamclient/cppISteamGameServer_SteamGameServer012.h
+++ b/lsteamclient/cppISteamGameServer_SteamGameServer012.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamGameServer_SteamGameServer012_InitGameServer(void *, uint32, uint16, uint16, uint32, AppId_t, const char *);
 extern void cppISteamGameServer_SteamGameServer012_SetProduct(void *, const char *);
 extern void cppISteamGameServer_SteamGameServer012_SetGameDescription(void *, const char *);
@@ -45,6 +42,3 @@ extern void cppISteamGameServer_SteamGameServer012_SetHeartbeatInterval(void *,
 extern void cppISteamGameServer_SteamGameServer012_ForceHeartbeat(void *);
 extern SteamAPICall_t cppISteamGameServer_SteamGameServer012_AssociateWithClan(void *, CSteamID);
 extern SteamAPICall_t cppISteamGameServer_SteamGameServer012_ComputeNewPlayerCompatibility(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamGameStats_SteamGameStats001.cpp b/lsteamclient/cppISteamGameStats_SteamGameStats001.cpp
index d67624df..6a248f1b 100644
--- a/lsteamclient/cppISteamGameStats_SteamGameStats001.cpp
+++ b/lsteamclient/cppISteamGameStats_SteamGameStats001.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_117/steam_api.h"
 #include "steamworks_sdk_117/isteamgamestats.h"
 #include "steamclient_private.h"
-#include "cppISteamGameStats_SteamGameStats001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_117.h"
+#define SDKVER_117
+#include "struct_converters.h"
+#include "cppISteamGameStats_SteamGameStats001.h"
 SteamAPICall_t cppISteamGameStats_SteamGameStats001_GetNewSession(void *linux_side, int8 nAccountType, uint64 ulAccountID, int32 nAppID, RTime32 rtTimeStarted)
 {
     return ((ISteamGameStats*)linux_side)->GetNewSession((int8)nAccountType, (uint64)ulAccountID, (int32)nAppID, (RTime32)rtTimeStarted);
diff --git a/lsteamclient/cppISteamGameStats_SteamGameStats001.h b/lsteamclient/cppISteamGameStats_SteamGameStats001.h
index a73625de..21839be4 100644
--- a/lsteamclient/cppISteamGameStats_SteamGameStats001.h
+++ b/lsteamclient/cppISteamGameStats_SteamGameStats001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern SteamAPICall_t cppISteamGameStats_SteamGameStats001_GetNewSession(void *, int8, uint64, int32, RTime32);
 extern SteamAPICall_t cppISteamGameStats_SteamGameStats001_EndSession(void *, uint64, RTime32, int);
 extern EResult cppISteamGameStats_SteamGameStats001_AddSessionAttributeInt(void *, uint64, const char *, int32);
@@ -14,6 +11,3 @@ extern EResult cppISteamGameStats_SteamGameStats001_AddRowAtributeString(void *,
 extern EResult cppISteamGameStats_SteamGameStats001_AddRowAttributeFloat(void *, uint64, const char *, float);
 extern EResult cppISteamGameStats_SteamGameStats001_AddSessionAttributeInt64(void *, uint64, const char *, int64);
 extern EResult cppISteamGameStats_SteamGameStats001_AddRowAttributeInt64(void *, uint64, const char *, int64);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.cpp b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.cpp
index 99d53c2e..4dccdbde 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.cpp
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_130x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_130x.h"
+#define SDKVER_130x
+#include "struct_converters.h"
+#include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.h"
 bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_Init(void *linux_side)
 {
     return ((ISteamHTMLSurface*)linux_side)->Init();
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.h b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.h
index eb98cbb6..14aea708 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.h
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_Init(void *);
 extern bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_Shutdown(void *);
 extern SteamAPICall_t cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_CreateBrowser(void *, const char *, const char *);
@@ -33,6 +30,3 @@ extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_GetLinkA
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_AllowStartRequest(void *, HHTMLBrowser, bool);
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_JSDialogResponse(void *, HHTMLBrowser, bool);
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_FileLoadDialogResponse(void *, HHTMLBrowser, const char **);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.cpp b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.cpp
index e28844cc..e8de5aff 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.cpp
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_133a/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_133a.h"
+#define SDKVER_133a
+#include "struct_converters.h"
+#include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.h"
 bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_Init(void *linux_side)
 {
     return ((ISteamHTMLSurface*)linux_side)->Init();
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.h b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.h
index 5a844fc9..a47d1ef7 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.h
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_Init(void *);
 extern bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_Shutdown(void *);
 extern SteamAPICall_t cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_CreateBrowser(void *, const char *, const char *);
@@ -35,6 +32,3 @@ extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_SetPageS
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_AllowStartRequest(void *, HHTMLBrowser, bool);
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_JSDialogResponse(void *, HHTMLBrowser, bool);
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_FileLoadDialogResponse(void *, HHTMLBrowser, const char **);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.cpp b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.cpp
index 54f6e28f..e0ee0db1 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.cpp
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_140/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_140.h"
+#define SDKVER_140
+#include "struct_converters.h"
+#include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.h"
 bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_Init(void *linux_side)
 {
     return ((ISteamHTMLSurface*)linux_side)->Init();
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.h b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.h
index 2c3e4508..4913ed76 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.h
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_Init(void *);
 extern bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_Shutdown(void *);
 extern SteamAPICall_t cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_CreateBrowser(void *, const char *, const char *);
@@ -36,6 +33,3 @@ extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_SetBackg
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_AllowStartRequest(void *, HHTMLBrowser, bool);
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_JSDialogResponse(void *, HHTMLBrowser, bool);
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_FileLoadDialogResponse(void *, HHTMLBrowser, const char **);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.cpp b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.cpp
index 17a57e60..74b049af 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.cpp
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_142/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_142.h"
+#define SDKVER_142
+#include "struct_converters.h"
+#include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.h"
 bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_Init(void *linux_side)
 {
     return ((ISteamHTMLSurface*)linux_side)->Init();
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.h b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.h
index ec69f3ba..4f365964 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.h
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_Init(void *);
 extern bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_Shutdown(void *);
 extern SteamAPICall_t cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_CreateBrowser(void *, const char *, const char *);
@@ -37,6 +34,3 @@ extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_SetDPISc
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_AllowStartRequest(void *, HHTMLBrowser, bool);
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_JSDialogResponse(void *, HHTMLBrowser, bool);
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_FileLoadDialogResponse(void *, HHTMLBrowser, const char **);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.cpp b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.cpp
index 10758f20..a3b3c777 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.cpp
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.h"
 bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_Init(void *linux_side)
 {
     return ((ISteamHTMLSurface*)linux_side)->Init();
diff --git a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.h b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.h
index f59b6d0b..a1f424b4 100644
--- a/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.h
+++ b/lsteamclient/cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_Init(void *);
 extern bool cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_Shutdown(void *);
 extern SteamAPICall_t cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_CreateBrowser(void *, const char *, const char *);
@@ -38,6 +35,3 @@ extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_OpenDeve
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_AllowStartRequest(void *, HHTMLBrowser, bool);
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_JSDialogResponse(void *, HHTMLBrowser, bool);
 extern void cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_FileLoadDialogResponse(void *, HHTMLBrowser, const char **);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.cpp
index cb000823..eff25665 100644
--- a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_121/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_121.h"
+#define SDKVER_121
+#include "struct_converters.h"
+#include "cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.h"
 HTTPRequestHandle cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_CreateHTTPRequest(void *linux_side, EHTTPMethod eHTTPRequestMethod, const char * pchAbsoluteURL)
 {
     return ((ISteamHTTP*)linux_side)->CreateHTTPRequest((EHTTPMethod)eHTTPRequestMethod, (const char *)pchAbsoluteURL);
diff --git a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.h b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.h
index 46678289..1a476937 100644
--- a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HTTPRequestHandle cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_CreateHTTPRequest(void *, EHTTPMethod, const char *);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_SetHTTPRequestContextValue(void *, HTTPRequestHandle, uint64);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_SetHTTPRequestNetworkActivityTimeout(void *, HTTPRequestHandle, uint32);
@@ -16,6 +13,3 @@ extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_GetHTTPResponseBodyData
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_ReleaseHTTPRequest(void *, HTTPRequestHandle);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_GetHTTPDownloadProgressPct(void *, HTTPRequestHandle, float *);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_SetHTTPRequestRawPostBody(void *, HTTPRequestHandle, const char *, uint8 *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.cpp b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.cpp
index 63bca2b3..4a9f990b 100644
--- a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.cpp
+++ b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_142/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_142.h"
+#define SDKVER_142
+#include "struct_converters.h"
+#include "cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.h"
 HTTPRequestHandle cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_CreateHTTPRequest(void *linux_side, EHTTPMethod eHTTPRequestMethod, const char * pchAbsoluteURL)
 {
     return ((ISteamHTTP*)linux_side)->CreateHTTPRequest((EHTTPMethod)eHTTPRequestMethod, (const char *)pchAbsoluteURL);
diff --git a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.h b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.h
index 79fbf328..14b63a1e 100644
--- a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.h
+++ b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HTTPRequestHandle cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_CreateHTTPRequest(void *, EHTTPMethod, const char *);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_SetHTTPRequestContextValue(void *, HTTPRequestHandle, uint64);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_SetHTTPRequestNetworkActivityTimeout(void *, HTTPRequestHandle, uint32);
@@ -26,6 +23,3 @@ extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_SetHTTPRequestUserAgent
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_SetHTTPRequestRequiresVerifiedCertificate(void *, HTTPRequestHandle, bool);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_SetHTTPRequestAbsoluteTimeoutMS(void *, HTTPRequestHandle, uint32);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_GetHTTPRequestWasTimedOut(void *, HTTPRequestHandle, bool *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.cpp b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.cpp
index cad133ea..d4baf20e 100644
--- a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.cpp
+++ b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.h"
 HTTPRequestHandle cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_CreateHTTPRequest(void *linux_side, EHTTPMethod eHTTPRequestMethod, const char * pchAbsoluteURL)
 {
     return ((ISteamHTTP*)linux_side)->CreateHTTPRequest((EHTTPMethod)eHTTPRequestMethod, (const char *)pchAbsoluteURL);
diff --git a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.h b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.h
index acdaf22c..12978553 100644
--- a/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.h
+++ b/lsteamclient/cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HTTPRequestHandle cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_CreateHTTPRequest(void *, EHTTPMethod, const char *);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_SetHTTPRequestContextValue(void *, HTTPRequestHandle, uint64);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_SetHTTPRequestNetworkActivityTimeout(void *, HTTPRequestHandle, uint32);
@@ -26,6 +23,3 @@ extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_SetHTTPRequestUserAgent
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_SetHTTPRequestRequiresVerifiedCertificate(void *, HTTPRequestHandle, bool);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_SetHTTPRequestAbsoluteTimeoutMS(void *, HTTPRequestHandle, uint32);
 extern bool cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_GetHTTPRequestWasTimedOut(void *, HTTPRequestHandle, bool *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.cpp b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.cpp
index e65af107..025218f2 100644
--- a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.cpp
+++ b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_139/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_139.h"
+#define SDKVER_139
+#include "struct_converters.h"
+#include "cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.h"
 EResult cppISteamInventory_STEAMINVENTORY_INTERFACE_V001_GetResultStatus(void *linux_side, SteamInventoryResult_t resultHandle)
 {
     return ((ISteamInventory*)linux_side)->GetResultStatus((SteamInventoryResult_t)resultHandle);
diff --git a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.h b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.h
index e8251cb7..ed189fd2 100644
--- a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.h
+++ b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern EResult cppISteamInventory_STEAMINVENTORY_INTERFACE_V001_GetResultStatus(void *, SteamInventoryResult_t);
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V001_GetResultItems(void *, SteamInventoryResult_t, SteamItemDetails_t *, uint32 *);
 extern uint32 cppISteamInventory_STEAMINVENTORY_INTERFACE_V001_GetResultTimestamp(void *, SteamInventoryResult_t);
@@ -25,6 +22,3 @@ extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V001_GetItemDefinitionID
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V001_GetItemDefinitionProperty(void *, SteamItemDef_t, const char *, char *, uint32 *);
 extern SteamAPICall_t cppISteamInventory_STEAMINVENTORY_INTERFACE_V001_RequestEligiblePromoItemDefinitionsIDs(void *, CSteamID);
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V001_GetEligiblePromoItemDefinitionIDs(void *, CSteamID, SteamItemDef_t *, uint32 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.cpp b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.cpp
index 9b3a888e..5e18b996 100644
--- a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.cpp
+++ b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_142/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_142.h"
+#define SDKVER_142
+#include "struct_converters.h"
+#include "cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.h"
 EResult cppISteamInventory_STEAMINVENTORY_INTERFACE_V002_GetResultStatus(void *linux_side, SteamInventoryResult_t resultHandle)
 {
     return ((ISteamInventory*)linux_side)->GetResultStatus((SteamInventoryResult_t)resultHandle);
diff --git a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.h b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.h
index dfaa68a3..a5e05eec 100644
--- a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.h
+++ b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern EResult cppISteamInventory_STEAMINVENTORY_INTERFACE_V002_GetResultStatus(void *, SteamInventoryResult_t);
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V002_GetResultItems(void *, SteamInventoryResult_t, SteamItemDetails_t *, uint32 *);
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V002_GetResultItemProperty(void *, SteamInventoryResult_t, uint32, const char *, char *, uint32 *);
@@ -38,6 +35,3 @@ extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V002_SetProperty_2(void
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V002_SetProperty_3(void *, SteamInventoryUpdateHandle_t, SteamItemInstanceID_t, const char *, int64);
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V002_SetProperty_4(void *, SteamInventoryUpdateHandle_t, SteamItemInstanceID_t, const char *, float);
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V002_SubmitUpdateProperties(void *, SteamInventoryUpdateHandle_t, SteamInventoryResult_t *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.cpp b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.cpp
index 72e97b96..b5608c02 100644
--- a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.cpp
+++ b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.h"
 EResult cppISteamInventory_STEAMINVENTORY_INTERFACE_V003_GetResultStatus(void *linux_side, SteamInventoryResult_t resultHandle)
 {
     return ((ISteamInventory*)linux_side)->GetResultStatus((SteamInventoryResult_t)resultHandle);
diff --git a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.h b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.h
index b2390eeb..078ad757 100644
--- a/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.h
+++ b/lsteamclient/cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern EResult cppISteamInventory_STEAMINVENTORY_INTERFACE_V003_GetResultStatus(void *, SteamInventoryResult_t);
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V003_GetResultItems(void *, SteamInventoryResult_t, SteamItemDetails_t *, uint32 *);
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V003_GetResultItemProperty(void *, SteamInventoryResult_t, uint32, const char *, char *, uint32 *);
@@ -38,6 +35,3 @@ extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V003_SetProperty_2(void
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V003_SetProperty_3(void *, SteamInventoryUpdateHandle_t, SteamItemInstanceID_t, const char *, int64);
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V003_SetProperty_4(void *, SteamInventoryUpdateHandle_t, SteamItemInstanceID_t, const char *, float);
 extern bool cppISteamInventory_STEAMINVENTORY_INTERFACE_V003_SubmitUpdateProperties(void *, SteamInventoryUpdateHandle_t, SteamInventoryResult_t *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMasterServerUpdater_SteamMasterServerUpdater001.cpp b/lsteamclient/cppISteamMasterServerUpdater_SteamMasterServerUpdater001.cpp
index 19ae427b..302f3af3 100644
--- a/lsteamclient/cppISteamMasterServerUpdater_SteamMasterServerUpdater001.cpp
+++ b/lsteamclient/cppISteamMasterServerUpdater_SteamMasterServerUpdater001.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_116/steam_api.h"
 #include "steamworks_sdk_116/isteammasterserverupdater.h"
 #include "steamclient_private.h"
-#include "cppISteamMasterServerUpdater_SteamMasterServerUpdater001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_116.h"
+#define SDKVER_116
+#include "struct_converters.h"
+#include "cppISteamMasterServerUpdater_SteamMasterServerUpdater001.h"
 void cppISteamMasterServerUpdater_SteamMasterServerUpdater001_SetActive(void *linux_side, bool bActive)
 {
     ((ISteamMasterServerUpdater*)linux_side)->SetActive((bool)bActive);
diff --git a/lsteamclient/cppISteamMasterServerUpdater_SteamMasterServerUpdater001.h b/lsteamclient/cppISteamMasterServerUpdater_SteamMasterServerUpdater001.h
index 58e60b1a..bdfd759b 100644
--- a/lsteamclient/cppISteamMasterServerUpdater_SteamMasterServerUpdater001.h
+++ b/lsteamclient/cppISteamMasterServerUpdater_SteamMasterServerUpdater001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamMasterServerUpdater_SteamMasterServerUpdater001_SetActive(void *, bool);
 extern void cppISteamMasterServerUpdater_SteamMasterServerUpdater001_SetHeartbeatInterval(void *, int);
 extern bool cppISteamMasterServerUpdater_SteamMasterServerUpdater001_HandleIncomingPacket(void *, const void *, int, uint32, uint16);
@@ -15,6 +12,3 @@ extern bool cppISteamMasterServerUpdater_SteamMasterServerUpdater001_AddMasterSe
 extern bool cppISteamMasterServerUpdater_SteamMasterServerUpdater001_RemoveMasterServer(void *, const char *);
 extern int cppISteamMasterServerUpdater_SteamMasterServerUpdater001_GetNumMasterServers(void *);
 extern int cppISteamMasterServerUpdater_SteamMasterServerUpdater001_GetMasterServerAddress(void *, int, char *, int);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers001.cpp b/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers001.cpp
index aa77944f..a5819240 100644
--- a/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers001.cpp
+++ b/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_105/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmakingServers_SteamMatchMakingServers001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_105.h"
+#define SDKVER_105
+#include "struct_converters.h"
+#include "cppISteamMatchmakingServers_SteamMatchMakingServers001.h"
 void cppISteamMatchmakingServers_SteamMatchMakingServers001_RequestInternetServerList(void *linux_side, AppId_t iApp, MatchMakingKeyValuePair_t ** ppchFilters, uint32 nFilters, ISteamMatchmakingServerListResponse * pRequestServersResponse)
 {
     ((ISteamMatchmakingServers*)linux_side)->RequestInternetServerList((AppId_t)iApp, (MatchMakingKeyValuePair_t **)ppchFilters, (uint32)nFilters, (ISteamMatchmakingServerListResponse *)pRequestServersResponse);
diff --git a/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers001.h b/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers001.h
index 4010ba30..c2736c77 100644
--- a/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers001.h
+++ b/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamMatchmakingServers_SteamMatchMakingServers001_RequestInternetServerList(void *, AppId_t, MatchMakingKeyValuePair_t **, uint32, ISteamMatchmakingServerListResponse *);
 extern void cppISteamMatchmakingServers_SteamMatchMakingServers001_RequestLANServerList(void *, AppId_t, ISteamMatchmakingServerListResponse *);
 extern void cppISteamMatchmakingServers_SteamMatchMakingServers001_RequestFriendsServerList(void *, AppId_t, MatchMakingKeyValuePair_t **, uint32, ISteamMatchmakingServerListResponse *);
@@ -17,6 +14,3 @@ extern HServerQuery cppISteamMatchmakingServers_SteamMatchMakingServers001_PingS
 extern HServerQuery cppISteamMatchmakingServers_SteamMatchMakingServers001_PlayerDetails(void *, uint32, uint16, ISteamMatchmakingPlayersResponse *);
 extern HServerQuery cppISteamMatchmakingServers_SteamMatchMakingServers001_ServerRules(void *, uint32, uint16, ISteamMatchmakingRulesResponse *);
 extern void cppISteamMatchmakingServers_SteamMatchMakingServers001_CancelServerQuery(void *, HServerQuery);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers002.cpp b/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers002.cpp
index b051f7bf..74370926 100644
--- a/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers002.cpp
+++ b/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmakingServers_SteamMatchMakingServers002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamMatchmakingServers_SteamMatchMakingServers002.h"
 HServerListRequest cppISteamMatchmakingServers_SteamMatchMakingServers002_RequestInternetServerList(void *linux_side, AppId_t iApp, MatchMakingKeyValuePair_t ** ppchFilters, uint32 nFilters, ISteamMatchmakingServerListResponse * pRequestServersResponse)
 {
     return ((ISteamMatchmakingServers*)linux_side)->RequestInternetServerList((AppId_t)iApp, (MatchMakingKeyValuePair_t **)ppchFilters, (uint32)nFilters, (ISteamMatchmakingServerListResponse *)pRequestServersResponse);
diff --git a/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers002.h b/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers002.h
index b32cc46a..8ae88599 100644
--- a/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers002.h
+++ b/lsteamclient/cppISteamMatchmakingServers_SteamMatchMakingServers002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HServerListRequest cppISteamMatchmakingServers_SteamMatchMakingServers002_RequestInternetServerList(void *, AppId_t, MatchMakingKeyValuePair_t **, uint32, ISteamMatchmakingServerListResponse *);
 extern HServerListRequest cppISteamMatchmakingServers_SteamMatchMakingServers002_RequestLANServerList(void *, AppId_t, ISteamMatchmakingServerListResponse *);
 extern HServerListRequest cppISteamMatchmakingServers_SteamMatchMakingServers002_RequestFriendsServerList(void *, AppId_t, MatchMakingKeyValuePair_t **, uint32, ISteamMatchmakingServerListResponse *);
@@ -18,6 +15,3 @@ extern HServerQuery cppISteamMatchmakingServers_SteamMatchMakingServers002_PingS
 extern HServerQuery cppISteamMatchmakingServers_SteamMatchMakingServers002_PlayerDetails(void *, uint32, uint16, ISteamMatchmakingPlayersResponse *);
 extern HServerQuery cppISteamMatchmakingServers_SteamMatchMakingServers002_ServerRules(void *, uint32, uint16, ISteamMatchmakingRulesResponse *);
 extern void cppISteamMatchmakingServers_SteamMatchMakingServers002_CancelServerQuery(void *, HServerQuery);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking001.cpp b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking001.cpp
index ea5b2946..765c8850 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking001.cpp
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099y/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmaking_SteamMatchMaking001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099y.h"
+#define SDKVER_099y
+#include "struct_converters.h"
+#include "cppISteamMatchmaking_SteamMatchMaking001.h"
 int cppISteamMatchmaking_SteamMatchMaking001_GetFavoriteGameCount(void *linux_side)
 {
     return ((ISteamMatchmaking*)linux_side)->GetFavoriteGameCount();
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking001.h b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking001.h
index 264dc5a5..77e3b369 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking001.h
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern int cppISteamMatchmaking_SteamMatchMaking001_GetFavoriteGameCount(void *);
 extern bool cppISteamMatchmaking_SteamMatchMaking001_GetFavoriteGame(void *, int, uint32 *, uint32 *, uint16 *, uint32 *, uint32 *);
 extern int cppISteamMatchmaking_SteamMatchMaking001_AddFavoriteGame(void *, uint32, uint32, uint16, uint32, uint32);
@@ -23,6 +20,3 @@ extern bool cppISteamMatchmaking_SteamMatchMaking001_SetLobbyMemberData(void *,
 extern bool cppISteamMatchmaking_SteamMatchMaking001_SendLobbyChatMsg(void *, CSteamID, const void *, int);
 extern int cppISteamMatchmaking_SteamMatchMaking001_GetLobbyChatEntry(void *, CSteamID, int, CSteamID *, void *, int, EChatEntryType *);
 extern bool cppISteamMatchmaking_SteamMatchMaking001_RequestLobbyData(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking002.cpp b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking002.cpp
index 657ca7d3..4f487fcc 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking002.cpp
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_101/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmaking_SteamMatchMaking002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_101.h"
+#define SDKVER_101
+#include "struct_converters.h"
+#include "cppISteamMatchmaking_SteamMatchMaking002.h"
 int cppISteamMatchmaking_SteamMatchMaking002_GetFavoriteGameCount(void *linux_side)
 {
     return ((ISteamMatchmaking*)linux_side)->GetFavoriteGameCount();
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking002.h b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking002.h
index a4219b66..e9279a2d 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking002.h
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern int cppISteamMatchmaking_SteamMatchMaking002_GetFavoriteGameCount(void *);
 extern bool cppISteamMatchmaking_SteamMatchMaking002_GetFavoriteGame(void *, int, AppId_t *, uint32 *, uint16 *, uint16 *, uint32 *, uint32 *);
 extern int cppISteamMatchmaking_SteamMatchMaking002_AddFavoriteGame(void *, AppId_t, uint32, uint16, uint16, uint32, uint32);
@@ -21,6 +18,3 @@ extern bool cppISteamMatchmaking_SteamMatchMaking002_SendLobbyChatMsg(void *, CS
 extern int cppISteamMatchmaking_SteamMatchMaking002_GetLobbyChatEntry(void *, CSteamID, int, CSteamID *, void *, int, EChatEntryType *);
 extern bool cppISteamMatchmaking_SteamMatchMaking002_RequestLobbyData(void *, CSteamID);
 extern void cppISteamMatchmaking_SteamMatchMaking002_SetLobbyGameServer(void *, CSteamID, uint32, uint16, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking003.cpp b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking003.cpp
index cef7a2b1..4cb4b6c5 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking003.cpp
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_101x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmaking_SteamMatchMaking003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_101x.h"
+#define SDKVER_101x
+#include "struct_converters.h"
+#include "cppISteamMatchmaking_SteamMatchMaking003.h"
 int cppISteamMatchmaking_SteamMatchMaking003_GetFavoriteGameCount(void *linux_side)
 {
     return ((ISteamMatchmaking*)linux_side)->GetFavoriteGameCount();
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking003.h b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking003.h
index 8e4ff14a..132f5e01 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking003.h
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern int cppISteamMatchmaking_SteamMatchMaking003_GetFavoriteGameCount(void *);
 extern bool cppISteamMatchmaking_SteamMatchMaking003_GetFavoriteGame(void *, int, AppId_t *, uint32 *, uint16 *, uint16 *, uint32 *, uint32 *);
 extern int cppISteamMatchmaking_SteamMatchMaking003_AddFavoriteGame(void *, AppId_t, uint32, uint16, uint16, uint32, uint32);
@@ -29,6 +26,3 @@ extern bool cppISteamMatchmaking_SteamMatchMaking003_SetLobbyMemberLimit(void *,
 extern int cppISteamMatchmaking_SteamMatchMaking003_GetLobbyMemberLimit(void *, CSteamID);
 extern void cppISteamMatchmaking_SteamMatchMaking003_SetLobbyVoiceEnabled(void *, CSteamID, bool);
 extern bool cppISteamMatchmaking_SteamMatchMaking003_RequestFriendsLobbies(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking004.cpp b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking004.cpp
index ac35a74b..5d45bffc 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking004.cpp
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_102/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmaking_SteamMatchMaking004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_102.h"
+#define SDKVER_102
+#include "struct_converters.h"
+#include "cppISteamMatchmaking_SteamMatchMaking004.h"
 int cppISteamMatchmaking_SteamMatchMaking004_GetFavoriteGameCount(void *linux_side)
 {
     return ((ISteamMatchmaking*)linux_side)->GetFavoriteGameCount();
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking004.h b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking004.h
index 5d1bb35e..fe02d629 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking004.h
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern int cppISteamMatchmaking_SteamMatchMaking004_GetFavoriteGameCount(void *);
 extern bool cppISteamMatchmaking_SteamMatchMaking004_GetFavoriteGame(void *, int, AppId_t *, uint32 *, uint16 *, uint16 *, uint32 *, uint32 *);
 extern int cppISteamMatchmaking_SteamMatchMaking004_AddFavoriteGame(void *, AppId_t, uint32, uint16, uint16, uint32, uint32);
@@ -28,6 +25,3 @@ extern bool cppISteamMatchmaking_SteamMatchMaking004_GetLobbyGameServer(void *,
 extern bool cppISteamMatchmaking_SteamMatchMaking004_SetLobbyMemberLimit(void *, CSteamID, int);
 extern int cppISteamMatchmaking_SteamMatchMaking004_GetLobbyMemberLimit(void *, CSteamID);
 extern bool cppISteamMatchmaking_SteamMatchMaking004_RequestFriendsLobbies(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking005.cpp b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking005.cpp
index 92283569..6b371dc5 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking005.cpp
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_102x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmaking_SteamMatchMaking005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_102x.h"
+#define SDKVER_102x
+#include "struct_converters.h"
+#include "cppISteamMatchmaking_SteamMatchMaking005.h"
 int cppISteamMatchmaking_SteamMatchMaking005_GetFavoriteGameCount(void *linux_side)
 {
     return ((ISteamMatchmaking*)linux_side)->GetFavoriteGameCount();
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking005.h b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking005.h
index 712639a3..897f68f2 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking005.h
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern int cppISteamMatchmaking_SteamMatchMaking005_GetFavoriteGameCount(void *);
 extern bool cppISteamMatchmaking_SteamMatchMaking005_GetFavoriteGame(void *, int, AppId_t *, uint32 *, uint16 *, uint16 *, uint32 *, uint32 *);
 extern int cppISteamMatchmaking_SteamMatchMaking005_AddFavoriteGame(void *, AppId_t, uint32, uint16, uint16, uint32, uint32);
@@ -32,6 +29,3 @@ extern bool cppISteamMatchmaking_SteamMatchMaking005_RequestFriendsLobbies(void
 extern bool cppISteamMatchmaking_SteamMatchMaking005_SetLobbyType(void *, CSteamID, ELobbyType);
 extern CSteamID cppISteamMatchmaking_SteamMatchMaking005_GetLobbyOwner(void *, CSteamID);
 extern float cppISteamMatchmaking_SteamMatchMaking005_GetLobbyDistance(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking006.cpp b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking006.cpp
index 6ee2a618..f868ad98 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking006.cpp
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking006.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_104/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmaking_SteamMatchMaking006.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_104.h"
+#define SDKVER_104
+#include "struct_converters.h"
+#include "cppISteamMatchmaking_SteamMatchMaking006.h"
 int cppISteamMatchmaking_SteamMatchMaking006_GetFavoriteGameCount(void *linux_side)
 {
     return ((ISteamMatchmaking*)linux_side)->GetFavoriteGameCount();
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking006.h b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking006.h
index 74766006..a2535e60 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking006.h
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking006.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern int cppISteamMatchmaking_SteamMatchMaking006_GetFavoriteGameCount(void *);
 extern bool cppISteamMatchmaking_SteamMatchMaking006_GetFavoriteGame(void *, int, AppId_t *, uint32 *, uint16 *, uint16 *, uint32 *, uint32 *);
 extern int cppISteamMatchmaking_SteamMatchMaking006_AddFavoriteGame(void *, AppId_t, uint32, uint16, uint16, uint32, uint32);
@@ -29,6 +26,3 @@ extern bool cppISteamMatchmaking_SteamMatchMaking006_SetLobbyMemberLimit(void *,
 extern int cppISteamMatchmaking_SteamMatchMaking006_GetLobbyMemberLimit(void *, CSteamID);
 extern bool cppISteamMatchmaking_SteamMatchMaking006_SetLobbyType(void *, CSteamID, ELobbyType);
 extern CSteamID cppISteamMatchmaking_SteamMatchMaking006_GetLobbyOwner(void *, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking007.cpp b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking007.cpp
index fde9caa4..323b4788 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking007.cpp
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking007.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_107/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmaking_SteamMatchMaking007.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_107.h"
+#define SDKVER_107
+#include "struct_converters.h"
+#include "cppISteamMatchmaking_SteamMatchMaking007.h"
 int cppISteamMatchmaking_SteamMatchMaking007_GetFavoriteGameCount(void *linux_side)
 {
     return ((ISteamMatchmaking*)linux_side)->GetFavoriteGameCount();
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking007.h b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking007.h
index dc2429dc..112ef5a7 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking007.h
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking007.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern int cppISteamMatchmaking_SteamMatchMaking007_GetFavoriteGameCount(void *);
 extern bool cppISteamMatchmaking_SteamMatchMaking007_GetFavoriteGame(void *, int, AppId_t *, uint32 *, uint16 *, uint16 *, uint32 *, uint32 *);
 extern int cppISteamMatchmaking_SteamMatchMaking007_AddFavoriteGame(void *, AppId_t, uint32, uint16, uint16, uint32, uint32);
@@ -35,6 +32,3 @@ extern bool cppISteamMatchmaking_SteamMatchMaking007_SetLobbyType(void *, CSteam
 extern bool cppISteamMatchmaking_SteamMatchMaking007_SetLobbyJoinable(void *, CSteamID, bool);
 extern CSteamID cppISteamMatchmaking_SteamMatchMaking007_GetLobbyOwner(void *, CSteamID);
 extern bool cppISteamMatchmaking_SteamMatchMaking007_SetLobbyOwner(void *, CSteamID, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking008.cpp b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking008.cpp
index 6bc7c005..05aba331 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking008.cpp
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking008.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_116/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmaking_SteamMatchMaking008.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_116.h"
+#define SDKVER_116
+#include "struct_converters.h"
+#include "cppISteamMatchmaking_SteamMatchMaking008.h"
 int cppISteamMatchmaking_SteamMatchMaking008_GetFavoriteGameCount(void *linux_side)
 {
     return ((ISteamMatchmaking*)linux_side)->GetFavoriteGameCount();
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking008.h b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking008.h
index 8c449c3b..d437f71b 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking008.h
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking008.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern int cppISteamMatchmaking_SteamMatchMaking008_GetFavoriteGameCount(void *);
 extern bool cppISteamMatchmaking_SteamMatchMaking008_GetFavoriteGame(void *, int, AppId_t *, uint32 *, uint16 *, uint16 *, uint32 *, uint32 *);
 extern int cppISteamMatchmaking_SteamMatchMaking008_AddFavoriteGame(void *, AppId_t, uint32, uint16, uint16, uint32, uint32);
@@ -37,6 +34,3 @@ extern bool cppISteamMatchmaking_SteamMatchMaking008_SetLobbyType(void *, CSteam
 extern bool cppISteamMatchmaking_SteamMatchMaking008_SetLobbyJoinable(void *, CSteamID, bool);
 extern CSteamID cppISteamMatchmaking_SteamMatchMaking008_GetLobbyOwner(void *, CSteamID);
 extern bool cppISteamMatchmaking_SteamMatchMaking008_SetLobbyOwner(void *, CSteamID, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking009.cpp b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking009.cpp
index 2f6a9ece..bf3daeac 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking009.cpp
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking009.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMatchmaking_SteamMatchMaking009.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamMatchmaking_SteamMatchMaking009.h"
 int cppISteamMatchmaking_SteamMatchMaking009_GetFavoriteGameCount(void *linux_side)
 {
     return ((ISteamMatchmaking*)linux_side)->GetFavoriteGameCount();
diff --git a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking009.h b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking009.h
index 415f28dc..eda029aa 100644
--- a/lsteamclient/cppISteamMatchmaking_SteamMatchMaking009.h
+++ b/lsteamclient/cppISteamMatchmaking_SteamMatchMaking009.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern int cppISteamMatchmaking_SteamMatchMaking009_GetFavoriteGameCount(void *);
 extern bool cppISteamMatchmaking_SteamMatchMaking009_GetFavoriteGame(void *, int, AppId_t *, uint32 *, uint16 *, uint16 *, uint32 *, uint32 *);
 extern int cppISteamMatchmaking_SteamMatchMaking009_AddFavoriteGame(void *, AppId_t, uint32, uint16, uint16, uint32, uint32);
@@ -39,6 +36,3 @@ extern bool cppISteamMatchmaking_SteamMatchMaking009_SetLobbyJoinable(void *, CS
 extern CSteamID cppISteamMatchmaking_SteamMatchMaking009_GetLobbyOwner(void *, CSteamID);
 extern bool cppISteamMatchmaking_SteamMatchMaking009_SetLobbyOwner(void *, CSteamID, CSteamID);
 extern bool cppISteamMatchmaking_SteamMatchMaking009_SetLinkedLobby(void *, CSteamID, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.cpp
index e8f718c6..65b99b17 100644
--- a/lsteamclient/cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.h"
 bool cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_RegisterSteamMusicRemote(void *linux_side, const char * pchName)
 {
     return ((ISteamMusicRemote*)linux_side)->RegisterSteamMusicRemote((const char *)pchName);
diff --git a/lsteamclient/cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.h b/lsteamclient/cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.h
index 47cfb5de..e4c7dd48 100644
--- a/lsteamclient/cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_RegisterSteamMusicRemote(void *, const char *);
 extern bool cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_DeregisterSteamMusicRemote(void *);
 extern bool cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_BIsCurrentMusicRemote(void *);
@@ -33,6 +30,3 @@ extern bool cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_ResetPlay
 extern bool cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_SetPlaylistEntry(void *, int, int, const char *);
 extern bool cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_SetCurrentPlaylistEntry(void *, int);
 extern bool cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_PlaylistDidChange(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.cpp
index ef7eb0ad..27567723 100644
--- a/lsteamclient/cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.h"
 bool cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_BIsEnabled(void *linux_side)
 {
     return ((ISteamMusic*)linux_side)->BIsEnabled();
diff --git a/lsteamclient/cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.h b/lsteamclient/cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.h
index e6bfdfce..4b6f82f3 100644
--- a/lsteamclient/cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_BIsEnabled(void *);
 extern bool cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_BIsPlaying(void *);
 extern AudioPlayback_Status cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_GetPlaybackStatus(void *);
@@ -10,6 +7,3 @@ extern void cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_PlayPrevious(void *);
 extern void cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_PlayNext(void *);
 extern void cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_SetVolume(void *, float);
 extern float cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_GetVolume(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.cpp b/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.cpp
index 46e63dc6..2244b6ad 100644
--- a/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.cpp
+++ b/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_next/steam_api.h"
 #include "steamworks_sdk_next/isteamnetworkingsocketsserialized.h"
 #include "steamclient_private.h"
-#include "cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_next.h"
+#define SDKVER_next
+#include "struct_converters.h"
+#include "cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.h"
 void cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002_SendP2PRendezvous(void *linux_side, CSteamID steamIDRemote, uint32 unConnectionIDSrc, const void * pMsgRendezvous, uint32 cbRendezvous)
 {
     ((ISteamNetworkingSocketsSerialized*)linux_side)->SendP2PRendezvous((CSteamID)steamIDRemote, (uint32)unConnectionIDSrc, (const void *)pMsgRendezvous, (uint32)cbRendezvous);
diff --git a/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.h b/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.h
index 758f2b6f..9c6d9ce1 100644
--- a/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.h
+++ b/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002_SendP2PRendezvous(void *, CSteamID, uint32, const void *, uint32);
 extern void cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002_SendP2PConnectionFailure(void *, CSteamID, uint32, uint32, const char *);
 extern SteamAPICall_t cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002_GetCertAsync(void *);
@@ -9,6 +6,3 @@ extern void cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialize
 extern uint32 cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002_GetCachedRelayTicketCount(void *);
 extern int cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002_GetCachedRelayTicket(void *, uint32, void *, uint32);
 extern void cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002_PostConnectionStateMsg(void *, const void *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.cpp b/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.cpp
index 5c4e313b..5f9770c5 100644
--- a/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.cpp
+++ b/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_next2/steam_api.h"
 #include "steamworks_sdk_next2/isteamnetworkingsocketsserialized.h"
 #include "steamclient_private.h"
-#include "cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_next2.h"
+#define SDKVER_next2
+#include "struct_converters.h"
+#include "cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.h"
 void cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003_SendP2PRendezvous(void *linux_side, CSteamID steamIDRemote, uint32 unConnectionIDSrc, const void * pMsgRendezvous, uint32 cbRendezvous)
 {
     ((ISteamNetworkingSocketsSerialized*)linux_side)->SendP2PRendezvous((CSteamID)steamIDRemote, (uint32)unConnectionIDSrc, (const void *)pMsgRendezvous, (uint32)cbRendezvous);
diff --git a/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.h b/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.h
index 23334d36..2dd5aae9 100644
--- a/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.h
+++ b/lsteamclient/cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003_SendP2PRendezvous(void *, CSteamID, uint32, const void *, uint32);
 extern void cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003_SendP2PConnectionFailure(void *, CSteamID, uint32, uint32, const char *);
 extern SteamAPICall_t cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003_GetCertAsync(void *);
@@ -9,6 +6,3 @@ extern void cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialize
 extern uint32 cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003_GetCachedRelayTicketCount(void *);
 extern int cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003_GetCachedRelayTicket(void *, uint32, void *, uint32);
 extern void cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003_PostConnectionStateMsg(void *, const void *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamNetworking_SteamNetworking001.cpp b/lsteamclient/cppISteamNetworking_SteamNetworking001.cpp
index 6540f0e9..06a94caf 100644
--- a/lsteamclient/cppISteamNetworking_SteamNetworking001.cpp
+++ b/lsteamclient/cppISteamNetworking_SteamNetworking001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_102/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamNetworking_SteamNetworking001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_102.h"
+#define SDKVER_102
+#include "struct_converters.h"
+#include "cppISteamNetworking_SteamNetworking001.h"
 SNetListenSocket_t cppISteamNetworking_SteamNetworking001_CreateListenSocket(void *linux_side, int nVirtualP2PPort, uint32 nIP, uint16 nPort)
 {
     return ((ISteamNetworking*)linux_side)->CreateListenSocket((int)nVirtualP2PPort, (uint32)nIP, (uint16)nPort);
diff --git a/lsteamclient/cppISteamNetworking_SteamNetworking001.h b/lsteamclient/cppISteamNetworking_SteamNetworking001.h
index abb5e7a7..007567e4 100644
--- a/lsteamclient/cppISteamNetworking_SteamNetworking001.h
+++ b/lsteamclient/cppISteamNetworking_SteamNetworking001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern SNetListenSocket_t cppISteamNetworking_SteamNetworking001_CreateListenSocket(void *, int, uint32, uint16);
 extern SNetSocket_t cppISteamNetworking_SteamNetworking001_CreateP2PConnectionSocket(void *, CSteamID, int, int);
 extern SNetSocket_t cppISteamNetworking_SteamNetworking001_CreateConnectionSocket(void *, uint32, uint16, int);
@@ -13,6 +10,3 @@ extern bool cppISteamNetworking_SteamNetworking001_IsDataAvailable(void *, SNetL
 extern bool cppISteamNetworking_SteamNetworking001_RetrieveData(void *, SNetListenSocket_t, void *, uint32, uint32 *, SNetSocket_t *);
 extern bool cppISteamNetworking_SteamNetworking001_GetSocketInfo(void *, SNetSocket_t, CSteamID *, int *, uint32 *, uint16 *);
 extern bool cppISteamNetworking_SteamNetworking001_GetListenSocketInfo(void *, SNetListenSocket_t, uint32 *, uint16 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamNetworking_SteamNetworking002.cpp b/lsteamclient/cppISteamNetworking_SteamNetworking002.cpp
index 81f4f7e2..b44348ba 100644
--- a/lsteamclient/cppISteamNetworking_SteamNetworking002.cpp
+++ b/lsteamclient/cppISteamNetworking_SteamNetworking002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_104/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamNetworking_SteamNetworking002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_104.h"
+#define SDKVER_104
+#include "struct_converters.h"
+#include "cppISteamNetworking_SteamNetworking002.h"
 SNetListenSocket_t cppISteamNetworking_SteamNetworking002_CreateListenSocket(void *linux_side, int nVirtualP2PPort, uint32 nIP, uint16 nPort, bool bAllowUseOfPacketRelay)
 {
     return ((ISteamNetworking*)linux_side)->CreateListenSocket((int)nVirtualP2PPort, (uint32)nIP, (uint16)nPort, (bool)bAllowUseOfPacketRelay);
diff --git a/lsteamclient/cppISteamNetworking_SteamNetworking002.h b/lsteamclient/cppISteamNetworking_SteamNetworking002.h
index 421a45d7..e040ee54 100644
--- a/lsteamclient/cppISteamNetworking_SteamNetworking002.h
+++ b/lsteamclient/cppISteamNetworking_SteamNetworking002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern SNetListenSocket_t cppISteamNetworking_SteamNetworking002_CreateListenSocket(void *, int, uint32, uint16, bool);
 extern SNetSocket_t cppISteamNetworking_SteamNetworking002_CreateP2PConnectionSocket(void *, CSteamID, int, int, bool);
 extern SNetSocket_t cppISteamNetworking_SteamNetworking002_CreateConnectionSocket(void *, uint32, uint16, int);
@@ -15,6 +12,3 @@ extern bool cppISteamNetworking_SteamNetworking002_GetSocketInfo(void *, SNetSoc
 extern bool cppISteamNetworking_SteamNetworking002_GetListenSocketInfo(void *, SNetListenSocket_t, uint32 *, uint16 *);
 extern ESNetSocketConnectionType cppISteamNetworking_SteamNetworking002_GetSocketConnectionType(void *, SNetSocket_t);
 extern int cppISteamNetworking_SteamNetworking002_GetMaxPacketSize(void *, SNetSocket_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamNetworking_SteamNetworking003.cpp b/lsteamclient/cppISteamNetworking_SteamNetworking003.cpp
index 2ae113a2..183c17b4 100644
--- a/lsteamclient/cppISteamNetworking_SteamNetworking003.cpp
+++ b/lsteamclient/cppISteamNetworking_SteamNetworking003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_110/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamNetworking_SteamNetworking003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_110.h"
+#define SDKVER_110
+#include "struct_converters.h"
+#include "cppISteamNetworking_SteamNetworking003.h"
 bool cppISteamNetworking_SteamNetworking003_SendP2PPacket(void *linux_side, CSteamID steamIDRemote, const void * pubData, uint32 cubData, EP2PSend eP2PSendType)
 {
     return ((ISteamNetworking*)linux_side)->SendP2PPacket((CSteamID)steamIDRemote, (const void *)pubData, (uint32)cubData, (EP2PSend)eP2PSendType);
diff --git a/lsteamclient/cppISteamNetworking_SteamNetworking003.h b/lsteamclient/cppISteamNetworking_SteamNetworking003.h
index 098a58dd..4938e32c 100644
--- a/lsteamclient/cppISteamNetworking_SteamNetworking003.h
+++ b/lsteamclient/cppISteamNetworking_SteamNetworking003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamNetworking_SteamNetworking003_SendP2PPacket(void *, CSteamID, const void *, uint32, EP2PSend);
 extern bool cppISteamNetworking_SteamNetworking003_IsP2PPacketAvailable(void *, uint32 *);
 extern bool cppISteamNetworking_SteamNetworking003_ReadP2PPacket(void *, void *, uint32, uint32 *, CSteamID *);
@@ -21,6 +18,3 @@ extern bool cppISteamNetworking_SteamNetworking003_GetSocketInfo(void *, SNetSoc
 extern bool cppISteamNetworking_SteamNetworking003_GetListenSocketInfo(void *, SNetListenSocket_t, uint32 *, uint16 *);
 extern ESNetSocketConnectionType cppISteamNetworking_SteamNetworking003_GetSocketConnectionType(void *, SNetSocket_t);
 extern int cppISteamNetworking_SteamNetworking003_GetMaxPacketSize(void *, SNetSocket_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamNetworking_SteamNetworking004.cpp b/lsteamclient/cppISteamNetworking_SteamNetworking004.cpp
index e02ddcdd..8d9bdff3 100644
--- a/lsteamclient/cppISteamNetworking_SteamNetworking004.cpp
+++ b/lsteamclient/cppISteamNetworking_SteamNetworking004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_112/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamNetworking_SteamNetworking004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_112.h"
+#define SDKVER_112
+#include "struct_converters.h"
+#include "cppISteamNetworking_SteamNetworking004.h"
 bool cppISteamNetworking_SteamNetworking004_SendP2PPacket(void *linux_side, CSteamID steamIDRemote, const void * pubData, uint32 cubData, EP2PSend eP2PSendType, int nVirtualPort)
 {
     return ((ISteamNetworking*)linux_side)->SendP2PPacket((CSteamID)steamIDRemote, (const void *)pubData, (uint32)cubData, (EP2PSend)eP2PSendType, (int)nVirtualPort);
diff --git a/lsteamclient/cppISteamNetworking_SteamNetworking004.h b/lsteamclient/cppISteamNetworking_SteamNetworking004.h
index 521bddfa..faeaf2c0 100644
--- a/lsteamclient/cppISteamNetworking_SteamNetworking004.h
+++ b/lsteamclient/cppISteamNetworking_SteamNetworking004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamNetworking_SteamNetworking004_SendP2PPacket(void *, CSteamID, const void *, uint32, EP2PSend, int);
 extern bool cppISteamNetworking_SteamNetworking004_IsP2PPacketAvailable(void *, uint32 *, int);
 extern bool cppISteamNetworking_SteamNetworking004_ReadP2PPacket(void *, void *, uint32, uint32 *, CSteamID *, int);
@@ -21,6 +18,3 @@ extern bool cppISteamNetworking_SteamNetworking004_GetSocketInfo(void *, SNetSoc
 extern bool cppISteamNetworking_SteamNetworking004_GetListenSocketInfo(void *, SNetListenSocket_t, uint32 *, uint16 *);
 extern ESNetSocketConnectionType cppISteamNetworking_SteamNetworking004_GetSocketConnectionType(void *, SNetSocket_t);
 extern int cppISteamNetworking_SteamNetworking004_GetMaxPacketSize(void *, SNetSocket_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamNetworking_SteamNetworking005.cpp b/lsteamclient/cppISteamNetworking_SteamNetworking005.cpp
index 02f959b0..faa1f386 100644
--- a/lsteamclient/cppISteamNetworking_SteamNetworking005.cpp
+++ b/lsteamclient/cppISteamNetworking_SteamNetworking005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamNetworking_SteamNetworking005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamNetworking_SteamNetworking005.h"
 bool cppISteamNetworking_SteamNetworking005_SendP2PPacket(void *linux_side, CSteamID steamIDRemote, const void * pubData, uint32 cubData, EP2PSend eP2PSendType, int nChannel)
 {
     return ((ISteamNetworking*)linux_side)->SendP2PPacket((CSteamID)steamIDRemote, (const void *)pubData, (uint32)cubData, (EP2PSend)eP2PSendType, (int)nChannel);
diff --git a/lsteamclient/cppISteamNetworking_SteamNetworking005.h b/lsteamclient/cppISteamNetworking_SteamNetworking005.h
index 6b841e72..d19e0c21 100644
--- a/lsteamclient/cppISteamNetworking_SteamNetworking005.h
+++ b/lsteamclient/cppISteamNetworking_SteamNetworking005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamNetworking_SteamNetworking005_SendP2PPacket(void *, CSteamID, const void *, uint32, EP2PSend, int);
 extern bool cppISteamNetworking_SteamNetworking005_IsP2PPacketAvailable(void *, uint32 *, int);
 extern bool cppISteamNetworking_SteamNetworking005_ReadP2PPacket(void *, void *, uint32, uint32 *, CSteamID *, int);
@@ -23,6 +20,3 @@ extern bool cppISteamNetworking_SteamNetworking005_GetSocketInfo(void *, SNetSoc
 extern bool cppISteamNetworking_SteamNetworking005_GetListenSocketInfo(void *, SNetListenSocket_t, uint32 *, uint16 *);
 extern ESNetSocketConnectionType cppISteamNetworking_SteamNetworking005_GetSocketConnectionType(void *, SNetSocket_t);
 extern int cppISteamNetworking_SteamNetworking005_GetMaxPacketSize(void *, SNetSocket_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.cpp
index 002e584e..fe570774 100644
--- a/lsteamclient/cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.cpp
@@ -2,11 +2,12 @@
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamworks_sdk_143/isteamparentalsettings.h"
 #include "steamclient_private.h"
-#include "cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.h"
 bool cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001_BIsParentalLockEnabled(void *linux_side)
 {
     return ((ISteamParentalSettings*)linux_side)->BIsParentalLockEnabled();
diff --git a/lsteamclient/cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.h b/lsteamclient/cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.h
index 91e33110..9eaba40f 100644
--- a/lsteamclient/cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.h
@@ -1,12 +1,6 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001_BIsParentalLockEnabled(void *);
 extern bool cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001_BIsParentalLockLocked(void *);
 extern bool cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001_BIsAppBlocked(void *, AppId_t);
 extern bool cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001_BIsAppInBlockList(void *, AppId_t);
 extern bool cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001_BIsFeatureBlocked(void *, EParentalFeature);
 extern bool cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001_BIsFeatureInBlockList(void *, EParentalFeature);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.cpp
index 38872bde..d1db5469 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_102x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_102x.h"
+#define SDKVER_102x
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.h
index c055c3fd..9fdcccb5 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_GetFileSize(void *, const char *);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_FileRead(void *, const char *, void *, int32);
@@ -9,6 +6,3 @@ extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_FileD
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_GetFileCount(void *);
 extern const char * cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_GetFileNameAndSize(void *, int, int32 *);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_GetQuota(void *, int32 *, int32 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.cpp
index 7c73ab95..fc43a375 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_111/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_111.h"
+#define SDKVER_111
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.h
index 709e2849..fb30ea71 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_GetFileSize(void *, const char *);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_FileRead(void *, const char *, void *, int32);
@@ -8,6 +5,3 @@ extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_FileE
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_GetFileCount(void *);
 extern const char * cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_GetFileNameAndSize(void *, int, int32 *);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_GetQuota(void *, int32 *, int32 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.cpp
index 0a06093a..051c0385 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_111x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_111x.h"
+#define SDKVER_111x
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.h
index fa3c52a7..aa27fcb3 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_FileRead(void *, const char *, void *, int32);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_FileForget(void *, const char *);
@@ -21,6 +18,3 @@ extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_GetUG
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_UGCRead(void *, UGCHandle_t, void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_GetCachedUGCCount(void *);
 extern UGCHandle_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_GetCachedUGCHandle(void *, int32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.cpp
index 65eaf8b4..4c8b03a3 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_116/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_116.h"
+#define SDKVER_116
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.h
index e26d3f91..fe6ba3f4 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_FileRead(void *, const char *, void *, int32);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_FileForget(void *, const char *);
@@ -23,6 +20,3 @@ extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_GetUG
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_UGCRead(void *, UGCHandle_t, void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_GetCachedUGCCount(void *);
 extern UGCHandle_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_GetCachedUGCHandle(void *, int32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.cpp
index 2353e1ae..bfcc7ecb 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_117/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_117.h"
+#define SDKVER_117
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.h
index 2d3d6053..f2e148f8 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005_FileRead(void *, const char *, void *, int32);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005_FileForget(void *, const char *);
@@ -32,6 +29,3 @@ extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSIO
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005_SubscribePublishedFile(void *, PublishedFileId_t);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005_EnumerateUserSubscribedFiles(void *, uint32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005_UnsubscribePublishedFile(void *, PublishedFileId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.cpp
index 5a484faa..4c4b888f 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_119/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_119.h"
+#define SDKVER_119
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.h
index 9d5f4450..13b4399f 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006_FileRead(void *, const char *, void *, int32);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006_FileForget(void *, const char *);
@@ -48,6 +45,3 @@ extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSIO
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006_SetUserPublishedFileAction(void *, PublishedFileId_t, EWorkshopFileAction);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006_EnumeratePublishedFilesByUserAction(void *, EWorkshopFileAction, uint32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006_EnumeratePublishedWorkshopFiles(void *, EWorkshopEnumerationType, uint32, uint32, uint32, SteamParamStringArray_t *, SteamParamStringArray_t *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.cpp
index f7e0d0a6..0bcf13b7 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_119x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_119x.h"
+#define SDKVER_119x
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.h
index 53722ef1..fcc7599c 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007_FileRead(void *, const char *, void *, int32);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007_FileForget(void *, const char *);
@@ -48,6 +45,3 @@ extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSIO
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007_SetUserPublishedFileAction(void *, PublishedFileId_t, EWorkshopFileAction);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007_EnumeratePublishedFilesByUserAction(void *, EWorkshopFileAction, uint32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007_EnumeratePublishedWorkshopFiles(void *, EWorkshopEnumerationType, uint32, uint32, uint32, SteamParamStringArray_t *, SteamParamStringArray_t *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.cpp
index d6200f1d..44188116 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_121/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_121.h"
+#define SDKVER_121
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.h
index 094b347b..4c71334f 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008_FileRead(void *, const char *, void *, int32);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008_FileForget(void *, const char *);
@@ -52,6 +49,3 @@ extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSIO
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008_SetUserPublishedFileAction(void *, PublishedFileId_t, EWorkshopFileAction);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008_EnumeratePublishedFilesByUserAction(void *, EWorkshopFileAction, uint32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008_EnumeratePublishedWorkshopFiles(void *, EWorkshopEnumerationType, uint32, uint32, uint32, SteamParamStringArray_t *, SteamParamStringArray_t *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.cpp
index 105cb660..4c38578f 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_121x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_121x.h"
+#define SDKVER_121x
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.h
index da128381..668046f6 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009_FileRead(void *, const char *, void *, int32);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009_FileForget(void *, const char *);
@@ -52,6 +49,3 @@ extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSIO
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009_SetUserPublishedFileAction(void *, PublishedFileId_t, EWorkshopFileAction);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009_EnumeratePublishedFilesByUserAction(void *, EWorkshopFileAction, uint32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009_EnumeratePublishedWorkshopFiles(void *, EWorkshopEnumerationType, uint32, uint32, uint32, SteamParamStringArray_t *, SteamParamStringArray_t *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.cpp
index 14358adf..e61be0e0 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_124/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_124.h"
+#define SDKVER_124
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.h
index a003454c..ec9a01bf 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010_FileRead(void *, const char *, void *, int32);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010_FileForget(void *, const char *);
@@ -53,6 +50,3 @@ extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSIO
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010_EnumeratePublishedFilesByUserAction(void *, EWorkshopFileAction, uint32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010_EnumeratePublishedWorkshopFiles(void *, EWorkshopEnumerationType, uint32, uint32, uint32, SteamParamStringArray_t *, SteamParamStringArray_t *);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010_UGCDownloadToLocation(void *, UGCHandle_t, const char *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.cpp
index ac7bc151..5b75f445 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_125/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_125.h"
+#define SDKVER_125
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.h
index ca80fcbf..99315e02 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011_FileRead(void *, const char *, void *, int32);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011_FileForget(void *, const char *);
@@ -53,6 +50,3 @@ extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSIO
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011_EnumeratePublishedFilesByUserAction(void *, EWorkshopFileAction, uint32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011_EnumeratePublishedWorkshopFiles(void *, EWorkshopEnumerationType, uint32, uint32, uint32, SteamParamStringArray_t *, SteamParamStringArray_t *);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011_UGCDownloadToLocation(void *, UGCHandle_t, const char *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.cpp
index 75770b26..fd1fbd50 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_134/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_134.h"
+#define SDKVER_134
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.h
index 24222ba1..f9973440 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012_FileRead(void *, const char *, void *, int32);
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012_FileForget(void *, const char *);
@@ -53,6 +50,3 @@ extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSIO
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012_EnumeratePublishedFilesByUserAction(void *, EWorkshopFileAction, uint32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012_EnumeratePublishedWorkshopFiles(void *, EWorkshopEnumerationType, uint32, uint32, uint32, SteamParamStringArray_t *, SteamParamStringArray_t *);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012_UGCDownloadToLocation(void *, UGCHandle_t, const char *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.cpp
index b3400fe4..7bff1757 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_137/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_137.h"
+#define SDKVER_137
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.h
index d5d43a87..03633a75 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013_FileRead(void *, const char *, void *, int32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013_FileWriteAsync(void *, const char *, const void *, uint32);
@@ -56,6 +53,3 @@ extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSIO
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013_EnumeratePublishedFilesByUserAction(void *, EWorkshopFileAction, uint32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013_EnumeratePublishedWorkshopFiles(void *, EWorkshopEnumerationType, uint32, uint32, uint32, SteamParamStringArray_t *, SteamParamStringArray_t *);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013_UGCDownloadToLocation(void *, UGCHandle_t, const char *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.cpp b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.cpp
index fe521e5c..102c5324 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.cpp
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.h"
 bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014_FileWrite(void *linux_side, const char * pchFile, const void * pvData, int32 cubData)
 {
     return ((ISteamRemoteStorage*)linux_side)->FileWrite((const char *)pchFile, (const void *)pvData, (int32)cubData);
diff --git a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.h b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.h
index 2a80f8b8..c6b88711 100644
--- a/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.h
+++ b/lsteamclient/cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014_FileWrite(void *, const char *, const void *, int32);
 extern int32 cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014_FileRead(void *, const char *, void *, int32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014_FileWriteAsync(void *, const char *, const void *, uint32);
@@ -56,6 +53,3 @@ extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSIO
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014_EnumeratePublishedFilesByUserAction(void *, EWorkshopFileAction, uint32);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014_EnumeratePublishedWorkshopFiles(void *, EWorkshopEnumerationType, uint32, uint32, uint32, SteamParamStringArray_t *, SteamParamStringArray_t *);
 extern SteamAPICall_t cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014_UGCDownloadToLocation(void *, UGCHandle_t, const char *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.cpp
index b169a6e9..b3808256 100644
--- a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_122/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_122.h"
+#define SDKVER_122
+#include "struct_converters.h"
+#include "cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.h"
 ScreenshotHandle cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001_WriteScreenshot(void *linux_side, void * pubRGB, uint32 cubRGB, int nWidth, int nHeight)
 {
     return ((ISteamScreenshots*)linux_side)->WriteScreenshot((void *)pubRGB, (uint32)cubRGB, (int)nWidth, (int)nHeight);
diff --git a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.h b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.h
index 2c85eb18..99e67ea4 100644
--- a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001.h
@@ -1,12 +1,6 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern ScreenshotHandle cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001_WriteScreenshot(void *, void *, uint32, int, int);
 extern ScreenshotHandle cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001_AddScreenshotToLibrary(void *, const char *, const char *, int, int);
 extern void cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001_TriggerScreenshot(void *);
 extern void cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001_HookScreenshots(void *, bool);
 extern bool cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001_SetLocation(void *, ScreenshotHandle, const char *);
 extern bool cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001_TagUser(void *, ScreenshotHandle, CSteamID);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.cpp b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.cpp
index 452ac21d..0988480b 100644
--- a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.cpp
+++ b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_137/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_137.h"
+#define SDKVER_137
+#include "struct_converters.h"
+#include "cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.h"
 ScreenshotHandle cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_WriteScreenshot(void *linux_side, void * pubRGB, uint32 cubRGB, int nWidth, int nHeight)
 {
     return ((ISteamScreenshots*)linux_side)->WriteScreenshot((void *)pubRGB, (uint32)cubRGB, (int)nWidth, (int)nHeight);
diff --git a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.h b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.h
index 999684c3..a0ed4f81 100644
--- a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.h
+++ b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern ScreenshotHandle cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_WriteScreenshot(void *, void *, uint32, int, int);
 extern ScreenshotHandle cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_AddScreenshotToLibrary(void *, const char *, const char *, int, int);
 extern void cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_TriggerScreenshot(void *);
@@ -8,6 +5,3 @@ extern void cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_HookScree
 extern bool cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_SetLocation(void *, ScreenshotHandle, const char *);
 extern bool cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_TagUser(void *, ScreenshotHandle, CSteamID);
 extern bool cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_TagPublishedFile(void *, ScreenshotHandle, PublishedFileId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.cpp b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.cpp
index f429f9db..dc354a55 100644
--- a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.cpp
+++ b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.h"
 ScreenshotHandle cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_WriteScreenshot(void *linux_side, void * pubRGB, uint32 cubRGB, int nWidth, int nHeight)
 {
     return ((ISteamScreenshots*)linux_side)->WriteScreenshot((void *)pubRGB, (uint32)cubRGB, (int)nWidth, (int)nHeight);
diff --git a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.h b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.h
index 7bfb193c..3f07c17c 100644
--- a/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.h
+++ b/lsteamclient/cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern ScreenshotHandle cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_WriteScreenshot(void *, void *, uint32, int, int);
 extern ScreenshotHandle cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_AddScreenshotToLibrary(void *, const char *, const char *, int, int);
 extern void cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_TriggerScreenshot(void *);
@@ -10,6 +7,3 @@ extern bool cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_TagUser(v
 extern bool cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_TagPublishedFile(void *, ScreenshotHandle, PublishedFileId_t);
 extern bool cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_IsScreenshotsHooked(void *);
 extern ScreenshotHandle cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_AddVRScreenshotToLibrary(void *, EVRScreenshotType, const char *, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.cpp
index 7508ba39..e885c287 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_128/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_128.h"
+#define SDKVER_128
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -21,7 +22,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_128 * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_128(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.h
index 2f69e72a..ab09801e 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION001.h
@@ -1,10 +1,7 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_128 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_ReleaseQueryUGCRequest(void *, UGCQueryHandle_t);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_AddRequiredTag(void *, UGCQueryHandle_t, const char *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_AddExcludedTag(void *, UGCQueryHandle_t, const char *);
@@ -15,6 +12,3 @@ extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_SetMatchAnyTag(void *, UG
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_SetSearchText(void *, UGCQueryHandle_t, const char *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_SetRankedByTrendDays(void *, UGCQueryHandle_t, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_RequestUGCDetails(void *, PublishedFileId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.cpp
index 971d877d..96d17a8d 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_130/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_130.h"
+#define SDKVER_130
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -21,7 +22,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_130 * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_130(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.h
index fe2d11f5..2d35cb9f 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION002.h
@@ -1,10 +1,7 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_130 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_ReleaseQueryUGCRequest(void *, UGCQueryHandle_t);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_AddRequiredTag(void *, UGCQueryHandle_t, const char *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_AddExcludedTag(void *, UGCQueryHandle_t, const char *);
@@ -32,6 +29,3 @@ extern uint32 cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetNumSubscribedItems(v
 extern uint32 cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetSubscribedItems(void *, PublishedFileId_t *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetItemInstallInfo(void *, PublishedFileId_t, uint64 *, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetItemUpdateInfo(void *, PublishedFileId_t, bool *, bool *, uint64 *, uint64 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.cpp
index 6501cc7e..77513941 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_132/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_132.h"
+#define SDKVER_132
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -21,7 +22,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_132 * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_132(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.h
index 3127ed93..8c2ea536 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION003.h
@@ -1,10 +1,7 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_132 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_ReleaseQueryUGCRequest(void *, UGCQueryHandle_t);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_AddRequiredTag(void *, UGCQueryHandle_t, const char *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_AddExcludedTag(void *, UGCQueryHandle_t, const char *);
@@ -32,6 +29,3 @@ extern uint32 cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetNumSubscribedItems(v
 extern uint32 cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetSubscribedItems(void *, PublishedFileId_t *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetItemInstallInfo(void *, PublishedFileId_t, uint64 *, char *, uint32, bool *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetItemUpdateInfo(void *, PublishedFileId_t, bool *, bool *, uint64 *, uint64 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.cpp
index 3f67b49c..1eae7d17 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_132x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_132x.h"
+#define SDKVER_132x
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -21,7 +22,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_132x * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_132x(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.h
index b016118b..2a88e47a 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION004.h
@@ -1,10 +1,7 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_132x *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_ReleaseQueryUGCRequest(void *, UGCQueryHandle_t);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_AddRequiredTag(void *, UGCQueryHandle_t, const char *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_AddExcludedTag(void *, UGCQueryHandle_t, const char *);
@@ -34,6 +31,3 @@ extern uint32 cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetItemState(void *, Pu
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetItemInstallInfo(void *, PublishedFileId_t, uint64 *, char *, uint32, uint32 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetItemDownloadInfo(void *, PublishedFileId_t, uint64 *, uint64 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_DownloadItem(void *, PublishedFileId_t, bool);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.cpp
index 05ca32ec..da722dd9 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_133b/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_133b.h"
+#define SDKVER_133b
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -26,7 +27,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_133b * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_133b(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.h
index f3cbc6e7..9dc3d40c 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION005.h
@@ -1,11 +1,8 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_CreateQueryUGCDetailsRequest(void *, PublishedFileId_t *, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_133b *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCPreviewURL(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCMetadata(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCChildren(void *, UGCQueryHandle_t, uint32, PublishedFileId_t *, uint32);
@@ -47,6 +44,3 @@ extern uint32 cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetItemState(void *, Pu
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetItemInstallInfo(void *, PublishedFileId_t, uint64 *, char *, uint32, uint32 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetItemDownloadInfo(void *, PublishedFileId_t, uint64 *, uint64 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_DownloadItem(void *, PublishedFileId_t, bool);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.cpp
index 5ecbdf53..d7d5ca05 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_133x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_133x.h"
+#define SDKVER_133x
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -26,7 +27,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_133x * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_133x(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.h
index 2b24c79a..6072cc9c 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION006.h
@@ -1,11 +1,8 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_CreateQueryUGCDetailsRequest(void *, PublishedFileId_t *, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_133x *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCPreviewURL(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCMetadata(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCChildren(void *, UGCQueryHandle_t, uint32, PublishedFileId_t *, uint32);
@@ -51,6 +48,3 @@ extern uint32 cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetItemState(void *, Pu
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetItemInstallInfo(void *, PublishedFileId_t, uint64 *, char *, uint32, uint32 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetItemDownloadInfo(void *, PublishedFileId_t, uint64 *, uint64 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_DownloadItem(void *, PublishedFileId_t, bool);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.cpp
index 7cf70fe1..2a11f2b9 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_136/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_136.h"
+#define SDKVER_136
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -26,7 +27,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_136 * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_136(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.h
index 710a3569..c60de286 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION007.h
@@ -1,11 +1,8 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_CreateQueryUGCDetailsRequest(void *, PublishedFileId_t *, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_136 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCPreviewURL(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCMetadata(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCChildren(void *, UGCQueryHandle_t, uint32, PublishedFileId_t *, uint32);
@@ -59,6 +56,3 @@ extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetItemDownloadInfo(void
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_DownloadItem(void *, PublishedFileId_t, bool);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_BInitWorkshopForGameServer(void *, DepotId_t, const char *);
 extern void cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_SuspendDownloads(void *, bool);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.cpp
index cbd9236e..997154dd 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_137/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_137.h"
+#define SDKVER_137
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -26,7 +27,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_137 * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_137(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.h
index b3d62039..94c0b5a3 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION008.h
@@ -1,11 +1,8 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_CreateQueryUGCDetailsRequest(void *, PublishedFileId_t *, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_137 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCPreviewURL(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCMetadata(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCChildren(void *, UGCQueryHandle_t, uint32, PublishedFileId_t *, uint32);
@@ -64,6 +61,3 @@ extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetItemDownloadInfo(void
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_DownloadItem(void *, PublishedFileId_t, bool);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_BInitWorkshopForGameServer(void *, DepotId_t, const char *);
 extern void cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_SuspendDownloads(void *, bool);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.cpp
index 9ea305df..65725f7c 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_139/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_139.h"
+#define SDKVER_139
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -26,7 +27,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_139 * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_139(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.h
index ccb97956..b9a2c78d 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION009.h
@@ -1,11 +1,8 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_CreateQueryUGCDetailsRequest(void *, PublishedFileId_t *, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_139 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCPreviewURL(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCMetadata(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCChildren(void *, UGCQueryHandle_t, uint32, PublishedFileId_t *, uint32);
@@ -68,6 +65,3 @@ extern void cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_SuspendDownloads(void *,
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_StartPlaytimeTracking(void *, PublishedFileId_t *, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_StopPlaytimeTracking(void *, PublishedFileId_t *, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_StopPlaytimeTrackingForAllItems(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.cpp
index 6f738e8a..85945060 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_142/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_142.h"
+#define SDKVER_142
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -26,7 +27,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_142 * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_142(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.h
index 8deadaf6..3ebfc66b 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION010.h
@@ -1,11 +1,8 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_CreateQueryUGCDetailsRequest(void *, PublishedFileId_t *, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_142 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCPreviewURL(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCMetadata(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCChildren(void *, UGCQueryHandle_t, uint32, PublishedFileId_t *, uint32);
@@ -75,6 +72,3 @@ extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_AddAppDependenc
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_RemoveAppDependency(void *, PublishedFileId_t, AppId_t);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetAppDependencies(void *, PublishedFileId_t);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_DeleteItem(void *, PublishedFileId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.cpp b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.cpp
index 025b509a..f7a458d1 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.cpp
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.h"
 UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_CreateQueryUserUGCRequest(void *linux_side, AccountID_t unAccountID, EUserUGCList eListType, EUGCMatchingUGCType eMatchingUGCType, EUserUGCListSortOrder eSortOrder, AppId_t nCreatorAppID, AppId_t nConsumerAppID, uint32 unPage)
 {
     return ((ISteamUGC*)linux_side)->CreateQueryUserUGCRequest((AccountID_t)unAccountID, (EUserUGCList)eListType, (EUGCMatchingUGCType)eMatchingUGCType, (EUserUGCListSortOrder)eSortOrder, (AppId_t)nCreatorAppID, (AppId_t)nConsumerAppID, (uint32)unPage);
@@ -31,7 +32,7 @@ SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_SendQueryUGCRequest(vo
     return ((ISteamUGC*)linux_side)->SendQueryUGCRequest((UGCQueryHandle_t)handle);
 }
 
-bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCResult(void *linux_side, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_143 * pDetails)
 {
     SteamUGCDetails_t lin_pDetails;
     win_to_lin_struct_SteamUGCDetails_t_143(pDetails, &lin_pDetails);
diff --git a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.h b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.h
index c69aa885..a0bc5281 100644
--- a/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.h
+++ b/lsteamclient/cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.h
@@ -1,12 +1,9 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_CreateQueryUserUGCRequest(void *, AccountID_t, EUserUGCList, EUGCMatchingUGCType, EUserUGCListSortOrder, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_CreateQueryAllUGCRequest(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, uint32);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_CreateQueryAllUGCRequest_2(void *, EUGCQuery, EUGCMatchingUGCType, AppId_t, AppId_t, const char *);
 extern UGCQueryHandle_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_CreateQueryUGCDetailsRequest(void *, PublishedFileId_t *, uint32);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_SendQueryUGCRequest(void *, UGCQueryHandle_t);
-extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, SteamUGCDetails_t *);
+extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCResult(void *, UGCQueryHandle_t, uint32, winSteamUGCDetails_t_143 *);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCPreviewURL(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCMetadata(void *, UGCQueryHandle_t, uint32, char *, uint32);
 extern bool cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCChildren(void *, UGCQueryHandle_t, uint32, PublishedFileId_t *, uint32);
@@ -77,6 +74,3 @@ extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_AddAppDependenc
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_RemoveAppDependency(void *, PublishedFileId_t, AppId_t);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetAppDependencies(void *, PublishedFileId_t);
 extern SteamAPICall_t cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_DeleteItem(void *, PublishedFileId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.cpp
index d89fdc5f..b2215be9 100644
--- a/lsteamclient/cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_141/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_141.h"
+#define SDKVER_141
+#include "struct_converters.h"
+#include "cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.h"
 ClientUnifiedMessageHandle cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001_SendMethod(void *linux_side, const char * pchServiceMethod, const void * pRequestBuffer, uint32 unRequestBufferSize, uint64 unContext)
 {
     return ((ISteamUnifiedMessages*)linux_side)->SendMethod((const char *)pchServiceMethod, (const void *)pRequestBuffer, (uint32)unRequestBufferSize, (uint64)unContext);
diff --git a/lsteamclient/cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.h b/lsteamclient/cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.h
index 2c6b7657..6d3a3876 100644
--- a/lsteamclient/cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.h
@@ -1,11 +1,5 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern ClientUnifiedMessageHandle cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001_SendMethod(void *, const char *, const void *, uint32, uint64);
 extern bool cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001_GetMethodResponseInfo(void *, ClientUnifiedMessageHandle, uint32 *, EResult *);
 extern bool cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001_GetMethodResponseData(void *, ClientUnifiedMessageHandle, void *, uint32, bool);
 extern bool cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001_ReleaseMethod(void *, ClientUnifiedMessageHandle);
 extern bool cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001_SendNotification(void *, const char *, const void *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.cpp
index 016a0841..b29a4a7c 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099x.h"
+#define SDKVER_099x
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.h"
 uint32 cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_GetNumStats(void *linux_side, CGameID nGameID)
 {
     return ((ISteamUserStats*)linux_side)->GetNumStats((CGameID)nGameID);
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.h
index 8e1aa0f4..a6242f1e 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_GetNumStats(void *, CGameID);
 extern const char * cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_GetStatName(void *, CGameID, uint32);
 extern ESteamUserStatType cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_GetStatType(void *, CGameID, const char *);
@@ -23,6 +20,3 @@ extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_ClearAchievem
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_ClearGroupAchievement(void *, CGameID, const char *);
 extern int cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_GetAchievementIcon(void *, CGameID, const char *);
 extern const char * cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_GetAchievementDisplayAttribute(void *, CGameID, const char *, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.cpp
index 99dc47c9..136d21ae 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099y/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099y.h"
+#define SDKVER_099y
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.h"
 uint32 cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_GetNumStats(void *linux_side, CGameID nGameID)
 {
     return ((ISteamUserStats*)linux_side)->GetNumStats((CGameID)nGameID);
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.h
index 552c648a..e777010a 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_GetNumStats(void *, CGameID);
 extern const char * cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_GetStatName(void *, CGameID, uint32);
 extern ESteamUserStatType cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_GetStatType(void *, CGameID, const char *);
@@ -19,6 +16,3 @@ extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_StoreStats(vo
 extern int cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_GetAchievementIcon(void *, CGameID, const char *);
 extern const char * cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_GetAchievementDisplayAttribute(void *, CGameID, const char *, const char *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_IndicateAchievementProgress(void *, CGameID, const char *, uint32, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.cpp
index 10340389..b5e78f27 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_102/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_102.h"
+#define SDKVER_102
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.h"
 bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_RequestCurrentStats(void *linux_side)
 {
     return ((ISteamUserStats*)linux_side)->RequestCurrentStats();
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.h
index 16b3071c..c8aa884a 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_RequestCurrentStats(void *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_GetStat(void *, const char *, int32 *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_GetStat_2(void *, const char *, float *);
@@ -14,6 +11,3 @@ extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_StoreStats(vo
 extern int cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_GetAchievementIcon(void *, const char *);
 extern const char * cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_GetAchievementDisplayAttribute(void *, const char *, const char *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_IndicateAchievementProgress(void *, const char *, uint32, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.cpp
index c91fb503..0f507e8a 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_103/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_103.h"
+#define SDKVER_103
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.h"
 bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_RequestCurrentStats(void *linux_side)
 {
     return ((ISteamUserStats*)linux_side)->RequestCurrentStats();
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.h
index b2febe57..ad196e59 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_RequestCurrentStats(void *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_GetStat(void *, const char *, int32 *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_GetStat_2(void *, const char *, float *);
@@ -18,6 +15,3 @@ extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_Req
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_GetUserStat(void *, CSteamID, const char *, int32 *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_GetUserStat_2(void *, CSteamID, const char *, float *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_GetUserAchievement(void *, CSteamID, const char *, bool *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.cpp
index 4aaac5d2..c13758be 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_104/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_104.h"
+#define SDKVER_104
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.h"
 bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005_RequestCurrentStats(void *linux_side)
 {
     return ((ISteamUserStats*)linux_side)->RequestCurrentStats();
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.h
index 41339622..b44958bf 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005_RequestCurrentStats(void *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005_GetStat(void *, const char *, int32 *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005_GetStat_2(void *, const char *, float *);
@@ -28,6 +25,3 @@ extern ELeaderboardDisplayType cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSI
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005_DownloadLeaderboardEntries(void *, SteamLeaderboard_t, ELeaderboardDataRequest, int, int);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, LeaderboardEntry_t *, int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005_UploadLeaderboardScore(void *, SteamLeaderboard_t, int32, int32 *, int);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.cpp
index e2a53f53..d44ede18 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_107/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_107.h"
+#define SDKVER_107
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.h"
 bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_RequestCurrentStats(void *linux_side)
 {
     return ((ISteamUserStats*)linux_side)->RequestCurrentStats();
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.h
index c3724bd8..78b5b9df 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_RequestCurrentStats(void *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_GetStat(void *, const char *, int32 *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_GetStat_2(void *, const char *, float *);
@@ -29,6 +26,3 @@ extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_Dow
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, LeaderboardEntry_t *, int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_UploadLeaderboardScore(void *, SteamLeaderboard_t, ELeaderboardUploadScoreMethod, int32, const int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_GetNumberOfCurrentPlayers(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.cpp
index a7586249..fe90e9c3 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_111/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_111.h"
+#define SDKVER_111
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.h"
 bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_RequestCurrentStats(void *linux_side)
 {
     return ((ISteamUserStats*)linux_side)->RequestCurrentStats();
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.h
index ff1b8b1c..da226835 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_RequestCurrentStats(void *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_GetStat(void *, const char *, int32 *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_GetStat_2(void *, const char *, float *);
@@ -31,6 +28,3 @@ extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_Dow
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, LeaderboardEntry_t *, int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_UploadLeaderboardScore(void *, SteamLeaderboard_t, ELeaderboardUploadScoreMethod, int32, const int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_GetNumberOfCurrentPlayers(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.cpp
index bfdbd53b..763d6aa5 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_111x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_111x.h"
+#define SDKVER_111x
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.h"
 bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_RequestCurrentStats(void *linux_side)
 {
     return ((ISteamUserStats*)linux_side)->RequestCurrentStats();
@@ -141,7 +142,7 @@ SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_DownloadLe
     return ((ISteamUserStats*)linux_side)->DownloadLeaderboardEntries((SteamLeaderboard_t)hSteamLeaderboard, (ELeaderboardDataRequest)eLeaderboardDataRequest, (int)nRangeStart, (int)nRangeEnd);
 }
 
-bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetDownloadedLeaderboardEntry(void *linux_side, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, LeaderboardEntry_t * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
+bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetDownloadedLeaderboardEntry(void *linux_side, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, winLeaderboardEntry_t_111x * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
 {
     LeaderboardEntry_t lin_pLeaderboardEntry;
     win_to_lin_struct_LeaderboardEntry_t_111x(pLeaderboardEntry, &lin_pLeaderboardEntry);
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.h
index 2e808c1f..6ee45a51 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_RequestCurrentStats(void *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetStat(void *, const char *, int32 *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetStat_2(void *, const char *, float *);
@@ -28,10 +25,7 @@ extern int cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetLeaderboard
 extern ELeaderboardSortMethod cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetLeaderboardSortMethod(void *, SteamLeaderboard_t);
 extern ELeaderboardDisplayType cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetLeaderboardDisplayType(void *, SteamLeaderboard_t);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_DownloadLeaderboardEntries(void *, SteamLeaderboard_t, ELeaderboardDataRequest, int, int);
-extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, LeaderboardEntry_t *, int32 *, int);
+extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, winLeaderboardEntry_t_111x *, int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_UploadLeaderboardScore(void *, SteamLeaderboard_t, ELeaderboardUploadScoreMethod, int32, const int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_AttachLeaderboardUGC(void *, SteamLeaderboard_t, UGCHandle_t);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetNumberOfCurrentPlayers(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.cpp
index 20f9efac..e8d5b485 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_113/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_113.h"
+#define SDKVER_113
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.h"
 bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_RequestCurrentStats(void *linux_side)
 {
     return ((ISteamUserStats*)linux_side)->RequestCurrentStats();
@@ -146,7 +147,7 @@ SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_DownloadLe
     return ((ISteamUserStats*)linux_side)->DownloadLeaderboardEntriesForUsers((SteamLeaderboard_t)hSteamLeaderboard, (CSteamID *)prgUsers, (int)cUsers);
 }
 
-bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetDownloadedLeaderboardEntry(void *linux_side, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, LeaderboardEntry_t * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
+bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetDownloadedLeaderboardEntry(void *linux_side, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, winLeaderboardEntry_t_113 * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
 {
     LeaderboardEntry_t lin_pLeaderboardEntry;
     win_to_lin_struct_LeaderboardEntry_t_113(pLeaderboardEntry, &lin_pLeaderboardEntry);
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.h
index 43542cf8..6da525ec 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_RequestCurrentStats(void *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetStat(void *, const char *, int32 *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetStat_2(void *, const char *, float *);
@@ -29,10 +26,7 @@ extern ELeaderboardSortMethod cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSIO
 extern ELeaderboardDisplayType cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetLeaderboardDisplayType(void *, SteamLeaderboard_t);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_DownloadLeaderboardEntries(void *, SteamLeaderboard_t, ELeaderboardDataRequest, int, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_DownloadLeaderboardEntriesForUsers(void *, SteamLeaderboard_t, CSteamID *, int);
-extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, LeaderboardEntry_t *, int32 *, int);
+extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, winLeaderboardEntry_t_113 *, int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_UploadLeaderboardScore(void *, SteamLeaderboard_t, ELeaderboardUploadScoreMethod, int32, const int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_AttachLeaderboardUGC(void *, SteamLeaderboard_t, UGCHandle_t);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetNumberOfCurrentPlayers(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.cpp
index aee9c492..8a8cfe7b 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_119/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_119.h"
+#define SDKVER_119
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.h"
 bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_RequestCurrentStats(void *linux_side)
 {
     return ((ISteamUserStats*)linux_side)->RequestCurrentStats();
@@ -146,7 +147,7 @@ SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_DownloadLe
     return ((ISteamUserStats*)linux_side)->DownloadLeaderboardEntriesForUsers((SteamLeaderboard_t)hSteamLeaderboard, (CSteamID *)prgUsers, (int)cUsers);
 }
 
-bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetDownloadedLeaderboardEntry(void *linux_side, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, LeaderboardEntry_t * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
+bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetDownloadedLeaderboardEntry(void *linux_side, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, winLeaderboardEntry_t_119 * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
 {
     LeaderboardEntry_t lin_pLeaderboardEntry;
     win_to_lin_struct_LeaderboardEntry_t_119(pLeaderboardEntry, &lin_pLeaderboardEntry);
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.h
index a9daea22..4a2d6b15 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_RequestCurrentStats(void *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetStat(void *, const char *, int32 *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetStat_2(void *, const char *, float *);
@@ -29,7 +26,7 @@ extern ELeaderboardSortMethod cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSIO
 extern ELeaderboardDisplayType cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetLeaderboardDisplayType(void *, SteamLeaderboard_t);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_DownloadLeaderboardEntries(void *, SteamLeaderboard_t, ELeaderboardDataRequest, int, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_DownloadLeaderboardEntriesForUsers(void *, SteamLeaderboard_t, CSteamID *, int);
-extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, LeaderboardEntry_t *, int32 *, int);
+extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, winLeaderboardEntry_t_119 *, int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_UploadLeaderboardScore(void *, SteamLeaderboard_t, ELeaderboardUploadScoreMethod, int32, const int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_AttachLeaderboardUGC(void *, SteamLeaderboard_t, UGCHandle_t);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetNumberOfCurrentPlayers(void *);
@@ -42,6 +39,3 @@ extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetGlobalStat
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetGlobalStat_2(void *, const char *, double *);
 extern int32 cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetGlobalStatHistory(void *, const char *, int64 *, uint32);
 extern int32 cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetGlobalStatHistory_2(void *, const char *, double *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.cpp b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.cpp
index 9112792f..ffcd8dd1 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.cpp
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.h"
 bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_RequestCurrentStats(void *linux_side)
 {
     return ((ISteamUserStats*)linux_side)->RequestCurrentStats();
@@ -156,7 +157,7 @@ SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_DownloadLe
     return ((ISteamUserStats*)linux_side)->DownloadLeaderboardEntriesForUsers((SteamLeaderboard_t)hSteamLeaderboard, (CSteamID *)prgUsers, (int)cUsers);
 }
 
-bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetDownloadedLeaderboardEntry(void *linux_side, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, LeaderboardEntry_t * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
+bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetDownloadedLeaderboardEntry(void *linux_side, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, winLeaderboardEntry_t_143 * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
 {
     LeaderboardEntry_t lin_pLeaderboardEntry;
     win_to_lin_struct_LeaderboardEntry_t_143(pLeaderboardEntry, &lin_pLeaderboardEntry);
diff --git a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.h b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.h
index 9142eb31..e41efafb 100644
--- a/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.h
+++ b/lsteamclient/cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_RequestCurrentStats(void *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetStat(void *, const char *, int32 *);
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetStat_2(void *, const char *, float *);
@@ -31,7 +28,7 @@ extern ELeaderboardSortMethod cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSIO
 extern ELeaderboardDisplayType cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetLeaderboardDisplayType(void *, SteamLeaderboard_t);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_DownloadLeaderboardEntries(void *, SteamLeaderboard_t, ELeaderboardDataRequest, int, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_DownloadLeaderboardEntriesForUsers(void *, SteamLeaderboard_t, CSteamID *, int);
-extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, LeaderboardEntry_t *, int32 *, int);
+extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetDownloadedLeaderboardEntry(void *, SteamLeaderboardEntries_t, int, winLeaderboardEntry_t_143 *, int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_UploadLeaderboardScore(void *, SteamLeaderboard_t, ELeaderboardUploadScoreMethod, int32, const int32 *, int);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_AttachLeaderboardUGC(void *, SteamLeaderboard_t, UGCHandle_t);
 extern SteamAPICall_t cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetNumberOfCurrentPlayers(void *);
@@ -44,6 +41,3 @@ extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetGlobalStat
 extern bool cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetGlobalStat_2(void *, const char *, double *);
 extern int32 cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetGlobalStatHistory(void *, const char *, int64 *, uint32);
 extern int32 cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetGlobalStatHistory_2(void *, const char *, double *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser004.cpp b/lsteamclient/cppISteamUser_SteamUser004.cpp
index c979c513..ee9f20d2 100644
--- a/lsteamclient/cppISteamUser_SteamUser004.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099u/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099u.h"
+#define SDKVER_099u
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser004.h"
 HSteamUser cppISteamUser_SteamUser004_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser004.h b/lsteamclient/cppISteamUser_SteamUser004.h
index c91073c1..bb78c655 100644
--- a/lsteamclient/cppISteamUser_SteamUser004.h
+++ b/lsteamclient/cppISteamUser_SteamUser004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser004_GetHSteamUser(void *);
 extern void cppISteamUser_SteamUser004_LogOn(void *, CSteamID);
 extern void cppISteamUser_SteamUser004_LogOff(void *);
@@ -27,6 +24,3 @@ extern void cppISteamUser_SteamUser004_TerminateGameConnection(void *, uint32, u
 extern void cppISteamUser_SteamUser004_SetSelfAsPrimaryChatDestination(void *);
 extern bool cppISteamUser_SteamUser004_IsPrimaryChatDestination(void *);
 extern void cppISteamUser_SteamUser004_RequestLegacyCDKey(void *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser005.cpp b/lsteamclient/cppISteamUser_SteamUser005.cpp
index 893f302a..a5e49fe6 100644
--- a/lsteamclient/cppISteamUser_SteamUser005.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099v/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099v.h"
+#define SDKVER_099v
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser005.h"
 HSteamUser cppISteamUser_SteamUser005_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser005.h b/lsteamclient/cppISteamUser_SteamUser005.h
index f07d3af5..7eded8d6 100644
--- a/lsteamclient/cppISteamUser_SteamUser005.h
+++ b/lsteamclient/cppISteamUser_SteamUser005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser005_GetHSteamUser(void *);
 extern void cppISteamUser_SteamUser005_LogOn(void *, CSteamID);
 extern void cppISteamUser_SteamUser005_LogOff(void *);
@@ -40,6 +37,3 @@ extern void cppISteamUser_SteamUser005_TrackAppUsageEvent(void *, CGameID, int,
 extern void cppISteamUser_SteamUser005_SetAccountName(void *, const char *);
 extern void cppISteamUser_SteamUser005_SetPassword(void *, const char *);
 extern void cppISteamUser_SteamUser005_SetAccountCreationTime(void *, RTime32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser006.cpp b/lsteamclient/cppISteamUser_SteamUser006.cpp
index ba87caf4..f6866166 100644
--- a/lsteamclient/cppISteamUser_SteamUser006.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser006.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099w/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser006.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099w.h"
+#define SDKVER_099w
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser006.h"
 HSteamUser cppISteamUser_SteamUser006_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser006.h b/lsteamclient/cppISteamUser_SteamUser006.h
index 179e6260..a45bdf2d 100644
--- a/lsteamclient/cppISteamUser_SteamUser006.h
+++ b/lsteamclient/cppISteamUser_SteamUser006.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser006_GetHSteamUser(void *);
 extern void cppISteamUser_SteamUser006_LogOn(void *, CSteamID);
 extern void cppISteamUser_SteamUser006_LogOff(void *);
@@ -13,6 +10,3 @@ extern bool cppISteamUser_SteamUser006_GetRegistryInt(void *, EConfigSubTree, co
 extern int cppISteamUser_SteamUser006_InitiateGameConnection(void *, void *, int, CSteamID, CGameID, uint32, uint16, bool);
 extern void cppISteamUser_SteamUser006_TerminateGameConnection(void *, uint32, uint16);
 extern void cppISteamUser_SteamUser006_TrackAppUsageEvent(void *, CGameID, int, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser007.cpp b/lsteamclient/cppISteamUser_SteamUser007.cpp
index 4193898a..25f61524 100644
--- a/lsteamclient/cppISteamUser_SteamUser007.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser007.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser007.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099x.h"
+#define SDKVER_099x
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser007.h"
 HSteamUser cppISteamUser_SteamUser007_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser007.h b/lsteamclient/cppISteamUser_SteamUser007.h
index 8e4049d7..645d89ed 100644
--- a/lsteamclient/cppISteamUser_SteamUser007.h
+++ b/lsteamclient/cppISteamUser_SteamUser007.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser007_GetHSteamUser(void *);
 extern void cppISteamUser_SteamUser007_LogOn(void *, CSteamID);
 extern void cppISteamUser_SteamUser007_LogOff(void *);
@@ -14,6 +11,3 @@ extern int cppISteamUser_SteamUser007_InitiateGameConnection(void *, void *, int
 extern void cppISteamUser_SteamUser007_TerminateGameConnection(void *, uint32, uint16);
 extern void cppISteamUser_SteamUser007_TrackAppUsageEvent(void *, CGameID, int, const char *);
 extern void cppISteamUser_SteamUser007_RefreshSteam2Login(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser008.cpp b/lsteamclient/cppISteamUser_SteamUser008.cpp
index 89abdc90..48fc4fb5 100644
--- a/lsteamclient/cppISteamUser_SteamUser008.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser008.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_099y/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser008.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_099y.h"
+#define SDKVER_099y
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser008.h"
 HSteamUser cppISteamUser_SteamUser008_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser008.h b/lsteamclient/cppISteamUser_SteamUser008.h
index 9d5583b0..7ce2d042 100644
--- a/lsteamclient/cppISteamUser_SteamUser008.h
+++ b/lsteamclient/cppISteamUser_SteamUser008.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser008_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser008_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser008_GetSteamID(void *);
@@ -8,6 +5,3 @@ extern int cppISteamUser_SteamUser008_InitiateGameConnection(void *, void *, int
 extern void cppISteamUser_SteamUser008_TerminateGameConnection(void *, uint32, uint16);
 extern void cppISteamUser_SteamUser008_TrackAppUsageEvent(void *, CGameID, int, const char *);
 extern void cppISteamUser_SteamUser008_RefreshSteam2Login(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser009.cpp b/lsteamclient/cppISteamUser_SteamUser009.cpp
index aee59c98..b0ac7d39 100644
--- a/lsteamclient/cppISteamUser_SteamUser009.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser009.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_100/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser009.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_100.h"
+#define SDKVER_100
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser009.h"
 HSteamUser cppISteamUser_SteamUser009_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser009.h b/lsteamclient/cppISteamUser_SteamUser009.h
index 851e22c4..f8141732 100644
--- a/lsteamclient/cppISteamUser_SteamUser009.h
+++ b/lsteamclient/cppISteamUser_SteamUser009.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser009_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser009_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser009_GetSteamID(void *);
@@ -8,6 +5,3 @@ extern int cppISteamUser_SteamUser009_InitiateGameConnection(void *, void *, int
 extern void cppISteamUser_SteamUser009_TerminateGameConnection(void *, uint32, uint16);
 extern void cppISteamUser_SteamUser009_TrackAppUsageEvent(void *, CGameID, int, const char *);
 extern void cppISteamUser_SteamUser009_RefreshSteam2Login(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser010.cpp b/lsteamclient/cppISteamUser_SteamUser010.cpp
index e7368f34..b87bc4b0 100644
--- a/lsteamclient/cppISteamUser_SteamUser010.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser010.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_101/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser010.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_101.h"
+#define SDKVER_101
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser010.h"
 HSteamUser cppISteamUser_SteamUser010_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser010.h b/lsteamclient/cppISteamUser_SteamUser010.h
index fdf00d3c..5a641f5b 100644
--- a/lsteamclient/cppISteamUser_SteamUser010.h
+++ b/lsteamclient/cppISteamUser_SteamUser010.h
@@ -1,12 +1,6 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser010_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser010_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser010_GetSteamID(void *);
 extern int cppISteamUser_SteamUser010_InitiateGameConnection(void *, void *, int, CSteamID, uint32, uint16, bool);
 extern void cppISteamUser_SteamUser010_TerminateGameConnection(void *, uint32, uint16);
 extern void cppISteamUser_SteamUser010_TrackAppUsageEvent(void *, CGameID, int, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser011.cpp b/lsteamclient/cppISteamUser_SteamUser011.cpp
index b4b64ca1..5041d975 100644
--- a/lsteamclient/cppISteamUser_SteamUser011.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser011.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_103/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser011.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_103.h"
+#define SDKVER_103
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser011.h"
 HSteamUser cppISteamUser_SteamUser011_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser011.h b/lsteamclient/cppISteamUser_SteamUser011.h
index 4b69cdc5..a7706164 100644
--- a/lsteamclient/cppISteamUser_SteamUser011.h
+++ b/lsteamclient/cppISteamUser_SteamUser011.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser011_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser011_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser011_GetSteamID(void *);
@@ -12,6 +9,3 @@ extern void cppISteamUser_SteamUser011_StartVoiceRecording(void *);
 extern void cppISteamUser_SteamUser011_StopVoiceRecording(void *);
 extern EVoiceResult cppISteamUser_SteamUser011_GetCompressedVoice(void *, void *, uint32, uint32 *);
 extern EVoiceResult cppISteamUser_SteamUser011_DecompressVoice(void *, void *, uint32, void *, uint32, uint32 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser012.cpp b/lsteamclient/cppISteamUser_SteamUser012.cpp
index 141bceef..879320a6 100644
--- a/lsteamclient/cppISteamUser_SteamUser012.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser012.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_105/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser012.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_105.h"
+#define SDKVER_105
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser012.h"
 HSteamUser cppISteamUser_SteamUser012_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser012.h b/lsteamclient/cppISteamUser_SteamUser012.h
index bc643e97..c604abc3 100644
--- a/lsteamclient/cppISteamUser_SteamUser012.h
+++ b/lsteamclient/cppISteamUser_SteamUser012.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser012_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser012_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser012_GetSteamID(void *);
@@ -17,6 +14,3 @@ extern EBeginAuthSessionResult cppISteamUser_SteamUser012_BeginAuthSession(void
 extern void cppISteamUser_SteamUser012_EndAuthSession(void *, CSteamID);
 extern void cppISteamUser_SteamUser012_CancelAuthTicket(void *, HAuthTicket);
 extern EUserHasLicenseForAppResult cppISteamUser_SteamUser012_UserHasLicenseForApp(void *, CSteamID, AppId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser013.cpp b/lsteamclient/cppISteamUser_SteamUser013.cpp
index 001702d8..3396609b 100644
--- a/lsteamclient/cppISteamUser_SteamUser013.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser013.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_110/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser013.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_110.h"
+#define SDKVER_110
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser013.h"
 HSteamUser cppISteamUser_SteamUser013_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser013.h b/lsteamclient/cppISteamUser_SteamUser013.h
index dfe59836..1c925a1c 100644
--- a/lsteamclient/cppISteamUser_SteamUser013.h
+++ b/lsteamclient/cppISteamUser_SteamUser013.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser013_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser013_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser013_GetSteamID(void *);
@@ -18,6 +15,3 @@ extern EBeginAuthSessionResult cppISteamUser_SteamUser013_BeginAuthSession(void
 extern void cppISteamUser_SteamUser013_EndAuthSession(void *, CSteamID);
 extern void cppISteamUser_SteamUser013_CancelAuthTicket(void *, HAuthTicket);
 extern EUserHasLicenseForAppResult cppISteamUser_SteamUser013_UserHasLicenseForApp(void *, CSteamID, AppId_t);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser014.cpp b/lsteamclient/cppISteamUser_SteamUser014.cpp
index 2d508ae0..1731aabb 100644
--- a/lsteamclient/cppISteamUser_SteamUser014.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser014.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_112/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser014.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_112.h"
+#define SDKVER_112
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser014.h"
 HSteamUser cppISteamUser_SteamUser014_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser014.h b/lsteamclient/cppISteamUser_SteamUser014.h
index 28426016..0045f3a1 100644
--- a/lsteamclient/cppISteamUser_SteamUser014.h
+++ b/lsteamclient/cppISteamUser_SteamUser014.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser014_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser014_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser014_GetSteamID(void *);
@@ -22,6 +19,3 @@ extern bool cppISteamUser_SteamUser014_BIsBehindNAT(void *);
 extern void cppISteamUser_SteamUser014_AdvertiseGame(void *, CSteamID, uint32, uint16);
 extern SteamAPICall_t cppISteamUser_SteamUser014_RequestEncryptedAppTicket(void *, void *, int);
 extern bool cppISteamUser_SteamUser014_GetEncryptedAppTicket(void *, void *, int, uint32 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser015.cpp b/lsteamclient/cppISteamUser_SteamUser015.cpp
index da52c301..ffc77165 100644
--- a/lsteamclient/cppISteamUser_SteamUser015.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser015.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_112x/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser015.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_112x.h"
+#define SDKVER_112x
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser015.h"
 HSteamUser cppISteamUser_SteamUser015_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser015.h b/lsteamclient/cppISteamUser_SteamUser015.h
index 0d2b4814..758f3e5d 100644
--- a/lsteamclient/cppISteamUser_SteamUser015.h
+++ b/lsteamclient/cppISteamUser_SteamUser015.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser015_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser015_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser015_GetSteamID(void *);
@@ -23,6 +20,3 @@ extern bool cppISteamUser_SteamUser015_BIsBehindNAT(void *);
 extern void cppISteamUser_SteamUser015_AdvertiseGame(void *, CSteamID, uint32, uint16);
 extern SteamAPICall_t cppISteamUser_SteamUser015_RequestEncryptedAppTicket(void *, void *, int);
 extern bool cppISteamUser_SteamUser015_GetEncryptedAppTicket(void *, void *, int, uint32 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser016.cpp b/lsteamclient/cppISteamUser_SteamUser016.cpp
index 986dcaa1..a5c5234c 100644
--- a/lsteamclient/cppISteamUser_SteamUser016.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser016.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_123a/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser016.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_123a.h"
+#define SDKVER_123a
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser016.h"
 HSteamUser cppISteamUser_SteamUser016_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser016.h b/lsteamclient/cppISteamUser_SteamUser016.h
index 3cbb33af..6e2003d9 100644
--- a/lsteamclient/cppISteamUser_SteamUser016.h
+++ b/lsteamclient/cppISteamUser_SteamUser016.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser016_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser016_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser016_GetSteamID(void *);
@@ -23,6 +20,3 @@ extern bool cppISteamUser_SteamUser016_BIsBehindNAT(void *);
 extern void cppISteamUser_SteamUser016_AdvertiseGame(void *, CSteamID, uint32, uint16);
 extern SteamAPICall_t cppISteamUser_SteamUser016_RequestEncryptedAppTicket(void *, void *, int);
 extern bool cppISteamUser_SteamUser016_GetEncryptedAppTicket(void *, void *, int, uint32 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser017.cpp b/lsteamclient/cppISteamUser_SteamUser017.cpp
index 5a9f29bc..2e6ba85e 100644
--- a/lsteamclient/cppISteamUser_SteamUser017.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser017.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_131/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser017.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_131.h"
+#define SDKVER_131
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser017.h"
 HSteamUser cppISteamUser_SteamUser017_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser017.h b/lsteamclient/cppISteamUser_SteamUser017.h
index 57a583e6..83e6fd32 100644
--- a/lsteamclient/cppISteamUser_SteamUser017.h
+++ b/lsteamclient/cppISteamUser_SteamUser017.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser017_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser017_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser017_GetSteamID(void *);
@@ -25,6 +22,3 @@ extern SteamAPICall_t cppISteamUser_SteamUser017_RequestEncryptedAppTicket(void
 extern bool cppISteamUser_SteamUser017_GetEncryptedAppTicket(void *, void *, int, uint32 *);
 extern int cppISteamUser_SteamUser017_GetGameBadgeLevel(void *, int, bool);
 extern int cppISteamUser_SteamUser017_GetPlayerSteamLevel(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser018.cpp b/lsteamclient/cppISteamUser_SteamUser018.cpp
index 64115c32..5239be43 100644
--- a/lsteamclient/cppISteamUser_SteamUser018.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser018.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_136/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser018.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_136.h"
+#define SDKVER_136
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser018.h"
 HSteamUser cppISteamUser_SteamUser018_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser018.h b/lsteamclient/cppISteamUser_SteamUser018.h
index 1d7e140c..fa3f3bfb 100644
--- a/lsteamclient/cppISteamUser_SteamUser018.h
+++ b/lsteamclient/cppISteamUser_SteamUser018.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser018_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser018_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser018_GetSteamID(void *);
@@ -26,6 +23,3 @@ extern bool cppISteamUser_SteamUser018_GetEncryptedAppTicket(void *, void *, int
 extern int cppISteamUser_SteamUser018_GetGameBadgeLevel(void *, int, bool);
 extern int cppISteamUser_SteamUser018_GetPlayerSteamLevel(void *);
 extern SteamAPICall_t cppISteamUser_SteamUser018_RequestStoreAuthURL(void *, const char *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser019.cpp b/lsteamclient/cppISteamUser_SteamUser019.cpp
index f4184238..fee45fdb 100644
--- a/lsteamclient/cppISteamUser_SteamUser019.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser019.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_142/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser019.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_142.h"
+#define SDKVER_142
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser019.h"
 HSteamUser cppISteamUser_SteamUser019_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser019.h b/lsteamclient/cppISteamUser_SteamUser019.h
index 112d56c3..73377e75 100644
--- a/lsteamclient/cppISteamUser_SteamUser019.h
+++ b/lsteamclient/cppISteamUser_SteamUser019.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser019_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser019_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser019_GetSteamID(void *);
@@ -30,6 +27,3 @@ extern bool cppISteamUser_SteamUser019_BIsPhoneVerified(void *);
 extern bool cppISteamUser_SteamUser019_BIsTwoFactorEnabled(void *);
 extern bool cppISteamUser_SteamUser019_BIsPhoneIdentifying(void *);
 extern bool cppISteamUser_SteamUser019_BIsPhoneRequiringVerification(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUser_SteamUser020.cpp b/lsteamclient/cppISteamUser_SteamUser020.cpp
index f44831cd..9429b7a5 100644
--- a/lsteamclient/cppISteamUser_SteamUser020.cpp
+++ b/lsteamclient/cppISteamUser_SteamUser020.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUser_SteamUser020.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamUser_SteamUser020.h"
 HSteamUser cppISteamUser_SteamUser020_GetHSteamUser(void *linux_side)
 {
     return ((ISteamUser*)linux_side)->GetHSteamUser();
diff --git a/lsteamclient/cppISteamUser_SteamUser020.h b/lsteamclient/cppISteamUser_SteamUser020.h
index 1894592f..0488748b 100644
--- a/lsteamclient/cppISteamUser_SteamUser020.h
+++ b/lsteamclient/cppISteamUser_SteamUser020.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern HSteamUser cppISteamUser_SteamUser020_GetHSteamUser(void *);
 extern bool cppISteamUser_SteamUser020_BLoggedOn(void *);
 extern CSteamID cppISteamUser_SteamUser020_GetSteamID(void *);
@@ -31,6 +28,3 @@ extern bool cppISteamUser_SteamUser020_BIsTwoFactorEnabled(void *);
 extern bool cppISteamUser_SteamUser020_BIsPhoneIdentifying(void *);
 extern bool cppISteamUser_SteamUser020_BIsPhoneRequiringVerification(void *);
 extern SteamAPICall_t cppISteamUser_SteamUser020_GetMarketEligibility(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUtils_SteamUtils002.cpp b/lsteamclient/cppISteamUtils_SteamUtils002.cpp
index 526501c8..59774108 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils002.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_103/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUtils_SteamUtils002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_103.h"
+#define SDKVER_103
+#include "struct_converters.h"
+#include "cppISteamUtils_SteamUtils002.h"
 uint32 cppISteamUtils_SteamUtils002_GetSecondsSinceAppActive(void *linux_side)
 {
     return ((ISteamUtils*)linux_side)->GetSecondsSinceAppActive();
diff --git a/lsteamclient/cppISteamUtils_SteamUtils002.h b/lsteamclient/cppISteamUtils_SteamUtils002.h
index 9f603a49..41a839d6 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils002.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils002.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamUtils_SteamUtils002_GetSecondsSinceAppActive(void *);
 extern uint32 cppISteamUtils_SteamUtils002_GetSecondsSinceComputerActive(void *);
 extern EUniverse cppISteamUtils_SteamUtils002_GetConnectedUniverse(void *);
@@ -15,6 +12,3 @@ extern void cppISteamUtils_SteamUtils002_SetOverlayNotificationPosition(void *,
 extern bool cppISteamUtils_SteamUtils002_IsAPICallCompleted(void *, SteamAPICall_t, bool *);
 extern ESteamAPICallFailure cppISteamUtils_SteamUtils002_GetAPICallFailureReason(void *, SteamAPICall_t);
 extern bool cppISteamUtils_SteamUtils002_GetAPICallResult(void *, SteamAPICall_t, void *, int, int, bool *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUtils_SteamUtils004.cpp b/lsteamclient/cppISteamUtils_SteamUtils004.cpp
index b5871fc1..36cdbdc4 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils004.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils004.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_106/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUtils_SteamUtils004.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_106.h"
+#define SDKVER_106
+#include "struct_converters.h"
+#include "cppISteamUtils_SteamUtils004.h"
 uint32 cppISteamUtils_SteamUtils004_GetSecondsSinceAppActive(void *linux_side)
 {
     return ((ISteamUtils*)linux_side)->GetSecondsSinceAppActive();
diff --git a/lsteamclient/cppISteamUtils_SteamUtils004.h b/lsteamclient/cppISteamUtils_SteamUtils004.h
index a7f6c6d1..95a912ae 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils004.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils004.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamUtils_SteamUtils004_GetSecondsSinceAppActive(void *);
 extern uint32 cppISteamUtils_SteamUtils004_GetSecondsSinceComputerActive(void *);
 extern EUniverse cppISteamUtils_SteamUtils004_GetConnectedUniverse(void *);
@@ -19,6 +16,3 @@ extern void cppISteamUtils_SteamUtils004_RunFrame(void *);
 extern uint32 cppISteamUtils_SteamUtils004_GetIPCCallCount(void *);
 extern void cppISteamUtils_SteamUtils004_SetWarningMessageHook(void *, SteamAPIWarningMessageHook_t);
 extern bool cppISteamUtils_SteamUtils004_IsOverlayEnabled(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUtils_SteamUtils005.cpp b/lsteamclient/cppISteamUtils_SteamUtils005.cpp
index a8337b9c..9e1df8bd 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils005.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils005.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_123a/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUtils_SteamUtils005.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_123a.h"
+#define SDKVER_123a
+#include "struct_converters.h"
+#include "cppISteamUtils_SteamUtils005.h"
 uint32 cppISteamUtils_SteamUtils005_GetSecondsSinceAppActive(void *linux_side)
 {
     return ((ISteamUtils*)linux_side)->GetSecondsSinceAppActive();
diff --git a/lsteamclient/cppISteamUtils_SteamUtils005.h b/lsteamclient/cppISteamUtils_SteamUtils005.h
index cba80609..2c0ac247 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils005.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils005.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamUtils_SteamUtils005_GetSecondsSinceAppActive(void *);
 extern uint32 cppISteamUtils_SteamUtils005_GetSecondsSinceComputerActive(void *);
 extern EUniverse cppISteamUtils_SteamUtils005_GetConnectedUniverse(void *);
@@ -24,6 +21,3 @@ extern SteamAPICall_t cppISteamUtils_SteamUtils005_CheckFileSignature(void *, co
 extern bool cppISteamUtils_SteamUtils005_ShowGamepadTextInput(void *, EGamepadTextInputMode, EGamepadTextInputLineMode, const char *, uint32);
 extern uint32 cppISteamUtils_SteamUtils005_GetEnteredGamepadTextLength(void *);
 extern bool cppISteamUtils_SteamUtils005_GetEnteredGamepadTextInput(void *, char *, uint32);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUtils_SteamUtils006.cpp b/lsteamclient/cppISteamUtils_SteamUtils006.cpp
index 69e4c097..561d1faf 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils006.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils006.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_128/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUtils_SteamUtils006.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_128.h"
+#define SDKVER_128
+#include "struct_converters.h"
+#include "cppISteamUtils_SteamUtils006.h"
 uint32 cppISteamUtils_SteamUtils006_GetSecondsSinceAppActive(void *linux_side)
 {
     return ((ISteamUtils*)linux_side)->GetSecondsSinceAppActive();
diff --git a/lsteamclient/cppISteamUtils_SteamUtils006.h b/lsteamclient/cppISteamUtils_SteamUtils006.h
index 3084c55a..a67eafa5 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils006.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils006.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamUtils_SteamUtils006_GetSecondsSinceAppActive(void *);
 extern uint32 cppISteamUtils_SteamUtils006_GetSecondsSinceComputerActive(void *);
 extern EUniverse cppISteamUtils_SteamUtils006_GetConnectedUniverse(void *);
@@ -26,6 +23,3 @@ extern uint32 cppISteamUtils_SteamUtils006_GetEnteredGamepadTextLength(void *);
 extern bool cppISteamUtils_SteamUtils006_GetEnteredGamepadTextInput(void *, char *, uint32);
 extern const char * cppISteamUtils_SteamUtils006_GetSteamUILanguage(void *);
 extern bool cppISteamUtils_SteamUtils006_IsSteamRunningInVR(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUtils_SteamUtils007.cpp b/lsteamclient/cppISteamUtils_SteamUtils007.cpp
index 80206e31..1fee1b76 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils007.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils007.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_136/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUtils_SteamUtils007.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_136.h"
+#define SDKVER_136
+#include "struct_converters.h"
+#include "cppISteamUtils_SteamUtils007.h"
 uint32 cppISteamUtils_SteamUtils007_GetSecondsSinceAppActive(void *linux_side)
 {
     return ((ISteamUtils*)linux_side)->GetSecondsSinceAppActive();
diff --git a/lsteamclient/cppISteamUtils_SteamUtils007.h b/lsteamclient/cppISteamUtils_SteamUtils007.h
index b2964623..06748776 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils007.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils007.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamUtils_SteamUtils007_GetSecondsSinceAppActive(void *);
 extern uint32 cppISteamUtils_SteamUtils007_GetSecondsSinceComputerActive(void *);
 extern EUniverse cppISteamUtils_SteamUtils007_GetConnectedUniverse(void *);
@@ -27,6 +24,3 @@ extern bool cppISteamUtils_SteamUtils007_GetEnteredGamepadTextInput(void *, char
 extern const char * cppISteamUtils_SteamUtils007_GetSteamUILanguage(void *);
 extern bool cppISteamUtils_SteamUtils007_IsSteamRunningInVR(void *);
 extern void cppISteamUtils_SteamUtils007_SetOverlayNotificationInset(void *, int, int);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUtils_SteamUtils008.cpp b/lsteamclient/cppISteamUtils_SteamUtils008.cpp
index 9b59cc4c..ca5ee889 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils008.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils008.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_139/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUtils_SteamUtils008.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_139.h"
+#define SDKVER_139
+#include "struct_converters.h"
+#include "cppISteamUtils_SteamUtils008.h"
 uint32 cppISteamUtils_SteamUtils008_GetSecondsSinceAppActive(void *linux_side)
 {
     return ((ISteamUtils*)linux_side)->GetSecondsSinceAppActive();
diff --git a/lsteamclient/cppISteamUtils_SteamUtils008.h b/lsteamclient/cppISteamUtils_SteamUtils008.h
index 017b1b48..a62ad09c 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils008.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils008.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamUtils_SteamUtils008_GetSecondsSinceAppActive(void *);
 extern uint32 cppISteamUtils_SteamUtils008_GetSecondsSinceComputerActive(void *);
 extern EUniverse cppISteamUtils_SteamUtils008_GetConnectedUniverse(void *);
@@ -29,6 +26,3 @@ extern bool cppISteamUtils_SteamUtils008_IsSteamRunningInVR(void *);
 extern void cppISteamUtils_SteamUtils008_SetOverlayNotificationInset(void *, int, int);
 extern bool cppISteamUtils_SteamUtils008_IsSteamInBigPictureMode(void *);
 extern void cppISteamUtils_SteamUtils008_StartVRDashboard(void *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamUtils_SteamUtils009.cpp b/lsteamclient/cppISteamUtils_SteamUtils009.cpp
index f16b2555..4bf3eb93 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils009.cpp
+++ b/lsteamclient/cppISteamUtils_SteamUtils009.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamUtils_SteamUtils009.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamUtils_SteamUtils009.h"
 uint32 cppISteamUtils_SteamUtils009_GetSecondsSinceAppActive(void *linux_side)
 {
     return ((ISteamUtils*)linux_side)->GetSecondsSinceAppActive();
diff --git a/lsteamclient/cppISteamUtils_SteamUtils009.h b/lsteamclient/cppISteamUtils_SteamUtils009.h
index 34a66c34..0458f77c 100644
--- a/lsteamclient/cppISteamUtils_SteamUtils009.h
+++ b/lsteamclient/cppISteamUtils_SteamUtils009.h
@@ -1,6 +1,3 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern uint32 cppISteamUtils_SteamUtils009_GetSecondsSinceAppActive(void *);
 extern uint32 cppISteamUtils_SteamUtils009_GetSecondsSinceComputerActive(void *);
 extern EUniverse cppISteamUtils_SteamUtils009_GetConnectedUniverse(void *);
@@ -31,6 +28,3 @@ extern bool cppISteamUtils_SteamUtils009_IsSteamInBigPictureMode(void *);
 extern void cppISteamUtils_SteamUtils009_StartVRDashboard(void *);
 extern bool cppISteamUtils_SteamUtils009_IsVRHeadsetStreamingEnabled(void *);
 extern void cppISteamUtils_SteamUtils009_SetVRHeadsetStreamingEnabled(void *, bool);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V001.cpp b/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V001.cpp
index 5ef4c868..069ab20a 100644
--- a/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V001.cpp
+++ b/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V001.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_139/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamVideo_STEAMVIDEO_INTERFACE_V001.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_139.h"
+#define SDKVER_139
+#include "struct_converters.h"
+#include "cppISteamVideo_STEAMVIDEO_INTERFACE_V001.h"
 void cppISteamVideo_STEAMVIDEO_INTERFACE_V001_GetVideoURL(void *linux_side, AppId_t unVideoAppID)
 {
     ((ISteamVideo*)linux_side)->GetVideoURL((AppId_t)unVideoAppID);
diff --git a/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V001.h b/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V001.h
index eb8ed0c7..1a49fa67 100644
--- a/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V001.h
+++ b/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V001.h
@@ -1,8 +1,2 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamVideo_STEAMVIDEO_INTERFACE_V001_GetVideoURL(void *, AppId_t);
 extern bool cppISteamVideo_STEAMVIDEO_INTERFACE_V001_IsBroadcasting(void *, int *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V002.cpp b/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V002.cpp
index 0779cca9..4fef83f2 100644
--- a/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V002.cpp
+++ b/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V002.cpp
@@ -1,11 +1,12 @@
 #include "steam_defs.h"
 #include "steamworks_sdk_143/steam_api.h"
 #include "steamclient_private.h"
-#include "cppISteamVideo_STEAMVIDEO_INTERFACE_V002.h"
 #ifdef __cplusplus
 extern "C" {
 #endif
-#include "struct_converters_143.h"
+#define SDKVER_143
+#include "struct_converters.h"
+#include "cppISteamVideo_STEAMVIDEO_INTERFACE_V002.h"
 void cppISteamVideo_STEAMVIDEO_INTERFACE_V002_GetVideoURL(void *linux_side, AppId_t unVideoAppID)
 {
     ((ISteamVideo*)linux_side)->GetVideoURL((AppId_t)unVideoAppID);
diff --git a/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V002.h b/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V002.h
index 755175b5..bae688fd 100644
--- a/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V002.h
+++ b/lsteamclient/cppISteamVideo_STEAMVIDEO_INTERFACE_V002.h
@@ -1,10 +1,4 @@
-#ifdef __cplusplus
-extern "C" {
-#endif
 extern void cppISteamVideo_STEAMVIDEO_INTERFACE_V002_GetVideoURL(void *, AppId_t);
 extern bool cppISteamVideo_STEAMVIDEO_INTERFACE_V002_IsBroadcasting(void *, int *);
 extern void cppISteamVideo_STEAMVIDEO_INTERFACE_V002_GetOPFSettings(void *, AppId_t);
 extern bool cppISteamVideo_STEAMVIDEO_INTERFACE_V002_GetOPFStringForApp(void *, AppId_t, char *, int32 *);
-#ifdef __cplusplus
-}
-#endif
diff --git a/lsteamclient/gen_wrapper.py b/lsteamclient/gen_wrapper.py
index 379e9a71..166ec83b 100755
--- a/lsteamclient/gen_wrapper.py
+++ b/lsteamclient/gen_wrapper.py
@@ -455,24 +455,26 @@ def handle_method(cfile, classname, winclassname, cppname, method, cpp, cpp_h, e
             else:
                 typename = param.type.spelling.split("::")[-1];
 
-            #assume pointers are out-params and structs are in-params
             real_type = param.type;
             while real_type.kind == clang.cindex.TypeKind.POINTER:
                 real_type = real_type.get_pointee()
+            win_name = typename
             if real_type.kind == clang.cindex.TypeKind.RECORD and \
                     not real_type.spelling in wrapped_classes and \
                     struct_needs_conversion(real_type):
                 need_convert.append(param)
+                #preserve pointers
+                win_name = typename.replace(real_type.spelling, "win%s_%s" % (real_type.spelling, sdkver))
 
             if param.spelling == "":
-                cfile.write(", %s _%s" % (typename, unnamed))
-                cpp.write(", %s _%s" % (typename, unnamed))
-                cpp_h.write(", %s" % typename)
+                cfile.write(", %s _%s" % (win_name, unnamed))
+                cpp.write(", %s _%s" % (win_name, unnamed))
+                cpp_h.write(", %s" % win_name)
                 unnamed = chr(ord(unnamed) + 1)
             else:
-                cfile.write(", %s %s" % (typename, param.spelling))
-                cpp.write(", %s %s" % (typename, param.spelling))
-                cpp_h.write(", %s" % (typename))
+                cfile.write(", %s %s" % (win_name, param.spelling))
+                cpp.write(", %s %s" % (win_name, param.spelling))
+                cpp_h.write(", %s" % (win_name))
     cfile.write(")\n{\n")
     cpp.write(")\n{\n")
     cpp_h.write(");\n")
@@ -637,6 +639,8 @@ def handle_class(sdkver, classnode):
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 """)
@@ -647,12 +651,12 @@ WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
     if not fname == "steam_api.h":
         cpp.write("#include \"steamworks_sdk_%s/%s\"\n" % (sdkver, fname))
     cpp.write("#include \"steamclient_private.h\"\n")
-    cpp.write("#include \"%s.h\"\n" % cppname)
     cpp.write("#ifdef __cplusplus\nextern \"C\" {\n#endif\n")
-    cpp.write("#include \"struct_converters_%s.h\"\n" % sdkver)
+    cpp.write("#define SDKVER_%s\n" % sdkver)
+    cpp.write("#include \"struct_converters.h\"\n")
+    cpp.write("#include \"%s.h\"\n" % cppname)
 
     cpp_h = open("%s.h" % cppname, "w")
-    cpp_h.write("#ifdef __cplusplus\nextern \"C\" {\n#endif\n")
 
     winclassname = "win%s_%s" % (classnode.spelling, iface_version)
     cfile.write("#include \"%s.h\"\n\n" % cppname)
@@ -686,7 +690,6 @@ WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
     cfile.write("    return r;\n}\n\n")
 
     cpp.write("#ifdef __cplusplus\n}\n#endif\n")
-    cpp_h.write("#ifdef __cplusplus\n}\n#endif\n")
 
     constructors = open("win_constructors.h", "a")
     constructors.write("extern void *create_%s(void *);\n" % winclassname)
@@ -722,9 +725,23 @@ def handle_struct(sdkver, struct):
     w2l_handler_name = None
     l2w_handler_name = None
 
+    def dump_win_struct(to_file):
+        to_file.write("#pragma pack( push, 8 )\n")
+        to_file.write("struct win%s {\n" % struct_name)
+        for m in struct.get_children():
+            if m.kind == clang.cindex.CursorKind.FIELD_DECL:
+                if m.type.kind == clang.cindex.TypeKind.CONSTANTARRAY:
+                    to_file.write("    %s %s[%u];\n" % (m.type.element_type.spelling, m.displayname, m.type.element_count))
+                elif m.type.kind == clang.cindex.TypeKind.RECORD and \
+                        struct_needs_conversion(m.type):
+                    to_file.write("    win%s_%s %s;\n" % (m.type.spelling, sdkver, m.displayname))
+                else:
+                    to_file.write("    %s %s;\n" % (m.type.spelling, m.displayname))
+        to_file.write("}  __attribute__ ((ms_struct));\n")
+        to_file.write("#pragma pack( pop )\n")
+
     if cb_num is None:
-        #open here so the .h is always created
-        hfile = open("struct_converters_%s.h" % sdkver, "a")
+        hfile = open("struct_converters.h", "a")
 
         if not has_fields:
             return
@@ -737,8 +754,14 @@ def handle_struct(sdkver, struct):
         w2l_handler_name = "win_to_lin_struct_%s" % struct_name;
         l2w_handler_name = "lin_to_win_struct_%s" % struct_name;
 
-        hfile.write("extern void %s(const void *w, void *l);\n" % w2l_handler_name)
-        hfile.write("extern void %s(const void *l, void *w);\n\n" % l2w_handler_name)
+        hfile.write("#if defined(SDKVER_%s) || !defined(__cplusplus)\n" % sdkver)
+        dump_win_struct(hfile)
+        hfile.write("typedef struct win%s win%s;\n" % (struct_name, struct_name))
+        hfile.write("struct %s;\n" % struct.displayname);
+
+        hfile.write("extern void %s(const struct win%s *w, struct %s *l);\n" % (w2l_handler_name, struct_name, struct.displayname))
+        hfile.write("extern void %s(const struct %s *l, struct win%s *w);\n" % (l2w_handler_name, struct.displayname, struct_name))
+        hfile.write("#endif\n\n")
 
     else:
         #for callbacks, we use the windows struct size in the cb dispatch switch
@@ -759,7 +782,7 @@ def handle_struct(sdkver, struct):
         generated_cb_ids.append(cb_id)
 
         datfile = open("cb_converters.dat", "a")
-        datfile.write("case 0x%08x: win_msg->m_cubParam = %s; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); %s(lin_msg.m_pubParam, win_msg->m_pubParam); break;\n" % (cb_id, windows_struct.get_size(), l2w_handler_name))
+        datfile.write("case 0x%08x: win_msg->m_cubParam = %s; win_msg->m_pubParam = HeapAlloc(GetProcessHeap(), 0, win_msg->m_cubParam); %s((void*)lin_msg.m_pubParam, (void*)win_msg->m_pubParam); break;\n" % (cb_id, windows_struct.get_size(), l2w_handler_name))
 
         generated_cb_handlers.append(l2w_handler_name)
 
@@ -769,11 +792,11 @@ def handle_struct(sdkver, struct):
         cb_table[cb_num][1].append((windows_struct.get_size(), struct_name))
 
         hfile = open("cb_converters.h", "a")
-        hfile.write("extern void %s(void *l, void *w);\n\n" % l2w_handler_name)
+        hfile.write("struct %s;\n" % struct.displayname)
+        hfile.write("struct win%s;\n" % struct_name)
+        hfile.write("extern void %s(const struct %s *l, struct win%s *w);\n\n" % (l2w_handler_name, struct.displayname, struct_name))
 
-
-    filename_base = "struct_converters_%s" % sdkver
-    cppname = "%s.cpp" % filename_base
+    cppname = "struct_converters_%s.cpp" % sdkver
     file_exists = os.path.isfile(cppname)
     cppfile = open(cppname, "a")
     if not file_exists:
@@ -786,22 +809,10 @@ def handle_struct(sdkver, struct):
             cppfile.write("#include \"steamworks_sdk_%s/isteamgamecoordinator.h\"\n" % sdkver)
         cppfile.write("#include \"steamclient_private.h\"\n")
         cppfile.write("extern \"C\" {\n")
+        cppfile.write("#define SDKVER_%s\n" % sdkver)
+        cppfile.write("#include \"struct_converters.h\"\n")
         cpp_files_need_close_brace.append(cppname)
 
-    cppfile.write("#pragma pack( push, 8 )\n")
-    cppfile.write("struct win%s {\n" % struct_name)
-    for m in struct.get_children():
-        if m.kind == clang.cindex.CursorKind.FIELD_DECL:
-            if m.type.kind == clang.cindex.TypeKind.CONSTANTARRAY:
-                cppfile.write("    %s %s[%u];\n" % (m.type.element_type.spelling, m.displayname, m.type.element_count))
-            elif m.type.kind == clang.cindex.TypeKind.RECORD and \
-                    struct_needs_conversion(m.type):
-                cppfile.write("    win%s_%s %s;\n" % (m.type.spelling, sdkver, m.displayname))
-            else:
-                cppfile.write("    %s %s;\n" % (m.type.spelling, m.displayname))
-    cppfile.write("}  __attribute__ ((ms_struct));\n")
-    cppfile.write("#pragma pack( pop )\n")
-
     path_conv = get_path_converter(struct.type)
 
     def handle_field(m, src, dst):
@@ -819,18 +830,17 @@ def handle_struct(sdkver, struct):
             else:
                 cppfile.write("    %s->%s = %s->%s;\n" % (dst, m.displayname, src, m.displayname))
 
+    if not cb_num is None:
+        dump_win_struct(cppfile)
+
     if w2l_handler_name:
-        cppfile.write("void %s(const void *w, void *l)\n{\n" % w2l_handler_name)
-        cppfile.write("    %s *lin = (%s *)l;\n" % (struct.displayname, struct.displayname))
-        cppfile.write("    struct win%s *win = (struct win%s *)w;\n" % (struct_name, struct_name))
+        cppfile.write("void %s(const struct win%s *win, struct %s *lin)\n{\n" % (w2l_handler_name, struct_name, struct.displayname))
         for m in struct.get_children():
             handle_field(m, "win", "lin")
         cppfile.write("}\n\n")
 
     if l2w_handler_name:
-        cppfile.write("void %s(const void *l, void *w)\n{\n" % l2w_handler_name)
-        cppfile.write("    %s *lin = (%s *)l;\n" % (struct.displayname, struct.displayname))
-        cppfile.write("    struct win%s *win = (struct win%s *)w;\n" % (struct_name, struct_name))
+        cppfile.write("void %s(const struct %s *lin, struct win%s *win)\n{\n" % (l2w_handler_name, struct.displayname, struct_name))
         for m in struct.get_children():
             handle_field(m, "lin", "win")
         cppfile.write("}\n\n")
diff --git a/lsteamclient/steam_defs.h b/lsteamclient/steam_defs.h
index 9b8fdac7..1d3cf1d7 100644
--- a/lsteamclient/steam_defs.h
+++ b/lsteamclient/steam_defs.h
@@ -70,7 +70,8 @@ typedef uint32_t EUserUGCList,
         ELogonState,
         EXboxOrigin,
         EInputSourceMode,
-        EActivateGameOverlayToWebPageMode
+        EActivateGameOverlayToWebPageMode,
+        ESteamPartyBeaconLocationType
 ;
 
 /* these are PODs, so just copy the data. hopefully the
@@ -140,6 +141,7 @@ typedef struct LeaderboardEntry_t LeaderboardEntry_t;
 typedef struct SteamUGCDetails_t SteamUGCDetails_t;
 typedef struct gameserveritem_t gameserveritem_t;
 typedef struct MatchMakingKeyValuePair_t MatchMakingKeyValuePair_t;
+typedef struct SteamPartyBeaconLocation_t SteamPartyBeaconLocation_t;
 
 /* FIXME: we don't care about fn pointer types, just pass 'em through */
 typedef void *SteamAPI_CheckCallbackRegistered_t;
@@ -202,6 +204,7 @@ typedef uint32 HHTMLBrowser;
 typedef int32 SteamInventoryResult_t, SteamItemDef_t;
 typedef uint64 SteamItemInstanceID_t;
 typedef uint64 SteamInventoryUpdateHandle_t;
+typedef uint64 PartyBeaconID_t;
 
 #pragma pack( push, 4 )
 typedef struct CallbackMsg_t
diff --git a/lsteamclient/struct_converters.h b/lsteamclient/struct_converters.h
new file mode 100644
index 00000000..870a6364
--- /dev/null
+++ b/lsteamclient/struct_converters.h
@@ -0,0 +1,1944 @@
+#if defined(SDKVER_143) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamPartyBeaconLocation_t_143 {
+    ESteamPartyBeaconLocationType m_eType;
+    uint64 m_ulLocationID;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamPartyBeaconLocation_t_143 winSteamPartyBeaconLocation_t_143;
+struct SteamPartyBeaconLocation_t;
+extern void win_to_lin_struct_SteamPartyBeaconLocation_t_143(const struct winSteamPartyBeaconLocation_t_143 *w, struct SteamPartyBeaconLocation_t *l);
+extern void lin_to_win_struct_SteamPartyBeaconLocation_t_143(const struct SteamPartyBeaconLocation_t *l, struct winSteamPartyBeaconLocation_t_143 *w);
+#endif
+
+#if defined(SDKVER_143) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_143 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_143 winLeaderboardEntry_t_143;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_143(const struct winLeaderboardEntry_t_143 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_143(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_143 *w);
+#endif
+
+#if defined(SDKVER_143) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_143 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_143 winSteamUGCDetails_t_143;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_143(const struct winSteamUGCDetails_t_143 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_143(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_143 *w);
+#endif
+
+#if defined(SDKVER_142) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_142 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_142 winLeaderboardEntry_t_142;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_142(const struct winLeaderboardEntry_t_142 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_142(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_142 *w);
+#endif
+
+#if defined(SDKVER_142) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_142 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_142 winSteamUGCDetails_t_142;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_142(const struct winSteamUGCDetails_t_142 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_142(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_142 *w);
+#endif
+
+#if defined(SDKVER_141) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_141 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_141 winLeaderboardEntry_t_141;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_141(const struct winLeaderboardEntry_t_141 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_141(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_141 *w);
+#endif
+
+#if defined(SDKVER_141) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_141 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_141 winSteamUGCDetails_t_141;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_141(const struct winSteamUGCDetails_t_141 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_141(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_141 *w);
+#endif
+
+#if defined(SDKVER_140) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_140 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_140 winLeaderboardEntry_t_140;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_140(const struct winLeaderboardEntry_t_140 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_140(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_140 *w);
+#endif
+
+#if defined(SDKVER_140) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_140 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_140 winSteamUGCDetails_t_140;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_140(const struct winSteamUGCDetails_t_140 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_140(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_140 *w);
+#endif
+
+#if defined(SDKVER_139) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_139 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_139 winLeaderboardEntry_t_139;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_139(const struct winLeaderboardEntry_t_139 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_139(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_139 *w);
+#endif
+
+#if defined(SDKVER_139) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_139 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_139 winSteamUGCDetails_t_139;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_139(const struct winSteamUGCDetails_t_139 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_139(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_139 *w);
+#endif
+
+#if defined(SDKVER_138a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_138a {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_138a winLeaderboardEntry_t_138a;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_138a(const struct winLeaderboardEntry_t_138a *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_138a(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_138a *w);
+#endif
+
+#if defined(SDKVER_138a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_138a {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_138a winSteamUGCDetails_t_138a;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_138a(const struct winSteamUGCDetails_t_138a *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_138a(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_138a *w);
+#endif
+
+#if defined(SDKVER_138) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_138 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_138 winLeaderboardEntry_t_138;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_138(const struct winLeaderboardEntry_t_138 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_138(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_138 *w);
+#endif
+
+#if defined(SDKVER_138) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_138 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_138 winSteamUGCDetails_t_138;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_138(const struct winSteamUGCDetails_t_138 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_138(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_138 *w);
+#endif
+
+#if defined(SDKVER_137) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_137 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_137 winLeaderboardEntry_t_137;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_137(const struct winLeaderboardEntry_t_137 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_137(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_137 *w);
+#endif
+
+#if defined(SDKVER_137) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_137 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_137 winSteamUGCDetails_t_137;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_137(const struct winSteamUGCDetails_t_137 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_137(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_137 *w);
+#endif
+
+#if defined(SDKVER_136) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_136 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_136 winLeaderboardEntry_t_136;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_136(const struct winLeaderboardEntry_t_136 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_136(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_136 *w);
+#endif
+
+#if defined(SDKVER_136) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_136 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_136 winSteamUGCDetails_t_136;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_136(const struct winSteamUGCDetails_t_136 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_136(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_136 *w);
+#endif
+
+#if defined(SDKVER_135a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_135a {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_135a winLeaderboardEntry_t_135a;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_135a(const struct winLeaderboardEntry_t_135a *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_135a(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_135a *w);
+#endif
+
+#if defined(SDKVER_135a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_135a {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_135a winSteamUGCDetails_t_135a;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_135a(const struct winSteamUGCDetails_t_135a *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_135a(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_135a *w);
+#endif
+
+#if defined(SDKVER_135) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_135 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_135 winLeaderboardEntry_t_135;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_135(const struct winLeaderboardEntry_t_135 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_135(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_135 *w);
+#endif
+
+#if defined(SDKVER_135) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_135 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_135 winSteamUGCDetails_t_135;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_135(const struct winSteamUGCDetails_t_135 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_135(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_135 *w);
+#endif
+
+#if defined(SDKVER_134) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_134 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_134 winLeaderboardEntry_t_134;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_134(const struct winLeaderboardEntry_t_134 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_134(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_134 *w);
+#endif
+
+#if defined(SDKVER_134) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_134 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_134 winSteamUGCDetails_t_134;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_134(const struct winSteamUGCDetails_t_134 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_134(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_134 *w);
+#endif
+
+#if defined(SDKVER_133x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_133x {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_133x winLeaderboardEntry_t_133x;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_133x(const struct winLeaderboardEntry_t_133x *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_133x(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_133x *w);
+#endif
+
+#if defined(SDKVER_133x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_133x {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_133x winSteamUGCDetails_t_133x;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_133x(const struct winSteamUGCDetails_t_133x *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_133x(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_133x *w);
+#endif
+
+#if defined(SDKVER_133b) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_133b {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_133b winLeaderboardEntry_t_133b;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_133b(const struct winLeaderboardEntry_t_133b *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_133b(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_133b *w);
+#endif
+
+#if defined(SDKVER_133b) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_133b {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_133b winSteamUGCDetails_t_133b;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_133b(const struct winSteamUGCDetails_t_133b *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_133b(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_133b *w);
+#endif
+
+#if defined(SDKVER_133a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_133a {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_133a winLeaderboardEntry_t_133a;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_133a(const struct winLeaderboardEntry_t_133a *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_133a(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_133a *w);
+#endif
+
+#if defined(SDKVER_133a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_133a {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_133a winSteamUGCDetails_t_133a;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_133a(const struct winSteamUGCDetails_t_133a *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_133a(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_133a *w);
+#endif
+
+#if defined(SDKVER_133) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_133 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_133 winLeaderboardEntry_t_133;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_133(const struct winLeaderboardEntry_t_133 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_133(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_133 *w);
+#endif
+
+#if defined(SDKVER_133) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_133 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_133 winSteamUGCDetails_t_133;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_133(const struct winSteamUGCDetails_t_133 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_133(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_133 *w);
+#endif
+
+#if defined(SDKVER_132x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_132x {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_132x winLeaderboardEntry_t_132x;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_132x(const struct winLeaderboardEntry_t_132x *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_132x(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_132x *w);
+#endif
+
+#if defined(SDKVER_132x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_132x {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_132x winSteamUGCDetails_t_132x;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_132x(const struct winSteamUGCDetails_t_132x *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_132x(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_132x *w);
+#endif
+
+#if defined(SDKVER_132) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_132 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_132 winLeaderboardEntry_t_132;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_132(const struct winLeaderboardEntry_t_132 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_132(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_132 *w);
+#endif
+
+#if defined(SDKVER_132) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_132 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_132 winSteamUGCDetails_t_132;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_132(const struct winSteamUGCDetails_t_132 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_132(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_132 *w);
+#endif
+
+#if defined(SDKVER_131) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_131 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_131 winLeaderboardEntry_t_131;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_131(const struct winLeaderboardEntry_t_131 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_131(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_131 *w);
+#endif
+
+#if defined(SDKVER_131) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_131 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_131 winSteamUGCDetails_t_131;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_131(const struct winSteamUGCDetails_t_131 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_131(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_131 *w);
+#endif
+
+#if defined(SDKVER_130x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_130x {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_130x winLeaderboardEntry_t_130x;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_130x(const struct winLeaderboardEntry_t_130x *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_130x(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_130x *w);
+#endif
+
+#if defined(SDKVER_130x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_130x {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_130x winSteamUGCDetails_t_130x;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_130x(const struct winSteamUGCDetails_t_130x *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_130x(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_130x *w);
+#endif
+
+#if defined(SDKVER_130) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_130 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_130 winLeaderboardEntry_t_130;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_130(const struct winLeaderboardEntry_t_130 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_130(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_130 *w);
+#endif
+
+#if defined(SDKVER_130) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_130 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_130 winSteamUGCDetails_t_130;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_130(const struct winSteamUGCDetails_t_130 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_130(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_130 *w);
+#endif
+
+#if defined(SDKVER_129a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_129a {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_129a winLeaderboardEntry_t_129a;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_129a(const struct winLeaderboardEntry_t_129a *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_129a(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_129a *w);
+#endif
+
+#if defined(SDKVER_129a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_129a {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_129a winSteamUGCDetails_t_129a;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_129a(const struct winSteamUGCDetails_t_129a *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_129a(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_129a *w);
+#endif
+
+#if defined(SDKVER_129) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_129 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_129 winLeaderboardEntry_t_129;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_129(const struct winLeaderboardEntry_t_129 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_129(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_129 *w);
+#endif
+
+#if defined(SDKVER_129) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_129 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_129 winSteamUGCDetails_t_129;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_129(const struct winSteamUGCDetails_t_129 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_129(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_129 *w);
+#endif
+
+#if defined(SDKVER_128x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_128x {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_128x winLeaderboardEntry_t_128x;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_128x(const struct winLeaderboardEntry_t_128x *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_128x(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_128x *w);
+#endif
+
+#if defined(SDKVER_128x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_128x {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_128x winSteamUGCDetails_t_128x;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_128x(const struct winSteamUGCDetails_t_128x *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_128x(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_128x *w);
+#endif
+
+#if defined(SDKVER_128) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_128 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_128 winLeaderboardEntry_t_128;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_128(const struct winLeaderboardEntry_t_128 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_128(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_128 *w);
+#endif
+
+#if defined(SDKVER_128) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_128 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_128 winSteamUGCDetails_t_128;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_128(const struct winSteamUGCDetails_t_128 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_128(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_128 *w);
+#endif
+
+#if defined(SDKVER_127) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_127 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_127 winLeaderboardEntry_t_127;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_127(const struct winLeaderboardEntry_t_127 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_127(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_127 *w);
+#endif
+
+#if defined(SDKVER_127) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_127 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_127 winSteamUGCDetails_t_127;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_127(const struct winSteamUGCDetails_t_127 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_127(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_127 *w);
+#endif
+
+#if defined(SDKVER_126a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_126a {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_126a winLeaderboardEntry_t_126a;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_126a(const struct winLeaderboardEntry_t_126a *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_126a(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_126a *w);
+#endif
+
+#if defined(SDKVER_126a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_126a {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_126a winSteamUGCDetails_t_126a;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_126a(const struct winSteamUGCDetails_t_126a *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_126a(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_126a *w);
+#endif
+
+#if defined(SDKVER_126) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_126 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_126 winLeaderboardEntry_t_126;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_126(const struct winLeaderboardEntry_t_126 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_126(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_126 *w);
+#endif
+
+#if defined(SDKVER_126) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_126 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_126 winSteamUGCDetails_t_126;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_126(const struct winSteamUGCDetails_t_126 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_126(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_126 *w);
+#endif
+
+#if defined(SDKVER_125) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_125 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_125 winLeaderboardEntry_t_125;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_125(const struct winLeaderboardEntry_t_125 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_125(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_125 *w);
+#endif
+
+#if defined(SDKVER_124) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_124 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_124 winLeaderboardEntry_t_124;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_124(const struct winLeaderboardEntry_t_124 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_124(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_124 *w);
+#endif
+
+#if defined(SDKVER_123a) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_123a {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_123a winLeaderboardEntry_t_123a;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_123a(const struct winLeaderboardEntry_t_123a *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_123a(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_123a *w);
+#endif
+
+#if defined(SDKVER_123) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_123 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_123 winLeaderboardEntry_t_123;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_123(const struct winLeaderboardEntry_t_123 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_123(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_123 *w);
+#endif
+
+#if defined(SDKVER_122) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_122 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_122 winLeaderboardEntry_t_122;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_122(const struct winLeaderboardEntry_t_122 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_122(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_122 *w);
+#endif
+
+#if defined(SDKVER_121x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_121x {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_121x winLeaderboardEntry_t_121x;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_121x(const struct winLeaderboardEntry_t_121x *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_121x(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_121x *w);
+#endif
+
+#if defined(SDKVER_121) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_121 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_121 winLeaderboardEntry_t_121;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_121(const struct winLeaderboardEntry_t_121 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_121(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_121 *w);
+#endif
+
+#if defined(SDKVER_120) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_120 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_120 winLeaderboardEntry_t_120;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_120(const struct winLeaderboardEntry_t_120 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_120(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_120 *w);
+#endif
+
+#if defined(SDKVER_119x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_119x {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_119x winLeaderboardEntry_t_119x;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_119x(const struct winLeaderboardEntry_t_119x *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_119x(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_119x *w);
+#endif
+
+#if defined(SDKVER_119) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_119 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_119 winLeaderboardEntry_t_119;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_119(const struct winLeaderboardEntry_t_119 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_119(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_119 *w);
+#endif
+
+#if defined(SDKVER_118) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_118 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_118 winLeaderboardEntry_t_118;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_118(const struct winLeaderboardEntry_t_118 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_118(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_118 *w);
+#endif
+
+#if defined(SDKVER_117) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_117 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_117 winLeaderboardEntry_t_117;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_117(const struct winLeaderboardEntry_t_117 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_117(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_117 *w);
+#endif
+
+#if defined(SDKVER_116x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_116x {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_116x winLeaderboardEntry_t_116x;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_116x(const struct winLeaderboardEntry_t_116x *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_116x(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_116x *w);
+#endif
+
+#if defined(SDKVER_116) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_116 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_116 winLeaderboardEntry_t_116;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_116(const struct winLeaderboardEntry_t_116 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_116(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_116 *w);
+#endif
+
+#if defined(SDKVER_115) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_115 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_115 winLeaderboardEntry_t_115;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_115(const struct winLeaderboardEntry_t_115 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_115(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_115 *w);
+#endif
+
+#if defined(SDKVER_114) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_114 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_114 winLeaderboardEntry_t_114;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_114(const struct winLeaderboardEntry_t_114 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_114(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_114 *w);
+#endif
+
+#if defined(SDKVER_113) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_113 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_113 winLeaderboardEntry_t_113;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_113(const struct winLeaderboardEntry_t_113 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_113(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_113 *w);
+#endif
+
+#if defined(SDKVER_112x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_112x {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_112x winLeaderboardEntry_t_112x;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_112x(const struct winLeaderboardEntry_t_112x *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_112x(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_112x *w);
+#endif
+
+#if defined(SDKVER_112) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_112 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_112 winLeaderboardEntry_t_112;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_112(const struct winLeaderboardEntry_t_112 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_112(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_112 *w);
+#endif
+
+#if defined(SDKVER_111x) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_111x {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_111x winLeaderboardEntry_t_111x;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_111x(const struct winLeaderboardEntry_t_111x *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_111x(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_111x *w);
+#endif
+
+#if defined(SDKVER_next2) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamPartyBeaconLocation_t_next2 {
+    ESteamPartyBeaconLocationType m_eType;
+    uint64 m_ulLocationID;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamPartyBeaconLocation_t_next2 winSteamPartyBeaconLocation_t_next2;
+struct SteamPartyBeaconLocation_t;
+extern void win_to_lin_struct_SteamPartyBeaconLocation_t_next2(const struct winSteamPartyBeaconLocation_t_next2 *w, struct SteamPartyBeaconLocation_t *l);
+extern void lin_to_win_struct_SteamPartyBeaconLocation_t_next2(const struct SteamPartyBeaconLocation_t *l, struct winSteamPartyBeaconLocation_t_next2 *w);
+#endif
+
+#if defined(SDKVER_next2) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_next2 {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_next2 winLeaderboardEntry_t_next2;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_next2(const struct winLeaderboardEntry_t_next2 *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_next2(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_next2 *w);
+#endif
+
+#if defined(SDKVER_next2) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_next2 {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_next2 winSteamUGCDetails_t_next2;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_next2(const struct winSteamUGCDetails_t_next2 *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_next2(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_next2 *w);
+#endif
+
+#if defined(SDKVER_next) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamPartyBeaconLocation_t_next {
+    ESteamPartyBeaconLocationType m_eType;
+    uint64 m_ulLocationID;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamPartyBeaconLocation_t_next winSteamPartyBeaconLocation_t_next;
+struct SteamPartyBeaconLocation_t;
+extern void win_to_lin_struct_SteamPartyBeaconLocation_t_next(const struct winSteamPartyBeaconLocation_t_next *w, struct SteamPartyBeaconLocation_t *l);
+extern void lin_to_win_struct_SteamPartyBeaconLocation_t_next(const struct SteamPartyBeaconLocation_t *l, struct winSteamPartyBeaconLocation_t_next *w);
+#endif
+
+#if defined(SDKVER_next) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winLeaderboardEntry_t_next {
+    CSteamID m_steamIDUser;
+    int32 m_nGlobalRank;
+    int32 m_nScore;
+    int32 m_cDetails;
+    UGCHandle_t m_hUGC;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winLeaderboardEntry_t_next winLeaderboardEntry_t_next;
+struct LeaderboardEntry_t;
+extern void win_to_lin_struct_LeaderboardEntry_t_next(const struct winLeaderboardEntry_t_next *w, struct LeaderboardEntry_t *l);
+extern void lin_to_win_struct_LeaderboardEntry_t_next(const struct LeaderboardEntry_t *l, struct winLeaderboardEntry_t_next *w);
+#endif
+
+#if defined(SDKVER_next) || !defined(__cplusplus)
+#pragma pack( push, 8 )
+struct winSteamUGCDetails_t_next {
+    PublishedFileId_t m_nPublishedFileId;
+    EResult m_eResult;
+    EWorkshopFileType m_eFileType;
+    AppId_t m_nCreatorAppID;
+    AppId_t m_nConsumerAppID;
+    char m_rgchTitle[129];
+    char m_rgchDescription[8000];
+    uint64 m_ulSteamIDOwner;
+    uint32 m_rtimeCreated;
+    uint32 m_rtimeUpdated;
+    uint32 m_rtimeAddedToUserList;
+    ERemoteStoragePublishedFileVisibility m_eVisibility;
+    bool m_bBanned;
+    bool m_bAcceptedForUse;
+    bool m_bTagsTruncated;
+    char m_rgchTags[1025];
+    UGCHandle_t m_hFile;
+    UGCHandle_t m_hPreviewFile;
+    char m_pchFileName[260];
+    int32 m_nFileSize;
+    int32 m_nPreviewFileSize;
+    char m_rgchURL[256];
+    uint32 m_unVotesUp;
+    uint32 m_unVotesDown;
+    float m_flScore;
+    uint32 m_unNumChildren;
+}  __attribute__ ((ms_struct));
+#pragma pack( pop )
+typedef struct winSteamUGCDetails_t_next winSteamUGCDetails_t_next;
+struct SteamUGCDetails_t;
+extern void win_to_lin_struct_SteamUGCDetails_t_next(const struct winSteamUGCDetails_t_next *w, struct SteamUGCDetails_t *l);
+extern void lin_to_win_struct_SteamUGCDetails_t_next(const struct SteamUGCDetails_t *l, struct winSteamUGCDetails_t_next *w);
+#endif
+
diff --git a/lsteamclient/struct_converters_099u.h b/lsteamclient/struct_converters_099u.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_099v.h b/lsteamclient/struct_converters_099v.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_099w.h b/lsteamclient/struct_converters_099w.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_099x.h b/lsteamclient/struct_converters_099x.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_099y.h b/lsteamclient/struct_converters_099y.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_100.h b/lsteamclient/struct_converters_100.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_101.h b/lsteamclient/struct_converters_101.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_101x.h b/lsteamclient/struct_converters_101x.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_102.h b/lsteamclient/struct_converters_102.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_102x.h b/lsteamclient/struct_converters_102x.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_103.h b/lsteamclient/struct_converters_103.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_104.h b/lsteamclient/struct_converters_104.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_105.h b/lsteamclient/struct_converters_105.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_106.h b/lsteamclient/struct_converters_106.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_107.h b/lsteamclient/struct_converters_107.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_108.h b/lsteamclient/struct_converters_108.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_109.h b/lsteamclient/struct_converters_109.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_110.h b/lsteamclient/struct_converters_110.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_111.h b/lsteamclient/struct_converters_111.h
deleted file mode 100644
index e69de29b..00000000
diff --git a/lsteamclient/struct_converters_111x.cpp b/lsteamclient/struct_converters_111x.cpp
index e346bc51..4f3bc245 100644
--- a/lsteamclient/struct_converters_111x.cpp
+++ b/lsteamclient/struct_converters_111x.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_111x/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_111x {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_111x(const void *w, void *l)
+#define SDKVER_111x
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_111x(const struct winLeaderboardEntry_t_111x *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_111x *win = (struct winLeaderboardEntry_t_111x *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_111x(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_111x(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_111x(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_111x *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_111x *win = (struct winLeaderboardEntry_t_111x *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_111x.h b/lsteamclient/struct_converters_111x.h
deleted file mode 100644
index f5b084bd..00000000
--- a/lsteamclient/struct_converters_111x.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_111x(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_111x(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_112.cpp b/lsteamclient/struct_converters_112.cpp
index 619cad5d..22aa469d 100644
--- a/lsteamclient/struct_converters_112.cpp
+++ b/lsteamclient/struct_converters_112.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_112/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_112 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_112(const void *w, void *l)
+#define SDKVER_112
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_112(const struct winLeaderboardEntry_t_112 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_112 *win = (struct winLeaderboardEntry_t_112 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_112(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_112(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_112(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_112 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_112 *win = (struct winLeaderboardEntry_t_112 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_112.h b/lsteamclient/struct_converters_112.h
deleted file mode 100644
index 553bec84..00000000
--- a/lsteamclient/struct_converters_112.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_112(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_112(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_112x.cpp b/lsteamclient/struct_converters_112x.cpp
index c4953a3a..6b86830d 100644
--- a/lsteamclient/struct_converters_112x.cpp
+++ b/lsteamclient/struct_converters_112x.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_112x/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_112x {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_112x(const void *w, void *l)
+#define SDKVER_112x
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_112x(const struct winLeaderboardEntry_t_112x *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_112x *win = (struct winLeaderboardEntry_t_112x *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_112x(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_112x(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_112x(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_112x *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_112x *win = (struct winLeaderboardEntry_t_112x *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_112x.h b/lsteamclient/struct_converters_112x.h
deleted file mode 100644
index 6192babe..00000000
--- a/lsteamclient/struct_converters_112x.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_112x(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_112x(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_113.cpp b/lsteamclient/struct_converters_113.cpp
index 4f72ad24..ec7ac266 100644
--- a/lsteamclient/struct_converters_113.cpp
+++ b/lsteamclient/struct_converters_113.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_113/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_113 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_113(const void *w, void *l)
+#define SDKVER_113
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_113(const struct winLeaderboardEntry_t_113 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_113 *win = (struct winLeaderboardEntry_t_113 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_113(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_113(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_113(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_113 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_113 *win = (struct winLeaderboardEntry_t_113 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_113.h b/lsteamclient/struct_converters_113.h
deleted file mode 100644
index 5672bce1..00000000
--- a/lsteamclient/struct_converters_113.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_113(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_113(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_114.cpp b/lsteamclient/struct_converters_114.cpp
index 97f9325b..b523af80 100644
--- a/lsteamclient/struct_converters_114.cpp
+++ b/lsteamclient/struct_converters_114.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_114/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_114 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_114(const void *w, void *l)
+#define SDKVER_114
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_114(const struct winLeaderboardEntry_t_114 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_114 *win = (struct winLeaderboardEntry_t_114 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_114(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_114(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_114(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_114 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_114 *win = (struct winLeaderboardEntry_t_114 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_114.h b/lsteamclient/struct_converters_114.h
deleted file mode 100644
index b25fa3d3..00000000
--- a/lsteamclient/struct_converters_114.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_114(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_114(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_115.cpp b/lsteamclient/struct_converters_115.cpp
index a052264b..9ec03394 100644
--- a/lsteamclient/struct_converters_115.cpp
+++ b/lsteamclient/struct_converters_115.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_115/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_115 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_115(const void *w, void *l)
+#define SDKVER_115
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_115(const struct winLeaderboardEntry_t_115 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_115 *win = (struct winLeaderboardEntry_t_115 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_115(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_115(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_115(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_115 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_115 *win = (struct winLeaderboardEntry_t_115 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_115.h b/lsteamclient/struct_converters_115.h
deleted file mode 100644
index ed51a59e..00000000
--- a/lsteamclient/struct_converters_115.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_115(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_115(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_116.cpp b/lsteamclient/struct_converters_116.cpp
index ea3acc5b..e7eaaa66 100644
--- a/lsteamclient/struct_converters_116.cpp
+++ b/lsteamclient/struct_converters_116.cpp
@@ -5,6 +5,8 @@
 #include "steamworks_sdk_116/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
+#define SDKVER_116
+#include "struct_converters.h"
 #pragma pack( push, 8 )
 struct winRemoteStorageDownloadUGCResult_t_40 {
     EResult m_eResult;
@@ -15,10 +17,8 @@ struct winRemoteStorageDownloadUGCResult_t_40 {
     uint64 m_ulSteamIDOwner;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageDownloadUGCResult_t_40(const void *l, void *w)
+void cb_RemoteStorageDownloadUGCResult_t_40(const struct RemoteStorageDownloadUGCResult_t *lin, struct winRemoteStorageDownloadUGCResult_t_40 *win)
 {
-    RemoteStorageDownloadUGCResult_t *lin = (RemoteStorageDownloadUGCResult_t *)l;
-    struct winRemoteStorageDownloadUGCResult_t_40 *win = (struct winRemoteStorageDownloadUGCResult_t_40 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_hFile = lin->m_hFile;
     win->m_nAppID = lin->m_nAppID;
@@ -27,19 +27,8 @@ void cb_RemoteStorageDownloadUGCResult_t_40(const void *l, void *w)
     win->m_ulSteamIDOwner = lin->m_ulSteamIDOwner;
 }
 
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_116 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_116(const void *w, void *l)
+void win_to_lin_struct_LeaderboardEntry_t_116(const struct winLeaderboardEntry_t_116 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_116 *win = (struct winLeaderboardEntry_t_116 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -47,10 +36,8 @@ void win_to_lin_struct_LeaderboardEntry_t_116(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_116(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_116(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_116 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_116 *win = (struct winLeaderboardEntry_t_116 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_116.h b/lsteamclient/struct_converters_116.h
deleted file mode 100644
index 11cc3d9d..00000000
--- a/lsteamclient/struct_converters_116.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_116(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_116(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_116x.cpp b/lsteamclient/struct_converters_116x.cpp
index f6b6c126..7ba75ca6 100644
--- a/lsteamclient/struct_converters_116x.cpp
+++ b/lsteamclient/struct_converters_116x.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_116x/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_116x {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_116x(const void *w, void *l)
+#define SDKVER_116x
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_116x(const struct winLeaderboardEntry_t_116x *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_116x *win = (struct winLeaderboardEntry_t_116x *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_116x(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_116x(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_116x(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_116x *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_116x *win = (struct winLeaderboardEntry_t_116x *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_116x.h b/lsteamclient/struct_converters_116x.h
deleted file mode 100644
index f26e32f5..00000000
--- a/lsteamclient/struct_converters_116x.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_116x(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_116x(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_117.cpp b/lsteamclient/struct_converters_117.cpp
index 29c1a4e1..b706e936 100644
--- a/lsteamclient/struct_converters_117.cpp
+++ b/lsteamclient/struct_converters_117.cpp
@@ -5,6 +5,8 @@
 #include "steamworks_sdk_117/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
+#define SDKVER_117
+#include "struct_converters.h"
 #pragma pack( push, 8 )
 struct winRemoteStorageGetPublishedFileDetailsResult_t_1744 {
     EResult m_eResult;
@@ -25,10 +27,8 @@ struct winRemoteStorageGetPublishedFileDetailsResult_t_1744 {
     char m_pchFileName[260];
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageGetPublishedFileDetailsResult_t_1744(const void *l, void *w)
+void cb_RemoteStorageGetPublishedFileDetailsResult_t_1744(const struct RemoteStorageGetPublishedFileDetailsResult_t *lin, struct winRemoteStorageGetPublishedFileDetailsResult_t_1744 *win)
 {
-    RemoteStorageGetPublishedFileDetailsResult_t *lin = (RemoteStorageGetPublishedFileDetailsResult_t *)l;
-    struct winRemoteStorageGetPublishedFileDetailsResult_t_1744 *win = (struct winRemoteStorageGetPublishedFileDetailsResult_t_1744 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_nCreatorAppID = lin->m_nCreatorAppID;
@@ -47,19 +47,8 @@ void cb_RemoteStorageGetPublishedFileDetailsResult_t_1744(const void *l, void *w
     memcpy(win->m_pchFileName, lin->m_pchFileName, sizeof(win->m_pchFileName));
 }
 
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_117 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_117(const void *w, void *l)
+void win_to_lin_struct_LeaderboardEntry_t_117(const struct winLeaderboardEntry_t_117 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_117 *win = (struct winLeaderboardEntry_t_117 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -67,10 +56,8 @@ void win_to_lin_struct_LeaderboardEntry_t_117(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_117(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_117(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_117 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_117 *win = (struct winLeaderboardEntry_t_117 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_117.h b/lsteamclient/struct_converters_117.h
deleted file mode 100644
index 48298cb7..00000000
--- a/lsteamclient/struct_converters_117.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_117(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_117(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_118.cpp b/lsteamclient/struct_converters_118.cpp
index 1db72538..48dd05ac 100644
--- a/lsteamclient/struct_converters_118.cpp
+++ b/lsteamclient/struct_converters_118.cpp
@@ -5,6 +5,8 @@
 #include "steamworks_sdk_118/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
+#define SDKVER_118
+#include "struct_converters.h"
 #pragma pack( push, 8 )
 struct winRemoteStorageGetPublishedFileDetailsResult_t_9496 {
     EResult m_eResult;
@@ -27,10 +29,8 @@ struct winRemoteStorageGetPublishedFileDetailsResult_t_9496 {
     int32 m_nPreviewFileSize;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageGetPublishedFileDetailsResult_t_9496(const void *l, void *w)
+void cb_RemoteStorageGetPublishedFileDetailsResult_t_9496(const struct RemoteStorageGetPublishedFileDetailsResult_t *lin, struct winRemoteStorageGetPublishedFileDetailsResult_t_9496 *win)
 {
-    RemoteStorageGetPublishedFileDetailsResult_t *lin = (RemoteStorageGetPublishedFileDetailsResult_t *)l;
-    struct winRemoteStorageGetPublishedFileDetailsResult_t_9496 *win = (struct winRemoteStorageGetPublishedFileDetailsResult_t_9496 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_nCreatorAppID = lin->m_nCreatorAppID;
@@ -51,19 +51,8 @@ void cb_RemoteStorageGetPublishedFileDetailsResult_t_9496(const void *l, void *w
     win->m_nPreviewFileSize = lin->m_nPreviewFileSize;
 }
 
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_118 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_118(const void *w, void *l)
+void win_to_lin_struct_LeaderboardEntry_t_118(const struct winLeaderboardEntry_t_118 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_118 *win = (struct winLeaderboardEntry_t_118 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -71,10 +60,8 @@ void win_to_lin_struct_LeaderboardEntry_t_118(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_118(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_118(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_118 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_118 *win = (struct winLeaderboardEntry_t_118 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_118.h b/lsteamclient/struct_converters_118.h
deleted file mode 100644
index 714a08da..00000000
--- a/lsteamclient/struct_converters_118.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_118(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_118(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_119.cpp b/lsteamclient/struct_converters_119.cpp
index 95a9da51..5a31c4eb 100644
--- a/lsteamclient/struct_converters_119.cpp
+++ b/lsteamclient/struct_converters_119.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_119/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_119 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_119(const void *w, void *l)
+#define SDKVER_119
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_119(const struct winLeaderboardEntry_t_119 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_119 *win = (struct winLeaderboardEntry_t_119 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_119(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_119(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_119(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_119 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_119 *win = (struct winLeaderboardEntry_t_119 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_119.h b/lsteamclient/struct_converters_119.h
deleted file mode 100644
index 43ad9275..00000000
--- a/lsteamclient/struct_converters_119.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_119(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_119(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_119x.cpp b/lsteamclient/struct_converters_119x.cpp
index 55c2348c..1bff5758 100644
--- a/lsteamclient/struct_converters_119x.cpp
+++ b/lsteamclient/struct_converters_119x.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_119x/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_119x {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_119x(const void *w, void *l)
+#define SDKVER_119x
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_119x(const struct winLeaderboardEntry_t_119x *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_119x *win = (struct winLeaderboardEntry_t_119x *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_119x(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_119x(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_119x(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_119x *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_119x *win = (struct winLeaderboardEntry_t_119x *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_119x.h b/lsteamclient/struct_converters_119x.h
deleted file mode 100644
index aef32b69..00000000
--- a/lsteamclient/struct_converters_119x.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_119x(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_119x(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_120.cpp b/lsteamclient/struct_converters_120.cpp
index 6746171b..4a76db44 100644
--- a/lsteamclient/struct_converters_120.cpp
+++ b/lsteamclient/struct_converters_120.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_120/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_120 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_120(const void *w, void *l)
+#define SDKVER_120
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_120(const struct winLeaderboardEntry_t_120 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_120 *win = (struct winLeaderboardEntry_t_120 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_120(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_120(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_120(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_120 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_120 *win = (struct winLeaderboardEntry_t_120 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_120.h b/lsteamclient/struct_converters_120.h
deleted file mode 100644
index b4e6d4a5..00000000
--- a/lsteamclient/struct_converters_120.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_120(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_120(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_121.cpp b/lsteamclient/struct_converters_121.cpp
index 401aa515..ded8a704 100644
--- a/lsteamclient/struct_converters_121.cpp
+++ b/lsteamclient/struct_converters_121.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_121/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_121 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_121(const void *w, void *l)
+#define SDKVER_121
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_121(const struct winLeaderboardEntry_t_121 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_121 *win = (struct winLeaderboardEntry_t_121 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_121(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_121(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_121(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_121 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_121 *win = (struct winLeaderboardEntry_t_121 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_121.h b/lsteamclient/struct_converters_121.h
deleted file mode 100644
index b67b1aff..00000000
--- a/lsteamclient/struct_converters_121.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_121(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_121(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_121x.cpp b/lsteamclient/struct_converters_121x.cpp
index 28d41a37..3988258e 100644
--- a/lsteamclient/struct_converters_121x.cpp
+++ b/lsteamclient/struct_converters_121x.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_121x/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_121x {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_121x(const void *w, void *l)
+#define SDKVER_121x
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_121x(const struct winLeaderboardEntry_t_121x *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_121x *win = (struct winLeaderboardEntry_t_121x *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_121x(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_121x(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_121x(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_121x *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_121x *win = (struct winLeaderboardEntry_t_121x *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_121x.h b/lsteamclient/struct_converters_121x.h
deleted file mode 100644
index 01f4e09d..00000000
--- a/lsteamclient/struct_converters_121x.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_121x(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_121x(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_122.cpp b/lsteamclient/struct_converters_122.cpp
index b7f9da7a..bada8c71 100644
--- a/lsteamclient/struct_converters_122.cpp
+++ b/lsteamclient/struct_converters_122.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_122/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_122 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_122(const void *w, void *l)
+#define SDKVER_122
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_122(const struct winLeaderboardEntry_t_122 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_122 *win = (struct winLeaderboardEntry_t_122 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_122(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_122(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_122(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_122 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_122 *win = (struct winLeaderboardEntry_t_122 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_122.h b/lsteamclient/struct_converters_122.h
deleted file mode 100644
index 5eb3d1bf..00000000
--- a/lsteamclient/struct_converters_122.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_122(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_122(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_123.cpp b/lsteamclient/struct_converters_123.cpp
index c60ebd3d..259a0893 100644
--- a/lsteamclient/struct_converters_123.cpp
+++ b/lsteamclient/struct_converters_123.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_123/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_123 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_123(const void *w, void *l)
+#define SDKVER_123
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_123(const struct winLeaderboardEntry_t_123 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_123 *win = (struct winLeaderboardEntry_t_123 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_123(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_123(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_123(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_123 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_123 *win = (struct winLeaderboardEntry_t_123 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_123.h b/lsteamclient/struct_converters_123.h
deleted file mode 100644
index caafe527..00000000
--- a/lsteamclient/struct_converters_123.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_123(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_123(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_123a.cpp b/lsteamclient/struct_converters_123a.cpp
index 2ae2bd6d..202f8a0a 100644
--- a/lsteamclient/struct_converters_123a.cpp
+++ b/lsteamclient/struct_converters_123a.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_123a/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_123a {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_123a(const void *w, void *l)
+#define SDKVER_123a
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_123a(const struct winLeaderboardEntry_t_123a *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_123a *win = (struct winLeaderboardEntry_t_123a *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_123a(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_123a(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_123a(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_123a *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_123a *win = (struct winLeaderboardEntry_t_123a *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_123a.h b/lsteamclient/struct_converters_123a.h
deleted file mode 100644
index a2961476..00000000
--- a/lsteamclient/struct_converters_123a.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_123a(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_123a(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_124.cpp b/lsteamclient/struct_converters_124.cpp
index 1a40238d..34865cc0 100644
--- a/lsteamclient/struct_converters_124.cpp
+++ b/lsteamclient/struct_converters_124.cpp
@@ -5,16 +5,16 @@
 #include "steamworks_sdk_124/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
+#define SDKVER_124
+#include "struct_converters.h"
 #pragma pack( push, 8 )
 struct winRemoteStoragePublishFileResult_t_16 {
     EResult m_eResult;
     PublishedFileId_t m_nPublishedFileId;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStoragePublishFileResult_t_16(const void *l, void *w)
+void cb_RemoteStoragePublishFileResult_t_16(const struct RemoteStoragePublishFileResult_t *lin, struct winRemoteStoragePublishFileResult_t_16 *win)
 {
-    RemoteStoragePublishFileResult_t *lin = (RemoteStoragePublishFileResult_t *)l;
-    struct winRemoteStoragePublishFileResult_t_16 *win = (struct winRemoteStoragePublishFileResult_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
 }
@@ -25,10 +25,8 @@ struct winRemoteStorageUpdatePublishedFileResult_t_16 {
     PublishedFileId_t m_nPublishedFileId;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageUpdatePublishedFileResult_t_16(const void *l, void *w)
+void cb_RemoteStorageUpdatePublishedFileResult_t_16(const struct RemoteStorageUpdatePublishedFileResult_t *lin, struct winRemoteStorageUpdatePublishedFileResult_t_16 *win)
 {
-    RemoteStorageUpdatePublishedFileResult_t *lin = (RemoteStorageUpdatePublishedFileResult_t *)l;
-    struct winRemoteStorageUpdatePublishedFileResult_t_16 *win = (struct winRemoteStorageUpdatePublishedFileResult_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
 }
@@ -42,10 +40,8 @@ struct winRemoteStorageEnumerateWorkshopFilesResult_t_616 {
     float m_rgScore[50];
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageEnumerateWorkshopFilesResult_t_616(const void *l, void *w)
+void cb_RemoteStorageEnumerateWorkshopFilesResult_t_616(const struct RemoteStorageEnumerateWorkshopFilesResult_t *lin, struct winRemoteStorageEnumerateWorkshopFilesResult_t_616 *win)
 {
-    RemoteStorageEnumerateWorkshopFilesResult_t *lin = (RemoteStorageEnumerateWorkshopFilesResult_t *)l;
-    struct winRemoteStorageEnumerateWorkshopFilesResult_t_616 *win = (struct winRemoteStorageEnumerateWorkshopFilesResult_t_616 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nResultsReturned = lin->m_nResultsReturned;
     win->m_nTotalResultCount = lin->m_nTotalResultCount;
@@ -53,19 +49,8 @@ void cb_RemoteStorageEnumerateWorkshopFilesResult_t_616(const void *l, void *w)
     memcpy(win->m_rgScore, lin->m_rgScore, sizeof(win->m_rgScore));
 }
 
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_124 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_124(const void *w, void *l)
+void win_to_lin_struct_LeaderboardEntry_t_124(const struct winLeaderboardEntry_t_124 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_124 *win = (struct winLeaderboardEntry_t_124 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -73,10 +58,8 @@ void win_to_lin_struct_LeaderboardEntry_t_124(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_124(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_124(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_124 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_124 *win = (struct winLeaderboardEntry_t_124 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_124.h b/lsteamclient/struct_converters_124.h
deleted file mode 100644
index f00dbcdf..00000000
--- a/lsteamclient/struct_converters_124.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_124(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_124(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_125.cpp b/lsteamclient/struct_converters_125.cpp
index 9bcbfb14..67d007df 100644
--- a/lsteamclient/struct_converters_125.cpp
+++ b/lsteamclient/struct_converters_125.cpp
@@ -5,6 +5,8 @@
 #include "steamworks_sdk_125/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
+#define SDKVER_125
+#include "struct_converters.h"
 #pragma pack( push, 8 )
 struct winRemoteStorageGetPublishedFileDetailsResult_t_9752 {
     EResult m_eResult;
@@ -29,10 +31,8 @@ struct winRemoteStorageGetPublishedFileDetailsResult_t_9752 {
     EWorkshopFileType m_eFileType;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageGetPublishedFileDetailsResult_t_9752(const void *l, void *w)
+void cb_RemoteStorageGetPublishedFileDetailsResult_t_9752(const struct RemoteStorageGetPublishedFileDetailsResult_t *lin, struct winRemoteStorageGetPublishedFileDetailsResult_t_9752 *win)
 {
-    RemoteStorageGetPublishedFileDetailsResult_t *lin = (RemoteStorageGetPublishedFileDetailsResult_t *)l;
-    struct winRemoteStorageGetPublishedFileDetailsResult_t_9752 *win = (struct winRemoteStorageGetPublishedFileDetailsResult_t_9752 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_nCreatorAppID = lin->m_nCreatorAppID;
@@ -55,19 +55,8 @@ void cb_RemoteStorageGetPublishedFileDetailsResult_t_9752(const void *l, void *w
     win->m_eFileType = lin->m_eFileType;
 }
 
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_125 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_125(const void *w, void *l)
+void win_to_lin_struct_LeaderboardEntry_t_125(const struct winLeaderboardEntry_t_125 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_125 *win = (struct winLeaderboardEntry_t_125 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -75,10 +64,8 @@ void win_to_lin_struct_LeaderboardEntry_t_125(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_125(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_125(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_125 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_125 *win = (struct winLeaderboardEntry_t_125 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
diff --git a/lsteamclient/struct_converters_125.h b/lsteamclient/struct_converters_125.h
deleted file mode 100644
index 1cf0f1f8..00000000
--- a/lsteamclient/struct_converters_125.h
+++ /dev/null
@@ -1,3 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_125(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_125(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_126.cpp b/lsteamclient/struct_converters_126.cpp
index 5f76a858..a7e5f808 100644
--- a/lsteamclient/struct_converters_126.cpp
+++ b/lsteamclient/struct_converters_126.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_126/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_126 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_126(const void *w, void *l)
+#define SDKVER_126
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_126(const struct winLeaderboardEntry_t_126 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_126 *win = (struct winLeaderboardEntry_t_126 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_126(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_126(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_126(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_126 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_126 *win = (struct winLeaderboardEntry_t_126 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,39 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_126(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_126 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_126(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_126(const struct winSteamUGCDetails_t_126 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_126 *win = (struct winSteamUGCDetails_t_126 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -96,10 +54,8 @@ void win_to_lin_struct_SteamUGCDetails_t_126(const void *w, void *l)
     lin->m_flScore = win->m_flScore;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_126(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_126(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_126 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_126 *win = (struct winSteamUGCDetails_t_126 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_126.h b/lsteamclient/struct_converters_126.h
deleted file mode 100644
index 160f5c48..00000000
--- a/lsteamclient/struct_converters_126.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_126(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_126(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_126(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_126(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_126a.cpp b/lsteamclient/struct_converters_126a.cpp
index d9b3ea3b..91e04a7b 100644
--- a/lsteamclient/struct_converters_126a.cpp
+++ b/lsteamclient/struct_converters_126a.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_126a/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_126a {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_126a(const void *w, void *l)
+#define SDKVER_126a
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_126a(const struct winLeaderboardEntry_t_126a *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_126a *win = (struct winLeaderboardEntry_t_126a *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_126a(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_126a(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_126a(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_126a *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_126a *win = (struct winLeaderboardEntry_t_126a *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,39 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_126a(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_126a {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_126a(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_126a(const struct winSteamUGCDetails_t_126a *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_126a *win = (struct winSteamUGCDetails_t_126a *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -96,10 +54,8 @@ void win_to_lin_struct_SteamUGCDetails_t_126a(const void *w, void *l)
     lin->m_flScore = win->m_flScore;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_126a(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_126a(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_126a *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_126a *win = (struct winSteamUGCDetails_t_126a *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_126a.h b/lsteamclient/struct_converters_126a.h
deleted file mode 100644
index c6694af3..00000000
--- a/lsteamclient/struct_converters_126a.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_126a(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_126a(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_126a(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_126a(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_127.cpp b/lsteamclient/struct_converters_127.cpp
index 34f43fc8..3cb2d535 100644
--- a/lsteamclient/struct_converters_127.cpp
+++ b/lsteamclient/struct_converters_127.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_127/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_127 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_127(const void *w, void *l)
+#define SDKVER_127
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_127(const struct winLeaderboardEntry_t_127 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_127 *win = (struct winLeaderboardEntry_t_127 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_127(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_127(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_127(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_127 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_127 *win = (struct winLeaderboardEntry_t_127 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,39 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_127(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_127 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_127(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_127(const struct winSteamUGCDetails_t_127 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_127 *win = (struct winSteamUGCDetails_t_127 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -96,10 +54,8 @@ void win_to_lin_struct_SteamUGCDetails_t_127(const void *w, void *l)
     lin->m_flScore = win->m_flScore;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_127(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_127(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_127 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_127 *win = (struct winSteamUGCDetails_t_127 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_127.h b/lsteamclient/struct_converters_127.h
deleted file mode 100644
index 7c48ff2b..00000000
--- a/lsteamclient/struct_converters_127.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_127(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_127(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_127(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_127(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_128.cpp b/lsteamclient/struct_converters_128.cpp
index cc2fedea..74de963c 100644
--- a/lsteamclient/struct_converters_128.cpp
+++ b/lsteamclient/struct_converters_128.cpp
@@ -5,33 +5,22 @@
 #include "steamworks_sdk_128/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
+#define SDKVER_128
+#include "struct_converters.h"
 #pragma pack( push, 8 )
 struct winRemoteStorageFileShareResult_t_16 {
     EResult m_eResult;
     UGCHandle_t m_hFile;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageFileShareResult_t_16(const void *l, void *w)
+void cb_RemoteStorageFileShareResult_t_16(const struct RemoteStorageFileShareResult_t *lin, struct winRemoteStorageFileShareResult_t_16 *win)
 {
-    RemoteStorageFileShareResult_t *lin = (RemoteStorageFileShareResult_t *)l;
-    struct winRemoteStorageFileShareResult_t_16 *win = (struct winRemoteStorageFileShareResult_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_hFile = lin->m_hFile;
 }
 
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_128 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_128(const void *w, void *l)
+void win_to_lin_struct_LeaderboardEntry_t_128(const struct winLeaderboardEntry_t_128 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_128 *win = (struct winLeaderboardEntry_t_128 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -39,10 +28,8 @@ void win_to_lin_struct_LeaderboardEntry_t_128(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_128(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_128(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_128 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_128 *win = (struct winLeaderboardEntry_t_128 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -50,39 +37,8 @@ void lin_to_win_struct_LeaderboardEntry_t_128(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_128 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_128(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_128(const struct winSteamUGCDetails_t_128 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_128 *win = (struct winSteamUGCDetails_t_128 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -110,10 +66,8 @@ void win_to_lin_struct_SteamUGCDetails_t_128(const void *w, void *l)
     lin->m_flScore = win->m_flScore;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_128(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_128(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_128 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_128 *win = (struct winSteamUGCDetails_t_128 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
@@ -146,10 +100,8 @@ struct winSteamUGCRequestUGCDetailsResult_t_9768 {
     winSteamUGCDetails_t_128 m_details;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_SteamUGCRequestUGCDetailsResult_t_9768(const void *l, void *w)
+void cb_SteamUGCRequestUGCDetailsResult_t_9768(const struct SteamUGCRequestUGCDetailsResult_t *lin, struct winSteamUGCRequestUGCDetailsResult_t_9768 *win)
 {
-    SteamUGCRequestUGCDetailsResult_t *lin = (SteamUGCRequestUGCDetailsResult_t *)l;
-    struct winSteamUGCRequestUGCDetailsResult_t_9768 *win = (struct winSteamUGCRequestUGCDetailsResult_t_9768 *)w;
     lin_to_win_struct_SteamUGCDetails_t_128(&lin->m_details, &win->m_details);
 }
 
diff --git a/lsteamclient/struct_converters_128.h b/lsteamclient/struct_converters_128.h
deleted file mode 100644
index f6783244..00000000
--- a/lsteamclient/struct_converters_128.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_128(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_128(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_128(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_128(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_128x.cpp b/lsteamclient/struct_converters_128x.cpp
index e3e92fce..2fd6876e 100644
--- a/lsteamclient/struct_converters_128x.cpp
+++ b/lsteamclient/struct_converters_128x.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_128x/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_128x {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_128x(const void *w, void *l)
+#define SDKVER_128x
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_128x(const struct winLeaderboardEntry_t_128x *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_128x *win = (struct winLeaderboardEntry_t_128x *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_128x(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_128x(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_128x(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_128x *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_128x *win = (struct winLeaderboardEntry_t_128x *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_128x(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_128x {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_128x(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_128x(const struct winSteamUGCDetails_t_128x *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_128x *win = (struct winSteamUGCDetails_t_128x *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_128x(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_128x(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_128x(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_128x *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_128x *win = (struct winSteamUGCDetails_t_128x *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_128x.h b/lsteamclient/struct_converters_128x.h
deleted file mode 100644
index f7717b18..00000000
--- a/lsteamclient/struct_converters_128x.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_128x(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_128x(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_128x(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_128x(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_129.cpp b/lsteamclient/struct_converters_129.cpp
index c24354b1..a5dd9b05 100644
--- a/lsteamclient/struct_converters_129.cpp
+++ b/lsteamclient/struct_converters_129.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_129/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_129 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_129(const void *w, void *l)
+#define SDKVER_129
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_129(const struct winLeaderboardEntry_t_129 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_129 *win = (struct winLeaderboardEntry_t_129 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_129(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_129(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_129(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_129 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_129 *win = (struct winLeaderboardEntry_t_129 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,39 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_129(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_129 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_129(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_129(const struct winSteamUGCDetails_t_129 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_129 *win = (struct winSteamUGCDetails_t_129 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -96,10 +54,8 @@ void win_to_lin_struct_SteamUGCDetails_t_129(const void *w, void *l)
     lin->m_flScore = win->m_flScore;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_129(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_129(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_129 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_129 *win = (struct winSteamUGCDetails_t_129 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
@@ -133,10 +89,8 @@ struct winSteamUGCRequestUGCDetailsResult_t_9776 {
     bool m_bCachedData;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_SteamUGCRequestUGCDetailsResult_t_9776(const void *l, void *w)
+void cb_SteamUGCRequestUGCDetailsResult_t_9776(const struct SteamUGCRequestUGCDetailsResult_t *lin, struct winSteamUGCRequestUGCDetailsResult_t_9776 *win)
 {
-    SteamUGCRequestUGCDetailsResult_t *lin = (SteamUGCRequestUGCDetailsResult_t *)l;
-    struct winSteamUGCRequestUGCDetailsResult_t_9776 *win = (struct winSteamUGCRequestUGCDetailsResult_t_9776 *)w;
     lin_to_win_struct_SteamUGCDetails_t_129(&lin->m_details, &win->m_details);
     win->m_bCachedData = lin->m_bCachedData;
 }
diff --git a/lsteamclient/struct_converters_129.h b/lsteamclient/struct_converters_129.h
deleted file mode 100644
index 8ac53af2..00000000
--- a/lsteamclient/struct_converters_129.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_129(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_129(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_129(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_129(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_129a.cpp b/lsteamclient/struct_converters_129a.cpp
index 46221275..18aea444 100644
--- a/lsteamclient/struct_converters_129a.cpp
+++ b/lsteamclient/struct_converters_129a.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_129a/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_129a {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_129a(const void *w, void *l)
+#define SDKVER_129a
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_129a(const struct winLeaderboardEntry_t_129a *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_129a *win = (struct winLeaderboardEntry_t_129a *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_129a(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_129a(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_129a(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_129a *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_129a *win = (struct winLeaderboardEntry_t_129a *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_129a(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_129a {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_129a(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_129a(const struct winSteamUGCDetails_t_129a *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_129a *win = (struct winSteamUGCDetails_t_129a *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_129a(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_129a(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_129a(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_129a *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_129a *win = (struct winSteamUGCDetails_t_129a *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_129a.h b/lsteamclient/struct_converters_129a.h
deleted file mode 100644
index 7b29c5d1..00000000
--- a/lsteamclient/struct_converters_129a.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_129a(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_129a(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_129a(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_129a(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_130.cpp b/lsteamclient/struct_converters_130.cpp
index 55536d84..bd016add 100644
--- a/lsteamclient/struct_converters_130.cpp
+++ b/lsteamclient/struct_converters_130.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_130/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_130 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_130(const void *w, void *l)
+#define SDKVER_130
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_130(const struct winLeaderboardEntry_t_130 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_130 *win = (struct winLeaderboardEntry_t_130 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_130(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_130(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_130(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_130 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_130 *win = (struct winLeaderboardEntry_t_130 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_130(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_130 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_130(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_130(const struct winSteamUGCDetails_t_130 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_130 *win = (struct winSteamUGCDetails_t_130 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_130(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_130(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_130(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_130 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_130 *win = (struct winSteamUGCDetails_t_130 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_130.h b/lsteamclient/struct_converters_130.h
deleted file mode 100644
index 6da1b6dc..00000000
--- a/lsteamclient/struct_converters_130.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_130(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_130(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_130(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_130(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_130x.cpp b/lsteamclient/struct_converters_130x.cpp
index 0ea4e287..c3728733 100644
--- a/lsteamclient/struct_converters_130x.cpp
+++ b/lsteamclient/struct_converters_130x.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_130x/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_130x {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_130x(const void *w, void *l)
+#define SDKVER_130x
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_130x(const struct winLeaderboardEntry_t_130x *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_130x *win = (struct winLeaderboardEntry_t_130x *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_130x(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_130x(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_130x(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_130x *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_130x *win = (struct winLeaderboardEntry_t_130x *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_130x(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_130x {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_130x(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_130x(const struct winSteamUGCDetails_t_130x *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_130x *win = (struct winSteamUGCDetails_t_130x *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_130x(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_130x(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_130x(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_130x *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_130x *win = (struct winSteamUGCDetails_t_130x *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_130x.h b/lsteamclient/struct_converters_130x.h
deleted file mode 100644
index 5bd87961..00000000
--- a/lsteamclient/struct_converters_130x.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_130x(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_130x(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_130x(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_130x(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_131.cpp b/lsteamclient/struct_converters_131.cpp
index 79729da3..475c7625 100644
--- a/lsteamclient/struct_converters_131.cpp
+++ b/lsteamclient/struct_converters_131.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_131/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_131 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_131(const void *w, void *l)
+#define SDKVER_131
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_131(const struct winLeaderboardEntry_t_131 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_131 *win = (struct winLeaderboardEntry_t_131 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_131(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_131(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_131(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_131 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_131 *win = (struct winLeaderboardEntry_t_131 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_131(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_131 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_131(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_131(const struct winSteamUGCDetails_t_131 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_131 *win = (struct winSteamUGCDetails_t_131 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_131(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_131(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_131(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_131 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_131 *win = (struct winSteamUGCDetails_t_131 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_131.h b/lsteamclient/struct_converters_131.h
deleted file mode 100644
index f51eae1e..00000000
--- a/lsteamclient/struct_converters_131.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_131(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_131(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_131(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_131(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_132.cpp b/lsteamclient/struct_converters_132.cpp
index 1af09d47..c9b8bc4c 100644
--- a/lsteamclient/struct_converters_132.cpp
+++ b/lsteamclient/struct_converters_132.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_132/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_132 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_132(const void *w, void *l)
+#define SDKVER_132
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_132(const struct winLeaderboardEntry_t_132 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_132 *win = (struct winLeaderboardEntry_t_132 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_132(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_132(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_132(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_132 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_132 *win = (struct winLeaderboardEntry_t_132 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -44,50 +33,16 @@ struct winHTTPRequestCompleted_t_24 {
     EHTTPStatusCode m_eStatusCode;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_HTTPRequestCompleted_t_24(const void *l, void *w)
+void cb_HTTPRequestCompleted_t_24(const struct HTTPRequestCompleted_t *lin, struct winHTTPRequestCompleted_t_24 *win)
 {
-    HTTPRequestCompleted_t *lin = (HTTPRequestCompleted_t *)l;
-    struct winHTTPRequestCompleted_t_24 *win = (struct winHTTPRequestCompleted_t_24 *)w;
     win->m_hRequest = lin->m_hRequest;
     win->m_ulContextValue = lin->m_ulContextValue;
     win->m_bRequestSuccessful = lin->m_bRequestSuccessful;
     win->m_eStatusCode = lin->m_eStatusCode;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_132 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_132(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_132(const struct winSteamUGCDetails_t_132 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_132 *win = (struct winSteamUGCDetails_t_132 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -116,10 +71,8 @@ void win_to_lin_struct_SteamUGCDetails_t_132(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_132(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_132(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_132 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_132 *win = (struct winSteamUGCDetails_t_132 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_132.h b/lsteamclient/struct_converters_132.h
deleted file mode 100644
index 868d1a9c..00000000
--- a/lsteamclient/struct_converters_132.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_132(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_132(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_132(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_132(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_132x.cpp b/lsteamclient/struct_converters_132x.cpp
index c5470bf1..c1b6921e 100644
--- a/lsteamclient/struct_converters_132x.cpp
+++ b/lsteamclient/struct_converters_132x.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_132x/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_132x {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_132x(const void *w, void *l)
+#define SDKVER_132x
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_132x(const struct winLeaderboardEntry_t_132x *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_132x *win = (struct winLeaderboardEntry_t_132x *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_132x(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_132x(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_132x(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_132x *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_132x *win = (struct winLeaderboardEntry_t_132x *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_132x(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_132x {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_132x(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_132x(const struct winSteamUGCDetails_t_132x *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_132x *win = (struct winSteamUGCDetails_t_132x *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_132x(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_132x(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_132x(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_132x *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_132x *win = (struct winSteamUGCDetails_t_132x *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_132x.h b/lsteamclient/struct_converters_132x.h
deleted file mode 100644
index 56bc3e08..00000000
--- a/lsteamclient/struct_converters_132x.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_132x(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_132x(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_132x(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_132x(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_133.cpp b/lsteamclient/struct_converters_133.cpp
index d9036e19..9818dacb 100644
--- a/lsteamclient/struct_converters_133.cpp
+++ b/lsteamclient/struct_converters_133.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_133/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_133 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_133(const void *w, void *l)
+#define SDKVER_133
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_133(const struct winLeaderboardEntry_t_133 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_133 *win = (struct winLeaderboardEntry_t_133 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_133(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_133(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_133(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_133 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_133 *win = (struct winLeaderboardEntry_t_133 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_133(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_133 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_133(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_133(const struct winSteamUGCDetails_t_133 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_133 *win = (struct winSteamUGCDetails_t_133 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_133(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_133(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_133(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_133 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_133 *win = (struct winSteamUGCDetails_t_133 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_133.h b/lsteamclient/struct_converters_133.h
deleted file mode 100644
index 40f1a032..00000000
--- a/lsteamclient/struct_converters_133.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_133(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_133(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_133(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_133(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_133a.cpp b/lsteamclient/struct_converters_133a.cpp
index 79816e9e..0a24e71a 100644
--- a/lsteamclient/struct_converters_133a.cpp
+++ b/lsteamclient/struct_converters_133a.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_133a/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_133a {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_133a(const void *w, void *l)
+#define SDKVER_133a
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_133a(const struct winLeaderboardEntry_t_133a *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_133a *win = (struct winLeaderboardEntry_t_133a *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_133a(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_133a(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_133a(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_133a *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_133a *win = (struct winLeaderboardEntry_t_133a *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_133a(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_133a {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_133a(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_133a(const struct winSteamUGCDetails_t_133a *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_133a *win = (struct winSteamUGCDetails_t_133a *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_133a(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_133a(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_133a(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_133a *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_133a *win = (struct winSteamUGCDetails_t_133a *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_133a.h b/lsteamclient/struct_converters_133a.h
deleted file mode 100644
index 4876e439..00000000
--- a/lsteamclient/struct_converters_133a.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_133a(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_133a(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_133a(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_133a(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_133b.cpp b/lsteamclient/struct_converters_133b.cpp
index 984ac6e6..f13d539e 100644
--- a/lsteamclient/struct_converters_133b.cpp
+++ b/lsteamclient/struct_converters_133b.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_133b/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_133b {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_133b(const void *w, void *l)
+#define SDKVER_133b
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_133b(const struct winLeaderboardEntry_t_133b *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_133b *win = (struct winLeaderboardEntry_t_133b *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_133b(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_133b(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_133b(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_133b *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_133b *win = (struct winLeaderboardEntry_t_133b *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_133b(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_133b {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_133b(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_133b(const struct winSteamUGCDetails_t_133b *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_133b *win = (struct winSteamUGCDetails_t_133b *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_133b(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_133b(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_133b(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_133b *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_133b *win = (struct winSteamUGCDetails_t_133b *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_133b.h b/lsteamclient/struct_converters_133b.h
deleted file mode 100644
index df5923e4..00000000
--- a/lsteamclient/struct_converters_133b.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_133b(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_133b(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_133b(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_133b(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_133x.cpp b/lsteamclient/struct_converters_133x.cpp
index f2cbe705..82577668 100644
--- a/lsteamclient/struct_converters_133x.cpp
+++ b/lsteamclient/struct_converters_133x.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_133x/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_133x {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_133x(const void *w, void *l)
+#define SDKVER_133x
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_133x(const struct winLeaderboardEntry_t_133x *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_133x *win = (struct winLeaderboardEntry_t_133x *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_133x(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_133x(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_133x(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_133x *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_133x *win = (struct winLeaderboardEntry_t_133x *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_133x(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_133x {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_133x(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_133x(const struct winSteamUGCDetails_t_133x *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_133x *win = (struct winSteamUGCDetails_t_133x *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_133x(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_133x(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_133x(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_133x *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_133x *win = (struct winSteamUGCDetails_t_133x *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_133x.h b/lsteamclient/struct_converters_133x.h
deleted file mode 100644
index 33fb396c..00000000
--- a/lsteamclient/struct_converters_133x.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_133x(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_133x(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_133x(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_133x(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_134.cpp b/lsteamclient/struct_converters_134.cpp
index cf0d2780..75df2214 100644
--- a/lsteamclient/struct_converters_134.cpp
+++ b/lsteamclient/struct_converters_134.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_134/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_134 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_134(const void *w, void *l)
+#define SDKVER_134
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_134(const struct winLeaderboardEntry_t_134 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_134 *win = (struct winLeaderboardEntry_t_134 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_134(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_134(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_134(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_134 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_134 *win = (struct winLeaderboardEntry_t_134 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_134(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_134 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_134(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_134(const struct winSteamUGCDetails_t_134 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_134 *win = (struct winSteamUGCDetails_t_134 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_134(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_134(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_134(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_134 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_134 *win = (struct winSteamUGCDetails_t_134 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_134.h b/lsteamclient/struct_converters_134.h
deleted file mode 100644
index 230c4b9f..00000000
--- a/lsteamclient/struct_converters_134.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_134(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_134(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_134(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_134(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_135.cpp b/lsteamclient/struct_converters_135.cpp
index d7b4d12f..a549a76c 100644
--- a/lsteamclient/struct_converters_135.cpp
+++ b/lsteamclient/struct_converters_135.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_135/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_135 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_135(const void *w, void *l)
+#define SDKVER_135
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_135(const struct winLeaderboardEntry_t_135 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_135 *win = (struct winLeaderboardEntry_t_135 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_135(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_135(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_135(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_135 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_135 *win = (struct winLeaderboardEntry_t_135 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_135(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_135 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_135(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_135(const struct winSteamUGCDetails_t_135 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_135 *win = (struct winSteamUGCDetails_t_135 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_135(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_135(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_135(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_135 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_135 *win = (struct winSteamUGCDetails_t_135 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_135.h b/lsteamclient/struct_converters_135.h
deleted file mode 100644
index eaed2f8c..00000000
--- a/lsteamclient/struct_converters_135.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_135(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_135(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_135(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_135(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_135a.cpp b/lsteamclient/struct_converters_135a.cpp
index 6a10787c..b5a665d1 100644
--- a/lsteamclient/struct_converters_135a.cpp
+++ b/lsteamclient/struct_converters_135a.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_135a/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_135a {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_135a(const void *w, void *l)
+#define SDKVER_135a
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_135a(const struct winLeaderboardEntry_t_135a *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_135a *win = (struct winLeaderboardEntry_t_135a *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_135a(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_135a(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_135a(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_135a *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_135a *win = (struct winLeaderboardEntry_t_135a *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_135a(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_135a {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_135a(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_135a(const struct winSteamUGCDetails_t_135a *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_135a *win = (struct winSteamUGCDetails_t_135a *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_135a(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_135a(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_135a(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_135a *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_135a *win = (struct winSteamUGCDetails_t_135a *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_135a.h b/lsteamclient/struct_converters_135a.h
deleted file mode 100644
index e042863b..00000000
--- a/lsteamclient/struct_converters_135a.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_135a(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_135a(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_135a(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_135a(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_136.cpp b/lsteamclient/struct_converters_136.cpp
index efdd3a72..7ef30c40 100644
--- a/lsteamclient/struct_converters_136.cpp
+++ b/lsteamclient/struct_converters_136.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_136/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_136 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_136(const void *w, void *l)
+#define SDKVER_136
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_136(const struct winLeaderboardEntry_t_136 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_136 *win = (struct winLeaderboardEntry_t_136 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_136(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_136(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_136(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_136 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_136 *win = (struct winLeaderboardEntry_t_136 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_136(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_136 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_136(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_136(const struct winSteamUGCDetails_t_136 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_136 *win = (struct winSteamUGCDetails_t_136 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_136(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_136(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_136(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_136 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_136 *win = (struct winSteamUGCDetails_t_136 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_136.h b/lsteamclient/struct_converters_136.h
deleted file mode 100644
index 6a4600ba..00000000
--- a/lsteamclient/struct_converters_136.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_136(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_136(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_136(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_136(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_137.cpp b/lsteamclient/struct_converters_137.cpp
index 835f6c9a..9bbd906b 100644
--- a/lsteamclient/struct_converters_137.cpp
+++ b/lsteamclient/struct_converters_137.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_137/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_137 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_137(const void *w, void *l)
+#define SDKVER_137
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_137(const struct winLeaderboardEntry_t_137 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_137 *win = (struct winLeaderboardEntry_t_137 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_137(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_137(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_137(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_137 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_137 *win = (struct winLeaderboardEntry_t_137 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_137(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_137 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_137(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_137(const struct winSteamUGCDetails_t_137 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_137 *win = (struct winSteamUGCDetails_t_137 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_137(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_137(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_137(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_137 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_137 *win = (struct winSteamUGCDetails_t_137 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_137.h b/lsteamclient/struct_converters_137.h
deleted file mode 100644
index 63c275a5..00000000
--- a/lsteamclient/struct_converters_137.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_137(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_137(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_137(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_137(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_138.cpp b/lsteamclient/struct_converters_138.cpp
index 8934e925..b0ea8f40 100644
--- a/lsteamclient/struct_converters_138.cpp
+++ b/lsteamclient/struct_converters_138.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_138/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_138 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_138(const void *w, void *l)
+#define SDKVER_138
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_138(const struct winLeaderboardEntry_t_138 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_138 *win = (struct winLeaderboardEntry_t_138 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_138(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_138(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_138(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_138 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_138 *win = (struct winLeaderboardEntry_t_138 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_138(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_138 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_138(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_138(const struct winSteamUGCDetails_t_138 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_138 *win = (struct winSteamUGCDetails_t_138 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_138(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_138(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_138(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_138 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_138 *win = (struct winSteamUGCDetails_t_138 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_138.h b/lsteamclient/struct_converters_138.h
deleted file mode 100644
index de321584..00000000
--- a/lsteamclient/struct_converters_138.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_138(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_138(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_138(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_138(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_138a.cpp b/lsteamclient/struct_converters_138a.cpp
index 3c3afc72..1686e5fe 100644
--- a/lsteamclient/struct_converters_138a.cpp
+++ b/lsteamclient/struct_converters_138a.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_138a/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_138a {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_138a(const void *w, void *l)
+#define SDKVER_138a
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_138a(const struct winLeaderboardEntry_t_138a *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_138a *win = (struct winLeaderboardEntry_t_138a *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_138a(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_138a(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_138a(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_138a *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_138a *win = (struct winLeaderboardEntry_t_138a *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_138a(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_138a {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_138a(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_138a(const struct winSteamUGCDetails_t_138a *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_138a *win = (struct winSteamUGCDetails_t_138a *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_138a(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_138a(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_138a(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_138a *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_138a *win = (struct winSteamUGCDetails_t_138a *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_138a.h b/lsteamclient/struct_converters_138a.h
deleted file mode 100644
index fdc4fb49..00000000
--- a/lsteamclient/struct_converters_138a.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_138a(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_138a(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_138a(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_138a(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_139.cpp b/lsteamclient/struct_converters_139.cpp
index 6d4f868c..c8b53e71 100644
--- a/lsteamclient/struct_converters_139.cpp
+++ b/lsteamclient/struct_converters_139.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_139/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_139 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_139(const void *w, void *l)
+#define SDKVER_139
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_139(const struct winLeaderboardEntry_t_139 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_139 *win = (struct winLeaderboardEntry_t_139 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_139(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_139(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_139(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_139 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_139 *win = (struct winLeaderboardEntry_t_139 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_139(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_139 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_139(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_139(const struct winSteamUGCDetails_t_139 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_139 *win = (struct winSteamUGCDetails_t_139 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_139(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_139(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_139(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_139 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_139 *win = (struct winSteamUGCDetails_t_139 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_139.h b/lsteamclient/struct_converters_139.h
deleted file mode 100644
index d0f42dbf..00000000
--- a/lsteamclient/struct_converters_139.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_139(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_139(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_139(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_139(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_140.cpp b/lsteamclient/struct_converters_140.cpp
index 8c05ae9b..5ff73a7a 100644
--- a/lsteamclient/struct_converters_140.cpp
+++ b/lsteamclient/struct_converters_140.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_140/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_140 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_140(const void *w, void *l)
+#define SDKVER_140
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_140(const struct winLeaderboardEntry_t_140 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_140 *win = (struct winLeaderboardEntry_t_140 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_140(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_140(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_140(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_140 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_140 *win = (struct winLeaderboardEntry_t_140 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_140(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_140 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_140(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_140(const struct winSteamUGCDetails_t_140 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_140 *win = (struct winSteamUGCDetails_t_140 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_140(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_140(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_140(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_140 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_140 *win = (struct winSteamUGCDetails_t_140 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_140.h b/lsteamclient/struct_converters_140.h
deleted file mode 100644
index 5f8535af..00000000
--- a/lsteamclient/struct_converters_140.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_140(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_140(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_140(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_140(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_141.cpp b/lsteamclient/struct_converters_141.cpp
index a2bffd86..010a9c53 100644
--- a/lsteamclient/struct_converters_141.cpp
+++ b/lsteamclient/struct_converters_141.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_141/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_141 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_141(const void *w, void *l)
+#define SDKVER_141
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_141(const struct winLeaderboardEntry_t_141 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_141 *win = (struct winLeaderboardEntry_t_141 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_141(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_141(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_141(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_141 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_141 *win = (struct winLeaderboardEntry_t_141 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_141(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_141 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_141(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_141(const struct winSteamUGCDetails_t_141 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_141 *win = (struct winSteamUGCDetails_t_141 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_141(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_141(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_141(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_141 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_141 *win = (struct winSteamUGCDetails_t_141 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_141.h b/lsteamclient/struct_converters_141.h
deleted file mode 100644
index a768396c..00000000
--- a/lsteamclient/struct_converters_141.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_141(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_141(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_141(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_141(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_142.cpp b/lsteamclient/struct_converters_142.cpp
index 096eaa77..ff1d65e7 100644
--- a/lsteamclient/struct_converters_142.cpp
+++ b/lsteamclient/struct_converters_142.cpp
@@ -5,19 +5,10 @@
 #include "steamworks_sdk_142/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_142 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_142(const void *w, void *l)
+#define SDKVER_142
+#include "struct_converters.h"
+void win_to_lin_struct_LeaderboardEntry_t_142(const struct winLeaderboardEntry_t_142 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_142 *win = (struct winLeaderboardEntry_t_142 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -25,10 +16,8 @@ void win_to_lin_struct_LeaderboardEntry_t_142(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_142(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_142(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_142 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_142 *win = (struct winLeaderboardEntry_t_142 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -36,40 +25,8 @@ void lin_to_win_struct_LeaderboardEntry_t_142(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_142 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_142(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_142(const struct winSteamUGCDetails_t_142 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_142 *win = (struct winSteamUGCDetails_t_142 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -98,10 +55,8 @@ void win_to_lin_struct_SteamUGCDetails_t_142(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_142(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_142(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_142 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_142 *win = (struct winSteamUGCDetails_t_142 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_142.h b/lsteamclient/struct_converters_142.h
deleted file mode 100644
index bc4e5a02..00000000
--- a/lsteamclient/struct_converters_142.h
+++ /dev/null
@@ -1,6 +0,0 @@
-extern void win_to_lin_struct_LeaderboardEntry_t_142(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_142(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_142(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_142(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_143.cpp b/lsteamclient/struct_converters_143.cpp
index bdb200b3..c700d34f 100644
--- a/lsteamclient/struct_converters_143.cpp
+++ b/lsteamclient/struct_converters_143.cpp
@@ -5,6 +5,8 @@
 #include "steamworks_sdk_143/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
+#define SDKVER_143
+#include "struct_converters.h"
 #pragma pack( push, 8 )
 struct winMicroTxnAuthorizationResponse_t_24 {
     uint32 m_unAppID;
@@ -12,33 +14,21 @@ struct winMicroTxnAuthorizationResponse_t_24 {
     uint8 m_bAuthorized;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_MicroTxnAuthorizationResponse_t_24(const void *l, void *w)
+void cb_MicroTxnAuthorizationResponse_t_24(const struct MicroTxnAuthorizationResponse_t *lin, struct winMicroTxnAuthorizationResponse_t_24 *win)
 {
-    MicroTxnAuthorizationResponse_t *lin = (MicroTxnAuthorizationResponse_t *)l;
-    struct winMicroTxnAuthorizationResponse_t_24 *win = (struct winMicroTxnAuthorizationResponse_t_24 *)w;
     win->m_unAppID = lin->m_unAppID;
     win->m_ulOrderID = lin->m_ulOrderID;
     win->m_bAuthorized = lin->m_bAuthorized;
 }
 
-#pragma pack( push, 8 )
-struct winSteamPartyBeaconLocation_t_143 {
-    ESteamPartyBeaconLocationType m_eType;
-    uint64 m_ulLocationID;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamPartyBeaconLocation_t_143(const void *w, void *l)
+void win_to_lin_struct_SteamPartyBeaconLocation_t_143(const struct winSteamPartyBeaconLocation_t_143 *win, struct SteamPartyBeaconLocation_t *lin)
 {
-    SteamPartyBeaconLocation_t *lin = (SteamPartyBeaconLocation_t *)l;
-    struct winSteamPartyBeaconLocation_t_143 *win = (struct winSteamPartyBeaconLocation_t_143 *)w;
     lin->m_eType = win->m_eType;
     lin->m_ulLocationID = win->m_ulLocationID;
 }
 
-void lin_to_win_struct_SteamPartyBeaconLocation_t_143(const void *l, void *w)
+void lin_to_win_struct_SteamPartyBeaconLocation_t_143(const struct SteamPartyBeaconLocation_t *lin, struct winSteamPartyBeaconLocation_t_143 *win)
 {
-    SteamPartyBeaconLocation_t *lin = (SteamPartyBeaconLocation_t *)l;
-    struct winSteamPartyBeaconLocation_t_143 *win = (struct winSteamPartyBeaconLocation_t_143 *)w;
     win->m_eType = lin->m_eType;
     win->m_ulLocationID = lin->m_ulLocationID;
 }
@@ -49,10 +39,8 @@ struct winLobbyCreated_t_16 {
     uint64 m_ulSteamIDLobby;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_LobbyCreated_t_16(const void *l, void *w)
+void cb_LobbyCreated_t_16(const struct LobbyCreated_t *lin, struct winLobbyCreated_t_16 *win)
 {
-    LobbyCreated_t *lin = (LobbyCreated_t *)l;
-    struct winLobbyCreated_t_16 *win = (struct winLobbyCreated_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_ulSteamIDLobby = lin->m_ulSteamIDLobby;
 }
@@ -63,10 +51,8 @@ struct winRequestPlayersForGameProgressCallback_t_16 {
     uint64 m_ullSearchID;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RequestPlayersForGameProgressCallback_t_16(const void *l, void *w)
+void cb_RequestPlayersForGameProgressCallback_t_16(const struct RequestPlayersForGameProgressCallback_t *lin, struct winRequestPlayersForGameProgressCallback_t_16 *win)
 {
-    RequestPlayersForGameProgressCallback_t *lin = (RequestPlayersForGameProgressCallback_t *)l;
-    struct winRequestPlayersForGameProgressCallback_t_16 *win = (struct winRequestPlayersForGameProgressCallback_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_ullSearchID = lin->m_ullSearchID;
 }
@@ -85,10 +71,8 @@ struct winRequestPlayersForGameResultCallback_t_64 {
     uint64 m_ullUniqueGameID;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RequestPlayersForGameResultCallback_t_64(const void *l, void *w)
+void cb_RequestPlayersForGameResultCallback_t_64(const struct RequestPlayersForGameResultCallback_t *lin, struct winRequestPlayersForGameResultCallback_t_64 *win)
 {
-    RequestPlayersForGameResultCallback_t *lin = (RequestPlayersForGameResultCallback_t *)l;
-    struct winRequestPlayersForGameResultCallback_t_64 *win = (struct winRequestPlayersForGameResultCallback_t_64 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_ullSearchID = lin->m_ullSearchID;
     win->m_SteamIDPlayerFound = lin->m_SteamIDPlayerFound;
@@ -108,10 +92,8 @@ struct winRequestPlayersForGameFinalResultCallback_t_24 {
     uint64 m_ullUniqueGameID;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RequestPlayersForGameFinalResultCallback_t_24(const void *l, void *w)
+void cb_RequestPlayersForGameFinalResultCallback_t_24(const struct RequestPlayersForGameFinalResultCallback_t *lin, struct winRequestPlayersForGameFinalResultCallback_t_24 *win)
 {
-    RequestPlayersForGameFinalResultCallback_t *lin = (RequestPlayersForGameFinalResultCallback_t *)l;
-    struct winRequestPlayersForGameFinalResultCallback_t_24 *win = (struct winRequestPlayersForGameFinalResultCallback_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_ullSearchID = lin->m_ullSearchID;
     win->m_ullUniqueGameID = lin->m_ullUniqueGameID;
@@ -124,10 +106,8 @@ struct winSubmitPlayerResultResultCallback_t_24 {
     CSteamID steamIDPlayer;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_SubmitPlayerResultResultCallback_t_24(const void *l, void *w)
+void cb_SubmitPlayerResultResultCallback_t_24(const struct SubmitPlayerResultResultCallback_t *lin, struct winSubmitPlayerResultResultCallback_t_24 *win)
 {
-    SubmitPlayerResultResultCallback_t *lin = (SubmitPlayerResultResultCallback_t *)l;
-    struct winSubmitPlayerResultResultCallback_t_24 *win = (struct winSubmitPlayerResultResultCallback_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->ullUniqueGameID = lin->ullUniqueGameID;
     win->steamIDPlayer = lin->steamIDPlayer;
@@ -139,10 +119,8 @@ struct winEndGameResultCallback_t_16 {
     uint64 ullUniqueGameID;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_EndGameResultCallback_t_16(const void *l, void *w)
+void cb_EndGameResultCallback_t_16(const struct EndGameResultCallback_t *lin, struct winEndGameResultCallback_t_16 *win)
 {
-    EndGameResultCallback_t *lin = (EndGameResultCallback_t *)l;
-    struct winEndGameResultCallback_t_16 *win = (struct winEndGameResultCallback_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->ullUniqueGameID = lin->ullUniqueGameID;
 }
@@ -155,10 +133,8 @@ struct winJoinPartyCallback_t_280 {
     char m_rgchConnectString[256];
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_JoinPartyCallback_t_280(const void *l, void *w)
+void cb_JoinPartyCallback_t_280(const struct JoinPartyCallback_t *lin, struct winJoinPartyCallback_t_280 *win)
 {
-    JoinPartyCallback_t *lin = (JoinPartyCallback_t *)l;
-    struct winJoinPartyCallback_t_280 *win = (struct winJoinPartyCallback_t_280 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_ulBeaconID = lin->m_ulBeaconID;
     win->m_SteamIDBeaconOwner = lin->m_SteamIDBeaconOwner;
@@ -171,10 +147,8 @@ struct winCreateBeaconCallback_t_16 {
     PartyBeaconID_t m_ulBeaconID;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_CreateBeaconCallback_t_16(const void *l, void *w)
+void cb_CreateBeaconCallback_t_16(const struct CreateBeaconCallback_t *lin, struct winCreateBeaconCallback_t_16 *win)
 {
-    CreateBeaconCallback_t *lin = (CreateBeaconCallback_t *)l;
-    struct winCreateBeaconCallback_t_16 *win = (struct winCreateBeaconCallback_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_ulBeaconID = lin->m_ulBeaconID;
 }
@@ -188,10 +162,8 @@ struct winRemoteStorageAppSyncProgress_t_288 {
     bool m_bUploading;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageAppSyncProgress_t_288(const void *l, void *w)
+void cb_RemoteStorageAppSyncProgress_t_288(const struct RemoteStorageAppSyncProgress_t *lin, struct winRemoteStorageAppSyncProgress_t_288 *win)
 {
-    RemoteStorageAppSyncProgress_t *lin = (RemoteStorageAppSyncProgress_t *)l;
-    struct winRemoteStorageAppSyncProgress_t_288 *win = (struct winRemoteStorageAppSyncProgress_t_288 *)w;
     memcpy(win->m_rgchCurrentFile, lin->m_rgchCurrentFile, sizeof(win->m_rgchCurrentFile));
     win->m_nAppID = lin->m_nAppID;
     win->m_uBytesTransferredThisChunk = lin->m_uBytesTransferredThisChunk;
@@ -206,10 +178,8 @@ struct winRemoteStorageFileShareResult_t_280 {
     char m_rgchFilename[260];
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageFileShareResult_t_280(const void *l, void *w)
+void cb_RemoteStorageFileShareResult_t_280(const struct RemoteStorageFileShareResult_t *lin, struct winRemoteStorageFileShareResult_t_280 *win)
 {
-    RemoteStorageFileShareResult_t *lin = (RemoteStorageFileShareResult_t *)l;
-    struct winRemoteStorageFileShareResult_t_280 *win = (struct winRemoteStorageFileShareResult_t_280 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_hFile = lin->m_hFile;
     memcpy(win->m_rgchFilename, lin->m_rgchFilename, sizeof(win->m_rgchFilename));
@@ -222,10 +192,8 @@ struct winRemoteStoragePublishFileResult_t_24 {
     bool m_bUserNeedsToAcceptWorkshopLegalAgreement;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStoragePublishFileResult_t_24(const void *l, void *w)
+void cb_RemoteStoragePublishFileResult_t_24(const struct RemoteStoragePublishFileResult_t *lin, struct winRemoteStoragePublishFileResult_t_24 *win)
 {
-    RemoteStoragePublishFileResult_t *lin = (RemoteStoragePublishFileResult_t *)l;
-    struct winRemoteStoragePublishFileResult_t_24 *win = (struct winRemoteStoragePublishFileResult_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_bUserNeedsToAcceptWorkshopLegalAgreement = lin->m_bUserNeedsToAcceptWorkshopLegalAgreement;
@@ -237,10 +205,8 @@ struct winRemoteStorageDeletePublishedFileResult_t_16 {
     PublishedFileId_t m_nPublishedFileId;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageDeletePublishedFileResult_t_16(const void *l, void *w)
+void cb_RemoteStorageDeletePublishedFileResult_t_16(const struct RemoteStorageDeletePublishedFileResult_t *lin, struct winRemoteStorageDeletePublishedFileResult_t_16 *win)
 {
-    RemoteStorageDeletePublishedFileResult_t *lin = (RemoteStorageDeletePublishedFileResult_t *)l;
-    struct winRemoteStorageDeletePublishedFileResult_t_16 *win = (struct winRemoteStorageDeletePublishedFileResult_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
 }
@@ -253,10 +219,8 @@ struct winRemoteStorageEnumerateUserPublishedFilesResult_t_416 {
     PublishedFileId_t m_rgPublishedFileId[50];
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageEnumerateUserPublishedFilesResult_t_416(const void *l, void *w)
+void cb_RemoteStorageEnumerateUserPublishedFilesResult_t_416(const struct RemoteStorageEnumerateUserPublishedFilesResult_t *lin, struct winRemoteStorageEnumerateUserPublishedFilesResult_t_416 *win)
 {
-    RemoteStorageEnumerateUserPublishedFilesResult_t *lin = (RemoteStorageEnumerateUserPublishedFilesResult_t *)l;
-    struct winRemoteStorageEnumerateUserPublishedFilesResult_t_416 *win = (struct winRemoteStorageEnumerateUserPublishedFilesResult_t_416 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nResultsReturned = lin->m_nResultsReturned;
     win->m_nTotalResultCount = lin->m_nTotalResultCount;
@@ -269,10 +233,8 @@ struct winRemoteStorageSubscribePublishedFileResult_t_16 {
     PublishedFileId_t m_nPublishedFileId;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageSubscribePublishedFileResult_t_16(const void *l, void *w)
+void cb_RemoteStorageSubscribePublishedFileResult_t_16(const struct RemoteStorageSubscribePublishedFileResult_t *lin, struct winRemoteStorageSubscribePublishedFileResult_t_16 *win)
 {
-    RemoteStorageSubscribePublishedFileResult_t *lin = (RemoteStorageSubscribePublishedFileResult_t *)l;
-    struct winRemoteStorageSubscribePublishedFileResult_t_16 *win = (struct winRemoteStorageSubscribePublishedFileResult_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
 }
@@ -286,10 +248,8 @@ struct winRemoteStorageEnumerateUserSubscribedFilesResult_t_616 {
     uint32 m_rgRTimeSubscribed[50];
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageEnumerateUserSubscribedFilesResult_t_616(const void *l, void *w)
+void cb_RemoteStorageEnumerateUserSubscribedFilesResult_t_616(const struct RemoteStorageEnumerateUserSubscribedFilesResult_t *lin, struct winRemoteStorageEnumerateUserSubscribedFilesResult_t_616 *win)
 {
-    RemoteStorageEnumerateUserSubscribedFilesResult_t *lin = (RemoteStorageEnumerateUserSubscribedFilesResult_t *)l;
-    struct winRemoteStorageEnumerateUserSubscribedFilesResult_t_616 *win = (struct winRemoteStorageEnumerateUserSubscribedFilesResult_t_616 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nResultsReturned = lin->m_nResultsReturned;
     win->m_nTotalResultCount = lin->m_nTotalResultCount;
@@ -303,10 +263,8 @@ struct winRemoteStorageUnsubscribePublishedFileResult_t_16 {
     PublishedFileId_t m_nPublishedFileId;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageUnsubscribePublishedFileResult_t_16(const void *l, void *w)
+void cb_RemoteStorageUnsubscribePublishedFileResult_t_16(const struct RemoteStorageUnsubscribePublishedFileResult_t *lin, struct winRemoteStorageUnsubscribePublishedFileResult_t_16 *win)
 {
-    RemoteStorageUnsubscribePublishedFileResult_t *lin = (RemoteStorageUnsubscribePublishedFileResult_t *)l;
-    struct winRemoteStorageUnsubscribePublishedFileResult_t_16 *win = (struct winRemoteStorageUnsubscribePublishedFileResult_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
 }
@@ -318,10 +276,8 @@ struct winRemoteStorageUpdatePublishedFileResult_t_24 {
     bool m_bUserNeedsToAcceptWorkshopLegalAgreement;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageUpdatePublishedFileResult_t_24(const void *l, void *w)
+void cb_RemoteStorageUpdatePublishedFileResult_t_24(const struct RemoteStorageUpdatePublishedFileResult_t *lin, struct winRemoteStorageUpdatePublishedFileResult_t_24 *win)
 {
-    RemoteStorageUpdatePublishedFileResult_t *lin = (RemoteStorageUpdatePublishedFileResult_t *)l;
-    struct winRemoteStorageUpdatePublishedFileResult_t_24 *win = (struct winRemoteStorageUpdatePublishedFileResult_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_bUserNeedsToAcceptWorkshopLegalAgreement = lin->m_bUserNeedsToAcceptWorkshopLegalAgreement;
@@ -337,10 +293,8 @@ struct winRemoteStorageDownloadUGCResult_t_296 {
     uint64 m_ulSteamIDOwner;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageDownloadUGCResult_t_296(const void *l, void *w)
+void cb_RemoteStorageDownloadUGCResult_t_296(const struct RemoteStorageDownloadUGCResult_t *lin, struct winRemoteStorageDownloadUGCResult_t_296 *win)
 {
-    RemoteStorageDownloadUGCResult_t *lin = (RemoteStorageDownloadUGCResult_t *)l;
-    struct winRemoteStorageDownloadUGCResult_t_296 *win = (struct winRemoteStorageDownloadUGCResult_t_296 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_hFile = lin->m_hFile;
     win->m_nAppID = lin->m_nAppID;
@@ -374,10 +328,8 @@ struct winRemoteStorageGetPublishedFileDetailsResult_t_9760 {
     bool m_bAcceptedForUse;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageGetPublishedFileDetailsResult_t_9760(const void *l, void *w)
+void cb_RemoteStorageGetPublishedFileDetailsResult_t_9760(const struct RemoteStorageGetPublishedFileDetailsResult_t *lin, struct winRemoteStorageGetPublishedFileDetailsResult_t_9760 *win)
 {
-    RemoteStorageGetPublishedFileDetailsResult_t *lin = (RemoteStorageGetPublishedFileDetailsResult_t *)l;
-    struct winRemoteStorageGetPublishedFileDetailsResult_t_9760 *win = (struct winRemoteStorageGetPublishedFileDetailsResult_t_9760 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_nCreatorAppID = lin->m_nCreatorAppID;
@@ -412,10 +364,8 @@ struct winRemoteStorageEnumerateWorkshopFilesResult_t_624 {
     uint32 m_unStartIndex;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageEnumerateWorkshopFilesResult_t_624(const void *l, void *w)
+void cb_RemoteStorageEnumerateWorkshopFilesResult_t_624(const struct RemoteStorageEnumerateWorkshopFilesResult_t *lin, struct winRemoteStorageEnumerateWorkshopFilesResult_t_624 *win)
 {
-    RemoteStorageEnumerateWorkshopFilesResult_t *lin = (RemoteStorageEnumerateWorkshopFilesResult_t *)l;
-    struct winRemoteStorageEnumerateWorkshopFilesResult_t_624 *win = (struct winRemoteStorageEnumerateWorkshopFilesResult_t_624 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nResultsReturned = lin->m_nResultsReturned;
     win->m_nTotalResultCount = lin->m_nTotalResultCount;
@@ -435,10 +385,8 @@ struct winRemoteStorageGetPublishedItemVoteDetailsResult_t_32 {
     float m_fScore;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32(const void *l, void *w)
+void cb_RemoteStorageGetPublishedItemVoteDetailsResult_t_32(const struct RemoteStorageGetPublishedItemVoteDetailsResult_t *lin, struct winRemoteStorageGetPublishedItemVoteDetailsResult_t_32 *win)
 {
-    RemoteStorageGetPublishedItemVoteDetailsResult_t *lin = (RemoteStorageGetPublishedItemVoteDetailsResult_t *)l;
-    struct winRemoteStorageGetPublishedItemVoteDetailsResult_t_32 *win = (struct winRemoteStorageGetPublishedItemVoteDetailsResult_t_32 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_unPublishedFileId = lin->m_unPublishedFileId;
     win->m_nVotesFor = lin->m_nVotesFor;
@@ -453,10 +401,8 @@ struct winRemoteStorageUpdateUserPublishedItemVoteResult_t_16 {
     PublishedFileId_t m_nPublishedFileId;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16(const void *l, void *w)
+void cb_RemoteStorageUpdateUserPublishedItemVoteResult_t_16(const struct RemoteStorageUpdateUserPublishedItemVoteResult_t *lin, struct winRemoteStorageUpdateUserPublishedItemVoteResult_t_16 *win)
 {
-    RemoteStorageUpdateUserPublishedItemVoteResult_t *lin = (RemoteStorageUpdateUserPublishedItemVoteResult_t *)l;
-    struct winRemoteStorageUpdateUserPublishedItemVoteResult_t_16 *win = (struct winRemoteStorageUpdateUserPublishedItemVoteResult_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
 }
@@ -468,10 +414,8 @@ struct winRemoteStorageUserVoteDetails_t_24 {
     EWorkshopVote m_eVote;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageUserVoteDetails_t_24(const void *l, void *w)
+void cb_RemoteStorageUserVoteDetails_t_24(const struct RemoteStorageUserVoteDetails_t *lin, struct winRemoteStorageUserVoteDetails_t_24 *win)
 {
-    RemoteStorageUserVoteDetails_t *lin = (RemoteStorageUserVoteDetails_t *)l;
-    struct winRemoteStorageUserVoteDetails_t_24 *win = (struct winRemoteStorageUserVoteDetails_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eVote = lin->m_eVote;
@@ -485,10 +429,8 @@ struct winRemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 {
     PublishedFileId_t m_rgPublishedFileId[50];
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416(const void *l, void *w)
+void cb_RemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416(const struct RemoteStorageEnumerateUserSharedWorkshopFilesResult_t *lin, struct winRemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 *win)
 {
-    RemoteStorageEnumerateUserSharedWorkshopFilesResult_t *lin = (RemoteStorageEnumerateUserSharedWorkshopFilesResult_t *)l;
-    struct winRemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 *win = (struct winRemoteStorageEnumerateUserSharedWorkshopFilesResult_t_416 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nResultsReturned = lin->m_nResultsReturned;
     win->m_nTotalResultCount = lin->m_nTotalResultCount;
@@ -502,10 +444,8 @@ struct winRemoteStorageSetUserPublishedFileActionResult_t_24 {
     EWorkshopFileAction m_eAction;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStorageSetUserPublishedFileActionResult_t_24(const void *l, void *w)
+void cb_RemoteStorageSetUserPublishedFileActionResult_t_24(const struct RemoteStorageSetUserPublishedFileActionResult_t *lin, struct winRemoteStorageSetUserPublishedFileActionResult_t_24 *win)
 {
-    RemoteStorageSetUserPublishedFileActionResult_t *lin = (RemoteStorageSetUserPublishedFileActionResult_t *)l;
-    struct winRemoteStorageSetUserPublishedFileActionResult_t_24 *win = (struct winRemoteStorageSetUserPublishedFileActionResult_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eAction = lin->m_eAction;
@@ -518,28 +458,15 @@ struct winRemoteStoragePublishedFileUpdated_t_24 {
     uint64 m_ulUnused;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoteStoragePublishedFileUpdated_t_24(const void *l, void *w)
+void cb_RemoteStoragePublishedFileUpdated_t_24(const struct RemoteStoragePublishedFileUpdated_t *lin, struct winRemoteStoragePublishedFileUpdated_t_24 *win)
 {
-    RemoteStoragePublishedFileUpdated_t *lin = (RemoteStoragePublishedFileUpdated_t *)l;
-    struct winRemoteStoragePublishedFileUpdated_t_24 *win = (struct winRemoteStoragePublishedFileUpdated_t_24 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_nAppID = lin->m_nAppID;
     win->m_ulUnused = lin->m_ulUnused;
 }
 
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_143 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_143(const void *w, void *l)
+void win_to_lin_struct_LeaderboardEntry_t_143(const struct winLeaderboardEntry_t_143 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_143 *win = (struct winLeaderboardEntry_t_143 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -547,10 +474,8 @@ void win_to_lin_struct_LeaderboardEntry_t_143(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_143(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_143(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_143 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_143 *win = (struct winLeaderboardEntry_t_143 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -568,10 +493,8 @@ struct winLeaderboardScoreUploaded_t_32 {
     int m_nGlobalRankPrevious;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_LeaderboardScoreUploaded_t_32(const void *l, void *w)
+void cb_LeaderboardScoreUploaded_t_32(const struct LeaderboardScoreUploaded_t *lin, struct winLeaderboardScoreUploaded_t_32 *win)
 {
-    LeaderboardScoreUploaded_t *lin = (LeaderboardScoreUploaded_t *)l;
-    struct winLeaderboardScoreUploaded_t_32 *win = (struct winLeaderboardScoreUploaded_t_32 *)w;
     win->m_bSuccess = lin->m_bSuccess;
     win->m_hSteamLeaderboard = lin->m_hSteamLeaderboard;
     win->m_nScore = lin->m_nScore;
@@ -586,10 +509,8 @@ struct winLeaderboardUGCSet_t_16 {
     SteamLeaderboard_t m_hSteamLeaderboard;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_LeaderboardUGCSet_t_16(const void *l, void *w)
+void cb_LeaderboardUGCSet_t_16(const struct LeaderboardUGCSet_t *lin, struct winLeaderboardUGCSet_t_16 *win)
 {
-    LeaderboardUGCSet_t *lin = (LeaderboardUGCSet_t *)l;
-    struct winLeaderboardUGCSet_t_16 *win = (struct winLeaderboardUGCSet_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_hSteamLeaderboard = lin->m_hSteamLeaderboard;
 }
@@ -601,10 +522,8 @@ struct winPS3TrophiesInstalled_t_24 {
     uint64 m_ulRequiredDiskSpace;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_PS3TrophiesInstalled_t_24(const void *l, void *w)
+void cb_PS3TrophiesInstalled_t_24(const struct PS3TrophiesInstalled_t *lin, struct winPS3TrophiesInstalled_t_24 *win)
 {
-    PS3TrophiesInstalled_t *lin = (PS3TrophiesInstalled_t *)l;
-    struct winPS3TrophiesInstalled_t_24 *win = (struct winPS3TrophiesInstalled_t_24 *)w;
     win->m_nGameID = lin->m_nGameID;
     win->m_eResult = lin->m_eResult;
     win->m_ulRequiredDiskSpace = lin->m_ulRequiredDiskSpace;
@@ -618,10 +537,8 @@ struct winFileDetailsResult_t_40 {
     uint32 m_unFlags;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_FileDetailsResult_t_40(const void *l, void *w)
+void cb_FileDetailsResult_t_40(const struct FileDetailsResult_t *lin, struct winFileDetailsResult_t_40 *win)
 {
-    FileDetailsResult_t *lin = (FileDetailsResult_t *)l;
-    struct winFileDetailsResult_t_40 *win = (struct winFileDetailsResult_t_40 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_ulFileSize = lin->m_ulFileSize;
     memcpy(win->m_FileSHA, lin->m_FileSHA, sizeof(win->m_FileSHA));
@@ -637,10 +554,8 @@ struct winHTTPRequestCompleted_t_32 {
     uint32 m_unBodySize;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_HTTPRequestCompleted_t_32(const void *l, void *w)
+void cb_HTTPRequestCompleted_t_32(const struct HTTPRequestCompleted_t *lin, struct winHTTPRequestCompleted_t_32 *win)
 {
-    HTTPRequestCompleted_t *lin = (HTTPRequestCompleted_t *)l;
-    struct winHTTPRequestCompleted_t_32 *win = (struct winHTTPRequestCompleted_t_32 *)w;
     win->m_hRequest = lin->m_hRequest;
     win->m_ulContextValue = lin->m_ulContextValue;
     win->m_bRequestSuccessful = lin->m_bRequestSuccessful;
@@ -654,10 +569,8 @@ struct winHTTPRequestHeadersReceived_t_16 {
     uint64 m_ulContextValue;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_HTTPRequestHeadersReceived_t_16(const void *l, void *w)
+void cb_HTTPRequestHeadersReceived_t_16(const struct HTTPRequestHeadersReceived_t *lin, struct winHTTPRequestHeadersReceived_t_16 *win)
 {
-    HTTPRequestHeadersReceived_t *lin = (HTTPRequestHeadersReceived_t *)l;
-    struct winHTTPRequestHeadersReceived_t_16 *win = (struct winHTTPRequestHeadersReceived_t_16 *)w;
     win->m_hRequest = lin->m_hRequest;
     win->m_ulContextValue = lin->m_ulContextValue;
 }
@@ -670,50 +583,16 @@ struct winHTTPRequestDataReceived_t_24 {
     uint32 m_cBytesReceived;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_HTTPRequestDataReceived_t_24(const void *l, void *w)
+void cb_HTTPRequestDataReceived_t_24(const struct HTTPRequestDataReceived_t *lin, struct winHTTPRequestDataReceived_t_24 *win)
 {
-    HTTPRequestDataReceived_t *lin = (HTTPRequestDataReceived_t *)l;
-    struct winHTTPRequestDataReceived_t_24 *win = (struct winHTTPRequestDataReceived_t_24 *)w;
     win->m_hRequest = lin->m_hRequest;
     win->m_ulContextValue = lin->m_ulContextValue;
     win->m_cOffset = lin->m_cOffset;
     win->m_cBytesReceived = lin->m_cBytesReceived;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_143 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_143(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_143(const struct winSteamUGCDetails_t_143 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_143 *win = (struct winSteamUGCDetails_t_143 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -742,10 +621,8 @@ void win_to_lin_struct_SteamUGCDetails_t_143(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_143(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_143(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_143 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_143 *win = (struct winSteamUGCDetails_t_143 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
@@ -780,10 +657,8 @@ struct winSteamUGCRequestUGCDetailsResult_t_9784 {
     bool m_bCachedData;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_SteamUGCRequestUGCDetailsResult_t_9784(const void *l, void *w)
+void cb_SteamUGCRequestUGCDetailsResult_t_9784(const struct SteamUGCRequestUGCDetailsResult_t *lin, struct winSteamUGCRequestUGCDetailsResult_t_9784 *win)
 {
-    SteamUGCRequestUGCDetailsResult_t *lin = (SteamUGCRequestUGCDetailsResult_t *)l;
-    struct winSteamUGCRequestUGCDetailsResult_t_9784 *win = (struct winSteamUGCRequestUGCDetailsResult_t_9784 *)w;
     lin_to_win_struct_SteamUGCDetails_t_143(&lin->m_details, &win->m_details);
     win->m_bCachedData = lin->m_bCachedData;
 }
@@ -795,10 +670,8 @@ struct winCreateItemResult_t_24 {
     bool m_bUserNeedsToAcceptWorkshopLegalAgreement;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_CreateItemResult_t_24(const void *l, void *w)
+void cb_CreateItemResult_t_24(const struct CreateItemResult_t *lin, struct winCreateItemResult_t_24 *win)
 {
-    CreateItemResult_t *lin = (CreateItemResult_t *)l;
-    struct winCreateItemResult_t_24 *win = (struct winCreateItemResult_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_bUserNeedsToAcceptWorkshopLegalAgreement = lin->m_bUserNeedsToAcceptWorkshopLegalAgreement;
@@ -810,10 +683,8 @@ struct winItemInstalled_t_16 {
     PublishedFileId_t m_nPublishedFileId;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_ItemInstalled_t_16(const void *l, void *w)
+void cb_ItemInstalled_t_16(const struct ItemInstalled_t *lin, struct winItemInstalled_t_16 *win)
 {
-    ItemInstalled_t *lin = (ItemInstalled_t *)l;
-    struct winItemInstalled_t_16 *win = (struct winItemInstalled_t_16 *)w;
     win->m_unAppID = lin->m_unAppID;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
 }
@@ -825,10 +696,8 @@ struct winDownloadItemResult_t_24 {
     EResult m_eResult;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_DownloadItemResult_t_24(const void *l, void *w)
+void cb_DownloadItemResult_t_24(const struct DownloadItemResult_t *lin, struct winDownloadItemResult_t_24 *win)
 {
-    DownloadItemResult_t *lin = (DownloadItemResult_t *)l;
-    struct winDownloadItemResult_t_24 *win = (struct winDownloadItemResult_t_24 *)w;
     win->m_unAppID = lin->m_unAppID;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
@@ -841,10 +710,8 @@ struct winAddUGCDependencyResult_t_24 {
     PublishedFileId_t m_nChildPublishedFileId;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_AddUGCDependencyResult_t_24(const void *l, void *w)
+void cb_AddUGCDependencyResult_t_24(const struct AddUGCDependencyResult_t *lin, struct winAddUGCDependencyResult_t_24 *win)
 {
-    AddUGCDependencyResult_t *lin = (AddUGCDependencyResult_t *)l;
-    struct winAddUGCDependencyResult_t_24 *win = (struct winAddUGCDependencyResult_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_nChildPublishedFileId = lin->m_nChildPublishedFileId;
@@ -857,10 +724,8 @@ struct winRemoveUGCDependencyResult_t_24 {
     PublishedFileId_t m_nChildPublishedFileId;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoveUGCDependencyResult_t_24(const void *l, void *w)
+void cb_RemoveUGCDependencyResult_t_24(const struct RemoveUGCDependencyResult_t *lin, struct winRemoveUGCDependencyResult_t_24 *win)
 {
-    RemoveUGCDependencyResult_t *lin = (RemoveUGCDependencyResult_t *)l;
-    struct winRemoveUGCDependencyResult_t_24 *win = (struct winRemoveUGCDependencyResult_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_nChildPublishedFileId = lin->m_nChildPublishedFileId;
@@ -873,10 +738,8 @@ struct winAddAppDependencyResult_t_24 {
     AppId_t m_nAppID;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_AddAppDependencyResult_t_24(const void *l, void *w)
+void cb_AddAppDependencyResult_t_24(const struct AddAppDependencyResult_t *lin, struct winAddAppDependencyResult_t_24 *win)
 {
-    AddAppDependencyResult_t *lin = (AddAppDependencyResult_t *)l;
-    struct winAddAppDependencyResult_t_24 *win = (struct winAddAppDependencyResult_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_nAppID = lin->m_nAppID;
@@ -889,10 +752,8 @@ struct winRemoveAppDependencyResult_t_24 {
     AppId_t m_nAppID;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_RemoveAppDependencyResult_t_24(const void *l, void *w)
+void cb_RemoveAppDependencyResult_t_24(const struct RemoveAppDependencyResult_t *lin, struct winRemoveAppDependencyResult_t_24 *win)
 {
-    RemoveAppDependencyResult_t *lin = (RemoveAppDependencyResult_t *)l;
-    struct winRemoveAppDependencyResult_t_24 *win = (struct winRemoveAppDependencyResult_t_24 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_nAppID = lin->m_nAppID;
@@ -907,10 +768,8 @@ struct winGetAppDependenciesResult_t_152 {
     uint32 m_nTotalNumAppDependencies;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_GetAppDependenciesResult_t_152(const void *l, void *w)
+void cb_GetAppDependenciesResult_t_152(const struct GetAppDependenciesResult_t *lin, struct winGetAppDependenciesResult_t_152 *win)
 {
-    GetAppDependenciesResult_t *lin = (GetAppDependenciesResult_t *)l;
-    struct winGetAppDependenciesResult_t_152 *win = (struct winGetAppDependenciesResult_t_152 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     memcpy(win->m_rgAppIDs, lin->m_rgAppIDs, sizeof(win->m_rgAppIDs));
@@ -924,10 +783,8 @@ struct winDeleteItemResult_t_16 {
     PublishedFileId_t m_nPublishedFileId;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_DeleteItemResult_t_16(const void *l, void *w)
+void cb_DeleteItemResult_t_16(const struct DeleteItemResult_t *lin, struct winDeleteItemResult_t_16 *win)
 {
-    DeleteItemResult_t *lin = (DeleteItemResult_t *)l;
-    struct winDeleteItemResult_t_16 *win = (struct winDeleteItemResult_t_16 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
 }
@@ -939,10 +796,8 @@ struct winHTML_FileOpenDialog_t_12 {
     const char * pchInitialFile;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_HTML_FileOpenDialog_t_12(const void *l, void *w)
+void cb_HTML_FileOpenDialog_t_12(const struct HTML_FileOpenDialog_t *lin, struct winHTML_FileOpenDialog_t_12 *win)
 {
-    HTML_FileOpenDialog_t *lin = (HTML_FileOpenDialog_t *)l;
-    struct winHTML_FileOpenDialog_t_12 *win = (struct winHTML_FileOpenDialog_t_12 *)w;
     win->unBrowserHandle = lin->unBrowserHandle;
     win->pchTitle = lin->pchTitle;
     steamclient_unix_path_to_dos_path(1, lin->pchInitialFile, g_tmppath, sizeof(g_tmppath));
@@ -956,10 +811,8 @@ struct winSteamInventoryStartPurchaseResult_t_24 {
     uint64 m_ulTransID;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_SteamInventoryStartPurchaseResult_t_24(const void *l, void *w)
+void cb_SteamInventoryStartPurchaseResult_t_24(const struct SteamInventoryStartPurchaseResult_t *lin, struct winSteamInventoryStartPurchaseResult_t_24 *win)
 {
-    SteamInventoryStartPurchaseResult_t *lin = (SteamInventoryStartPurchaseResult_t *)l;
-    struct winSteamInventoryStartPurchaseResult_t_24 *win = (struct winSteamInventoryStartPurchaseResult_t_24 *)w;
     win->m_result = lin->m_result;
     win->m_ulOrderID = lin->m_ulOrderID;
     win->m_ulTransID = lin->m_ulTransID;
@@ -976,10 +829,8 @@ struct winGSReputation_t_40 {
     uint32 m_unBanExpires;
 }  __attribute__ ((ms_struct));
 #pragma pack( pop )
-void cb_GSReputation_t_40(const void *l, void *w)
+void cb_GSReputation_t_40(const struct GSReputation_t *lin, struct winGSReputation_t_40 *win)
 {
-    GSReputation_t *lin = (GSReputation_t *)l;
-    struct winGSReputation_t_40 *win = (struct winGSReputation_t_40 *)w;
     win->m_eResult = lin->m_eResult;
     win->m_unReputationScore = lin->m_unReputationScore;
     win->m_bBanned = lin->m_bBanned;
diff --git a/lsteamclient/struct_converters_143.h b/lsteamclient/struct_converters_143.h
deleted file mode 100644
index 7d78e56d..00000000
--- a/lsteamclient/struct_converters_143.h
+++ /dev/null
@@ -1,9 +0,0 @@
-extern void win_to_lin_struct_SteamPartyBeaconLocation_t_143(const void *w, void *l);
-extern void lin_to_win_struct_SteamPartyBeaconLocation_t_143(const void *l, void *w);
-
-extern void win_to_lin_struct_LeaderboardEntry_t_143(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_143(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_143(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_143(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_next.cpp b/lsteamclient/struct_converters_next.cpp
index 5d53ce87..05f321c7 100644
--- a/lsteamclient/struct_converters_next.cpp
+++ b/lsteamclient/struct_converters_next.cpp
@@ -5,41 +5,22 @@
 #include "steamworks_sdk_next/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winSteamPartyBeaconLocation_t_next {
-    ESteamPartyBeaconLocationType m_eType;
-    uint64 m_ulLocationID;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamPartyBeaconLocation_t_next(const void *w, void *l)
+#define SDKVER_next
+#include "struct_converters.h"
+void win_to_lin_struct_SteamPartyBeaconLocation_t_next(const struct winSteamPartyBeaconLocation_t_next *win, struct SteamPartyBeaconLocation_t *lin)
 {
-    SteamPartyBeaconLocation_t *lin = (SteamPartyBeaconLocation_t *)l;
-    struct winSteamPartyBeaconLocation_t_next *win = (struct winSteamPartyBeaconLocation_t_next *)w;
     lin->m_eType = win->m_eType;
     lin->m_ulLocationID = win->m_ulLocationID;
 }
 
-void lin_to_win_struct_SteamPartyBeaconLocation_t_next(const void *l, void *w)
+void lin_to_win_struct_SteamPartyBeaconLocation_t_next(const struct SteamPartyBeaconLocation_t *lin, struct winSteamPartyBeaconLocation_t_next *win)
 {
-    SteamPartyBeaconLocation_t *lin = (SteamPartyBeaconLocation_t *)l;
-    struct winSteamPartyBeaconLocation_t_next *win = (struct winSteamPartyBeaconLocation_t_next *)w;
     win->m_eType = lin->m_eType;
     win->m_ulLocationID = lin->m_ulLocationID;
 }
 
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_next {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_next(const void *w, void *l)
+void win_to_lin_struct_LeaderboardEntry_t_next(const struct winLeaderboardEntry_t_next *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_next *win = (struct winLeaderboardEntry_t_next *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -47,10 +28,8 @@ void win_to_lin_struct_LeaderboardEntry_t_next(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_next(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_next(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_next *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_next *win = (struct winLeaderboardEntry_t_next *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -58,40 +37,8 @@ void lin_to_win_struct_LeaderboardEntry_t_next(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_next {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_next(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_next(const struct winSteamUGCDetails_t_next *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_next *win = (struct winSteamUGCDetails_t_next *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -120,10 +67,8 @@ void win_to_lin_struct_SteamUGCDetails_t_next(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_next(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_next(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_next *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_next *win = (struct winSteamUGCDetails_t_next *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_next.h b/lsteamclient/struct_converters_next.h
deleted file mode 100644
index cfdc884f..00000000
--- a/lsteamclient/struct_converters_next.h
+++ /dev/null
@@ -1,9 +0,0 @@
-extern void win_to_lin_struct_SteamPartyBeaconLocation_t_next(const void *w, void *l);
-extern void lin_to_win_struct_SteamPartyBeaconLocation_t_next(const void *l, void *w);
-
-extern void win_to_lin_struct_LeaderboardEntry_t_next(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_next(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_next(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_next(const void *l, void *w);
-
diff --git a/lsteamclient/struct_converters_next2.cpp b/lsteamclient/struct_converters_next2.cpp
index b50b2be8..34a25823 100644
--- a/lsteamclient/struct_converters_next2.cpp
+++ b/lsteamclient/struct_converters_next2.cpp
@@ -5,41 +5,22 @@
 #include "steamworks_sdk_next2/isteamgamecoordinator.h"
 #include "steamclient_private.h"
 extern "C" {
-#pragma pack( push, 8 )
-struct winSteamPartyBeaconLocation_t_next2 {
-    ESteamPartyBeaconLocationType m_eType;
-    uint64 m_ulLocationID;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamPartyBeaconLocation_t_next2(const void *w, void *l)
+#define SDKVER_next2
+#include "struct_converters.h"
+void win_to_lin_struct_SteamPartyBeaconLocation_t_next2(const struct winSteamPartyBeaconLocation_t_next2 *win, struct SteamPartyBeaconLocation_t *lin)
 {
-    SteamPartyBeaconLocation_t *lin = (SteamPartyBeaconLocation_t *)l;
-    struct winSteamPartyBeaconLocation_t_next2 *win = (struct winSteamPartyBeaconLocation_t_next2 *)w;
     lin->m_eType = win->m_eType;
     lin->m_ulLocationID = win->m_ulLocationID;
 }
 
-void lin_to_win_struct_SteamPartyBeaconLocation_t_next2(const void *l, void *w)
+void lin_to_win_struct_SteamPartyBeaconLocation_t_next2(const struct SteamPartyBeaconLocation_t *lin, struct winSteamPartyBeaconLocation_t_next2 *win)
 {
-    SteamPartyBeaconLocation_t *lin = (SteamPartyBeaconLocation_t *)l;
-    struct winSteamPartyBeaconLocation_t_next2 *win = (struct winSteamPartyBeaconLocation_t_next2 *)w;
     win->m_eType = lin->m_eType;
     win->m_ulLocationID = lin->m_ulLocationID;
 }
 
-#pragma pack( push, 8 )
-struct winLeaderboardEntry_t_next2 {
-    CSteamID m_steamIDUser;
-    int32 m_nGlobalRank;
-    int32 m_nScore;
-    int32 m_cDetails;
-    UGCHandle_t m_hUGC;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_LeaderboardEntry_t_next2(const void *w, void *l)
+void win_to_lin_struct_LeaderboardEntry_t_next2(const struct winLeaderboardEntry_t_next2 *win, struct LeaderboardEntry_t *lin)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_next2 *win = (struct winLeaderboardEntry_t_next2 *)w;
     lin->m_steamIDUser = win->m_steamIDUser;
     lin->m_nGlobalRank = win->m_nGlobalRank;
     lin->m_nScore = win->m_nScore;
@@ -47,10 +28,8 @@ void win_to_lin_struct_LeaderboardEntry_t_next2(const void *w, void *l)
     lin->m_hUGC = win->m_hUGC;
 }
 
-void lin_to_win_struct_LeaderboardEntry_t_next2(const void *l, void *w)
+void lin_to_win_struct_LeaderboardEntry_t_next2(const struct LeaderboardEntry_t *lin, struct winLeaderboardEntry_t_next2 *win)
 {
-    LeaderboardEntry_t *lin = (LeaderboardEntry_t *)l;
-    struct winLeaderboardEntry_t_next2 *win = (struct winLeaderboardEntry_t_next2 *)w;
     win->m_steamIDUser = lin->m_steamIDUser;
     win->m_nGlobalRank = lin->m_nGlobalRank;
     win->m_nScore = lin->m_nScore;
@@ -58,40 +37,8 @@ void lin_to_win_struct_LeaderboardEntry_t_next2(const void *l, void *w)
     win->m_hUGC = lin->m_hUGC;
 }
 
-#pragma pack( push, 8 )
-struct winSteamUGCDetails_t_next2 {
-    PublishedFileId_t m_nPublishedFileId;
-    EResult m_eResult;
-    EWorkshopFileType m_eFileType;
-    AppId_t m_nCreatorAppID;
-    AppId_t m_nConsumerAppID;
-    char m_rgchTitle[129];
-    char m_rgchDescription[8000];
-    uint64 m_ulSteamIDOwner;
-    uint32 m_rtimeCreated;
-    uint32 m_rtimeUpdated;
-    uint32 m_rtimeAddedToUserList;
-    ERemoteStoragePublishedFileVisibility m_eVisibility;
-    bool m_bBanned;
-    bool m_bAcceptedForUse;
-    bool m_bTagsTruncated;
-    char m_rgchTags[1025];
-    UGCHandle_t m_hFile;
-    UGCHandle_t m_hPreviewFile;
-    char m_pchFileName[260];
-    int32 m_nFileSize;
-    int32 m_nPreviewFileSize;
-    char m_rgchURL[256];
-    uint32 m_unVotesUp;
-    uint32 m_unVotesDown;
-    float m_flScore;
-    uint32 m_unNumChildren;
-}  __attribute__ ((ms_struct));
-#pragma pack( pop )
-void win_to_lin_struct_SteamUGCDetails_t_next2(const void *w, void *l)
+void win_to_lin_struct_SteamUGCDetails_t_next2(const struct winSteamUGCDetails_t_next2 *win, struct SteamUGCDetails_t *lin)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_next2 *win = (struct winSteamUGCDetails_t_next2 *)w;
     lin->m_nPublishedFileId = win->m_nPublishedFileId;
     lin->m_eResult = win->m_eResult;
     lin->m_eFileType = win->m_eFileType;
@@ -120,10 +67,8 @@ void win_to_lin_struct_SteamUGCDetails_t_next2(const void *w, void *l)
     lin->m_unNumChildren = win->m_unNumChildren;
 }
 
-void lin_to_win_struct_SteamUGCDetails_t_next2(const void *l, void *w)
+void lin_to_win_struct_SteamUGCDetails_t_next2(const struct SteamUGCDetails_t *lin, struct winSteamUGCDetails_t_next2 *win)
 {
-    SteamUGCDetails_t *lin = (SteamUGCDetails_t *)l;
-    struct winSteamUGCDetails_t_next2 *win = (struct winSteamUGCDetails_t_next2 *)w;
     win->m_nPublishedFileId = lin->m_nPublishedFileId;
     win->m_eResult = lin->m_eResult;
     win->m_eFileType = lin->m_eFileType;
diff --git a/lsteamclient/struct_converters_next2.h b/lsteamclient/struct_converters_next2.h
deleted file mode 100644
index 20352f8c..00000000
--- a/lsteamclient/struct_converters_next2.h
+++ /dev/null
@@ -1,9 +0,0 @@
-extern void win_to_lin_struct_SteamPartyBeaconLocation_t_next2(const void *w, void *l);
-extern void lin_to_win_struct_SteamPartyBeaconLocation_t_next2(const void *l, void *w);
-
-extern void win_to_lin_struct_LeaderboardEntry_t_next2(const void *w, void *l);
-extern void lin_to_win_struct_LeaderboardEntry_t_next2(const void *l, void *w);
-
-extern void win_to_lin_struct_SteamUGCDetails_t_next2(const void *w, void *l);
-extern void lin_to_win_struct_SteamUGCDetails_t_next2(const void *l, void *w);
-
diff --git a/lsteamclient/winISteamAppList.c b/lsteamclient/winISteamAppList.c
index e3f68db5..ccfe79e8 100644
--- a/lsteamclient/winISteamAppList.c
+++ b/lsteamclient/winISteamAppList.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001.h"
diff --git a/lsteamclient/winISteamAppTicket.c b/lsteamclient/winISteamAppTicket.c
index 4616983c..1dc25839 100644
--- a/lsteamclient/winISteamAppTicket.c
+++ b/lsteamclient/winISteamAppTicket.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001.h"
diff --git a/lsteamclient/winISteamApps.c b/lsteamclient/winISteamApps.c
index 01c99817..f3a07f3a 100644
--- a/lsteamclient/winISteamApps.c
+++ b/lsteamclient/winISteamApps.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamApps_STEAMAPPS_INTERFACE_VERSION008.h"
diff --git a/lsteamclient/winISteamClient.c b/lsteamclient/winISteamClient.c
index 7e602ca6..87dc9240 100644
--- a/lsteamclient/winISteamClient.c
+++ b/lsteamclient/winISteamClient.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamClient_SteamClient018.h"
diff --git a/lsteamclient/winISteamController.c b/lsteamclient/winISteamController.c
index 38c21a94..f1e77a9a 100644
--- a/lsteamclient/winISteamController.c
+++ b/lsteamclient/winISteamController.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamController_SteamController007.h"
diff --git a/lsteamclient/winISteamFriends.c b/lsteamclient/winISteamFriends.c
index 00e6cdbc..e02e605b 100644
--- a/lsteamclient/winISteamFriends.c
+++ b/lsteamclient/winISteamFriends.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamFriends_SteamFriends017.h"
diff --git a/lsteamclient/winISteamGameCoordinator.c b/lsteamclient/winISteamGameCoordinator.c
index d1524a9c..3b46c133 100644
--- a/lsteamclient/winISteamGameCoordinator.c
+++ b/lsteamclient/winISteamGameCoordinator.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamGameCoordinator_SteamGameCoordinator001.h"
diff --git a/lsteamclient/winISteamGameServer.c b/lsteamclient/winISteamGameServer.c
index d180e804..4da7e6a2 100644
--- a/lsteamclient/winISteamGameServer.c
+++ b/lsteamclient/winISteamGameServer.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamGameServer_SteamGameServer012.h"
diff --git a/lsteamclient/winISteamGameServerStats.c b/lsteamclient/winISteamGameServerStats.c
index 5eef9b66..97d661f4 100644
--- a/lsteamclient/winISteamGameServerStats.c
+++ b/lsteamclient/winISteamGameServerStats.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamGameServerStats_SteamGameServerStats001.h"
diff --git a/lsteamclient/winISteamGameStats.c b/lsteamclient/winISteamGameStats.c
index b0af70ab..f672c5cb 100644
--- a/lsteamclient/winISteamGameStats.c
+++ b/lsteamclient/winISteamGameStats.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamGameStats_SteamGameStats001.h"
diff --git a/lsteamclient/winISteamHTMLSurface.c b/lsteamclient/winISteamHTMLSurface.c
index 7011bbbb..2ebbcb2f 100644
--- a/lsteamclient/winISteamHTMLSurface.c
+++ b/lsteamclient/winISteamHTMLSurface.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005.h"
diff --git a/lsteamclient/winISteamHTTP.c b/lsteamclient/winISteamHTTP.c
index 35e6a40d..7febfca8 100644
--- a/lsteamclient/winISteamHTTP.c
+++ b/lsteamclient/winISteamHTTP.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamHTTP_STEAMHTTP_INTERFACE_VERSION003.h"
diff --git a/lsteamclient/winISteamInventory.c b/lsteamclient/winISteamInventory.c
index 78cdc730..de6eb166 100644
--- a/lsteamclient/winISteamInventory.c
+++ b/lsteamclient/winISteamInventory.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamInventory_STEAMINVENTORY_INTERFACE_V003.h"
diff --git a/lsteamclient/winISteamMasterServerUpdater.c b/lsteamclient/winISteamMasterServerUpdater.c
index 4460e9a5..30684691 100644
--- a/lsteamclient/winISteamMasterServerUpdater.c
+++ b/lsteamclient/winISteamMasterServerUpdater.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamMasterServerUpdater_SteamMasterServerUpdater001.h"
diff --git a/lsteamclient/winISteamMatchmaking.c b/lsteamclient/winISteamMatchmaking.c
index a3620aa8..af5e97c6 100644
--- a/lsteamclient/winISteamMatchmaking.c
+++ b/lsteamclient/winISteamMatchmaking.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamMatchmaking_SteamMatchMaking009.h"
diff --git a/lsteamclient/winISteamMatchmakingServers.c b/lsteamclient/winISteamMatchmakingServers.c
index 5af82ca9..5ab1ca20 100644
--- a/lsteamclient/winISteamMatchmakingServers.c
+++ b/lsteamclient/winISteamMatchmakingServers.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamMatchmakingServers_SteamMatchMakingServers002.h"
diff --git a/lsteamclient/winISteamMusic.c b/lsteamclient/winISteamMusic.c
index cdd04bd2..5f14186f 100644
--- a/lsteamclient/winISteamMusic.c
+++ b/lsteamclient/winISteamMusic.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamMusic_STEAMMUSIC_INTERFACE_VERSION001.h"
diff --git a/lsteamclient/winISteamMusicRemote.c b/lsteamclient/winISteamMusicRemote.c
index 6321132d..4e2a28d3 100644
--- a/lsteamclient/winISteamMusicRemote.c
+++ b/lsteamclient/winISteamMusicRemote.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001.h"
diff --git a/lsteamclient/winISteamNetworking.c b/lsteamclient/winISteamNetworking.c
index 7a5a48d8..30b3dff8 100644
--- a/lsteamclient/winISteamNetworking.c
+++ b/lsteamclient/winISteamNetworking.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamNetworking_SteamNetworking005.h"
diff --git a/lsteamclient/winISteamNetworkingSocketsSerialized.c b/lsteamclient/winISteamNetworkingSocketsSerialized.c
index 36e32507..efee18f3 100644
--- a/lsteamclient/winISteamNetworkingSocketsSerialized.c
+++ b/lsteamclient/winISteamNetworkingSocketsSerialized.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003.h"
diff --git a/lsteamclient/winISteamParentalSettings.c b/lsteamclient/winISteamParentalSettings.c
index e1df0102..22a9205f 100644
--- a/lsteamclient/winISteamParentalSettings.c
+++ b/lsteamclient/winISteamParentalSettings.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001.h"
diff --git a/lsteamclient/winISteamRemoteStorage.c b/lsteamclient/winISteamRemoteStorage.c
index c09eea19..c276e793 100644
--- a/lsteamclient/winISteamRemoteStorage.c
+++ b/lsteamclient/winISteamRemoteStorage.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014.h"
diff --git a/lsteamclient/winISteamScreenshots.c b/lsteamclient/winISteamScreenshots.c
index f0761fef..bb332748 100644
--- a/lsteamclient/winISteamScreenshots.c
+++ b/lsteamclient/winISteamScreenshots.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003.h"
diff --git a/lsteamclient/winISteamUGC.c b/lsteamclient/winISteamUGC.c
index fb7a9836..f30b3b95 100644
--- a/lsteamclient/winISteamUGC.c
+++ b/lsteamclient/winISteamUGC.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamUGC_STEAMUGC_INTERFACE_VERSION012.h"
@@ -56,7 +58,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION012_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION012 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION012 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_143 * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION012_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
@@ -697,7 +699,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION010_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION010 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION010 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_142 * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION010_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
@@ -1329,7 +1331,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION009_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION009 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION009 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_139 * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION009_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
@@ -1905,7 +1907,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION008_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION008 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION008 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_137 * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION008_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
@@ -2449,7 +2451,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION007_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION007 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION007 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_136 * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION007_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
@@ -2949,7 +2951,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION006_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION006 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION006 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_133x * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION006_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
@@ -3383,7 +3385,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION005_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION005 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION005 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_133b * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION005_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
@@ -3778,7 +3780,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION004_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION004 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION004 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_132x * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION004_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
@@ -4076,7 +4078,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION003_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION003 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION003 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_132 * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION003_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
@@ -4358,7 +4360,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION002_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION002 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION002 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_130 * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION002_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
@@ -4640,7 +4642,7 @@ SteamAPICall_t __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION001_SendQueryUG
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUGC_STEAMUGC_INTERFACE_VERSION001_GetQueryUGCResult, 20)
-bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION001_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION001 *_this, UGCQueryHandle_t handle, uint32 index, SteamUGCDetails_t * pDetails)
+bool __thiscall winISteamUGC_STEAMUGC_INTERFACE_VERSION001_GetQueryUGCResult(winISteamUGC_STEAMUGC_INTERFACE_VERSION001 *_this, UGCQueryHandle_t handle, uint32 index, winSteamUGCDetails_t_128 * pDetails)
 {
     TRACE("%p\n", _this);
     return cppISteamUGC_STEAMUGC_INTERFACE_VERSION001_GetQueryUGCResult(_this->linux_side, handle, index, pDetails);
diff --git a/lsteamclient/winISteamUnifiedMessages.c b/lsteamclient/winISteamUnifiedMessages.c
index 89c12fbe..12f49f6e 100644
--- a/lsteamclient/winISteamUnifiedMessages.c
+++ b/lsteamclient/winISteamUnifiedMessages.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001.h"
diff --git a/lsteamclient/winISteamUser.c b/lsteamclient/winISteamUser.c
index e127a02b..b56ff3f3 100644
--- a/lsteamclient/winISteamUser.c
+++ b/lsteamclient/winISteamUser.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamUser_SteamUser020.h"
diff --git a/lsteamclient/winISteamUserStats.c b/lsteamclient/winISteamUserStats.c
index 511823d7..fa162f76 100644
--- a/lsteamclient/winISteamUserStats.c
+++ b/lsteamclient/winISteamUserStats.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011.h"
@@ -231,7 +233,7 @@ SteamAPICall_t __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetDownloadedLeaderboardEntry, 28)
-bool __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetDownloadedLeaderboardEntry(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011 *_this, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, LeaderboardEntry_t * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
+bool __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetDownloadedLeaderboardEntry(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011 *_this, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, winLeaderboardEntry_t_143 * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
 {
     TRACE("%p\n", _this);
     return cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_GetDownloadedLeaderboardEntry(_this->linux_side, hSteamLeaderboardEntries, index, pLeaderboardEntry, pDetails, cDetailsMax);
@@ -588,7 +590,7 @@ SteamAPICall_t __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetDownloadedLeaderboardEntry, 28)
-bool __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetDownloadedLeaderboardEntry(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010 *_this, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, LeaderboardEntry_t * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
+bool __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetDownloadedLeaderboardEntry(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010 *_this, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, winLeaderboardEntry_t_119 * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
 {
     TRACE("%p\n", _this);
     return cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_GetDownloadedLeaderboardEntry(_this->linux_side, hSteamLeaderboardEntries, index, pLeaderboardEntry, pDetails, cDetailsMax);
@@ -943,7 +945,7 @@ SteamAPICall_t __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetDownloadedLeaderboardEntry, 28)
-bool __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetDownloadedLeaderboardEntry(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009 *_this, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, LeaderboardEntry_t * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
+bool __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetDownloadedLeaderboardEntry(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009 *_this, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, winLeaderboardEntry_t_113 * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
 {
     TRACE("%p\n", _this);
     return cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_GetDownloadedLeaderboardEntry(_this->linux_side, hSteamLeaderboardEntries, index, pLeaderboardEntry, pDetails, cDetailsMax);
@@ -1219,7 +1221,7 @@ SteamAPICall_t __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008
 }
 
 DEFINE_THISCALL_WRAPPER(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetDownloadedLeaderboardEntry, 28)
-bool __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetDownloadedLeaderboardEntry(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008 *_this, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, LeaderboardEntry_t * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
+bool __thiscall winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetDownloadedLeaderboardEntry(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008 *_this, SteamLeaderboardEntries_t hSteamLeaderboardEntries, int index, winLeaderboardEntry_t_111x * pLeaderboardEntry, int32 * pDetails, int cDetailsMax)
 {
     TRACE("%p\n", _this);
     return cppISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_GetDownloadedLeaderboardEntry(_this->linux_side, hSteamLeaderboardEntries, index, pLeaderboardEntry, pDetails, cDetailsMax);
diff --git a/lsteamclient/winISteamUtils.c b/lsteamclient/winISteamUtils.c
index d48f355e..cabed2ae 100644
--- a/lsteamclient/winISteamUtils.c
+++ b/lsteamclient/winISteamUtils.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamUtils_SteamUtils009.h"
diff --git a/lsteamclient/winISteamVideo.c b/lsteamclient/winISteamVideo.c
index 8c7eafdb..bb731f9f 100644
--- a/lsteamclient/winISteamVideo.c
+++ b/lsteamclient/winISteamVideo.c
@@ -11,6 +11,8 @@
 
 #include "steamclient_private.h"
 
+#include "struct_converters.h"
+
 WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
 
 #include "cppISteamVideo_STEAMVIDEO_INTERFACE_V002.h"