diff --git a/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec b/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec
index b835f4e7c75..fe546fff4cf 100644
--- a/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec
+++ b/dlls/api-ms-win-core-heap-l1-1-0/api-ms-win-core-heap-l1-1-0.spec
@@ -1,4 +1,4 @@
-@ stdcall -norelay GetProcessHeap() kernel32.GetProcessHeap
+@ stdcall GetProcessHeap() kernel32.GetProcessHeap
 @ stdcall GetProcessHeaps(long ptr) kernel32.GetProcessHeaps
 @ stdcall HeapAlloc(long long long) kernel32.HeapAlloc
 @ stdcall HeapCompact(long long) kernel32.HeapCompact
diff --git a/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec b/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec
index fc4d357b396..88bb7203010 100644
--- a/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec
+++ b/dlls/api-ms-win-core-heap-l1-2-0/api-ms-win-core-heap-l1-2-0.spec
@@ -1,4 +1,4 @@
-@ stdcall -norelay GetProcessHeap() kernel32.GetProcessHeap
+@ stdcall GetProcessHeap() kernel32.GetProcessHeap
 @ stdcall GetProcessHeaps(long ptr) kernel32.GetProcessHeaps
 @ stdcall HeapAlloc(long long long) kernel32.HeapAlloc
 @ stdcall HeapCompact(long long) kernel32.HeapCompact
diff --git a/tools/make_specfiles b/tools/make_specfiles
index 5c30ce50038..7fef3a6821a 100755
--- a/tools/make_specfiles
+++ b/tools/make_specfiles
@@ -575,7 +575,7 @@ sub update_spec_file($)
         my $func = $descr{name};
         if (!defined $funcs{$func})
         {
-            $funcs{$func} = \%descr unless $commented_out;
+            $funcs{$func} = \%descr unless $commented_out || $name =~ /-/;
             goto done;
         }