diff --git a/controls/combo.c b/controls/combo.c
index dc2f4b56339..d7a6118d5f8 100644
--- a/controls/combo.c
+++ b/controls/combo.c
@@ -13,10 +13,10 @@
 #include "wingdi.h"
 #include "winuser.h"
 #include "wine/winuser16.h"
+#include "wine/unicode.h"
 #include "win.h"
 #include "spy.h"
 #include "user.h"
-#include "heap.h"
 #include "controls.h"
 #include "debugtools.h"
 
diff --git a/controls/desktop.c b/controls/desktop.c
index 01e1706cacf..3400ddebab6 100644
--- a/controls/desktop.c
+++ b/controls/desktop.c
@@ -10,7 +10,6 @@
 
 #include "windef.h"
 #include "wingdi.h"
-#include "heap.h"
 #include "user.h"
 #include "win.h"
 #include "controls.h"
diff --git a/controls/icontitle.c b/controls/icontitle.c
index 770232fccde..ea37153435c 100644
--- a/controls/icontitle.c
+++ b/controls/icontitle.c
@@ -16,7 +16,6 @@
 #include "wine/unicode.h"
 #include "controls.h"
 #include "win.h"
-#include "heap.h"
 
 static BOOL bMultiLineTitle;
 static HFONT hIconTitleFont;
diff --git a/controls/static.c b/controls/static.c
index 21ad0c2da71..0912ea973b3 100644
--- a/controls/static.c
+++ b/controls/static.c
@@ -11,7 +11,6 @@
 #include "win.h"
 #include "cursoricon.h"
 #include "controls.h"
-#include "heap.h"
 #include "user.h"
 #include "debugtools.h"
 
diff --git a/dlls/comctl32/ipaddress.c b/dlls/comctl32/ipaddress.c
index da988fa0aaf..0df1a2c1c6e 100644
--- a/dlls/comctl32/ipaddress.c
+++ b/dlls/comctl32/ipaddress.c
@@ -28,7 +28,6 @@
 
 #include "winbase.h"
 #include "commctrl.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ipaddress);
diff --git a/dlls/commdlg/filedlg95.c b/dlls/commdlg/filedlg95.c
index 15c7afe918c..9234591d787 100644
--- a/dlls/commdlg/filedlg95.c
+++ b/dlls/commdlg/filedlg95.c
@@ -41,7 +41,7 @@
 #include "winbase.h"
 #include "ntddk.h"
 #include "winnls.h"
-#include "heap.h"
+#include "wine/unicode.h"
 #include "commdlg.h"
 #include "dlgs.h"
 #include "cdlg.h"
diff --git a/dlls/commdlg/filedlgbrowser.c b/dlls/commdlg/filedlgbrowser.c
index 3feebee7410..5f20dc24dec 100644
--- a/dlls/commdlg/filedlgbrowser.c
+++ b/dlls/commdlg/filedlgbrowser.c
@@ -12,7 +12,6 @@
 #include "winnls.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "heap.h"
 #include "debugtools.h"
 
 #include "shlwapi.h"
diff --git a/dlls/ddraw/d3ddevice/main.c b/dlls/ddraw/d3ddevice/main.c
index 82c8acfdca1..aafedcfe554 100644
--- a/dlls/ddraw/d3ddevice/main.c
+++ b/dlls/ddraw/d3ddevice/main.c
@@ -9,7 +9,6 @@
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
-#include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
diff --git a/dlls/ddraw/d3ddevice/mesa.c b/dlls/ddraw/d3ddevice/mesa.c
index b86b9696b83..a2dd59f8974 100644
--- a/dlls/ddraw/d3ddevice/mesa.c
+++ b/dlls/ddraw/d3ddevice/mesa.c
@@ -9,7 +9,6 @@
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
-#include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
diff --git a/dlls/ddraw/d3dexecutebuffer.c b/dlls/ddraw/d3dexecutebuffer.c
index 9cb33ce9ac4..aa49cbbcf26 100644
--- a/dlls/ddraw/d3dexecutebuffer.c
+++ b/dlls/ddraw/d3dexecutebuffer.c
@@ -9,7 +9,6 @@
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
-#include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
diff --git a/dlls/ddraw/d3dlight.c b/dlls/ddraw/d3dlight.c
index 8b1c60d07b9..d0a85c91fdd 100644
--- a/dlls/ddraw/d3dlight.c
+++ b/dlls/ddraw/d3dlight.c
@@ -8,7 +8,6 @@
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
-#include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
diff --git a/dlls/ddraw/d3dmaterial.c b/dlls/ddraw/d3dmaterial.c
index 70c77e0d0f3..1e9215748a8 100644
--- a/dlls/ddraw/d3dmaterial.c
+++ b/dlls/ddraw/d3dmaterial.c
@@ -7,7 +7,6 @@
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
-#include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
diff --git a/dlls/ddraw/d3dtexture.c b/dlls/ddraw/d3dtexture.c
index 35bb75fa004..be68b6c3a78 100644
--- a/dlls/ddraw/d3dtexture.c
+++ b/dlls/ddraw/d3dtexture.c
@@ -9,7 +9,6 @@
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
-#include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
diff --git a/dlls/ddraw/d3dviewport.c b/dlls/ddraw/d3dviewport.c
index bc97ce97288..ed91eabe97e 100644
--- a/dlls/ddraw/d3dviewport.c
+++ b/dlls/ddraw/d3dviewport.c
@@ -7,7 +7,6 @@
 #include "windef.h"
 #include "winerror.h"
 #include "wine/obj_base.h"
