diff --git a/lsteamclient/gen_wrapper.py b/lsteamclient/gen_wrapper.py
index 1c72ae92..31fc2331 100755
--- a/lsteamclient/gen_wrapper.py
+++ b/lsteamclient/gen_wrapper.py
@@ -986,7 +986,7 @@ WINE_DEFAULT_DEBUG_CHANNEL(steamclient);
     cfile.write("}\n")
     cfile.write("#endif\n\n")
     cfile.write("%s *create_%s(void *linux_side)\n{\n" % (winclassname, winclassname))
-    cfile.write("    %s *r = HeapAlloc(GetProcessHeap(), 0, sizeof(%s));\n" % (winclassname, winclassname))
+    cfile.write("    %s *r = alloc_mem_for_iface(sizeof(%s), \"%s\");\n" % (winclassname, winclassname, iface_version))
     cfile.write("    TRACE(\"-> %p\\n\", r);\n")
     cfile.write("    r->vtable = &%s_vtable;\n" % winclassname)
     cfile.write("    r->linux_side = linux_side;\n")
diff --git a/lsteamclient/steamclient_main.c b/lsteamclient/steamclient_main.c
index cd885b26..d4cccb40 100644
--- a/lsteamclient/steamclient_main.c
+++ b/lsteamclient/steamclient_main.c
@@ -9,6 +9,7 @@
 #include "winbase.h"
 #include "winnls.h"
 #include "winuser.h"
+#include "winternl.h"
 #include "wine/debug.h"
 #include "wine/list.h"
 #include "steam_defs.h"
@@ -232,6 +233,144 @@ void steamclient_free_stringlist(const char **out)
     }
 }
 
+static BYTE *alloc_start, *alloc_end;
+
+static BOOL allocated_from_steamclient_dll( void *ptr )
+{
+    return (BYTE *)ptr >= alloc_start && (BYTE *)ptr < alloc_end;
+}
+
+static void *get_mem_from_steamclient_dll(size_t size, unsigned int version)
+{
+    static BYTE * const error_ptr = (BYTE *)~(ULONG_PTR)0;
+    static const unsigned int magic = 0x53ba947a;
+    static struct
+    {
+        unsigned int version;
+        size_t size;
+        void *ptr;
+    }
+    allocated[32];
+    static unsigned int allocated_count;
+    static BYTE *alloc_base;
+    unsigned int i;
+
+    if (alloc_base == error_ptr)
+    {
+        /* Previously failed to locate the section. */
+        return NULL;
+    }
+
+    if (alloc_base && (IsBadReadPtr(alloc_start, sizeof(magic)) || *(unsigned int *)alloc_start != magic))
+    {
+        TRACE("steamclient.dll reloaded.\n");
+        alloc_base = alloc_start = alloc_end = NULL;
+        allocated_count = 0;
+    }
+
+    for (i = 0; i < allocated_count; ++i)
+    {
+        if (allocated[i].version == version)
+        {
+            if (allocated[i].size != size)
+            {
+                FIXME("Size does not match.\n");
+                return NULL;
+            }
+            return allocated[i].ptr;
+        }
+    }
+
+    if (allocated_count == ARRAY_SIZE(allocated))
+    {
+        FIXME("Too many interface versions.\n");
+        return NULL;
+    }
+
+    if (!alloc_base)
+    {
+        const IMAGE_SECTION_HEADER *sec;
+        const IMAGE_NT_HEADERS *nt;
+        HMODULE mod;
+
+        if (!(mod = GetModuleHandleW(L"steamclient.dll")))
+        {
+            /* That is steamclient64.dll for x64 but no known use cases on x64.*/
+            WARN("Module not found, err %u.\n", GetLastError());
+            alloc_base = error_ptr;
+            return NULL;
+        }
+        if (!(nt = RtlImageNtHeader(mod)))
+        {
+            FIXME("Got NULL NT image headers.\n");
+            alloc_base = error_ptr;
+            return NULL;
+        }
+        sec = (const IMAGE_SECTION_HEADER *)((const BYTE *)&nt->OptionalHeader + nt->FileHeader.SizeOfOptionalHeader);
+        for (i = 0; i < nt->FileHeader.NumberOfSections; i++)
+        {
+            if (!memcmp(sec[i].Name, ".data", 5))
+            {
+                alloc_start = alloc_base = (BYTE *)mod + sec[i].VirtualAddress;
+                alloc_end = alloc_base + sec[i].SizeOfRawData;
+                if (alloc_end - alloc_start < sizeof(magic))
+                {
+                    ERR(".data section is too small.\n");
+                    alloc_base = error_ptr;
+                    return NULL;
+                }
+                TRACE("Found .data section, start %p, end %p.\n", alloc_base, alloc_end);
+                *(unsigned int *)alloc_base = magic;
+                alloc_base += sizeof(unsigned int);
+                break;
+            }
+        }
+        if (i == nt->FileHeader.NumberOfSections)
+        {
+            FIXME(".data section not found.\n");
+            alloc_base = error_ptr;
+            return NULL;
+        }
+    }
+
+    if (alloc_end - alloc_base < size)
+    {
+        FIXME("Not enough section size left.\n");
+        return NULL;
+    }
+    allocated[allocated_count].version = version;
+    allocated[allocated_count].size = size;
+    allocated[allocated_count].ptr = alloc_base;
+    alloc_base += size;
+
+    return allocated[allocated_count++].ptr;
+}
+
+void *alloc_mem_for_iface(size_t size, const char *iface_version)
+{
+    const char steamclient_iface_name[] = "SteamClient";
+    unsigned int version;
+    void *ret;
+
+    /* Mafia II depends on SteamClient interface pointer to point inside
+     * native Windows steamclient.dll. */
+    if (strncmp(iface_version, steamclient_iface_name, ARRAY_SIZE(steamclient_iface_name) - 1))
+         goto fallback;
+
+    version = atoi(iface_version + ARRAY_SIZE(steamclient_iface_name) - 1);
+    if (!version)
+    {
+        FIXME("Could not get iface version from %s.\n", iface_version);
+        goto fallback;
+    }
+
+    if ((ret = get_mem_from_steamclient_dll(size, version)))
+        return ret;
+
+fallback:
+    return HeapAlloc(GetProcessHeap(), 0, size);
+}
+
 #ifdef __linux__
 static const uint32 vk_to_xkeysym[0xFF] = {
     0, /* 0x0  Undefined */
@@ -417,13 +556,16 @@ void *create_win_interface(const char *name, void *linux_side)
     {
         if (!strcmp(name, constructors[i].iface_version))
         {
+            ret = constructors[i].ctor(linux_side);
+            if (allocated_from_steamclient_dll(ret))
+                break;
+
             e = HeapAlloc(GetProcessHeap(), 0, sizeof(*e));
             e->name = constructors[i].iface_version;
             e->linux_side = linux_side;
-            e->interface = constructors[i].ctor(linux_side);
+            e->interface = ret;
             list_add_tail(&steamclient_interfaces, &e->entry);
 
-            ret = e->interface;
             break;
         }
     }
diff --git a/lsteamclient/steamclient_private.h b/lsteamclient/steamclient_private.h
index 707fdf96..03685c90 100644
--- a/lsteamclient/steamclient_private.h
+++ b/lsteamclient/steamclient_private.h
@@ -58,6 +58,8 @@ extern char g_tmppath[PATH_MAX];
 typedef uint64 SteamAPICall_t; //for ancient SDKs
 bool do_cb_wrap(HSteamPipe pipe, void *linux_side, bool (*cpp_func)(void *, SteamAPICall_t, void *, int, int, bool *), SteamAPICall_t call, void *callback, int callback_len, int cb_expected, bool *failed);
 
+void *alloc_mem_for_iface(size_t size, const char *iface_version);
+
 #ifdef __cplusplus
 }
 #endif
diff --git a/lsteamclient/winISteamAppList.c b/lsteamclient/winISteamAppList.c
index 1296cb34..5a28fefa 100644
--- a/lsteamclient/winISteamAppList.c
+++ b/lsteamclient/winISteamAppList.c
@@ -78,7 +78,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *create_winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001));
+    winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001), "STEAMAPPLIST_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamAppList_STEAMAPPLIST_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamAppTicket.c b/lsteamclient/winISteamAppTicket.c
index 1dc25839..983dea71 100644
--- a/lsteamclient/winISteamAppTicket.c
+++ b/lsteamclient/winISteamAppTicket.c
@@ -43,7 +43,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001 *create_winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001));
+    winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001), "STEAMAPPTICKET_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamAppTicket_STEAMAPPTICKET_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamApps.c b/lsteamclient/winISteamApps.c
index 9e55c8c4..81c9af81 100644
--- a/lsteamclient/winISteamApps.c
+++ b/lsteamclient/winISteamApps.c
@@ -274,7 +274,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamApps_STEAMAPPS_INTERFACE_VERSION008 *create_winISteamApps_STEAMAPPS_INTERFACE_VERSION008(void *linux_side)
 {
-    winISteamApps_STEAMAPPS_INTERFACE_VERSION008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION008));
+    winISteamApps_STEAMAPPS_INTERFACE_VERSION008 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION008), "STEAMAPPS_INTERFACE_VERSION008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION008_vtable;
     r->linux_side = linux_side;
