diff --git a/dlls/kernel32/heap.c b/dlls/kernel32/heap.c
index ead0778683a..4d36a1d4a2e 100644
--- a/dlls/kernel32/heap.c
+++ b/dlls/kernel32/heap.c
@@ -248,15 +248,6 @@ BOOL WINAPI HeapUnlock(
 }
 
 
-/***********************************************************************
- *           GetProcessHeap    (KERNEL32.@)
- */
-HANDLE WINAPI GetProcessHeap(void)
-{
-    return NtCurrentTeb()->Peb->ProcessHeap;
-}
-
-
 /***********************************************************************
  *           GetProcessHeaps    (KERNEL32.@)
  */
diff --git a/dlls/kernel32/thread.c b/dlls/kernel32/thread.c
index f6a2b0f2cc4..51302860ec4 100644
--- a/dlls/kernel32/thread.c
+++ b/dlls/kernel32/thread.c
@@ -596,6 +596,12 @@ __ASM_STDCALL_FUNC( GetCurrentProcessId, 0, ".byte 0x64\n\tmovl 0x20,%eax\n\tret
 /* DWORD WINAPI GetCurrentThreadId(void) */
 __ASM_STDCALL_FUNC( GetCurrentThreadId, 0, ".byte 0x64\n\tmovl 0x24,%eax\n\tret" )
 
+/***********************************************************************
+ *		GetProcessHeap (KERNEL32.@)
+ */
+/* HANDLE WINAPI GetProcessHeap(void) */
+__ASM_STDCALL_FUNC( GetProcessHeap, 0, ".byte 0x64\n\tmovl 0x30,%eax\n\tmovl 0x18(%eax),%eax\n\tret");
+
 #else  /* __i386__ */
 
 /**********************************************************************
@@ -650,6 +656,14 @@ DWORD WINAPI GetCurrentThreadId(void)
     return HandleToULong(NtCurrentTeb()->ClientId.UniqueThread);
 }
 
+/***********************************************************************
+ *           GetProcessHeap    (KERNEL32.@)
+ */
+HANDLE WINAPI GetProcessHeap(void)
+{
+    return NtCurrentTeb()->Peb->ProcessHeap;
+}
+
 #endif  /* __i386__ */
 
 /*************************************************************************