-#include "heap.h"
 #include "ddraw.h"
 #include "d3d.h"
 #include "debugtools.h"
diff --git a/dlls/ddraw/helper.c b/dlls/ddraw/helper.c
index 5daed61bddd..bfce85bd9b8 100644
--- a/dlls/ddraw/helper.c
+++ b/dlls/ddraw/helper.c
@@ -16,7 +16,6 @@
 
 #include "wine/exception.h"
 #include "ddraw_private.h"
-#include "heap.h"
 
 #include "debugtools.h"
 
diff --git a/dlls/dplayx/dplaysp.c b/dlls/dplayx/dplaysp.c
index a798660a945..e38d2b6aa01 100644
--- a/dlls/dplayx/dplaysp.c
+++ b/dlls/dplayx/dplaysp.c
@@ -5,7 +5,6 @@
  */
 
 #include <string.h>
-#include "heap.h"
 #include "winerror.h"
 #include "debugtools.h"
 
diff --git a/dlls/dplayx/dplayx_global.c b/dlls/dplayx/dplayx_global.c
index e77615ca220..84dd3b68369 100644
--- a/dlls/dplayx/dplayx_global.c
+++ b/dlls/dplayx/dplayx_global.c
@@ -15,7 +15,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "wine/unicode.h"
-#include "heap.h"
 
 #include "wingdi.h"
 #include "winuser.h"
diff --git a/dlls/kernel/toolhelp.c b/dlls/kernel/toolhelp.c
index d2ef0a446bd..b9a31fa2388 100644
--- a/dlls/kernel/toolhelp.c
+++ b/dlls/kernel/toolhelp.c
@@ -15,7 +15,6 @@
 #include "local.h"
 #include "tlhelp32.h"
 #include "toolhelp.h"
-#include "heap.h"
 #include "wine/server.h"
 #include "debugtools.h"
 
diff --git a/dlls/kernel/wowthunk.c b/dlls/kernel/wowthunk.c
index d14bbe365b9..bbb3c636a45 100644
--- a/dlls/kernel/wowthunk.c
+++ b/dlls/kernel/wowthunk.c
@@ -8,7 +8,6 @@
 #include "winbase.h"
 #include "wownt32.h"
 #include "file.h"
-#include "heap.h"
 #include "miscemu.h"
 #include "stackframe.h"
 #include "builtin16.h"
diff --git a/dlls/mpr/mpr_main.c b/dlls/mpr/mpr_main.c
index 976e12537f7..ff2a86d57f1 100644
--- a/dlls/mpr/mpr_main.c
+++ b/dlls/mpr/mpr_main.c
@@ -4,7 +4,6 @@
 
 #include "winbase.h"
 #include "winnetwk.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(mpr);
diff --git a/dlls/msacm/driver.c b/dlls/msacm/driver.c
index da0f473feec..d0c6b270be4 100644
--- a/dlls/msacm/driver.c
+++ b/dlls/msacm/driver.c
@@ -14,13 +14,13 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "debugtools.h"
-#include "heap.h"
+#include "winnls.h"
 #include "mmsystem.h"
 #include "msacm.h"
 #include "msacmdrv.h"
 #include "wineacm.h"
 #include "winreg.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(msacm);
 	