@@ -497,7 +497,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamApps_STEAMAPPS_INTERFACE_VERSION007 *create_winISteamApps_STEAMAPPS_INTERFACE_VERSION007(void *linux_side)
 {
-    winISteamApps_STEAMAPPS_INTERFACE_VERSION007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION007));
+    winISteamApps_STEAMAPPS_INTERFACE_VERSION007 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION007), "STEAMAPPS_INTERFACE_VERSION007");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION007_vtable;
     r->linux_side = linux_side;
@@ -704,7 +704,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamApps_STEAMAPPS_INTERFACE_VERSION006 *create_winISteamApps_STEAMAPPS_INTERFACE_VERSION006(void *linux_side)
 {
-    winISteamApps_STEAMAPPS_INTERFACE_VERSION006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION006));
+    winISteamApps_STEAMAPPS_INTERFACE_VERSION006 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION006), "STEAMAPPS_INTERFACE_VERSION006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION006_vtable;
     r->linux_side = linux_side;
@@ -894,7 +894,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamApps_STEAMAPPS_INTERFACE_VERSION005 *create_winISteamApps_STEAMAPPS_INTERFACE_VERSION005(void *linux_side)
 {
-    winISteamApps_STEAMAPPS_INTERFACE_VERSION005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION005));
+    winISteamApps_STEAMAPPS_INTERFACE_VERSION005 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION005), "STEAMAPPS_INTERFACE_VERSION005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION005_vtable;
     r->linux_side = linux_side;
@@ -1033,7 +1033,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamApps_STEAMAPPS_INTERFACE_VERSION004 *create_winISteamApps_STEAMAPPS_INTERFACE_VERSION004(void *linux_side)
 {
-    winISteamApps_STEAMAPPS_INTERFACE_VERSION004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION004));
+    winISteamApps_STEAMAPPS_INTERFACE_VERSION004 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION004), "STEAMAPPS_INTERFACE_VERSION004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION004_vtable;
     r->linux_side = linux_side;
@@ -1124,7 +1124,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamApps_STEAMAPPS_INTERFACE_VERSION003 *create_winISteamApps_STEAMAPPS_INTERFACE_VERSION003(void *linux_side)
 {
-    winISteamApps_STEAMAPPS_INTERFACE_VERSION003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION003));
+    winISteamApps_STEAMAPPS_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION003), "STEAMAPPS_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION003_vtable;
     r->linux_side = linux_side;
@@ -1207,7 +1207,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamApps_STEAMAPPS_INTERFACE_VERSION002 *create_winISteamApps_STEAMAPPS_INTERFACE_VERSION002(void *linux_side)
 {
-    winISteamApps_STEAMAPPS_INTERFACE_VERSION002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION002));
+    winISteamApps_STEAMAPPS_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION002), "STEAMAPPS_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION002_vtable;
     r->linux_side = linux_side;
@@ -1242,7 +1242,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamApps_STEAMAPPS_INTERFACE_VERSION001 *create_winISteamApps_STEAMAPPS_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamApps_STEAMAPPS_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION001));
+    winISteamApps_STEAMAPPS_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamApps_STEAMAPPS_INTERFACE_VERSION001), "STEAMAPPS_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamApps_STEAMAPPS_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamClient.c b/lsteamclient/winISteamClient.c
index a3806705..1bbcefb0 100644
--- a/lsteamclient/winISteamClient.c
+++ b/lsteamclient/winISteamClient.c
@@ -398,7 +398,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient020 *create_winISteamClient_SteamClient020(void *linux_side)
 {
-    winISteamClient_SteamClient020 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient020));
+    winISteamClient_SteamClient020 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient020), "SteamClient020");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient020_vtable;
     r->linux_side = linux_side;
@@ -780,7 +780,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient019 *create_winISteamClient_SteamClient019(void *linux_side)
 {
-    winISteamClient_SteamClient019 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient019));
+    winISteamClient_SteamClient019 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient019), "SteamClient019");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient019_vtable;
     r->linux_side = linux_side;
@@ -1153,7 +1153,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient018 *create_winISteamClient_SteamClient018(void *linux_side)
 {
-    winISteamClient_SteamClient018 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient018));
+    winISteamClient_SteamClient018 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient018), "SteamClient018");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient018_vtable;
     r->linux_side = linux_side;
@@ -1499,7 +1499,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient017 *create_winISteamClient_SteamClient017(void *linux_side)
 {
-    winISteamClient_SteamClient017 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient017));
+    winISteamClient_SteamClient017 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient017), "SteamClient017");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient017_vtable;
     r->linux_side = linux_side;
@@ -1819,7 +1819,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient016 *create_winISteamClient_SteamClient016(void *linux_side)
 {
-    winISteamClient_SteamClient016 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient016));
+    winISteamClient_SteamClient016 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient016), "SteamClient016");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient016_vtable;
     r->linux_side = linux_side;
@@ -2106,7 +2106,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient015 *create_winISteamClient_SteamClient015(void *linux_side)
 {
-    winISteamClient_SteamClient015 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient015));
+    winISteamClient_SteamClient015 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient015), "SteamClient015");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient015_vtable;
     r->linux_side = linux_side;
@@ -2384,7 +2384,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient014 *create_winISteamClient_SteamClient014(void *linux_side)
 {
-    winISteamClient_SteamClient014 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient014));
+    winISteamClient_SteamClient014 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient014), "SteamClient014");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient014_vtable;
     r->linux_side = linux_side;
@@ -2669,7 +2669,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient013 *create_winISteamClient_SteamClient013(void *linux_side)
 {
-    winISteamClient_SteamClient013 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient013));
+    winISteamClient_SteamClient013 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient013), "SteamClient013");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient013_vtable;
     r->linux_side = linux_side;
@@ -2929,7 +2929,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient012 *create_winISteamClient_SteamClient012(void *linux_side)
 {
-    winISteamClient_SteamClient012 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient012));
+    winISteamClient_SteamClient012 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient012), "SteamClient012");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient012_vtable;
     r->linux_side = linux_side;
@@ -3171,7 +3171,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient011 *create_winISteamClient_SteamClient011(void *linux_side)
 {
-    winISteamClient_SteamClient011 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient011));
+    winISteamClient_SteamClient011 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient011), "SteamClient011");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient011_vtable;
     r->linux_side = linux_side;
@@ -3404,7 +3404,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient010 *create_winISteamClient_SteamClient010(void *linux_side)
 {
-    winISteamClient_SteamClient010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient010));
+    winISteamClient_SteamClient010 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient010), "SteamClient010");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient010_vtable;
     r->linux_side = linux_side;
@@ -3620,7 +3620,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient009 *create_winISteamClient_SteamClient009(void *linux_side)
 {
-    winISteamClient_SteamClient009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient009));
+    winISteamClient_SteamClient009 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient009), "SteamClient009");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient009_vtable;
     r->linux_side = linux_side;
@@ -3827,7 +3827,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient008 *create_winISteamClient_SteamClient008(void *linux_side)
 {
-    winISteamClient_SteamClient008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient008));
+    winISteamClient_SteamClient008 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient008), "SteamClient008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient008_vtable;
     r->linux_side = linux_side;
@@ -4043,7 +4043,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient007 *create_winISteamClient_SteamClient007(void *linux_side)
 {
-    winISteamClient_SteamClient007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient007));
+    winISteamClient_SteamClient007 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient007), "SteamClient007");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient007_vtable;
     r->linux_side = linux_side;
@@ -4247,7 +4247,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamClient_SteamClient006 *create_winISteamClient_SteamClient006(void *linux_side)
 {
-    winISteamClient_SteamClient006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamClient_SteamClient006));
+    winISteamClient_SteamClient006 *r = alloc_mem_for_iface(sizeof(winISteamClient_SteamClient006), "SteamClient006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamClient_SteamClient006_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamController.c b/lsteamclient/winISteamController.c
index dc5caff4..4e73910b 100644
--- a/lsteamclient/winISteamController.c
+++ b/lsteamclient/winISteamController.c
@@ -310,7 +310,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamController_SteamController008 *create_winISteamController_SteamController008(void *linux_side)
 {
-    winISteamController_SteamController008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamController_SteamController008));
+    winISteamController_SteamController008 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController008), "SteamController008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamController_SteamController008_vtable;
     r->linux_side = linux_side;
@@ -612,7 +612,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamController_SteamController007 *create_winISteamController_SteamController007(void *linux_side)
 {
-    winISteamController_SteamController007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamController_SteamController007));
+    winISteamController_SteamController007 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController007), "SteamController007");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamController_SteamController007_vtable;
     r->linux_side = linux_side;
@@ -890,7 +890,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamController_SteamController006 *create_winISteamController_SteamController006(void *linux_side)
 {
-    winISteamController_SteamController006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamController_SteamController006));
+    winISteamController_SteamController006 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController006), "SteamController006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamController_SteamController006_vtable;
     r->linux_side = linux_side;
@@ -1128,7 +1128,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamController_SteamController005 *create_winISteamController_SteamController005(void *linux_side)
 {
-    winISteamController_SteamController005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamController_SteamController005));
+    winISteamController_SteamController005 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController005), "SteamController005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamController_SteamController005_vtable;
     r->linux_side = linux_side;
