Removed unnecessary inclusion of heap.h.

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"
 

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"

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;

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"
 

dlls/comctl32/ipaddress.c

@@ -28,7 +28,6 @@
 
 #include "winbase.h"
 #include "commctrl.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(ipaddress);

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"

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"

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"

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"

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"

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"

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"

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"

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"

dlls/ddraw/helper.c

@@ -16,7 +16,6 @@
 
 #include "wine/exception.h"
 #include "ddraw_private.h"
-#include "heap.h"
 
 #include "debugtools.h"
 

dlls/dplayx/dplaysp.c

@@ -5,7 +5,6 @@
  */
 
 #include <string.h>
-#include "heap.h"
 #include "winerror.h"
 #include "debugtools.h"
 

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"

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"
 

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"

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);

dlls/msacm/driver.c

@@ -14,13 +14,13 @@
 #include "windef.h"
 #include "wingdi.h"
 #include "winuser.h"
-#include "debugtools.h"
+#include "winnls.h"
-#include "heap.h"
 #include "mmsystem.h"
 #include "msacm.h"
 #include "msacmdrv.h"
 #include "wineacm.h"
 #include "winreg.h"
+#include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(msacm);
 	

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"

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"

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"

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);
 

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"

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"

dlls/ole32/ole2nls.c

@@ -24,7 +24,6 @@
 #include "winver.h"
 
 #include "wine/winbase16.h"
-#include "heap.h"
 
 #include "debugtools.h"
 

dlls/oleaut32/dispatch.c

@@ -23,7 +23,6 @@
 #include "winnls.h"         /* for PRIMARYLANGID */
 
 #include "wine/obj_oleaut.h"
-#include "heap.h"
 
 #include "debugtools.h"
 

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);

dlls/oleaut32/stubs.c

@@ -13,7 +13,6 @@
 #include "debugtools.h"
 #include "ole2.h"
 #include "olectl.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(ole);
 

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"

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);
 

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"

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"

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);

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"

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);

dlls/shlwapi/regstream.c

@@ -8,7 +8,6 @@
 #include "winreg.h"
 #include "shlobj.h"
 
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(shell);

dlls/ttydrv/graphics.c

@@ -8,7 +8,6 @@
 
 #include "winnls.h"
 #include "gdi.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "ttydrv.h"
 

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);
 

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"
 

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);

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"

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);

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);

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);
 

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"
 

dlls/wsock32/protocol.c

@@ -9,13 +9,15 @@
 #include <stdio.h>
 #include <string.h>
 #include "winbase.h"
-#include "debugtools.h"
+#include "winnls.h"
-#include "heap.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

graphics/enhmetafiledrv/graphics.c

@@ -9,7 +9,6 @@
 
 #include "gdi.h"
 #include "enhmetafiledrv.h"
-#include "heap.h"
 #include "debugtools.h"
 
 DEFAULT_DEBUG_CHANNEL(enhmetafile);

graphics/enhmetafiledrv/objects.c

@@ -11,7 +11,6 @@
 #include "bitmap.h"
 #include "enhmetafiledrv.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(enhmetafile);
 

graphics/metafiledrv/bitblt.c

@@ -8,7 +8,6 @@
 
 #include "gdi.h"
 #include "metafiledrv.h"
-#include "heap.h"
 #include "debugtools.h"
 #include "bitmap.h"
 

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);

graphics/metafiledrv/objects.c

@@ -12,7 +12,6 @@
 #include "font.h"
 #include "metafiledrv.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(metafile);
 

graphics/metafiledrv/text.c

@@ -10,7 +10,6 @@
 #include "windef.h"
 #include "metafiledrv.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(metafile);
 

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"

graphics/win16drv/graphics.c

@@ -5,7 +5,7 @@
  */
 
 #include <stdio.h>
-#include "heap.h"
+
 #include "win16drv.h"
 #include "debugtools.h"
 

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"

graphics/x11drv/clipping.c

@@ -14,7 +14,6 @@
 #include "x11drv.h"
 #include "region.h"
 #include "debugtools.h"
-#include "heap.h"
 
 DEFAULT_DEBUG_CHANNEL(x11drv);
 

graphics/x11drv/codepage.c

@@ -12,7 +12,6 @@
 
 #include "windef.h"
 #include "winnls.h"
-#include "heap.h"
 #include "x11font.h"
 #include "debugtools.h"
 

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"
 

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"

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"

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"

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"

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"

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"

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"

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"
 

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"

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"
 

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);

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"
 

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"

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"
 

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"

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"

windows/driver.c

@@ -9,7 +9,7 @@
  */
 
 #include <string.h>
-#include "heap.h"
+
 #include "windef.h"
 #include "wine/winbase16.h"
 #include "wingdi.h"

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"

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"

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);

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"

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"