diff --git a/dlls/ntdll/rtl.c b/dlls/ntdll/rtl.c
index 98d4442e791..4b8d6a296ba 100644
--- a/dlls/ntdll/rtl.c
+++ b/dlls/ntdll/rtl.c
@@ -10,7 +10,6 @@
 #include <stdlib.h>
 #include <stdio.h>
 #include <string.h>
-#include "heap.h"
 #include "debugtools.h"
 #include "windef.h"
 #include "winerror.h"
diff --git a/dlls/ntdll/rtlstr.c b/dlls/ntdll/rtlstr.c
index 34e90f03e14..b1b6139f682 100644
--- a/dlls/ntdll/rtlstr.c
+++ b/dlls/ntdll/rtlstr.c
@@ -11,7 +11,6 @@
 #include <string.h>
 #include <ctype.h>
 #include "wine/unicode.h"
-#include "heap.h"
 #include "winnls.h"
 #include "debugtools.h"
 #include "ntdll_misc.h"
diff --git a/dlls/ntdll/sec.c b/dlls/ntdll/sec.c
index 8f2fd536383..666ac5c9754 100644
--- a/dlls/ntdll/sec.c
+++ b/dlls/ntdll/sec.c
@@ -13,7 +13,6 @@
 #include "winbase.h"
 #include "wine/exception.h"
 #include "file.h"
-#include "heap.h"
 #include "winnls.h"
 #include "debugtools.h"
 #include "winerror.h"
diff --git a/dlls/ole32/bindctx.c b/dlls/ole32/bindctx.c
index a4604b93f20..ff7e61fe5b4 100644
--- a/dlls/ole32/bindctx.c
+++ b/dlls/ole32/bindctx.c
@@ -14,7 +14,6 @@
 #include "wine/obj_storage.h"
 #include "wine/obj_moniker.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
 
diff --git a/dlls/ole32/errorinfo.c b/dlls/ole32/errorinfo.c
index 1e201128eff..0d36ff81c83 100644
--- a/dlls/ole32/errorinfo.c
+++ b/dlls/ole32/errorinfo.c
@@ -11,6 +11,7 @@
 #include <string.h>
 
 #include "windef.h"
+#include "winbase.h"
 #include "oleauto.h"
 #include "winerror.h"
 
@@ -18,7 +19,6 @@
 #include "wine/obj_oleaut.h"
 #include "wine/obj_errorinfo.h"
 #include "wine/unicode.h"
-#include "heap.h"
 #include "thread.h"
 
 #include "debugtools.h"
diff --git a/dlls/ole32/moniker.c b/dlls/ole32/moniker.c
index dc369e37c4d..9c0a4a69f51 100644
--- a/dlls/ole32/moniker.c
+++ b/dlls/ole32/moniker.c
@@ -16,7 +16,6 @@
 #include "wine/obj_misc.h"
 #include "wine/obj_moniker.h"
 #include "debugtools.h"
-#include "heap.h"
 #include "ole2.h"
 
 #include "compobj_private.h"
diff --git a/dlls/ole32/ole2nls.c b/dlls/ole32/ole2nls.c
index c309d1e8c1a..1d57226a5c6 100644
--- a/dlls/ole32/ole2nls.c
+++ b/dlls/ole32/ole2nls.c
@@ -24,7 +24,6 @@
 #include "winver.h"
 
 #include "wine/winbase16.h"
-#include "heap.h"
 
 #include "debugtools.h"
 
diff --git a/dlls/oleaut32/dispatch.c b/dlls/oleaut32/dispatch.c
index a15c5f4701a..69167e7fa70 100644
--- a/dlls/oleaut32/dispatch.c
+++ b/dlls/oleaut32/dispatch.c
@@ -23,7 +23,6 @@
 #include "winnls.h"         /* for PRIMARYLANGID */
 
 #include "wine/obj_oleaut.h"
-#include "heap.h"
 
 #include "debugtools.h"
 
diff --git a/dlls/oleaut32/oleaut.c b/dlls/oleaut32/oleaut.c
index f70215ba127..3981320cf3f 100644
--- a/dlls/oleaut32/oleaut.c
+++ b/dlls/oleaut32/oleaut.c
@@ -14,7 +14,6 @@
 #include "olectl.h"
 #include "wine/obj_oleaut.h"
 #include "wine/obj_olefont.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