@@ -1334,7 +1334,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamController_SteamController004 *create_winISteamController_SteamController004(void *linux_side)
 {
-    winISteamController_SteamController004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamController_SteamController004));
+    winISteamController_SteamController004 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController004), "SteamController004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamController_SteamController004_vtable;
     r->linux_side = linux_side;
@@ -1499,7 +1499,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamController_SteamController003 *create_winISteamController_SteamController003(void *linux_side)
 {
-    winISteamController_SteamController003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamController_SteamController003));
+    winISteamController_SteamController003 *r = alloc_mem_for_iface(sizeof(winISteamController_SteamController003), "SteamController003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamController_SteamController003_vtable;
     r->linux_side = linux_side;
@@ -1576,7 +1576,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamController_STEAMCONTROLLER_INTERFACE_VERSION *create_winISteamController_STEAMCONTROLLER_INTERFACE_VERSION(void *linux_side)
 {
-    winISteamController_STEAMCONTROLLER_INTERFACE_VERSION *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamController_STEAMCONTROLLER_INTERFACE_VERSION));
+    winISteamController_STEAMCONTROLLER_INTERFACE_VERSION *r = alloc_mem_for_iface(sizeof(winISteamController_STEAMCONTROLLER_INTERFACE_VERSION), "STEAMCONTROLLER_INTERFACE_VERSION");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamController_STEAMCONTROLLER_INTERFACE_VERSION_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamFriends.c b/lsteamclient/winISteamFriends.c
index 132d3790..1da48ef0 100644
--- a/lsteamclient/winISteamFriends.c
+++ b/lsteamclient/winISteamFriends.c
@@ -650,7 +650,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends017 *create_winISteamFriends_SteamFriends017(void *linux_side)
 {
-    winISteamFriends_SteamFriends017 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends017));
+    winISteamFriends_SteamFriends017 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends017), "SteamFriends017");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends017_vtable;
     r->linux_side = linux_side;
@@ -1260,7 +1260,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends015 *create_winISteamFriends_SteamFriends015(void *linux_side)
 {
-    winISteamFriends_SteamFriends015 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends015));
+    winISteamFriends_SteamFriends015 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends015), "SteamFriends015");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends015_vtable;
     r->linux_side = linux_side;
@@ -1806,7 +1806,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends014 *create_winISteamFriends_SteamFriends014(void *linux_side)
 {
-    winISteamFriends_SteamFriends014 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends014));
+    winISteamFriends_SteamFriends014 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends014), "SteamFriends014");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends014_vtable;
     r->linux_side = linux_side;
@@ -2344,7 +2344,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends013 *create_winISteamFriends_SteamFriends013(void *linux_side)
 {
-    winISteamFriends_SteamFriends013 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends013));
+    winISteamFriends_SteamFriends013 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends013), "SteamFriends013");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends013_vtable;
     r->linux_side = linux_side;
@@ -2882,7 +2882,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends012 *create_winISteamFriends_SteamFriends012(void *linux_side)
 {
-    winISteamFriends_SteamFriends012 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends012));
+    winISteamFriends_SteamFriends012 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends012), "SteamFriends012");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends012_vtable;
     r->linux_side = linux_side;
@@ -3420,7 +3420,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends011 *create_winISteamFriends_SteamFriends011(void *linux_side)
 {
-    winISteamFriends_SteamFriends011 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends011));
+    winISteamFriends_SteamFriends011 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends011), "SteamFriends011");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends011_vtable;
     r->linux_side = linux_side;
@@ -3926,7 +3926,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends010 *create_winISteamFriends_SteamFriends010(void *linux_side)
 {
-    winISteamFriends_SteamFriends010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends010));
+    winISteamFriends_SteamFriends010 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends010), "SteamFriends010");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends010_vtable;
     r->linux_side = linux_side;
@@ -4311,7 +4311,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends009 *create_winISteamFriends_SteamFriends009(void *linux_side)
 {
-    winISteamFriends_SteamFriends009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends009));
+    winISteamFriends_SteamFriends009 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends009), "SteamFriends009");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends009_vtable;
     r->linux_side = linux_side;
@@ -4615,7 +4615,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends008 *create_winISteamFriends_SteamFriends008(void *linux_side)
 {
-    winISteamFriends_SteamFriends008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends008));
+    winISteamFriends_SteamFriends008 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends008), "SteamFriends008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends008_vtable;
     r->linux_side = linux_side;
@@ -4869,7 +4869,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends007 *create_winISteamFriends_SteamFriends007(void *linux_side)
 {
-    winISteamFriends_SteamFriends007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends007));
+    winISteamFriends_SteamFriends007 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends007), "SteamFriends007");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends007_vtable;
     r->linux_side = linux_side;
@@ -5107,7 +5107,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends006 *create_winISteamFriends_SteamFriends006(void *linux_side)
 {
-    winISteamFriends_SteamFriends006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends006));
+    winISteamFriends_SteamFriends006 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends006), "SteamFriends006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends006_vtable;
     r->linux_side = linux_side;
@@ -5329,7 +5329,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends005 *create_winISteamFriends_SteamFriends005(void *linux_side)
 {
-    winISteamFriends_SteamFriends005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends005));
+    winISteamFriends_SteamFriends005 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends005), "SteamFriends005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends005_vtable;
     r->linux_side = linux_side;
@@ -5519,7 +5519,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends004 *create_winISteamFriends_SteamFriends004(void *linux_side)
 {
-    winISteamFriends_SteamFriends004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends004));
+    winISteamFriends_SteamFriends004 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends004), "SteamFriends004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends004_vtable;
     r->linux_side = linux_side;
@@ -5709,7 +5709,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends003 *create_winISteamFriends_SteamFriends003(void *linux_side)
 {
-    winISteamFriends_SteamFriends003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends003));
+    winISteamFriends_SteamFriends003 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends003), "SteamFriends003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends003_vtable;
     r->linux_side = linux_side;
@@ -5979,7 +5979,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends002 *create_winISteamFriends_SteamFriends002(void *linux_side)
 {
-    winISteamFriends_SteamFriends002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends002));
+    winISteamFriends_SteamFriends002 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends002), "SteamFriends002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends002_vtable;
     r->linux_side = linux_side;
@@ -6223,7 +6223,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamFriends_SteamFriends001 *create_winISteamFriends_SteamFriends001(void *linux_side)
 {
-    winISteamFriends_SteamFriends001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamFriends_SteamFriends001));
+    winISteamFriends_SteamFriends001 *r = alloc_mem_for_iface(sizeof(winISteamFriends_SteamFriends001), "SteamFriends001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamFriends_SteamFriends001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamGameCoordinator.c b/lsteamclient/winISteamGameCoordinator.c
index 3b46c133..7db6e00d 100644
--- a/lsteamclient/winISteamGameCoordinator.c
+++ b/lsteamclient/winISteamGameCoordinator.c
@@ -59,7 +59,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameCoordinator_SteamGameCoordinator001 *create_winISteamGameCoordinator_SteamGameCoordinator001(void *linux_side)
 {
-    winISteamGameCoordinator_SteamGameCoordinator001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameCoordinator_SteamGameCoordinator001));
+    winISteamGameCoordinator_SteamGameCoordinator001 *r = alloc_mem_for_iface(sizeof(winISteamGameCoordinator_SteamGameCoordinator001), "SteamGameCoordinator001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameCoordinator_SteamGameCoordinator001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamGameSearch.c b/lsteamclient/winISteamGameSearch.c
index 6ca4e550..edbae8ad 100644
--- a/lsteamclient/winISteamGameSearch.c
+++ b/lsteamclient/winISteamGameSearch.c
@@ -147,7 +147,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameSearch_SteamMatchGameSearch001 *create_winISteamGameSearch_SteamMatchGameSearch001(void *linux_side)
 {
-    winISteamGameSearch_SteamMatchGameSearch001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameSearch_SteamMatchGameSearch001));
+    winISteamGameSearch_SteamMatchGameSearch001 *r = alloc_mem_for_iface(sizeof(winISteamGameSearch_SteamMatchGameSearch001), "SteamMatchGameSearch001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameSearch_SteamMatchGameSearch001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamGameServer.c b/lsteamclient/winISteamGameServer.c
index 507b98bc..402aed86 100644
--- a/lsteamclient/winISteamGameServer.c
+++ b/lsteamclient/winISteamGameServer.c
@@ -390,7 +390,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer014 *create_winISteamGameServer_SteamGameServer014(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer014 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer014));
+    winISteamGameServer_SteamGameServer014 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer014), "SteamGameServer014");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer014_vtable;
     r->linux_side = linux_side;
@@ -772,7 +772,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer013 *create_winISteamGameServer_SteamGameServer013(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer013 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer013));
+    winISteamGameServer_SteamGameServer013 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer013), "SteamGameServer013");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer013_vtable;
     r->linux_side = linux_side;
@@ -1153,7 +1153,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer012 *create_winISteamGameServer_SteamGameServer012(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer012 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer012));
+    winISteamGameServer_SteamGameServer012 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer012), "SteamGameServer012");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer012_vtable;
     r->linux_side = linux_side;
@@ -1534,7 +1534,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer011 *create_winISteamGameServer_SteamGameServer011(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer011 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer011));
+    winISteamGameServer_SteamGameServer011 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer011), "SteamGameServer011");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer011_vtable;
     r->linux_side = linux_side;
