diff --git a/loader/afl.c b/loader/afl.c
index d1024b1a55..aaef2ac2d4 100644
--- a/loader/afl.c
+++ b/loader/afl.c
@@ -273,6 +273,9 @@ PWINE_ACMDRIVERID MSACM_RegisterDriver(const char* pszFileName,
 
     TRACE("('%s', '%x', 0x%08x)\n", pszFileName, wFormatTag, hinstModule);
 
+#ifndef WIN32_LOADER
+	MSACM_hHeap = GetProcessHeap();
+#endif
     padid = (PWINE_ACMDRIVERID) HeapAlloc(MSACM_hHeap, 0, sizeof(WINE_ACMDRIVERID));
     padid->pszFileName = (char*)malloc(strlen(pszFileName)+1);
     strcpy(padid->pszFileName, pszFileName);
@@ -494,7 +497,9 @@ MMRESULT WINAPI acmStreamOpen(PHACMSTREAM phas, HACMDRIVER had, PWAVEFORMATEX pw
 	if (phas)
 	    *phas = (HACMSTREAM)was;
 	TRACE("=> (%d)\n", ret);
+#ifdef WIN32_LOADER
         CodecAlloc();
+#endif
 	return ret;
     }
 errCleanUp:		
@@ -521,7 +526,9 @@ MMRESULT WINAPI acmStreamClose(HACMSTREAM has, DWORD fdwClose)
 	if (was->hAcmDriver)
 	    acmDriverClose(was->hAcmDriver, 0L);	
 	HeapFree(MSACM_hHeap, 0, was);
+#ifdef WIN32_LOADER
         CodecRelease();
+#endif
     }
     TRACE("=> (%d)\n", ret);
     return ret;