diff --git a/dlls/oleaut32/stubs.c b/dlls/oleaut32/stubs.c
index 16781789408..ac1e8327adb 100644
--- a/dlls/oleaut32/stubs.c
+++ b/dlls/oleaut32/stubs.c
@@ -13,7 +13,6 @@
 #include "debugtools.h"
 #include "ole2.h"
 #include "olectl.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
 
diff --git a/dlls/richedit/richedit.c b/dlls/richedit/richedit.c
index f65b4d539a9..267f95eebaa 100644
--- a/dlls/richedit/richedit.c
+++ b/dlls/richedit/richedit.c
@@ -12,7 +12,6 @@
 #include <string.h>
 #include "windef.h"
 #include "winbase.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "winerror.h"
 #include "riched32.h"
diff --git a/dlls/setupapi/devinst.c b/dlls/setupapi/devinst.c
index 7ff00bef370..cb6af4991cb 100644
--- a/dlls/setupapi/devinst.c
+++ b/dlls/setupapi/devinst.c
@@ -3,10 +3,10 @@
  *
  */
 
-#include "debugtools.h"
 #include "windef.h"
+#include "winbase.h"
 #include "setupx16.h"
-#include "heap.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(setupapi);
 
diff --git a/dlls/setupapi/infparse.c b/dlls/setupapi/infparse.c
index 379ebb41dba..25e2f184be9 100644
--- a/dlls/setupapi/infparse.c
+++ b/dlls/setupapi/infparse.c
@@ -13,7 +13,6 @@
 #include "debugtools.h"
 #include "windef.h"
 #include "winbase.h"
-#include "heap.h"
 #include "wine/winbase16.h"
 #include "setupx16.h"
 #include "setupapi_private.h"
diff --git a/dlls/setupapi/virtcopy.c b/dlls/setupapi/virtcopy.c
index e2ac47a12a6..eef036abaa8 100644
--- a/dlls/setupapi/virtcopy.c
+++ b/dlls/setupapi/virtcopy.c
@@ -9,7 +9,6 @@
 #include "debugtools.h"
 #include "windef.h"
 #include "setupx16.h"
-#include "heap.h"
 #include "callback.h"
 #include "winreg.h"
 #include "setupapi_private.h"
diff --git a/dlls/shell32/memorystream.c b/dlls/shell32/memorystream.c
index 7e85ccdedc2..a36a8d4f07c 100644
--- a/dlls/shell32/memorystream.c
+++ b/dlls/shell32/memorystream.c
@@ -15,7 +15,6 @@
 #include "winerror.h"
 #include "shlobj.h"
 #include "debugtools.h"
-#include "heap.h"
 #include "shell32_main.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shell32/shellstring.c b/dlls/shell32/shellstring.c
index 0fc4762a34d..eb8edbaa8a0 100644
--- a/dlls/shell32/shellstring.c
+++ b/dlls/shell32/shellstring.c
@@ -6,7 +6,6 @@
 #include "winnls.h"
 #include "winerror.h"
 #include "debugtools.h"
-#include "heap.h"
 
 #include "shlobj.h"
 #include "shlwapi.h"
diff --git a/dlls/shell32/systray.c b/dlls/shell32/systray.c
index cd62f77363a..6f7165bed3a 100644
--- a/dlls/shell32/systray.c
+++ b/dlls/shell32/systray.c
@@ -19,7 +19,6 @@
 #include "shell32_main.h"
 #include "commctrl.h"
 #include "debugtools.h"
-#include "heap.h"
 #include "config.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/shlwapi/regstream.c b/dlls/shlwapi/regstream.c
index 4646054a0fd..528b3e083e2 100644
--- a/dlls/shlwapi/regstream.c
+++ b/dlls/shlwapi/regstream.c
@@ -8,7 +8,6 @@
 #include "winreg.h"
 #include "shlobj.h"
 
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);
diff --git a/dlls/ttydrv/graphics.c b/dlls/ttydrv/graphics.c
index 0883eba7cfc..ee1960d6960 100644
--- a/dlls/ttydrv/graphics.c
+++ b/dlls/ttydrv/graphics.c
@@ -8,7 +8,6 @@
 
 #include "winnls.h"
 #include "gdi.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "ttydrv.h"
 
diff --git a/dlls/user/network.c b/dlls/user/network.c
index 3e344e393f0..03a7b6e5885 100644
--- a/dlls/user/network.c
+++ b/dlls/user/network.c
@@ -12,7 +12,6 @@
 #include "wine/winnet16.h"
 #include "winnetwk.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(wnet);
 