@@ -1747,7 +1747,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer010 *create_winISteamGameServer_SteamGameServer010(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer010));
+    winISteamGameServer_SteamGameServer010 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer010), "SteamGameServer010");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer010_vtable;
     r->linux_side = linux_side;
@@ -1928,7 +1928,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer009 *create_winISteamGameServer_SteamGameServer009(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer009));
+    winISteamGameServer_SteamGameServer009 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer009), "SteamGameServer009");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer009_vtable;
     r->linux_side = linux_side;
@@ -2093,7 +2093,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer008 *create_winISteamGameServer_SteamGameServer008(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer008));
+    winISteamGameServer_SteamGameServer008 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer008), "SteamGameServer008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer008_vtable;
     r->linux_side = linux_side;
@@ -2234,7 +2234,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer005 *create_winISteamGameServer_SteamGameServer005(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer005));
+    winISteamGameServer_SteamGameServer005 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer005), "SteamGameServer005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer005_vtable;
     r->linux_side = linux_side;
@@ -2375,7 +2375,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer004 *create_winISteamGameServer_SteamGameServer004(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer004));
+    winISteamGameServer_SteamGameServer004 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer004), "SteamGameServer004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer004_vtable;
     r->linux_side = linux_side;
@@ -2539,7 +2539,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer003 *create_winISteamGameServer_SteamGameServer003(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer003));
+    winISteamGameServer_SteamGameServer003 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer003), "SteamGameServer003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer003_vtable;
     r->linux_side = linux_side;
@@ -2735,7 +2735,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServer_SteamGameServer002 *create_winISteamGameServer_SteamGameServer002(void *linux_side)
 {
-    winISteamGameServer_SteamGameServer002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServer_SteamGameServer002));
+    winISteamGameServer_SteamGameServer002 *r = alloc_mem_for_iface(sizeof(winISteamGameServer_SteamGameServer002), "SteamGameServer002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServer_SteamGameServer002_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamGameServerStats.c b/lsteamclient/winISteamGameServerStats.c
index 97d661f4..d83a2d90 100644
--- a/lsteamclient/winISteamGameServerStats.c
+++ b/lsteamclient/winISteamGameServerStats.c
@@ -115,7 +115,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameServerStats_SteamGameServerStats001 *create_winISteamGameServerStats_SteamGameServerStats001(void *linux_side)
 {
-    winISteamGameServerStats_SteamGameServerStats001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameServerStats_SteamGameServerStats001));
+    winISteamGameServerStats_SteamGameServerStats001 *r = alloc_mem_for_iface(sizeof(winISteamGameServerStats_SteamGameServerStats001), "SteamGameServerStats001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameServerStats_SteamGameServerStats001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamGameStats.c b/lsteamclient/winISteamGameStats.c
index f672c5cb..eb342f20 100644
--- a/lsteamclient/winISteamGameStats.c
+++ b/lsteamclient/winISteamGameStats.c
@@ -139,7 +139,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamGameStats_SteamGameStats001 *create_winISteamGameStats_SteamGameStats001(void *linux_side)
 {
-    winISteamGameStats_SteamGameStats001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamGameStats_SteamGameStats001));
+    winISteamGameStats_SteamGameStats001 *r = alloc_mem_for_iface(sizeof(winISteamGameStats_SteamGameStats001), "SteamGameStats001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamGameStats_SteamGameStats001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamHTMLSurface.c b/lsteamclient/winISteamHTMLSurface.c
index 6a86fa57..3b21520c 100644
--- a/lsteamclient/winISteamHTMLSurface.c
+++ b/lsteamclient/winISteamHTMLSurface.c
@@ -340,7 +340,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005 *create_winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005(void *linux_side)
 {
-    winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005));
+    winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005 *r = alloc_mem_for_iface(sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005), "STEAMHTMLSURFACE_INTERFACE_VERSION_005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_005_vtable;
     r->linux_side = linux_side;
@@ -664,7 +664,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004 *create_winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004(void *linux_side)
 {
-    winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004));
+    winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004 *r = alloc_mem_for_iface(sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004), "STEAMHTMLSURFACE_INTERFACE_VERSION_004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_004_vtable;
     r->linux_side = linux_side;
@@ -980,7 +980,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003 *create_winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003(void *linux_side)
 {
-    winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003));
+    winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003 *r = alloc_mem_for_iface(sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003), "STEAMHTMLSURFACE_INTERFACE_VERSION_003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_003_vtable;
     r->linux_side = linux_side;
@@ -1288,7 +1288,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002 *create_winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002(void *linux_side)
 {
-    winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002));
+    winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002 *r = alloc_mem_for_iface(sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002), "STEAMHTMLSURFACE_INTERFACE_VERSION_002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_002_vtable;
     r->linux_side = linux_side;
@@ -1580,7 +1580,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001 *create_winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001(void *linux_side)
 {
-    winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001));
+    winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001 *r = alloc_mem_for_iface(sizeof(winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001), "STEAMHTMLSURFACE_INTERFACE_VERSION_001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamHTMLSurface_STEAMHTMLSURFACE_INTERFACE_VERSION_001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamHTTP.c b/lsteamclient/winISteamHTTP.c
index 7febfca8..8458a813 100644
--- a/lsteamclient/winISteamHTTP.c
+++ b/lsteamclient/winISteamHTTP.c
@@ -235,7 +235,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003 *create_winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003(void *linux_side)
 {
-    winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003));
+    winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003), "STEAMHTTP_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamHTTP_STEAMHTTP_INTERFACE_VERSION003_vtable;
     r->linux_side = linux_side;
@@ -462,7 +462,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002 *create_winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002(void *linux_side)
 {
-    winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002));
+    winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002), "STEAMHTTP_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamHTTP_STEAMHTTP_INTERFACE_VERSION002_vtable;
     r->linux_side = linux_side;
@@ -609,7 +609,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001 *create_winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001));
+    winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001), "STEAMHTTP_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamHTTP_STEAMHTTP_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamInput.c b/lsteamclient/winISteamInput.c
index 761fa0c3..69464232 100644
--- a/lsteamclient/winISteamInput.c
+++ b/lsteamclient/winISteamInput.c
@@ -416,7 +416,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamInput_SteamInput005 *create_winISteamInput_SteamInput005(void *linux_side)
 {
-    winISteamInput_SteamInput005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamInput_SteamInput005));
+    winISteamInput_SteamInput005 *r = alloc_mem_for_iface(sizeof(winISteamInput_SteamInput005), "SteamInput005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamInput_SteamInput005_vtable;
     r->linux_side = linux_side;
@@ -726,7 +726,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamInput_SteamInput002 *create_winISteamInput_SteamInput002(void *linux_side)
 {
-    winISteamInput_SteamInput002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamInput_SteamInput002));
+    winISteamInput_SteamInput002 *r = alloc_mem_for_iface(sizeof(winISteamInput_SteamInput002), "SteamInput002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamInput_SteamInput002_vtable;
     r->linux_side = linux_side;
@@ -1036,7 +1036,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamInput_SteamInput001 *create_winISteamInput_SteamInput001(void *linux_side)
 {
-    winISteamInput_SteamInput001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamInput_SteamInput001));
+    winISteamInput_SteamInput001 *r = alloc_mem_for_iface(sizeof(winISteamInput_SteamInput001), "SteamInput001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamInput_SteamInput001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamInventory.c b/lsteamclient/winISteamInventory.c
index 1d273af4..0d2e6c32 100644
--- a/lsteamclient/winISteamInventory.c
+++ b/lsteamclient/winISteamInventory.c
@@ -339,7 +339,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamInventory_STEAMINVENTORY_INTERFACE_V003 *create_winISteamInventory_STEAMINVENTORY_INTERFACE_V003(void *linux_side)
 {
-    winISteamInventory_STEAMINVENTORY_INTERFACE_V003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamInventory_STEAMINVENTORY_INTERFACE_V003));
+    winISteamInventory_STEAMINVENTORY_INTERFACE_V003 *r = alloc_mem_for_iface(sizeof(winISteamInventory_STEAMINVENTORY_INTERFACE_V003), "STEAMINVENTORY_INTERFACE_V003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamInventory_STEAMINVENTORY_INTERFACE_V003_vtable;
     r->linux_side = linux_side;
@@ -662,7 +662,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamInventory_STEAMINVENTORY_INTERFACE_V002 *create_winISteamInventory_STEAMINVENTORY_INTERFACE_V002(void *linux_side)
 {
-    winISteamInventory_STEAMINVENTORY_INTERFACE_V002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamInventory_STEAMINVENTORY_INTERFACE_V002));
+    winISteamInventory_STEAMINVENTORY_INTERFACE_V002 *r = alloc_mem_for_iface(sizeof(winISteamInventory_STEAMINVENTORY_INTERFACE_V002), "STEAMINVENTORY_INTERFACE_V002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamInventory_STEAMINVENTORY_INTERFACE_V002_vtable;
     r->linux_side = linux_side;
@@ -881,7 +881,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamInventory_STEAMINVENTORY_INTERFACE_V001 *create_winISteamInventory_STEAMINVENTORY_INTERFACE_V001(void *linux_side)
 {
-    winISteamInventory_STEAMINVENTORY_INTERFACE_V001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamInventory_STEAMINVENTORY_INTERFACE_V001));
+    winISteamInventory_STEAMINVENTORY_INTERFACE_V001 *r = alloc_mem_for_iface(sizeof(winISteamInventory_STEAMINVENTORY_INTERFACE_V001), "STEAMINVENTORY_INTERFACE_V001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamInventory_STEAMINVENTORY_INTERFACE_V001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamMasterServerUpdater.c b/lsteamclient/winISteamMasterServerUpdater.c
index 30684691..1f298c02 100644
--- a/lsteamclient/winISteamMasterServerUpdater.c
+++ b/lsteamclient/winISteamMasterServerUpdater.c
@@ -147,7 +147,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMasterServerUpdater_SteamMasterServerUpdater001 *create_winISteamMasterServerUpdater_SteamMasterServerUpdater001(void *linux_side)
 {
-    winISteamMasterServerUpdater_SteamMasterServerUpdater001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMasterServerUpdater_SteamMasterServerUpdater001));
+    winISteamMasterServerUpdater_SteamMasterServerUpdater001 *r = alloc_mem_for_iface(sizeof(winISteamMasterServerUpdater_SteamMasterServerUpdater001), "SteamMasterServerUpdater001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMasterServerUpdater_SteamMasterServerUpdater001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamMatchmaking.c b/lsteamclient/winISteamMatchmaking.c
index af5e97c6..1126f68d 100644
--- a/lsteamclient/winISteamMatchmaking.c
+++ b/lsteamclient/winISteamMatchmaking.c
@@ -342,7 +342,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmaking_SteamMatchMaking009 *create_winISteamMatchmaking_SteamMatchMaking009(void *linux_side)
 {
-    winISteamMatchmaking_SteamMatchMaking009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmaking_SteamMatchMaking009));
+    winISteamMatchmaking_SteamMatchMaking009 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking009), "SteamMatchMaking009");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmaking_SteamMatchMaking009_vtable;
     r->linux_side = linux_side;
