diff --git a/dlls/advapi32/eventlog.c b/dlls/advapi32/eventlog.c
index 9f4ad5809ce..991e0092f9b 100644
--- a/dlls/advapi32/eventlog.c
+++ b/dlls/advapi32/eventlog.c
@@ -21,7 +21,6 @@
 #include "winbase.h"
 #include "windef.h"
 #include "winerror.h"
-#include "heap.h"
 #include "winternl.h"
 
 #include "wine/debug.h"
diff --git a/dlls/advapi32/security.c b/dlls/advapi32/security.c
index a6dbcddacf2..d39232feb1c 100644
--- a/dlls/advapi32/security.c
+++ b/dlls/advapi32/security.c
@@ -23,7 +23,6 @@
 #include "windef.h"
 #include "winerror.h"
 #include "rpcnterr.h"
-#include "heap.h"
 #include "winternl.h"
 #include "ntsecapi.h"
 #include "accctrl.h"
diff --git a/dlls/comctl32/listview.c b/dlls/comctl32/listview.c
index 8f2367ef7b5..7820c0bec2c 100644
--- a/dlls/comctl32/listview.c
+++ b/dlls/comctl32/listview.c
@@ -156,7 +156,6 @@
 
 #include "winbase.h"
 #include "winnt.h"
-#include "heap.h"
 #include "commctrl.h"
 #include "comctl32.h"
 
diff --git a/dlls/comctl32/propsheet.c b/dlls/comctl32/propsheet.c
index 4d9b2c0a77d..411a49b4c77 100644
--- a/dlls/comctl32/propsheet.c
+++ b/dlls/comctl32/propsheet.c
@@ -32,7 +32,6 @@
 #include "prsht.h"
 #include "winnls.h"
 #include "comctl32.h"
-#include "heap.h"
 
 #include "wine/debug.h"
 #include "wine/unicode.h"
diff --git a/dlls/commdlg/filedlg.c b/dlls/commdlg/filedlg.c
index f95d14edf28..fa40369bba0 100644
--- a/dlls/commdlg/filedlg.c
+++ b/dlls/commdlg/filedlg.c
@@ -29,7 +29,6 @@
 #include "wine/winbase16.h"
 #include "wine/winuser16.h"
 #include "wine/unicode.h"
-#include "heap.h"
 #include "commdlg.h"
 #include "wine/debug.h"
 #include "cderr.h"
diff --git a/dlls/kernel/thunk.c b/dlls/kernel/thunk.c
index 0e8ccef3e9a..d68ce7e7650 100644
--- a/dlls/kernel/thunk.c
+++ b/dlls/kernel/thunk.c
@@ -38,7 +38,6 @@
 #include "wine/debug.h"
 #include "wine/library.h"
 #include "flatthunk.h"
-#include "heap.h"
 #include "module.h"
 #include "miscemu.h"
 #include "selectors.h"
diff --git a/dlls/ntdll/heap.c b/dlls/ntdll/heap.c
index b7362703b7f..bd7babe924b 100644
--- a/dlls/ntdll/heap.c
+++ b/dlls/ntdll/heap.c
@@ -33,7 +33,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "winnt.h"
-#include "heap.h"
 #include "thread.h"
 #include "wine/debug.h"
 
diff --git a/dlls/oleaut32/tmarshal.c b/dlls/oleaut32/tmarshal.c
index d8619f04340..f0608346bc1 100644
--- a/dlls/oleaut32/tmarshal.c
+++ b/dlls/oleaut32/tmarshal.c
@@ -35,7 +35,6 @@
 
 #include "ole2.h"
 #include "wine/unicode.h"
-#include "heap.h"
 #include "ole2disp.h"
 #include "typelib.h"
 #include "wine/debug.h"
diff --git a/dlls/shell32/shellord.c b/dlls/shell32/shellord.c
index 772cd763305..d6c336a241b 100644
--- a/dlls/shell32/shellord.c
+++ b/dlls/shell32/shellord.c
@@ -27,7 +27,6 @@
 #include "winreg.h"
 #include "wine/debug.h"
 #include "winnls.h"
-#include "heap.h"
 
 #include "shellapi.h"
 #include "shlguid.h"
diff --git a/dlls/winmm/playsound.c b/dlls/winmm/playsound.c
index 52ffca16387..e898c089216 100644
--- a/dlls/winmm/playsound.c
+++ b/dlls/winmm/playsound.c
@@ -27,7 +27,6 @@
 #include "winbase.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "heap.h"
 #include "winreg.h"
 #include "winemm.h"
 #include "winternl.h"
diff --git a/files/directory.c b/files/directory.c
index fd13de238f1..ca8db27c888 100644
--- a/files/directory.c
+++ b/files/directory.c
@@ -44,7 +44,6 @@
 #include "wine/unicode.h"
 #include "drive.h"
 #include "file.h"
-#include "heap.h"
 #include "msdos.h"
 #include "wine/debug.h"
 
diff --git a/files/drive.c b/files/drive.c
index b042a2fd191..4ca9a284217 100644
--- a/files/drive.c
+++ b/files/drive.c
@@ -65,7 +65,6 @@
 #include "ntddcdrm.h"
 #include "drive.h"
 #include "file.h"
-#include "heap.h"
 #include "msdos.h"
 #include "task.h"
 #include "wine/unicode.h"
diff --git a/files/smb.c b/files/smb.c
index 56c90f17966..21c711dbde9 100644
--- a/files/smb.c
+++ b/files/smb.c
@@ -103,8 +103,8 @@
 #include "winerror.h"
 #include "windef.h"
 #include "winbase.h"
+#include "winnls.h"
 #include "file.h"
-#include "heap.h"
 
 #include "smb.h"
 
diff --git a/windows/message.c b/windows/message.c
index 4f7375c1a65..1b2d780278b 100644
--- a/windows/message.c
+++ b/windows/message.c
@@ -36,7 +36,6 @@
 #include "wine/server.h"
 #include "controls.h"
 #include "dde.h"
-#include "heap.h"
 #include "message.h"
 #include "thread.h"
 #include "user.h"
diff --git a/windows/msgbox.c b/windows/msgbox.c
index af3f1c57fbc..2645beeba0b 100644
--- a/windows/msgbox.c
+++ b/windows/msgbox.c
@@ -26,7 +26,6 @@
 #include "wine/winuser16.h"
 #include "winternl.h"
 #include "dlgs.h"
-#include "heap.h"
 #include "user.h"
 #include "wine/debug.h"