diff --git a/dlls/winaspi/winaspi16.c b/dlls/winaspi/winaspi16.c
index 6a225ee5114..189a3a65133 100644
--- a/dlls/winaspi/winaspi16.c
+++ b/dlls/winaspi/winaspi16.c
@@ -15,7 +15,6 @@
 #include "aspi.h"
 #include "winescsi.h"
 #include "wine/winaspi.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "miscemu.h"
 
diff --git a/dlls/winaspi/winaspi32.c b/dlls/winaspi/winaspi32.c
index 4be2d43ab5f..170bd8eb008 100644
--- a/dlls/winaspi/winaspi32.c
+++ b/dlls/winaspi/winaspi32.c
@@ -13,7 +13,6 @@
 #include "aspi.h"
 #include "wnaspi32.h"
 #include "winescsi.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(aspi);
diff --git a/dlls/wininet/ftp.c b/dlls/wininet/ftp.c
index 66a68191987..199188c7b65 100644
--- a/dlls/wininet/ftp.c
+++ b/dlls/wininet/ftp.c
@@ -40,7 +40,6 @@
 #include "wininet.h"
 #include "winerror.h"
 #include "winsock.h"
-#include "heap.h"
 
 #include "debugtools.h"
 #include "internet.h"
diff --git a/dlls/winmm/mciwave/mciwave.c b/dlls/winmm/mciwave/mciwave.c
index 6ea1197bead..a5152f84f27 100644
--- a/dlls/winmm/mciwave/mciwave.c
+++ b/dlls/winmm/mciwave/mciwave.c
@@ -14,7 +14,6 @@
 #include "winuser.h"
 #include "mmddk.h"
 #include "digitalv.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(mciwave);
diff --git a/dlls/winmm/wineoss/audio.c b/dlls/winmm/wineoss/audio.c
index 9a37e2f7d38..199b2b5a5c9 100644
--- a/dlls/winmm/wineoss/audio.c
+++ b/dlls/winmm/wineoss/audio.c
@@ -36,7 +36,6 @@
 #include "dsound.h"
 #include "dsdriver.h"
 #include "oss.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(wave);
diff --git a/dlls/winmm/wineoss/midi.c b/dlls/winmm/wineoss/midi.c
index 710f6e9e5e5..b1ae5a6862e 100644
--- a/dlls/winmm/wineoss/midi.c
+++ b/dlls/winmm/wineoss/midi.c
@@ -26,7 +26,6 @@
 #include "mmddk.h"
 #include "oss.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(midi);
 
diff --git a/dlls/winsock/async.c b/dlls/winsock/async.c
index 9b02ef6827a..87612bcefa7 100644
--- a/dlls/winsock/async.c
+++ b/dlls/winsock/async.c
@@ -84,7 +84,6 @@
 #include "winsock2.h"
 #include "wine/winsock16.h"
 #include "winnt.h"
-#include "heap.h"
 #include "wine/port.h"
 #include "debugtools.h"
 
diff --git a/dlls/wsock32/protocol.c b/dlls/wsock32/protocol.c
index 9ae90582053..b03d70a663d 100644
--- a/dlls/wsock32/protocol.c
+++ b/dlls/wsock32/protocol.c
@@ -9,13 +9,15 @@
 #include <stdio.h>
 #include <string.h>
 #include "winbase.h"
-#include "debugtools.h"
-#include "heap.h"
+#include "winnls.h"
+#include "wine/unicode.h"
 #include "nspapi.h"
 #include "winsock.h"
 #include "wsipx.h"
 #include "wshisotp.h"
 