@@ -660,7 +660,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmaking_SteamMatchMaking008 *create_winISteamMatchmaking_SteamMatchMaking008(void *linux_side)
 {
-    winISteamMatchmaking_SteamMatchMaking008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmaking_SteamMatchMaking008));
+    winISteamMatchmaking_SteamMatchMaking008 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking008), "SteamMatchMaking008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmaking_SteamMatchMaking008_vtable;
     r->linux_side = linux_side;
@@ -962,7 +962,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmaking_SteamMatchMaking007 *create_winISteamMatchmaking_SteamMatchMaking007(void *linux_side)
 {
-    winISteamMatchmaking_SteamMatchMaking007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmaking_SteamMatchMaking007));
+    winISteamMatchmaking_SteamMatchMaking007 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking007), "SteamMatchMaking007");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmaking_SteamMatchMaking007_vtable;
     r->linux_side = linux_side;
@@ -1216,7 +1216,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmaking_SteamMatchMaking006 *create_winISteamMatchmaking_SteamMatchMaking006(void *linux_side)
 {
-    winISteamMatchmaking_SteamMatchMaking006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmaking_SteamMatchMaking006));
+    winISteamMatchmaking_SteamMatchMaking006 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking006), "SteamMatchMaking006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmaking_SteamMatchMaking006_vtable;
     r->linux_side = linux_side;
@@ -1494,7 +1494,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmaking_SteamMatchMaking005 *create_winISteamMatchmaking_SteamMatchMaking005(void *linux_side)
 {
-    winISteamMatchmaking_SteamMatchMaking005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmaking_SteamMatchMaking005));
+    winISteamMatchmaking_SteamMatchMaking005 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking005), "SteamMatchMaking005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmaking_SteamMatchMaking005_vtable;
     r->linux_side = linux_side;
@@ -1739,7 +1739,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmaking_SteamMatchMaking004 *create_winISteamMatchmaking_SteamMatchMaking004(void *linux_side)
 {
-    winISteamMatchmaking_SteamMatchMaking004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmaking_SteamMatchMaking004));
+    winISteamMatchmaking_SteamMatchMaking004 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking004), "SteamMatchMaking004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmaking_SteamMatchMaking004_vtable;
     r->linux_side = linux_side;
@@ -1992,7 +1992,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmaking_SteamMatchMaking003 *create_winISteamMatchmaking_SteamMatchMaking003(void *linux_side)
 {
-    winISteamMatchmaking_SteamMatchMaking003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmaking_SteamMatchMaking003));
+    winISteamMatchmaking_SteamMatchMaking003 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking003), "SteamMatchMaking003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmaking_SteamMatchMaking003_vtable;
     r->linux_side = linux_side;
@@ -2181,7 +2181,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmaking_SteamMatchMaking002 *create_winISteamMatchmaking_SteamMatchMaking002(void *linux_side)
 {
-    winISteamMatchmaking_SteamMatchMaking002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmaking_SteamMatchMaking002));
+    winISteamMatchmaking_SteamMatchMaking002 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking002), "SteamMatchMaking002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmaking_SteamMatchMaking002_vtable;
     r->linux_side = linux_side;
@@ -2386,7 +2386,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmaking_SteamMatchMaking001 *create_winISteamMatchmaking_SteamMatchMaking001(void *linux_side)
 {
-    winISteamMatchmaking_SteamMatchMaking001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmaking_SteamMatchMaking001));
+    winISteamMatchmaking_SteamMatchMaking001 *r = alloc_mem_for_iface(sizeof(winISteamMatchmaking_SteamMatchMaking001), "SteamMatchMaking001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmaking_SteamMatchMaking001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamMatchmakingServers.c b/lsteamclient/winISteamMatchmakingServers.c
index 5ab1ca20..ae28668f 100644
--- a/lsteamclient/winISteamMatchmakingServers.c
+++ b/lsteamclient/winISteamMatchmakingServers.c
@@ -171,7 +171,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmakingServers_SteamMatchMakingServers002 *create_winISteamMatchmakingServers_SteamMatchMakingServers002(void *linux_side)
 {
-    winISteamMatchmakingServers_SteamMatchMakingServers002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmakingServers_SteamMatchMakingServers002));
+    winISteamMatchmakingServers_SteamMatchMakingServers002 *r = alloc_mem_for_iface(sizeof(winISteamMatchmakingServers_SteamMatchMakingServers002), "SteamMatchMakingServers002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmakingServers_SteamMatchMakingServers002_vtable;
     r->linux_side = linux_side;
@@ -326,7 +326,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMatchmakingServers_SteamMatchMakingServers001 *create_winISteamMatchmakingServers_SteamMatchMakingServers001(void *linux_side)
 {
-    winISteamMatchmakingServers_SteamMatchMakingServers001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMatchmakingServers_SteamMatchMakingServers001));
+    winISteamMatchmakingServers_SteamMatchMakingServers001 *r = alloc_mem_for_iface(sizeof(winISteamMatchmakingServers_SteamMatchMakingServers001), "SteamMatchMakingServers001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMatchmakingServers_SteamMatchMakingServers001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamMusic.c b/lsteamclient/winISteamMusic.c
index 5f14186f..44c96abc 100644
--- a/lsteamclient/winISteamMusic.c
+++ b/lsteamclient/winISteamMusic.c
@@ -107,7 +107,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001 *create_winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001));
+    winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001), "STEAMMUSIC_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMusic_STEAMMUSIC_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamMusicRemote.c b/lsteamclient/winISteamMusicRemote.c
index 4e2a28d3..7adc4066 100644
--- a/lsteamclient/winISteamMusicRemote.c
+++ b/lsteamclient/winISteamMusicRemote.c
@@ -291,7 +291,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001 *create_winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001));
+    winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001), "STEAMMUSICREMOTE_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamMusicRemote_STEAMMUSICREMOTE_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamNetworking.c b/lsteamclient/winISteamNetworking.c
index 357d0b7f..089bb30a 100644
--- a/lsteamclient/winISteamNetworking.c
+++ b/lsteamclient/winISteamNetworking.c
@@ -211,7 +211,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworking_SteamNetworking006 *create_winISteamNetworking_SteamNetworking006(void *linux_side)
 {
-    winISteamNetworking_SteamNetworking006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworking_SteamNetworking006));
+    winISteamNetworking_SteamNetworking006 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking006), "SteamNetworking006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworking_SteamNetworking006_vtable;
     r->linux_side = linux_side;
@@ -414,7 +414,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworking_SteamNetworking005 *create_winISteamNetworking_SteamNetworking005(void *linux_side)
 {
-    winISteamNetworking_SteamNetworking005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworking_SteamNetworking005));
+    winISteamNetworking_SteamNetworking005 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking005), "SteamNetworking005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworking_SteamNetworking005_vtable;
     r->linux_side = linux_side;
@@ -601,7 +601,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworking_SteamNetworking004 *create_winISteamNetworking_SteamNetworking004(void *linux_side)
 {
-    winISteamNetworking_SteamNetworking004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworking_SteamNetworking004));
+    winISteamNetworking_SteamNetworking004 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking004), "SteamNetworking004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworking_SteamNetworking004_vtable;
     r->linux_side = linux_side;
@@ -788,7 +788,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworking_SteamNetworking003 *create_winISteamNetworking_SteamNetworking003(void *linux_side)
 {
-    winISteamNetworking_SteamNetworking003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworking_SteamNetworking003));
+    winISteamNetworking_SteamNetworking003 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking003), "SteamNetworking003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworking_SteamNetworking003_vtable;
     r->linux_side = linux_side;
@@ -927,7 +927,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworking_SteamNetworking002 *create_winISteamNetworking_SteamNetworking002(void *linux_side)
 {
-    winISteamNetworking_SteamNetworking002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworking_SteamNetworking002));
+    winISteamNetworking_SteamNetworking002 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking002), "SteamNetworking002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworking_SteamNetworking002_vtable;
     r->linux_side = linux_side;