+#include "debugtools.h"
+
 DEFAULT_DEBUG_CHANNEL(winsock);
 
 /* name of the protocols
diff --git a/graphics/enhmetafiledrv/graphics.c b/graphics/enhmetafiledrv/graphics.c
index c899cd52698..49e54998ce1 100644
--- a/graphics/enhmetafiledrv/graphics.c
+++ b/graphics/enhmetafiledrv/graphics.c
@@ -9,7 +9,6 @@
 
 #include "gdi.h"
 #include "enhmetafiledrv.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(enhmetafile);
diff --git a/graphics/enhmetafiledrv/objects.c b/graphics/enhmetafiledrv/objects.c
index c75b6e4d0e6..166816c4d4e 100644
--- a/graphics/enhmetafiledrv/objects.c
+++ b/graphics/enhmetafiledrv/objects.c
@@ -11,7 +11,6 @@
 #include "bitmap.h"
 #include "enhmetafiledrv.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(enhmetafile);
 
diff --git a/graphics/metafiledrv/bitblt.c b/graphics/metafiledrv/bitblt.c
index 666fcdf8bf3..ab0e9509c6a 100644
--- a/graphics/metafiledrv/bitblt.c
+++ b/graphics/metafiledrv/bitblt.c
@@ -8,7 +8,6 @@
 
 #include "gdi.h"
 #include "metafiledrv.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "bitmap.h"
 
diff --git a/graphics/metafiledrv/graphics.c b/graphics/metafiledrv/graphics.c
index 067ef238b6e..66d437baaea 100644
--- a/graphics/metafiledrv/graphics.c
+++ b/graphics/metafiledrv/graphics.c
@@ -10,7 +10,6 @@
 #include "gdi.h"
 #include "region.h"
 #include "metafiledrv.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(metafile);
diff --git a/graphics/metafiledrv/objects.c b/graphics/metafiledrv/objects.c
index cbaba57e9c9..7f77790dc36 100644
--- a/graphics/metafiledrv/objects.c
+++ b/graphics/metafiledrv/objects.c
@@ -12,7 +12,6 @@
 #include "font.h"
 #include "metafiledrv.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(metafile);
 
diff --git a/graphics/metafiledrv/text.c b/graphics/metafiledrv/text.c
index 50c3463fe18..64b4b49a81d 100644
--- a/graphics/metafiledrv/text.c
+++ b/graphics/metafiledrv/text.c
@@ -10,7 +10,6 @@
 #include "windef.h"
 #include "metafiledrv.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(metafile);
 
diff --git a/graphics/painting.c b/graphics/painting.c
index a9a74baec0d..9af5593b0be 100644
--- a/graphics/painting.c
+++ b/graphics/painting.c
@@ -14,7 +14,6 @@
 #include "winerror.h"
 #include "gdi.h"
 #include "bitmap.h"
-#include "heap.h"
 #include "region.h"
 #include "path.h"
 #include "debugtools.h"
diff --git a/graphics/win16drv/graphics.c b/graphics/win16drv/graphics.c
index a3f3a71071d..0cd100faffb 100644
--- a/graphics/win16drv/graphics.c
+++ b/graphics/win16drv/graphics.c
@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include "heap.h"
+
 #include "win16drv.h"
 #include "debugtools.h"
 
diff --git a/graphics/x11drv/bitmap.c b/graphics/x11drv/bitmap.c
index 26e06c6ec26..478357ceaeb 100644
--- a/graphics/x11drv/bitmap.c
+++ b/graphics/x11drv/bitmap.c
@@ -14,7 +14,6 @@
 #include <stdlib.h>
 #include "gdi.h"
 #include "bitmap.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "x11drv.h"
 #include "wingdi.h"
diff --git a/graphics/x11drv/clipping.c b/graphics/x11drv/clipping.c
index b557d170837..d890f122f27 100644
--- a/graphics/x11drv/clipping.c
+++ b/graphics/x11drv/clipping.c
@@ -14,7 +14,6 @@
 #include "x11drv.h"
 #include "region.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(x11drv);
 
diff --git a/graphics/x11drv/codepage.c b/graphics/x11drv/codepage.c
index c36915b9226..092c7ca2f5c 100644
--- a/graphics/x11drv/codepage.c
+++ b/graphics/x11drv/codepage.c
@@ -12,7 +12,6 @@
 
 #include "windef.h"
 #include "winnls.h"
-#include "heap.h"
 #include "x11font.h"
 #include "debugtools.h"
 
diff --git a/graphics/x11drv/oembitmap.c b/graphics/x11drv/oembitmap.c
index c9c42a72a7d..c20bd64e8e4 100644
--- a/graphics/x11drv/oembitmap.c
+++ b/graphics/x11drv/oembitmap.c
@@ -28,7 +28,6 @@ typedef unsigned long Pixel;
 #include "cursoricon.h"
 #include "debugtools.h"
 #include "gdi.h"
-#include "heap.h"
 #include "user.h" /* for TWEAK_WineLook (FIXME) */
 #include "x11drv.h"
 