@@ -1050,7 +1050,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworking_SteamNetworking001 *create_winISteamNetworking_SteamNetworking001(void *linux_side)
 {
-    winISteamNetworking_SteamNetworking001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworking_SteamNetworking001));
+    winISteamNetworking_SteamNetworking001 *r = alloc_mem_for_iface(sizeof(winISteamNetworking_SteamNetworking001), "SteamNetworking001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworking_SteamNetworking001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamNetworkingMessages.c b/lsteamclient/winISteamNetworkingMessages.c
index 7bb7e7c3..d4fdb23b 100644
--- a/lsteamclient/winISteamNetworkingMessages.c
+++ b/lsteamclient/winISteamNetworkingMessages.c
@@ -83,7 +83,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingMessages_SteamNetworkingMessages002 *create_winISteamNetworkingMessages_SteamNetworkingMessages002(void *linux_side)
 {
-    winISteamNetworkingMessages_SteamNetworkingMessages002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingMessages_SteamNetworkingMessages002));
+    winISteamNetworkingMessages_SteamNetworkingMessages002 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingMessages_SteamNetworkingMessages002), "SteamNetworkingMessages002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingMessages_SteamNetworkingMessages002_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamNetworkingSockets.c b/lsteamclient/winISteamNetworkingSockets.c
index 10cca1ad..4360cf1e 100644
--- a/lsteamclient/winISteamNetworkingSockets.c
+++ b/lsteamclient/winISteamNetworkingSockets.c
@@ -360,7 +360,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingSockets_SteamNetworkingSockets009 *create_winISteamNetworkingSockets_SteamNetworkingSockets009(void *linux_side)
 {
-    winISteamNetworkingSockets_SteamNetworkingSockets009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingSockets_SteamNetworkingSockets009));
+    winISteamNetworkingSockets_SteamNetworkingSockets009 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets009), "SteamNetworkingSockets009");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets009_vtable;
     r->linux_side = linux_side;
@@ -704,7 +704,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingSockets_SteamNetworkingSockets008 *create_winISteamNetworkingSockets_SteamNetworkingSockets008(void *linux_side)
 {
-    winISteamNetworkingSockets_SteamNetworkingSockets008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingSockets_SteamNetworkingSockets008));
+    winISteamNetworkingSockets_SteamNetworkingSockets008 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets008), "SteamNetworkingSockets008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets008_vtable;
     r->linux_side = linux_side;
@@ -1008,7 +1008,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingSockets_SteamNetworkingSockets006 *create_winISteamNetworkingSockets_SteamNetworkingSockets006(void *linux_side)
 {
-    winISteamNetworkingSockets_SteamNetworkingSockets006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingSockets_SteamNetworkingSockets006));
+    winISteamNetworkingSockets_SteamNetworkingSockets006 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets006), "SteamNetworkingSockets006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets006_vtable;
     r->linux_side = linux_side;
@@ -1288,7 +1288,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingSockets_SteamNetworkingSockets004 *create_winISteamNetworkingSockets_SteamNetworkingSockets004(void *linux_side)
 {
-    winISteamNetworkingSockets_SteamNetworkingSockets004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingSockets_SteamNetworkingSockets004));
+    winISteamNetworkingSockets_SteamNetworkingSockets004 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets004), "SteamNetworkingSockets004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets004_vtable;
     r->linux_side = linux_side;
@@ -1544,7 +1544,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingSockets_SteamNetworkingSockets002 *create_winISteamNetworkingSockets_SteamNetworkingSockets002(void *linux_side)
 {
-    winISteamNetworkingSockets_SteamNetworkingSockets002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingSockets_SteamNetworkingSockets002));
+    winISteamNetworkingSockets_SteamNetworkingSockets002 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSockets_SteamNetworkingSockets002), "SteamNetworkingSockets002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingSockets_SteamNetworkingSockets002_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamNetworkingSocketsSerialized.c b/lsteamclient/winISteamNetworkingSocketsSerialized.c
index efee18f3..36d5ddac 100644
--- a/lsteamclient/winISteamNetworkingSocketsSerialized.c
+++ b/lsteamclient/winISteamNetworkingSocketsSerialized.c
@@ -99,7 +99,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003 *create_winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003(void *linux_side)
 {
-    winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003));
+    winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003), "SteamNetworkingSocketsSerialized003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized003_vtable;
     r->linux_side = linux_side;
@@ -190,7 +190,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002 *create_winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002(void *linux_side)
 {
-    winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002));
+    winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002), "SteamNetworkingSocketsSerialized002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingSocketsSerialized_SteamNetworkingSocketsSerialized002_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamNetworkingUtils.c b/lsteamclient/winISteamNetworkingUtils.c
index 033868a9..9eaf0641 100644
--- a/lsteamclient/winISteamNetworkingUtils.c
+++ b/lsteamclient/winISteamNetworkingUtils.c
@@ -216,7 +216,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingUtils_SteamNetworkingUtils003 *create_winISteamNetworkingUtils_SteamNetworkingUtils003(void *linux_side)
 {
-    winISteamNetworkingUtils_SteamNetworkingUtils003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingUtils_SteamNetworkingUtils003));
+    winISteamNetworkingUtils_SteamNetworkingUtils003 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingUtils_SteamNetworkingUtils003), "SteamNetworkingUtils003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingUtils_SteamNetworkingUtils003_vtable;
     r->linux_side = linux_side;
@@ -416,7 +416,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingUtils_SteamNetworkingUtils002 *create_winISteamNetworkingUtils_SteamNetworkingUtils002(void *linux_side)
 {
-    winISteamNetworkingUtils_SteamNetworkingUtils002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingUtils_SteamNetworkingUtils002));
+    winISteamNetworkingUtils_SteamNetworkingUtils002 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingUtils_SteamNetworkingUtils002), "SteamNetworkingUtils002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingUtils_SteamNetworkingUtils002_vtable;
     r->linux_side = linux_side;
@@ -616,7 +616,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamNetworkingUtils_SteamNetworkingUtils001 *create_winISteamNetworkingUtils_SteamNetworkingUtils001(void *linux_side)
 {
-    winISteamNetworkingUtils_SteamNetworkingUtils001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamNetworkingUtils_SteamNetworkingUtils001));
+    winISteamNetworkingUtils_SteamNetworkingUtils001 *r = alloc_mem_for_iface(sizeof(winISteamNetworkingUtils_SteamNetworkingUtils001), "SteamNetworkingUtils001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamNetworkingUtils_SteamNetworkingUtils001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamParentalSettings.c b/lsteamclient/winISteamParentalSettings.c
index 22a9205f..a9f9a545 100644
--- a/lsteamclient/winISteamParentalSettings.c
+++ b/lsteamclient/winISteamParentalSettings.c
@@ -83,7 +83,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001 *create_winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001));
+    winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001), "STEAMPARENTALSETTINGS_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamParentalSettings_STEAMPARENTALSETTINGS_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamParties.c b/lsteamclient/winISteamParties.c
index 88d2448f..95049c29 100644
--- a/lsteamclient/winISteamParties.c
+++ b/lsteamclient/winISteamParties.c
@@ -131,7 +131,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamParties_SteamParties002 *create_winISteamParties_SteamParties002(void *linux_side)
 {
-    winISteamParties_SteamParties002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamParties_SteamParties002));
+    winISteamParties_SteamParties002 *r = alloc_mem_for_iface(sizeof(winISteamParties_SteamParties002), "SteamParties002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamParties_SteamParties002_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamRemotePlay.c b/lsteamclient/winISteamRemotePlay.c
index ae056997..c87e38fc 100644
--- a/lsteamclient/winISteamRemotePlay.c
+++ b/lsteamclient/winISteamRemotePlay.c
@@ -92,7 +92,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001 *create_winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001));
+    winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001), "STEAMREMOTEPLAY_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemotePlay_STEAMREMOTEPLAY_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamRemoteStorage.c b/lsteamclient/winISteamRemoteStorage.c
index 5da23035..e63b9309 100644
--- a/lsteamclient/winISteamRemoteStorage.c
+++ b/lsteamclient/winISteamRemoteStorage.c
@@ -519,7 +519,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016), "STEAMREMOTESTORAGE_INTERFACE_VERSION016");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION016_vtable;
     r->linux_side = linux_side;
@@ -998,7 +998,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014), "STEAMREMOTESTORAGE_INTERFACE_VERSION014");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION014_vtable;
     r->linux_side = linux_side;
@@ -1477,7 +1477,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013), "STEAMREMOTESTORAGE_INTERFACE_VERSION013");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION013_vtable;
     r->linux_side = linux_side;
@@ -1932,7 +1932,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012), "STEAMREMOTESTORAGE_INTERFACE_VERSION012");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION012_vtable;
     r->linux_side = linux_side;
@@ -2387,7 +2387,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011), "STEAMREMOTESTORAGE_INTERFACE_VERSION011");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION011_vtable;
     r->linux_side = linux_side;
@@ -2842,7 +2842,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010), "STEAMREMOTESTORAGE_INTERFACE_VERSION010");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION010_vtable;
     r->linux_side = linux_side;
@@ -3287,7 +3287,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009), "STEAMREMOTESTORAGE_INTERFACE_VERSION009");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION009_vtable;
     r->linux_side = linux_side;
@@ -3732,7 +3732,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008), "STEAMREMOTESTORAGE_INTERFACE_VERSION008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION008_vtable;
     r->linux_side = linux_side;
@@ -4145,7 +4145,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007), "STEAMREMOTESTORAGE_INTERFACE_VERSION007");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION007_vtable;
     r->linux_side = linux_side;
@@ -4558,7 +4558,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006), "STEAMREMOTESTORAGE_INTERFACE_VERSION006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION006_vtable;
     r->linux_side = linux_side;
@@ -4837,7 +4837,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005), "STEAMREMOTESTORAGE_INTERFACE_VERSION005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION005_vtable;
     r->linux_side = linux_side;
@@ -5040,7 +5040,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004), "STEAMREMOTESTORAGE_INTERFACE_VERSION004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION004_vtable;
     r->linux_side = linux_side;
@@ -5227,7 +5227,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003), "STEAMREMOTESTORAGE_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION003_vtable;
     r->linux_side = linux_side;
@@ -5310,7 +5310,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002), "STEAMREMOTESTORAGE_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION002_vtable;
     r->linux_side = linux_side;
@@ -5401,7 +5401,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001 *create_winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001));
+    winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001), "STEAMREMOTESTORAGE_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamRemoteStorage_STEAMREMOTESTORAGE_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamScreenshots.c b/lsteamclient/winISteamScreenshots.c
index 9a168ccc..d0f21f74 100644
--- a/lsteamclient/winISteamScreenshots.c
+++ b/lsteamclient/winISteamScreenshots.c
@@ -115,7 +115,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003 *create_winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003(void *linux_side)
 {
-    winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003));
+    winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003), "STEAMSCREENSHOTS_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION003_vtable;
     r->linux_side = linux_side;
@@ -202,7 +202,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002 *create_winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002(void *linux_side)
 {
-    winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002));
+    winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002), "STEAMSCREENSHOTS_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION002_vtable;
     r->linux_side = linux_side;
@@ -281,7 +281,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001 *create_winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001));
+    winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001), "STEAMSCREENSHOTS_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamScreenshots_STEAMSCREENSHOTS_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamUGC.c b/lsteamclient/winISteamUGC.c
index 54c036ee..2d5f80e4 100644
--- a/lsteamclient/winISteamUGC.c
+++ b/lsteamclient/winISteamUGC.c
@@ -723,7 +723,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION015 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION015(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION015 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION015));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION015 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION015), "STEAMUGC_INTERFACE_VERSION015");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION015_vtable;
     r->linux_side = linux_side;
@@ -1398,7 +1398,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION014 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION014(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION014 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION014));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION014 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION014), "STEAMUGC_INTERFACE_VERSION014");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION014_vtable;
     r->linux_side = linux_side;
@@ -2065,7 +2065,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION013 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION013(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION013 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION013));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION013 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION013), "STEAMUGC_INTERFACE_VERSION013");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION013_vtable;
     r->linux_side = linux_side;
@@ -2716,7 +2716,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION012 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION012(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION012 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION012));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION012 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION012), "STEAMUGC_INTERFACE_VERSION012");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION012_vtable;
     r->linux_side = linux_side;
@@ -3351,7 +3351,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION010 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION010(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION010));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION010 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION010), "STEAMUGC_INTERFACE_VERSION010");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION010_vtable;
     r->linux_side = linux_side;
@@ -3930,7 +3930,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION009 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION009(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION009));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION009 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION009), "STEAMUGC_INTERFACE_VERSION009");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION009_vtable;
     r->linux_side = linux_side;
@@ -4477,7 +4477,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION008 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION008(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION008));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION008 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION008), "STEAMUGC_INTERFACE_VERSION008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION008_vtable;
     r->linux_side = linux_side;
@@ -4980,7 +4980,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION007 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION007(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION007));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION007 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION007), "STEAMUGC_INTERFACE_VERSION007");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION007_vtable;
     r->linux_side = linux_side;
@@ -5417,7 +5417,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION006 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION006(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION006));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION006 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION006), "STEAMUGC_INTERFACE_VERSION006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION006_vtable;
     r->linux_side = linux_side;
@@ -5822,7 +5822,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION005 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION005(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION005));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION005 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION005), "STEAMUGC_INTERFACE_VERSION005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION005_vtable;
     r->linux_side = linux_side;
@@ -6120,7 +6120,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION004 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION004(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION004));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION004 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION004), "STEAMUGC_INTERFACE_VERSION004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION004_vtable;
     r->linux_side = linux_side;
@@ -6402,7 +6402,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION003 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION003(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION003));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION003), "STEAMUGC_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION003_vtable;
     r->linux_side = linux_side;
@@ -6684,7 +6684,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION002 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION002(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION002));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION002), "STEAMUGC_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION002_vtable;
     r->linux_side = linux_side;
@@ -6823,7 +6823,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUGC_STEAMUGC_INTERFACE_VERSION001 *create_winISteamUGC_STEAMUGC_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamUGC_STEAMUGC_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION001));
+    winISteamUGC_STEAMUGC_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamUGC_STEAMUGC_INTERFACE_VERSION001), "STEAMUGC_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUGC_STEAMUGC_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamUnifiedMessages.c b/lsteamclient/winISteamUnifiedMessages.c
index 12f49f6e..70500206 100644
--- a/lsteamclient/winISteamUnifiedMessages.c
+++ b/lsteamclient/winISteamUnifiedMessages.c
@@ -75,7 +75,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001 *create_winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001));
+    winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001), "STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUnifiedMessages_STEAMUNIFIEDMESSAGES_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamUser.c b/lsteamclient/winISteamUser.c
index 9e40aae4..80e2af7c 100644
--- a/lsteamclient/winISteamUser.c
+++ b/lsteamclient/winISteamUser.c
@@ -295,7 +295,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser021 *create_winISteamUser_SteamUser021(void *linux_side)
 {
-    winISteamUser_SteamUser021 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser021));
+    winISteamUser_SteamUser021 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser021), "SteamUser021");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser021_vtable;
     r->linux_side = linux_side;
@@ -574,7 +574,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser020 *create_winISteamUser_SteamUser020(void *linux_side)
 {
-    winISteamUser_SteamUser020 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser020));
+    winISteamUser_SteamUser020 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser020), "SteamUser020");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser020_vtable;
     r->linux_side = linux_side;
@@ -837,7 +837,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser019 *create_winISteamUser_SteamUser019(void *linux_side)
 {
-    winISteamUser_SteamUser019 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser019));
+    winISteamUser_SteamUser019 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser019), "SteamUser019");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser019_vtable;
     r->linux_side = linux_side;
@@ -1068,7 +1068,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser018 *create_winISteamUser_SteamUser018(void *linux_side)
 {
-    winISteamUser_SteamUser018 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser018));
+    winISteamUser_SteamUser018 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser018), "SteamUser018");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser018_vtable;
     r->linux_side = linux_side;
@@ -1291,7 +1291,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser017 *create_winISteamUser_SteamUser017(void *linux_side)
 {
-    winISteamUser_SteamUser017 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser017));
+    winISteamUser_SteamUser017 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser017), "SteamUser017");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser017_vtable;
     r->linux_side = linux_side;
@@ -1498,7 +1498,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser016 *create_winISteamUser_SteamUser016(void *linux_side)
 {
-    winISteamUser_SteamUser016 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser016));
+    winISteamUser_SteamUser016 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser016), "SteamUser016");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser016_vtable;
     r->linux_side = linux_side;
@@ -1705,7 +1705,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser015 *create_winISteamUser_SteamUser015(void *linux_side)
 {
-    winISteamUser_SteamUser015 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser015));
+    winISteamUser_SteamUser015 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser015), "SteamUser015");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser015_vtable;
     r->linux_side = linux_side;
@@ -1904,7 +1904,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser014 *create_winISteamUser_SteamUser014(void *linux_side)
 {
-    winISteamUser_SteamUser014 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser014));
+    winISteamUser_SteamUser014 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser014), "SteamUser014");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser014_vtable;
     r->linux_side = linux_side;
@@ -2071,7 +2071,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser013 *create_winISteamUser_SteamUser013(void *linux_side)
 {
-    winISteamUser_SteamUser013 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser013));
+    winISteamUser_SteamUser013 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser013), "SteamUser013");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser013_vtable;
     r->linux_side = linux_side;
@@ -2230,7 +2230,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser012 *create_winISteamUser_SteamUser012(void *linux_side)
 {
-    winISteamUser_SteamUser012 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser012));
+    winISteamUser_SteamUser012 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser012), "SteamUser012");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser012_vtable;
     r->linux_side = linux_side;
@@ -2349,7 +2349,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser011 *create_winISteamUser_SteamUser011(void *linux_side)
 {
-    winISteamUser_SteamUser011 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser011));
+    winISteamUser_SteamUser011 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser011), "SteamUser011");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser011_vtable;
     r->linux_side = linux_side;
@@ -2425,7 +2425,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser010 *create_winISteamUser_SteamUser010(void *linux_side)
 {
-    winISteamUser_SteamUser010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser010));
+    winISteamUser_SteamUser010 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser010), "SteamUser010");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser010_vtable;
     r->linux_side = linux_side;