diff --git a/graphics/x11drv/text.c b/graphics/x11drv/text.c
index 865db60f049..5e7d223f5b7 100644
--- a/graphics/x11drv/text.c
+++ b/graphics/x11drv/text.c
@@ -16,7 +16,6 @@
 #include "windef.h"
 #include "winnls.h"
 #include "gdi.h"
-#include "heap.h"
 #include "x11font.h"
 #include "bitmap.h"
 #include "debugtools.h"
diff --git a/if1632/builtin.c b/if1632/builtin.c
index ff9fddaeaf2..bffd41b538c 100644
--- a/if1632/builtin.c
+++ b/if1632/builtin.c
@@ -12,7 +12,6 @@
 #include "wine/winbase16.h"
 #include "builtin16.h"
 #include "global.h"
-#include "heap.h"
 #include "file.h"
 #include "module.h"
 #include "miscemu.h"
diff --git a/if1632/relay.c b/if1632/relay.c
index 441fb1e20ba..f73c2560d01 100644
--- a/if1632/relay.c
+++ b/if1632/relay.c
@@ -8,7 +8,6 @@
 #include <string.h>
 #include "wine/winbase16.h"
 #include "winnt.h"
-#include "heap.h"
 #include "module.h"
 #include "stackframe.h"
 #include "selectors.h"
diff --git a/if1632/thunk.c b/if1632/thunk.c
index 47e2bb5a44b..83b34da8b70 100644
--- a/if1632/thunk.c
+++ b/if1632/thunk.c
@@ -9,7 +9,6 @@
 #include "wine/winbase16.h"
 #include "callback.h"
 #include "builtin16.h"
-#include "heap.h"
 #include "module.h"
 #include "stackframe.h"
 #include "debugtools.h"
diff --git a/loader/ne/module.c b/loader/ne/module.c
index 1d596639f71..20909640653 100644
--- a/loader/ne/module.c
+++ b/loader/ne/module.c
@@ -17,7 +17,6 @@
 #include "module.h"
 #include "toolhelp.h"
 #include "file.h"
-#include "heap.h"
 #include "task.h"
 #include "snoop.h"
 #include "builtin16.h"
diff --git a/memory/global.c b/memory/global.c
index a861e77b3cf..8a4ef73a534 100644
--- a/memory/global.c
+++ b/memory/global.c
@@ -16,7 +16,6 @@
 #include "wine/exception.h"
 #include "wine/port.h"
 #include "global.h"
-#include "heap.h"
 #include "toolhelp.h"
 #include "selectors.h"
 #include "miscemu.h"
diff --git a/memory/local.c b/memory/local.c
index 3999149114c..9d50c1f0710 100644
--- a/memory/local.c
+++ b/memory/local.c
@@ -17,7 +17,6 @@
 #include <stdlib.h>
 #include <string.h>
 #include "wine/winbase16.h"
-#include "heap.h"
 #include "instance.h"
 #include "local.h"
 #include "module.h"
diff --git a/memory/registry.c b/memory/registry.c
index 1ec8f804d2c..dc2ef3759e4 100644
--- a/memory/registry.c
+++ b/memory/registry.c
@@ -21,7 +21,6 @@
 #include "winerror.h"
 #include "wine/winbase16.h"
 #include "wine/unicode.h"
-#include "heap.h"
 #include "wine/server.h"
 #include "debugtools.h"
 
diff --git a/msdos/dosaspi.c b/msdos/dosaspi.c
index 29771cbda5e..a7bb3be9cbc 100644
--- a/msdos/dosaspi.c
+++ b/msdos/dosaspi.c
@@ -4,7 +4,6 @@
 #include "winbase.h"
 #include "wine/windef16.h"
 #include "wine/winaspi.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "miscemu.h" /* DOSMEM_* */
 #include "callback.h"
diff --git a/objects/bitmap.c b/objects/bitmap.c
index ce00d7acda3..c12c66315bb 100644
--- a/objects/bitmap.c
+++ b/objects/bitmap.c
@@ -11,7 +11,6 @@
 #include "wine/winbase16.h"
 #include "gdi.h"
 #include "bitmap.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "wine/winuser16.h"
 
diff --git a/objects/region.c b/objects/region.c
index 1c980f0cf97..125118026ff 100644
--- a/objects/region.c
+++ b/objects/region.c
@@ -87,7 +87,6 @@ SOFTWARE.
 #include "wingdi.h"
 #include "debugtools.h"
 #include "region.h"
-#include "heap.h"
 #include "gdi.h"
 
 DEFAULT_DEBUG_CHANNEL(region);
diff --git a/objects/text.c b/objects/text.c
index 9be7383d659..b4b15a4c9fc 100644
--- a/objects/text.c
+++ b/objects/text.c
@@ -13,7 +13,6 @@
 #include "winbase.h"
 #include "winerror.h"
 #include "gdi.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "winnls.h"
 
diff --git a/relay32/builtin32.c b/relay32/builtin32.c
index 0951a8f9448..bea5db68e45 100644
--- a/relay32/builtin32.c
+++ b/relay32/builtin32.c
@@ -20,7 +20,6 @@
 #include "wine/library.h"
 #include "module.h"
 #include "file.h"
-#include "heap.h"
 #include "winerror.h"
 #include "wine/server.h"
 #include "debugtools.h"
diff --git a/scheduler/critsection.c b/scheduler/critsection.c
index acb9e5207e5..80c9b9e144b 100644
--- a/scheduler/critsection.c
+++ b/scheduler/critsection.c
@@ -13,7 +13,6 @@
 #include "winerror.h"
 #include "winbase.h"
 #include "ntddk.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "thread.h"
 
diff --git a/scheduler/thread.c b/scheduler/thread.c
index b4a395c9156..bd2e85cdb27 100644
--- a/scheduler/thread.c
+++ b/scheduler/thread.c
@@ -19,7 +19,6 @@
 #include "task.h"
 #include "module.h"
 #include "winerror.h"
-#include "heap.h"
 #include "selectors.h"
 #include "winnt.h"
 #include "wine/server.h"
diff --git a/win32/device.c b/win32/device.c
index bb954f14989..9661c641bf4 100644
--- a/win32/device.c
+++ b/win32/device.c
@@ -21,7 +21,6 @@
 #include "winreg.h"
 #include "winerror.h"
 #include "file.h"
-#include "heap.h"
 #include "winioctl.h"
 #include "winnt.h"
 #include "msdos.h"
diff --git a/windows/driver.c b/windows/driver.c
index a5fc11ac448..75fd1b76cf4 100644
--- a/windows/driver.c
+++ b/windows/driver.c
@@ -9,7 +9,7 @@
  */
 
 #include <string.h>
-#include "heap.h"
+
 #include "windef.h"
 #include "wine/winbase16.h"
 #include "wingdi.h"
diff --git a/windows/input.c b/windows/input.c
index 9a4225a7f80..b30b9f62e0a 100644
--- a/windows/input.c
+++ b/windows/input.c
@@ -25,7 +25,6 @@
 #include "wine/keyboard16.h"
 #include "wine/server.h"
 #include "win.h"
-#include "heap.h"
 #include "input.h"
 #include "keyboard.h"
 #include "mouse.h"
diff --git a/windows/keyboard.c b/windows/keyboard.c
index 0447c20a838..906093e77ab 100644
--- a/windows/keyboard.c
+++ b/windows/keyboard.c
@@ -19,7 +19,6 @@
 #include "winuser.h"
 #include "wine/keyboard16.h"
 #include "win.h"
-#include "heap.h"
 #include "keyboard.h"
 #include "user.h"
 #include "message.h"
diff --git a/windows/painting.c b/windows/painting.c
index 831274e5055..d7b514f6d50 100644
--- a/windows/painting.c
+++ b/windows/painting.c
@@ -16,7 +16,6 @@
 #include "win.h"
 #include "queue.h"
 #include "dce.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(win);
diff --git a/windows/winpos.c b/windows/winpos.c
index da7078b9163..41aeeb6cb7a 100644
--- a/windows/winpos.c
+++ b/windows/winpos.c
@@ -12,7 +12,6 @@
 #include "winerror.h"
 #include "wine/winuser16.h"
 #include "controls.h"
-#include "heap.h"
 #include "user.h"
 #include "region.h"
 #include "win.h"
diff --git a/windows/x11drv/event.c b/windows/x11drv/event.c
index 000a986f5be..3541f68fd48 100644
--- a/windows/x11drv/event.c
+++ b/windows/x11drv/event.c
@@ -25,7 +25,6 @@
 #include "clipboard.h"
 #include "dce.h"
 #include "debugtools.h"
-#include "heap.h"
 #include "input.h"
 #include "keyboard.h"
 #include "mouse.h"