@@ -2509,7 +2509,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser009 *create_winISteamUser_SteamUser009(void *linux_side)
 {
-    winISteamUser_SteamUser009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser009));
+    winISteamUser_SteamUser009 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser009), "SteamUser009");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser009_vtable;
     r->linux_side = linux_side;
@@ -2593,7 +2593,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser008 *create_winISteamUser_SteamUser008(void *linux_side)
 {
-    winISteamUser_SteamUser008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser008));
+    winISteamUser_SteamUser008 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser008), "SteamUser008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser008_vtable;
     r->linux_side = linux_side;
@@ -2725,7 +2725,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser007 *create_winISteamUser_SteamUser007(void *linux_side)
 {
-    winISteamUser_SteamUser007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser007));
+    winISteamUser_SteamUser007 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser007), "SteamUser007");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser007_vtable;
     r->linux_side = linux_side;
@@ -2849,7 +2849,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser006 *create_winISteamUser_SteamUser006(void *linux_side)
 {
-    winISteamUser_SteamUser006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser006));
+    winISteamUser_SteamUser006 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser006), "SteamUser006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser006_vtable;
     r->linux_side = linux_side;
@@ -3189,7 +3189,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser005 *create_winISteamUser_SteamUser005(void *linux_side)
 {
-    winISteamUser_SteamUser005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser005));
+    winISteamUser_SteamUser005 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser005), "SteamUser005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser005_vtable;
     r->linux_side = linux_side;
@@ -3425,7 +3425,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUser_SteamUser004 *create_winISteamUser_SteamUser004(void *linux_side)
 {
-    winISteamUser_SteamUser004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUser_SteamUser004));
+    winISteamUser_SteamUser004 *r = alloc_mem_for_iface(sizeof(winISteamUser_SteamUser004), "SteamUser004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUser_SteamUser004_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamUserStats.c b/lsteamclient/winISteamUserStats.c
index b4cae321..c0fa3dcd 100644
--- a/lsteamclient/winISteamUserStats.c
+++ b/lsteamclient/winISteamUserStats.c
@@ -395,7 +395,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012), "STEAMUSERSTATS_INTERFACE_VERSION012");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION012_vtable;
     r->linux_side = linux_side;
@@ -766,7 +766,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011), "STEAMUSERSTATS_INTERFACE_VERSION011");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION011_vtable;
     r->linux_side = linux_side;
@@ -1121,7 +1121,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010), "STEAMUSERSTATS_INTERFACE_VERSION010");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION010_vtable;
     r->linux_side = linux_side;
@@ -1404,7 +1404,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009), "STEAMUSERSTATS_INTERFACE_VERSION009");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION009_vtable;
     r->linux_side = linux_side;
@@ -1679,7 +1679,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008), "STEAMUSERSTATS_INTERFACE_VERSION008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION008_vtable;
     r->linux_side = linux_side;
@@ -1946,7 +1946,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007), "STEAMUSERSTATS_INTERFACE_VERSION007");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION007_vtable;
     r->linux_side = linux_side;
@@ -2197,7 +2197,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006), "STEAMUSERSTATS_INTERFACE_VERSION006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION006_vtable;
     r->linux_side = linux_side;
@@ -2440,7 +2440,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005), "STEAMUSERSTATS_INTERFACE_VERSION005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION005_vtable;
     r->linux_side = linux_side;
@@ -2603,7 +2603,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004), "STEAMUSERSTATS_INTERFACE_VERSION004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION004_vtable;
     r->linux_side = linux_side;
@@ -2734,7 +2734,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003), "STEAMUSERSTATS_INTERFACE_VERSION003");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION003_vtable;
     r->linux_side = linux_side;
@@ -2905,7 +2905,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002), "STEAMUSERSTATS_INTERFACE_VERSION002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION002_vtable;
     r->linux_side = linux_side;
@@ -3108,7 +3108,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001 *create_winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001(void *linux_side)
 {
-    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001));
+    winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001 *r = alloc_mem_for_iface(sizeof(winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001), "STEAMUSERSTATS_INTERFACE_VERSION001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUserStats_STEAMUSERSTATS_INTERFACE_VERSION001_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamUtils.c b/lsteamclient/winISteamUtils.c
index 2eb79ac5..9f139ff4 100644
--- a/lsteamclient/winISteamUtils.c
+++ b/lsteamclient/winISteamUtils.c
@@ -333,7 +333,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUtils_SteamUtils010 *create_winISteamUtils_SteamUtils010(void *linux_side)
 {
-    winISteamUtils_SteamUtils010 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUtils_SteamUtils010));
+    winISteamUtils_SteamUtils010 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils010), "SteamUtils010");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUtils_SteamUtils010_vtable;
     r->linux_side = linux_side;
@@ -634,7 +634,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUtils_SteamUtils009 *create_winISteamUtils_SteamUtils009(void *linux_side)
 {
-    winISteamUtils_SteamUtils009 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUtils_SteamUtils009));
+    winISteamUtils_SteamUtils009 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils009), "SteamUtils009");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUtils_SteamUtils009_vtable;
     r->linux_side = linux_side;
@@ -887,7 +887,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUtils_SteamUtils008 *create_winISteamUtils_SteamUtils008(void *linux_side)
 {
-    winISteamUtils_SteamUtils008 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUtils_SteamUtils008));
+    winISteamUtils_SteamUtils008 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils008), "SteamUtils008");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUtils_SteamUtils008_vtable;
     r->linux_side = linux_side;
@@ -1124,7 +1124,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUtils_SteamUtils007 *create_winISteamUtils_SteamUtils007(void *linux_side)
 {
-    winISteamUtils_SteamUtils007 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUtils_SteamUtils007));
+    winISteamUtils_SteamUtils007 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils007), "SteamUtils007");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUtils_SteamUtils007_vtable;
     r->linux_side = linux_side;
@@ -1353,7 +1353,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUtils_SteamUtils006 *create_winISteamUtils_SteamUtils006(void *linux_side)
 {
-    winISteamUtils_SteamUtils006 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUtils_SteamUtils006));
+    winISteamUtils_SteamUtils006 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils006), "SteamUtils006");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUtils_SteamUtils006_vtable;
     r->linux_side = linux_side;
@@ -1566,7 +1566,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUtils_SteamUtils005 *create_winISteamUtils_SteamUtils005(void *linux_side)
 {
-    winISteamUtils_SteamUtils005 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUtils_SteamUtils005));
+    winISteamUtils_SteamUtils005 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils005), "SteamUtils005");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUtils_SteamUtils005_vtable;
     r->linux_side = linux_side;
@@ -1737,7 +1737,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUtils_SteamUtils004 *create_winISteamUtils_SteamUtils004(void *linux_side)
 {
-    winISteamUtils_SteamUtils004 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUtils_SteamUtils004));
+    winISteamUtils_SteamUtils004 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils004), "SteamUtils004");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUtils_SteamUtils004_vtable;
     r->linux_side = linux_side;
@@ -1876,7 +1876,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamUtils_SteamUtils002 *create_winISteamUtils_SteamUtils002(void *linux_side)
 {
-    winISteamUtils_SteamUtils002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamUtils_SteamUtils002));
+    winISteamUtils_SteamUtils002 *r = alloc_mem_for_iface(sizeof(winISteamUtils_SteamUtils002), "SteamUtils002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamUtils_SteamUtils002_vtable;
     r->linux_side = linux_side;
diff --git a/lsteamclient/winISteamVideo.c b/lsteamclient/winISteamVideo.c
index bb731f9f..49e60200 100644
--- a/lsteamclient/winISteamVideo.c
+++ b/lsteamclient/winISteamVideo.c
@@ -67,7 +67,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamVideo_STEAMVIDEO_INTERFACE_V002 *create_winISteamVideo_STEAMVIDEO_INTERFACE_V002(void *linux_side)
 {
-    winISteamVideo_STEAMVIDEO_INTERFACE_V002 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamVideo_STEAMVIDEO_INTERFACE_V002));
+    winISteamVideo_STEAMVIDEO_INTERFACE_V002 *r = alloc_mem_for_iface(sizeof(winISteamVideo_STEAMVIDEO_INTERFACE_V002), "STEAMVIDEO_INTERFACE_V002");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamVideo_STEAMVIDEO_INTERFACE_V002_vtable;
     r->linux_side = linux_side;
@@ -110,7 +110,7 @@ void __asm_dummy_vtables(void) {
 
 winISteamVideo_STEAMVIDEO_INTERFACE_V001 *create_winISteamVideo_STEAMVIDEO_INTERFACE_V001(void *linux_side)
 {
-    winISteamVideo_STEAMVIDEO_INTERFACE_V001 *r = HeapAlloc(GetProcessHeap(), 0, sizeof(winISteamVideo_STEAMVIDEO_INTERFACE_V001));
+    winISteamVideo_STEAMVIDEO_INTERFACE_V001 *r = alloc_mem_for_iface(sizeof(winISteamVideo_STEAMVIDEO_INTERFACE_V001), "STEAMVIDEO_INTERFACE_V001");
     TRACE("-> %p\n", r);
     r->vtable = &winISteamVideo_STEAMVIDEO_INTERFACE_V001_vtable;
     r->linux_side = linux_side;